diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index b08a2b627a..a6567b8eb6 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -986,6 +986,8 @@ gtk_notebook_class_init (GtkNotebookClass *class)
    * gtk_render_background and gtk_render_frame are used.
    *
    * Since: 3.12
+   *
+   * Deprecated: 3.20: This function always behaves as if it was set to %FALSE.
    */
   gtk_widget_class_install_style_property (widget_class,
                                            g_param_spec_boolean ("has-tab-gap",
@@ -1474,31 +1476,6 @@ get_effective_tab_pos (GtkNotebook *notebook)
   return priv->tab_pos;
 }
 
-static gint
-get_tab_gap_pos (GtkNotebook *notebook)
-{
-  GtkPositionType tab_pos = get_effective_tab_pos (notebook);
-  gint gap_side = GTK_POS_BOTTOM;
-
-  switch (tab_pos)
-    {
-    case GTK_POS_TOP:
-      gap_side = GTK_POS_BOTTOM;
-      break;
-    case GTK_POS_BOTTOM:
-      gap_side = GTK_POS_TOP;
-      break;
-    case GTK_POS_LEFT:
-      gap_side = GTK_POS_RIGHT;
-      break;
-    case GTK_POS_RIGHT:
-      gap_side = GTK_POS_LEFT;
-      break;
-    }
-
-  return gap_side;
-}
-
 static void
 gtk_notebook_move_focus_out (GtkNotebook      *notebook,
                              GtkDirectionType  direction_type)
@@ -3787,12 +3764,10 @@ on_drag_icon_draw (GtkWidget *widget,
                    cairo_t   *cr,
                    gpointer   data)
 {
-  GtkWidget *notebook, *child;
+  GtkWidget *child;
   GtkRequisition requisition;
   GtkStyleContext *context;
-  gboolean has_tab_gap;
 
-  notebook = GTK_WIDGET (data);
   child = gtk_bin_get_child (GTK_BIN (widget));
   context = gtk_widget_get_style_context (widget);
 
@@ -3801,28 +3776,13 @@ on_drag_icon_draw (GtkWidget *widget,
   gtk_widget_get_preferred_size (widget,
                                  &requisition, NULL);
 
-  gtk_widget_style_get (GTK_WIDGET (notebook),
-                        "has-tab-gap", &has_tab_gap,
-                        NULL);
+  gtk_render_background (context, cr, 0, 0,
+                         requisition.width,
+                         requisition.height);
 
-  if (has_tab_gap)
-    {
-      gint gap_pos;
-      gap_pos = get_tab_gap_pos (GTK_NOTEBOOK (notebook));
-      gtk_render_extension (context, cr, 0, 0,
-                            requisition.width, requisition.height,
-                            gap_pos);
-    }
-  else
-    {
-      gtk_render_background (context, cr, 0, 0,
-                             requisition.width,
-                             requisition.height);
-
-      gtk_render_frame (context, cr, 0, 0,
-                        requisition.width,
-                        requisition.height);
-    }
+  gtk_render_frame (context, cr, 0, 0,
+                    requisition.width,
+                    requisition.height);
 
   if (child)
     gtk_container_propagate_draw (GTK_CONTAINER (widget), child, cr);
@@ -5408,9 +5368,8 @@ gtk_notebook_paint (GtkWidget    *widget,
   gint x, y;
   gint header_x, header_y;
   guint border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
-  gint gap_x = 0, gap_width = 0, step = STEP_PREV;
+  gint step = STEP_PREV;
   gboolean is_rtl;
-  gboolean has_tab_gap;
   GtkPositionType tab_pos;
   GtkStyleContext *context;
 
@@ -5485,8 +5444,7 @@ gtk_notebook_paint (GtkWidget    *widget,
   if (!NOTEBOOK_IS_TAB_LABEL_PARENT (notebook, priv->cur_page) ||
       !gtk_widget_get_mapped (priv->cur_page->tab_label))
     {
-      gap_x = 0;
-      gap_width = 0;
+      step = STEP_PREV;
     }
   else
     {
@@ -5494,22 +5452,10 @@ gtk_notebook_paint (GtkWidget    *widget,
         {
         case GTK_POS_TOP:
         case GTK_POS_BOTTOM:
-          if (priv->operation == DRAG_OPERATION_REORDER)
-            gap_x = priv->drag_window_x - allocation.x - border_width;
-          else
-            gap_x = priv->cur_page->allocation.x - allocation.x - border_width;
-
-          gap_width = priv->cur_page->allocation.width;
           step = is_rtl ? STEP_PREV : STEP_NEXT;
           break;
         case GTK_POS_LEFT:
         case GTK_POS_RIGHT:
-          if (priv->operation == DRAG_OPERATION_REORDER)
-            gap_x = priv->drag_window_y - border_width - allocation.y;
-          else
-            gap_x = priv->cur_page->allocation.y - allocation.y - border_width;
-
-          gap_width = priv->cur_page->allocation.height;
           step = STEP_PREV;
           break;
         }
@@ -5562,22 +5508,13 @@ gtk_notebook_paint (GtkWidget    *widget,
       gtk_style_context_set_junction_sides (context, junction);
     }
 
-  gtk_widget_style_get (GTK_WIDGET (notebook),
-                        "has-tab-gap", &has_tab_gap,
-                        NULL);
-
   if (priv->show_border)
     gtk_style_context_add_class (context, GTK_STYLE_CLASS_FRAME);
 
   gtk_render_background (context, cr,
                          x, y, width, height);
-  if (has_tab_gap)
-    gtk_render_frame_gap (context, cr,
-                          x, y, width, height,
-                          tab_pos, gap_x, gap_x + gap_width);
-  else
-    gtk_render_frame (context, cr,
-                      x, y, width, height);
+  gtk_render_frame (context, cr,
+                    x, y, width, height);
 
   gtk_style_context_restore (context);
 
@@ -5651,7 +5588,6 @@ gtk_notebook_draw_tab (GtkNotebook     *notebook,
   GtkNotebookPrivate *priv;
   GtkWidget *widget;
   GtkStyleContext *context;
-  gboolean has_tab_gap;
 
   if (!NOTEBOOK_IS_TAB_LABEL_PARENT (notebook, page) ||
       !gtk_widget_get_mapped (page->tab_label) ||
@@ -5664,33 +5600,17 @@ gtk_notebook_draw_tab (GtkNotebook     *notebook,
   context = gtk_widget_get_style_context (widget);
   gtk_style_context_save_to_node (context, page->cssnode);
 
-  gtk_widget_style_get (GTK_WIDGET (notebook),
-                        "has-tab-gap", &has_tab_gap,
-                        NULL);
+  gtk_render_background (context, cr,
+                         page->allocation.x,
+                         page->allocation.y,
+                         page->allocation.width,
+                         page->allocation.height);
 
-  if (has_tab_gap)
-    {
-      gtk_render_extension (context, cr,
-                            page->allocation.x,
-                            page->allocation.y,
-                            page->allocation.width,
-                            page->allocation.height,
-                            get_tab_gap_pos (notebook));
-    }
-  else
-    {
-      gtk_render_background (context, cr,
-                             page->allocation.x,
-                             page->allocation.y,
-                             page->allocation.width,
-                             page->allocation.height);
-
-      gtk_render_frame (context, cr,
-                        page->allocation.x,
-                        page->allocation.y,
-                        page->allocation.width,
-                        page->allocation.height);
-    }
+  gtk_render_frame (context, cr,
+                    page->allocation.x,
+                    page->allocation.y,
+                    page->allocation.width,
+                    page->allocation.height);
 
   if (gtk_widget_has_visible_focus (widget) &&
       priv->cur_page == page)
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 7372a07b97..7e6ed7522c 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1785,7 +1785,6 @@ notebook {
   -GtkNotebook-arrow-spacing: 5;
   -GtkNotebook-tab-curvature: 0;
   -GtkNotebook-tab-overlap: -8;
-  -GtkNotebook-has-tab-gap: false;
 
   // Through me you go to the grief wracked city;
   // Through me you go to everlasting pain;
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index c692179be8..60bd3ecb56 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -25,7 +25,7 @@
   .background:backdrop {
     text-shadow: none;
     -gtk-icon-shadow: none;
-    color: #949796;
+    color: #939695;
     background-color: #393f3f; }
 
 /*
@@ -47,8 +47,8 @@
     background-color: #212424;
     color: #eeeeec; }
   .gtkstyle-fallback:disabled {
-    background-color: #333636;
-    color: #949796; }
+    background-color: #323636;
+    color: #939695; }
   .gtkstyle-fallback:selected {
     background-color: #215d9c;
     color: #ffffff; }
@@ -59,14 +59,14 @@ textview text,
   background-color: #292929; }
   textview text:backdrop,
   .view:backdrop {
-    color: #d5d5d5;
+    color: #d4d4d4;
     background-color: #2c2c2c; }
 
 iconview {
   color: white;
   background-color: #292929; }
   iconview:backdrop {
-    color: #d5d5d5;
+    color: #d4d4d4;
     background-color: #2c2c2c; }
   iconview:selected, iconview:selected:focus {
     border-radius: 3px; }
@@ -88,9 +88,9 @@ flowbox flowboxchild {
 label.separator {
   color: #eeeeec; }
   label.separator:backdrop {
-    color: #949796; }
+    color: #939695; }
 label:disabled {
-  color: #949796; }
+  color: #939695; }
   label:disabled:backdrop {
     color: #5d6767; }
 
@@ -108,18 +108,18 @@ assistant .sidebar {
     border-left: 1px solid #1c1f1f; }
   assistant .sidebar:backdrop {
     background-color: #2c2c2c;
-    border-color: #1f2222; }
+    border-color: #1e2222; }
 assistant.csd .sidebar {
   border-top-style: none; }
 assistant .sidebar label {
   padding: 6px 12px; }
 assistant .sidebar label.highlight {
-  background-color: #5d6262; }
+  background-color: #5d6261; }
 
 textview {
   background-color: #313434; }
   textview:backdrop {
-    background-color: #333636; }
+    background-color: #323535; }
 
 popover.background.touch-selection, popover.background.magnifier, .csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.osd, .csd popover.background.osd, .app-notification,
 .app-notification.frame, .osd .scale-popup, .osd {
@@ -161,7 +161,7 @@ entry, spinbutton {
   border-radius: 3px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   background-color: #292929;
-  background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+  background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
   color: white;
   border-color: #1c1f1f;
   box-shadow: inset 0 0 0 1px rgba(33, 93, 156, 0), 0 1px rgba(238, 238, 236, 0); }
@@ -174,7 +174,7 @@ entry, spinbutton {
   entry.flat, spinbutton.flat, entry.flat:focus, spinbutton.flat:focus {
     padding: 2px;
     background-color: #292929;
-    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
     color: white;
     border-color: #1c1f1f;
     box-shadow: inset 0 0 0 1px rgba(33, 93, 156, 0);
@@ -182,29 +182,29 @@ entry, spinbutton {
     border-radius: 0; }
   entry:focus, spinbutton:focus {
     background-color: #292929;
-    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
     box-shadow: inset 0 0 0 1px #215d9c, 0 1px rgba(238, 238, 236, 0);
     border-color: #0f2b48; }
   entry:disabled, spinbutton:disabled {
     background-color: #292929;
-    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
-    color: #949796;
+    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+    color: #939695;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #333636);
+    background-image: linear-gradient(to bottom, #323636);
     box-shadow: 0 1px rgba(238, 238, 236, 0); }
   entry:backdrop, spinbutton:backdrop {
     background-color: #292929;
-    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
-    color: #d5d5d5;
-    border-color: #1f2222;
+    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+    color: #d4d4d4;
+    border-color: #1e2222;
     background-image: linear-gradient(to bottom, #2c2c2c);
     box-shadow: 0 1px rgba(238, 238, 236, 0); }
   entry:backdrop:disabled, spinbutton:backdrop:disabled {
     background-color: #292929;
-    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
     color: #5d6767;
-    border-color: #1f2222;
-    background-image: linear-gradient(to bottom, #333636);
+    border-color: #1e2222;
+    background-image: linear-gradient(to bottom, #323636);
     box-shadow: 0 1px rgba(238, 238, 236, 0); }
   entry progress, spinbutton progress {
     margin: 1px;
@@ -224,7 +224,7 @@ entry, spinbutton {
     border-color: #1a0000; }
     entry.error:focus, spinbutton.error:focus {
       background-color: #292929;
-      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
       box-shadow: inset 0 0 0 1px #cc0000, 0 1px rgba(238, 238, 236, 0);
       border-color: #1a0000; }
     entry.error:selected, spinbutton.error:selected, entry.error:selected:focus, spinbutton.error:selected:focus {
@@ -234,22 +234,22 @@ entry, spinbutton {
     border-color: #432100; }
     entry.warning:focus, spinbutton.warning:focus {
       background-color: #292929;
-      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
       box-shadow: inset 0 0 0 1px #f57900, 0 1px rgba(238, 238, 236, 0);
       border-color: #432100; }
     entry.warning:selected, spinbutton.warning:selected, entry.warning:selected:focus, spinbutton.warning:selected:focus {
       background-color: #f57900; }
   entry image, spinbutton image {
-    color: #c7c7c5; }
+    color: #c6c6c5; }
     entry image:hover, spinbutton image:hover {
       color: #eeeeec; }
     entry image:active, spinbutton image:active {
       color: #215d9c; }
     entry image:backdrop, spinbutton image:backdrop {
-      color: #7f8281; }
+      color: #7e8080; }
   .osd entry, .osd spinbutton {
     background-color: #292929;
-    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
@@ -259,7 +259,7 @@ entry, spinbutton {
     -gtk-icon-shadow: 0 1px black; }
     .osd entry:focus, .osd spinbutton:focus {
       background-color: #292929;
-      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
       color: white;
       border-color: #215d9c;
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
@@ -269,7 +269,7 @@ entry, spinbutton {
       -gtk-icon-shadow: 0 1px black; }
     .osd entry:backdrop, .osd spinbutton:backdrop {
       background-color: #292929;
-      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
@@ -279,10 +279,10 @@ entry, spinbutton {
       -gtk-icon-shadow: none; }
     .osd entry:disabled, .osd spinbutton:disabled {
       background-color: #292929;
-      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
-      color: #878a89;
+      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -296,7 +296,7 @@ entry, spinbutton {
   border-top-color: #252626;
   background-image: linear-gradient(to bottom, #292929); }
   .linked.vertical > entry:not(:disabled) + entry:not(:disabled):backdrop, .linked.vertical > spinbutton:not(:disabled) + entry:not(:disabled):backdrop, .linked.vertical > entry:not(:disabled) + spinbutton:not(:disabled):backdrop, .linked.vertical > spinbutton:not(:disabled) + spinbutton:not(:disabled):backdrop {
-    border-top-color: #282929;
+    border-top-color: #272929;
     background-image: linear-gradient(to bottom, #2c2c2c); }
 .linked.vertical > entry:disabled + entry:disabled, .linked.vertical > spinbutton:disabled + entry:disabled, .linked.vertical > entry:disabled + spinbutton:disabled, .linked.vertical > spinbutton:disabled + spinbutton:disabled {
   border-top-color: #252626; }
@@ -381,8 +381,8 @@ button, headerbar button.titlebutton,
   button:backdrop, headerbar button.titlebutton:backdrop,
   .titlebar button.titlebutton:backdrop, button.flat:backdrop, button.sidebar-button:backdrop, headerbar button.titlebutton:backdrop,
   .titlebar button.titlebutton:backdrop {
-    color: #949796;
-    border-color: #1f2222;
+    color: #939695;
+    border-color: #1e2222;
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     -gtk-icon-shadow: none;
@@ -391,32 +391,29 @@ button, headerbar button.titlebutton,
     button:backdrop:active, button:backdrop:checked, button.flat:backdrop:active, button.sidebar-button:backdrop:active, headerbar button.titlebutton:backdrop:active,
     .titlebar button.titlebutton:backdrop:active, button.flat:backdrop:checked, button.sidebar-button:backdrop:checked, headerbar button.titlebutton:backdrop:checked,
     .titlebar button.titlebutton:backdrop:checked {
-      color: #949796;
-      border-color: #1f2222;
-      background-image: linear-gradient(to bottom, #303535);
+      color: #939695;
+      border-color: #1e2222;
+      background-image: linear-gradient(to bottom, #2f3434);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
     button:backdrop:disabled, button.flat:backdrop:disabled, button.sidebar-button:backdrop:disabled, headerbar button.titlebutton:backdrop:disabled,
     .titlebar button.titlebutton:backdrop:disabled {
       color: #5d6767;
-      border-color: #1f2222;
-      background-image: linear-gradient(to bottom, #333636);
+      border-color: #1e2222;
+      background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-      button:backdrop:disabled > .label, headerbar button.titlebutton:backdrop:disabled > .label,
-      .titlebar button.titlebutton:backdrop:disabled > .label, button.flat:backdrop:disabled > .label, button.sidebar-button:backdrop:disabled > .label, headerbar button.titlebutton:backdrop:disabled > .label,
+      button:backdrop:disabled > .label, button.flat:backdrop:disabled > .label, button.sidebar-button:backdrop:disabled > .label, headerbar button.titlebutton:backdrop:disabled > .label,
       .titlebar button.titlebutton:backdrop:disabled > .label {
         color: inherit; }
     button:backdrop:disabled:active, button:backdrop:disabled:checked, button.flat:backdrop:disabled:active, button.sidebar-button:backdrop:disabled:active, headerbar button.titlebutton:backdrop:disabled:active,
     .titlebar button.titlebutton:backdrop:disabled:active, button.flat:backdrop:disabled:checked, button.sidebar-button:backdrop:disabled:checked, headerbar button.titlebutton:backdrop:disabled:checked,
     .titlebar button.titlebutton:backdrop:disabled:checked {
       color: #5d6767;
-      border-color: #1f2222;
-      background-image: linear-gradient(to bottom, #272929);
+      border-color: #1e2222;
+      background-image: linear-gradient(to bottom, #262929);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-      button:backdrop:disabled:active > .label, headerbar button.titlebutton:backdrop:disabled:active > .label,
-      .titlebar button.titlebutton:backdrop:disabled:active > .label, button:backdrop:disabled:checked > .label, headerbar button.titlebutton:backdrop:disabled:checked > .label,
-      .titlebar button.titlebutton:backdrop:disabled:checked > .label, button.flat:backdrop:disabled:active > .label, button.sidebar-button:backdrop:disabled:active > .label, headerbar button.titlebutton:backdrop:disabled:active > .label,
+      button:backdrop:disabled:active > .label, button:backdrop:disabled:checked > .label, button.flat:backdrop:disabled:active > .label, button.sidebar-button:backdrop:disabled:active > .label, headerbar button.titlebutton:backdrop:disabled:active > .label,
       .titlebar button.titlebutton:backdrop:disabled:active > .label, button.flat:backdrop:disabled:checked > .label, button.sidebar-button:backdrop:disabled:checked > .label, headerbar button.titlebutton:backdrop:disabled:checked > .label,
       .titlebar button.titlebutton:backdrop:disabled:checked > .label {
         color: inherit; }
@@ -432,23 +429,20 @@ button, headerbar button.titlebutton,
     -gtk-icon-shadow: none; }
   button:disabled, headerbar button.titlebutton:disabled,
   .titlebar button.titlebutton:disabled {
-    color: #949796;
+    color: #939695;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #333636);
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-    button:disabled > .label, headerbar button.titlebutton:disabled > .label,
-    .titlebar button.titlebutton:disabled > .label {
+    button:disabled > .label {
       color: inherit; }
     button:disabled:active, button:disabled:checked {
-      color: #949796;
+      color: #939695;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #313434, #333636);
+      background-image: linear-gradient(to bottom, #2f3333, #323636);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-      button:disabled:active > .label, headerbar button.titlebutton:disabled:active > .label,
-      .titlebar button.titlebutton:disabled:active > .label, button:disabled:checked > .label, headerbar button.titlebutton:disabled:checked > .label,
-      .titlebar button.titlebutton:disabled:checked > .label {
+      button:disabled:active > .label, button:disabled:checked > .label {
         color: inherit; }
   button.osd, headerbar button.osd.titlebutton,
   .titlebar button.osd.titlebutton {
@@ -491,9 +485,9 @@ button, headerbar button.titlebutton,
       border: none;
       box-shadow: none; }
     button.osd:disabled, button.osd:backdrop:disabled {
-      color: #878a89;
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -541,9 +535,9 @@ button, headerbar button.titlebutton,
       -gtk-icon-shadow: none;
       outline-color: rgba(238, 238, 236, 0.3); }
     popover.background.touch-selection button:disabled, popover.background.magnifier button:disabled, .app-notification button:disabled, popover.background.touch-selection button:backdrop:disabled, popover.background.magnifier button:backdrop:disabled, .app-notification button:backdrop:disabled, .osd button:disabled, .osd button:backdrop:disabled {
-      color: #878a89;
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -600,9 +594,9 @@ button, headerbar button.titlebutton,
       .titlebar .app-notification button.titlebutton:disabled, .osd button.flat:disabled, .osd button.sidebar-button:disabled, .osd headerbar button.titlebutton:disabled, headerbar .osd button.titlebutton:disabled,
       .osd .titlebar button.titlebutton:disabled,
       .titlebar .osd button.titlebutton:disabled {
-        color: #878a89;
+        color: #878989;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -692,7 +686,7 @@ button, headerbar button.titlebutton,
       box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 238, 236, 0); }
     button.suggested-action:backdrop, button.suggested-action.flat:backdrop, button.suggested-action.sidebar-button:backdrop, headerbar button.suggested-action.titlebutton:backdrop,
     .titlebar button.suggested-action.titlebutton:backdrop {
-      color: #d3dfeb;
+      color: #d2deeb;
       border-color: #0b1e33;
       background-image: linear-gradient(to bottom, #215d9c);
       text-shadow: none;
@@ -701,32 +695,29 @@ button, headerbar button.titlebutton,
       button.suggested-action:backdrop:active, button.suggested-action:backdrop:checked, button.suggested-action.flat:backdrop:active, button.suggested-action.sidebar-button:backdrop:active, headerbar button.suggested-action.titlebutton:backdrop:active,
       .titlebar button.suggested-action.titlebutton:backdrop:active, button.suggested-action.flat:backdrop:checked, button.suggested-action.sidebar-button:backdrop:checked, headerbar button.suggested-action.titlebutton:backdrop:checked,
       .titlebar button.suggested-action.titlebutton:backdrop:checked {
-        color: #d1dae3;
+        color: #d0d9e2;
         border-color: #0b1e33;
         background-image: linear-gradient(to bottom, #184472);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
       button.suggested-action:backdrop:disabled, button.suggested-action.flat:backdrop:disabled, button.suggested-action.sidebar-button:backdrop:disabled, headerbar button.suggested-action.titlebutton:backdrop:disabled,
       .titlebar button.suggested-action.titlebutton:backdrop:disabled {
         color: #5d6767;
-        border-color: #1f2222;
-        background-image: linear-gradient(to bottom, #333636);
+        border-color: #1e2222;
+        background-image: linear-gradient(to bottom, #323636);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-        button.suggested-action:backdrop:disabled > .label, headerbar button.suggested-action.titlebutton:backdrop:disabled > .label,
-        .titlebar button.suggested-action.titlebutton:backdrop:disabled > .label, button.suggested-action.flat:backdrop:disabled > .label, button.suggested-action.sidebar-button:backdrop:disabled > .label, headerbar button.suggested-action.titlebutton:backdrop:disabled > .label,
+        button.suggested-action:backdrop:disabled > .label, button.suggested-action.flat:backdrop:disabled > .label, button.suggested-action.sidebar-button:backdrop:disabled > .label, headerbar button.suggested-action.titlebutton:backdrop:disabled > .label,
         .titlebar button.suggested-action.titlebutton:backdrop:disabled > .label {
           color: inherit; }
         button.suggested-action:backdrop:disabled:active, button.suggested-action:backdrop:disabled:checked, button.suggested-action.flat:backdrop:disabled:active, button.suggested-action.sidebar-button:backdrop:disabled:active, headerbar button.suggested-action.titlebutton:backdrop:disabled:active,
         .titlebar button.suggested-action.titlebutton:backdrop:disabled:active, button.suggested-action.flat:backdrop:disabled:checked, button.suggested-action.sidebar-button:backdrop:disabled:checked, headerbar button.suggested-action.titlebutton:backdrop:disabled:checked,
         .titlebar button.suggested-action.titlebutton:backdrop:disabled:checked {
-          color: #6c88a7;
+          color: #6c88a5;
           border-color: #0b1e33;
-          background-image: linear-gradient(to bottom, #1d4877);
+          background-image: linear-gradient(to bottom, #1d4876);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-          button.suggested-action:backdrop:disabled:active > .label, headerbar button.suggested-action.titlebutton:backdrop:disabled:active > .label,
-          .titlebar button.suggested-action.titlebutton:backdrop:disabled:active > .label, button.suggested-action:backdrop:disabled:checked > .label, headerbar button.suggested-action.titlebutton:backdrop:disabled:checked > .label,
-          .titlebar button.suggested-action.titlebutton:backdrop:disabled:checked > .label, button.suggested-action.flat:backdrop:disabled:active > .label, button.suggested-action.sidebar-button:backdrop:disabled:active > .label, headerbar button.suggested-action.titlebutton:backdrop:disabled:active > .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.sidebar-button:backdrop:disabled:active > .label, headerbar button.suggested-action.titlebutton:backdrop:disabled:active > .label,
           .titlebar button.suggested-action.titlebutton:backdrop:disabled:active > .label, button.suggested-action.flat:backdrop:disabled:checked > .label, button.suggested-action.sidebar-button:backdrop:disabled:checked > .label, headerbar button.suggested-action.titlebutton:backdrop:disabled:checked > .label,
           .titlebar button.suggested-action.titlebutton:backdrop:disabled:checked > .label {
             color: inherit; }
@@ -742,23 +733,20 @@ button, headerbar button.titlebutton,
       -gtk-icon-shadow: none;
       color: rgba(33, 93, 156, 0.8); }
     button.suggested-action:disabled {
-      color: #949796;
+      color: #939695;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #333636);
+      background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-      button.suggested-action:disabled > .label, headerbar button.suggested-action.titlebutton:disabled > .label,
-      .titlebar button.suggested-action.titlebutton:disabled > .label {
+      button.suggested-action:disabled > .label {
         color: inherit; }
       button.suggested-action:disabled:active, button.suggested-action:disabled:checked {
-        color: #a5b6c9;
+        color: #a4b5c8;
         border-color: #0b1e33;
-        background-image: linear-gradient(to bottom, #1b4470, #1d4877);
+        background-image: linear-gradient(to bottom, #1b436f, #1d4876);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-        button.suggested-action:disabled:active > .label, headerbar button.suggested-action.titlebutton:disabled:active > .label,
-        .titlebar button.suggested-action.titlebutton:disabled:active > .label, button.suggested-action:disabled:checked > .label, headerbar button.suggested-action.titlebutton:disabled:checked > .label,
-        .titlebar button.suggested-action.titlebutton:disabled:checked > .label {
+        button.suggested-action:disabled:active > .label, button.suggested-action:disabled:checked > .label {
           color: inherit; }
     .osd button.suggested-action {
       color: #eeeeec;
@@ -788,9 +776,9 @@ button, headerbar button.titlebutton,
         -gtk-icon-shadow: none;
         outline-color: rgba(238, 238, 236, 0.3); }
       .osd button.suggested-action:disabled, .osd button.suggested-action:backdrop:disabled {
-        color: #878a89;
+        color: #878989;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -845,7 +833,7 @@ button, headerbar button.titlebutton,
       box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 238, 236, 0); }
     button.destructive-action:backdrop, button.destructive-action.flat:backdrop, button.destructive-action.sidebar-button:backdrop, headerbar button.destructive-action.titlebutton:backdrop,
     .titlebar button.destructive-action.titlebutton:backdrop {
-      color: #f7cfcf;
+      color: #f6cfcf;
       border-color: #5e0707;
       background-image: linear-gradient(to bottom, #d51010);
       text-shadow: none;
@@ -861,25 +849,22 @@ button, headerbar button.titlebutton,
       button.destructive-action:backdrop:disabled, button.destructive-action.flat:backdrop:disabled, button.destructive-action.sidebar-button:backdrop:disabled, headerbar button.destructive-action.titlebutton:backdrop:disabled,
       .titlebar button.destructive-action.titlebutton:backdrop:disabled {
         color: #5d6767;
-        border-color: #1f2222;
-        background-image: linear-gradient(to bottom, #333636);
+        border-color: #1e2222;
+        background-image: linear-gradient(to bottom, #323636);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-        button.destructive-action:backdrop:disabled > .label, headerbar button.destructive-action.titlebutton:backdrop:disabled > .label,
-        .titlebar button.destructive-action.titlebutton:backdrop:disabled > .label, button.destructive-action.flat:backdrop:disabled > .label, button.destructive-action.sidebar-button:backdrop:disabled > .label, headerbar button.destructive-action.titlebutton:backdrop:disabled > .label,
+        button.destructive-action:backdrop:disabled > .label, button.destructive-action.flat:backdrop:disabled > .label, button.destructive-action.sidebar-button:backdrop:disabled > .label, headerbar button.destructive-action.titlebutton:backdrop:disabled > .label,
         .titlebar button.destructive-action.titlebutton:backdrop:disabled > .label {
           color: inherit; }
         button.destructive-action:backdrop:disabled:active, button.destructive-action:backdrop:disabled:checked, button.destructive-action.flat:backdrop:disabled:active, button.destructive-action.sidebar-button:backdrop:disabled:active, headerbar button.destructive-action.titlebutton:backdrop:disabled:active,
         .titlebar button.destructive-action.titlebutton:backdrop:disabled:active, button.destructive-action.flat:backdrop:disabled:checked, button.destructive-action.sidebar-button:backdrop:disabled:checked, headerbar button.destructive-action.titlebutton:backdrop:disabled:checked,
         .titlebar button.destructive-action.titlebutton:backdrop:disabled:checked {
-          color: #c46565;
+          color: #c36464;
           border-color: #5e0707;
-          background-image: linear-gradient(to bottom, #a41212);
+          background-image: linear-gradient(to bottom, #a41111);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-          button.destructive-action:backdrop:disabled:active > .label, headerbar button.destructive-action.titlebutton:backdrop:disabled:active > .label,
-          .titlebar button.destructive-action.titlebutton:backdrop:disabled:active > .label, button.destructive-action:backdrop:disabled:checked > .label, headerbar button.destructive-action.titlebutton:backdrop:disabled:checked > .label,
-          .titlebar button.destructive-action.titlebutton:backdrop:disabled:checked > .label, button.destructive-action.flat:backdrop:disabled:active > .label, button.destructive-action.sidebar-button:backdrop:disabled:active > .label, headerbar button.destructive-action.titlebutton:backdrop:disabled:active > .label,
+          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.sidebar-button:backdrop:disabled:active > .label, headerbar button.destructive-action.titlebutton:backdrop:disabled:active > .label,
           .titlebar button.destructive-action.titlebutton:backdrop:disabled:active > .label, button.destructive-action.flat:backdrop:disabled:checked > .label, button.destructive-action.sidebar-button:backdrop:disabled:checked > .label, headerbar button.destructive-action.titlebutton:backdrop:disabled:checked > .label,
           .titlebar button.destructive-action.titlebutton:backdrop:disabled:checked > .label {
             color: inherit; }
@@ -895,23 +880,20 @@ button, headerbar button.titlebutton,
       -gtk-icon-shadow: none;
       color: rgba(213, 16, 16, 0.8); }
     button.destructive-action:disabled {
-      color: #949796;
+      color: #939695;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #333636);
+      background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-      button.destructive-action:disabled > .label, headerbar button.destructive-action.titlebutton:disabled > .label,
-      .titlebar button.destructive-action.titlebutton:disabled > .label {
+      button.destructive-action:disabled > .label {
         color: inherit; }
       button.destructive-action:disabled:active, button.destructive-action:disabled:checked {
-        color: #dba0a0;
+        color: #da9f9f;
         border-color: #5e0707;
-        background-image: linear-gradient(to bottom, #9d1111, #a41212);
+        background-image: linear-gradient(to bottom, #9d1010, #a41111);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-        button.destructive-action:disabled:active > .label, headerbar button.destructive-action.titlebutton:disabled:active > .label,
-        .titlebar button.destructive-action.titlebutton:disabled:active > .label, button.destructive-action:disabled:checked > .label, headerbar button.destructive-action.titlebutton:disabled:checked > .label,
-        .titlebar button.destructive-action.titlebutton:disabled:checked > .label {
+        button.destructive-action:disabled:active > .label, button.destructive-action:disabled:checked > .label {
           color: inherit; }
     .osd button.destructive-action {
       color: #eeeeec;
@@ -941,9 +923,9 @@ button, headerbar button.titlebutton,
         -gtk-icon-shadow: none;
         outline-color: rgba(238, 238, 236, 0.3); }
       .osd button.destructive-action:disabled, .osd button.destructive-action:backdrop:disabled {
-        color: #878a89;
+        color: #878989;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -977,12 +959,10 @@ button, headerbar button.titlebutton,
       padding-right: 6px;
       padding-top: 3px;
       padding-bottom: 3px; }
-    .stack-switcher > button.text-button, headerbar .stack-switcher > button.text-button.titlebutton,
-    .titlebar .stack-switcher > button.text-button.titlebutton {
+    .stack-switcher > button.text-button {
       padding-left: 10px;
       padding-right: 10px; }
-    .stack-switcher > button.image-button, headerbar .stack-switcher > button.image-button.titlebutton,
-    .titlebar .stack-switcher > button.image-button.titlebutton {
+    .stack-switcher > button.image-button {
       padding-left: 2px;
       padding-right: 2px; }
     .stack-switcher > button.needs-attention:active > label, .stack-switcher > button.needs-attention:active > image, .stack-switcher > button.needs-attention:checked > label, .stack-switcher > button.needs-attention:checked > image {
@@ -1009,7 +989,7 @@ button, headerbar button.titlebutton,
   .stack-switcher > button.needs-attention > label:dir(rtl), .stack-switcher > button.needs-attention > image:dir(rtl), stacksidebar row.needs-attention > label:dir(rtl) {
     background-position: left 3px, left 2px; }
 
-.inline-toolbar toolbutton > button, .inline-toolbar headerbar toolbutton > button.titlebutton,
+.inline-toolbar toolbutton > button,
 .inline-toolbar .titlebar toolbutton > button.titlebutton,
 .titlebar .inline-toolbar toolbutton > button.titlebutton {
   color: #eeeeec;
@@ -1019,8 +999,7 @@ button, headerbar button.titlebutton,
   text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
   -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(238, 238, 236, 0); }
-  .inline-toolbar toolbutton > button:hover, .inline-toolbar headerbar toolbutton > button.titlebutton:hover,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:hover {
+  .inline-toolbar toolbutton > button:hover {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #1c1f1f;
@@ -1034,9 +1013,7 @@ button, headerbar button.titlebutton,
     text-shadow: 0 -1px rgba(0, 0, 0, 0.76376);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.76376);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(238, 238, 236, 0); }
-  .inline-toolbar toolbutton > button:active, .inline-toolbar headerbar toolbutton > button.titlebutton:active,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:active, .inline-toolbar toolbutton > button:checked, .inline-toolbar headerbar toolbutton > button.titlebutton:checked,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:checked {
+  .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #1c1f1f;
@@ -1044,56 +1021,47 @@ button, headerbar button.titlebutton,
     text-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
     box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 238, 236, 0); }
-  .inline-toolbar toolbutton > button:disabled, .inline-toolbar headerbar toolbutton > button.titlebutton:disabled,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:disabled {
-    color: #949796;
+  .inline-toolbar toolbutton > button:disabled {
+    color: #939695;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #333636);
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
     .inline-toolbar toolbutton > button:disabled > .label {
       color: inherit; }
-  .inline-toolbar toolbutton > button:disabled:active, .inline-toolbar headerbar toolbutton > button.titlebutton:disabled:active,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:disabled:active, .inline-toolbar toolbutton > button:disabled:checked, .inline-toolbar headerbar toolbutton > button.titlebutton:disabled:checked,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:disabled:checked {
-    color: #949796;
+  .inline-toolbar toolbutton > button:disabled:active, .inline-toolbar toolbutton > button:disabled:checked {
+    color: #939695;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #313434, #333636);
+    background-image: linear-gradient(to bottom, #2f3333, #323636);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
     .inline-toolbar toolbutton > button:disabled:active > .label, .inline-toolbar toolbutton > button:disabled:checked > .label {
       color: inherit; }
-  .inline-toolbar toolbutton > button:backdrop, .inline-toolbar headerbar toolbutton > button.titlebutton:backdrop,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop {
-    color: #949796;
-    border-color: #1f2222;
+  .inline-toolbar toolbutton > button:backdrop {
+    color: #939695;
+    border-color: #1e2222;
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-  .inline-toolbar toolbutton > button:backdrop:active, .inline-toolbar headerbar toolbutton > button.titlebutton:backdrop:active,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop:active, .inline-toolbar toolbutton > button:backdrop:checked, .inline-toolbar headerbar toolbutton > button.titlebutton:backdrop:checked,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop:checked {
-    color: #949796;
-    border-color: #1f2222;
-    background-image: linear-gradient(to bottom, #303535);
+  .inline-toolbar toolbutton > button:backdrop:active, .inline-toolbar toolbutton > button:backdrop:checked {
+    color: #939695;
+    border-color: #1e2222;
+    background-image: linear-gradient(to bottom, #2f3434);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-  .inline-toolbar toolbutton > button:backdrop:disabled, .inline-toolbar headerbar toolbutton > button.titlebutton:backdrop:disabled,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop:disabled {
+  .inline-toolbar toolbutton > button:backdrop:disabled {
     color: #5d6767;
-    border-color: #1f2222;
-    background-image: linear-gradient(to bottom, #333636);
+    border-color: #1e2222;
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
     .inline-toolbar toolbutton > button:backdrop:disabled > .label {
       color: inherit; }
-  .inline-toolbar toolbutton > button:backdrop:disabled:active, .inline-toolbar headerbar toolbutton > button.titlebutton:backdrop:disabled:active,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop:disabled:active, .inline-toolbar toolbutton > button:backdrop:disabled:checked, .inline-toolbar headerbar toolbutton > button.titlebutton:backdrop:disabled:checked,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop:disabled:checked {
+  .inline-toolbar toolbutton > button:backdrop:disabled:active, .inline-toolbar toolbutton > button:backdrop:disabled:checked {
     color: #5d6767;
-    border-color: #1f2222;
-    background-image: linear-gradient(to bottom, #272929);
+    border-color: #1e2222;
+    background-image: linear-gradient(to bottom, #262929);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
     .inline-toolbar toolbutton > button:backdrop:disabled:active > .label, .inline-toolbar toolbutton > button:backdrop:disabled:checked > .label {
       color: inherit; }
@@ -1119,8 +1087,7 @@ headerbar .inline-toolbar toolbutton:backdrop > button.titlebutton,
   border-radius: 0;
   border-right-style: none; }
 
-.linked:not(.vertical) > entry:first-child, .linked:not(.vertical) > spinbutton:first-child, .inline-toolbar button:first-child, .linked > button:first-child, headerbar .linked > button.titlebutton:first-child,
-.titlebar .linked > button.titlebutton:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, searchbar.inline-toolbar toolbutton:first-child > button.flat,
+.linked:not(.vertical) > entry:first-child, .linked:not(.vertical) > spinbutton:first-child, .inline-toolbar button:first-child, .linked > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, searchbar.inline-toolbar toolbutton:first-child > button.flat,
 .inline-toolbar.location-bar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, searchbar.inline-toolbar toolbutton:first-child > button.sidebar-button,
 .inline-toolbar.location-bar toolbutton:first-child > button.sidebar-button, .inline-toolbar headerbar toolbutton:first-child > button.titlebutton, headerbar .inline-toolbar toolbutton:first-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:first-child > button.titlebutton,
@@ -1139,8 +1106,7 @@ headerbar .inline-toolbar toolbutton:backdrop:first-child > button.titlebutton,
 .titlebar .inline-toolbar toolbutton:backdrop:first-child > button.titlebutton, .linked > combobox:first-child > button.combo {
   border-top-left-radius: 3px;
   border-bottom-left-radius: 3px; }
-.linked:not(.vertical) > entry:last-child, .linked:not(.vertical) > spinbutton:last-child, .inline-toolbar button:last-child, .linked > button:last-child, headerbar .linked > button.titlebutton:last-child,
-.titlebar .linked > button.titlebutton:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, searchbar.inline-toolbar toolbutton:last-child > button.flat,
+.linked:not(.vertical) > entry:last-child, .linked:not(.vertical) > spinbutton:last-child, .inline-toolbar button:last-child, .linked > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, searchbar.inline-toolbar toolbutton:last-child > button.flat,
 .inline-toolbar.location-bar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, searchbar.inline-toolbar toolbutton:last-child > button.sidebar-button,
 .inline-toolbar.location-bar toolbutton:last-child > button.sidebar-button, .inline-toolbar headerbar toolbutton:last-child > button.titlebutton, headerbar .inline-toolbar toolbutton:last-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:last-child > button.titlebutton,
@@ -1160,8 +1126,7 @@ headerbar .inline-toolbar toolbutton:backdrop:last-child > button.titlebutton,
   border-top-right-radius: 3px;
   border-bottom-right-radius: 3px;
   border-right-style: solid; }
-.linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > spinbutton:only-child, .inline-toolbar button:only-child, .linked > button:only-child, headerbar .linked > button.titlebutton:only-child,
-.titlebar .linked > button.titlebutton:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, searchbar.inline-toolbar toolbutton:only-child > button.flat,
+.linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > spinbutton:only-child, .inline-toolbar button:only-child, .linked > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, searchbar.inline-toolbar toolbutton:only-child > button.flat,
 .inline-toolbar.location-bar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, searchbar.inline-toolbar toolbutton:only-child > button.sidebar-button,
 .inline-toolbar.location-bar toolbutton:only-child > button.sidebar-button, .inline-toolbar headerbar toolbutton:only-child > button.titlebutton, headerbar .inline-toolbar toolbutton:only-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:only-child > button.titlebutton,
@@ -1181,22 +1146,18 @@ headerbar .inline-toolbar toolbutton:backdrop:only-child > button.titlebutton,
   border-radius: 3px;
   border-style: solid; }
 
-.linked.vertical > entry, .linked.vertical > spinbutton, .linked.vertical > button, headerbar .linked.vertical > button.titlebutton,
-.titlebar .linked.vertical > button.titlebutton, .linked.vertical > button:hover, .linked.vertical > button:active, .linked.vertical > button:checked, .linked.vertical > button:backdrop, .linked.vertical > combobox > button.combo {
+.linked.vertical > entry, .linked.vertical > spinbutton, .linked.vertical > button, .linked.vertical > button:hover, .linked.vertical > button:active, .linked.vertical > button:checked, .linked.vertical > button:backdrop, .linked.vertical > combobox > button.combo {
   border-style: solid solid none solid;
   border-radius: 0; }
 
-.linked.vertical > entry:first-child, .linked.vertical > spinbutton:first-child, .linked.vertical > button:first-child, headerbar .linked.vertical > button.titlebutton:first-child,
-.titlebar .linked.vertical > button.titlebutton:first-child, .linked.vertical > combobox:first-child > button.combo {
+.linked.vertical > entry:first-child, .linked.vertical > spinbutton:first-child, .linked.vertical > button:first-child, .linked.vertical > combobox:first-child > button.combo {
   border-top-left-radius: 3px;
   border-top-right-radius: 3px; }
-.linked.vertical > entry:last-child, .linked.vertical > spinbutton:last-child, .linked.vertical > button:last-child, headerbar .linked.vertical > button.titlebutton:last-child,
-.titlebar .linked.vertical > button.titlebutton:last-child, .linked.vertical > combobox:last-child > button.combo {
+.linked.vertical > entry:last-child, .linked.vertical > spinbutton:last-child, .linked.vertical > button:last-child, .linked.vertical > combobox:last-child > button.combo {
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border-style: solid; }
-.linked.vertical > entry:only-child, .linked.vertical > spinbutton:only-child, .linked.vertical > button:only-child, headerbar .linked.vertical > button.titlebutton:only-child,
-.titlebar .linked.vertical > button.titlebutton:only-child, .linked.vertical > combobox:only-child > button.combo {
+.linked.vertical > entry:only-child, .linked.vertical > spinbutton:only-child, .linked.vertical > button:only-child, .linked.vertical > combobox:only-child > button.combo {
   border-radius: 3px;
   border-style: solid; }
 
@@ -1232,7 +1193,7 @@ modelbutton.flat,
   outline-offset: -2px; }
   modelbutton.flat:hover,
   .menuitem.button.flat:hover {
-    background-color: #4b5150; }
+    background-color: #4b5050; }
   modelbutton.flat check:last-child,
   modelbutton.flat radio:last-child,
   .menuitem.button.flat check:last-child,
@@ -1285,13 +1246,13 @@ headerbar button.titlebutton:visited,
     color: #74aae2; }
     *:selected *:link:hover, *:selected button:hover:link,
     *:selected button:hover:visited {
-      color: #e9eff5; }
+      color: #e8eef5; }
   *:link:active, button:active:link,
   button:active:visited {
     color: #4a90d9; }
     *:selected *:link:active, *:selected button:active:link,
     *:selected button:active:visited {
-      color: #d3dfeb; }
+      color: #d2deeb; }
   *:link:backdrop, button:backdrop:link,
   button:backdrop:visited, *:link:backdrop:hover, button:backdrop:hover:link,
   button:backdrop:hover:visited, *:link:backdrop:hover:selected, button:backdrop:hover:selected:link,
@@ -1302,7 +1263,7 @@ headerbar button.titlebutton:visited,
   button:selected:visited, .selection-mode.titlebar:not(headerbar) .subtitle:link,
   headerbar.selection-mode .subtitle:link, *:selected *:link, *:selected button:link,
   *:selected button:visited {
-    color: #d3dfeb; }
+    color: #d2deeb; }
 
 button:link, headerbar button.titlebutton:link,
 .titlebar button.titlebutton:link,
@@ -1315,10 +1276,9 @@ headerbar button.titlebutton:visited,
   button:visited:active,
   button:visited:checked {
     text-shadow: none; }
-  button:link > label, headerbar button.titlebutton:link > label,
+  button:link > label,
   .titlebar button.titlebutton:link > label,
   button:visited > label,
-  headerbar button.titlebutton:visited > label,
   .titlebar button.titlebutton:visited > label {
     text-decoration-line: underline; }
 
@@ -1331,7 +1291,7 @@ spinbutton:not(.vertical) .titlebar button.titlebutton,
   background-image: none;
   border-style: none none none solid;
   border-color: rgba(28, 31, 31, 0.3);
-  color: #dadad9;
+  color: #dadad8;
   border-radius: 0;
   box-shadow: none; }
   spinbutton:not(.vertical) button:dir(rtl) {
@@ -1340,13 +1300,13 @@ spinbutton:not(.vertical) .titlebar button.titlebutton,
     color: #eeeeec;
     background-color: rgba(238, 238, 236, 0.05); }
   spinbutton:not(.vertical) button:disabled {
-    color: rgba(148, 151, 150, 0.3); }
+    color: rgba(147, 150, 149, 0.3); }
   spinbutton:not(.vertical) button:active {
     box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2);
     background-color: rgba(0, 0, 0, 0.1); }
   spinbutton:not(.vertical) button:backdrop {
-    color: #8a8c8b;
-    border-color: rgba(31, 34, 34, 0.3);
+    color: #888b8a;
+    border-color: rgba(30, 34, 34, 0.3);
     background-color: transparent; }
   spinbutton:not(.vertical) button:backdrop:disabled {
     background-image: none;
@@ -1399,7 +1359,7 @@ spinbutton:not(.vertical) .titlebar button.titlebutton,
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
     text-shadow: none;
     -gtk-icon-shadow: none;
-    color: #878a89;
+    color: #878989;
     border-color: rgba(0, 0, 0, 0.5);
     -gtk-icon-shadow: none;
     box-shadow: none; }
@@ -1447,31 +1407,29 @@ spinbutton.vertical {
         -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.76376);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); }
       spinbutton.vertical button:first-child:disabled {
-        color: #949796;
+        color: #939695;
         border-color: #1c1f1f;
-        background-image: linear-gradient(to bottom, #333636);
+        background-image: linear-gradient(to bottom, #323636);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        spinbutton.vertical button:first-child:disabled > .label, spinbutton.vertical headerbar button.titlebutton:first-child:disabled > .label,
-        spinbutton.vertical .titlebar button.titlebutton:first-child:disabled > .label {
+        spinbutton.vertical button:first-child:disabled > .label {
           color: inherit; }
       spinbutton.vertical button:first-child:backdrop {
-        color: #949796;
-        border-color: #1f2222;
+        color: #939695;
+        border-color: #1e2222;
         background-image: linear-gradient(to bottom, #393f3f);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
         spinbutton.vertical button:first-child:backdrop:disabled {
           color: #5d6767;
-          border-color: #1f2222;
-          background-image: linear-gradient(to bottom, #333636);
+          border-color: #1e2222;
+          background-image: linear-gradient(to bottom, #323636);
           text-shadow: none;
           -gtk-icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-          spinbutton.vertical button:first-child:backdrop:disabled > .label, spinbutton.vertical headerbar button.titlebutton:first-child:backdrop:disabled > .label,
-          spinbutton.vertical .titlebar button.titlebutton:first-child:backdrop:disabled > .label {
+          spinbutton.vertical button:first-child:backdrop:disabled > .label {
             color: inherit; }
   spinbutton.vertical button:first-child, spinbutton.vertical button:first-child:active, spinbutton.vertical button:first-child:hover, spinbutton.vertical button:first-child:disabled, spinbutton.vertical button:first-child:backdrop {
     border-radius: 3px 3px 0 0;
@@ -1507,9 +1465,9 @@ spinbutton.vertical {
     -gtk-icon-shadow: none;
     outline-color: rgba(238, 238, 236, 0.3); }
   .osd spinbutton.vertical button:first-child:disabled {
-    color: #878a89;
+    color: #878989;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+    background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -1537,16 +1495,16 @@ treeview spinbutton spinbutton:focus {
 combobox {
   text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
   -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176); }
-  combobox > button.combo, headerbar combobox > button.combo.titlebutton,
+  combobox > button.combo,
   .titlebar combobox > button.combo.titlebutton {
     padding-left: 8px;
     padding-right: 8px; }
   combobox:disabled {
-    color: #949796;
+    color: #939695;
     text-shadow: none;
     -gtk-icon-shadow: none; }
   combobox:backdrop {
-    color: #949796;
+    color: #939695;
     text-shadow: none;
     -gtk-icon-shadow: none; }
   combobox:backdrop:disabled {
@@ -1563,13 +1521,11 @@ combobox {
   combobox > entry.combo:dir(rtl), combobox > spinbutton.combo:dir(rtl) {
     border-top-left-radius: 0;
     border-bottom-left-radius: 0; }
-  combobox > button.combo:not(:only-child):dir(ltr), headerbar combobox > button.combo.titlebutton:not(:only-child):dir(ltr),
-  .titlebar combobox > button.combo.titlebutton:not(:only-child):dir(ltr) {
+  combobox > button.combo:not(:only-child):dir(ltr) {
     border-top-left-radius: 0;
     border-bottom-left-radius: 0;
     border-left-style: none; }
-  combobox > button.combo:not(:only-child):dir(rtl), headerbar combobox > button.combo.titlebutton:not(:only-child):dir(rtl),
-  .titlebar combobox > button.combo.titlebutton:not(:only-child):dir(rtl) {
+  combobox > button.combo:not(:only-child):dir(rtl) {
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
     border-right-style: none; }
@@ -1622,11 +1578,11 @@ searchbar,
   border-style: solid;
   border-color: #1c1f1f;
   background-color: #303535;
-  box-shadow: inset 0 2px 3px -1px #242828, 0 1px rgba(238, 238, 236, 0); }
+  box-shadow: inset 0 2px 3px -1px #242727, 0 1px rgba(238, 238, 236, 0); }
   .inline-toolbar:backdrop, searchbar:backdrop,
   .location-bar:backdrop {
-    border-color: #1f2222;
-    background-color: #303535;
+    border-color: #1e2222;
+    background-color: #2f3434;
     box-shadow: none; }
 
 /***************
@@ -1645,7 +1601,7 @@ headerbar {
   box-shadow: inset 0 1px rgba(238, 238, 236, 0.07); }
   .titlebar:backdrop:not(headerbar),
   headerbar:backdrop {
-    border-color: #1f2222;
+    border-color: #1e2222;
     background-color: #393f3f;
     background-image: none;
     box-shadow: inset 0 1px rgba(238, 238, 236, 0.07); }
@@ -1665,11 +1621,11 @@ headerbar {
     text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
     border-color: #0f2b48;
     background-image: linear-gradient(to bottom, #256ab1, #215d9c);
-    box-shadow: inset 0 -1px #1b4c7f, inset 0 1px rgba(40, 98, 159, 0.535); }
+    box-shadow: inset 0 -1px #1a4b7e, inset 0 1px rgba(40, 98, 158, 0.535); }
     .selection-mode.titlebar:backdrop:not(headerbar),
     headerbar.selection-mode:backdrop {
       background-image: linear-gradient(to bottom, #215d9c);
-      box-shadow: inset 0 1px rgba(44, 100, 160, 0.442); }
+      box-shadow: inset 0 1px rgba(43, 100, 160, 0.442); }
     .selection-mode.titlebar:not(headerbar) button,
     headerbar.selection-mode button,
     headerbar.selection-mode .titlebar button.titlebutton,
@@ -1680,7 +1636,7 @@ headerbar {
       background-image: linear-gradient(to bottom, #1f5894, #1d538b 60%, #1b4e83);
       text-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
       -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(40, 98, 159, 0); }
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(40, 98, 158, 0); }
       .selection-mode.titlebar:not(headerbar) button.flat, .selection-mode.titlebar:not(headerbar) button.sidebar-button,
       .selection-mode.titlebar:not(headerbar) button.titlebutton,
       headerbar.selection-mode button.flat,
@@ -1706,7 +1662,7 @@ headerbar {
         background-image: linear-gradient(to bottom, #2260a0, #1f5894 60%, #1d538b);
         text-shadow: 0 -1px rgba(0, 0, 0, 0.65553);
         -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.65553);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(40, 98, 159, 0); }
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(40, 98, 158, 0); }
       .selection-mode.titlebar:not(headerbar) button:active, .selection-mode.titlebar:not(headerbar) button:checked,
       headerbar.selection-mode button:active,
       headerbar.selection-mode button:checked {
@@ -1716,19 +1672,19 @@ headerbar {
         background-image: linear-gradient(to bottom, #194776, #1c5187);
         text-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
         -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
-        box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(40, 98, 159, 0); }
+        box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(40, 98, 158, 0); }
       .selection-mode.titlebar:not(headerbar) button:backdrop, .selection-mode.titlebar:not(headerbar) button.flat:backdrop, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop,
       .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop,
       headerbar.selection-mode button:backdrop,
       headerbar.selection-mode button.flat:backdrop,
       headerbar.selection-mode button.sidebar-button:backdrop,
       headerbar.selection-mode button.titlebutton:backdrop {
-        color: #d3dfeb;
+        color: #d2deeb;
         border-color: #0b1e33;
         background-image: linear-gradient(to bottom, #215d9c);
         text-shadow: none;
         -gtk-icon-shadow: none;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 159, 0);
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 158, 0);
         -gtk-icon-effect: none;
         border-color: #0f2b48; }
         .selection-mode.titlebar:not(headerbar) button:backdrop:active, .selection-mode.titlebar:not(headerbar) button:backdrop:checked, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:active, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:active,
@@ -1742,10 +1698,10 @@ headerbar {
         headerbar.selection-mode button.flat:backdrop:checked,
         headerbar.selection-mode button.sidebar-button:backdrop:checked,
         headerbar.selection-mode button.titlebutton:backdrop:checked {
-          color: #d1dae3;
+          color: #d0d9e2;
           border-color: #0b1e33;
           background-image: linear-gradient(to bottom, #184472);
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 159, 0);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 158, 0);
           border-color: #0f2b48; }
         .selection-mode.titlebar:not(headerbar) button:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled,
         .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled,
@@ -1753,21 +1709,19 @@ headerbar {
         headerbar.selection-mode button.flat:backdrop:disabled,
         headerbar.selection-mode button.sidebar-button:backdrop:disabled,
         headerbar.selection-mode button.titlebutton:backdrop:disabled {
-          color: #6f91b4;
+          color: #6f90b2;
           border-color: #0b1e33;
-          background-image: linear-gradient(to bottom, #22558b);
+          background-image: linear-gradient(to bottom, #22558a);
           text-shadow: none;
           -gtk-icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 159, 0);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 158, 0);
           border-color: #0f2b48; }
-          .selection-mode.titlebar:not(headerbar) button:backdrop:disabled > .label, .selection-mode.titlebar:not(headerbar) headerbar button.titlebutton:backdrop:disabled > .label, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled > .label, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled > .label, .selection-mode.titlebar:not(headerbar) headerbar button.titlebutton:backdrop:disabled > .label,
+          .selection-mode.titlebar:not(headerbar) button:backdrop:disabled > .label, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled > .label, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled > .label,
           .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled > .label,
           headerbar.selection-mode button:backdrop:disabled > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:disabled > .label,
           headerbar.selection-mode button.flat:backdrop:disabled > .label,
           headerbar.selection-mode button.sidebar-button:backdrop:disabled > .label,
-          headerbar.selection-mode button.titlebutton:backdrop:disabled > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:disabled > .label {
+          headerbar.selection-mode button.titlebutton:backdrop:disabled > .label {
             color: inherit; }
         .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:checked, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled:active,
         .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled:checked, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled:checked,
@@ -1780,26 +1734,22 @@ headerbar {
         headerbar.selection-mode button.flat:backdrop:disabled:checked,
         headerbar.selection-mode button.sidebar-button:backdrop:disabled:checked,
         headerbar.selection-mode button.titlebutton:backdrop:disabled:checked {
-          color: #6c88a7;
+          color: #6c88a5;
           border-color: #0b1e33;
-          background-image: linear-gradient(to bottom, #1d4877);
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 159, 0);
+          background-image: linear-gradient(to bottom, #1d4876);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 158, 0);
           border-color: #0f2b48; }
-          .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:active > .label, .selection-mode.titlebar:not(headerbar) headerbar button.titlebutton:backdrop:disabled:active > .label, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:checked > .label, .selection-mode.titlebar:not(headerbar) headerbar button.titlebutton:backdrop:disabled:checked > .label, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled:active > .label, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled:active > .label, .selection-mode.titlebar:not(headerbar) headerbar button.titlebutton:backdrop:disabled:active > .label,
-          .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled:active > .label, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled:checked > .label, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled:checked > .label, .selection-mode.titlebar:not(headerbar) headerbar button.titlebutton:backdrop: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.flat:backdrop:disabled:active > .label, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled:active > .label,
+          .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled:active > .label, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled:checked > .label, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled:checked > .label,
           .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled:checked > .label,
           headerbar.selection-mode button:backdrop:disabled:active > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:disabled:active > .label,
           headerbar.selection-mode button:backdrop:disabled:checked > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:disabled:checked > .label,
           headerbar.selection-mode button.flat:backdrop:disabled:active > .label,
           headerbar.selection-mode button.sidebar-button:backdrop:disabled:active > .label,
           headerbar.selection-mode button.titlebutton:backdrop:disabled:active > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:disabled:active > .label,
           headerbar.selection-mode button.flat:backdrop:disabled:checked > .label,
           headerbar.selection-mode button.sidebar-button:backdrop:disabled:checked > .label,
-          headerbar.selection-mode button.titlebutton:backdrop:disabled:checked > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:disabled:checked > .label {
+          headerbar.selection-mode button.titlebutton:backdrop:disabled:checked > .label {
             color: inherit; }
       .selection-mode.titlebar:not(headerbar) button.flat:backdrop, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop,
       .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop, .selection-mode.titlebar:not(headerbar) button.flat:disabled, .selection-mode.titlebar:not(headerbar) button.sidebar-button:disabled,
@@ -1822,28 +1772,25 @@ headerbar {
         -gtk-icon-shadow: none; }
       .selection-mode.titlebar:not(headerbar) button:disabled,
       headerbar.selection-mode button:disabled {
-        color: #91aac5;
+        color: #90aac4;
         border-color: #0b1e33;
-        background-image: linear-gradient(to bottom, #22558b);
+        background-image: linear-gradient(to bottom, #22558a);
         text-shadow: none;
         -gtk-icon-shadow: none;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 159, 0); }
-        .selection-mode.titlebar:not(headerbar) button:disabled > .label, .selection-mode.titlebar:not(headerbar) headerbar button.titlebutton:disabled > .label,
-        headerbar.selection-mode button:disabled > .label,
-        headerbar.selection-mode .titlebar button.titlebutton:disabled > .label {
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 158, 0); }
+        .selection-mode.titlebar:not(headerbar) button:disabled > .label,
+        headerbar.selection-mode button:disabled > .label {
           color: inherit; }
         .selection-mode.titlebar:not(headerbar) button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:checked,
         headerbar.selection-mode button:disabled:active,
         headerbar.selection-mode button:disabled:checked {
-          color: #a5b6c9;
+          color: #a4b5c8;
           border-color: #0b1e33;
-          background-image: linear-gradient(to bottom, #1b4470, #1d4877);
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 159, 0); }
-          .selection-mode.titlebar:not(headerbar) button:disabled:active > .label, .selection-mode.titlebar:not(headerbar) headerbar button.titlebutton:disabled:active > .label, .selection-mode.titlebar:not(headerbar) button:disabled:checked > .label, .selection-mode.titlebar:not(headerbar) headerbar button.titlebutton:disabled:checked > .label,
+          background-image: linear-gradient(to bottom, #1b436f, #1d4876);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 158, 0); }
+          .selection-mode.titlebar:not(headerbar) button:disabled:active > .label, .selection-mode.titlebar:not(headerbar) button:disabled:checked > .label,
           headerbar.selection-mode button:disabled:active > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:disabled:active > .label,
-          headerbar.selection-mode button:disabled:checked > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:disabled:checked > .label {
+          headerbar.selection-mode button:disabled:checked > .label {
             color: inherit; }
       .selection-mode.titlebar:not(headerbar) button.suggested-action,
       headerbar.selection-mode button.suggested-action {
@@ -1853,7 +1800,7 @@ headerbar {
         background-image: linear-gradient(to bottom, #343a3a, #2f3434 60%, #2a2f2f);
         text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
         -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(40, 98, 159, 0);
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(40, 98, 158, 0);
         border-color: #0f2b48; }
         .selection-mode.titlebar:not(headerbar) button.suggested-action:hover,
         headerbar.selection-mode button.suggested-action:hover {
@@ -1869,7 +1816,7 @@ headerbar {
           background-image: linear-gradient(to bottom, #3b4242, #343a3a 60%, #2f3434);
           text-shadow: 0 -1px rgba(0, 0, 0, 0.76376);
           -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.76376);
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(40, 98, 159, 0);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(40, 98, 158, 0);
           border-color: #0f2b48; }
         .selection-mode.titlebar:not(headerbar) button.suggested-action:active,
         headerbar.selection-mode button.suggested-action:active {
@@ -1879,42 +1826,40 @@ headerbar {
           background-image: linear-gradient(to bottom, #232727, #2d3232);
           text-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
           -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
-          box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(40, 98, 159, 0);
+          box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(40, 98, 158, 0);
           border-color: #0f2b48; }
         .selection-mode.titlebar:not(headerbar) button.suggested-action:disabled,
         headerbar.selection-mode button.suggested-action:disabled {
-          color: #949796;
+          color: #939695;
           border-color: #1c1f1f;
-          background-image: linear-gradient(to bottom, #333636);
+          background-image: linear-gradient(to bottom, #323636);
           text-shadow: none;
           -gtk-icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 159, 0);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 158, 0);
           border-color: #0f2b48; }
-          .selection-mode.titlebar:not(headerbar) button.suggested-action:disabled > .label, .selection-mode.titlebar:not(headerbar) headerbar button.suggested-action.titlebutton:disabled > .label,
-          headerbar.selection-mode button.suggested-action:disabled > .label,
-          headerbar.selection-mode .titlebar button.suggested-action.titlebutton:disabled > .label {
+          .selection-mode.titlebar:not(headerbar) button.suggested-action:disabled > .label,
+          headerbar.selection-mode button.suggested-action:disabled > .label {
             color: inherit; }
         .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop,
         headerbar.selection-mode button.suggested-action:backdrop {
-          color: #949796;
-          border-color: #1f2222;
+          color: #939695;
+          border-color: #1e2222;
           background-image: linear-gradient(to bottom, #393f3f);
           text-shadow: none;
           -gtk-icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 159, 0);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 158, 0);
           border-color: #0f2b48; }
         .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop:disabled,
         headerbar.selection-mode button.suggested-action:backdrop:disabled {
           color: #5d6767;
-          border-color: #1f2222;
-          background-image: linear-gradient(to bottom, #333636);
+          border-color: #1e2222;
+          background-image: linear-gradient(to bottom, #323636);
           text-shadow: none;
           -gtk-icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 159, 0);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 158, 0);
           border-color: #0f2b48; }
-          .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop:disabled > .label, .selection-mode.titlebar:not(headerbar) headerbar button.suggested-action.titlebutton:backdrop:disabled > .label,
-          headerbar.selection-mode button.suggested-action:backdrop:disabled > .label,
-          headerbar.selection-mode .titlebar button.suggested-action.titlebutton:backdrop:disabled > .label {
+          .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop:disabled > .label,
+          headerbar.selection-mode button.suggested-action:backdrop:disabled > .label {
             color: inherit; }
     .selection-mode.titlebar:not(headerbar) .selection-menu, .selection-mode.titlebar:not(headerbar) .selection-menu:backdrop,
     headerbar.selection-mode .selection-menu,
@@ -2017,19 +1962,19 @@ treeview.view {
   -GtkTreeView-tree-line-width: 1;
   -GtkTreeView-tree-line-pattern: '';
   -GtkTreeView-expander-size: 16;
-  border-left-color: #8c8c8b;
+  border-left-color: #8b8b8a;
   border-top-color: #393f3f; }
   treeview.view:selected {
     border-radius: 0; }
   treeview.view:selected, treeview.view:backdrop:selected {
-    border-left-color: #90aece;
+    border-left-color: #90aecd;
     border-top-color: rgba(238, 238, 236, 0.1); }
   treeview.view:disabled {
-    color: #949796; }
+    color: #939695; }
     treeview.view:disabled:selected {
-      color: #7a9ec4; }
+      color: #799dc3; }
       treeview.view:disabled:selected:backdrop {
-        color: #648eba; }
+        color: #638db9; }
     treeview.view:disabled:backdrop {
       color: #5d6767; }
   treeview.view.separator {
@@ -2037,15 +1982,15 @@ treeview.view {
     treeview.view.separator:backdrop {
       color: rgba(0, 0, 0, 0.1); }
   treeview.view:backdrop {
-    border-left-color: #676b6b;
+    border-left-color: #666a6a;
     border-top: #393f3f; }
   treeview.view.dnd {
     border-style: solid none;
     border-width: 1px;
-    border-color: #88a6c4; }
+    border-color: #87a5c4; }
   treeview.view.expander {
     -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
-    color: #b3b3b2; }
+    color: #b2b2b1; }
     treeview.view.expander:dir(rtl) {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
     treeview.view.expander:hover {
@@ -2059,7 +2004,7 @@ treeview.view {
     treeview.view.expander:checked {
       -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
     treeview.view.expander:backdrop {
-      color: #757776; }
+      color: #747675; }
   treeview.view.progressbar {
     border: 1px solid #0f2b48;
     border-radius: 4px;
@@ -2083,13 +2028,13 @@ treeview.view {
   treeview.view header button,
   treeview.view header .titlebar button.titlebutton,
   .titlebar treeview.view header button.titlebutton {
-    color: #8c8c8b;
+    color: #8b8b8a;
     background-color: #292929;
     font-weight: bold;
     text-shadow: none;
     box-shadow: none; }
     treeview.view header button:hover {
-      color: #bdbdbc;
+      color: #bcbcbb;
       box-shadow: none;
       transition: none; }
     treeview.view header button:active {
@@ -2118,7 +2063,7 @@ treeview.view header .titlebar button.titlebutton,
   treeview.view header button:backdrop {
     border-color: #393f3f;
     border-style: none solid solid none;
-    color: #676b6b;
+    color: #666a6a;
     background-image: none;
     background-color: #2c2c2c; }
     treeview.view header button:backdrop:disabled {
@@ -2145,7 +2090,7 @@ menubar,
       color: #4a90d9; }
     menubar > menuitem:disabled,
     .menubar > menuitem:disabled {
-      color: #949796;
+      color: #939695;
       box-shadow: none; }
 
 menu,
@@ -2159,7 +2104,7 @@ menu,
     border: none; }
   menu:backdrop,
   .menu:backdrop {
-    background-color: #2f3030; }
+    background-color: #2e2f2f; }
   menu menuitem,
   .menu menuitem {
     text-shadow: none;
@@ -2171,14 +2116,14 @@ menu,
       background-color: #215d9c; }
     menu menuitem:disabled,
     .menu menuitem:disabled {
-      color: #949796; }
+      color: #939695; }
       menu menuitem:disabled:backdrop,
       .menu menuitem:disabled:backdrop {
         color: #5d6767; }
     menu menuitem:backdrop, menu menuitem:backdrop:hover,
     .menu menuitem:backdrop,
     .menu menuitem:backdrop:hover {
-      color: #949796;
+      color: #939695;
       background-color: transparent; }
     menu menuitem arrow,
     .menu menuitem arrow {
@@ -2201,14 +2146,14 @@ menu,
     menu arrow.top,
     .menu arrow.top {
       -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
-      border-bottom: 1px solid #3d3d3d; }
+      border-bottom: 1px solid #3c3c3c; }
     menu arrow.bottom,
     .menu arrow.bottom {
       -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
-      border-top: 1px solid #3d3d3d; }
+      border-top: 1px solid #3c3c3c; }
     menu arrow:hover,
     .menu arrow:hover {
-      background-color: #3d3d3d; }
+      background-color: #3c3c3c; }
     menu arrow:disabled,
     .menu arrow:disabled {
       color: transparent;
@@ -2271,7 +2216,6 @@ notebook {
   -GtkNotebook-arrow-spacing: 5;
   -GtkNotebook-tab-curvature: 0;
   -GtkNotebook-tab-overlap: -8;
-  -GtkNotebook-has-tab-gap: false;
   padding: 0;
   background-color: #292929;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
@@ -2280,7 +2224,7 @@ notebook {
   notebook.frame {
     border: 1px solid #1c1f1f; }
     notebook.frame:backdrop {
-      border-color: #1f2222; }
+      border-color: #1e2222; }
   notebook header {
     background-color: #303535; }
     .frame notebook header {
@@ -2294,11 +2238,11 @@ notebook {
       .frame notebook header.left {
         border-right-width: 0; }
       .frame notebook header:backdrop {
-        border-color: #1f2222; }
+        border-color: #1e2222; }
     notebook header.top {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 -1px #1c1f1f; }
       notebook header.top:backdrop {
-        box-shadow: inset 0 -1px #1f2222; }
+        box-shadow: inset 0 -1px #1e2222; }
       notebook header.top tab {
         padding: 8px 20px;
         border-bottom-width: 3px; }
@@ -2310,7 +2254,7 @@ notebook {
     notebook header.bottom {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 1px #1c1f1f; }
       notebook header.bottom:backdrop {
-        box-shadow: inset 0 1px #1f2222; }
+        box-shadow: inset 0 1px #1e2222; }
       notebook header.bottom tab {
         padding: 8px 20px;
         border-top-width: 3px; }
@@ -2322,7 +2266,7 @@ notebook {
     notebook header.right {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 1px 0 #1c1f1f; }
       notebook header.right:backdrop {
-        box-shadow: inset 1px 0 #1f2222; }
+        box-shadow: inset 1px 0 #1e2222; }
       notebook header.right tab {
         padding: 5px 20px;
         border-left-width: 3px; }
@@ -2332,7 +2276,7 @@ notebook {
     notebook header.left {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset -1px 0 #1c1f1f; }
       notebook header.left:backdrop {
-        box-shadow: inset -1px 0 #1f2222; }
+        box-shadow: inset -1px 0 #1e2222; }
       notebook header.left tab {
         padding: 5px 20px;
         border-right-width: 3px; }
@@ -2340,7 +2284,7 @@ notebook {
           border-bottom-width: 1px;
           border-top-width: 1px; }
     notebook header:backdrop {
-      background-color: #303535;
+      background-color: #2f3434;
       box-shadow: none; }
     notebook header.top tabs arrow.up, notebook header.bottom tabs arrow.up {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
@@ -2351,15 +2295,15 @@ notebook {
     notebook header.left tabs arrow.down, notebook header.right tabs arrow.down {
       -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); }
     notebook header tabs arrow {
-      color: #949796; }
+      color: #939695; }
       notebook header tabs arrow:hover {
-        color: #c1c3c1; }
+        color: #c0c2c0; }
       notebook header tabs arrow:active {
         color: #eeeeec; }
       notebook header tabs arrow:disabled {
-        color: rgba(148, 151, 150, 0.3); }
+        color: rgba(147, 150, 149, 0.3); }
       notebook header tabs arrow:backdrop {
-        color: rgba(148, 151, 150, 0.4); }
+        color: rgba(147, 150, 149, 0.4); }
       notebook header tabs arrow:backdrop:disabled {
         color: #5d6767; }
   notebook tab {
@@ -2388,7 +2332,7 @@ notebook {
         .top notebook tab.reorderable-page:active:hover {
           background-color: rgba(57, 63, 63, 0.7); }
         .top notebook tab.reorderable-page:active:backdrop {
-          border-color: #1f2222;
+          border-color: #1e2222;
           background-color: #393f3f;
           border-bottom-color: #215d9c; }
       .top notebook tab.reorderable-page:backdrop {
@@ -2407,7 +2351,7 @@ notebook {
         .bottom notebook tab.reorderable-page:active:hover {
           background-color: rgba(57, 63, 63, 0.7); }
         .bottom notebook tab.reorderable-page:active:backdrop {
-          border-color: #1f2222;
+          border-color: #1e2222;
           background-color: #393f3f;
           border-top-color: #215d9c; }
       .bottom notebook tab.reorderable-page:backdrop {
@@ -2426,7 +2370,7 @@ notebook {
         .left notebook tab.reorderable-page:active:hover {
           background-color: rgba(57, 63, 63, 0.7); }
         .left notebook tab.reorderable-page:active:backdrop {
-          border-color: #1f2222;
+          border-color: #1e2222;
           background-color: #393f3f;
           border-right-color: #215d9c; }
       .left notebook tab.reorderable-page:backdrop {
@@ -2445,7 +2389,7 @@ notebook {
         .right notebook tab.reorderable-page:active:hover {
           background-color: rgba(57, 63, 63, 0.7); }
         .right notebook tab.reorderable-page:active:backdrop {
-          border-color: #1f2222;
+          border-color: #1e2222;
           background-color: #393f3f;
           border-left-color: #215d9c; }
       .right notebook tab.reorderable-page:backdrop {
@@ -2454,17 +2398,17 @@ notebook {
     notebook tab label {
       padding: 0 2px;
       font-weight: bold;
-      color: #949796; }
+      color: #939695; }
       notebook tab label:backdrop {
-        color: #797f7f; }
+        color: #787e7e; }
     notebook tab:hover label {
-      color: #c1c3c1; }
+      color: #c0c2c0; }
       notebook tab:hover label:backdrop {
-        color: #797f7f; }
+        color: #787e7e; }
     notebook tab:active label {
       color: #eeeeec; }
       notebook tab:active label:backdrop {
-        color: #949796; }
+        color: #939695; }
     notebook tab button.flat, notebook tab button.sidebar-button, notebook tab headerbar button.titlebutton, headerbar notebook tab button.titlebutton,
     notebook tab .titlebar button.titlebutton,
     .titlebar notebook tab button.titlebutton {
@@ -2507,7 +2451,7 @@ notebook {
       notebook tab button.flat:backdrop, notebook tab button.sidebar-button:backdrop, notebook tab headerbar button.titlebutton:backdrop, headerbar notebook tab button.titlebutton:backdrop,
       notebook tab .titlebar button.titlebutton:backdrop,
       .titlebar notebook tab button.titlebutton:backdrop {
-        color: rgba(148, 151, 150, 0.3);
+        color: rgba(147, 150, 149, 0.3);
         border-color: transparent; }
 
 /**************
@@ -2549,15 +2493,15 @@ scrollbar trough {
   border: 1px none #1c1f1f; }
   scrollbar trough:backdrop {
     background-color: #323737;
-    border-color: #1f2222; }
+    border-color: #1e2222; }
 scrollbar slider {
-  background-color: #a6a8a7; }
+  background-color: #a5a8a6; }
   scrollbar slider:hover {
-    background-color: #cacbc9; }
+    background-color: #c9cbc9; }
   scrollbar slider:hover:active {
     background-color: #2a76c6; }
   scrollbar slider:backdrop {
-    background-color: #5d6262; }
+    background-color: #5d6161; }
   scrollbar slider:disabled {
     background-color: transparent; }
 scrollbar slider {
@@ -2608,16 +2552,16 @@ switch {
     box-shadow: 0 1px rgba(238, 238, 236, 0);
     text-shadow: 0 1px rgba(15, 43, 72, 0.5), 0 0 2px rgba(255, 255, 255, 0.6); }
   switch:disabled {
-    color: #949796;
+    color: #939695;
     border-color: #1c1f1f;
     background-image: none;
-    background-color: #333636;
+    background-color: #323636;
     box-shadow: 0 1px rgba(238, 238, 236, 0);
     text-shadow: none; }
   switch:backdrop {
-    color: #949796;
-    border-color: #1f2222;
-    background-image: linear-gradient(to bottom, #303535);
+    color: #939695;
+    border-color: #1e2222;
+    background-image: linear-gradient(to bottom, #2f3434);
     box-shadow: none;
     text-shadow: none; }
     switch:backdrop:active {
@@ -2626,9 +2570,9 @@ switch {
       box-shadow: none; }
   switch:disabled {
     color: #5d6767;
-    border-color: #1f2222;
+    border-color: #1e2222;
     background-image: none;
-    background-color: #333636; }
+    background-color: #323636; }
   switch slider {
     margin: -1px;
     min-width: 45px;
@@ -2642,7 +2586,7 @@ switch {
     text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(238, 238, 236, 0);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px rgba(57, 63, 63, 0.6), inset 0 -1px #2b2f2f; }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px rgba(57, 63, 63, 0.6), inset 0 -1px #2a2f2f; }
   switch:hover slider {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
@@ -2657,21 +2601,21 @@ switch {
     text-shadow: 0 -1px rgba(0, 0, 0, 0.76376);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.76376);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(238, 238, 236, 0);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px rgba(57, 63, 63, 0.6), inset 0 -1px #2b2f2f; }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px rgba(57, 63, 63, 0.6), inset 0 -1px #2a2f2f; }
   switch:active slider {
     border: 1px solid #0f2b48; }
   switch:disabled slider {
-    color: #949796;
+    color: #939695;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #333636);
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     switch:disabled slider > .label {
       color: inherit; }
   switch:backdrop slider {
-    color: #949796;
-    border-color: #1f2222;
+    color: #939695;
+    border-color: #1e2222;
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     -gtk-icon-shadow: none;
@@ -2681,8 +2625,8 @@ switch {
     border-color: #0f2b48; }
   switch:backdrop:disabled slider {
     color: #5d6767;
-    border-color: #1f2222;
-    background-image: linear-gradient(to bottom, #333636);
+    border-color: #1e2222;
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
@@ -2838,7 +2782,7 @@ check:backdrop:checked:disabled {
     -gtk-icon-shadow: none; }
 
 menu menuitem check {
-  color: #b8bab8;
+  color: #b7b9b8;
   -gtk-icon-source: -gtk-icontheme("checkbox-symbolic");
   -gtk-icon-shadow: none; }
   menu menuitem check:hover, menu menuitem check:disabled {
@@ -2853,7 +2797,7 @@ menu menuitem check {
   menu menuitem check:hover {
     color: #ffffff; }
   menu menuitem check:disabled {
-    color: #676b6b; }
+    color: #666a6a; }
 
 radio {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png"));
@@ -3000,7 +2944,7 @@ radio:backdrop:checked:disabled {
     -gtk-icon-shadow: none; }
 
 menu menuitem radio {
-  color: #b8bab8;
+  color: #b7b9b8;
   -gtk-icon-source: -gtk-icontheme("radio-symbolic");
   -gtk-icon-shadow: none; }
   menu menuitem radio:hover, menu menuitem radio:disabled {
@@ -3015,7 +2959,7 @@ menu menuitem radio {
   menu menuitem radio:hover {
     color: #ffffff; }
   menu menuitem radio:disabled {
-    color: #676b6b; }
+    color: #666a6a; }
 
 .view.check, .view.radio,
 row .check, row .radio {
@@ -3069,7 +3013,7 @@ checkbutton.text-button, radiobutton.text-button {
   padding: 1px 2px 4px;
   outline-offset: 0; }
   checkbutton.text-button:disabled, checkbutton.text-button:disabled:active, checkbutton.text-button:disabled:indeterminate, radiobutton.text-button:disabled, radiobutton.text-button:disabled:active, radiobutton.text-button:disabled:indeterminate {
-    color: #949796; }
+    color: #939695; }
     checkbutton.text-button:disabled:backdrop, checkbutton.text-button:disabled:active:backdrop, checkbutton.text-button:disabled:indeterminate:backdrop, radiobutton.text-button:disabled:backdrop, radiobutton.text-button:disabled:active:backdrop, radiobutton.text-button:disabled:indeterminate:backdrop {
       color: #5d6767; }
 
@@ -3088,17 +3032,17 @@ checkbutton check {
 scale trough, scale fill, progressbar trough {
   border: 1px solid #1c1f1f;
   border-radius: 3px;
-  background-color: #2f3434;
+  background-color: #2e3333;
   box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1), 0 1px rgba(238, 238, 236, 0); }
   scale trough:disabled, scale fill:disabled, progressbar trough:disabled {
-    background-color: #333636;
+    background-color: #323636;
     box-shadow: 0 1px rgba(238, 238, 236, 0); }
   scale trough:backdrop, scale fill:backdrop, progressbar trough:backdrop, progressbar:backdrop trough {
-    background-color: #303535;
-    border-color: #1f2222;
+    background-color: #2f3434;
+    border-color: #1e2222;
     box-shadow: none; }
     scale trough:backdrop:disabled, scale fill:backdrop:disabled, progressbar trough:backdrop:disabled, progressbar:backdrop trough:disabled {
-      background-color: #333636; }
+      background-color: #323636; }
   row:selected scale trough, scale row:selected trough, row:selected scale fill, scale row:selected fill, row:selected progressbar trough, progressbar row:selected trough {
     box-shadow: none; }
     row:selected scale trough, scale row:selected trough, row:selected scale fill, scale row:selected fill, row:selected progressbar trough, progressbar row:selected trough, row:selected scale trough:disabled, scale row:selected trough:disabled, row:selected scale fill:disabled, scale row:selected fill:disabled, row:selected progressbar trough:disabled, progressbar row:selected trough:disabled {
@@ -3109,7 +3053,7 @@ scale trough, scale fill, progressbar trough {
     box-shadow: none;
     outline-color: rgba(238, 238, 236, 0.2); }
     .osd scale trough:disabled, scale .osd trough:disabled, .osd scale fill:disabled, scale .osd fill:disabled, .osd progressbar trough:disabled, progressbar .osd trough:disabled {
-      background-color: rgba(53, 57, 58, 0.5); }
+      background-color: rgba(52, 57, 57, 0.5); }
 
 scale highlight, progressbar progress {
   border: 1px solid #0f2b48;
@@ -3187,25 +3131,25 @@ scale {
     scale slider:active {
       border-color: #0f2b48; }
     scale slider:disabled {
-      color: #949796;
+      color: #939695;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #333636);
+      background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
       scale slider:disabled > .label {
         color: inherit; }
     scale slider:backdrop {
-      color: #949796;
-      border-color: #1f2222;
+      color: #939695;
+      border-color: #1e2222;
       background-image: linear-gradient(to bottom, #393f3f);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
       scale slider:backdrop:disabled {
         color: #5d6767;
-        border-color: #1f2222;
-        background-image: linear-gradient(to bottom, #333636);
+        border-color: #1e2222;
+        background-image: linear-gradient(to bottom, #323636);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
@@ -3243,9 +3187,9 @@ scale {
         -gtk-icon-shadow: none;
         outline-color: rgba(238, 238, 236, 0.3); }
       .osd scale slider:disabled {
-        color: #878a89;
+        color: #878989;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -3539,15 +3483,15 @@ levelbar {
     padding: 2px;
     border-radius: 3px;
     background-color: #292929;
-    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
     color: white;
     border-color: #1c1f1f;
     box-shadow: inset 0 0 0 1px rgba(33, 93, 156, 0), 0 1px rgba(238, 238, 236, 0); }
     levelbar trough:backdrop {
       background-color: #292929;
-      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
-      color: #d5d5d5;
-      border-color: #1f2222;
+      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+      color: #d4d4d4;
+      border-color: #1e2222;
       background-image: linear-gradient(to bottom, #2c2c2c);
       box-shadow: 0 1px rgba(238, 238, 236, 0); }
   levelbar.horizontal.discrete block {
@@ -3584,7 +3528,7 @@ levelbar {
     border-color: rgba(238, 238, 236, 0.1);
     box-shadow: none; }
     levelbar block.empty:backdrop {
-      border-color: rgba(148, 151, 150, 0.15); }
+      border-color: rgba(147, 150, 149, 0.15); }
 
 /**********
  * Frames *
@@ -3601,14 +3545,14 @@ frame border,
     border-style: none; }
   frame border:backdrop,
   .frame:backdrop {
-    border-color: #1f2222; }
+    border-color: #1e2222; }
 
 paper {
   border: 1px solid #1c1f1f;
   background: white;
   padding: 0; }
   paper:backdrop {
-    border-color: #1f2222; }
+    border-color: #1e2222; }
 
 actionbar box {
   padding: 6px;
@@ -3628,7 +3572,7 @@ scrolledwindow overshoot.top {
   box-shadow: none; }
   placessidebar overshoot.top:backdrop,
   scrolledwindow overshoot.top:backdrop {
-    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#1f2222), to(rgba(31, 34, 34, 0)));
+    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#1e2222), to(rgba(30, 34, 34, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center top;
@@ -3646,7 +3590,7 @@ scrolledwindow overshoot.bottom {
   box-shadow: none; }
   placessidebar overshoot.bottom:backdrop,
   scrolledwindow overshoot.bottom:backdrop {
-    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#1f2222), to(rgba(31, 34, 34, 0)));
+    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#1e2222), to(rgba(30, 34, 34, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center bottom;
@@ -3664,7 +3608,7 @@ scrolledwindow overshoot.left {
   box-shadow: none; }
   placessidebar overshoot.left:backdrop,
   scrolledwindow overshoot.left:backdrop {
-    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#1f2222), to(rgba(31, 34, 34, 0)));
+    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#1e2222), to(rgba(30, 34, 34, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: left center;
@@ -3682,7 +3626,7 @@ scrolledwindow overshoot.right {
   box-shadow: none; }
   placessidebar overshoot.right:backdrop,
   scrolledwindow overshoot.right:backdrop {
-    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#1f2222), to(rgba(31, 34, 34, 0)));
+    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#1e2222), to(rgba(30, 34, 34, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: right center;
@@ -3743,7 +3687,7 @@ scrolledwindow junction {
     border-image-slice: 0 1 0 0; }
   placessidebar junction:backdrop,
   scrolledwindow junction:backdrop {
-    border-image-source: linear-gradient(to bottom, #1f2222 1px, transparent 1px);
+    border-image-source: linear-gradient(to bottom, #1e2222 1px, transparent 1px);
     background-color: #323737; }
 
 separator {
@@ -3759,7 +3703,7 @@ list {
   border-color: #1c1f1f; }
   list:backdrop {
     background-color: #2c2c2c;
-    border-color: #1f2222; }
+    border-color: #1e2222; }
   list row {
     padding: 2px; }
 
@@ -3772,7 +3716,7 @@ row.activatable:backdrop:hover {
 row.activatable:selected:active {
   box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); }
 row.activatable:selected.has-open-popup, row.activatable:selected:hover {
-  background-color: #366ca4; }
+  background-color: #356ba4; }
 row.activatable:selected:backdrop {
   background-color: #215d9c; }
 
@@ -3821,8 +3765,8 @@ row:selected .titlebar button.titlebutton,
   row:selected button:backdrop, row:selected button.flat:backdrop, row:selected button.sidebar-button:backdrop, row:selected headerbar button.titlebutton:backdrop, headerbar row:selected button.titlebutton:backdrop,
   row:selected .titlebar button.titlebutton:backdrop,
   .titlebar row:selected button.titlebutton:backdrop {
-    color: #949796;
-    border-color: #1f2222;
+    color: #939695;
+    border-color: #1e2222;
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     -gtk-icon-shadow: none;
@@ -3832,21 +3776,20 @@ row:selected .titlebar button.titlebutton,
     .titlebar row:selected button.titlebutton:backdrop:active, row:selected button.flat:backdrop:checked, row:selected button.sidebar-button:backdrop:checked, row:selected headerbar button.titlebutton:backdrop:checked, headerbar row:selected button.titlebutton:backdrop:checked,
     row:selected .titlebar button.titlebutton:backdrop:checked,
     .titlebar row:selected button.titlebutton:backdrop:checked {
-      color: #949796;
-      border-color: #1f2222;
-      background-image: linear-gradient(to bottom, #303535);
+      color: #939695;
+      border-color: #1e2222;
+      background-image: linear-gradient(to bottom, #2f3434);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     row:selected button:backdrop:disabled, row:selected button.flat:backdrop:disabled, row:selected button.sidebar-button:backdrop:disabled, row:selected headerbar button.titlebutton:backdrop:disabled, headerbar row:selected button.titlebutton:backdrop:disabled,
     row:selected .titlebar button.titlebutton:backdrop:disabled,
     .titlebar row:selected button.titlebutton:backdrop:disabled {
       color: #5d6767;
-      border-color: #1f2222;
-      background-image: linear-gradient(to bottom, #333636);
+      border-color: #1e2222;
+      background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      row:selected button:backdrop:disabled > .label, row:selected headerbar button.titlebutton:backdrop:disabled > .label,
-      row:selected .titlebar button.titlebutton:backdrop:disabled > .label, row:selected button.flat:backdrop:disabled > .label, row:selected button.sidebar-button:backdrop:disabled > .label, row:selected headerbar button.titlebutton:backdrop:disabled > .label, headerbar row:selected button.titlebutton:backdrop:disabled > .label,
+      row:selected button:backdrop:disabled > .label, row:selected button.flat:backdrop:disabled > .label, row:selected button.sidebar-button:backdrop:disabled > .label, row:selected headerbar button.titlebutton:backdrop:disabled > .label, headerbar row:selected button.titlebutton:backdrop:disabled > .label,
       row:selected .titlebar button.titlebutton:backdrop:disabled > .label,
       .titlebar row:selected button.titlebutton:backdrop:disabled > .label {
         color: inherit; }
@@ -3856,12 +3799,10 @@ row:selected .titlebar button.titlebutton,
       row:selected .titlebar button.titlebutton:backdrop:disabled:checked,
       .titlebar row:selected button.titlebutton:backdrop:disabled:checked {
         color: #5d6767;
-        border-color: #1f2222;
-        background-image: linear-gradient(to bottom, #272929);
+        border-color: #1e2222;
+        background-image: linear-gradient(to bottom, #262929);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        row:selected button:backdrop:disabled:active > .label, row:selected headerbar button.titlebutton:backdrop:disabled:active > .label,
-        row:selected .titlebar button.titlebutton:backdrop:disabled:active > .label, row:selected button:backdrop:disabled:checked > .label, row:selected headerbar button.titlebutton:backdrop:disabled:checked > .label,
-        row:selected .titlebar button.titlebutton:backdrop:disabled:checked > .label, row:selected button.flat:backdrop:disabled:active > .label, row:selected button.sidebar-button:backdrop:disabled:active > .label, row:selected headerbar button.titlebutton:backdrop:disabled:active > .label, headerbar row:selected button.titlebutton:backdrop:disabled:active > .label,
+        row:selected button:backdrop:disabled:active > .label, row:selected button:backdrop:disabled:checked > .label, row:selected button.flat:backdrop:disabled:active > .label, row:selected button.sidebar-button:backdrop:disabled:active > .label, row:selected headerbar button.titlebutton:backdrop:disabled:active > .label, headerbar row:selected button.titlebutton:backdrop:disabled:active > .label,
         row:selected .titlebar button.titlebutton:backdrop:disabled:active > .label,
         .titlebar row:selected button.titlebutton:backdrop:disabled:active > .label, row:selected button.flat:backdrop:disabled:checked > .label, row:selected button.sidebar-button:backdrop:disabled:checked > .label, row:selected headerbar button.titlebutton:backdrop:disabled:checked > .label, headerbar row:selected button.titlebutton:backdrop:disabled:checked > .label,
         row:selected .titlebar button.titlebutton:backdrop:disabled:checked > .label,
@@ -3876,25 +3817,22 @@ row:selected .titlebar button.titlebutton,
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
     text-shadow: none;
     -gtk-icon-shadow: none;
-    color: #949796; }
+    color: #939695; }
   row:selected button:disabled {
-    color: #949796;
+    color: #939695;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #333636);
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    row:selected button:disabled > .label, row:selected headerbar button.titlebutton:disabled > .label,
-    row:selected .titlebar button.titlebutton:disabled > .label {
+    row:selected button:disabled > .label {
       color: inherit; }
     row:selected button:disabled:active, row:selected button:disabled:checked {
-      color: #949796;
+      color: #939695;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #313434, #333636);
+      background-image: linear-gradient(to bottom, #2f3333, #323636);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      row:selected button:disabled:active > .label, row:selected headerbar button.titlebutton:disabled:active > .label,
-      row:selected .titlebar button.titlebutton:disabled:active > .label, row:selected button:disabled:checked > .label, row:selected headerbar button.titlebutton:disabled:checked > .label,
-      row:selected .titlebar button.titlebutton:disabled:checked > .label {
+      row:selected button:disabled:active > .label, row:selected button:disabled:checked > .label {
         color: inherit; }
 
 row {
@@ -3951,17 +3889,17 @@ calendar {
     calendar.button:hover {
       color: #eeeeec; }
     calendar.button:backdrop {
-      color: rgba(148, 151, 150, 0.45); }
+      color: rgba(147, 150, 149, 0.45); }
     calendar.button:disabled {
-      color: rgba(148, 151, 150, 0.45); }
+      color: rgba(147, 150, 149, 0.45); }
   calendar:indeterminate, calendar:indeterminate:backdrop {
     color: alpha(currentColor,0.55); }
   calendar.highlight, calendar.highlight:backdrop {
     font-size: smaller;
     color: #eeeeec; }
   calendar:backdrop {
-    color: #d5d5d5;
-    border-color: #1f2222; }
+    color: #d4d4d4;
+    border-color: #1e2222; }
 
 /***********
  * Dialogs *
@@ -4010,31 +3948,29 @@ messagedialog.csd .dialog-action-area button {
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
     box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
   messagedialog.csd .dialog-action-area button:disabled {
-    color: #949796;
+    color: #939695;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #333636);
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    messagedialog.csd .dialog-action-area button:disabled > .label, messagedialog.csd .dialog-action-area headerbar button.titlebutton:disabled > .label,
-    messagedialog.csd .dialog-action-area .titlebar button.titlebutton:disabled > .label {
+    messagedialog.csd .dialog-action-area button:disabled > .label {
       color: inherit; }
   messagedialog.csd .dialog-action-area button:backdrop {
-    color: #949796;
-    border-color: #1f2222;
+    color: #939695;
+    border-color: #1e2222;
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   messagedialog.csd .dialog-action-area button:backdrop:disabled {
     color: #5d6767;
-    border-color: #1f2222;
-    background-image: linear-gradient(to bottom, #333636);
+    border-color: #1e2222;
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    messagedialog.csd .dialog-action-area button:backdrop:disabled > .label, messagedialog.csd .dialog-action-area headerbar button.titlebutton:backdrop:disabled > .label,
-    messagedialog.csd .dialog-action-area .titlebar button.titlebutton:backdrop:disabled > .label {
+    messagedialog.csd .dialog-action-area button:backdrop:disabled > .label {
       color: inherit; }
   messagedialog.csd .dialog-action-area button.suggested-action {
     color: white;
@@ -4067,7 +4003,7 @@ messagedialog.csd .dialog-action-area button {
       -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
       box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
     messagedialog.csd .dialog-action-area button.suggested-action:backdrop {
-      color: #d3dfeb;
+      color: #d2deeb;
       border-color: #0b1e33;
       background-image: linear-gradient(to bottom, #215d9c);
       text-shadow: none;
@@ -4075,23 +4011,21 @@ messagedialog.csd .dialog-action-area button {
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       messagedialog.csd .dialog-action-area button.suggested-action:backdrop:disabled {
         color: #5d6767;
-        border-color: #1f2222;
-        background-image: linear-gradient(to bottom, #333636);
+        border-color: #1e2222;
+        background-image: linear-gradient(to bottom, #323636);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        messagedialog.csd .dialog-action-area button.suggested-action:backdrop:disabled > .label, messagedialog.csd .dialog-action-area headerbar button.suggested-action.titlebutton:backdrop:disabled > .label,
-        messagedialog.csd .dialog-action-area .titlebar button.suggested-action.titlebutton:backdrop:disabled > .label {
+        messagedialog.csd .dialog-action-area button.suggested-action:backdrop:disabled > .label {
           color: inherit; }
     messagedialog.csd .dialog-action-area button.suggested-action:disabled {
-      color: #949796;
+      color: #939695;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #333636);
+      background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      messagedialog.csd .dialog-action-area button.suggested-action:disabled > .label, messagedialog.csd .dialog-action-area headerbar button.suggested-action.titlebutton:disabled > .label,
-      messagedialog.csd .dialog-action-area .titlebar button.suggested-action.titlebutton:disabled > .label {
+      messagedialog.csd .dialog-action-area button.suggested-action:disabled > .label {
         color: inherit; }
   messagedialog.csd .dialog-action-area button.destructive-action {
     color: white;
@@ -4124,7 +4058,7 @@ messagedialog.csd .dialog-action-area button {
       -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.72078);
       box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
     messagedialog.csd .dialog-action-area button.destructive-action:backdrop {
-      color: #f7cfcf;
+      color: #f6cfcf;
       border-color: #5e0707;
       background-image: linear-gradient(to bottom, #d51010);
       text-shadow: none;
@@ -4132,23 +4066,21 @@ messagedialog.csd .dialog-action-area button {
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       messagedialog.csd .dialog-action-area button.destructive-action:backdrop:disabled {
         color: #5d6767;
-        border-color: #1f2222;
-        background-image: linear-gradient(to bottom, #333636);
+        border-color: #1e2222;
+        background-image: linear-gradient(to bottom, #323636);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        messagedialog.csd .dialog-action-area button.destructive-action:backdrop:disabled > .label, messagedialog.csd .dialog-action-area headerbar button.destructive-action.titlebutton:backdrop:disabled > .label,
-        messagedialog.csd .dialog-action-area .titlebar button.destructive-action.titlebutton:backdrop:disabled > .label {
+        messagedialog.csd .dialog-action-area button.destructive-action:backdrop:disabled > .label {
           color: inherit; }
     messagedialog.csd .dialog-action-area button.destructive-action:disabled {
-      color: #949796;
+      color: #939695;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #333636);
+      background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      messagedialog.csd .dialog-action-area button.destructive-action:disabled > .label, messagedialog.csd .dialog-action-area headerbar button.destructive-action.titlebutton:disabled > .label,
-      messagedialog.csd .dialog-action-area .titlebar button.destructive-action.titlebutton:disabled > .label {
+      messagedialog.csd .dialog-action-area button.destructive-action:disabled > .label {
         color: inherit; }
 messagedialog.csd .dialog-action-area button, messagedialog.csd .dialog-action-area button:hover, messagedialog.csd .dialog-action-area button:active, messagedialog.csd .dialog-action-area button:disabled, messagedialog.csd .dialog-action-area button:backdrop, messagedialog.csd .dialog-action-area button:backdrop:disabled, messagedialog.csd .dialog-action-area button.suggested-action, messagedialog.csd .dialog-action-area button.suggested-action:hover, messagedialog.csd .dialog-action-area button.suggested-action:active, messagedialog.csd .dialog-action-area button.suggested-action:backdrop, messagedialog.csd .dialog-action-area button.suggested-action:backdrop:disabled, messagedialog.csd .dialog-action-area button.suggested-action:disabled, messagedialog.csd .dialog-action-area button.destructive-action, messagedialog.csd .dialog-action-area button.destructive-action:hover, messagedialog.csd .dialog-action-area button.destructive-action:active, messagedialog.csd .dialog-action-area button.destructive-action:backdrop, messagedialog.csd .dialog-action-area button.destructive-action:backdrop:disabled, messagedialog.csd .dialog-action-area button.destructive-action:disabled {
   border-left-style: solid;
@@ -4165,7 +4097,7 @@ messagedialog.csd .dialog-action-area button:first-child {
 GtkFileChooserDialog .dialog-action-box {
   border-top: 1px solid #1c1f1f; }
   GtkFileChooserDialog .dialog-action-box:backdrop {
-    border-top-color: #1f2222; }
+    border-top-color: #1e2222; }
 
 /***********
  * Sidebar *
@@ -4174,7 +4106,7 @@ GtkFileChooserDialog .dialog-action-box {
   border: none;
   background-color: #313434; }
   .sidebar:backdrop {
-    background-color: #333636; }
+    background-color: #323535; }
 
 stacksidebar row {
   padding: 10px 4px; }
@@ -4206,9 +4138,7 @@ placessidebar row {
     padding: 5px;
     border-radius: 100%;
     -gtk-outline-radius: 100%; }
-    button.sidebar-button:not(:hover):not(:active) > image, headerbar button.sidebar-button.titlebutton:not(:hover):not(:active) > image,
-    .titlebar button.sidebar-button.titlebutton:not(:hover):not(:active) > image, button.sidebar-button:backdrop > image, headerbar button.sidebar-button.titlebutton:backdrop > image,
-    .titlebar button.sidebar-button.titlebutton:backdrop > image {
+    button.sidebar-button:not(:hover):not(:active) > image, button.sidebar-button:backdrop > image {
       opacity: 0.7; }
 placessidebar row:selected:active {
   box-shadow: none; }
@@ -4240,7 +4170,7 @@ paned > separator {
   paned > separator:selected {
     background-image: linear-gradient(to top, #215d9c); }
   paned > separator:backdrop {
-    background-image: linear-gradient(to top, #1f2222); }
+    background-image: linear-gradient(to top, #1e2222); }
   paned > separator.wide {
     margin: 0;
     padding: 0;
@@ -4249,7 +4179,7 @@ paned > separator {
     background-image: linear-gradient(to top, #1c1f1f), linear-gradient(to top, #1c1f1f);
     background-size: 1px 1px, 1px 1px; }
     paned > separator.wide:backdrop {
-      background-image: linear-gradient(to top, #1f2222), linear-gradient(to top, #1f2222); }
+      background-image: linear-gradient(to top, #1e2222), linear-gradient(to top, #1e2222); }
 paned.horizontal > separator {
   background-repeat: repeat-y; }
   paned.horizontal > separator:dir(ltr) {
@@ -4346,29 +4276,22 @@ infobar {
     .question button:disabled,
     .warning button:disabled,
     .error button:disabled {
-      color: #91aac5;
+      color: #90aac4;
       border-color: #0b1e33;
-      background-image: linear-gradient(to bottom, #22558b);
+      background-image: linear-gradient(to bottom, #22558a);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .info button:disabled > .label, .info headerbar button.titlebutton:disabled > .label,
-      .info .titlebar button.titlebutton:disabled > .label,
+      .info button:disabled > .label,
       .question button:disabled > .label,
-      .question headerbar button.titlebutton:disabled > .label,
-      .question .titlebar button.titlebutton:disabled > .label,
       .warning button:disabled > .label,
-      .warning headerbar button.titlebutton:disabled > .label,
-      .warning .titlebar button.titlebutton:disabled > .label,
-      .error button:disabled > .label,
-      .error headerbar button.titlebutton:disabled > .label,
-      .error .titlebar button.titlebutton:disabled > .label {
+      .error button:disabled > .label {
         color: inherit; }
     .info button:backdrop,
     .question button:backdrop,
     .warning button:backdrop,
     .error button:backdrop {
-      color: #d3dfeb;
+      color: #d2deeb;
       border-color: #0b1e33;
       background-image: linear-gradient(to bottom, #215d9c);
       text-shadow: none;
@@ -4379,24 +4302,17 @@ infobar {
       .question button:backdrop:disabled,
       .warning button:backdrop:disabled,
       .error button:backdrop:disabled {
-        color: #6f91b4;
+        color: #6f90b2;
         border-color: #0b1e33;
-        background-image: linear-gradient(to bottom, #22558b);
+        background-image: linear-gradient(to bottom, #22558a);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         border-color: #0b1e33; }
-        .info button:backdrop:disabled > .label, .info headerbar button.titlebutton:backdrop:disabled > .label,
-        .info .titlebar button.titlebutton:backdrop:disabled > .label,
+        .info button:backdrop:disabled > .label,
         .question button:backdrop:disabled > .label,
-        .question headerbar button.titlebutton:backdrop:disabled > .label,
-        .question .titlebar button.titlebutton:backdrop:disabled > .label,
         .warning button:backdrop:disabled > .label,
-        .warning headerbar button.titlebutton:backdrop:disabled > .label,
-        .warning .titlebar button.titlebutton:backdrop:disabled > .label,
-        .error button:backdrop:disabled > .label,
-        .error headerbar button.titlebutton:backdrop:disabled > .label,
-        .error .titlebar button.titlebutton:backdrop:disabled > .label {
+        .error button:backdrop:disabled > .label {
           color: inherit; }
   .info label:selected, .info label:selected:focus, .info label:selected:hover,
   .question label:selected,
@@ -4470,7 +4386,7 @@ colorswatch.light overlay {
   colorswatch.light overlay:hover {
     border-color: #1c1f1f; }
   colorswatch.light overlay:backdrop {
-    color: #d5d5d5; }
+    color: #d4d4d4; }
 colorswatch overlay {
   box-shadow: inset 0 3px 2px -2px rgba(0, 0, 0, 0.5);
   border: 1px solid #1c1f1f; }
@@ -4506,8 +4422,8 @@ colorswatch#add-color-button {
       -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.76376);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(238, 238, 236, 0); }
     colorswatch#add-color-button overlay:backdrop {
-      color: #949796;
-      border-color: #1f2222;
+      color: #939695;
+      border-color: #1e2222;
       background-image: linear-gradient(to bottom, #393f3f);
       text-shadow: none;
       -gtk-icon-shadow: none;
@@ -4577,7 +4493,7 @@ decoration {
     border-radius: 0;
     margin: 4px;
     background-color: #393f3f;
-    border: solid 1px #1f2222;
+    border: solid 1px #1e2222;
     box-shadow: none; }
 
 headerbar button.titlebutton,
@@ -4614,7 +4530,7 @@ spinbutton selection:focus, modelbutton.flat:selected,
   .view selection:disabled, iconview:disabled:selected, flowbox flowboxchild:disabled:selected, label:disabled:selected,
   label selection:disabled, entry selection:disabled, spinbutton selection:disabled, modelbutton.flat:disabled:selected,
   .menuitem.button.flat:disabled:selected, treeview.view:disabled:selected, row:disabled:selected, calendar:disabled:selected, .sidebar :disabled:selected, placessidebar row:selected:disabled label {
-    color: #90aece; }
+    color: #90aecd; }
   textview text selection:backdrop,
   .view selection:backdrop, iconview:backdrop:selected, flowbox flowboxchild:backdrop:selected, label:backdrop:selected,
   label selection:backdrop, entry selection:backdrop, spinbutton selection:backdrop, modelbutton.flat:backdrop:selected,
@@ -4624,7 +4540,7 @@ spinbutton selection:focus, modelbutton.flat:selected,
     .view selection:backdrop:disabled, iconview:backdrop:disabled:selected, flowbox flowboxchild:backdrop:disabled:selected, label:backdrop:disabled:selected,
     label selection:backdrop:disabled, entry selection:backdrop:disabled, spinbutton selection:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected,
     .menuitem.button.flat:backdrop:disabled:selected, treeview.view:backdrop:disabled:selected, row:backdrop:disabled:selected, calendar:backdrop:disabled:selected, .sidebar :backdrop:disabled:selected, placessidebar row:selected:disabled label:backdrop, placessidebar row:selected:backdrop:disabled label {
-      color: #648eba; }
+      color: #638db9; }
 
 .monospace {
   font: Monospace; }
@@ -4688,7 +4604,7 @@ button.circular, headerbar button.circular.titlebutton,
   font-size: smaller; }
   .keycap:backdrop {
     background-color: #2c2c2c;
-    color: #949796; }
+    color: #939695; }
   .keycap border {
     border-style: none; }
 
@@ -4732,16 +4648,16 @@ text/foreground color of selections */
 @define-color theme_selected_fg_color #ffffff;
 /*
 base background color of insensitive widgets */
-@define-color insensitive_bg_color #333636;
+@define-color insensitive_bg_color #323636;
 /*
 text foreground color of insensitive widgets */
-@define-color insensitive_fg_color #949796;
+@define-color insensitive_fg_color #939695;
 /*
 insensitive text widgets and the like base background color */
 @define-color insensitive_base_color #292929;
 /*
 widget text/foreground color on backdrop windows */
-@define-color theme_unfocused_fg_color #949796;
+@define-color theme_unfocused_fg_color #939695;
 /*
 text color for entries, views and content in general on backdrop windows */
 @define-color theme_unfocused_text_color white;
@@ -4762,7 +4678,7 @@ widgets main borders color */
 @define-color borders #1c1f1f;
 /*
 widgets main borders color on backdrop windows */
-@define-color unfocused_borders #1f2222;
+@define-color unfocused_borders #1e2222;
 /*
 these are pretty self explicative */
 @define-color warning_color #f57900;
@@ -4772,7 +4688,7 @@ these are pretty self explicative */
 these colors are exported for the window manager and shouldn't be used in applications,
 read if you used those and something break with a version upgrade you're on your own... */
 @define-color wm_title shade(#eeeeec, 1.8);
-@define-color wm_unfocused_title #949796;
+@define-color wm_unfocused_title #939695;
 @define-color wm_highlight transparent;
 @define-color wm_borders_edge rgba(238, 238, 236, 0.07);
 @define-color wm_bg_a shade(#393f3f, 1.2);
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 61ea108262..a859f8274f 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -25,7 +25,7 @@
   .background:backdrop {
     text-shadow: none;
     -gtk-icon-shadow: none;
-    color: #8b8e8f;
+    color: #8b8e8e;
     background-color: #e8e8e7; }
 
 /*
@@ -47,8 +47,8 @@
     background-color: #cfcfcd;
     color: #2e3436; }
   .gtkstyle-fallback:disabled {
-    background-color: #f1f1f1;
-    color: #8b8e8f; }
+    background-color: #f1f1f0;
+    color: #8b8e8e; }
   .gtkstyle-fallback:selected {
     background-color: #4a90d9;
     color: #ffffff; }
@@ -59,14 +59,14 @@ textview text,
   background-color: #ffffff; }
   textview text:backdrop,
   .view:backdrop {
-    color: #333333;
+    color: #323232;
     background-color: white; }
 
 iconview {
   color: black;
   background-color: #ffffff; }
   iconview:backdrop {
-    color: #333333;
+    color: #323232;
     background-color: white; }
   iconview:selected, iconview:selected:focus {
     border-radius: 3px; }
@@ -88,9 +88,9 @@ flowbox flowboxchild {
 label.separator {
   color: #2e3436; }
   label.separator:backdrop {
-    color: #8b8e8f; }
+    color: #8b8e8e; }
 label:disabled {
-  color: #8b8e8f; }
+  color: #8b8e8e; }
   label:disabled:backdrop {
     color: #c3c3c0; }
 
@@ -108,18 +108,18 @@ assistant .sidebar {
     border-left: 1px solid #9d9d99; }
   assistant .sidebar:backdrop {
     background-color: white;
-    border-color: #a5a5a1; }
+    border-color: #a4a4a0; }
 assistant.csd .sidebar {
   border-top-style: none; }
 assistant .sidebar label {
   padding: 6px 12px; }
 assistant .sidebar label.highlight {
-  background-color: #c3c4c4; }
+  background-color: #c2c4c3; }
 
 textview {
-  background-color: #f4f4f3; }
+  background-color: #f3f3f3; }
   textview:backdrop {
-    background-color: #f4f4f3; }
+    background-color: #f3f3f3; }
 
 popover.background.touch-selection, popover.background.magnifier, .csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.osd, .csd popover.background.osd, .app-notification,
 .app-notification.frame, .osd .scale-popup, .osd {
@@ -161,7 +161,7 @@ entry, spinbutton {
   border-radius: 3px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   background-color: #ffffff;
-  background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
+  background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
   color: black;
   border-color: #9d9d99;
   box-shadow: inset 0 0 0 1px rgba(74, 144, 217, 0), 0 1px rgba(255, 255, 255, 0); }
@@ -174,7 +174,7 @@ entry, spinbutton {
   entry.flat, spinbutton.flat, entry.flat:focus, spinbutton.flat:focus {
     padding: 2px;
     background-color: #ffffff;
-    background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
+    background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
     color: black;
     border-color: #9d9d99;
     box-shadow: inset 0 0 0 1px rgba(74, 144, 217, 0);
@@ -182,29 +182,29 @@ entry, spinbutton {
     border-radius: 0; }
   entry:focus, spinbutton:focus {
     background-color: #ffffff;
-    background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
+    background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
     box-shadow: inset 0 0 0 1px #4a90d9, 0 1px rgba(255, 255, 255, 0);
     border-color: #4a90d9; }
   entry:disabled, spinbutton:disabled {
     background-color: #ffffff;
-    background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
-    color: #8b8e8f;
+    background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
+    color: #8b8e8e;
     border-color: #9d9d99;
-    background-image: linear-gradient(to bottom, #f1f1f1);
+    background-image: linear-gradient(to bottom, #f1f1f0);
     box-shadow: 0 1px rgba(255, 255, 255, 0); }
   entry:backdrop, spinbutton:backdrop {
     background-color: #ffffff;
-    background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
-    color: #333333;
-    border-color: #a5a5a1;
+    background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
+    color: #323232;
+    border-color: #a4a4a0;
     background-image: linear-gradient(to bottom, white);
     box-shadow: 0 1px rgba(255, 255, 255, 0); }
   entry:backdrop:disabled, spinbutton:backdrop:disabled {
     background-color: #ffffff;
-    background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
+    background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
     color: #c3c3c0;
-    border-color: #a5a5a1;
-    background-image: linear-gradient(to bottom, #f1f1f1);
+    border-color: #a4a4a0;
+    background-image: linear-gradient(to bottom, #f1f1f0);
     box-shadow: 0 1px rgba(255, 255, 255, 0); }
   entry progress, spinbutton progress {
     margin: 1px;
@@ -224,7 +224,7 @@ entry, spinbutton {
     border-color: #cc0000; }
     entry.error:focus, spinbutton.error:focus {
       background-color: #ffffff;
-      background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
+      background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
       box-shadow: inset 0 0 0 1px #cc0000, 0 1px rgba(255, 255, 255, 0);
       border-color: #cc0000; }
     entry.error:selected, spinbutton.error:selected, entry.error:selected:focus, spinbutton.error:selected:focus {
@@ -234,22 +234,22 @@ entry, spinbutton {
     border-color: #f57900; }
     entry.warning:focus, spinbutton.warning:focus {
       background-color: #ffffff;
-      background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
+      background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
       box-shadow: inset 0 0 0 1px #f57900, 0 1px rgba(255, 255, 255, 0);
       border-color: #f57900; }
     entry.warning:selected, spinbutton.warning:selected, entry.warning:selected:focus, spinbutton.warning:selected:focus {
       background-color: #f57900; }
   entry image, spinbutton image {
-    color: #585d5e; }
+    color: #575c5e; }
     entry image:hover, spinbutton image:hover {
       color: #2e3436; }
     entry image:active, spinbutton image:active {
       color: #4a90d9; }
     entry image:backdrop, spinbutton image:backdrop {
-      color: #a2a5a5; }
+      color: #a2a4a4; }
   .osd entry, .osd spinbutton {
     background-color: #ffffff;
-    background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
+    background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
@@ -259,7 +259,7 @@ entry, spinbutton {
     -gtk-icon-shadow: 0 1px black; }
     .osd entry:focus, .osd spinbutton:focus {
       background-color: #ffffff;
-      background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
+      background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
       color: white;
       border-color: #4a90d9;
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
@@ -269,7 +269,7 @@ entry, spinbutton {
       -gtk-icon-shadow: 0 1px black; }
     .osd entry:backdrop, .osd spinbutton:backdrop {
       background-color: #ffffff;
-      background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
+      background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
@@ -279,10 +279,10 @@ entry, spinbutton {
       -gtk-icon-shadow: none; }
     .osd entry:disabled, .osd spinbutton:disabled {
       background-color: #ffffff;
-      background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
-      color: #878a89;
+      background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -293,13 +293,13 @@ entry, spinbutton {
 .linked.vertical > entry:focus:not(:last-child), .linked.vertical > spinbutton:focus:not(:last-child) {
   box-shadow: inset 0 0 0 1px #4a90d9; }
 .linked.vertical > entry:not(:disabled) + entry:not(:disabled), .linked.vertical > spinbutton:not(:disabled) + entry:not(:disabled), .linked.vertical > entry:not(:disabled) + spinbutton:not(:disabled), .linked.vertical > spinbutton:not(:disabled) + spinbutton:not(:disabled) {
-  border-top-color: #e2e2e0;
+  border-top-color: #e1e1e0;
   background-image: linear-gradient(to bottom, #ffffff); }
   .linked.vertical > entry:not(:disabled) + entry:not(:disabled):backdrop, .linked.vertical > spinbutton:not(:disabled) + entry:not(:disabled):backdrop, .linked.vertical > entry:not(:disabled) + spinbutton:not(:disabled):backdrop, .linked.vertical > spinbutton:not(:disabled) + spinbutton:not(:disabled):backdrop {
-    border-top-color: #e4e4e3;
+    border-top-color: #e3e3e2;
     background-image: linear-gradient(to bottom, white); }
 .linked.vertical > entry:disabled + entry:disabled, .linked.vertical > spinbutton:disabled + entry:disabled, .linked.vertical > entry:disabled + spinbutton:disabled, .linked.vertical > spinbutton:disabled + spinbutton:disabled {
-  border-top-color: #e2e2e0; }
+  border-top-color: #e1e1e0; }
 .linked.vertical > entry + entry:focus:not(:last-child), .linked.vertical > spinbutton + entry:focus:not(:last-child), .linked.vertical > entry + spinbutton:focus:not(:last-child), .linked.vertical > spinbutton + spinbutton:focus:not(:last-child) {
   border-top-color: #4a90d9;
   box-shadow: inset 0 0 0 1px #4a90d9; }
@@ -381,8 +381,8 @@ button, headerbar button.titlebutton,
   button:backdrop, headerbar button.titlebutton:backdrop,
   .titlebar button.titlebutton:backdrop, button.flat:backdrop, button.sidebar-button:backdrop, headerbar button.titlebutton:backdrop,
   .titlebar button.titlebutton:backdrop {
-    color: #8b8e8f;
-    border-color: #a5a5a1;
+    color: #8b8e8e;
+    border-color: #a4a4a0;
     background-image: linear-gradient(to bottom, #e8e8e7);
     text-shadow: none;
     -gtk-icon-shadow: none;
@@ -391,32 +391,29 @@ button, headerbar button.titlebutton,
     button:backdrop:active, button:backdrop:checked, button.flat:backdrop:active, button.sidebar-button:backdrop:active, headerbar button.titlebutton:backdrop:active,
     .titlebar button.titlebutton:backdrop:active, button.flat:backdrop:checked, button.sidebar-button:backdrop:checked, headerbar button.titlebutton:backdrop:checked,
     .titlebar button.titlebutton:backdrop:checked {
-      color: #8b8e8f;
-      border-color: #a5a5a1;
-      background-image: linear-gradient(to bottom, #d1d1cf);
+      color: #8b8e8e;
+      border-color: #a4a4a0;
+      background-image: linear-gradient(to bottom, #d0d0ce);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
     button:backdrop:disabled, button.flat:backdrop:disabled, button.sidebar-button:backdrop:disabled, headerbar button.titlebutton:backdrop:disabled,
     .titlebar button.titlebutton:backdrop:disabled {
       color: #c3c3c0;
-      border-color: #a5a5a1;
-      background-image: linear-gradient(to bottom, #f1f1f1);
+      border-color: #a4a4a0;
+      background-image: linear-gradient(to bottom, #f1f1f0);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-      button:backdrop:disabled > .label, headerbar button.titlebutton:backdrop:disabled > .label,
-      .titlebar button.titlebutton:backdrop:disabled > .label, button.flat:backdrop:disabled > .label, button.sidebar-button:backdrop:disabled > .label, headerbar button.titlebutton:backdrop:disabled > .label,
+      button:backdrop:disabled > .label, button.flat:backdrop:disabled > .label, button.sidebar-button:backdrop:disabled > .label, headerbar button.titlebutton:backdrop:disabled > .label,
       .titlebar button.titlebutton:backdrop:disabled > .label {
         color: inherit; }
     button:backdrop:disabled:active, button:backdrop:disabled:checked, button.flat:backdrop:disabled:active, button.sidebar-button:backdrop:disabled:active, headerbar button.titlebutton:backdrop:disabled:active,
     .titlebar button.titlebutton:backdrop:disabled:active, button.flat:backdrop:disabled:checked, button.sidebar-button:backdrop:disabled:checked, headerbar button.titlebutton:backdrop:disabled:checked,
     .titlebar button.titlebutton:backdrop:disabled:checked {
       color: #c3c3c0;
-      border-color: #a5a5a1;
-      background-image: linear-gradient(to bottom, #e4e4e4);
+      border-color: #a4a4a0;
+      background-image: linear-gradient(to bottom, #e5e5e3);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-      button:backdrop:disabled:active > .label, headerbar button.titlebutton:backdrop:disabled:active > .label,
-      .titlebar button.titlebutton:backdrop:disabled:active > .label, button:backdrop:disabled:checked > .label, headerbar button.titlebutton:backdrop:disabled:checked > .label,
-      .titlebar button.titlebutton:backdrop:disabled:checked > .label, button.flat:backdrop:disabled:active > .label, button.sidebar-button:backdrop:disabled:active > .label, headerbar button.titlebutton:backdrop:disabled:active > .label,
+      button:backdrop:disabled:active > .label, button:backdrop:disabled:checked > .label, button.flat:backdrop:disabled:active > .label, button.sidebar-button:backdrop:disabled:active > .label, headerbar button.titlebutton:backdrop:disabled:active > .label,
       .titlebar button.titlebutton:backdrop:disabled:active > .label, button.flat:backdrop:disabled:checked > .label, button.sidebar-button:backdrop:disabled:checked > .label, headerbar button.titlebutton:backdrop:disabled:checked > .label,
       .titlebar button.titlebutton:backdrop:disabled:checked > .label {
         color: inherit; }
@@ -432,23 +429,20 @@ button, headerbar button.titlebutton,
     -gtk-icon-shadow: none; }
   button:disabled, headerbar button.titlebutton:disabled,
   .titlebar button.titlebutton:disabled {
-    color: #8b8e8f;
+    color: #8b8e8e;
     border-color: #9d9d99;
-    background-image: linear-gradient(to bottom, #f1f1f1);
+    background-image: linear-gradient(to bottom, #f1f1f0);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-    button:disabled > .label, headerbar button.titlebutton:disabled > .label,
-    .titlebar button.titlebutton:disabled > .label {
+    button:disabled > .label {
       color: inherit; }
     button:disabled:active, button:disabled:checked {
-      color: #8b8e8f;
+      color: #8b8e8e;
       border-color: #9d9d99;
-      background-image: linear-gradient(to bottom, #e9e9e8, #f1f1f1);
+      background-image: linear-gradient(to bottom, #e8e8e7, #f1f1f0);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-      button:disabled:active > .label, headerbar button.titlebutton:disabled:active > .label,
-      .titlebar button.titlebutton:disabled:active > .label, button:disabled:checked > .label, headerbar button.titlebutton:disabled:checked > .label,
-      .titlebar button.titlebutton:disabled:checked > .label {
+      button:disabled:active > .label, button:disabled:checked > .label {
         color: inherit; }
   button.osd, headerbar button.osd.titlebutton,
   .titlebar button.osd.titlebutton {
@@ -491,9 +485,9 @@ button, headerbar button.titlebutton,
       border: none;
       box-shadow: none; }
     button.osd:disabled, button.osd:backdrop:disabled {
-      color: #878a89;
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -541,9 +535,9 @@ button, headerbar button.titlebutton,
       -gtk-icon-shadow: none;
       outline-color: rgba(238, 238, 236, 0.3); }
     popover.background.touch-selection button:disabled, popover.background.magnifier button:disabled, .app-notification button:disabled, popover.background.touch-selection button:backdrop:disabled, popover.background.magnifier button:backdrop:disabled, .app-notification button:backdrop:disabled, .osd button:disabled, .osd button:backdrop:disabled {
-      color: #878a89;
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -600,9 +594,9 @@ button, headerbar button.titlebutton,
       .titlebar .app-notification button.titlebutton:disabled, .osd button.flat:disabled, .osd button.sidebar-button:disabled, .osd headerbar button.titlebutton:disabled, headerbar .osd button.titlebutton:disabled,
       .osd .titlebar button.titlebutton:disabled,
       .titlebar .osd button.titlebutton:disabled {
-        color: #878a89;
+        color: #878989;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -692,7 +686,7 @@ button, headerbar button.titlebutton,
       box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(255, 255, 255, 0); }
     button.suggested-action:backdrop, button.suggested-action.flat:backdrop, button.suggested-action.sidebar-button:backdrop, headerbar button.suggested-action.titlebutton:backdrop,
     .titlebar button.suggested-action.titlebutton:backdrop {
-      color: #dbe9f7;
+      color: #dae8f7;
       border-color: #4a90d9;
       background-image: linear-gradient(to bottom, #4a90d9);
       text-shadow: none;
@@ -701,32 +695,29 @@ button, headerbar button.titlebutton,
       button.suggested-action:backdrop:active, button.suggested-action:backdrop:checked, button.suggested-action.flat:backdrop:active, button.suggested-action.sidebar-button:backdrop:active, headerbar button.suggested-action.titlebutton:backdrop:active,
       .titlebar button.suggested-action.titlebutton:backdrop:active, button.suggested-action.flat:backdrop:checked, button.suggested-action.sidebar-button:backdrop:checked, headerbar button.suggested-action.titlebutton:backdrop:checked,
       .titlebar button.suggested-action.titlebutton:backdrop:checked {
-        color: #d4e4f4;
+        color: #d4e3f3;
         border-color: #2a76c6;
         background-image: linear-gradient(to bottom, #2a76c6);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
       button.suggested-action:backdrop:disabled, button.suggested-action.flat:backdrop:disabled, button.suggested-action.sidebar-button:backdrop:disabled, headerbar button.suggested-action.titlebutton:backdrop:disabled,
       .titlebar button.suggested-action.titlebutton:backdrop:disabled {
         color: #c3c3c0;
-        border-color: #a5a5a1;
-        background-image: linear-gradient(to bottom, #f1f1f1);
+        border-color: #a4a4a0;
+        background-image: linear-gradient(to bottom, #f1f1f0);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-        button.suggested-action:backdrop:disabled > .label, headerbar button.suggested-action.titlebutton:backdrop:disabled > .label,
-        .titlebar button.suggested-action.titlebutton:backdrop:disabled > .label, button.suggested-action.flat:backdrop:disabled > .label, button.suggested-action.sidebar-button:backdrop:disabled > .label, headerbar button.suggested-action.titlebutton:backdrop:disabled > .label,
+        button.suggested-action:backdrop:disabled > .label, button.suggested-action.flat:backdrop:disabled > .label, button.suggested-action.sidebar-button:backdrop:disabled > .label, headerbar button.suggested-action.titlebutton:backdrop:disabled > .label,
         .titlebar button.suggested-action.titlebutton:backdrop:disabled > .label {
           color: inherit; }
         button.suggested-action:backdrop:disabled:active, button.suggested-action:backdrop:disabled:checked, button.suggested-action.flat:backdrop:disabled:active, button.suggested-action.sidebar-button:backdrop:disabled:active, headerbar button.suggested-action.titlebutton:backdrop:disabled:active,
         .titlebar button.suggested-action.titlebutton:backdrop:disabled:active, button.suggested-action.flat:backdrop:disabled:checked, button.suggested-action.sidebar-button:backdrop:disabled:checked, headerbar button.suggested-action.titlebutton:backdrop:disabled:checked,
         .titlebar button.suggested-action.titlebutton:backdrop:disabled:checked {
-          color: #8db9e8;
-          border-color: #5094db;
-          background-image: linear-gradient(to bottom, #5094db);
+          color: #8db8e6;
+          border-color: #5093da;
+          background-image: linear-gradient(to bottom, #5093da);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-          button.suggested-action:backdrop:disabled:active > .label, headerbar button.suggested-action.titlebutton:backdrop:disabled:active > .label,
-          .titlebar button.suggested-action.titlebutton:backdrop:disabled:active > .label, button.suggested-action:backdrop:disabled:checked > .label, headerbar button.suggested-action.titlebutton:backdrop:disabled:checked > .label,
-          .titlebar button.suggested-action.titlebutton:backdrop:disabled:checked > .label, button.suggested-action.flat:backdrop:disabled:active > .label, button.suggested-action.sidebar-button:backdrop:disabled:active > .label, headerbar button.suggested-action.titlebutton:backdrop:disabled:active > .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.sidebar-button:backdrop:disabled:active > .label, headerbar button.suggested-action.titlebutton:backdrop:disabled:active > .label,
           .titlebar button.suggested-action.titlebutton:backdrop:disabled:active > .label, button.suggested-action.flat:backdrop:disabled:checked > .label, button.suggested-action.sidebar-button:backdrop:disabled:checked > .label, headerbar button.suggested-action.titlebutton:backdrop:disabled:checked > .label,
           .titlebar button.suggested-action.titlebutton:backdrop:disabled:checked > .label {
             color: inherit; }
@@ -742,23 +733,20 @@ button, headerbar button.titlebutton,
       -gtk-icon-shadow: none;
       color: rgba(74, 144, 217, 0.8); }
     button.suggested-action:disabled {
-      color: #8b8e8f;
+      color: #8b8e8e;
       border-color: #9d9d99;
-      background-image: linear-gradient(to bottom, #f1f1f1);
+      background-image: linear-gradient(to bottom, #f1f1f0);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-      button.suggested-action:disabled > .label, headerbar button.suggested-action.titlebutton:disabled > .label,
-      .titlebar button.suggested-action.titlebutton:disabled > .label {
+      button.suggested-action:disabled > .label {
         color: inherit; }
       button.suggested-action:disabled:active, button.suggested-action:disabled:checked {
-        color: #b9d4f1;
+        color: #b9d3f0;
         border-color: #1c5187;
-        background-image: linear-gradient(to bottom, #4b8dd3, #5094db);
+        background-image: linear-gradient(to bottom, #4a8cd1, #5093da);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-        button.suggested-action:disabled:active > .label, headerbar button.suggested-action.titlebutton:disabled:active > .label,
-        .titlebar button.suggested-action.titlebutton:disabled:active > .label, button.suggested-action:disabled:checked > .label, headerbar button.suggested-action.titlebutton:disabled:checked > .label,
-        .titlebar button.suggested-action.titlebutton:disabled:checked > .label {
+        button.suggested-action:disabled:active > .label, button.suggested-action:disabled:checked > .label {
           color: inherit; }
     .osd button.suggested-action {
       color: #eeeeec;
@@ -788,9 +776,9 @@ button, headerbar button.titlebutton,
         -gtk-icon-shadow: none;
         outline-color: rgba(238, 238, 236, 0.3); }
       .osd button.suggested-action:disabled, .osd button.suggested-action:backdrop:disabled {
-        color: #878a89;
+        color: #878989;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -845,7 +833,7 @@ button, headerbar button.titlebutton,
       box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(255, 255, 255, 0); }
     button.destructive-action:backdrop, button.destructive-action.flat:backdrop, button.destructive-action.sidebar-button:backdrop, headerbar button.destructive-action.titlebutton:backdrop,
     .titlebar button.destructive-action.titlebutton:backdrop {
-      color: #fcd4d4;
+      color: #fbd4d4;
       border-color: #ef2929;
       background-image: linear-gradient(to bottom, #ef2929);
       text-shadow: none;
@@ -854,32 +842,29 @@ button, headerbar button.titlebutton,
       button.destructive-action:backdrop:active, button.destructive-action:backdrop:checked, button.destructive-action.flat:backdrop:active, button.destructive-action.sidebar-button:backdrop:active, headerbar button.destructive-action.titlebutton:backdrop:active,
       .titlebar button.destructive-action.titlebutton:backdrop:active, button.destructive-action.flat:backdrop:checked, button.destructive-action.sidebar-button:backdrop:checked, headerbar button.destructive-action.titlebutton:backdrop:checked,
       .titlebar button.destructive-action.titlebutton:backdrop:checked {
-        color: #f7cfcf;
+        color: #f6cfcf;
         border-color: #d51010;
         background-image: linear-gradient(to bottom, #d51010);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
       button.destructive-action:backdrop:disabled, button.destructive-action.flat:backdrop:disabled, button.destructive-action.sidebar-button:backdrop:disabled, headerbar button.destructive-action.titlebutton:backdrop:disabled,
       .titlebar button.destructive-action.titlebutton:backdrop:disabled {
         color: #c3c3c0;
-        border-color: #a5a5a1;
-        background-image: linear-gradient(to bottom, #f1f1f1);
+        border-color: #a4a4a0;
+        background-image: linear-gradient(to bottom, #f1f1f0);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-        button.destructive-action:backdrop:disabled > .label, headerbar button.destructive-action.titlebutton:backdrop:disabled > .label,
-        .titlebar button.destructive-action.titlebutton:backdrop:disabled > .label, button.destructive-action.flat:backdrop:disabled > .label, button.destructive-action.sidebar-button:backdrop:disabled > .label, headerbar button.destructive-action.titlebutton:backdrop:disabled > .label,
+        button.destructive-action:backdrop:disabled > .label, button.destructive-action.flat:backdrop:disabled > .label, button.destructive-action.sidebar-button:backdrop:disabled > .label, headerbar button.destructive-action.titlebutton:backdrop:disabled > .label,
         .titlebar button.destructive-action.titlebutton:backdrop:disabled > .label {
           color: inherit; }
         button.destructive-action:backdrop:disabled:active, button.destructive-action:backdrop:disabled:checked, button.destructive-action.flat:backdrop:disabled:active, button.destructive-action.sidebar-button:backdrop:disabled:active, headerbar button.destructive-action.titlebutton:backdrop:disabled:active,
         .titlebar button.destructive-action.titlebutton:backdrop:disabled:active, button.destructive-action.flat:backdrop:disabled:checked, button.destructive-action.sidebar-button:backdrop:disabled:checked, headerbar button.destructive-action.titlebutton:backdrop:disabled:checked,
         .titlebar button.destructive-action.titlebutton:backdrop:disabled:checked {
-          color: #f57979;
+          color: #f47979;
           border-color: #ef3131;
           background-image: linear-gradient(to bottom, #ef3131);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-          button.destructive-action:backdrop:disabled:active > .label, headerbar button.destructive-action.titlebutton:backdrop:disabled:active > .label,
-          .titlebar button.destructive-action.titlebutton:backdrop:disabled:active > .label, button.destructive-action:backdrop:disabled:checked > .label, headerbar button.destructive-action.titlebutton:backdrop:disabled:checked > .label,
-          .titlebar button.destructive-action.titlebutton:backdrop:disabled:checked > .label, button.destructive-action.flat:backdrop:disabled:active > .label, button.destructive-action.sidebar-button:backdrop:disabled:active > .label, headerbar button.destructive-action.titlebutton:backdrop:disabled:active > .label,
+          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.sidebar-button:backdrop:disabled:active > .label, headerbar button.destructive-action.titlebutton:backdrop:disabled:active > .label,
           .titlebar button.destructive-action.titlebutton:backdrop:disabled:active > .label, button.destructive-action.flat:backdrop:disabled:checked > .label, button.destructive-action.sidebar-button:backdrop:disabled:checked > .label, headerbar button.destructive-action.titlebutton:backdrop:disabled:checked > .label,
           .titlebar button.destructive-action.titlebutton:backdrop:disabled:checked > .label {
             color: inherit; }
@@ -895,23 +880,20 @@ button, headerbar button.titlebutton,
       -gtk-icon-shadow: none;
       color: rgba(239, 41, 41, 0.8); }
     button.destructive-action:disabled {
-      color: #8b8e8f;
+      color: #8b8e8e;
       border-color: #9d9d99;
-      background-image: linear-gradient(to bottom, #f1f1f1);
+      background-image: linear-gradient(to bottom, #f1f1f0);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-      button.destructive-action:disabled > .label, headerbar button.destructive-action.titlebutton:disabled > .label,
-      .titlebar button.destructive-action.titlebutton:disabled > .label {
+      button.destructive-action:disabled > .label {
         color: inherit; }
       button.destructive-action:disabled:active, button.destructive-action:disabled:checked {
-        color: #f9adad;
+        color: #f8acac;
         border-color: #8e0b0b;
         background-image: linear-gradient(to bottom, #e52d2d, #ef3131);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-        button.destructive-action:disabled:active > .label, headerbar button.destructive-action.titlebutton:disabled:active > .label,
-        .titlebar button.destructive-action.titlebutton:disabled:active > .label, button.destructive-action:disabled:checked > .label, headerbar button.destructive-action.titlebutton:disabled:checked > .label,
-        .titlebar button.destructive-action.titlebutton:disabled:checked > .label {
+        button.destructive-action:disabled:active > .label, button.destructive-action:disabled:checked > .label {
           color: inherit; }
     .osd button.destructive-action {
       color: #eeeeec;
@@ -941,9 +923,9 @@ button, headerbar button.titlebutton,
         -gtk-icon-shadow: none;
         outline-color: rgba(238, 238, 236, 0.3); }
       .osd button.destructive-action:disabled, .osd button.destructive-action:backdrop:disabled {
-        color: #878a89;
+        color: #878989;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -977,12 +959,10 @@ button, headerbar button.titlebutton,
       padding-right: 6px;
       padding-top: 3px;
       padding-bottom: 3px; }
-    .stack-switcher > button.text-button, headerbar .stack-switcher > button.text-button.titlebutton,
-    .titlebar .stack-switcher > button.text-button.titlebutton {
+    .stack-switcher > button.text-button {
       padding-left: 10px;
       padding-right: 10px; }
-    .stack-switcher > button.image-button, headerbar .stack-switcher > button.image-button.titlebutton,
-    .titlebar .stack-switcher > button.image-button.titlebutton {
+    .stack-switcher > button.image-button {
       padding-left: 2px;
       padding-right: 2px; }
     .stack-switcher > button.needs-attention:active > label, .stack-switcher > button.needs-attention:active > image, .stack-switcher > button.needs-attention:checked > label, .stack-switcher > button.needs-attention:checked > image {
@@ -1009,7 +989,7 @@ button, headerbar button.titlebutton,
   .stack-switcher > button.needs-attention > label:dir(rtl), .stack-switcher > button.needs-attention > image:dir(rtl), stacksidebar row.needs-attention > label:dir(rtl) {
     background-position: left 3px, left 4px; }
 
-.inline-toolbar toolbutton > button, .inline-toolbar headerbar toolbutton > button.titlebutton,
+.inline-toolbar toolbutton > button,
 .inline-toolbar .titlebar toolbutton > button.titlebutton,
 .titlebar .inline-toolbar toolbutton > button.titlebutton {
   color: #2e3436;
@@ -1019,8 +999,7 @@ button, headerbar button.titlebutton,
   text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.8), 0 1px rgba(255, 255, 255, 0); }
-  .inline-toolbar toolbutton > button:hover, .inline-toolbar headerbar toolbutton > button.titlebutton:hover,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:hover {
+  .inline-toolbar toolbutton > button:hover {
     color: #2e3436;
     outline-color: rgba(46, 52, 54, 0.3);
     border-color: #9d9d99;
@@ -1034,9 +1013,7 @@ button, headerbar button.titlebutton,
     text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     box-shadow: inset 0 1px white, 0 1px rgba(255, 255, 255, 0); }
-  .inline-toolbar toolbutton > button:active, .inline-toolbar headerbar toolbutton > button.titlebutton:active,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:active, .inline-toolbar toolbutton > button:checked, .inline-toolbar headerbar toolbutton > button.titlebutton:checked,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:checked {
+  .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
     color: #2e3436;
     outline-color: rgba(46, 52, 54, 0.3);
     border-color: #9d9d99;
@@ -1044,56 +1021,47 @@ button, headerbar button.titlebutton,
     text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(255, 255, 255, 0); }
-  .inline-toolbar toolbutton > button:disabled, .inline-toolbar headerbar toolbutton > button.titlebutton:disabled,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:disabled {
-    color: #8b8e8f;
+  .inline-toolbar toolbutton > button:disabled {
+    color: #8b8e8e;
     border-color: #9d9d99;
-    background-image: linear-gradient(to bottom, #f1f1f1);
+    background-image: linear-gradient(to bottom, #f1f1f0);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
     .inline-toolbar toolbutton > button:disabled > .label {
       color: inherit; }
-  .inline-toolbar toolbutton > button:disabled:active, .inline-toolbar headerbar toolbutton > button.titlebutton:disabled:active,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:disabled:active, .inline-toolbar toolbutton > button:disabled:checked, .inline-toolbar headerbar toolbutton > button.titlebutton:disabled:checked,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:disabled:checked {
-    color: #8b8e8f;
+  .inline-toolbar toolbutton > button:disabled:active, .inline-toolbar toolbutton > button:disabled:checked {
+    color: #8b8e8e;
     border-color: #9d9d99;
-    background-image: linear-gradient(to bottom, #e9e9e8, #f1f1f1);
+    background-image: linear-gradient(to bottom, #e8e8e7, #f1f1f0);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
     .inline-toolbar toolbutton > button:disabled:active > .label, .inline-toolbar toolbutton > button:disabled:checked > .label {
       color: inherit; }
-  .inline-toolbar toolbutton > button:backdrop, .inline-toolbar headerbar toolbutton > button.titlebutton:backdrop,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop {
-    color: #8b8e8f;
-    border-color: #a5a5a1;
+  .inline-toolbar toolbutton > button:backdrop {
+    color: #8b8e8e;
+    border-color: #a4a4a0;
     background-image: linear-gradient(to bottom, #e8e8e7);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-  .inline-toolbar toolbutton > button:backdrop:active, .inline-toolbar headerbar toolbutton > button.titlebutton:backdrop:active,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop:active, .inline-toolbar toolbutton > button:backdrop:checked, .inline-toolbar headerbar toolbutton > button.titlebutton:backdrop:checked,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop:checked {
-    color: #8b8e8f;
-    border-color: #a5a5a1;
-    background-image: linear-gradient(to bottom, #d1d1cf);
+  .inline-toolbar toolbutton > button:backdrop:active, .inline-toolbar toolbutton > button:backdrop:checked {
+    color: #8b8e8e;
+    border-color: #a4a4a0;
+    background-image: linear-gradient(to bottom, #d0d0ce);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-  .inline-toolbar toolbutton > button:backdrop:disabled, .inline-toolbar headerbar toolbutton > button.titlebutton:backdrop:disabled,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop:disabled {
+  .inline-toolbar toolbutton > button:backdrop:disabled {
     color: #c3c3c0;
-    border-color: #a5a5a1;
-    background-image: linear-gradient(to bottom, #f1f1f1);
+    border-color: #a4a4a0;
+    background-image: linear-gradient(to bottom, #f1f1f0);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
     .inline-toolbar toolbutton > button:backdrop:disabled > .label {
       color: inherit; }
-  .inline-toolbar toolbutton > button:backdrop:disabled:active, .inline-toolbar headerbar toolbutton > button.titlebutton:backdrop:disabled:active,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop:disabled:active, .inline-toolbar toolbutton > button:backdrop:disabled:checked, .inline-toolbar headerbar toolbutton > button.titlebutton:backdrop:disabled:checked,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop:disabled:checked {
+  .inline-toolbar toolbutton > button:backdrop:disabled:active, .inline-toolbar toolbutton > button:backdrop:disabled:checked {
     color: #c3c3c0;
-    border-color: #a5a5a1;
-    background-image: linear-gradient(to bottom, #e4e4e4);
+    border-color: #a4a4a0;
+    background-image: linear-gradient(to bottom, #e5e5e3);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
     .inline-toolbar toolbutton > button:backdrop:disabled:active > .label, .inline-toolbar toolbutton > button:backdrop:disabled:checked > .label {
       color: inherit; }
@@ -1119,8 +1087,7 @@ headerbar .inline-toolbar toolbutton:backdrop > button.titlebutton,
   border-radius: 0;
   border-right-style: none; }
 
-.linked:not(.vertical) > entry:first-child, .linked:not(.vertical) > spinbutton:first-child, .inline-toolbar button:first-child, .linked > button:first-child, headerbar .linked > button.titlebutton:first-child,
-.titlebar .linked > button.titlebutton:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, searchbar.inline-toolbar toolbutton:first-child > button.flat,
+.linked:not(.vertical) > entry:first-child, .linked:not(.vertical) > spinbutton:first-child, .inline-toolbar button:first-child, .linked > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, searchbar.inline-toolbar toolbutton:first-child > button.flat,
 .inline-toolbar.location-bar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, searchbar.inline-toolbar toolbutton:first-child > button.sidebar-button,
 .inline-toolbar.location-bar toolbutton:first-child > button.sidebar-button, .inline-toolbar headerbar toolbutton:first-child > button.titlebutton, headerbar .inline-toolbar toolbutton:first-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:first-child > button.titlebutton,
@@ -1139,8 +1106,7 @@ headerbar .inline-toolbar toolbutton:backdrop:first-child > button.titlebutton,
 .titlebar .inline-toolbar toolbutton:backdrop:first-child > button.titlebutton, .linked > combobox:first-child > button.combo {
   border-top-left-radius: 3px;
   border-bottom-left-radius: 3px; }
-.linked:not(.vertical) > entry:last-child, .linked:not(.vertical) > spinbutton:last-child, .inline-toolbar button:last-child, .linked > button:last-child, headerbar .linked > button.titlebutton:last-child,
-.titlebar .linked > button.titlebutton:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, searchbar.inline-toolbar toolbutton:last-child > button.flat,
+.linked:not(.vertical) > entry:last-child, .linked:not(.vertical) > spinbutton:last-child, .inline-toolbar button:last-child, .linked > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, searchbar.inline-toolbar toolbutton:last-child > button.flat,
 .inline-toolbar.location-bar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, searchbar.inline-toolbar toolbutton:last-child > button.sidebar-button,
 .inline-toolbar.location-bar toolbutton:last-child > button.sidebar-button, .inline-toolbar headerbar toolbutton:last-child > button.titlebutton, headerbar .inline-toolbar toolbutton:last-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:last-child > button.titlebutton,
@@ -1160,8 +1126,7 @@ headerbar .inline-toolbar toolbutton:backdrop:last-child > button.titlebutton,
   border-top-right-radius: 3px;
   border-bottom-right-radius: 3px;
   border-right-style: solid; }
-.linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > spinbutton:only-child, .inline-toolbar button:only-child, .linked > button:only-child, headerbar .linked > button.titlebutton:only-child,
-.titlebar .linked > button.titlebutton:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, searchbar.inline-toolbar toolbutton:only-child > button.flat,
+.linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > spinbutton:only-child, .inline-toolbar button:only-child, .linked > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, searchbar.inline-toolbar toolbutton:only-child > button.flat,
 .inline-toolbar.location-bar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, searchbar.inline-toolbar toolbutton:only-child > button.sidebar-button,
 .inline-toolbar.location-bar toolbutton:only-child > button.sidebar-button, .inline-toolbar headerbar toolbutton:only-child > button.titlebutton, headerbar .inline-toolbar toolbutton:only-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:only-child > button.titlebutton,
@@ -1181,22 +1146,18 @@ headerbar .inline-toolbar toolbutton:backdrop:only-child > button.titlebutton,
   border-radius: 3px;
   border-style: solid; }
 
-.linked.vertical > entry, .linked.vertical > spinbutton, .linked.vertical > button, headerbar .linked.vertical > button.titlebutton,
-.titlebar .linked.vertical > button.titlebutton, .linked.vertical > button:hover, .linked.vertical > button:active, .linked.vertical > button:checked, .linked.vertical > button:backdrop, .linked.vertical > combobox > button.combo {
+.linked.vertical > entry, .linked.vertical > spinbutton, .linked.vertical > button, .linked.vertical > button:hover, .linked.vertical > button:active, .linked.vertical > button:checked, .linked.vertical > button:backdrop, .linked.vertical > combobox > button.combo {
   border-style: solid solid none solid;
   border-radius: 0; }
 
-.linked.vertical > entry:first-child, .linked.vertical > spinbutton:first-child, .linked.vertical > button:first-child, headerbar .linked.vertical > button.titlebutton:first-child,
-.titlebar .linked.vertical > button.titlebutton:first-child, .linked.vertical > combobox:first-child > button.combo {
+.linked.vertical > entry:first-child, .linked.vertical > spinbutton:first-child, .linked.vertical > button:first-child, .linked.vertical > combobox:first-child > button.combo {
   border-top-left-radius: 3px;
   border-top-right-radius: 3px; }
-.linked.vertical > entry:last-child, .linked.vertical > spinbutton:last-child, .linked.vertical > button:last-child, headerbar .linked.vertical > button.titlebutton:last-child,
-.titlebar .linked.vertical > button.titlebutton:last-child, .linked.vertical > combobox:last-child > button.combo {
+.linked.vertical > entry:last-child, .linked.vertical > spinbutton:last-child, .linked.vertical > button:last-child, .linked.vertical > combobox:last-child > button.combo {
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border-style: solid; }
-.linked.vertical > entry:only-child, .linked.vertical > spinbutton:only-child, .linked.vertical > button:only-child, headerbar .linked.vertical > button.titlebutton:only-child,
-.titlebar .linked.vertical > button.titlebutton:only-child, .linked.vertical > combobox:only-child > button.combo {
+.linked.vertical > entry:only-child, .linked.vertical > spinbutton:only-child, .linked.vertical > button:only-child, .linked.vertical > combobox:only-child > button.combo {
   border-radius: 3px;
   border-style: solid; }
 
@@ -1283,19 +1244,19 @@ headerbar button.titlebutton:visited,
     headerbar *:selected button.titlebutton:visited,
     *:selected .titlebar button.titlebutton:visited,
     .titlebar *:selected button.titlebutton:visited {
-      color: #b7d3f0; }
+      color: #b6d2ef; }
   *:link:hover, button:hover:link,
   button:hover:visited {
     color: #4a90d9; }
     *:selected *:link:hover, *:selected button:hover:link,
     *:selected button:hover:visited {
-      color: #edf4fb; }
+      color: #ecf3fb; }
   *:link:active, button:active:link,
   button:active:visited {
     color: #2a76c6; }
     *:selected *:link:active, *:selected button:active:link,
     *:selected button:active:visited {
-      color: #dbe9f7; }
+      color: #dae8f7; }
   *:link:backdrop, button:backdrop:link,
   button:backdrop:visited, *:link:backdrop:hover, button:backdrop:hover:link,
   button:backdrop:hover:visited, *:link:backdrop:hover:selected, button:backdrop:hover:selected:link,
@@ -1306,7 +1267,7 @@ headerbar button.titlebutton:visited,
   button:selected:visited, .selection-mode.titlebar:not(headerbar) .subtitle:link,
   headerbar.selection-mode .subtitle:link, *:selected *:link, *:selected button:link,
   *:selected button:visited {
-    color: #dbe9f7; }
+    color: #dae8f7; }
 
 button:link, headerbar button.titlebutton:link,
 .titlebar button.titlebutton:link,
@@ -1319,10 +1280,9 @@ headerbar button.titlebutton:visited,
   button:visited:active,
   button:visited:checked {
     text-shadow: none; }
-  button:link > label, headerbar button.titlebutton:link > label,
+  button:link > label,
   .titlebar button.titlebutton:link > label,
   button:visited > label,
-  headerbar button.titlebutton:visited > label,
   .titlebar button.titlebutton:visited > label {
     text-decoration-line: underline; }
 
@@ -1335,7 +1295,7 @@ spinbutton:not(.vertical) .titlebar button.titlebutton,
   background-image: none;
   border-style: none none none solid;
   border-color: rgba(157, 157, 153, 0.3);
-  color: #43484a;
+  color: #42484a;
   border-radius: 0;
   box-shadow: none; }
   spinbutton:not(.vertical) button:dir(rtl) {
@@ -1344,13 +1304,13 @@ spinbutton:not(.vertical) .titlebar button.titlebutton,
     color: #2e3436;
     background-color: rgba(46, 52, 54, 0.05); }
   spinbutton:not(.vertical) button:disabled {
-    color: rgba(139, 142, 143, 0.3); }
+    color: rgba(139, 142, 142, 0.3); }
   spinbutton:not(.vertical) button:active {
     box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2);
     background-color: rgba(0, 0, 0, 0.1); }
   spinbutton:not(.vertical) button:backdrop {
-    color: #97999a;
-    border-color: rgba(165, 165, 161, 0.3);
+    color: #969999;
+    border-color: rgba(164, 164, 160, 0.3);
     background-color: transparent; }
   spinbutton:not(.vertical) button:backdrop:disabled {
     background-image: none;
@@ -1403,7 +1363,7 @@ spinbutton:not(.vertical) .titlebar button.titlebutton,
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     -gtk-icon-shadow: none;
-    color: #878a89;
+    color: #878989;
     border-color: rgba(0, 0, 0, 0.5);
     -gtk-icon-shadow: none;
     box-shadow: none; }
@@ -1451,31 +1411,29 @@ spinbutton.vertical {
         -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
         box-shadow: inset 0 1px white; }
       spinbutton.vertical button:first-child:disabled {
-        color: #8b8e8f;
+        color: #8b8e8e;
         border-color: #9d9d99;
-        background-image: linear-gradient(to bottom, #f1f1f1);
+        background-image: linear-gradient(to bottom, #f1f1f0);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        spinbutton.vertical button:first-child:disabled > .label, spinbutton.vertical headerbar button.titlebutton:first-child:disabled > .label,
-        spinbutton.vertical .titlebar button.titlebutton:first-child:disabled > .label {
+        spinbutton.vertical button:first-child:disabled > .label {
           color: inherit; }
       spinbutton.vertical button:first-child:backdrop {
-        color: #8b8e8f;
-        border-color: #a5a5a1;
+        color: #8b8e8e;
+        border-color: #a4a4a0;
         background-image: linear-gradient(to bottom, #e8e8e7);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
         spinbutton.vertical button:first-child:backdrop:disabled {
           color: #c3c3c0;
-          border-color: #a5a5a1;
-          background-image: linear-gradient(to bottom, #f1f1f1);
+          border-color: #a4a4a0;
+          background-image: linear-gradient(to bottom, #f1f1f0);
           text-shadow: none;
           -gtk-icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-          spinbutton.vertical button:first-child:backdrop:disabled > .label, spinbutton.vertical headerbar button.titlebutton:first-child:backdrop:disabled > .label,
-          spinbutton.vertical .titlebar button.titlebutton:first-child:backdrop:disabled > .label {
+          spinbutton.vertical button:first-child:backdrop:disabled > .label {
             color: inherit; }
   spinbutton.vertical button:first-child, spinbutton.vertical button:first-child:active, spinbutton.vertical button:first-child:hover, spinbutton.vertical button:first-child:disabled, spinbutton.vertical button:first-child:backdrop {
     border-radius: 3px 3px 0 0;
@@ -1511,9 +1469,9 @@ spinbutton.vertical {
     -gtk-icon-shadow: none;
     outline-color: rgba(238, 238, 236, 0.3); }
   .osd spinbutton.vertical button:first-child:disabled {
-    color: #878a89;
+    color: #878989;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+    background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -1541,16 +1499,16 @@ treeview spinbutton spinbutton:focus {
 combobox {
   text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); }
-  combobox > button.combo, headerbar combobox > button.combo.titlebutton,
+  combobox > button.combo,
   .titlebar combobox > button.combo.titlebutton {
     padding-left: 8px;
     padding-right: 8px; }
   combobox:disabled {
-    color: #8b8e8f;
+    color: #8b8e8e;
     text-shadow: none;
     -gtk-icon-shadow: none; }
   combobox:backdrop {
-    color: #8b8e8f;
+    color: #8b8e8e;
     text-shadow: none;
     -gtk-icon-shadow: none; }
   combobox:backdrop:disabled {
@@ -1567,13 +1525,11 @@ combobox {
   combobox > entry.combo:dir(rtl), combobox > spinbutton.combo:dir(rtl) {
     border-top-left-radius: 0;
     border-bottom-left-radius: 0; }
-  combobox > button.combo:not(:only-child):dir(ltr), headerbar combobox > button.combo.titlebutton:not(:only-child):dir(ltr),
-  .titlebar combobox > button.combo.titlebutton:not(:only-child):dir(ltr) {
+  combobox > button.combo:not(:only-child):dir(ltr) {
     border-top-left-radius: 0;
     border-bottom-left-radius: 0;
     border-left-style: none; }
-  combobox > button.combo:not(:only-child):dir(rtl), headerbar combobox > button.combo.titlebutton:not(:only-child):dir(rtl),
-  .titlebar combobox > button.combo.titlebutton:not(:only-child):dir(rtl) {
+  combobox > button.combo:not(:only-child):dir(rtl) {
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
     border-right-style: none; }
@@ -1625,12 +1581,12 @@ searchbar,
 .location-bar {
   border-style: solid;
   border-color: #9d9d99;
-  background-color: #d2d2d0;
-  box-shadow: inset 0 2px 3px -1px #b2b2af, 0 1px rgba(255, 255, 255, 0); }
+  background-color: #d1d1cf;
+  box-shadow: inset 0 2px 3px -1px #b1b1ae, 0 1px rgba(255, 255, 255, 0); }
   .inline-toolbar:backdrop, searchbar:backdrop,
   .location-bar:backdrop {
-    border-color: #a5a5a1;
-    background-color: #d1d1cf;
+    border-color: #a4a4a0;
+    background-color: #d0d0ce;
     box-shadow: none; }
 
 /***************
@@ -1649,7 +1605,7 @@ headerbar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.8); }
   .titlebar:backdrop:not(headerbar),
   headerbar:backdrop {
-    border-color: #a5a5a1;
+    border-color: #a4a4a0;
     background-color: #e8e8e7;
     background-image: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.8); }
@@ -1669,11 +1625,11 @@ headerbar {
     text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
     border-color: #184472;
     background-image: linear-gradient(to bottom, #5f9ddd, #4a90d9);
-    box-shadow: inset 0 -1px #3975b5, inset 0 1px rgba(146, 188, 232, 0.9); }
+    box-shadow: inset 0 -1px #3875b4, inset 0 1px rgba(146, 188, 232, 0.9); }
     .selection-mode.titlebar:backdrop:not(headerbar),
     headerbar.selection-mode:backdrop {
       background-image: linear-gradient(to bottom, #4a90d9);
-      box-shadow: inset 0 1px rgba(165, 200, 236, 0.88); }
+      box-shadow: inset 0 1px rgba(164, 199, 236, 0.88); }
     .selection-mode.titlebar:not(headerbar) button,
     headerbar.selection-mode button,
     headerbar.selection-mode .titlebar button.titlebutton,
@@ -1727,7 +1683,7 @@ headerbar {
       headerbar.selection-mode button.flat:backdrop,
       headerbar.selection-mode button.sidebar-button:backdrop,
       headerbar.selection-mode button.titlebutton:backdrop {
-        color: #dbe9f7;
+        color: #dae8f7;
         border-color: #4a90d9;
         background-image: linear-gradient(to bottom, #4a90d9);
         text-shadow: none;
@@ -1746,7 +1702,7 @@ headerbar {
         headerbar.selection-mode button.flat:backdrop:checked,
         headerbar.selection-mode button.sidebar-button:backdrop:checked,
         headerbar.selection-mode button.titlebutton:backdrop:checked {
-          color: #d4e4f4;
+          color: #d4e3f3;
           border-color: #2a76c6;
           background-image: linear-gradient(to bottom, #2a76c6);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(146, 188, 232, 0);
@@ -1757,21 +1713,19 @@ headerbar {
         headerbar.selection-mode button.flat:backdrop:disabled,
         headerbar.selection-mode button.sidebar-button:backdrop:disabled,
         headerbar.selection-mode button.titlebutton:backdrop:disabled {
-          color: #9bc2ea;
-          border-color: #65a1df;
-          background-image: linear-gradient(to bottom, #65a1df);
+          color: #9ac1e9;
+          border-color: #65a0de;
+          background-image: linear-gradient(to bottom, #65a0de);
           text-shadow: none;
           -gtk-icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(146, 188, 232, 0);
           border-color: #184472; }
-          .selection-mode.titlebar:not(headerbar) button:backdrop:disabled > .label, .selection-mode.titlebar:not(headerbar) headerbar button.titlebutton:backdrop:disabled > .label, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled > .label, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled > .label, .selection-mode.titlebar:not(headerbar) headerbar button.titlebutton:backdrop:disabled > .label,
+          .selection-mode.titlebar:not(headerbar) button:backdrop:disabled > .label, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled > .label, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled > .label,
           .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled > .label,
           headerbar.selection-mode button:backdrop:disabled > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:disabled > .label,
           headerbar.selection-mode button.flat:backdrop:disabled > .label,
           headerbar.selection-mode button.sidebar-button:backdrop:disabled > .label,
-          headerbar.selection-mode button.titlebutton:backdrop:disabled > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:disabled > .label {
+          headerbar.selection-mode button.titlebutton:backdrop:disabled > .label {
             color: inherit; }
         .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:checked, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled:active,
         .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled:checked, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled:checked,
@@ -1784,26 +1738,22 @@ headerbar {
         headerbar.selection-mode button.flat:backdrop:disabled:checked,
         headerbar.selection-mode button.sidebar-button:backdrop:disabled:checked,
         headerbar.selection-mode button.titlebutton:backdrop:disabled:checked {
-          color: #8db9e8;
-          border-color: #5094db;
-          background-image: linear-gradient(to bottom, #5094db);
+          color: #8db8e6;
+          border-color: #5093da;
+          background-image: linear-gradient(to bottom, #5093da);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(146, 188, 232, 0);
           border-color: #184472; }
-          .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:active > .label, .selection-mode.titlebar:not(headerbar) headerbar button.titlebutton:backdrop:disabled:active > .label, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:checked > .label, .selection-mode.titlebar:not(headerbar) headerbar button.titlebutton:backdrop:disabled:checked > .label, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled:active > .label, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled:active > .label, .selection-mode.titlebar:not(headerbar) headerbar button.titlebutton:backdrop:disabled:active > .label,
-          .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled:active > .label, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled:checked > .label, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled:checked > .label, .selection-mode.titlebar:not(headerbar) headerbar button.titlebutton:backdrop: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.flat:backdrop:disabled:active > .label, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled:active > .label,
+          .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled:active > .label, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled:checked > .label, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled:checked > .label,
           .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled:checked > .label,
           headerbar.selection-mode button:backdrop:disabled:active > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:disabled:active > .label,
           headerbar.selection-mode button:backdrop:disabled:checked > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:disabled:checked > .label,
           headerbar.selection-mode button.flat:backdrop:disabled:active > .label,
           headerbar.selection-mode button.sidebar-button:backdrop:disabled:active > .label,
           headerbar.selection-mode button.titlebutton:backdrop:disabled:active > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:disabled:active > .label,
           headerbar.selection-mode button.flat:backdrop:disabled:checked > .label,
           headerbar.selection-mode button.sidebar-button:backdrop:disabled:checked > .label,
-          headerbar.selection-mode button.titlebutton:backdrop:disabled:checked > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:disabled:checked > .label {
+          headerbar.selection-mode button.titlebutton:backdrop:disabled:checked > .label {
             color: inherit; }
       .selection-mode.titlebar:not(headerbar) button.flat:backdrop, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop,
       .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop, .selection-mode.titlebar:not(headerbar) button.flat:disabled, .selection-mode.titlebar:not(headerbar) button.sidebar-button:disabled,
@@ -1826,28 +1776,25 @@ headerbar {
         -gtk-icon-shadow: none; }
       .selection-mode.titlebar:not(headerbar) button:disabled,
       headerbar.selection-mode button:disabled {
-        color: #b2d0ef;
+        color: #b2cfee;
         border-color: #1c5187;
-        background-image: linear-gradient(to bottom, #65a1df);
+        background-image: linear-gradient(to bottom, #65a0de);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(146, 188, 232, 0); }
-        .selection-mode.titlebar:not(headerbar) button:disabled > .label, .selection-mode.titlebar:not(headerbar) headerbar button.titlebutton:disabled > .label,
-        headerbar.selection-mode button:disabled > .label,
-        headerbar.selection-mode .titlebar button.titlebutton:disabled > .label {
+        .selection-mode.titlebar:not(headerbar) button:disabled > .label,
+        headerbar.selection-mode button:disabled > .label {
           color: inherit; }
         .selection-mode.titlebar:not(headerbar) button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:checked,
         headerbar.selection-mode button:disabled:active,
         headerbar.selection-mode button:disabled:checked {
-          color: #b9d4f1;
+          color: #b9d3f0;
           border-color: #1c5187;
-          background-image: linear-gradient(to bottom, #4b8dd3, #5094db);
+          background-image: linear-gradient(to bottom, #4a8cd1, #5093da);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(146, 188, 232, 0); }
-          .selection-mode.titlebar:not(headerbar) button:disabled:active > .label, .selection-mode.titlebar:not(headerbar) headerbar button.titlebutton:disabled:active > .label, .selection-mode.titlebar:not(headerbar) button:disabled:checked > .label, .selection-mode.titlebar:not(headerbar) headerbar button.titlebutton:disabled:checked > .label,
+          .selection-mode.titlebar:not(headerbar) button:disabled:active > .label, .selection-mode.titlebar:not(headerbar) button:disabled:checked > .label,
           headerbar.selection-mode button:disabled:active > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:disabled:active > .label,
-          headerbar.selection-mode button:disabled:checked > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:disabled:checked > .label {
+          headerbar.selection-mode button:disabled:checked > .label {
             color: inherit; }
       .selection-mode.titlebar:not(headerbar) button.suggested-action,
       headerbar.selection-mode button.suggested-action {
@@ -1887,21 +1834,20 @@ headerbar {
           border-color: #184472; }
         .selection-mode.titlebar:not(headerbar) button.suggested-action:disabled,
         headerbar.selection-mode button.suggested-action:disabled {
-          color: #8b8e8f;
+          color: #8b8e8e;
           border-color: #9d9d99;
-          background-image: linear-gradient(to bottom, #f1f1f1);
+          background-image: linear-gradient(to bottom, #f1f1f0);
           text-shadow: none;
           -gtk-icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(146, 188, 232, 0);
           border-color: #184472; }
-          .selection-mode.titlebar:not(headerbar) button.suggested-action:disabled > .label, .selection-mode.titlebar:not(headerbar) headerbar button.suggested-action.titlebutton:disabled > .label,
-          headerbar.selection-mode button.suggested-action:disabled > .label,
-          headerbar.selection-mode .titlebar button.suggested-action.titlebutton:disabled > .label {
+          .selection-mode.titlebar:not(headerbar) button.suggested-action:disabled > .label,
+          headerbar.selection-mode button.suggested-action:disabled > .label {
             color: inherit; }
         .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop,
         headerbar.selection-mode button.suggested-action:backdrop {
-          color: #8b8e8f;
-          border-color: #a5a5a1;
+          color: #8b8e8e;
+          border-color: #a4a4a0;
           background-image: linear-gradient(to bottom, #e8e8e7);
           text-shadow: none;
           -gtk-icon-shadow: none;
@@ -1910,15 +1856,14 @@ headerbar {
         .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop:disabled,
         headerbar.selection-mode button.suggested-action:backdrop:disabled {
           color: #c3c3c0;
-          border-color: #a5a5a1;
-          background-image: linear-gradient(to bottom, #f1f1f1);
+          border-color: #a4a4a0;
+          background-image: linear-gradient(to bottom, #f1f1f0);
           text-shadow: none;
           -gtk-icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(146, 188, 232, 0);
           border-color: #184472; }
-          .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop:disabled > .label, .selection-mode.titlebar:not(headerbar) headerbar button.suggested-action.titlebutton:backdrop:disabled > .label,
-          headerbar.selection-mode button.suggested-action:backdrop:disabled > .label,
-          headerbar.selection-mode .titlebar button.suggested-action.titlebutton:backdrop:disabled > .label {
+          .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop:disabled > .label,
+          headerbar.selection-mode button.suggested-action:backdrop:disabled > .label {
             color: inherit; }
     .selection-mode.titlebar:not(headerbar) .selection-menu, .selection-mode.titlebar:not(headerbar) .selection-menu:backdrop,
     headerbar.selection-mode .selection-menu,
@@ -2021,15 +1966,15 @@ treeview.view {
   -GtkTreeView-tree-line-width: 1;
   -GtkTreeView-tree-line-pattern: '';
   -GtkTreeView-expander-size: 16;
-  border-left-color: #979a9b;
+  border-left-color: #96999a;
   border-top-color: #e8e8e7; }
   treeview.view:selected {
     border-radius: 0; }
   treeview.view:selected, treeview.view:backdrop:selected {
-    border-left-color: #a5c8ec;
+    border-left-color: #a4c7ec;
     border-top-color: rgba(46, 52, 54, 0.1); }
   treeview.view:disabled {
-    color: #8b8e8f; }
+    color: #8b8e8e; }
     treeview.view:disabled:selected {
       color: #92bce8; }
       treeview.view:disabled:selected:backdrop {
@@ -2041,29 +1986,29 @@ treeview.view {
     treeview.view.separator:backdrop {
       color: rgba(0, 0, 0, 0.1); }
   treeview.view:backdrop {
-    border-left-color: #babbbb;
+    border-left-color: #b9bbba;
     border-top: #e8e8e7; }
   treeview.view.dnd {
     border-style: solid none;
     border-width: 1px;
-    border-color: #3c6288; }
+    border-color: #3c6287; }
   treeview.view.expander {
     -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
-    color: #6d7172; }
+    color: #6c7072; }
     treeview.view.expander:dir(rtl) {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
     treeview.view.expander:hover {
       color: #2e3436; }
     treeview.view.expander:selected {
-      color: #c9def4; }
+      color: #c8ddf3; }
       treeview.view.expander:selected:hover {
         color: #ffffff; }
       treeview.view.expander:selected:backdrop {
-        color: #c9def4; }
+        color: #c8ddf3; }
     treeview.view.expander:checked {
       -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
     treeview.view.expander:backdrop {
-      color: #aeb0b1; }
+      color: #adafaf; }
   treeview.view.progressbar {
     color: #ffffff;
     border: 1px solid #184472;
@@ -2093,13 +2038,13 @@ treeview.view {
   treeview.view header button,
   treeview.view header .titlebar button.titlebutton,
   .titlebar treeview.view header button.titlebutton {
-    color: #979a9b;
+    color: #96999a;
     background-color: #ffffff;
     font-weight: bold;
     text-shadow: none;
     box-shadow: none; }
     treeview.view header button:hover {
-      color: #636769;
+      color: #626668;
       box-shadow: none;
       transition: none; }
     treeview.view header button:active {
@@ -2128,7 +2073,7 @@ treeview.view header .titlebar button.titlebutton,
   treeview.view header button:backdrop {
     border-color: #e8e8e7;
     border-style: none solid solid none;
-    color: #babbbb;
+    color: #b9bbba;
     background-image: none;
     background-color: white; }
     treeview.view header button:backdrop:disabled {
@@ -2155,7 +2100,7 @@ menubar,
       color: #2a76c6; }
     menubar > menuitem:disabled,
     .menubar > menuitem:disabled {
-      color: #8b8e8f;
+      color: #8b8e8e;
       box-shadow: none; }
 
 menu,
@@ -2181,14 +2126,14 @@ menu,
       background-color: #4a90d9; }
     menu menuitem:disabled,
     .menu menuitem:disabled {
-      color: #8b8e8f; }
+      color: #8b8e8e; }
       menu menuitem:disabled:backdrop,
       .menu menuitem:disabled:backdrop {
         color: #c3c3c0; }
     menu menuitem:backdrop, menu menuitem:backdrop:hover,
     .menu menuitem:backdrop,
     .menu menuitem:backdrop:hover {
-      color: #8b8e8f;
+      color: #8b8e8e;
       background-color: transparent; }
     menu menuitem arrow,
     .menu menuitem arrow {
@@ -2211,14 +2156,14 @@ menu,
     menu arrow.top,
     .menu arrow.top {
       -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
-      border-bottom: 1px solid #eaebeb; }
+      border-bottom: 1px solid #eaeaea; }
     menu arrow.bottom,
     .menu arrow.bottom {
       -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
-      border-top: 1px solid #eaebeb; }
+      border-top: 1px solid #eaeaea; }
     menu arrow:hover,
     .menu arrow:hover {
-      background-color: #eaebeb; }
+      background-color: #eaeaea; }
     menu arrow:disabled,
     .menu arrow:disabled {
       color: transparent;
@@ -2281,7 +2226,6 @@ notebook {
   -GtkNotebook-arrow-spacing: 5;
   -GtkNotebook-tab-curvature: 0;
   -GtkNotebook-tab-overlap: -8;
-  -GtkNotebook-has-tab-gap: false;
   padding: 0;
   background-color: #ffffff;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
@@ -2290,9 +2234,9 @@ notebook {
   notebook.frame {
     border: 1px solid #9d9d99; }
     notebook.frame:backdrop {
-      border-color: #a5a5a1; }
+      border-color: #a4a4a0; }
   notebook header {
-    background-color: #d2d2d0; }
+    background-color: #d1d1cf; }
     .frame notebook header {
       border: 1px solid #9d9d99; }
       .frame notebook header.top {
@@ -2304,11 +2248,11 @@ notebook {
       .frame notebook header.left {
         border-right-width: 0; }
       .frame notebook header:backdrop {
-        border-color: #a5a5a1; }
+        border-color: #a4a4a0; }
     notebook header.top {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 -1px #9d9d99; }
       notebook header.top:backdrop {
-        box-shadow: inset 0 -1px #a5a5a1; }
+        box-shadow: inset 0 -1px #a4a4a0; }
       notebook header.top tab {
         padding: 8px 20px;
         border-bottom-width: 3px; }
@@ -2320,7 +2264,7 @@ notebook {
     notebook header.bottom {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 1px #9d9d99; }
       notebook header.bottom:backdrop {
-        box-shadow: inset 0 1px #a5a5a1; }
+        box-shadow: inset 0 1px #a4a4a0; }
       notebook header.bottom tab {
         padding: 8px 20px;
         border-top-width: 3px; }
@@ -2332,7 +2276,7 @@ notebook {
     notebook header.right {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 1px 0 #9d9d99; }
       notebook header.right:backdrop {
-        box-shadow: inset 1px 0 #a5a5a1; }
+        box-shadow: inset 1px 0 #a4a4a0; }
       notebook header.right tab {
         padding: 5px 20px;
         border-left-width: 3px; }
@@ -2342,7 +2286,7 @@ notebook {
     notebook header.left {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset -1px 0 #9d9d99; }
       notebook header.left:backdrop {
-        box-shadow: inset -1px 0 #a5a5a1; }
+        box-shadow: inset -1px 0 #a4a4a0; }
       notebook header.left tab {
         padding: 5px 20px;
         border-right-width: 3px; }
@@ -2350,7 +2294,7 @@ notebook {
           border-bottom-width: 1px;
           border-top-width: 1px; }
     notebook header:backdrop {
-      background-color: #d1d1cf;
+      background-color: #d0d0ce;
       box-shadow: none; }
     notebook header.top tabs arrow.up, notebook header.bottom tabs arrow.up {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
@@ -2361,15 +2305,15 @@ notebook {
     notebook header.left tabs arrow.down, notebook header.right tabs arrow.down {
       -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); }
     notebook header tabs arrow {
-      color: #8b8e8f; }
+      color: #8b8e8e; }
       notebook header tabs arrow:hover {
-        color: #5d6163; }
+        color: #5c6162; }
       notebook header tabs arrow:active {
         color: #2e3436; }
       notebook header tabs arrow:disabled {
-        color: rgba(139, 142, 143, 0.3); }
+        color: rgba(139, 142, 142, 0.3); }
       notebook header tabs arrow:backdrop {
-        color: rgba(139, 142, 143, 0.4); }
+        color: rgba(139, 142, 142, 0.4); }
       notebook header tabs arrow:backdrop:disabled {
         color: #c3c3c0; }
   notebook tab {
@@ -2398,7 +2342,7 @@ notebook {
         .top notebook tab.reorderable-page:active:hover {
           background-color: rgba(232, 232, 231, 0.7); }
         .top notebook tab.reorderable-page:active:backdrop {
-          border-color: #a5a5a1;
+          border-color: #a4a4a0;
           background-color: #e8e8e7;
           border-bottom-color: #4a90d9; }
       .top notebook tab.reorderable-page:backdrop {
@@ -2417,7 +2361,7 @@ notebook {
         .bottom notebook tab.reorderable-page:active:hover {
           background-color: rgba(232, 232, 231, 0.7); }
         .bottom notebook tab.reorderable-page:active:backdrop {
-          border-color: #a5a5a1;
+          border-color: #a4a4a0;
           background-color: #e8e8e7;
           border-top-color: #4a90d9; }
       .bottom notebook tab.reorderable-page:backdrop {
@@ -2436,7 +2380,7 @@ notebook {
         .left notebook tab.reorderable-page:active:hover {
           background-color: rgba(232, 232, 231, 0.7); }
         .left notebook tab.reorderable-page:active:backdrop {
-          border-color: #a5a5a1;
+          border-color: #a4a4a0;
           background-color: #e8e8e7;
           border-right-color: #4a90d9; }
       .left notebook tab.reorderable-page:backdrop {
@@ -2455,7 +2399,7 @@ notebook {
         .right notebook tab.reorderable-page:active:hover {
           background-color: rgba(232, 232, 231, 0.7); }
         .right notebook tab.reorderable-page:active:backdrop {
-          border-color: #a5a5a1;
+          border-color: #a4a4a0;
           background-color: #e8e8e7;
           border-left-color: #4a90d9; }
       .right notebook tab.reorderable-page:backdrop {
@@ -2464,17 +2408,17 @@ notebook {
     notebook tab label {
       padding: 0 2px;
       font-weight: bold;
-      color: #8b8e8f; }
+      color: #8b8e8e; }
       notebook tab label:backdrop {
-        color: #a7a9a8; }
+        color: #a7a8a7; }
     notebook tab:hover label {
-      color: #5d6163; }
+      color: #5c6162; }
       notebook tab:hover label:backdrop {
-        color: #a7a9a8; }
+        color: #a7a8a7; }
     notebook tab:active label {
       color: #2e3436; }
       notebook tab:active label:backdrop {
-        color: #8b8e8f; }
+        color: #8b8e8e; }
     notebook tab button.flat, notebook tab button.sidebar-button, notebook tab headerbar button.titlebutton, headerbar notebook tab button.titlebutton,
     notebook tab .titlebar button.titlebutton,
     .titlebar notebook tab button.titlebutton {
@@ -2517,7 +2461,7 @@ notebook {
       notebook tab button.flat:backdrop, notebook tab button.sidebar-button:backdrop, notebook tab headerbar button.titlebutton:backdrop, headerbar notebook tab button.titlebutton:backdrop,
       notebook tab .titlebar button.titlebutton:backdrop,
       .titlebar notebook tab button.titlebutton:backdrop {
-        color: rgba(139, 142, 143, 0.3);
+        color: rgba(139, 142, 142, 0.3);
         border-color: transparent; }
 
 /**************
@@ -2559,15 +2503,15 @@ scrollbar trough {
   border: 1px none #9d9d99; }
   scrollbar trough:backdrop {
     background-color: #e1e1df;
-    border-color: #a5a5a1; }
+    border-color: #a4a4a0; }
 scrollbar slider {
-  background-color: #787c7d; }
+  background-color: #787c7c; }
   scrollbar slider:hover {
     background-color: #535859; }
   scrollbar slider:hover:active {
     background-color: #2a76c6; }
   scrollbar slider:backdrop {
-    background-color: #c3c4c4; }
+    background-color: #c2c4c3; }
   scrollbar slider:disabled {
     background-color: transparent; }
 scrollbar slider {
@@ -2608,7 +2552,7 @@ switch {
   border: 1px solid #9d9d99;
   border-radius: 3px;
   color: #2e3436;
-  background-image: linear-gradient(to bottom, #cacac8);
+  background-image: linear-gradient(to bottom, #cacac7);
   text-shadow: 0 1px rgba(0, 0, 0, 0.1); }
   switch:active {
     color: white;
@@ -2618,16 +2562,16 @@ switch {
     box-shadow: 0 1px rgba(255, 255, 255, 0);
     text-shadow: 0 1px rgba(24, 68, 114, 0.5), 0 0 2px rgba(255, 255, 255, 0.6); }
   switch:disabled {
-    color: #8b8e8f;
+    color: #8b8e8e;
     border-color: #9d9d99;
     background-image: none;
-    background-color: #f1f1f1;
+    background-color: #f1f1f0;
     box-shadow: 0 1px rgba(255, 255, 255, 0);
     text-shadow: none; }
   switch:backdrop {
-    color: #8b8e8f;
-    border-color: #a5a5a1;
-    background-image: linear-gradient(to bottom, #d1d1cf);
+    color: #8b8e8e;
+    border-color: #a4a4a0;
+    background-image: linear-gradient(to bottom, #d0d0ce);
     box-shadow: none;
     text-shadow: none; }
     switch:backdrop:active {
@@ -2637,9 +2581,9 @@ switch {
       box-shadow: none; }
   switch:disabled {
     color: #c3c3c0;
-    border-color: #a5a5a1;
+    border-color: #a4a4a0;
     background-image: none;
-    background-color: #f1f1f1; }
+    background-color: #f1f1f0; }
   switch slider {
     margin: -1px;
     min-width: 45px;
@@ -2653,7 +2597,7 @@ switch {
     text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.8), 0 1px rgba(255, 255, 255, 0);
-    box-shadow: inset 0 1px white, inset 0 -2px rgba(232, 232, 231, 0.6), inset 0 -1px #c3c3c0; }
+    box-shadow: inset 0 1px white, inset 0 -2px rgba(232, 232, 231, 0.6), inset 0 -1px #c2c2c0; }
   switch:hover slider {
     color: #2e3436;
     outline-color: rgba(46, 52, 54, 0.3);
@@ -2668,21 +2612,21 @@ switch {
     text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     box-shadow: inset 0 1px white, 0 1px rgba(255, 255, 255, 0);
-    box-shadow: inset 0 1px white, inset 0 -2px rgba(232, 232, 231, 0.6), inset 0 -1px #c3c3c0; }
+    box-shadow: inset 0 1px white, inset 0 -2px rgba(232, 232, 231, 0.6), inset 0 -1px #c2c2c0; }
   switch:active slider {
     border: 1px solid #184472; }
   switch:disabled slider {
-    color: #8b8e8f;
+    color: #8b8e8e;
     border-color: #9d9d99;
-    background-image: linear-gradient(to bottom, #f1f1f1);
+    background-image: linear-gradient(to bottom, #f1f1f0);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     switch:disabled slider > .label {
       color: inherit; }
   switch:backdrop slider {
-    color: #8b8e8f;
-    border-color: #a5a5a1;
+    color: #8b8e8e;
+    border-color: #a4a4a0;
     background-image: linear-gradient(to bottom, #e8e8e7);
     text-shadow: none;
     -gtk-icon-shadow: none;
@@ -2692,8 +2636,8 @@ switch {
     border-color: #4a90d9; }
   switch:backdrop:disabled slider {
     color: #c3c3c0;
-    border-color: #a5a5a1;
-    background-image: linear-gradient(to bottom, #f1f1f1);
+    border-color: #a4a4a0;
+    background-image: linear-gradient(to bottom, #f1f1f0);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
@@ -2932,7 +2876,7 @@ row:selected check:backdrop:checked:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-checked-backdrop-insensitive.png"), url("assets/selected-checkbox-checked-backdrop-insensitive@2.png")); }
 
 menu menuitem check {
-  color: #666a6b;
+  color: #656a6b;
   -gtk-icon-source: -gtk-icontheme("checkbox-symbolic");
   -gtk-icon-shadow: none; }
   menu menuitem check:hover, menu menuitem check:disabled {
@@ -2947,7 +2891,7 @@ menu menuitem check {
   menu menuitem check:hover {
     color: #ffffff; }
   menu menuitem check:disabled {
-    color: #babbbb; }
+    color: #b9bbba; }
 
 radio {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked.png"), url("assets/radio-unchecked@2.png"));
@@ -3166,7 +3110,7 @@ row:selected radio:backdrop:checked:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-checked-backdrop-insensitive.png"), url("assets/selected-radio-checked-backdrop-insensitive@2.png")); }
 
 menu menuitem radio {
-  color: #666a6b;
+  color: #656a6b;
   -gtk-icon-source: -gtk-icontheme("radio-symbolic");
   -gtk-icon-shadow: none; }
   menu menuitem radio:hover, menu menuitem radio:disabled {
@@ -3181,7 +3125,7 @@ menu menuitem radio {
   menu menuitem radio:hover {
     color: #ffffff; }
   menu menuitem radio:disabled {
-    color: #babbbb; }
+    color: #b9bbba; }
 
 .view.check, .view.radio,
 row .check, row .radio {
@@ -3235,7 +3179,7 @@ checkbutton.text-button, radiobutton.text-button {
   padding: 1px 2px 4px;
   outline-offset: 0; }
   checkbutton.text-button:disabled, checkbutton.text-button:disabled:active, checkbutton.text-button:disabled:indeterminate, radiobutton.text-button:disabled, radiobutton.text-button:disabled:active, radiobutton.text-button:disabled:indeterminate {
-    color: #8b8e8f; }
+    color: #8b8e8e; }
     checkbutton.text-button:disabled:backdrop, checkbutton.text-button:disabled:active:backdrop, checkbutton.text-button:disabled:indeterminate:backdrop, radiobutton.text-button:disabled:backdrop, radiobutton.text-button:disabled:active:backdrop, radiobutton.text-button:disabled:indeterminate:backdrop {
       color: #c3c3c0; }
 
@@ -3254,17 +3198,17 @@ checkbutton check {
 scale trough, scale fill, progressbar trough {
   border: 1px solid #9d9d99;
   border-radius: 3px;
-  background-color: #cececc;
+  background-color: #cdcdcb;
   box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1), 0 1px rgba(255, 255, 255, 0); }
   scale trough:disabled, scale fill:disabled, progressbar trough:disabled {
-    background-color: #f1f1f1;
+    background-color: #f1f1f0;
     box-shadow: 0 1px rgba(255, 255, 255, 0); }
   scale trough:backdrop, scale fill:backdrop, progressbar trough:backdrop, progressbar:backdrop trough {
-    background-color: #d1d1cf;
-    border-color: #a5a5a1;
+    background-color: #d0d0ce;
+    border-color: #a4a4a0;
     box-shadow: none; }
     scale trough:backdrop:disabled, scale fill:backdrop:disabled, progressbar trough:backdrop:disabled, progressbar:backdrop trough:disabled {
-      background-color: #f1f1f1; }
+      background-color: #f1f1f0; }
   row:selected scale trough, scale row:selected trough, row:selected scale fill, scale row:selected fill, row:selected progressbar trough, progressbar row:selected trough {
     box-shadow: none; }
     row:selected scale trough, scale row:selected trough, row:selected scale fill, scale row:selected fill, row:selected progressbar trough, progressbar row:selected trough, row:selected scale trough:disabled, scale row:selected trough:disabled, row:selected scale fill:disabled, scale row:selected fill:disabled, row:selected progressbar trough:disabled, progressbar row:selected trough:disabled {
@@ -3275,7 +3219,7 @@ scale trough, scale fill, progressbar trough {
     box-shadow: none;
     outline-color: rgba(238, 238, 236, 0.2); }
     .osd scale trough:disabled, scale .osd trough:disabled, .osd scale fill:disabled, scale .osd fill:disabled, .osd progressbar trough:disabled, progressbar .osd trough:disabled {
-      background-color: rgba(53, 57, 58, 0.5); }
+      background-color: rgba(52, 57, 57, 0.5); }
 
 scale highlight, progressbar progress {
   border: 1px solid #184472;
@@ -3353,25 +3297,25 @@ scale {
     scale slider:active {
       border-color: #184472; }
     scale slider:disabled {
-      color: #8b8e8f;
+      color: #8b8e8e;
       border-color: #9d9d99;
-      background-image: linear-gradient(to bottom, #f1f1f1);
+      background-image: linear-gradient(to bottom, #f1f1f0);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
       scale slider:disabled > .label {
         color: inherit; }
     scale slider:backdrop {
-      color: #8b8e8f;
-      border-color: #a5a5a1;
+      color: #8b8e8e;
+      border-color: #a4a4a0;
       background-image: linear-gradient(to bottom, #e8e8e7);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
       scale slider:backdrop:disabled {
         color: #c3c3c0;
-        border-color: #a5a5a1;
-        background-image: linear-gradient(to bottom, #f1f1f1);
+        border-color: #a4a4a0;
+        background-image: linear-gradient(to bottom, #f1f1f0);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
@@ -3409,9 +3353,9 @@ scale {
         -gtk-icon-shadow: none;
         outline-color: rgba(238, 238, 236, 0.3); }
       .osd scale slider:disabled {
-        color: #878a89;
+        color: #878989;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -3705,15 +3649,15 @@ levelbar {
     padding: 2px;
     border-radius: 3px;
     background-color: #ffffff;
-    background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
+    background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
     color: black;
     border-color: #9d9d99;
     box-shadow: inset 0 0 0 1px rgba(74, 144, 217, 0), 0 1px rgba(255, 255, 255, 0); }
     levelbar trough:backdrop {
       background-color: #ffffff;
-      background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
-      color: #333333;
-      border-color: #a5a5a1;
+      background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
+      color: #323232;
+      border-color: #a4a4a0;
       background-image: linear-gradient(to bottom, white);
       box-shadow: 0 1px rgba(255, 255, 255, 0); }
   levelbar.horizontal.discrete block {
@@ -3750,7 +3694,7 @@ levelbar {
     border-color: rgba(46, 52, 54, 0.2);
     box-shadow: none; }
     levelbar block.empty:backdrop {
-      border-color: rgba(139, 142, 143, 0.15); }
+      border-color: rgba(139, 142, 142, 0.15); }
 
 /**********
  * Frames *
@@ -3767,14 +3711,14 @@ frame border,
     border-style: none; }
   frame border:backdrop,
   .frame:backdrop {
-    border-color: #a5a5a1; }
+    border-color: #a4a4a0; }
 
 paper {
   border: 1px solid #9d9d99;
   background: white;
   padding: 0; }
   paper:backdrop {
-    border-color: #a5a5a1; }
+    border-color: #a4a4a0; }
 
 actionbar box {
   padding: 6px;
@@ -3794,7 +3738,7 @@ scrolledwindow overshoot.top {
   box-shadow: none; }
   placessidebar overshoot.top:backdrop,
   scrolledwindow overshoot.top:backdrop {
-    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#a5a5a1), to(rgba(165, 165, 161, 0)));
+    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#a4a4a0), to(rgba(164, 164, 160, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center top;
@@ -3812,7 +3756,7 @@ scrolledwindow overshoot.bottom {
   box-shadow: none; }
   placessidebar overshoot.bottom:backdrop,
   scrolledwindow overshoot.bottom:backdrop {
-    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#a5a5a1), to(rgba(165, 165, 161, 0)));
+    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#a4a4a0), to(rgba(164, 164, 160, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center bottom;
@@ -3830,7 +3774,7 @@ scrolledwindow overshoot.left {
   box-shadow: none; }
   placessidebar overshoot.left:backdrop,
   scrolledwindow overshoot.left:backdrop {
-    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#a5a5a1), to(rgba(165, 165, 161, 0)));
+    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#a4a4a0), to(rgba(164, 164, 160, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: left center;
@@ -3848,7 +3792,7 @@ scrolledwindow overshoot.right {
   box-shadow: none; }
   placessidebar overshoot.right:backdrop,
   scrolledwindow overshoot.right:backdrop {
-    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#a5a5a1), to(rgba(165, 165, 161, 0)));
+    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#a4a4a0), to(rgba(164, 164, 160, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: right center;
@@ -3909,7 +3853,7 @@ scrolledwindow junction {
     border-image-slice: 0 1 0 0; }
   placessidebar junction:backdrop,
   scrolledwindow junction:backdrop {
-    border-image-source: linear-gradient(to bottom, #a5a5a1 1px, transparent 1px);
+    border-image-source: linear-gradient(to bottom, #a4a4a0 1px, transparent 1px);
     background-color: #e1e1df; }
 
 separator {
@@ -3925,7 +3869,7 @@ list {
   border-color: #9d9d99; }
   list:backdrop {
     background-color: white;
-    border-color: #a5a5a1; }
+    border-color: #a4a4a0; }
   list row {
     padding: 2px; }
 
@@ -3938,7 +3882,7 @@ row.activatable:backdrop:hover {
 row.activatable:selected:active {
   box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); }
 row.activatable:selected.has-open-popup, row.activatable:selected:hover {
-  background-color: #4787c9; }
+  background-color: #4786c8; }
 row.activatable:selected:backdrop {
   background-color: #4a90d9; }
 
@@ -3990,8 +3934,8 @@ row:selected .titlebar button.titlebutton,
   row:selected button:backdrop, row:selected button.flat:backdrop, row:selected button.sidebar-button:backdrop, row:selected headerbar button.titlebutton:backdrop, headerbar row:selected button.titlebutton:backdrop,
   row:selected .titlebar button.titlebutton:backdrop,
   .titlebar row:selected button.titlebutton:backdrop {
-    color: #8b8e8f;
-    border-color: #a5a5a1;
+    color: #8b8e8e;
+    border-color: #a4a4a0;
     background-image: linear-gradient(to bottom, #e8e8e7);
     text-shadow: none;
     -gtk-icon-shadow: none;
@@ -4002,23 +3946,22 @@ row:selected .titlebar button.titlebutton,
     .titlebar row:selected button.titlebutton:backdrop:active, row:selected button.flat:backdrop:checked, row:selected button.sidebar-button:backdrop:checked, row:selected headerbar button.titlebutton:backdrop:checked, headerbar row:selected button.titlebutton:backdrop:checked,
     row:selected .titlebar button.titlebutton:backdrop:checked,
     .titlebar row:selected button.titlebutton:backdrop:checked {
-      color: #8b8e8f;
-      border-color: #a5a5a1;
-      background-image: linear-gradient(to bottom, #d1d1cf);
+      color: #8b8e8e;
+      border-color: #a4a4a0;
+      background-image: linear-gradient(to bottom, #d0d0ce);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       border-color: #184472; }
     row:selected button:backdrop:disabled, row:selected button.flat:backdrop:disabled, row:selected button.sidebar-button:backdrop:disabled, row:selected headerbar button.titlebutton:backdrop:disabled, headerbar row:selected button.titlebutton:backdrop:disabled,
     row:selected .titlebar button.titlebutton:backdrop:disabled,
     .titlebar row:selected button.titlebutton:backdrop:disabled {
       color: #c3c3c0;
-      border-color: #a5a5a1;
-      background-image: linear-gradient(to bottom, #f1f1f1);
+      border-color: #a4a4a0;
+      background-image: linear-gradient(to bottom, #f1f1f0);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       border-color: #184472; }
-      row:selected button:backdrop:disabled > .label, row:selected headerbar button.titlebutton:backdrop:disabled > .label,
-      row:selected .titlebar button.titlebutton:backdrop:disabled > .label, row:selected button.flat:backdrop:disabled > .label, row:selected button.sidebar-button:backdrop:disabled > .label, row:selected headerbar button.titlebutton:backdrop:disabled > .label, headerbar row:selected button.titlebutton:backdrop:disabled > .label,
+      row:selected button:backdrop:disabled > .label, row:selected button.flat:backdrop:disabled > .label, row:selected button.sidebar-button:backdrop:disabled > .label, row:selected headerbar button.titlebutton:backdrop:disabled > .label, headerbar row:selected button.titlebutton:backdrop:disabled > .label,
       row:selected .titlebar button.titlebutton:backdrop:disabled > .label,
       .titlebar row:selected button.titlebutton:backdrop:disabled > .label {
         color: inherit; }
@@ -4028,13 +3971,11 @@ row:selected .titlebar button.titlebutton,
       row:selected .titlebar button.titlebutton:backdrop:disabled:checked,
       .titlebar row:selected button.titlebutton:backdrop:disabled:checked {
         color: #c3c3c0;
-        border-color: #a5a5a1;
-        background-image: linear-gradient(to bottom, #e4e4e4);
+        border-color: #a4a4a0;
+        background-image: linear-gradient(to bottom, #e5e5e3);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         border-color: #184472; }
-        row:selected button:backdrop:disabled:active > .label, row:selected headerbar button.titlebutton:backdrop:disabled:active > .label,
-        row:selected .titlebar button.titlebutton:backdrop:disabled:active > .label, row:selected button:backdrop:disabled:checked > .label, row:selected headerbar button.titlebutton:backdrop:disabled:checked > .label,
-        row:selected .titlebar button.titlebutton:backdrop:disabled:checked > .label, row:selected button.flat:backdrop:disabled:active > .label, row:selected button.sidebar-button:backdrop:disabled:active > .label, row:selected headerbar button.titlebutton:backdrop:disabled:active > .label, headerbar row:selected button.titlebutton:backdrop:disabled:active > .label,
+        row:selected button:backdrop:disabled:active > .label, row:selected button:backdrop:disabled:checked > .label, row:selected button.flat:backdrop:disabled:active > .label, row:selected button.sidebar-button:backdrop:disabled:active > .label, row:selected headerbar button.titlebutton:backdrop:disabled:active > .label, headerbar row:selected button.titlebutton:backdrop:disabled:active > .label,
         row:selected .titlebar button.titlebutton:backdrop:disabled:active > .label,
         .titlebar row:selected button.titlebutton:backdrop:disabled:active > .label, row:selected button.flat:backdrop:disabled:checked > .label, row:selected button.sidebar-button:backdrop:disabled:checked > .label, row:selected headerbar button.titlebutton:backdrop:disabled:checked > .label, headerbar row:selected button.titlebutton:backdrop:disabled:checked > .label,
         row:selected .titlebar button.titlebutton:backdrop:disabled:checked > .label,
@@ -4051,24 +3992,21 @@ row:selected .titlebar button.titlebutton,
     -gtk-icon-shadow: none;
     color: white; }
   row:selected button:disabled {
-    color: #8b8e8f;
+    color: #8b8e8e;
     border-color: #9d9d99;
-    background-image: linear-gradient(to bottom, #f1f1f1);
+    background-image: linear-gradient(to bottom, #f1f1f0);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     border-color: #184472; }
-    row:selected button:disabled > .label, row:selected headerbar button.titlebutton:disabled > .label,
-    row:selected .titlebar button.titlebutton:disabled > .label {
+    row:selected button:disabled > .label {
       color: inherit; }
     row:selected button:disabled:active, row:selected button:disabled:checked {
-      color: #8b8e8f;
+      color: #8b8e8e;
       border-color: #9d9d99;
-      background-image: linear-gradient(to bottom, #e9e9e8, #f1f1f1);
+      background-image: linear-gradient(to bottom, #e8e8e7, #f1f1f0);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      row:selected button:disabled:active > .label, row:selected headerbar button.titlebutton:disabled:active > .label,
-      row:selected .titlebar button.titlebutton:disabled:active > .label, row:selected button:disabled:checked > .label, row:selected headerbar button.titlebutton:disabled:checked > .label,
-      row:selected .titlebar button.titlebutton:disabled:checked > .label {
+      row:selected button:disabled:active > .label, row:selected button:disabled:checked > .label {
         color: inherit; }
 
 row {
@@ -4125,17 +4063,17 @@ calendar {
     calendar.button:hover {
       color: #2e3436; }
     calendar.button:backdrop {
-      color: rgba(139, 142, 143, 0.45); }
+      color: rgba(139, 142, 142, 0.45); }
     calendar.button:disabled {
-      color: rgba(139, 142, 143, 0.45); }
+      color: rgba(139, 142, 142, 0.45); }
   calendar:indeterminate, calendar:indeterminate:backdrop {
     color: alpha(currentColor,0.55); }
   calendar.highlight, calendar.highlight:backdrop {
     font-size: smaller;
     color: #2e3436; }
   calendar:backdrop {
-    color: #333333;
-    border-color: #a5a5a1; }
+    color: #323232;
+    border-color: #a4a4a0; }
 
 /***********
  * Dialogs *
@@ -4186,31 +4124,29 @@ messagedialog.csd .dialog-action-area button {
     -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
   messagedialog.csd .dialog-action-area button:disabled {
-    color: #8b8e8f;
+    color: #8b8e8e;
     border-color: #9d9d99;
-    background-image: linear-gradient(to bottom, #f1f1f1);
+    background-image: linear-gradient(to bottom, #f1f1f0);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    messagedialog.csd .dialog-action-area button:disabled > .label, messagedialog.csd .dialog-action-area headerbar button.titlebutton:disabled > .label,
-    messagedialog.csd .dialog-action-area .titlebar button.titlebutton:disabled > .label {
+    messagedialog.csd .dialog-action-area button:disabled > .label {
       color: inherit; }
   messagedialog.csd .dialog-action-area button:backdrop {
-    color: #8b8e8f;
-    border-color: #a5a5a1;
+    color: #8b8e8e;
+    border-color: #a4a4a0;
     background-image: linear-gradient(to bottom, #e8e8e7);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   messagedialog.csd .dialog-action-area button:backdrop:disabled {
     color: #c3c3c0;
-    border-color: #a5a5a1;
-    background-image: linear-gradient(to bottom, #f1f1f1);
+    border-color: #a4a4a0;
+    background-image: linear-gradient(to bottom, #f1f1f0);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    messagedialog.csd .dialog-action-area button:backdrop:disabled > .label, messagedialog.csd .dialog-action-area headerbar button.titlebutton:backdrop:disabled > .label,
-    messagedialog.csd .dialog-action-area .titlebar button.titlebutton:backdrop:disabled > .label {
+    messagedialog.csd .dialog-action-area button:backdrop:disabled > .label {
       color: inherit; }
   messagedialog.csd .dialog-action-area button.suggested-action {
     color: white;
@@ -4243,7 +4179,7 @@ messagedialog.csd .dialog-action-area button {
       -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.62353);
       box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
     messagedialog.csd .dialog-action-area button.suggested-action:backdrop {
-      color: #dbe9f7;
+      color: #dae8f7;
       border-color: #4a90d9;
       background-image: linear-gradient(to bottom, #4a90d9);
       text-shadow: none;
@@ -4251,23 +4187,21 @@ messagedialog.csd .dialog-action-area button {
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       messagedialog.csd .dialog-action-area button.suggested-action:backdrop:disabled {
         color: #c3c3c0;
-        border-color: #a5a5a1;
-        background-image: linear-gradient(to bottom, #f1f1f1);
+        border-color: #a4a4a0;
+        background-image: linear-gradient(to bottom, #f1f1f0);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        messagedialog.csd .dialog-action-area button.suggested-action:backdrop:disabled > .label, messagedialog.csd .dialog-action-area headerbar button.suggested-action.titlebutton:backdrop:disabled > .label,
-        messagedialog.csd .dialog-action-area .titlebar button.suggested-action.titlebutton:backdrop:disabled > .label {
+        messagedialog.csd .dialog-action-area button.suggested-action:backdrop:disabled > .label {
           color: inherit; }
     messagedialog.csd .dialog-action-area button.suggested-action:disabled {
-      color: #8b8e8f;
+      color: #8b8e8e;
       border-color: #9d9d99;
-      background-image: linear-gradient(to bottom, #f1f1f1);
+      background-image: linear-gradient(to bottom, #f1f1f0);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      messagedialog.csd .dialog-action-area button.suggested-action:disabled > .label, messagedialog.csd .dialog-action-area headerbar button.suggested-action.titlebutton:disabled > .label,
-      messagedialog.csd .dialog-action-area .titlebar button.suggested-action.titlebutton:disabled > .label {
+      messagedialog.csd .dialog-action-area button.suggested-action:disabled > .label {
         color: inherit; }
   messagedialog.csd .dialog-action-area button.destructive-action {
     color: white;
@@ -4300,7 +4234,7 @@ messagedialog.csd .dialog-action-area button {
       -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
       box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
     messagedialog.csd .dialog-action-area button.destructive-action:backdrop {
-      color: #fcd4d4;
+      color: #fbd4d4;
       border-color: #ef2929;
       background-image: linear-gradient(to bottom, #ef2929);
       text-shadow: none;
@@ -4308,23 +4242,21 @@ messagedialog.csd .dialog-action-area button {
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       messagedialog.csd .dialog-action-area button.destructive-action:backdrop:disabled {
         color: #c3c3c0;
-        border-color: #a5a5a1;
-        background-image: linear-gradient(to bottom, #f1f1f1);
+        border-color: #a4a4a0;
+        background-image: linear-gradient(to bottom, #f1f1f0);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        messagedialog.csd .dialog-action-area button.destructive-action:backdrop:disabled > .label, messagedialog.csd .dialog-action-area headerbar button.destructive-action.titlebutton:backdrop:disabled > .label,
-        messagedialog.csd .dialog-action-area .titlebar button.destructive-action.titlebutton:backdrop:disabled > .label {
+        messagedialog.csd .dialog-action-area button.destructive-action:backdrop:disabled > .label {
           color: inherit; }
     messagedialog.csd .dialog-action-area button.destructive-action:disabled {
-      color: #8b8e8f;
+      color: #8b8e8e;
       border-color: #9d9d99;
-      background-image: linear-gradient(to bottom, #f1f1f1);
+      background-image: linear-gradient(to bottom, #f1f1f0);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      messagedialog.csd .dialog-action-area button.destructive-action:disabled > .label, messagedialog.csd .dialog-action-area headerbar button.destructive-action.titlebutton:disabled > .label,
-      messagedialog.csd .dialog-action-area .titlebar button.destructive-action.titlebutton:disabled > .label {
+      messagedialog.csd .dialog-action-area button.destructive-action:disabled > .label {
         color: inherit; }
 messagedialog.csd .dialog-action-area button, messagedialog.csd .dialog-action-area button:hover, messagedialog.csd .dialog-action-area button:active, messagedialog.csd .dialog-action-area button:disabled, messagedialog.csd .dialog-action-area button:backdrop, messagedialog.csd .dialog-action-area button:backdrop:disabled, messagedialog.csd .dialog-action-area button.suggested-action, messagedialog.csd .dialog-action-area button.suggested-action:hover, messagedialog.csd .dialog-action-area button.suggested-action:active, messagedialog.csd .dialog-action-area button.suggested-action:backdrop, messagedialog.csd .dialog-action-area button.suggested-action:backdrop:disabled, messagedialog.csd .dialog-action-area button.suggested-action:disabled, messagedialog.csd .dialog-action-area button.destructive-action, messagedialog.csd .dialog-action-area button.destructive-action:hover, messagedialog.csd .dialog-action-area button.destructive-action:active, messagedialog.csd .dialog-action-area button.destructive-action:backdrop, messagedialog.csd .dialog-action-area button.destructive-action:backdrop:disabled, messagedialog.csd .dialog-action-area button.destructive-action:disabled {
   border-left-style: solid;
@@ -4341,16 +4273,16 @@ messagedialog.csd .dialog-action-area button:first-child {
 GtkFileChooserDialog .dialog-action-box {
   border-top: 1px solid #9d9d99; }
   GtkFileChooserDialog .dialog-action-box:backdrop {
-    border-top-color: #a5a5a1; }
+    border-top-color: #a4a4a0; }
 
 /***********
  * Sidebar *
  ***********/
 .sidebar {
   border: none;
-  background-color: #f4f4f3; }
+  background-color: #f3f3f3; }
   .sidebar:backdrop {
-    background-color: #f4f4f3; }
+    background-color: #f3f3f3; }
 
 stacksidebar row {
   padding: 10px 4px; }
@@ -4382,9 +4314,7 @@ placessidebar row {
     padding: 5px;
     border-radius: 100%;
     -gtk-outline-radius: 100%; }
-    button.sidebar-button:not(:hover):not(:active) > image, headerbar button.sidebar-button.titlebutton:not(:hover):not(:active) > image,
-    .titlebar button.sidebar-button.titlebutton:not(:hover):not(:active) > image, button.sidebar-button:backdrop > image, headerbar button.sidebar-button.titlebutton:backdrop > image,
-    .titlebar button.sidebar-button.titlebutton:backdrop > image {
+    button.sidebar-button:not(:hover):not(:active) > image, button.sidebar-button:backdrop > image {
       opacity: 0.7; }
 placessidebar row:selected:active {
   box-shadow: none; }
@@ -4416,7 +4346,7 @@ paned > separator {
   paned > separator:selected {
     background-image: linear-gradient(to top, #4a90d9); }
   paned > separator:backdrop {
-    background-image: linear-gradient(to top, #a5a5a1); }
+    background-image: linear-gradient(to top, #a4a4a0); }
   paned > separator.wide {
     margin: 0;
     padding: 0;
@@ -4425,7 +4355,7 @@ paned > separator {
     background-image: linear-gradient(to top, #9d9d99), linear-gradient(to top, #9d9d99);
     background-size: 1px 1px, 1px 1px; }
     paned > separator.wide:backdrop {
-      background-image: linear-gradient(to top, #a5a5a1), linear-gradient(to top, #a5a5a1); }
+      background-image: linear-gradient(to top, #a4a4a0), linear-gradient(to top, #a4a4a0); }
 paned.horizontal > separator {
   background-repeat: repeat-y; }
   paned.horizontal > separator:dir(ltr) {
@@ -4522,29 +4452,22 @@ infobar {
     .question button:disabled,
     .warning button:disabled,
     .error button:disabled {
-      color: #b2d0ef;
+      color: #b2cfee;
       border-color: #1c5187;
-      background-image: linear-gradient(to bottom, #65a1df);
+      background-image: linear-gradient(to bottom, #65a0de);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .info button:disabled > .label, .info headerbar button.titlebutton:disabled > .label,
-      .info .titlebar button.titlebutton:disabled > .label,
+      .info button:disabled > .label,
       .question button:disabled > .label,
-      .question headerbar button.titlebutton:disabled > .label,
-      .question .titlebar button.titlebutton:disabled > .label,
       .warning button:disabled > .label,
-      .warning headerbar button.titlebutton:disabled > .label,
-      .warning .titlebar button.titlebutton:disabled > .label,
-      .error button:disabled > .label,
-      .error headerbar button.titlebutton:disabled > .label,
-      .error .titlebar button.titlebutton:disabled > .label {
+      .error button:disabled > .label {
         color: inherit; }
     .info button:backdrop,
     .question button:backdrop,
     .warning button:backdrop,
     .error button:backdrop {
-      color: #dbe9f7;
+      color: #dae8f7;
       border-color: #4a90d9;
       background-image: linear-gradient(to bottom, #4a90d9);
       text-shadow: none;
@@ -4555,24 +4478,17 @@ infobar {
       .question button:backdrop:disabled,
       .warning button:backdrop:disabled,
       .error button:backdrop:disabled {
-        color: #9bc2ea;
-        border-color: #65a1df;
-        background-image: linear-gradient(to bottom, #65a1df);
+        color: #9ac1e9;
+        border-color: #65a0de;
+        background-image: linear-gradient(to bottom, #65a0de);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         border-color: #1c5187; }
-        .info button:backdrop:disabled > .label, .info headerbar button.titlebutton:backdrop:disabled > .label,
-        .info .titlebar button.titlebutton:backdrop:disabled > .label,
+        .info button:backdrop:disabled > .label,
         .question button:backdrop:disabled > .label,
-        .question headerbar button.titlebutton:backdrop:disabled > .label,
-        .question .titlebar button.titlebutton:backdrop:disabled > .label,
         .warning button:backdrop:disabled > .label,
-        .warning headerbar button.titlebutton:backdrop:disabled > .label,
-        .warning .titlebar button.titlebutton:backdrop:disabled > .label,
-        .error button:backdrop:disabled > .label,
-        .error headerbar button.titlebutton:backdrop:disabled > .label,
-        .error .titlebar button.titlebutton:backdrop:disabled > .label {
+        .error button:backdrop:disabled > .label {
           color: inherit; }
   .info label:selected, .info label:selected:focus, .info label:selected:hover,
   .question label:selected,
@@ -4646,7 +4562,7 @@ colorswatch.light overlay {
   colorswatch.light overlay:hover {
     border-color: rgba(0, 0, 0, 0.5); }
   colorswatch.light overlay:backdrop {
-    color: #333333; }
+    color: #323232; }
 colorswatch overlay {
   box-shadow: inset 0 2px 2px -3px rgba(0, 0, 0, 0.7);
   border: 1px solid rgba(0, 0, 0, 0.3); }
@@ -4682,8 +4598,8 @@ colorswatch#add-color-button {
       -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
       box-shadow: inset 0 1px white, 0 1px rgba(255, 255, 255, 0); }
     colorswatch#add-color-button overlay:backdrop {
-      color: #8b8e8f;
-      border-color: #a5a5a1;
+      color: #8b8e8e;
+      border-color: #a4a4a0;
       background-image: linear-gradient(to bottom, #e8e8e7);
       text-shadow: none;
       -gtk-icon-shadow: none;
@@ -4753,7 +4669,7 @@ decoration {
     border-radius: 0;
     margin: 4px;
     background-color: #e8e8e7;
-    border: solid 1px #a5a5a1;
+    border: solid 1px #a4a4a0;
     box-shadow: none; }
 
 headerbar button.titlebutton,
@@ -4791,7 +4707,7 @@ spinbutton selection:focus, modelbutton.flat:selected,
   .view selection:disabled, iconview:disabled:selected, flowbox flowboxchild:disabled:selected, label:disabled:selected,
   label selection:disabled, entry selection:disabled, spinbutton selection:disabled, modelbutton.flat:disabled:selected,
   .menuitem.button.flat:disabled:selected, treeview.view:disabled:selected, row:disabled:selected, calendar:disabled:selected, .sidebar :disabled:selected, placessidebar row:selected:disabled label {
-    color: #a5c8ec; }
+    color: #a4c7ec; }
   textview text selection:backdrop,
   .view selection:backdrop, iconview:backdrop:selected, flowbox flowboxchild:backdrop:selected, label:backdrop:selected,
   label selection:backdrop, entry selection:backdrop, spinbutton selection:backdrop, modelbutton.flat:backdrop:selected,
@@ -4856,12 +4772,12 @@ button.circular, headerbar button.circular.titlebutton,
   padding-bottom: 3px;
   padding-left: 6px;
   padding-right: 6px;
-  color: #8b8e8f;
+  color: #8b8e8e;
   background-color: #ffffff;
   border: 1px solid;
-  border-color: #c3c3c0;
+  border-color: #c2c2c0;
   border-radius: 5px;
-  box-shadow: inset 0 -3px #ededec;
+  box-shadow: inset 0 -3px #ececeb;
   font-size: smaller; }
   .keycap:backdrop {
     background-color: white;
@@ -4909,16 +4825,16 @@ text/foreground color of selections */
 @define-color theme_selected_fg_color #ffffff;
 /*
 base background color of insensitive widgets */
-@define-color insensitive_bg_color #f1f1f1;
+@define-color insensitive_bg_color #f1f1f0;
 /*
 text foreground color of insensitive widgets */
-@define-color insensitive_fg_color #8b8e8f;
+@define-color insensitive_fg_color #8b8e8e;
 /*
 insensitive text widgets and the like base background color */
 @define-color insensitive_base_color #ffffff;
 /*
 widget text/foreground color on backdrop windows */
-@define-color theme_unfocused_fg_color #8b8e8f;
+@define-color theme_unfocused_fg_color #8b8e8e;
 /*
 text color for entries, views and content in general on backdrop windows */
 @define-color theme_unfocused_text_color black;
@@ -4939,7 +4855,7 @@ widgets main borders color */
 @define-color borders #9d9d99;
 /*
 widgets main borders color on backdrop windows */
-@define-color unfocused_borders #a5a5a1;
+@define-color unfocused_borders #a4a4a0;
 /*
 these are pretty self explicative */
 @define-color warning_color #f57900;
@@ -4949,7 +4865,7 @@ these are pretty self explicative */
 these colors are exported for the window manager and shouldn't be used in applications,
 read if you used those and something break with a version upgrade you're on your own... */
 @define-color wm_title shade(#2e3436, 1.8);
-@define-color wm_unfocused_title #8b8e8f;
+@define-color wm_unfocused_title #8b8e8e;
 @define-color wm_highlight rgba(255, 255, 255, 0.8);
 @define-color wm_borders_edge rgba(255, 255, 255, 0.8);
 @define-color wm_bg_a shade(#e8e8e7, 1.2);
diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss
index d07b66c1f4..4701878ba3 100644
--- a/gtk/theme/HighContrast/_common.scss
+++ b/gtk/theme/HighContrast/_common.scss
@@ -1253,7 +1253,6 @@ notebook {
   -GtkNotebook-arrow-spacing: 5;
   -GtkNotebook-tab-curvature: 0;
   -GtkNotebook-tab-overlap: -8;
-  -GtkNotebook-has-tab-gap: false;
 
   // Through me you go to the grief wracked city;
   // Through me you go to everlasting pain;
diff --git a/gtk/theme/HighContrast/gtk-contained-inverse.css b/gtk/theme/HighContrast/gtk-contained-inverse.css
index 3c3791ee15..0211610696 100644
--- a/gtk/theme/HighContrast/gtk-contained-inverse.css
+++ b/gtk/theme/HighContrast/gtk-contained-inverse.css
@@ -4,16 +4,16 @@
 @define-color theme_base_color #111;
 @define-color theme_selected_bg_color #aaa;
 @define-color theme_selected_fg_color #fff;
-@define-color insensitive_bg_color #070707;
-@define-color insensitive_fg_color gray;
+@define-color insensitive_bg_color #060606;
+@define-color insensitive_fg_color #7f7f7f;
 @define-color insensitive_base_color #111;
 @define-color theme_unfocused_fg_color #fff;
 @define-color theme_unfocused_bg_color #000;
 @define-color theme_unfocused_base_color #111;
 @define-color theme_unfocused_selected_bg_color #aaa;
 @define-color theme_unfocused_selected_fg_color #fff;
-@define-color borders gray;
-@define-color unfocused_borders #737373;
+@define-color borders #7f7f7f;
+@define-color unfocused_borders #727272;
 @define-color warning_color #f57900;
 @define-color error_color #cc0000;
 @define-color success_color #73d216;
@@ -79,8 +79,8 @@
     background-color: black;
     color: #fff; }
   .gtkstyle-fallback:disabled {
-    background-color: #070707;
-    color: gray; }
+    background-color: #060606;
+    color: #7f7f7f; }
   .gtkstyle-fallback:selected {
     background-color: #aaa;
     color: #fff; }
@@ -115,7 +115,7 @@ flowbox flowboxchild {
     outline-offset: -2px; }
 
 label:disabled, label:backdrop:disabled {
-  color: gray; }
+  color: #7f7f7f; }
 
 /*********************
  * Spinner Animation *
@@ -144,15 +144,15 @@ entry, spinbutton {
   background-color: transparent;
   border-style: solid;
   background-image: linear-gradient(to bottom, #090909, #111 90%);
-  border-color: gray;
-  box-shadow: inset 0 2px 2px -2px #090909; }
+  border-color: #7f7f7f;
+  box-shadow: inset 0 2px 2px -2px #080808; }
   entry.flat, entry.flat:focus, spinbutton.flat, spinbutton.flat:focus {
     padding: 2px;
     background-color: transparent;
     border-style: solid;
     background-image: linear-gradient(to bottom, #090909, #111 90%);
-    border-color: gray;
-    box-shadow: inset 0 2px 2px -2px #090909;
+    border-color: #7f7f7f;
+    box-shadow: inset 0 2px 2px -2px #080808;
     border: none;
     border-radius: 0; }
   entry:focus, spinbutton:focus {
@@ -160,14 +160,14 @@ entry, spinbutton {
     border-style: solid;
     background-image: linear-gradient(to bottom, #090909, #111 90%);
     border-color: #aaa;
-    box-shadow: inset 0 2px 2px -2px #090909, inset 0 0 2px 1px #303030; }
+    box-shadow: inset 0 2px 2px -2px #080808, inset 0 0 2px 1px #2f2f2f; }
   entry:disabled, spinbutton:disabled {
     background-color: transparent;
     border-style: solid;
     background-image: linear-gradient(to bottom, #090909, #111 90%);
-    color: gray;
-    border-color: gray;
-    background-image: linear-gradient(to bottom, #070707);
+    color: #7f7f7f;
+    border-color: #7f7f7f;
+    background-image: linear-gradient(to bottom, #060606);
     box-shadow: none; }
   entry:backdrop, spinbutton:backdrop {
     background-color: transparent;
@@ -180,7 +180,7 @@ entry, spinbutton {
     background-color: transparent;
     border-style: solid;
     background-image: linear-gradient(to bottom, #090909, #111 90%);
-    color: gray;
+    color: #7f7f7f;
     background-image: linear-gradient(to bottom, #000);
     box-shadow: 0 1px rgba(255, 255, 255, 0); }
   entry selection, entry selection:backdrop, spinbutton selection, spinbutton selection:backdrop {
@@ -212,8 +212,8 @@ entry, spinbutton {
     background-color: transparent;
     border-style: solid;
     background-image: linear-gradient(to bottom, #090909, #111 90%);
-    border-color: gray;
-    box-shadow: inset 0 2px 2px -2px #090909;
+    border-color: #7f7f7f;
+    box-shadow: inset 0 2px 2px -2px #080808;
     background-image: linear-gradient(to bottom, #111);
     border-bottom-color: #323232;
     box-shadow: none; }
@@ -224,16 +224,16 @@ entry, spinbutton {
       background-color: transparent;
       border-style: solid;
       background-image: linear-gradient(to bottom, #090909, #111 90%);
-      color: gray;
-      border-color: gray;
-      background-image: linear-gradient(to bottom, #070707);
+      color: #7f7f7f;
+      border-color: #7f7f7f;
+      background-image: linear-gradient(to bottom, #060606);
       box-shadow: none;
       border-bottom-color: #323232; }
       .linked.vertical entry:disabled:backdrop, .linked.vertical spinbutton:disabled:backdrop {
         background-color: transparent;
         border-style: solid;
         background-image: linear-gradient(to bottom, #090909, #111 90%);
-        color: gray;
+        color: #7f7f7f;
         background-image: linear-gradient(to bottom, #000);
         box-shadow: 0 1px rgba(255, 255, 255, 0);
         border-bottom-color: #2e2e2e; }
@@ -249,29 +249,29 @@ entry, spinbutton {
       background-color: transparent;
       border-style: solid;
       background-image: linear-gradient(to bottom, #090909, #111 90%);
-      border-color: gray;
-      box-shadow: inset 0 2px 2px -2px #090909;
+      border-color: #7f7f7f;
+      box-shadow: inset 0 2px 2px -2px #080808;
       border-bottom-color: #323232; }
       .linked.vertical entry:first-child:focus, .linked.vertical spinbutton:first-child:focus {
         background-color: transparent;
         border-style: solid;
         background-image: linear-gradient(to bottom, #090909, #111 90%);
         border-color: #aaa;
-        box-shadow: inset 0 2px 2px -2px #090909, inset 0 0 2px 1px #303030; }
+        box-shadow: inset 0 2px 2px -2px #080808, inset 0 0 2px 1px #2f2f2f; }
       .linked.vertical entry:first-child:disabled, .linked.vertical spinbutton:first-child:disabled {
         background-color: transparent;
         border-style: solid;
         background-image: linear-gradient(to bottom, #090909, #111 90%);
-        color: gray;
-        border-color: gray;
-        background-image: linear-gradient(to bottom, #070707);
+        color: #7f7f7f;
+        border-color: #7f7f7f;
+        background-image: linear-gradient(to bottom, #060606);
         box-shadow: none;
         border-bottom-color: #2e2e2e; }
         .linked.vertical entry:first-child:disabled:backdrop, .linked.vertical spinbutton:first-child:disabled:backdrop {
           background-color: transparent;
           border-style: solid;
           background-image: linear-gradient(to bottom, #090909, #111 90%);
-          color: gray;
+          color: #7f7f7f;
           background-image: linear-gradient(to bottom, #000);
           box-shadow: 0 1px rgba(255, 255, 255, 0);
           border-bottom-color: #2e2e2e;
@@ -288,8 +288,8 @@ entry, spinbutton {
       background-color: transparent;
       border-style: solid;
       background-image: linear-gradient(to bottom, #090909, #111 90%);
-      border-color: gray;
-      box-shadow: inset 0 2px 2px -2px #090909;
+      border-color: #7f7f7f;
+      box-shadow: inset 0 2px 2px -2px #080808;
       border-top-width: 0;
       background-image: linear-gradient(to bottom, #111);
       box-shadow: none; }
@@ -300,15 +300,15 @@ entry, spinbutton {
         background-color: transparent;
         border-style: solid;
         background-image: linear-gradient(to bottom, #090909, #111 90%);
-        color: gray;
-        border-color: gray;
-        background-image: linear-gradient(to bottom, #070707);
+        color: #7f7f7f;
+        border-color: #7f7f7f;
+        background-image: linear-gradient(to bottom, #060606);
         box-shadow: none; }
         .linked.vertical entry:last-child:disabled:backdrop, .linked.vertical spinbutton:last-child:disabled:backdrop {
           background-color: transparent;
           border-style: solid;
           background-image: linear-gradient(to bottom, #090909, #111 90%);
-          color: gray;
+          color: #7f7f7f;
           background-image: linear-gradient(to bottom, #000);
           box-shadow: 0 1px rgba(255, 255, 255, 0); }
       .linked.vertical entry:last-child:backdrop, .linked.vertical spinbutton:last-child:backdrop {
@@ -326,7 +326,7 @@ entry, spinbutton {
       border-style: solid;
       background-image: linear-gradient(to bottom, #090909, #111 90%);
       border-color: #cc0000;
-      box-shadow: inset 0 2px 2px -2px #090909, inset 0 0 2px 1px #360e0e; }
+      box-shadow: inset 0 2px 2px -2px #080808, inset 0 0 2px 1px #360d0d; }
     entry.error:selected, entry.error:selected:focus, spinbutton.error:selected, spinbutton.error:selected:focus {
       background-color: #cc0000; }
   entry.warning, spinbutton.warning {
@@ -337,7 +337,7 @@ entry, spinbutton {
       border-style: solid;
       background-image: linear-gradient(to bottom, #090909, #111 90%);
       border-color: #f57900;
-      box-shadow: inset 0 2px 2px -2px #090909, inset 0 0 2px 1px #3f260e; }
+      box-shadow: inset 0 2px 2px -2px #080808, inset 0 0 2px 1px #3e250d; }
     entry.warning:selected, entry.warning:selected:focus, spinbutton.warning:selected, spinbutton.warning:selected:focus {
       background-color: #f57900; }
 
@@ -358,13 +358,13 @@ button {
   color: #fff;
   background-image: none;
   background-color: #000;
-  border-color: gray; }
+  border-color: #7f7f7f; }
   button:hover, button.flat:hover, button.sidebar-button:hover {
     border-width: 2px;
     border-style: solid;
     color: #fff;
     background-color: #000;
-    border-color: gray;
+    border-color: #7f7f7f;
     background-image: none;
     -gtk-icon-effect: highlight; }
   button:active, button.flat:active, button.sidebar-button:active, button:checked, button.flat:checked, button.sidebar-button:checked {
@@ -373,14 +373,14 @@ button {
     background-image: none;
     color: black;
     background-color: white;
-    border-color: gray;
+    border-color: #7f7f7f;
     transition-duration: 50ms; }
   button:backdrop, button.flat:backdrop, button.sidebar-button:backdrop {
     border-width: 2px;
     border-style: solid;
     color: #fff;
     background-color: #000;
-    border-color: #737373;
+    border-color: #727272;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
@@ -388,39 +388,39 @@ button {
       border-width: 2px;
       border-style: solid;
       color: black;
-      background-color: #737373;
-      border-color: #737373;
+      background-color: #727272;
+      border-color: #727272;
       background-image: none; }
     button:backdrop:disabled, button.flat:backdrop:disabled, button.sidebar-button:backdrop:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
-      background-color: #070707;
-      border-color: #737373;
+      color: #7f7f7f;
+      background-color: #060606;
+      border-color: #727272;
       background-image: none; }
     button:backdrop:disabled:active, button.flat:backdrop:disabled:active, button.sidebar-button:backdrop:disabled:active {
       border-width: 2px;
       border-style: solid;
-      color: gray;
-      border-color: #737373;
+      color: #7f7f7f;
+      border-color: #727272;
       background-image: none;
       background-color: #090909; }
   button:disabled {
     border-width: 2px;
     border-style: solid;
-    color: gray;
-    background-color: #070707;
-    border-color: gray;
+    color: #7f7f7f;
+    background-color: #060606;
+    border-color: #7f7f7f;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
     button:disabled:active, button:disabled.flat:active, button.sidebar-button:disabled:active {
       border-width: 2px;
       border-style: solid;
-      color: gray;
-      border-color: gray;
+      color: #7f7f7f;
+      border-color: #7f7f7f;
       background-image: none;
-      background-color: #070707; }
+      background-color: #060606; }
   .osd button {
     padding: 6px;
     border-width: 1px 1px 2px 1px;
@@ -449,7 +449,7 @@ button {
       border-width: 2px;
       border-style: solid;
       border-color: rgba(255, 255, 255, 0.2);
-      color: gray; }
+      color: #7f7f7f; }
     .osd button:backdrop {
       border-width: 2px;
       border-style: solid; }
@@ -486,16 +486,16 @@ button {
       button.suggested-action:backdrop:disabled {
         border-width: 2px;
         border-style: solid;
-        color: gray;
-        background-color: #070707;
-        border-color: #737373;
+        color: #7f7f7f;
+        background-color: #060606;
+        border-color: #727272;
         background-image: none; }
     button.suggested-action:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
-      background-color: #070707;
-      border-color: gray;
+      color: #7f7f7f;
+      background-color: #060606;
+      border-color: #7f7f7f;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -532,16 +532,16 @@ button {
       button.destructive-action:backdrop:disabled {
         border-width: 2px;
         border-style: solid;
-        color: gray;
-        background-color: #070707;
-        border-color: #737373;
+        color: #7f7f7f;
+        background-color: #060606;
+        border-color: #727272;
         background-image: none; }
     button.destructive-action:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
-      background-color: #070707;
-      border-color: gray;
+      color: #7f7f7f;
+      background-color: #060606;
+      border-color: #7f7f7f;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -561,13 +561,13 @@ button {
   color: #fff;
   background-image: none;
   background-color: #000;
-  border-color: gray; }
+  border-color: #7f7f7f; }
   .inline-toolbar toolbutton > button:hover {
     border-width: 2px;
     border-style: solid;
     color: #fff;
     background-color: #000;
-    border-color: gray;
+    border-color: #7f7f7f;
     background-image: none; }
   .inline-toolbar toolbutton > button:active {
     border-width: 2px;
@@ -575,29 +575,29 @@ button {
     background-image: none;
     color: black;
     background-color: white;
-    border-color: gray; }
+    border-color: #7f7f7f; }
   .inline-toolbar toolbutton > button:disabled {
     border-width: 2px;
     border-style: solid;
-    color: gray;
-    background-color: #070707;
-    border-color: gray;
+    color: #7f7f7f;
+    background-color: #060606;
+    border-color: #7f7f7f;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
   .inline-toolbar toolbutton > button:disabled:active {
     border-width: 2px;
     border-style: solid;
-    color: gray;
-    border-color: gray;
+    color: #7f7f7f;
+    border-color: #7f7f7f;
     background-image: none;
-    background-color: #070707; }
+    background-color: #060606; }
   .inline-toolbar toolbutton > button:backdrop {
     border-width: 2px;
     border-style: solid;
     color: #fff;
     background-color: #000;
-    border-color: #737373;
+    border-color: #727272;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
@@ -605,21 +605,21 @@ button {
     border-width: 2px;
     border-style: solid;
     color: black;
-    background-color: #737373;
-    border-color: #737373;
+    background-color: #727272;
+    border-color: #727272;
     background-image: none; }
   .inline-toolbar toolbutton > button:backdrop:disabled {
     border-width: 2px;
     border-style: solid;
-    color: gray;
-    background-color: #070707;
-    border-color: #737373;
+    color: #7f7f7f;
+    background-color: #060606;
+    border-color: #727272;
     background-image: none; }
   .inline-toolbar toolbutton > button:backdrop:disabled:active {
     border-width: 2px;
     border-style: solid;
-    color: gray;
-    border-color: #737373;
+    color: #7f7f7f;
+    border-color: #727272;
     background-image: none;
     background-color: #090909; }
 
@@ -711,7 +711,7 @@ modelbutton.flat,
       background-color: #aaa; }
   modelbutton.flat:disabled,
   .menuitem.button.flat:disabled {
-    color: gray; }
+    color: #7f7f7f; }
 
 button.color {
   padding: 4px; }
@@ -754,7 +754,7 @@ spinbutton {
    */ }
   spinbutton button {
     background-image: none;
-    border-color: rgba(128, 128, 128, 0.3);
+    border-color: rgba(127, 127, 127, 0.3);
     color: #f3f3f3;
     border-radius: 0; }
     spinbutton button:dir(ltr) {
@@ -770,7 +770,7 @@ spinbutton {
         border-style: none solid none none; }
     spinbutton button:disabled {
       box-shadow: none;
-      color: rgba(128, 128, 128, 0.3); }
+      color: rgba(127, 127, 127, 0.3); }
       spinbutton button:disabled:dir(ltr) {
         border-style: none none none solid; }
       spinbutton button:disabled:dir(rtl) {
@@ -779,7 +779,7 @@ spinbutton {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2);
       background-color: rgba(0, 0, 0, 0.1); }
     spinbutton button:backdrop {
-      border-color: rgba(115, 115, 115, 0.3);
+      border-color: rgba(114, 114, 114, 0.3);
       background-color: #000;
       box-shadow: none; }
       spinbutton button:backdrop:dir(ltr) {
@@ -788,7 +788,7 @@ spinbutton {
         border-style: none solid none none; }
     spinbutton button:backdrop:disabled {
       box-shadow: none;
-      color: rgba(128, 128, 128, 0.3); }
+      color: rgba(127, 127, 127, 0.3); }
       spinbutton button:backdrop:disabled:dir(rtl) {
         border-width: 0 1px 0 0; }
       spinbutton button:backdrop:disabled:dir(ltr) {
@@ -801,27 +801,27 @@ spinbutton {
     color: #fff;
     background-image: none;
     background-color: #000;
-    border-color: gray; }
+    border-color: #7f7f7f; }
     spinbutton.vertical button:first-child:active {
       border-width: 2px;
       border-style: solid;
       background-image: none;
       color: black;
       background-color: white;
-      border-color: gray; }
+      border-color: #7f7f7f; }
     spinbutton.vertical button:first-child:hover {
       border-width: 2px;
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none; }
     spinbutton.vertical button:first-child:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
-      background-color: #070707;
-      border-color: gray;
+      color: #7f7f7f;
+      background-color: #060606;
+      border-color: #7f7f7f;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -830,7 +830,7 @@ spinbutton {
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: #737373;
+      border-color: #727272;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -840,27 +840,27 @@ spinbutton {
     color: #fff;
     background-image: none;
     background-color: #000;
-    border-color: gray; }
+    border-color: #7f7f7f; }
     spinbutton.vertical button:last-child:active {
       border-width: 2px;
       border-style: solid;
       background-image: none;
       color: black;
       background-color: white;
-      border-color: gray; }
+      border-color: #7f7f7f; }
     spinbutton.vertical button:last-child:hover {
       border-width: 2px;
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none; }
     spinbutton.vertical button:last-child:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
-      background-color: #070707;
-      border-color: gray;
+      color: #7f7f7f;
+      background-color: #060606;
+      border-color: #7f7f7f;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -869,16 +869,16 @@ spinbutton {
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: #737373;
+      border-color: #727272;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
   spinbutton.vertical button:backdrop:disabled {
     border-width: 2px;
     border-style: solid;
-    color: gray;
-    background-color: #070707;
-    border-color: #737373;
+    color: #7f7f7f;
+    background-color: #060606;
+    border-color: #727272;
     background-image: none; }
   spinbutton.vertical.entry {
     border-radius: 0; }
@@ -899,7 +899,7 @@ combobox {
     padding-left: 8px;
     padding-right: 8px; }
   combobox:disabled {
-    color: gray;
+    color: #7f7f7f;
     text-shadow: none;
     -gtk-icon-shadow: none; }
   combobox:backdrop {
@@ -907,7 +907,7 @@ combobox {
     text-shadow: none;
     -gtk-icon-shadow: none; }
   combobox:backdrop:disabled {
-    color: gray; }
+    color: #7f7f7f; }
   combobox arrow {
     -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
     min-height: 16px;
@@ -944,25 +944,25 @@ toolbar, searchbar {
     padding: 3px;
     border-radius: 0  0 4px 4px; }
   toolbar.vertical, searchbar.vertical {
-    border-right: 1px solid gray; }
+    border-right: 1px solid #7f7f7f; }
     toolbar.vertical:dir(rtl), searchbar.vertical:dir(rtl) {
       border-right: none;
-      border-left: 1px solid gray; }
+      border-left: 1px solid #7f7f7f; }
 
 searchbar {
   border-width: 0 0 1px;
-  border-color: gray;
+  border-color: #7f7f7f;
   border-style: none none solid none;
   padding: 3px; }
 
 toolbar.inline-toolbar, searchbar.inline-toolbar {
   border-style: solid;
-  border-color: gray;
+  border-color: #7f7f7f;
   background-color: #262626;
-  box-shadow: inset 0 2px 3px -1px #5c5c5c; }
+  box-shadow: inset 0 2px 3px -1px #5b5b5b; }
   toolbar.inline-toolbar:backdrop, searchbar.inline-toolbar:backdrop {
-    border-color: #737373;
-    background-color: #282828;
+    border-color: #727272;
+    background-color: #272727;
     box-shadow: none; }
 
 /***************
@@ -972,7 +972,7 @@ toolbar.inline-toolbar, searchbar.inline-toolbar {
 headerbar {
   border-width: 0 0 1px;
   border-style: solid;
-  border-color: gray;
+  border-color: #7f7f7f;
   border-radius: 7px 7px 0 0;
   background-color: transparent;
   background-image: linear-gradient(to bottom, #0a0a0a, #000);
@@ -980,7 +980,7 @@ headerbar {
   padding: 6px; }
   .titlebar:backdrop,
   headerbar:backdrop {
-    border-color: #737373;
+    border-color: #727272;
     background-color: #000;
     background-image: none;
     box-shadow: none; }
@@ -1032,9 +1032,9 @@ headerbar {
       headerbar.selection-mode button:disabled {
         border-width: 2px;
         border-style: solid;
-        color: gray;
-        background-color: #070707;
-        border-color: gray;
+        color: #7f7f7f;
+        background-color: #060606;
+        border-color: #7f7f7f;
         background-image: none;
         text-shadow: none;
         -gtk-icon-shadow: none; }
@@ -1053,9 +1053,9 @@ headerbar {
       headerbar.selection-mode button:backdrop:disabled {
         border-width: 2px;
         border-style: solid;
-        color: gray;
-        background-color: #070707;
-        border-color: #737373;
+        color: #7f7f7f;
+        background-color: #060606;
+        border-color: #727272;
         background-image: none; }
       .titlebar.selection-mode button.suggested-action,
       headerbar.selection-mode button.suggested-action {
@@ -1064,14 +1064,14 @@ headerbar {
         color: #fff;
         background-image: none;
         background-color: #000;
-        border-color: gray; }
+        border-color: #7f7f7f; }
         .titlebar.selection-mode button.suggested-action:hover,
         headerbar.selection-mode button.suggested-action:hover {
           border-width: 2px;
           border-style: solid;
           color: #fff;
           background-color: #000;
-          border-color: gray;
+          border-color: #7f7f7f;
           background-image: none; }
         .titlebar.selection-mode button.suggested-action:active,
         headerbar.selection-mode button.suggested-action:active {
@@ -1080,14 +1080,14 @@ headerbar {
           background-image: none;
           color: black;
           background-color: white;
-          border-color: gray; }
+          border-color: #7f7f7f; }
         .titlebar.selection-mode button.suggested-action:disabled,
         headerbar.selection-mode button.suggested-action:disabled {
           border-width: 2px;
           border-style: solid;
-          color: gray;
-          background-color: #070707;
-          border-color: gray;
+          color: #7f7f7f;
+          background-color: #060606;
+          border-color: #7f7f7f;
           background-image: none;
           text-shadow: none;
           -gtk-icon-shadow: none; }
@@ -1097,7 +1097,7 @@ headerbar {
           border-style: solid;
           color: #fff;
           background-color: #000;
-          border-color: #737373;
+          border-color: #727272;
           background-image: none;
           text-shadow: none;
           -gtk-icon-shadow: none; }
@@ -1105,9 +1105,9 @@ headerbar {
         headerbar.selection-mode button.suggested-action:backdrop:disabled {
           border-width: 2px;
           border-style: solid;
-          color: gray;
-          background-color: #070707;
-          border-color: #737373;
+          color: #7f7f7f;
+          background-color: #060606;
+          border-color: #727272;
           background-image: none; }
     .titlebar.selection-mode .selection-menu,
     headerbar.selection-mode .selection-menu {
@@ -1155,44 +1155,44 @@ treeview.view {
   treeview.view:selected {
     border-radius: 0; }
   treeview.view:selected, treeview.view:backdrop:selected {
-    border-left-color: #d5d5d5;
+    border-left-color: #d4d4d4;
     border-top-color: rgba(255, 255, 255, 0.1); }
   treeview.view:disabled {
-    color: gray; }
+    color: #7f7f7f; }
     treeview.view:disabled:selected {
       color: #cccccc; }
       treeview.view:disabled:selected:backdrop {
-        color: #d5d5d5; }
+        color: #d4d4d4; }
     treeview.view:disabled:backdrop {
-      color: gray; }
+      color: #7f7f7f; }
   treeview.view.separator:backdrop {
     min-height: 2px;
     color: rgba(0, 0, 0, 0.1); }
   treeview.view:backdrop {
     color: #fff;
-    border-left-color: gray;
+    border-left-color: #7f7f7f;
     border-top: #000; }
   treeview.view.dnd {
     border-style: solid none;
     border-width: 1px;
-    border-color: #d5d5d5; }
+    border-color: #d4d4d4; }
   treeview.view.expander {
     -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
-    color: #b8b8b8; }
+    color: #b7b7b7; }
     treeview.view.expander:dir(rtl) {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
     treeview.view.expander:hover {
       color: #fff; }
     treeview.view.expander:selected {
-      color: #e6e6e6; }
+      color: #e5e5e5; }
       treeview.view.expander:selected:hover {
         color: #fff; }
       treeview.view.expander:selected:backdrop {
-        color: #e6e6e6; }
+        color: #e5e5e5; }
     treeview.view.expander:checked {
       -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
     treeview.view.expander:backdrop {
-      color: #b8b8b8; }
+      color: #b7b7b7; }
   treeview.view.progressbar {
     color: #111;
     border: 1px solid #aaa;
@@ -1218,7 +1218,7 @@ treeview.view {
     text-shadow: none;
     box-shadow: none; }
     treeview.view header button:hover {
-      color: #c4c4c4;
+      color: #c3c3c3;
       box-shadow: none; }
     treeview.view header button:active {
       color: #fff; }
@@ -1231,15 +1231,15 @@ treeview.view header button, treeview.view header button:hover, treeview.view he
   border-radius: 0;
   border-width: 1px;
   background-image: none;
-  border-color: gray;
+  border-color: #7f7f7f;
   text-shadow: none; }
   treeview.view header button:disabled {
     border-color: #000;
     background-image: none; }
   treeview.view header button:backdrop {
-    border-color: gray;
+    border-color: #7f7f7f;
     border-style: none solid solid none;
-    color: gray;
+    color: #7f7f7f;
     background-image: none;
     background-color: #111; }
     treeview.view header button:backdrop:disabled {
@@ -1249,7 +1249,7 @@ treeview.view header button, treeview.view header button:hover, treeview.view he
 treeview.view.progressbar {
   color: #111;
   border-radius: 4px;
-  background-image: linear-gradient(to bottom, #aaa, #919191); }
+  background-image: linear-gradient(to bottom, #aaa, #909090); }
   treeview.view.progressbar:selected {
     color: #aaa;
     background-image: linear-gradient(to bottom, #111, black); }
@@ -1276,7 +1276,7 @@ menubar,
       color: #aaa; }
     menubar > menuitem:disabled,
     .menubar > menuitem:disabled {
-      color: gray;
+      color: #7f7f7f;
       box-shadow: none; }
 
 menu,
@@ -1284,7 +1284,7 @@ menu,
   margin: 4px;
   padding: 0px;
   background-color: #111;
-  border: 1px solid gray; }
+  border: 1px solid #7f7f7f; }
   menu menuitem,
   .menu menuitem {
     text-shadow: none;
@@ -1296,10 +1296,10 @@ menu,
       background-color: #aaa; }
     menu menuitem:disabled,
     .menu menuitem:disabled {
-      color: gray; }
+      color: #7f7f7f; }
       menu menuitem:disabled:backdrop,
       .menu menuitem:disabled:backdrop {
-        color: gray; }
+        color: #7f7f7f; }
     menu menuitem:backdrop, menu menuitem:backdrop:hover,
     .menu menuitem:backdrop,
     .menu menuitem:backdrop:hover {
@@ -1332,7 +1332,7 @@ menuitem check, menuitem radio {
 popover {
   margin: 10px;
   padding: 2px;
-  border-color: gray;
+  border-color: #7f7f7f;
   border-width: 1px;
   border-style: solid;
   border-radius: 5px;
@@ -1357,7 +1357,7 @@ popover {
   popover.magnifier, popover.osd {
     background-image: none;
     background-color: rgba(0, 0, 0, 0.8);
-    border: 1px solid gray;
+    border: 1px solid #7f7f7f;
     color: #fff; }
     popover.magnifier button, popover.osd button {
       color: white;
@@ -1387,7 +1387,7 @@ popover {
         border-width: 2px;
         border-style: solid;
         border-color: rgba(255, 255, 255, 0.2);
-        color: gray; }
+        color: #7f7f7f; }
 
 /*****************
  * Notebooks and *
@@ -1398,20 +1398,19 @@ notebook {
   -GtkNotebook-arrow-spacing: 5;
   -GtkNotebook-tab-curvature: 0;
   -GtkNotebook-tab-overlap: -8;
-  -GtkNotebook-has-tab-gap: false;
   padding: 0;
   background-color: #111;
   transition: all 200ms ease-out; }
   notebook:backdrop {
     background-color: #111; }
   notebook.frame {
-    border: 1px solid gray; }
+    border: 1px solid #7f7f7f; }
     notebook.frame:backdrop {
-      border-color: #737373; }
+      border-color: #727272; }
   notebook header {
     background-color: #262626; }
     .frame notebook header {
-      border: 1px solid gray; }
+      border: 1px solid #7f7f7f; }
       .frame notebook header.top {
         border-bottom-width: 0; }
       .frame notebook header.bottom {
@@ -1421,34 +1420,34 @@ notebook {
       .frame notebook header.left {
         border-right-width: 0; }
       .frame notebook header:backdrop {
-        border-color: #737373; }
+        border-color: #727272; }
     notebook header.top {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 -1px gray; }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 -1px #7f7f7f; }
       notebook header.top:backdrop {
-        box-shadow: inset 0 -1px #737373; }
+        box-shadow: inset 0 -1px #727272; }
     notebook header.bottom {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 1px gray; }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 1px #7f7f7f; }
       notebook header.bottom:backdrop {
-        box-shadow: inset 0 1px #737373; }
+        box-shadow: inset 0 1px #727272; }
     notebook header.right {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 1px 0 gray; }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 1px 0 #7f7f7f; }
       notebook header.right:backdrop {
-        box-shadow: inset 1px 0 #737373; }
+        box-shadow: inset 1px 0 #727272; }
     notebook header.left {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset -1px 0 gray; }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset -1px 0 #7f7f7f; }
       notebook header.left:backdrop {
-        box-shadow: inset -1px 0 #737373; }
+        box-shadow: inset -1px 0 #727272; }
     notebook header:backdrop {
-      background-color: #282828;
+      background-color: #272727;
       box-shadow: none; }
     notebook header tabs arrow {
-      color: gray; }
+      color: #7f7f7f; }
       notebook header tabs arrow:hover {
-        color: silver; }
+        color: #bfbfbf; }
       notebook header tabs arrow:active {
         color: #fff; }
       notebook header tabs arrow:disabled {
-        color: rgba(128, 128, 128, 0.3); }
+        color: rgba(127, 127, 127, 0.3); }
       notebook header tabs arrow:backdrop {
         color: rgba(255, 255, 255, 0.4); }
   notebook header.top tab {
@@ -1486,7 +1485,7 @@ notebook {
     background-color: transparent;
     outline-offset: 0; }
     notebook tab:hover {
-      border-color: gray; }
+      border-color: #7f7f7f; }
     notebook tab:active, notebook tab:backdrop:active {
       border-color: #aaa; }
     notebook tab:backdrop {
@@ -1495,17 +1494,17 @@ notebook {
     .top notebook tab.reorderable-page {
       border-color: transparent; }
       .top notebook tab.reorderable-page:hover {
-        border-color: rgba(128, 128, 128, 0.3);
-        border-bottom-color: gray;
+        border-color: rgba(127, 127, 127, 0.3);
+        border-bottom-color: #7f7f7f;
         background-color: rgba(0, 0, 0, 0.2); }
       .top notebook tab.reorderable-page:active {
         background-color: rgba(0, 0, 0, 0.5);
-        border-color: rgba(128, 128, 128, 0.5);
+        border-color: rgba(127, 127, 127, 0.5);
         border-bottom-color: #aaa; }
         .top notebook tab.reorderable-page:active:hover {
           background-color: rgba(0, 0, 0, 0.7); }
         .top notebook tab.reorderable-page:active:backdrop {
-          border-color: #737373;
+          border-color: #727272;
           background-color: #000;
           border-bottom-color: #aaa; }
       .top notebook tab.reorderable-page:backdrop {
@@ -1514,17 +1513,17 @@ notebook {
     .bottom notebook tab.reorderable-page {
       border-color: transparent; }
       .bottom notebook tab.reorderable-page:hover {
-        border-color: rgba(128, 128, 128, 0.3);
-        border-top-color: gray;
+        border-color: rgba(127, 127, 127, 0.3);
+        border-top-color: #7f7f7f;
         background-color: rgba(0, 0, 0, 0.2); }
       .bottom notebook tab.reorderable-page:active {
         background-color: rgba(0, 0, 0, 0.5);
-        border-color: rgba(128, 128, 128, 0.5);
+        border-color: rgba(127, 127, 127, 0.5);
         border-top-color: #aaa; }
         .bottom notebook tab.reorderable-page:active:hover {
           background-color: rgba(0, 0, 0, 0.7); }
         .bottom notebook tab.reorderable-page:active:backdrop {
-          border-color: #737373;
+          border-color: #727272;
           background-color: #000;
           border-top-color: #aaa; }
       .bottom notebook tab.reorderable-page:backdrop {
@@ -1533,17 +1532,17 @@ notebook {
     .left notebook tab.reorderable-page {
       border-color: transparent; }
       .left notebook tab.reorderable-page:hover {
-        border-color: rgba(128, 128, 128, 0.3);
-        border-right-color: gray;
+        border-color: rgba(127, 127, 127, 0.3);
+        border-right-color: #7f7f7f;
         background-color: rgba(0, 0, 0, 0.2); }
       .left notebook tab.reorderable-page:active {
         background-color: rgba(0, 0, 0, 0.5);
-        border-color: rgba(128, 128, 128, 0.5);
+        border-color: rgba(127, 127, 127, 0.5);
         border-right-color: #aaa; }
         .left notebook tab.reorderable-page:active:hover {
           background-color: rgba(0, 0, 0, 0.7); }
         .left notebook tab.reorderable-page:active:backdrop {
-          border-color: #737373;
+          border-color: #727272;
           background-color: #000;
           border-right-color: #aaa; }
       .left notebook tab.reorderable-page:backdrop {
@@ -1552,17 +1551,17 @@ notebook {
     .right notebook tab.reorderable-page {
       border-color: transparent; }
       .right notebook tab.reorderable-page:hover {
-        border-color: rgba(128, 128, 128, 0.3);
-        border-left-color: gray;
+        border-color: rgba(127, 127, 127, 0.3);
+        border-left-color: #7f7f7f;
         background-color: rgba(0, 0, 0, 0.2); }
       .right notebook tab.reorderable-page:active {
         background-color: rgba(0, 0, 0, 0.5);
-        border-color: rgba(128, 128, 128, 0.5);
+        border-color: rgba(127, 127, 127, 0.5);
         border-left-color: #aaa; }
         .right notebook tab.reorderable-page:active:hover {
           background-color: rgba(0, 0, 0, 0.7); }
         .right notebook tab.reorderable-page:active:backdrop {
-          border-color: #737373;
+          border-color: #727272;
           background-color: #000;
           border-left-color: #aaa; }
       .right notebook tab.reorderable-page:backdrop {
@@ -1571,12 +1570,12 @@ notebook {
     notebook tab label {
       padding: 0 2px;
       font-weight: bold;
-      color: gray;
+      color: #7f7f7f;
       /* color: inherit doesn't work here */ }
       notebook tab label:backdrop {
-        color: gray; }
+        color: #7f7f7f; }
     notebook tab:hover label {
-      color: silver; }
+      color: #bfbfbf; }
     notebook tab:active label {
       color: #fff; }
       notebook tab:active label:backdrop {
@@ -1592,7 +1591,7 @@ notebook {
         border-style: solid;
         color: #fff;
         background-color: #000;
-        border-color: gray;
+        border-color: #7f7f7f;
         background-image: none;
         border-width: 2px;
         background-image: none;
@@ -1603,7 +1602,7 @@ notebook {
         background-image: none;
         color: black;
         background-color: white;
-        border-color: gray;
+        border-color: #7f7f7f;
         border-width: 2px; }
       notebook tab button:backdrop, notebook tab button:backdrop:hover {
         color: rgba(255, 255, 255, 0.3);
@@ -1631,11 +1630,11 @@ scrollbar {
   scrollbar slider {
     border-radius: 20px;
     border: 5px solid transparent;
-    background-color: gray; }
+    background-color: #7f7f7f; }
     scrollbar slider:backdrop, scrollbar slider:disabled {
-      background-color: #1a1a1a; }
+      background-color: #191919; }
     scrollbar slider:hover {
-      background-color: #b3b3b3; }
+      background-color: #b2b2b2; }
     scrollbar slider:hover:active {
       background-color: #aaa; }
     scrollbar slider.fine-tune {
@@ -1671,8 +1670,8 @@ switch {
   border-width: 1px;
   border-style: solid;
   border-radius: 3px;
-  border-color: gray;
-  background-color: #333333;
+  border-color: #7f7f7f;
+  background-color: #323232;
   box-shadow: inset 0 1px rgba(0, 0, 0, 0.1);
   /*outset not working*/
   text-shadow: 0 1px rgba(0, 0, 0, 0.1); }
@@ -1682,25 +1681,25 @@ switch {
     background-color: #aaa;
     text-shadow: 0 0 2px white; }
   switch:disabled {
-    color: gray;
-    border-color: gray;
-    background-color: #070707;
+    color: #7f7f7f;
+    border-color: #7f7f7f;
+    background-color: #060606;
     text-shadow: none; }
   switch:backdrop {
     color: #fff;
-    border-color: #737373;
+    border-color: #727272;
     background-color: #000;
     box-shadow: none;
     text-shadow: none; }
     switch:backdrop:active {
       color: #fff;
-      border-color: #737373;
-      background-color: #737373;
+      border-color: #727272;
+      background-color: #727272;
       box-shadow: none; }
     switch:backdrop:disabled, switch:backdrop:disabled:active {
-      background-color: #070707;
-      color: gray;
-      border-color: gray; }
+      background-color: #060606;
+      color: #7f7f7f;
+      border-color: #7f7f7f; }
   switch slider {
     margin: -1px;
     min-width: 45px;
@@ -1712,24 +1711,24 @@ switch {
     color: #fff;
     background-image: none;
     background-color: #000;
-    border-color: gray;
-    box-shadow: inset 0 1px white, inset 0 -2px rgba(0, 0, 0, 0.6), inset 0 -1px #404040; }
+    border-color: #7f7f7f;
+    box-shadow: inset 0 1px white, inset 0 -2px rgba(0, 0, 0, 0.6), inset 0 -1px #3f3f3f; }
     switch slider:hover {
       border-width: 2px;
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none;
-      box-shadow: inset 0 1px white, inset 0 -2px rgba(0, 0, 0, 0.6), inset 0 -1px #404040; }
+      box-shadow: inset 0 1px white, inset 0 -2px rgba(0, 0, 0, 0.6), inset 0 -1px #3f3f3f; }
     switch slider:active {
       border-color: #aaa; }
     switch slider:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
-      background-color: #070707;
-      border-color: gray;
+      color: #7f7f7f;
+      background-color: #060606;
+      border-color: #7f7f7f;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -1738,18 +1737,18 @@ switch {
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: #737373;
+      border-color: #727272;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
       switch slider:backdrop:active {
-        border-color: #737373; }
+        border-color: #727272; }
       switch slider:backdrop:disabled {
         border-width: 2px;
         border-style: solid;
-        color: gray;
-        background-color: #070707;
-        border-color: #737373;
+        color: #7f7f7f;
+        background-color: #060606;
+        border-color: #727272;
         background-image: none; }
 
 /*************************
@@ -1768,15 +1767,15 @@ check {
   check:checked, check:active {
     -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); }
     check:checked:disabled, check:active:disabled {
-      color: gray; }
+      color: #7f7f7f; }
       check:checked:disabled:backdrop, check:active:disabled:backdrop {
-        color: gray; }
+        color: #7f7f7f; }
     check:checked:backdrop, check:active:backdrop {
       color: #fff; }
   check:disabled {
-    color: gray; }
+    color: #7f7f7f; }
     check:disabled:backdrop {
-      color: gray; }
+      color: #7f7f7f; }
   check:indeterminate {
     -gtk-icon-source: -gtk-icontheme("checkbox-mixed-symbolic"); }
   check:backdrop {
@@ -1793,15 +1792,15 @@ radio {
   radio:checked, radio:active {
     -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); }
     radio:checked:disabled, radio:active:disabled {
-      color: gray; }
+      color: #7f7f7f; }
       radio:checked:disabled:backdrop, radio:active:disabled:backdrop {
-        color: gray; }
+        color: #7f7f7f; }
     radio:checked:backdrop, radio:active:backdrop {
       color: #fff; }
   radio:disabled {
-    color: gray; }
+    color: #7f7f7f; }
     radio:disabled:backdrop {
-      color: gray; }
+      color: #7f7f7f; }
   radio:indeterminate {
     -gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); }
   radio:backdrop {
@@ -1847,9 +1846,9 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
     color: #fff;
     background-image: none;
     background-color: #000;
-    border-color: gray;
+    border-color: #7f7f7f;
     border-radius: 50%;
-    border-color: #787878; }
+    border-color: #777777; }
     scale trough slider:hover,
     scale.scale-has-marks-above.scale-has-marks-below trough slider:hover,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:hover {
@@ -1857,9 +1856,9 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none;
-      border-color: #787878;
+      border-color: #777777;
       border-radius: 50%; }
     scale trough slider:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough slider:disabled,
@@ -1873,7 +1872,7 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:backdrop {
       border-style: solid;
       border-radius: 50%;
-      border-color: #6b6b6b;
+      border-color: #6a6a6a;
       background-image: none;
       box-shadow: none; }
     scale trough slider:backdrop:disabled,
@@ -1881,9 +1880,9 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:backdrop:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
-      background-color: #070707;
-      border-color: #737373;
+      color: #7f7f7f;
+      background-color: #060606;
+      border-color: #727272;
       background-image: none; }
     scale trough slider:active,
     scale.scale-has-marks-above.scale-has-marks-below trough slider:active,
@@ -1896,8 +1895,8 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
     border-width: 1px;
     border-style: solid;
     border-radius: 3px;
-    border-color: gray;
-    background-color: #333333;
+    border-color: #7f7f7f;
+    background-color: #323232;
     box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); }
     scale trough.highlight,
     scale.scale-has-marks-above.scale-has-marks-below trough.highlight,
@@ -1907,28 +1906,28 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
       scale trough.highlight:backdrop,
       scale.scale-has-marks-above.scale-has-marks-below trough.highlight:backdrop,
       scale.vertical.scale-has-marks-above.scale-has-marks-below trough.highlight:backdrop {
-        border-color: gray;
-        background-color: gray;
+        border-color: #7f7f7f;
+        background-color: #7f7f7f;
         box-shadow: none; }
     scale trough:disabled, scale trough.hilight:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough.hilight:disabled,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough:disabled,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough.hilight:disabled {
-      border-color: gray;
-      background-color: #070707; }
+      border-color: #7f7f7f;
+      background-color: #060606; }
     scale trough:backdrop,
     scale.scale-has-marks-above.scale-has-marks-below trough:backdrop,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough:backdrop {
-      border-color: #737373;
-      background-color: #404040;
+      border-color: #727272;
+      background-color: #3f3f3f;
       box-shadow: none; }
     scale trough:backdrop:disabled, scale trough .hilight:backdrop:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough:backdrop:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough .hilight:backdrop:disabled,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough:backdrop:disabled,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough .hilight:backdrop:disabled {
-      border-color: gray;
+      border-color: #7f7f7f;
       background-color: #000; }
 
 /*****************
@@ -1939,17 +1938,17 @@ progressbar {
   font-size: 83%;
   color: #fff; }
   progressbar:backdrop {
-    color: gray; }
+    color: #7f7f7f; }
   progressbar trough {
     border-width: 1px;
     border-style: solid;
     border-radius: 3px;
-    border-color: gray;
-    background-color: #2d2d2d;
+    border-color: #7f7f7f;
+    background-color: #2c2c2c;
     box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); }
     progressbar trough:backdrop {
-      border-color: #737373;
-      background-color: #282828;
+      border-color: #727272;
+      background-color: #272727;
       box-shadow: 0 1px rgba(255, 255, 255, 0); }
   progressbar.osd trough {
     background-color: transparent;
@@ -1986,8 +1985,8 @@ levelbar trough {
   background-color: transparent;
   border-style: solid;
   background-image: linear-gradient(to bottom, #090909, #111 90%);
-  border-color: gray;
-  box-shadow: inset 0 2px 2px -2px #090909; }
+  border-color: #7f7f7f;
+  box-shadow: inset 0 2px 2px -2px #080808; }
   levelbar trough:backdrop {
     background-color: transparent;
     border-style: solid;
@@ -2013,7 +2012,7 @@ levelbar block.filled.low {
 levelbar block.filled.high {
   border-width: 1px;
   border-style: solid;
-  border-color: #919191;
+  border-color: #909090;
   background-color: #aaa;
   box-shadow: 0 1px rgba(0, 0, 0, 0.1);
   border-radius: 1px; }
@@ -2056,7 +2055,7 @@ spinbutton selection:focus, modelbutton.flat:hover, modelbutton.flat:selected,
   spinbutton selection:backdrop:focus, modelbutton.flat:backdrop:hover, modelbutton.flat:backdrop:selected,
   .menuitem.button.flat:backdrop:hover,
   .menuitem.button.flat:backdrop:selected, treeview.view:backdrop:selected, row.activatable:backdrop:selected, .sidebar:backdrop:selected, placessidebar .view:backdrop:selected, placessidebar calendar:backdrop:selected {
-    background-color: gray;
+    background-color: #7f7f7f;
     color: #fff; }
 
 /**********
@@ -2064,19 +2063,19 @@ spinbutton selection:focus, modelbutton.flat:hover, modelbutton.flat:selected,
  **********/
 frame border,
 .frame {
-  border: 1px solid gray;
+  border: 1px solid #7f7f7f;
   padding: 0; }
   frame border.flat,
   .frame.flat {
     border-style: none; }
   frame border:backdrop,
   .frame:backdrop {
-    border-color: #737373; }
+    border-color: #727272; }
 
 actionbar box {
   padding: 6px;
   border-width: 1px 0 0;
-  border-color: gray;
+  border-color: #7f7f7f;
   border-style: solid none none; }
 
 placessidebar .frame,
@@ -2087,7 +2086,7 @@ scrolledwindow viewport.frame {
   border-style: none; }
 placessidebar overshoot.top,
 scrolledwindow overshoot.top {
-  background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#010101), to(rgba(1, 1, 1, 0))), -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(255, 255, 255, 0.5)), to(rgba(255, 255, 255, 0)));
+  background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(black), to(transparent)), -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(255, 255, 255, 0.5)), to(rgba(255, 255, 255, 0)));
   background-size: 100% 5%, 100% 100%;
   background-repeat: no-repeat;
   background-position: center top;
@@ -2096,7 +2095,7 @@ scrolledwindow overshoot.top {
   box-shadow: none; }
   placessidebar overshoot.top:backdrop,
   scrolledwindow overshoot.top:backdrop {
-    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#737373), to(rgba(115, 115, 115, 0)));
+    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#727272), to(rgba(114, 114, 114, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center top;
@@ -2105,7 +2104,7 @@ scrolledwindow overshoot.top {
     box-shadow: none; }
 placessidebar overshoot.bottom,
 scrolledwindow overshoot.bottom {
-  background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#010101), to(rgba(1, 1, 1, 0))), -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(255, 255, 255, 0.5)), to(rgba(255, 255, 255, 0)));
+  background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(black), to(transparent)), -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(255, 255, 255, 0.5)), to(rgba(255, 255, 255, 0)));
   background-size: 100% 5%, 100% 100%;
   background-repeat: no-repeat;
   background-position: center bottom;
@@ -2114,7 +2113,7 @@ scrolledwindow overshoot.bottom {
   box-shadow: none; }
   placessidebar overshoot.bottom:backdrop,
   scrolledwindow overshoot.bottom:backdrop {
-    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#737373), to(rgba(115, 115, 115, 0)));
+    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#727272), to(rgba(114, 114, 114, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center bottom;
@@ -2123,7 +2122,7 @@ scrolledwindow overshoot.bottom {
     box-shadow: none; }
 placessidebar overshoot.left,
 scrolledwindow overshoot.left {
-  background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#010101), to(rgba(1, 1, 1, 0))), -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(255, 255, 255, 0.5)), to(rgba(255, 255, 255, 0)));
+  background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(black), to(transparent)), -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(255, 255, 255, 0.5)), to(rgba(255, 255, 255, 0)));
   background-size: 5% 100%, 100% 100%;
   background-repeat: no-repeat;
   background-position: left center;
@@ -2132,7 +2131,7 @@ scrolledwindow overshoot.left {
   box-shadow: none; }
   placessidebar overshoot.left:backdrop,
   scrolledwindow overshoot.left:backdrop {
-    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#737373), to(rgba(115, 115, 115, 0)));
+    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#727272), to(rgba(114, 114, 114, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: left center;
@@ -2141,7 +2140,7 @@ scrolledwindow overshoot.left {
     box-shadow: none; }
 placessidebar overshoot.right,
 scrolledwindow overshoot.right {
-  background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#010101), to(rgba(1, 1, 1, 0))), -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(255, 255, 255, 0.5)), to(rgba(255, 255, 255, 0)));
+  background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(black), to(transparent)), -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(255, 255, 255, 0.5)), to(rgba(255, 255, 255, 0)));
   background-size: 5% 100%, 100% 100%;
   background-repeat: no-repeat;
   background-position: right center;
@@ -2150,7 +2149,7 @@ scrolledwindow overshoot.right {
   box-shadow: none; }
   placessidebar overshoot.right:backdrop,
   scrolledwindow overshoot.right:backdrop {
-    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#737373), to(rgba(115, 115, 115, 0)));
+    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#727272), to(rgba(114, 114, 114, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: right center;
@@ -2215,7 +2214,7 @@ scrollbar scrolledwindow trough {
 
 separator, placessidebar .view separator,
 placessidebar .view separator:backdrop {
-  background: gray;
+  background: #7f7f7f;
   min-width: 1px;
   min-height: 1px; }
 
@@ -2224,10 +2223,10 @@ placessidebar .view separator:backdrop {
  *********/
 list {
   background-color: #111;
-  border-color: gray; }
+  border-color: #7f7f7f; }
   list:backdrop {
     background-color: #111;
-    border-color: #737373; }
+    border-color: #727272; }
   list row {
     padding: 2px; }
 
@@ -2248,7 +2247,7 @@ row.activatable:disabled:checked {
 row.activatable {
   color: #fff; }
   row.activatable:hover, placessidebar .has-open-popup {
-    background-color: #1d1d1d; }
+    background-color: #1c1c1c; }
   row.activatable:active {
     box-shadow: inset 0 2px 2px -2px rgba(0, 0, 0, 0.2); }
   row.activatable:selected {
@@ -2257,9 +2256,9 @@ row.activatable {
     row.activatable:selected:active {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); }
     row.activatable:selected:hover, placessidebar .has-open-popup:selected {
-      background-color: #b3b3b3; }
+      background-color: #b2b2b2; }
     row.activatable:selected:backdrop {
-      background-color: gray; }
+      background-color: #7f7f7f; }
     row.activatable:selected .button.flat {
       color: #fff; }
       row.activatable:selected .button.flat:hover {
@@ -2287,7 +2286,7 @@ row.activatable {
   padding: 10px;
   border-width: 0 1px 1px;
   border-style: solid;
-  border-color: gray;
+  border-color: #7f7f7f;
   border-radius: 0 0 6px 6px;
   background-image: linear-gradient(to bottom, black 5%, black); }
   .app-notification .button,
@@ -2312,7 +2311,7 @@ expander arrow {
  * Calendar *
  ***********/
 calendar {
-  border: 1px solid gray; }
+  border: 1px solid #7f7f7f; }
   calendar.button {
     padding: 0 4px;
     color: #707070; }
@@ -2324,10 +2323,10 @@ calendar {
     border-radius: 2px; }
   calendar.header {
     background: linear-gradient(to bottom, #050505, black);
-    border-bottom-color: #404040; }
+    border-bottom-color: #3f3f3f; }
     calendar.header:backdrop {
       background-image: linear-gradient(to bottom, #000);
-      border-bottom-color: #3a3a3a; }
+      border-bottom-color: #393939; }
   calendar:indeterminate, calendar:indeterminate:backdrop {
     color: alpha(currentColor,0.55); }
   calendar.highlight, calendar.highlight:backdrop {
@@ -2353,13 +2352,13 @@ messagedialog.csd {
     color: #fff;
     background-image: none;
     background-color: #000;
-    border-color: gray; }
+    border-color: #7f7f7f; }
     messagedialog.csd .dialog-action-area button:hover {
       border-width: 2px;
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none; }
     messagedialog.csd .dialog-action-area button:active {
       border-width: 2px;
@@ -2367,13 +2366,13 @@ messagedialog.csd {
       background-image: none;
       color: black;
       background-color: white;
-      border-color: gray; }
+      border-color: #7f7f7f; }
     messagedialog.csd .dialog-action-area button:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
-      background-color: #070707;
-      border-color: gray;
+      color: #7f7f7f;
+      background-color: #060606;
+      border-color: #7f7f7f;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -2382,16 +2381,16 @@ messagedialog.csd {
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: #737373;
+      border-color: #727272;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
     messagedialog.csd .dialog-action-area button:backdrop:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
-      background-color: #070707;
-      border-color: #737373;
+      color: #7f7f7f;
+      background-color: #060606;
+      border-color: #727272;
       background-image: none; }
     messagedialog.csd .dialog-action-area button.suggested-action {
       border-width: 2px;
@@ -2426,16 +2425,16 @@ messagedialog.csd {
         messagedialog.csd .dialog-action-area button.suggested-action:backdrop:disabled {
           border-width: 2px;
           border-style: solid;
-          color: gray;
-          background-color: #070707;
-          border-color: #737373;
+          color: #7f7f7f;
+          background-color: #060606;
+          border-color: #727272;
           background-image: none; }
       messagedialog.csd .dialog-action-area button.suggested-action:disabled {
         border-width: 2px;
         border-style: solid;
-        color: gray;
-        background-color: #070707;
-        border-color: gray;
+        color: #7f7f7f;
+        background-color: #060606;
+        border-color: #7f7f7f;
         background-image: none;
         text-shadow: none;
         -gtk-icon-shadow: none; }
@@ -2472,16 +2471,16 @@ messagedialog.csd {
         messagedialog.csd .dialog-action-area button.destructive-action:backdrop:disabled {
           border-width: 2px;
           border-style: solid;
-          color: gray;
-          background-color: #070707;
-          border-color: #737373;
+          color: #7f7f7f;
+          background-color: #060606;
+          border-color: #727272;
           background-image: none; }
       messagedialog.csd .dialog-action-area button.destructive-action:disabled {
         border-width: 2px;
         border-style: solid;
-        color: gray;
-        background-color: #070707;
-        border-color: gray;
+        color: #7f7f7f;
+        background-color: #060606;
+        border-color: #7f7f7f;
         background-image: none;
         text-shadow: none;
         -gtk-icon-shadow: none; }
@@ -2495,9 +2494,9 @@ messagedialog.csd {
     border-bottom-left-radius: 7px; }
 
 GtkFileChooserDialog .dialog-action-box {
-  border-top: 1px solid gray; }
+  border-top: 1px solid #7f7f7f; }
   GtkFileChooserDialog .dialog-action-box:backdrop {
-    border-top-color: #737373; }
+    border-top-color: #727272; }
 
 /***********
  * Sidebar *
@@ -2507,10 +2506,10 @@ GtkFileChooserDialog .dialog-action-box {
   .sidebar:backdrop {
     background-color: #000; }
   .sidebar > scrolledwindow > .frame {
-    border-right: 1px solid gray; }
+    border-right: 1px solid #7f7f7f; }
     .sidebar > scrolledwindow > .frame:dir(rtl) {
       border-right: none;
-      border-left: 1px solid gray; }
+      border-left: 1px solid #7f7f7f; }
 
 placessidebar row {
   padding: 0px; }
@@ -2537,9 +2536,9 @@ placessidebar .view {
   color: #fff;
   background-color: transparent; }
   placessidebar .view .image {
-    color: #b3b3b3; }
+    color: #b2b2b2; }
     placessidebar .view .image:selected {
-      color: #f7f7f7; }
+      color: #f6f6f6; }
 
 stacksidebar row {
   padding: 10px 4px; }
@@ -2557,9 +2556,9 @@ paned placessidebar .view separator:backdrop,
 placessidebar .view paned separator:backdrop {
   min-width: 1px;
   min-height: 1px;
-  background-image: linear-gradient(to bottom, gray); }
+  background-image: linear-gradient(to bottom, #7f7f7f); }
   paned separator:backdrop {
-    background-image: linear-gradient(to bottom, #737373); }
+    background-image: linear-gradient(to bottom, #727272); }
 paned:dir(ltr).horizontal separator {
   margin: 0 -8px 0 0;
   padding: 0 8px 0 0; }
@@ -2582,7 +2581,7 @@ placessidebar .view paned separator.wide:backdrop {
   min-height: 5px;
   background-color: transparent;
   border-style: none solid;
-  border-color: gray;
+  border-color: #7f7f7f;
   border-width: 1px; }
 
 /**************
@@ -2598,8 +2597,8 @@ infobar {
 .error {
   background-color: #aaa;
   color: #fff;
-  text-shadow: 0 1px #919191;
-  border-color: #919191; }
+  text-shadow: 0 1px #909090;
+  border-color: #909090; }
   .info button,
   .question button,
   .warning button,
@@ -2636,9 +2635,9 @@ infobar {
     .error button:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
-      background-color: #070707;
-      border-color: gray;
+      color: #7f7f7f;
+      background-color: #060606;
+      border-color: #7f7f7f;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -2660,9 +2659,9 @@ infobar {
     .error button:backdrop:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
-      background-color: #070707;
-      border-color: #737373;
+      color: #7f7f7f;
+      background-color: #060606;
+      border-color: #727272;
       background-image: none; }
   .info label:selected,
   .info label:selected:focus,
@@ -2764,20 +2763,20 @@ colorswatch {
     color: #fff;
     background-image: none;
     background-color: #000;
-    border-color: gray; }
+    border-color: #7f7f7f; }
     colorswatch#add-color-button:hover {
       border-width: 2px;
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none; }
     colorswatch#add-color-button:backdrop {
       border-width: 2px;
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: #737373;
+      border-color: #727272;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -2808,7 +2807,7 @@ decoration {
     border-radius: 0;
     margin: 4px;
     background-color: #000;
-    border: solid 1px #737373;
+    border: solid 1px #727272;
     box-shadow: none; }
 
 button.titlebutton {
@@ -2823,20 +2822,20 @@ button.titlebutton {
     color: #fff;
     background-image: none;
     background-color: #000;
-    border-color: gray; }
+    border-color: #7f7f7f; }
   button.titlebutton:active {
     border-width: 2px;
     border-style: solid;
     background-image: none;
     color: black;
     background-color: white;
-    border-color: gray; }
+    border-color: #7f7f7f; }
   button.titlebutton:backdrop {
     border-width: 2px;
     border-style: solid;
     color: #fff;
     background-color: #000;
-    border-color: #737373;
+    border-color: #727272;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none;
@@ -2921,7 +2920,7 @@ cursor-handle {
       border-width: 2px;
       border-style: solid;
       border-color: rgba(255, 255, 255, 0.2);
-      color: gray; }
+      color: #7f7f7f; }
     .touch-selection button:backdrop {
       border-width: 2px;
       border-style: solid; }
diff --git a/gtk/theme/HighContrast/gtk-contained.css b/gtk/theme/HighContrast/gtk-contained.css
index 30d4b4674a..01bba03b9d 100644
--- a/gtk/theme/HighContrast/gtk-contained.css
+++ b/gtk/theme/HighContrast/gtk-contained.css
@@ -5,15 +5,15 @@
 @define-color theme_selected_bg_color #000;
 @define-color theme_selected_fg_color #fff;
 @define-color insensitive_bg_color white;
-@define-color insensitive_fg_color gray;
+@define-color insensitive_fg_color #7f7f7f;
 @define-color insensitive_base_color #fff;
 @define-color theme_unfocused_fg_color #000;
 @define-color theme_unfocused_bg_color #fff;
 @define-color theme_unfocused_base_color #fff;
 @define-color theme_unfocused_selected_bg_color #000;
 @define-color theme_unfocused_selected_fg_color #fff;
-@define-color borders gray;
-@define-color unfocused_borders #8d8d8d;
+@define-color borders #7f7f7f;
+@define-color unfocused_borders #8b8b8b;
 @define-color warning_color #f57900;
 @define-color error_color #cc0000;
 @define-color success_color #73d216;
@@ -80,7 +80,7 @@
     color: #000; }
   .gtkstyle-fallback:disabled {
     background-color: white;
-    color: gray; }
+    color: #7f7f7f; }
   .gtkstyle-fallback:selected {
     background-color: #000;
     color: #fff; }
@@ -115,7 +115,7 @@ flowbox flowboxchild {
     outline-offset: -2px; }
 
 label:disabled, label:backdrop:disabled {
-  color: gray; }
+  color: #7f7f7f; }
 
 /*********************
  * Spinner Animation *
@@ -144,15 +144,15 @@ entry, spinbutton {
   background-color: transparent;
   border-style: solid;
   background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-  border-color: gray;
-  box-shadow: inset 0 2px 2px -2px gray; }
+  border-color: #7f7f7f;
+  box-shadow: inset 0 2px 2px -2px #7f7f7f; }
   entry.flat, entry.flat:focus, spinbutton.flat, spinbutton.flat:focus {
     padding: 2px;
     background-color: transparent;
     border-style: solid;
     background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-    border-color: gray;
-    box-shadow: inset 0 2px 2px -2px gray;
+    border-color: #7f7f7f;
+    box-shadow: inset 0 2px 2px -2px #7f7f7f;
     border: none;
     border-radius: 0; }
   entry:focus, spinbutton:focus {
@@ -160,13 +160,13 @@ entry, spinbutton {
     border-style: solid;
     background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
     border-color: #000;
-    box-shadow: inset 0 2px 2px -2px gray, inset 0 0 2px 1px #cccccc; }
+    box-shadow: inset 0 2px 2px -2px #7f7f7f, inset 0 0 2px 1px #cccccc; }
   entry:disabled, spinbutton:disabled {
     background-color: transparent;
     border-style: solid;
     background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-    color: gray;
-    border-color: gray;
+    color: #7f7f7f;
+    border-color: #7f7f7f;
     background-image: linear-gradient(to bottom, white);
     box-shadow: none; }
   entry:backdrop, spinbutton:backdrop {
@@ -180,7 +180,7 @@ entry, spinbutton {
     background-color: transparent;
     border-style: solid;
     background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-    color: gray;
+    color: #7f7f7f;
     background-image: linear-gradient(to bottom, #fff);
     box-shadow: 0 1px rgba(255, 255, 255, 0); }
   entry selection, entry selection:backdrop, spinbutton selection, spinbutton selection:backdrop {
@@ -212,10 +212,10 @@ entry, spinbutton {
     background-color: transparent;
     border-style: solid;
     background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-    border-color: gray;
-    box-shadow: inset 0 2px 2px -2px gray;
+    border-color: #7f7f7f;
+    box-shadow: inset 0 2px 2px -2px #7f7f7f;
     background-image: linear-gradient(to bottom, #fff);
-    border-bottom-color: #d9d9d9;
+    border-bottom-color: #d8d8d8;
     box-shadow: none; }
     .linked.vertical entry:focus, .linked.vertical spinbutton:focus {
       border-color: #000;
@@ -224,19 +224,19 @@ entry, spinbutton {
       background-color: transparent;
       border-style: solid;
       background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-      color: gray;
-      border-color: gray;
+      color: #7f7f7f;
+      border-color: #7f7f7f;
       background-image: linear-gradient(to bottom, white);
       box-shadow: none;
-      border-bottom-color: #d9d9d9; }
+      border-bottom-color: #d8d8d8; }
       .linked.vertical entry:disabled:backdrop, .linked.vertical spinbutton:disabled:backdrop {
         background-color: transparent;
         border-style: solid;
         background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-        color: gray;
+        color: #7f7f7f;
         background-image: linear-gradient(to bottom, #fff);
         box-shadow: 0 1px rgba(255, 255, 255, 0);
-        border-bottom-color: #dddddd; }
+        border-bottom-color: gainsboro; }
     .linked.vertical entry:backdrop, .linked.vertical spinbutton:backdrop {
       background-color: transparent;
       border-style: solid;
@@ -244,37 +244,37 @@ entry, spinbutton {
       color: #000;
       background-image: linear-gradient(to bottom, #fff);
       box-shadow: 0 1px rgba(255, 255, 255, 0);
-      border-bottom-color: #dddddd; }
+      border-bottom-color: gainsboro; }
     .linked.vertical entry:first-child, .linked.vertical spinbutton:first-child {
       background-color: transparent;
       border-style: solid;
       background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-      border-color: gray;
-      box-shadow: inset 0 2px 2px -2px gray;
-      border-bottom-color: #d9d9d9; }
+      border-color: #7f7f7f;
+      box-shadow: inset 0 2px 2px -2px #7f7f7f;
+      border-bottom-color: #d8d8d8; }
       .linked.vertical entry:first-child:focus, .linked.vertical spinbutton:first-child:focus {
         background-color: transparent;
         border-style: solid;
         background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
         border-color: #000;
-        box-shadow: inset 0 2px 2px -2px gray, inset 0 0 2px 1px #cccccc; }
+        box-shadow: inset 0 2px 2px -2px #7f7f7f, inset 0 0 2px 1px #cccccc; }
       .linked.vertical entry:first-child:disabled, .linked.vertical spinbutton:first-child:disabled {
         background-color: transparent;
         border-style: solid;
         background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-        color: gray;
-        border-color: gray;
+        color: #7f7f7f;
+        border-color: #7f7f7f;
         background-image: linear-gradient(to bottom, white);
         box-shadow: none;
-        border-bottom-color: #dddddd; }
+        border-bottom-color: gainsboro; }
         .linked.vertical entry:first-child:disabled:backdrop, .linked.vertical spinbutton:first-child:disabled:backdrop {
           background-color: transparent;
           border-style: solid;
           background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-          color: gray;
+          color: #7f7f7f;
           background-image: linear-gradient(to bottom, #fff);
           box-shadow: 0 1px rgba(255, 255, 255, 0);
-          border-bottom-color: #dddddd;
+          border-bottom-color: gainsboro;
           border-top-style: solid; }
       .linked.vertical entry:first-child:backdrop, .linked.vertical spinbutton:first-child:backdrop {
         background-color: transparent;
@@ -283,13 +283,13 @@ entry, spinbutton {
         color: #000;
         background-image: linear-gradient(to bottom, #fff);
         box-shadow: 0 1px rgba(255, 255, 255, 0);
-        border-bottom-color: #dddddd; }
+        border-bottom-color: gainsboro; }
     .linked.vertical entry:last-child, .linked.vertical spinbutton:last-child {
       background-color: transparent;
       border-style: solid;
       background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-      border-color: gray;
-      box-shadow: inset 0 2px 2px -2px gray;
+      border-color: #7f7f7f;
+      box-shadow: inset 0 2px 2px -2px #7f7f7f;
       border-top-width: 0;
       background-image: linear-gradient(to bottom, #fff);
       box-shadow: none; }
@@ -300,15 +300,15 @@ entry, spinbutton {
         background-color: transparent;
         border-style: solid;
         background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-        color: gray;
-        border-color: gray;
+        color: #7f7f7f;
+        border-color: #7f7f7f;
         background-image: linear-gradient(to bottom, white);
         box-shadow: none; }
         .linked.vertical entry:last-child:disabled:backdrop, .linked.vertical spinbutton:last-child:disabled:backdrop {
           background-color: transparent;
           border-style: solid;
           background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-          color: gray;
+          color: #7f7f7f;
           background-image: linear-gradient(to bottom, #fff);
           box-shadow: 0 1px rgba(255, 255, 255, 0); }
       .linked.vertical entry:last-child:backdrop, .linked.vertical spinbutton:last-child:backdrop {
@@ -326,7 +326,7 @@ entry, spinbutton {
       border-style: solid;
       background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
       border-color: #cc0000;
-      box-shadow: inset 0 2px 2px -2px gray, inset 0 0 2px 1px #f5cccc; }
+      box-shadow: inset 0 2px 2px -2px #7f7f7f, inset 0 0 2px 1px #f4cccc; }
     entry.error:selected, entry.error:selected:focus, spinbutton.error:selected, spinbutton.error:selected:focus {
       background-color: #cc0000; }
   entry.warning, spinbutton.warning {
@@ -337,7 +337,7 @@ entry, spinbutton {
       border-style: solid;
       background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
       border-color: #f57900;
-      box-shadow: inset 0 2px 2px -2px gray, inset 0 0 2px 1px #fde4cc; }
+      box-shadow: inset 0 2px 2px -2px #7f7f7f, inset 0 0 2px 1px #fde4cc; }
     entry.warning:selected, entry.warning:selected:focus, spinbutton.warning:selected, spinbutton.warning:selected:focus {
       background-color: #f57900; }
 
@@ -358,13 +358,13 @@ button {
   color: #000;
   background-image: none;
   background-color: #fff;
-  border-color: gray; }
+  border-color: #7f7f7f; }
   button:hover, button.flat:hover, button.sidebar-button:hover {
     border-width: 2px;
     border-style: solid;
     color: #000;
     background-color: #fff;
-    border-color: gray;
+    border-color: #7f7f7f;
     background-image: none;
     -gtk-icon-effect: highlight; }
   button:active, button.flat:active, button.sidebar-button:active, button:checked, button.flat:checked, button.sidebar-button:checked {
@@ -373,14 +373,14 @@ button {
     background-image: none;
     color: white;
     background-color: black;
-    border-color: gray;
+    border-color: #7f7f7f;
     transition-duration: 50ms; }
   button:backdrop, button.flat:backdrop, button.sidebar-button:backdrop {
     border-width: 2px;
     border-style: solid;
     color: #000;
     background-color: #fff;
-    border-color: #8d8d8d;
+    border-color: #8b8b8b;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
@@ -388,37 +388,37 @@ button {
       border-width: 2px;
       border-style: solid;
       color: white;
-      background-color: #8d8d8d;
-      border-color: #8d8d8d;
+      background-color: #8b8b8b;
+      border-color: #8b8b8b;
       background-image: none; }
     button:backdrop:disabled, button.flat:backdrop:disabled, button.sidebar-button:backdrop:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
+      color: #7f7f7f;
       background-color: white;
-      border-color: #8d8d8d;
+      border-color: #8b8b8b;
       background-image: none; }
     button:backdrop:disabled:active, button.flat:backdrop:disabled:active, button.sidebar-button:backdrop:disabled:active {
       border-width: 2px;
       border-style: solid;
-      color: gray;
-      border-color: #8d8d8d;
+      color: #7f7f7f;
+      border-color: #8b8b8b;
       background-image: none;
-      background-color: #f6f6f6; }
+      background-color: whitesmoke; }
   button:disabled {
     border-width: 2px;
     border-style: solid;
-    color: gray;
+    color: #7f7f7f;
     background-color: white;
-    border-color: gray;
+    border-color: #7f7f7f;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
     button:disabled:active, button:disabled.flat:active, button.sidebar-button:disabled:active {
       border-width: 2px;
       border-style: solid;
-      color: gray;
-      border-color: gray;
+      color: #7f7f7f;
+      border-color: #7f7f7f;
       background-image: none;
       background-color: white; }
   .osd button {
@@ -449,7 +449,7 @@ button {
       border-width: 2px;
       border-style: solid;
       border-color: rgba(255, 255, 255, 0.2);
-      color: gray; }
+      color: #7f7f7f; }
     .osd button:backdrop {
       border-width: 2px;
       border-style: solid; }
@@ -486,16 +486,16 @@ button {
       button.suggested-action:backdrop:disabled {
         border-width: 2px;
         border-style: solid;
-        color: gray;
+        color: #7f7f7f;
         background-color: white;
-        border-color: #8d8d8d;
+        border-color: #8b8b8b;
         background-image: none; }
     button.suggested-action:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
+      color: #7f7f7f;
       background-color: white;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -532,16 +532,16 @@ button {
       button.destructive-action:backdrop:disabled {
         border-width: 2px;
         border-style: solid;
-        color: gray;
+        color: #7f7f7f;
         background-color: white;
-        border-color: #8d8d8d;
+        border-color: #8b8b8b;
         background-image: none; }
     button.destructive-action:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
+      color: #7f7f7f;
       background-color: white;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -561,13 +561,13 @@ button {
   color: #000;
   background-image: none;
   background-color: #fff;
-  border-color: gray; }
+  border-color: #7f7f7f; }
   .inline-toolbar toolbutton > button:hover {
     border-width: 2px;
     border-style: solid;
     color: #000;
     background-color: #fff;
-    border-color: gray;
+    border-color: #7f7f7f;
     background-image: none; }
   .inline-toolbar toolbutton > button:active {
     border-width: 2px;
@@ -575,21 +575,21 @@ button {
     background-image: none;
     color: white;
     background-color: black;
-    border-color: gray; }
+    border-color: #7f7f7f; }
   .inline-toolbar toolbutton > button:disabled {
     border-width: 2px;
     border-style: solid;
-    color: gray;
+    color: #7f7f7f;
     background-color: white;
-    border-color: gray;
+    border-color: #7f7f7f;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
   .inline-toolbar toolbutton > button:disabled:active {
     border-width: 2px;
     border-style: solid;
-    color: gray;
-    border-color: gray;
+    color: #7f7f7f;
+    border-color: #7f7f7f;
     background-image: none;
     background-color: white; }
   .inline-toolbar toolbutton > button:backdrop {
@@ -597,7 +597,7 @@ button {
     border-style: solid;
     color: #000;
     background-color: #fff;
-    border-color: #8d8d8d;
+    border-color: #8b8b8b;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
@@ -605,23 +605,23 @@ button {
     border-width: 2px;
     border-style: solid;
     color: white;
-    background-color: #8d8d8d;
-    border-color: #8d8d8d;
+    background-color: #8b8b8b;
+    border-color: #8b8b8b;
     background-image: none; }
   .inline-toolbar toolbutton > button:backdrop:disabled {
     border-width: 2px;
     border-style: solid;
-    color: gray;
+    color: #7f7f7f;
     background-color: white;
-    border-color: #8d8d8d;
+    border-color: #8b8b8b;
     background-image: none; }
   .inline-toolbar toolbutton > button:backdrop:disabled:active {
     border-width: 2px;
     border-style: solid;
-    color: gray;
-    border-color: #8d8d8d;
+    color: #7f7f7f;
+    border-color: #8b8b8b;
     background-image: none;
-    background-color: #f6f6f6; }
+    background-color: whitesmoke; }
 
 toolbar.inline-toolbar toolbutton > button.flat, searchbar.inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton > button.sidebar-button, searchbar.inline-toolbar toolbutton > button.sidebar-button {
   border-radius: 0;
@@ -711,7 +711,7 @@ modelbutton.flat,
       background-color: #000; }
   modelbutton.flat:disabled,
   .menuitem.button.flat:disabled {
-    color: gray; }
+    color: #7f7f7f; }
 
 button.color {
   padding: 4px; }
@@ -754,8 +754,8 @@ spinbutton {
    */ }
   spinbutton button {
     background-image: none;
-    border-color: rgba(128, 128, 128, 0.3);
-    color: #0d0d0d;
+    border-color: rgba(127, 127, 127, 0.3);
+    color: #0c0c0c;
     border-radius: 0; }
     spinbutton button:dir(ltr) {
       border-style: none none none solid; }
@@ -770,7 +770,7 @@ spinbutton {
         border-style: none solid none none; }
     spinbutton button:disabled {
       box-shadow: none;
-      color: rgba(128, 128, 128, 0.3); }
+      color: rgba(127, 127, 127, 0.3); }
       spinbutton button:disabled:dir(ltr) {
         border-style: none none none solid; }
       spinbutton button:disabled:dir(rtl) {
@@ -779,7 +779,7 @@ spinbutton {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2);
       background-color: rgba(0, 0, 0, 0.1); }
     spinbutton button:backdrop {
-      border-color: rgba(141, 141, 141, 0.3);
+      border-color: rgba(139, 139, 139, 0.3);
       background-color: #fff;
       box-shadow: none; }
       spinbutton button:backdrop:dir(ltr) {
@@ -788,7 +788,7 @@ spinbutton {
         border-style: none solid none none; }
     spinbutton button:backdrop:disabled {
       box-shadow: none;
-      color: rgba(128, 128, 128, 0.3); }
+      color: rgba(127, 127, 127, 0.3); }
       spinbutton button:backdrop:disabled:dir(rtl) {
         border-width: 0 1px 0 0; }
       spinbutton button:backdrop:disabled:dir(ltr) {
@@ -801,27 +801,27 @@ spinbutton {
     color: #000;
     background-image: none;
     background-color: #fff;
-    border-color: gray; }
+    border-color: #7f7f7f; }
     spinbutton.vertical button:first-child:active {
       border-width: 2px;
       border-style: solid;
       background-image: none;
       color: white;
       background-color: black;
-      border-color: gray; }
+      border-color: #7f7f7f; }
     spinbutton.vertical button:first-child:hover {
       border-width: 2px;
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none; }
     spinbutton.vertical button:first-child:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
+      color: #7f7f7f;
       background-color: white;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -830,7 +830,7 @@ spinbutton {
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: #8d8d8d;
+      border-color: #8b8b8b;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -840,27 +840,27 @@ spinbutton {
     color: #000;
     background-image: none;
     background-color: #fff;
-    border-color: gray; }
+    border-color: #7f7f7f; }
     spinbutton.vertical button:last-child:active {
       border-width: 2px;
       border-style: solid;
       background-image: none;
       color: white;
       background-color: black;
-      border-color: gray; }
+      border-color: #7f7f7f; }
     spinbutton.vertical button:last-child:hover {
       border-width: 2px;
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none; }
     spinbutton.vertical button:last-child:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
+      color: #7f7f7f;
       background-color: white;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -869,16 +869,16 @@ spinbutton {
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: #8d8d8d;
+      border-color: #8b8b8b;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
   spinbutton.vertical button:backdrop:disabled {
     border-width: 2px;
     border-style: solid;
-    color: gray;
+    color: #7f7f7f;
     background-color: white;
-    border-color: #8d8d8d;
+    border-color: #8b8b8b;
     background-image: none; }
   spinbutton.vertical.entry {
     border-radius: 0; }
@@ -899,7 +899,7 @@ combobox {
     padding-left: 8px;
     padding-right: 8px; }
   combobox:disabled {
-    color: gray;
+    color: #7f7f7f;
     text-shadow: none;
     -gtk-icon-shadow: none; }
   combobox:backdrop {
@@ -907,7 +907,7 @@ combobox {
     text-shadow: none;
     -gtk-icon-shadow: none; }
   combobox:backdrop:disabled {
-    color: gray; }
+    color: #7f7f7f; }
   combobox arrow {
     -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
     min-height: 16px;
@@ -944,25 +944,25 @@ toolbar, searchbar {
     padding: 3px;
     border-radius: 0  0 4px 4px; }
   toolbar.vertical, searchbar.vertical {
-    border-right: 1px solid gray; }
+    border-right: 1px solid #7f7f7f; }
     toolbar.vertical:dir(rtl), searchbar.vertical:dir(rtl) {
       border-right: none;
-      border-left: 1px solid gray; }
+      border-left: 1px solid #7f7f7f; }
 
 searchbar {
   border-width: 0 0 1px;
-  border-color: gray;
+  border-color: #7f7f7f;
   border-style: none none solid none;
   padding: 3px; }
 
 toolbar.inline-toolbar, searchbar.inline-toolbar {
   border-style: solid;
-  border-color: gray;
-  background-color: #d9d9d9;
-  box-shadow: inset 0 2px 3px -1px #a4a4a4; }
+  border-color: #7f7f7f;
+  background-color: #d8d8d8;
+  box-shadow: inset 0 2px 3px -1px #a2a2a2; }
   toolbar.inline-toolbar:backdrop, searchbar.inline-toolbar:backdrop {
-    border-color: #8d8d8d;
-    background-color: #d7d7d7;
+    border-color: #8b8b8b;
+    background-color: #d6d6d6;
     box-shadow: none; }
 
 /***************
@@ -972,15 +972,15 @@ toolbar.inline-toolbar, searchbar.inline-toolbar {
 headerbar {
   border-width: 0 0 1px;
   border-style: solid;
-  border-color: gray;
+  border-color: #7f7f7f;
   border-radius: 7px 7px 0 0;
   background-color: transparent;
   background-image: linear-gradient(to bottom, white, #fff);
-  box-shadow: inset 0 -1px #d9d9d9, inset 0 1px #fff;
+  box-shadow: inset 0 -1px #d8d8d8, inset 0 1px #fff;
   padding: 6px; }
   .titlebar:backdrop,
   headerbar:backdrop {
-    border-color: #8d8d8d;
+    border-color: #8b8b8b;
     background-color: #fff;
     background-image: none;
     box-shadow: none; }
@@ -1003,7 +1003,7 @@ headerbar {
     color: black;
     text-shadow: 0 1px rgba(0, 0, 0, 0.5);
     background-image: linear-gradient(to bottom, #0d0d0d, #050505);
-    box-shadow: inset 0 -1px #d9d9d9, inset 0 1px gray; }
+    box-shadow: inset 0 -1px #d8d8d8, inset 0 1px #7f7f7f; }
     .titlebar.selection-mode button,
     headerbar.selection-mode button {
       border-width: 2px;
@@ -1032,9 +1032,9 @@ headerbar {
       headerbar.selection-mode button:disabled {
         border-width: 2px;
         border-style: solid;
-        color: gray;
+        color: #7f7f7f;
         background-color: white;
-        border-color: gray;
+        border-color: #7f7f7f;
         background-image: none;
         text-shadow: none;
         -gtk-icon-shadow: none; }
@@ -1053,9 +1053,9 @@ headerbar {
       headerbar.selection-mode button:backdrop:disabled {
         border-width: 2px;
         border-style: solid;
-        color: gray;
+        color: #7f7f7f;
         background-color: white;
-        border-color: #8d8d8d;
+        border-color: #8b8b8b;
         background-image: none; }
       .titlebar.selection-mode button.suggested-action,
       headerbar.selection-mode button.suggested-action {
@@ -1064,14 +1064,14 @@ headerbar {
         color: #000;
         background-image: none;
         background-color: #fff;
-        border-color: gray; }
+        border-color: #7f7f7f; }
         .titlebar.selection-mode button.suggested-action:hover,
         headerbar.selection-mode button.suggested-action:hover {
           border-width: 2px;
           border-style: solid;
           color: #000;
           background-color: #fff;
-          border-color: gray;
+          border-color: #7f7f7f;
           background-image: none; }
         .titlebar.selection-mode button.suggested-action:active,
         headerbar.selection-mode button.suggested-action:active {
@@ -1080,14 +1080,14 @@ headerbar {
           background-image: none;
           color: white;
           background-color: black;
-          border-color: gray; }
+          border-color: #7f7f7f; }
         .titlebar.selection-mode button.suggested-action:disabled,
         headerbar.selection-mode button.suggested-action:disabled {
           border-width: 2px;
           border-style: solid;
-          color: gray;
+          color: #7f7f7f;
           background-color: white;
-          border-color: gray;
+          border-color: #7f7f7f;
           background-image: none;
           text-shadow: none;
           -gtk-icon-shadow: none; }
@@ -1097,7 +1097,7 @@ headerbar {
           border-style: solid;
           color: #000;
           background-color: #fff;
-          border-color: #8d8d8d;
+          border-color: #8b8b8b;
           background-image: none;
           text-shadow: none;
           -gtk-icon-shadow: none; }
@@ -1105,9 +1105,9 @@ headerbar {
         headerbar.selection-mode button.suggested-action:backdrop:disabled {
           border-width: 2px;
           border-style: solid;
-          color: gray;
+          color: #7f7f7f;
           background-color: white;
-          border-color: #8d8d8d;
+          border-color: #8b8b8b;
           background-image: none; }
     .titlebar.selection-mode .selection-menu,
     headerbar.selection-mode .selection-menu {
@@ -1150,27 +1150,27 @@ treeview.view {
   -GtkTreeView-tree-line-width: 1;
   -GtkTreeView-tree-line-pattern: '';
   -GtkTreeView-expander-size: 16;
-  border-left-color: gray;
+  border-left-color: #7f7f7f;
   border-top-color: #fff; }
   treeview.view:selected {
     border-radius: 0; }
   treeview.view:selected, treeview.view:backdrop:selected {
-    border-left-color: gray;
+    border-left-color: #7f7f7f;
     border-top-color: rgba(0, 0, 0, 0.1); }
   treeview.view:disabled {
-    color: gray; }
+    color: #7f7f7f; }
     treeview.view:disabled:selected {
       color: #666666; }
       treeview.view:disabled:selected:backdrop {
-        color: gray; }
+        color: #7f7f7f; }
     treeview.view:disabled:backdrop {
-      color: gray; }
+      color: #7f7f7f; }
   treeview.view.separator:backdrop {
     min-height: 2px;
     color: rgba(0, 0, 0, 0.1); }
   treeview.view:backdrop {
     color: #000;
-    border-left-color: gray;
+    border-left-color: #7f7f7f;
     border-top: #fff; }
   treeview.view.dnd {
     border-style: solid none;
@@ -1178,21 +1178,21 @@ treeview.view {
     border-color: black; }
   treeview.view.expander {
     -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
-    color: #4d4d4d; }
+    color: #4c4c4c; }
     treeview.view.expander:dir(rtl) {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
     treeview.view.expander:hover {
       color: #000; }
     treeview.view.expander:selected {
-      color: #b3b3b3; }
+      color: #b2b2b2; }
       treeview.view.expander:selected:hover {
         color: #fff; }
       treeview.view.expander:selected:backdrop {
-        color: #b3b3b3; }
+        color: #b2b2b2; }
     treeview.view.expander:checked {
       -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
     treeview.view.expander:backdrop {
-      color: #4d4d4d; }
+      color: #4c4c4c; }
   treeview.view.progressbar {
     color: #fff;
     border: 1px solid #000;
@@ -1213,12 +1213,12 @@ treeview.view {
       border-style: solid;
       border-color: #000; }
   treeview.view header button {
-    color: gray;
+    color: #7f7f7f;
     font-weight: bold;
     text-shadow: none;
     box-shadow: none; }
     treeview.view header button:hover {
-      color: #404040;
+      color: #3f3f3f;
       box-shadow: none; }
     treeview.view header button:active {
       color: #fff; }
@@ -1231,15 +1231,15 @@ treeview.view header button, treeview.view header button:hover, treeview.view he
   border-radius: 0;
   border-width: 1px;
   background-image: none;
-  border-color: gray;
+  border-color: #7f7f7f;
   text-shadow: none; }
   treeview.view header button:disabled {
     border-color: #fff;
     background-image: none; }
   treeview.view header button:backdrop {
-    border-color: gray;
+    border-color: #7f7f7f;
     border-style: none solid solid none;
-    color: gray;
+    color: #7f7f7f;
     background-image: none;
     background-color: #fff; }
     treeview.view header button:backdrop:disabled {
@@ -1276,7 +1276,7 @@ menubar,
       color: #000; }
     menubar > menuitem:disabled,
     .menubar > menuitem:disabled {
-      color: gray;
+      color: #7f7f7f;
       box-shadow: none; }
 
 menu,
@@ -1284,7 +1284,7 @@ menu,
   margin: 4px;
   padding: 0px;
   background-color: #fff;
-  border: 1px solid gray; }
+  border: 1px solid #7f7f7f; }
   menu menuitem,
   .menu menuitem {
     text-shadow: none;
@@ -1296,10 +1296,10 @@ menu,
       background-color: #000; }
     menu menuitem:disabled,
     .menu menuitem:disabled {
-      color: gray; }
+      color: #7f7f7f; }
       menu menuitem:disabled:backdrop,
       .menu menuitem:disabled:backdrop {
-        color: gray; }
+        color: #7f7f7f; }
     menu menuitem:backdrop, menu menuitem:backdrop:hover,
     .menu menuitem:backdrop,
     .menu menuitem:backdrop:hover {
@@ -1332,7 +1332,7 @@ menuitem check, menuitem radio {
 popover {
   margin: 10px;
   padding: 2px;
-  border-color: gray;
+  border-color: #7f7f7f;
   border-width: 1px;
   border-style: solid;
   border-radius: 5px;
@@ -1357,7 +1357,7 @@ popover {
   popover.magnifier, popover.osd {
     background-image: none;
     background-color: rgba(0, 0, 0, 0.8);
-    border: 1px solid gray;
+    border: 1px solid #7f7f7f;
     color: #fff; }
     popover.magnifier button, popover.osd button {
       color: white;
@@ -1387,7 +1387,7 @@ popover {
         border-width: 2px;
         border-style: solid;
         border-color: rgba(255, 255, 255, 0.2);
-        color: gray; }
+        color: #7f7f7f; }
 
 /*****************
  * Notebooks and *
@@ -1398,20 +1398,19 @@ notebook {
   -GtkNotebook-arrow-spacing: 5;
   -GtkNotebook-tab-curvature: 0;
   -GtkNotebook-tab-overlap: -8;
-  -GtkNotebook-has-tab-gap: false;
   padding: 0;
   background-color: #fff;
   transition: all 200ms ease-out; }
   notebook:backdrop {
     background-color: #fff; }
   notebook.frame {
-    border: 1px solid gray; }
+    border: 1px solid #7f7f7f; }
     notebook.frame:backdrop {
-      border-color: #8d8d8d; }
+      border-color: #8b8b8b; }
   notebook header {
-    background-color: #d9d9d9; }
+    background-color: #d8d8d8; }
     .frame notebook header {
-      border: 1px solid gray; }
+      border: 1px solid #7f7f7f; }
       .frame notebook header.top {
         border-bottom-width: 0; }
       .frame notebook header.bottom {
@@ -1421,34 +1420,34 @@ notebook {
       .frame notebook header.left {
         border-right-width: 0; }
       .frame notebook header:backdrop {
-        border-color: #8d8d8d; }
+        border-color: #8b8b8b; }
     notebook header.top {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 -1px gray; }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 -1px #7f7f7f; }
       notebook header.top:backdrop {
-        box-shadow: inset 0 -1px #8d8d8d; }
+        box-shadow: inset 0 -1px #8b8b8b; }
     notebook header.bottom {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 1px gray; }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 1px #7f7f7f; }
       notebook header.bottom:backdrop {
-        box-shadow: inset 0 1px #8d8d8d; }
+        box-shadow: inset 0 1px #8b8b8b; }
     notebook header.right {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 1px 0 gray; }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 1px 0 #7f7f7f; }
       notebook header.right:backdrop {
-        box-shadow: inset 1px 0 #8d8d8d; }
+        box-shadow: inset 1px 0 #8b8b8b; }
     notebook header.left {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset -1px 0 gray; }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset -1px 0 #7f7f7f; }
       notebook header.left:backdrop {
-        box-shadow: inset -1px 0 #8d8d8d; }
+        box-shadow: inset -1px 0 #8b8b8b; }
     notebook header:backdrop {
-      background-color: #d7d7d7;
+      background-color: #d6d6d6;
       box-shadow: none; }
     notebook header tabs arrow {
-      color: gray; }
+      color: #7f7f7f; }
       notebook header tabs arrow:hover {
-        color: #404040; }
+        color: #3f3f3f; }
       notebook header tabs arrow:active {
         color: #000; }
       notebook header tabs arrow:disabled {
-        color: rgba(128, 128, 128, 0.3); }
+        color: rgba(127, 127, 127, 0.3); }
       notebook header tabs arrow:backdrop {
         color: rgba(0, 0, 0, 0.4); }
   notebook header.top tab {
@@ -1486,7 +1485,7 @@ notebook {
     background-color: transparent;
     outline-offset: 0; }
     notebook tab:hover {
-      border-color: gray; }
+      border-color: #7f7f7f; }
     notebook tab:active, notebook tab:backdrop:active {
       border-color: #000; }
     notebook tab:backdrop {
@@ -1495,17 +1494,17 @@ notebook {
     .top notebook tab.reorderable-page {
       border-color: transparent; }
       .top notebook tab.reorderable-page:hover {
-        border-color: rgba(128, 128, 128, 0.3);
-        border-bottom-color: gray;
+        border-color: rgba(127, 127, 127, 0.3);
+        border-bottom-color: #7f7f7f;
         background-color: rgba(255, 255, 255, 0.2); }
       .top notebook tab.reorderable-page:active {
         background-color: rgba(255, 255, 255, 0.5);
-        border-color: rgba(128, 128, 128, 0.5);
+        border-color: rgba(127, 127, 127, 0.5);
         border-bottom-color: #000; }
         .top notebook tab.reorderable-page:active:hover {
           background-color: rgba(255, 255, 255, 0.7); }
         .top notebook tab.reorderable-page:active:backdrop {
-          border-color: #8d8d8d;
+          border-color: #8b8b8b;
           background-color: #fff;
           border-bottom-color: #000; }
       .top notebook tab.reorderable-page:backdrop {
@@ -1514,17 +1513,17 @@ notebook {
     .bottom notebook tab.reorderable-page {
       border-color: transparent; }
       .bottom notebook tab.reorderable-page:hover {
-        border-color: rgba(128, 128, 128, 0.3);
-        border-top-color: gray;
+        border-color: rgba(127, 127, 127, 0.3);
+        border-top-color: #7f7f7f;
         background-color: rgba(255, 255, 255, 0.2); }
       .bottom notebook tab.reorderable-page:active {
         background-color: rgba(255, 255, 255, 0.5);
-        border-color: rgba(128, 128, 128, 0.5);
+        border-color: rgba(127, 127, 127, 0.5);
         border-top-color: #000; }
         .bottom notebook tab.reorderable-page:active:hover {
           background-color: rgba(255, 255, 255, 0.7); }
         .bottom notebook tab.reorderable-page:active:backdrop {
-          border-color: #8d8d8d;
+          border-color: #8b8b8b;
           background-color: #fff;
           border-top-color: #000; }
       .bottom notebook tab.reorderable-page:backdrop {
@@ -1533,17 +1532,17 @@ notebook {
     .left notebook tab.reorderable-page {
       border-color: transparent; }
       .left notebook tab.reorderable-page:hover {
-        border-color: rgba(128, 128, 128, 0.3);
-        border-right-color: gray;
+        border-color: rgba(127, 127, 127, 0.3);
+        border-right-color: #7f7f7f;
         background-color: rgba(255, 255, 255, 0.2); }
       .left notebook tab.reorderable-page:active {
         background-color: rgba(255, 255, 255, 0.5);
-        border-color: rgba(128, 128, 128, 0.5);
+        border-color: rgba(127, 127, 127, 0.5);
         border-right-color: #000; }
         .left notebook tab.reorderable-page:active:hover {
           background-color: rgba(255, 255, 255, 0.7); }
         .left notebook tab.reorderable-page:active:backdrop {
-          border-color: #8d8d8d;
+          border-color: #8b8b8b;
           background-color: #fff;
           border-right-color: #000; }
       .left notebook tab.reorderable-page:backdrop {
@@ -1552,17 +1551,17 @@ notebook {
     .right notebook tab.reorderable-page {
       border-color: transparent; }
       .right notebook tab.reorderable-page:hover {
-        border-color: rgba(128, 128, 128, 0.3);
-        border-left-color: gray;
+        border-color: rgba(127, 127, 127, 0.3);
+        border-left-color: #7f7f7f;
         background-color: rgba(255, 255, 255, 0.2); }
       .right notebook tab.reorderable-page:active {
         background-color: rgba(255, 255, 255, 0.5);
-        border-color: rgba(128, 128, 128, 0.5);
+        border-color: rgba(127, 127, 127, 0.5);
         border-left-color: #000; }
         .right notebook tab.reorderable-page:active:hover {
           background-color: rgba(255, 255, 255, 0.7); }
         .right notebook tab.reorderable-page:active:backdrop {
-          border-color: #8d8d8d;
+          border-color: #8b8b8b;
           background-color: #fff;
           border-left-color: #000; }
       .right notebook tab.reorderable-page:backdrop {
@@ -1571,12 +1570,12 @@ notebook {
     notebook tab label {
       padding: 0 2px;
       font-weight: bold;
-      color: gray;
+      color: #7f7f7f;
       /* color: inherit doesn't work here */ }
       notebook tab label:backdrop {
-        color: gray; }
+        color: #7f7f7f; }
     notebook tab:hover label {
-      color: #404040; }
+      color: #3f3f3f; }
     notebook tab:active label {
       color: #000; }
       notebook tab:active label:backdrop {
@@ -1592,7 +1591,7 @@ notebook {
         border-style: solid;
         color: #000;
         background-color: #fff;
-        border-color: gray;
+        border-color: #7f7f7f;
         background-image: none;
         border-width: 2px;
         background-image: none;
@@ -1603,7 +1602,7 @@ notebook {
         background-image: none;
         color: white;
         background-color: black;
-        border-color: gray;
+        border-color: #7f7f7f;
         border-width: 2px; }
       notebook tab button:backdrop, notebook tab button:backdrop:hover {
         color: rgba(0, 0, 0, 0.3);
@@ -1631,11 +1630,11 @@ scrollbar {
   scrollbar slider {
     border-radius: 20px;
     border: 5px solid transparent;
-    background-color: gray; }
+    background-color: #7f7f7f; }
     scrollbar slider:backdrop, scrollbar slider:disabled {
-      background-color: #e6e6e6; }
+      background-color: #e5e5e5; }
     scrollbar slider:hover {
-      background-color: #4d4d4d; }
+      background-color: #4c4c4c; }
     scrollbar slider:hover:active {
       background-color: #000; }
     scrollbar slider.fine-tune {
@@ -1671,8 +1670,8 @@ switch {
   border-width: 1px;
   border-style: solid;
   border-radius: 3px;
-  border-color: gray;
-  background-color: #cccccc;
+  border-color: #7f7f7f;
+  background-color: #cbcbcb;
   box-shadow: inset 0 1px rgba(0, 0, 0, 0.1);
   /*outset not working*/
   text-shadow: 0 1px rgba(0, 0, 0, 0.1); }
@@ -1682,25 +1681,25 @@ switch {
     background-color: #000;
     text-shadow: 0 0 2px white; }
   switch:disabled {
-    color: gray;
-    border-color: gray;
+    color: #7f7f7f;
+    border-color: #7f7f7f;
     background-color: white;
     text-shadow: none; }
   switch:backdrop {
     color: #000;
-    border-color: #8d8d8d;
+    border-color: #8b8b8b;
     background-color: #fff;
     box-shadow: none;
     text-shadow: none; }
     switch:backdrop:active {
       color: #fff;
-      border-color: #8d8d8d;
-      background-color: #8d8d8d;
+      border-color: #8b8b8b;
+      background-color: #8b8b8b;
       box-shadow: none; }
     switch:backdrop:disabled, switch:backdrop:disabled:active {
       background-color: white;
-      color: gray;
-      border-color: gray; }
+      color: #7f7f7f;
+      border-color: #7f7f7f; }
   switch slider {
     margin: -1px;
     min-width: 45px;
@@ -1712,24 +1711,24 @@ switch {
     color: #000;
     background-image: none;
     background-color: #fff;
-    border-color: gray;
-    box-shadow: inset 0 1px white, inset 0 -2px rgba(255, 255, 255, 0.6), inset 0 -1px silver; }
+    border-color: #7f7f7f;
+    box-shadow: inset 0 1px white, inset 0 -2px rgba(255, 255, 255, 0.6), inset 0 -1px #bfbfbf; }
     switch slider:hover {
       border-width: 2px;
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none;
-      box-shadow: inset 0 1px white, inset 0 -2px rgba(255, 255, 255, 0.6), inset 0 -1px silver; }
+      box-shadow: inset 0 1px white, inset 0 -2px rgba(255, 255, 255, 0.6), inset 0 -1px #bfbfbf; }
     switch slider:active {
       border-color: #000; }
     switch slider:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
+      color: #7f7f7f;
       background-color: white;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -1738,18 +1737,18 @@ switch {
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: #8d8d8d;
+      border-color: #8b8b8b;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
       switch slider:backdrop:active {
-        border-color: #8d8d8d; }
+        border-color: #8b8b8b; }
       switch slider:backdrop:disabled {
         border-width: 2px;
         border-style: solid;
-        color: gray;
+        color: #7f7f7f;
         background-color: white;
-        border-color: #8d8d8d;
+        border-color: #8b8b8b;
         background-image: none; }
 
 /*************************
@@ -1768,15 +1767,15 @@ check {
   check:checked, check:active {
     -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); }
     check:checked:disabled, check:active:disabled {
-      color: gray; }
+      color: #7f7f7f; }
       check:checked:disabled:backdrop, check:active:disabled:backdrop {
-        color: gray; }
+        color: #7f7f7f; }
     check:checked:backdrop, check:active:backdrop {
       color: #000; }
   check:disabled {
-    color: gray; }
+    color: #7f7f7f; }
     check:disabled:backdrop {
-      color: gray; }
+      color: #7f7f7f; }
   check:indeterminate {
     -gtk-icon-source: -gtk-icontheme("checkbox-mixed-symbolic"); }
   check:backdrop {
@@ -1793,15 +1792,15 @@ radio {
   radio:checked, radio:active {
     -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); }
     radio:checked:disabled, radio:active:disabled {
-      color: gray; }
+      color: #7f7f7f; }
       radio:checked:disabled:backdrop, radio:active:disabled:backdrop {
-        color: gray; }
+        color: #7f7f7f; }
     radio:checked:backdrop, radio:active:backdrop {
       color: #000; }
   radio:disabled {
-    color: gray; }
+    color: #7f7f7f; }
     radio:disabled:backdrop {
-      color: gray; }
+      color: #7f7f7f; }
   radio:indeterminate {
     -gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); }
   radio:backdrop {
@@ -1847,9 +1846,9 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
     color: #000;
     background-image: none;
     background-color: #fff;
-    border-color: gray;
+    border-color: #7f7f7f;
     border-radius: 50%;
-    border-color: #787878; }
+    border-color: #777777; }
     scale trough slider:hover,
     scale.scale-has-marks-above.scale-has-marks-below trough slider:hover,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:hover {
@@ -1857,9 +1856,9 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none;
-      border-color: #787878;
+      border-color: #777777;
       border-radius: 50%; }
     scale trough slider:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough slider:disabled,
@@ -1873,7 +1872,7 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:backdrop {
       border-style: solid;
       border-radius: 50%;
-      border-color: #858585;
+      border-color: #838383;
       background-image: none;
       box-shadow: none; }
     scale trough slider:backdrop:disabled,
@@ -1881,9 +1880,9 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:backdrop:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
+      color: #7f7f7f;
       background-color: white;
-      border-color: #8d8d8d;
+      border-color: #8b8b8b;
       background-image: none; }
     scale trough slider:active,
     scale.scale-has-marks-above.scale-has-marks-below trough slider:active,
@@ -1896,8 +1895,8 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
     border-width: 1px;
     border-style: solid;
     border-radius: 3px;
-    border-color: gray;
-    background-color: #cccccc;
+    border-color: #7f7f7f;
+    background-color: #cbcbcb;
     box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); }
     scale trough.highlight,
     scale.scale-has-marks-above.scale-has-marks-below trough.highlight,
@@ -1907,28 +1906,28 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
       scale trough.highlight:backdrop,
       scale.scale-has-marks-above.scale-has-marks-below trough.highlight:backdrop,
       scale.vertical.scale-has-marks-above.scale-has-marks-below trough.highlight:backdrop {
-        border-color: gray;
-        background-color: gray;
+        border-color: #7f7f7f;
+        background-color: #7f7f7f;
         box-shadow: none; }
     scale trough:disabled, scale trough.hilight:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough.hilight:disabled,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough:disabled,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough.hilight:disabled {
-      border-color: gray;
+      border-color: #7f7f7f;
       background-color: white; }
     scale trough:backdrop,
     scale.scale-has-marks-above.scale-has-marks-below trough:backdrop,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough:backdrop {
-      border-color: #8d8d8d;
-      background-color: silver;
+      border-color: #8b8b8b;
+      background-color: #bfbfbf;
       box-shadow: none; }
     scale trough:backdrop:disabled, scale trough .hilight:backdrop:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough:backdrop:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough .hilight:backdrop:disabled,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough:backdrop:disabled,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough .hilight:backdrop:disabled {
-      border-color: gray;
+      border-color: #7f7f7f;
       background-color: #fff; }
 
 /*****************
@@ -1939,17 +1938,17 @@ progressbar {
   font-size: 83%;
   color: #000; }
   progressbar:backdrop {
-    color: gray; }
+    color: #7f7f7f; }
   progressbar trough {
     border-width: 1px;
     border-style: solid;
     border-radius: 3px;
-    border-color: gray;
-    background-color: lightgray;
+    border-color: #7f7f7f;
+    background-color: #d2d2d2;
     box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); }
     progressbar trough:backdrop {
-      border-color: #8d8d8d;
-      background-color: #d7d7d7;
+      border-color: #8b8b8b;
+      background-color: #d6d6d6;
       box-shadow: 0 1px rgba(255, 255, 255, 0); }
   progressbar.osd trough {
     background-color: transparent;
@@ -1986,8 +1985,8 @@ levelbar trough {
   background-color: transparent;
   border-style: solid;
   background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-  border-color: gray;
-  box-shadow: inset 0 2px 2px -2px gray; }
+  border-color: #7f7f7f;
+  box-shadow: inset 0 2px 2px -2px #7f7f7f; }
   levelbar trough:backdrop {
     background-color: transparent;
     border-style: solid;
@@ -2056,7 +2055,7 @@ spinbutton selection:focus, modelbutton.flat:hover, modelbutton.flat:selected,
   spinbutton selection:backdrop:focus, modelbutton.flat:backdrop:hover, modelbutton.flat:backdrop:selected,
   .menuitem.button.flat:backdrop:hover,
   .menuitem.button.flat:backdrop:selected, treeview.view:backdrop:selected, row.activatable:backdrop:selected, .sidebar:backdrop:selected, placessidebar .view:backdrop:selected, placessidebar calendar:backdrop:selected {
-    background-color: gray;
+    background-color: #7f7f7f;
     color: #fff; }
 
 /**********
@@ -2064,19 +2063,19 @@ spinbutton selection:focus, modelbutton.flat:hover, modelbutton.flat:selected,
  **********/
 frame border,
 .frame {
-  border: 1px solid gray;
+  border: 1px solid #7f7f7f;
   padding: 0; }
   frame border.flat,
   .frame.flat {
     border-style: none; }
   frame border:backdrop,
   .frame:backdrop {
-    border-color: #8d8d8d; }
+    border-color: #8b8b8b; }
 
 actionbar box {
   padding: 6px;
   border-width: 1px 0 0;
-  border-color: gray;
+  border-color: #7f7f7f;
   border-style: solid none none; }
 
 placessidebar .frame,
@@ -2087,7 +2086,7 @@ scrolledwindow viewport.frame {
   border-style: none; }
 placessidebar overshoot.top,
 scrolledwindow overshoot.top {
-  background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#010101), to(rgba(1, 1, 1, 0))), -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent));
+  background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(black), to(transparent)), -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent));
   background-size: 100% 5%, 100% 100%;
   background-repeat: no-repeat;
   background-position: center top;
@@ -2096,7 +2095,7 @@ scrolledwindow overshoot.top {
   box-shadow: none; }
   placessidebar overshoot.top:backdrop,
   scrolledwindow overshoot.top:backdrop {
-    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#8d8d8d), to(rgba(141, 141, 141, 0)));
+    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#8b8b8b), to(rgba(139, 139, 139, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center top;
@@ -2105,7 +2104,7 @@ scrolledwindow overshoot.top {
     box-shadow: none; }
 placessidebar overshoot.bottom,
 scrolledwindow overshoot.bottom {
-  background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#010101), to(rgba(1, 1, 1, 0))), -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent));
+  background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(black), to(transparent)), -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent));
   background-size: 100% 5%, 100% 100%;
   background-repeat: no-repeat;
   background-position: center bottom;
@@ -2114,7 +2113,7 @@ scrolledwindow overshoot.bottom {
   box-shadow: none; }
   placessidebar overshoot.bottom:backdrop,
   scrolledwindow overshoot.bottom:backdrop {
-    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#8d8d8d), to(rgba(141, 141, 141, 0)));
+    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#8b8b8b), to(rgba(139, 139, 139, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center bottom;
@@ -2123,7 +2122,7 @@ scrolledwindow overshoot.bottom {
     box-shadow: none; }
 placessidebar overshoot.left,
 scrolledwindow overshoot.left {
-  background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#010101), to(rgba(1, 1, 1, 0))), -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent));
+  background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(black), to(transparent)), -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent));
   background-size: 5% 100%, 100% 100%;
   background-repeat: no-repeat;
   background-position: left center;
@@ -2132,7 +2131,7 @@ scrolledwindow overshoot.left {
   box-shadow: none; }
   placessidebar overshoot.left:backdrop,
   scrolledwindow overshoot.left:backdrop {
-    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#8d8d8d), to(rgba(141, 141, 141, 0)));
+    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#8b8b8b), to(rgba(139, 139, 139, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: left center;
@@ -2141,7 +2140,7 @@ scrolledwindow overshoot.left {
     box-shadow: none; }
 placessidebar overshoot.right,
 scrolledwindow overshoot.right {
-  background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#010101), to(rgba(1, 1, 1, 0))), -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent));
+  background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(black), to(transparent)), -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent));
   background-size: 5% 100%, 100% 100%;
   background-repeat: no-repeat;
   background-position: right center;
@@ -2150,7 +2149,7 @@ scrolledwindow overshoot.right {
   box-shadow: none; }
   placessidebar overshoot.right:backdrop,
   scrolledwindow overshoot.right:backdrop {
-    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#8d8d8d), to(rgba(141, 141, 141, 0)));
+    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#8b8b8b), to(rgba(139, 139, 139, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: right center;
@@ -2215,7 +2214,7 @@ scrollbar scrolledwindow trough {
 
 separator, placessidebar .view separator,
 placessidebar .view separator:backdrop {
-  background: gray;
+  background: #7f7f7f;
   min-width: 1px;
   min-height: 1px; }
 
@@ -2224,10 +2223,10 @@ placessidebar .view separator:backdrop {
  *********/
 list {
   background-color: #fff;
-  border-color: gray; }
+  border-color: #7f7f7f; }
   list:backdrop {
     background-color: #fff;
-    border-color: #8d8d8d; }
+    border-color: #8b8b8b; }
   list row {
     padding: 2px; }
 
@@ -2259,7 +2258,7 @@ row.activatable {
     row.activatable:selected:hover, placessidebar .has-open-popup:selected {
       background-color: black; }
     row.activatable:selected:backdrop {
-      background-color: gray; }
+      background-color: #7f7f7f; }
     row.activatable:selected .button.flat {
       color: #fff; }
       row.activatable:selected .button.flat:hover {
@@ -2287,9 +2286,9 @@ row.activatable {
   padding: 10px;
   border-width: 0 1px 1px;
   border-style: solid;
-  border-color: gray;
+  border-color: #7f7f7f;
   border-radius: 0 0 6px 6px;
-  background-image: linear-gradient(to bottom, #f0f0f0 5%, whitesmoke); }
+  background-image: linear-gradient(to bottom, #efefef 5%, #f4f4f4); }
   .app-notification .button,
   .app-notification.frame .button {
     padding: 6px; }
@@ -2312,22 +2311,22 @@ expander arrow {
  * Calendar *
  ***********/
 calendar {
-  border: 1px solid gray; }
+  border: 1px solid #7f7f7f; }
   calendar.button {
     padding: 0 4px;
     color: #999999; }
     calendar.button:hover {
       color: #000; }
     calendar.button:backdrop, calendar.button:backdrop:hover {
-      color: gray; }
+      color: #7f7f7f; }
   calendar.view {
     border-radius: 2px; }
   calendar.header {
     background: linear-gradient(to bottom, white, #fafafa);
-    border-bottom-color: silver; }
+    border-bottom-color: #bfbfbf; }
     calendar.header:backdrop {
       background-image: linear-gradient(to bottom, #fff);
-      border-bottom-color: #c6c6c6; }
+      border-bottom-color: #c5c5c5; }
   calendar:indeterminate, calendar:indeterminate:backdrop {
     color: alpha(currentColor,0.55); }
   calendar.highlight, calendar.highlight:backdrop {
@@ -2353,13 +2352,13 @@ messagedialog.csd {
     color: #000;
     background-image: none;
     background-color: #fff;
-    border-color: gray; }
+    border-color: #7f7f7f; }
     messagedialog.csd .dialog-action-area button:hover {
       border-width: 2px;
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none; }
     messagedialog.csd .dialog-action-area button:active {
       border-width: 2px;
@@ -2367,13 +2366,13 @@ messagedialog.csd {
       background-image: none;
       color: white;
       background-color: black;
-      border-color: gray; }
+      border-color: #7f7f7f; }
     messagedialog.csd .dialog-action-area button:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
+      color: #7f7f7f;
       background-color: white;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -2382,16 +2381,16 @@ messagedialog.csd {
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: #8d8d8d;
+      border-color: #8b8b8b;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
     messagedialog.csd .dialog-action-area button:backdrop:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
+      color: #7f7f7f;
       background-color: white;
-      border-color: #8d8d8d;
+      border-color: #8b8b8b;
       background-image: none; }
     messagedialog.csd .dialog-action-area button.suggested-action {
       border-width: 2px;
@@ -2426,16 +2425,16 @@ messagedialog.csd {
         messagedialog.csd .dialog-action-area button.suggested-action:backdrop:disabled {
           border-width: 2px;
           border-style: solid;
-          color: gray;
+          color: #7f7f7f;
           background-color: white;
-          border-color: #8d8d8d;
+          border-color: #8b8b8b;
           background-image: none; }
       messagedialog.csd .dialog-action-area button.suggested-action:disabled {
         border-width: 2px;
         border-style: solid;
-        color: gray;
+        color: #7f7f7f;
         background-color: white;
-        border-color: gray;
+        border-color: #7f7f7f;
         background-image: none;
         text-shadow: none;
         -gtk-icon-shadow: none; }
@@ -2472,16 +2471,16 @@ messagedialog.csd {
         messagedialog.csd .dialog-action-area button.destructive-action:backdrop:disabled {
           border-width: 2px;
           border-style: solid;
-          color: gray;
+          color: #7f7f7f;
           background-color: white;
-          border-color: #8d8d8d;
+          border-color: #8b8b8b;
           background-image: none; }
       messagedialog.csd .dialog-action-area button.destructive-action:disabled {
         border-width: 2px;
         border-style: solid;
-        color: gray;
+        color: #7f7f7f;
         background-color: white;
-        border-color: gray;
+        border-color: #7f7f7f;
         background-image: none;
         text-shadow: none;
         -gtk-icon-shadow: none; }
@@ -2495,9 +2494,9 @@ messagedialog.csd {
     border-bottom-left-radius: 7px; }
 
 GtkFileChooserDialog .dialog-action-box {
-  border-top: 1px solid gray; }
+  border-top: 1px solid #7f7f7f; }
   GtkFileChooserDialog .dialog-action-box:backdrop {
-    border-top-color: #8d8d8d; }
+    border-top-color: #8b8b8b; }
 
 /***********
  * Sidebar *
@@ -2507,10 +2506,10 @@ GtkFileChooserDialog .dialog-action-box {
   .sidebar:backdrop {
     background-color: #fff; }
   .sidebar > scrolledwindow > .frame {
-    border-right: 1px solid gray; }
+    border-right: 1px solid #7f7f7f; }
     .sidebar > scrolledwindow > .frame:dir(rtl) {
       border-right: none;
-      border-left: 1px solid gray; }
+      border-left: 1px solid #7f7f7f; }
 
 placessidebar row {
   padding: 0px; }
@@ -2537,9 +2536,9 @@ placessidebar .view {
   color: #000;
   background-color: transparent; }
   placessidebar .view .image {
-    color: #4d4d4d; }
+    color: #4c4c4c; }
     placessidebar .view .image:selected {
-      color: #e6e6e6; }
+      color: #e5e5e5; }
 
 stacksidebar row {
   padding: 10px 4px; }
@@ -2557,9 +2556,9 @@ paned placessidebar .view separator:backdrop,
 placessidebar .view paned separator:backdrop {
   min-width: 1px;
   min-height: 1px;
-  background-image: linear-gradient(to bottom, gray); }
+  background-image: linear-gradient(to bottom, #7f7f7f); }
   paned separator:backdrop {
-    background-image: linear-gradient(to bottom, #8d8d8d); }
+    background-image: linear-gradient(to bottom, #8b8b8b); }
 paned:dir(ltr).horizontal separator {
   margin: 0 -8px 0 0;
   padding: 0 8px 0 0; }
@@ -2582,7 +2581,7 @@ placessidebar .view paned separator.wide:backdrop {
   min-height: 5px;
   background-color: transparent;
   border-style: none solid;
-  border-color: gray;
+  border-color: #7f7f7f;
   border-width: 1px; }
 
 /**************
@@ -2636,9 +2635,9 @@ infobar {
     .error button:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
+      color: #7f7f7f;
       background-color: white;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -2660,9 +2659,9 @@ infobar {
     .error button:backdrop:disabled {
       border-width: 2px;
       border-style: solid;
-      color: gray;
+      color: #7f7f7f;
       background-color: white;
-      border-color: #8d8d8d;
+      border-color: #8b8b8b;
       background-image: none; }
   .info label:selected,
   .info label:selected:focus,
@@ -2764,20 +2763,20 @@ colorswatch {
     color: #000;
     background-image: none;
     background-color: #fff;
-    border-color: gray; }
+    border-color: #7f7f7f; }
     colorswatch#add-color-button:hover {
       border-width: 2px;
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none; }
     colorswatch#add-color-button:backdrop {
       border-width: 2px;
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: #8d8d8d;
+      border-color: #8b8b8b;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -2808,7 +2807,7 @@ decoration {
     border-radius: 0;
     margin: 4px;
     background-color: #fff;
-    border: solid 1px #8d8d8d;
+    border: solid 1px #8b8b8b;
     box-shadow: none; }
 
 button.titlebutton {
@@ -2823,20 +2822,20 @@ button.titlebutton {
     color: #000;
     background-image: none;
     background-color: #fff;
-    border-color: gray; }
+    border-color: #7f7f7f; }
   button.titlebutton:active {
     border-width: 2px;
     border-style: solid;
     background-image: none;
     color: white;
     background-color: black;
-    border-color: gray; }
+    border-color: #7f7f7f; }
   button.titlebutton:backdrop {
     border-width: 2px;
     border-style: solid;
     color: #000;
     background-color: #fff;
-    border-color: #8d8d8d;
+    border-color: #8b8b8b;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none;
@@ -2921,7 +2920,7 @@ cursor-handle {
       border-width: 2px;
       border-style: solid;
       border-color: rgba(255, 255, 255, 0.2);
-      color: gray; }
+      color: #7f7f7f; }
     .touch-selection button:backdrop {
       border-width: 2px;
       border-style: solid; }