[gtk+/wip/otte/gadget: 5/5] switch: Port to gadgets



commit f02c26e1aa17aeb8d8656eae43361c998410cc09
Author: Benjamin Otte <otte redhat com>
Date:   Mon Mar 9 06:16:50 2015 +0100

    switch: Port to gadgets

 gtk/gtkswitch.c                          |  342 +++++++-------
 gtk/theme/Adwaita/gtk-contained-dark.css |  770 +++++++++++++-----------------
 gtk/theme/Adwaita/gtk-contained.css      |  692 ++++++++++++---------------
 3 files changed, 818 insertions(+), 986 deletions(-)
---
diff --git a/gtk/gtkswitch.c b/gtk/gtkswitch.c
index 7648209..505cbd6 100644
--- a/gtk/gtkswitch.c
+++ b/gtk/gtkswitch.c
@@ -61,8 +61,8 @@
 #include "gtkactionable.h"
 #include "a11y/gtkswitchaccessible.h"
 #include "gtkactionhelper.h"
-#include "gtkcssnodeprivate.h"
-#include "gtkcssstylepropertyprivate.h"
+#include "gtkcsscustomgadgetprivate.h"
+#include "gtkcssgadgetprivate.h"
 #include "gtkstylecontextprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtkcssshadowsvalueprivate.h"
@@ -81,7 +81,8 @@ struct _GtkSwitchPrivate
   GtkGesture *pan_gesture;
   GtkGesture *multipress_gesture;
 
-  GtkCssNode *slider_node;
+  GtkCssGadget *gadget;
+  GtkCssGadget *slider_gadget;
 
   double handle_pos;
   gint64 start_time;
@@ -258,8 +259,6 @@ gtk_switch_pan_gesture_pan (GtkGesturePan   *gesture,
 {
   GtkWidget *widget = GTK_WIDGET (sw);
   GtkSwitchPrivate *priv = sw->priv;
-  GtkStyleContext *context;
-  GtkBorder padding;
   gint width;
 
   if (direction == GTK_PAN_DIRECTION_LEFT)
@@ -267,12 +266,6 @@ gtk_switch_pan_gesture_pan (GtkGesturePan   *gesture,
 
   gtk_gesture_set_state (GTK_GESTURE (gesture), GTK_EVENT_SEQUENCE_CLAIMED);
 
-  context = gtk_widget_get_style_context (widget);
-
-  gtk_style_context_save_to_node (context, priv->slider_node);
-  gtk_style_context_get_padding (context, gtk_style_context_get_state (context), &padding);
-  gtk_style_context_restore (context);
-
   width = gtk_widget_get_allocated_width (widget);
 
   if (priv->is_active)
@@ -357,54 +350,102 @@ gtk_switch_activate (GtkSwitch *sw)
 }
 
 static void
-gtk_switch_get_preferred_width (GtkWidget *widget,
-                                gint      *minimum,
-                                gint      *natural)
+gtk_switch_get_slider_size (GtkCssGadget   *gadget,
+                            GtkOrientation  orientation,
+                            gint            for_size,
+                            gint           *minimum,
+                            gint           *natural,
+                            gint           *minimum_baseline,
+                            gint           *natural_baseline,
+                            gpointer        unused)
 {
+  GtkWidget *widget = gtk_css_gadget_get_owner (gadget);
+  gint slider_size;
+
+  if (orientation == GTK_ORIENTATION_VERTICAL)
+    {
+      gtk_widget_style_get (widget,
+                            "slider-width", &slider_size,
+                            NULL);
+      slider_size *= 0.6;
+    }
+  else
+    {
+      gtk_widget_style_get (widget,
+                            "slider-height", &slider_size,
+                            NULL);
+    }
+
+  *minimum = slider_size;
+  *natural = slider_size;
+}
+
+static void
+gtk_switch_get_content_size (GtkCssGadget   *gadget,
+                             GtkOrientation  orientation,
+                             gint            for_size,
+                             gint           *minimum,
+                             gint           *natural,
+                             gint           *minimum_baseline,
+                             gint           *natural_baseline,
+                             gpointer        unused)
+{
+  GtkWidget *widget;
   GtkSwitch *self;
   GtkSwitchPrivate *priv;
-  GtkStyleContext *context;
-  GtkBorder padding;
-  gint width, slider_width;
+  gint slider_minimum, slider_natural;
   PangoLayout *layout;
-  PangoRectangle logical_rect;
+  PangoRectangle on_rect, off_rect;
 
+  widget = gtk_css_gadget_get_owner (gadget);
   self = GTK_SWITCH (widget);
   priv = self->priv;
-  context = gtk_widget_get_style_context (widget);
-
-  gtk_style_context_save_to_node (context, priv->slider_node);
-  gtk_style_context_get_padding (context, gtk_style_context_get_state (context), &padding);
-
-  width = padding.left + padding.right;
 
-  gtk_style_context_restore (context);
-
-  gtk_widget_style_get (widget,
-                        "slider-width", &slider_width,
-                        NULL);
+  gtk_css_gadget_get_preferred_size (priv->slider_gadget,
+                                     orientation,
+                                     -1,
+                                     &slider_minimum, &slider_natural,
+                                     NULL, NULL);
 
   /* Translators: if the "on" state label requires more than three
    * glyphs then use MEDIUM VERTICAL BAR (U+2759) as the text for
    * the state
    */
   layout = gtk_widget_create_pango_layout (widget, C_("switch", "ON"));
-  pango_layout_get_extents (layout, NULL, &logical_rect);
-  pango_extents_to_pixels (&logical_rect, NULL);
-  width += MAX (logical_rect.width, slider_width);
+  pango_layout_get_pixel_extents (layout, NULL, &on_rect);
 
   /* Translators: if the "off" state label requires more than three
    * glyphs then use WHITE CIRCLE (U+25CB) as the text for the state
    */
   pango_layout_set_text (layout, C_("switch", "OFF"), -1);
-  pango_layout_get_extents (layout, NULL, &logical_rect);
-  pango_extents_to_pixels (&logical_rect, NULL);
-  width += MAX (logical_rect.width, slider_width);
+  pango_layout_get_pixel_extents (layout, NULL, &off_rect);
 
   g_object_unref (layout);
 
-  *minimum = width;
-  *natural = width;
+  if (orientation == GTK_ORIENTATION_HORIZONTAL)
+    {
+      int text_width = MAX (on_rect.width, off_rect.width);
+      *minimum = 2 * MAX (slider_minimum, text_width);
+      *natural = 2 * MAX (slider_natural, text_width);
+    }
+  else
+    {
+      int text_height = MAX (on_rect.height, off_rect.height);
+      *minimum = MAX (slider_minimum, text_height);
+      *natural = MAX (slider_natural, text_height);
+    }
+}
+
+static void
+gtk_switch_get_preferred_width (GtkWidget *widget,
+                                gint      *minimum,
+                                gint      *natural)
+{
+  gtk_css_gadget_get_preferred_size (GTK_SWITCH (widget)->priv->gadget,
+                                     GTK_ORIENTATION_HORIZONTAL,
+                                     -1,
+                                     minimum, natural,
+                                     NULL, NULL);
 }
 
 static void
@@ -412,45 +453,30 @@ gtk_switch_get_preferred_height (GtkWidget *widget,
                                  gint      *minimum,
                                  gint      *natural)
 {
-  GtkSwitch *self;
-  GtkSwitchPrivate *priv;
-  GtkStyleContext *context;
-  GtkBorder padding;
-  gint height, slider_height;
-  PangoLayout *layout;
-  PangoRectangle logical_rect;
-  gchar *str;
-
-  self = GTK_SWITCH (widget);
-  priv = self->priv;
-  context = gtk_widget_get_style_context (widget);
-
-  gtk_style_context_save_to_node (context, priv->slider_node);
-
-  gtk_style_context_get_padding (context, gtk_style_context_get_state (context), &padding);
-
-  height = padding.top + padding.bottom;
-
-  gtk_style_context_restore (context);
-
-  gtk_widget_style_get (widget,
-                        "slider-height", &slider_height,
-                        NULL);
-
-  str = g_strdup_printf ("%s%s",
-                         C_("switch", "ON"),
-                         C_("switch", "OFF"));
-
-  layout = gtk_widget_create_pango_layout (widget, str);
-  pango_layout_get_extents (layout, NULL, &logical_rect);
-  pango_extents_to_pixels (&logical_rect, NULL);
-  height += MAX (slider_height, logical_rect.height);
+  gtk_css_gadget_get_preferred_size (GTK_SWITCH (widget)->priv->gadget,
+                                     GTK_ORIENTATION_VERTICAL,
+                                     -1,
+                                     minimum, natural,
+                                     NULL, NULL);
+}
 
-  g_object_unref (layout);
-  g_free (str);
+static void
+gtk_switch_allocate_contents (GtkCssGadget        *gadget,
+                              const GtkAllocation *allocation,
+                              int                  baseline,
+                              GtkAllocation       *out_clip,
+                              gpointer             unused)
+{
+  GtkSwitch *self = GTK_SWITCH (gtk_css_gadget_get_owner (gadget));
+  GtkSwitchPrivate *priv = self->priv;
 
-  *minimum = height;
-  *natural = height;
+  /* We pretend to allocate the full area to the slider. That way both
+   * potential left and right clip overlap gets correctly computed.
+   */
+  gtk_css_gadget_allocate (priv->slider_gadget,
+                           allocation,
+                           baseline,
+                           out_clip);
 }
 
 static void
@@ -458,8 +484,6 @@ gtk_switch_size_allocate (GtkWidget     *widget,
                           GtkAllocation *allocation)
 {
   GtkSwitchPrivate *priv = GTK_SWITCH (widget)->priv;
-  GtkStyleContext *context;
-  GtkBorder extents;
   GtkAllocation clip;
 
   gtk_widget_set_allocation (widget, allocation);
@@ -471,23 +495,12 @@ gtk_switch_size_allocate (GtkWidget     *widget,
                             allocation->width,
                             allocation->height);
 
-  context = gtk_widget_get_style_context (widget);
-
-  gtk_style_context_save_to_node (context, priv->slider_node);
-
-  _gtk_css_shadows_value_get_extents (_gtk_style_context_peek_property (context,
-                                                                        GTK_CSS_PROPERTY_BOX_SHADOW),
-                                      &extents);
-
-  gtk_style_context_restore (context);
-
-  clip = *allocation;
-  clip.x -= extents.left;
-  clip.y -= extents.top;
-  clip.width += extents.left + extents.right;
-  clip.height += extents.top + extents.bottom;
-
-  _gtk_widget_set_simple_clip (widget, &clip);
+  gtk_css_gadget_allocate (priv->gadget,
+                           allocation,
+                           gtk_widget_get_allocated_baseline (widget),
+                           &clip);
+  
+  gtk_widget_set_clip (widget, &clip);
 }
 
 static void
@@ -571,7 +584,7 @@ gtk_switch_paint_handle (GtkWidget    *widget,
 {
   GtkStyleContext *context = gtk_widget_get_style_context (widget);
 
-  gtk_style_context_save_to_node (context, GTK_SWITCH (widget)->priv->slider_node);
+  gtk_style_context_save_to_node (context, gtk_css_gadget_get_node (GTK_SWITCH 
(widget)->priv->slider_gadget));
 
   gtk_render_slider (context, cr,
                      box->x, box->y,
@@ -582,43 +595,29 @@ gtk_switch_paint_handle (GtkWidget    *widget,
 }
 
 static gboolean
-gtk_switch_draw (GtkWidget *widget,
-                 cairo_t   *cr)
+gtk_switch_render_slider (GtkCssGadget *gadget,
+                          cairo_t      *cr,
+                          int           width,
+                          int           height,
+                          gpointer      data)
 {
+  return gtk_widget_has_visible_focus (gtk_css_gadget_get_owner (gadget));
+}
+
+static gboolean
+gtk_switch_render_trough (GtkCssGadget *gadget,
+                          cairo_t      *cr,
+                          int           width,
+                          int           height,
+                          gpointer      data)
+{
+  GtkWidget *widget = gtk_css_gadget_get_owner (gadget);
   GtkSwitchPrivate *priv = GTK_SWITCH (widget)->priv;
-  GtkStyleContext *context;
-  GdkRectangle handle;
+  GtkStyleContext *context = gtk_widget_get_style_context (widget);
   PangoLayout *layout;
   PangoRectangle rect;
   gint label_x, label_y;
-  GtkBorder padding;
-  gint x, y, width, height;
-
-  context = gtk_widget_get_style_context (widget);
-
-  gtk_style_context_save_to_node (context, priv->slider_node);
-
-  gtk_style_context_get_padding (context, gtk_style_context_get_state (context), &padding);
-
-  gtk_style_context_restore (context);
-
-  x = 0;
-  y = 0;
-  width = gtk_widget_get_allocated_width (widget);
-  height = gtk_widget_get_allocated_height (widget);
-
-  gtk_render_background (context, cr, x, y, width, height);
-  gtk_render_frame (context, cr, x, y, width, height);
-
-  width -= padding.left + padding.right;
-  height -= padding.top + padding.bottom;
-
-  x += padding.left;
-  y += padding.top;
-
-  handle.y = y;
-  handle.width = width / 2;
-  handle.height = height;
+  gint slider_offset;
 
   /* Translators: if the "on" state label requires more than three
    * glyphs then use MEDIUM VERTICAL BAR (U+2759) as the text for
@@ -626,11 +625,10 @@ gtk_switch_draw (GtkWidget *widget,
    */
   layout = gtk_widget_create_pango_layout (widget, C_("switch", "ON"));
 
-  pango_layout_get_extents (layout, NULL, &rect);
-  pango_extents_to_pixels (&rect, NULL);
+  pango_layout_get_pixel_extents (layout, NULL, &rect);
 
-  label_x = x +  ((width / 2) - rect.width) / 2;
-  label_y = y + (height - rect.height) / 2;
+  label_x = ((width / 2) - rect.width) / 2;
+  label_y = (height - rect.height) / 2;
 
   gtk_render_layout (context, cr, label_x, label_y, layout);
 
@@ -641,26 +639,36 @@ gtk_switch_draw (GtkWidget *widget,
    */
   layout = gtk_widget_create_pango_layout (widget, C_("switch", "OFF"));
 
-  pango_layout_get_extents (layout, NULL, &rect);
-  pango_extents_to_pixels (&rect, NULL);
+  pango_layout_get_pixel_extents (layout, NULL, &rect);
 
-  label_x = x +  (width / 2) + ((width / 2) - rect.width) / 2;
-  label_y = y + (height - rect.height) / 2;
+  label_x = (width / 2) + ((width / 2) - rect.width) / 2;
+  label_y = (height - rect.height) / 2;
 
   gtk_render_layout (context, cr, label_x, label_y, layout);
 
   g_object_unref (layout);
 
-  handle.x = x + round (priv->handle_pos * width / 2);
+  slider_offset = round (priv->handle_pos * (width - width / 2));
+  cairo_translate (cr, slider_offset, 0);
 
-  gtk_switch_paint_handle (widget, cr, &handle);
+  gtk_css_gadget_draw (priv->slider_gadget,
+                       cr,
+                       width / 2,
+                       height);
 
-  if (gtk_widget_has_visible_focus (widget))
-    {
-      gtk_render_focus (context, cr,
-                        handle.x, handle.y,
-                        handle.width, handle.height);
-    }
+  cairo_translate (cr, -slider_offset, 0);
+
+  return FALSE;
+}
+
+static gboolean
+gtk_switch_draw (GtkWidget *widget,
+                 cairo_t   *cr)
+{
+  gtk_css_gadget_draw (GTK_SWITCH (widget)->priv->gadget,
+                       cr,
+                       gtk_widget_get_allocated_width (widget),
+                       gtk_widget_get_allocated_height (widget));
 
   return FALSE;
 }
@@ -839,6 +847,9 @@ gtk_switch_dispose (GObject *object)
       priv->action = NULL;
     }
 
+  g_clear_object (&priv->gadget);
+  g_clear_object (&priv->slider_gadget);
+
   g_clear_object (&priv->pan_gesture);
   g_clear_object (&priv->multipress_gesture);
 
@@ -870,29 +881,6 @@ state_set (GtkSwitch *sw, gboolean state)
 }
 
 static void
-node_style_changed_cb (GtkCssNode  *node,
-                       GtkCssStyle *old_style,
-                       GtkCssStyle *new_style,
-                       GtkWidget   *widget)
-{
-  GtkBitmask *changes;
-  static GtkBitmask *affects_size = NULL;
-
-  if (G_UNLIKELY (affects_size == NULL))
-    affects_size = _gtk_css_style_property_get_mask_affecting (GTK_CSS_AFFECTS_SIZE | GTK_CSS_AFFECTS_CLIP);
-
-  changes = _gtk_bitmask_new ();
-  changes = gtk_css_style_add_difference (changes, old_style, new_style);
-
-  if (_gtk_bitmask_intersects (changes, affects_size))
-    gtk_widget_queue_resize (widget);
-  else
-    gtk_widget_queue_draw (widget);
-
-  _gtk_bitmask_free (changes);
-}
-
-static void
 gtk_switch_class_init (GtkSwitchClass *klass)
 {
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
@@ -1064,12 +1052,24 @@ gtk_switch_init (GtkSwitch *self)
   gtk_widget_set_can_focus (GTK_WIDGET (self), TRUE);
 
   widget_node = gtk_widget_get_css_node (GTK_WIDGET (self));
-  priv->slider_node = gtk_css_node_new ();
-  gtk_css_node_set_name (priv->slider_node, I_("slider"));
-  gtk_css_node_set_parent (priv->slider_node, widget_node);
-  gtk_css_node_set_state (priv->slider_node, gtk_css_node_get_state (widget_node));
-  g_signal_connect_object (priv->slider_node, "style-changed", G_CALLBACK (node_style_changed_cb), self, 0);
-  g_object_unref (priv->slider_node);
+  priv->gadget = gtk_css_custom_gadget_new_for_node (widget_node,
+                                                     GTK_WIDGET (self),
+                                                     gtk_switch_get_content_size,
+                                                     gtk_switch_allocate_contents,
+                                                     gtk_switch_render_trough,
+                                                     NULL,
+                                                     NULL);
+
+  priv->slider_gadget = gtk_css_custom_gadget_new ("slider",
+                                                   GTK_WIDGET (self),
+                                                   priv->gadget,
+                                                   NULL,
+                                                   gtk_switch_get_slider_size,
+                                                   NULL,
+                                                   gtk_switch_render_slider,
+                                                   NULL,
+                                                   NULL);
+  gtk_css_gadget_add_class (priv->slider_gadget, GTK_STYLE_CLASS_SLIDER);
 
   gesture = gtk_gesture_multi_press_new (GTK_WIDGET (self));
   gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (gesture), FALSE);
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 05f5b4e..6832614 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -36,7 +36,7 @@
   .background:backdrop {
     text-shadow: none;
     icon-shadow: none;
-    color: #949796;
+    color: #939695;
     background-color: #393f3f; }
 
 /*
@@ -58,8 +58,8 @@
     background-color: #212424;
     color: #eeeeec; }
   .gtkstyle-fallback:insensitive {
-    background-color: #333636;
-    color: #949796; }
+    background-color: #323636;
+    color: #939695; }
   .gtkstyle-fallback:selected {
     background-color: #215d9c;
     color: #ffffff; }
@@ -70,7 +70,7 @@ textview text,
   background-color: #292929; }
   textview text:backdrop,
   .view:backdrop {
-    color: #d5d5d5;
+    color: #d4d4d4;
     background-color: #2c2c2c; }
 
 .rubberband,
@@ -84,9 +84,9 @@ treeview.view rubberband,
 label.separator {
   color: #eeeeec; }
   label.separator:backdrop {
-    color: #949796; }
+    color: #939695; }
 label:insensitive {
-  color: #949796; }
+  color: #939695; }
   label:insensitive:backdrop {
     color: #5d6767; }
 
@@ -104,18 +104,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; }
 
 .grid-child {
   padding: 3px;
@@ -168,7 +168,7 @@ entry, spinbutton {
   border-radius: 3px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   background-color: transparent;
-  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.1); }
@@ -181,7 +181,7 @@ entry, spinbutton {
   entry.flat, spinbutton.flat, entry.flat:focus, spinbutton.flat:focus {
     padding: 2px;
     background-color: transparent;
-    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);
@@ -189,29 +189,29 @@ entry, spinbutton {
     border-radius: 0; }
   entry:focus, spinbutton:focus {
     background-color: transparent;
-    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.1);
     border-color: #0f2b48; }
   entry:insensitive, spinbutton:insensitive {
     background-color: transparent;
-    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.1); }
   entry:backdrop, spinbutton:backdrop {
     background-color: transparent;
-    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:insensitive, spinbutton:backdrop:insensitive {
     background-color: transparent;
-    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;
@@ -231,7 +231,7 @@ entry, spinbutton {
     border-color: #1a0000; }
     entry.error:focus, spinbutton.error:focus {
       background-color: transparent;
-      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.1);
       border-color: #1a0000; }
     entry.error:selected, spinbutton.error:selected, entry.error:selected:focus, 
spinbutton.error:selected:focus {
@@ -241,22 +241,22 @@ entry, spinbutton {
     border-color: #432100; }
     entry.warning:focus, spinbutton.warning:focus {
       background-color: transparent;
-      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.1);
       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: transparent;
-    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));
@@ -266,7 +266,7 @@ entry, spinbutton {
     icon-shadow: 0 1px black; }
     .osd entry:focus, .osd spinbutton:focus {
       background-color: transparent;
-      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));
@@ -276,7 +276,7 @@ entry, spinbutton {
       icon-shadow: 0 1px black; }
     .osd entry:backdrop, .osd spinbutton:backdrop {
       background-color: transparent;
-      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));
@@ -286,10 +286,10 @@ entry, spinbutton {
       icon-shadow: none; }
     .osd entry:insensitive, .osd spinbutton:insensitive {
       background-color: transparent;
-      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;
@@ -303,7 +303,7 @@ entry, spinbutton {
   border-top-color: #252626;
   background-image: linear-gradient(to bottom, #292929); }
   .linked.vertical > entry:not(:insensitive) + entry:not(:insensitive):backdrop, .linked.vertical > 
spinbutton:not(:insensitive) + entry:not(:insensitive):backdrop, .linked.vertical > entry:not(:insensitive) + 
spinbutton:not(:insensitive):backdrop, .linked.vertical > spinbutton:not(:insensitive) + 
spinbutton:not(:insensitive):backdrop {
-    border-top-color: #282929;
+    border-top-color: #272929;
     background-image: linear-gradient(to bottom, #2c2c2c); }
 .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: #0f2b48;
@@ -378,8 +378,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;
     icon-shadow: none;
@@ -388,32 +388,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:insensitive, button.flat:backdrop:insensitive, 
button.sidebar-button:backdrop:insensitive, headerbar button.titlebutton:backdrop:insensitive,
     .titlebar button.titlebutton:backdrop:insensitive {
       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;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-      button:backdrop:insensitive > .label, headerbar button.titlebutton:backdrop:insensitive > .label,
-      .titlebar button.titlebutton:backdrop:insensitive > .label, button.flat:backdrop:insensitive > .label, 
button.sidebar-button:backdrop:insensitive > .label, headerbar button.titlebutton:backdrop:insensitive > 
.label,
+      button:backdrop:insensitive > .label, button.flat:backdrop:insensitive > .label, 
button.sidebar-button:backdrop:insensitive > .label, headerbar button.titlebutton:backdrop:insensitive > 
.label,
       .titlebar button.titlebutton:backdrop:insensitive > .label {
         color: inherit; }
     button:backdrop:insensitive:active, button:backdrop:insensitive:checked, 
button.flat:backdrop:insensitive:active, button.sidebar-button:backdrop:insensitive:active, headerbar 
button.titlebutton:backdrop:insensitive:active,
     .titlebar button.titlebutton:backdrop:insensitive:active, button.flat:backdrop:insensitive:checked, 
button.sidebar-button:backdrop:insensitive:checked, headerbar button.titlebutton:backdrop:insensitive:checked,
     .titlebar button.titlebutton:backdrop:insensitive: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:insensitive:active > .label, headerbar button.titlebutton:backdrop:insensitive:active 
.label,
-      .titlebar button.titlebutton:backdrop:insensitive:active > .label, button:backdrop:insensitive:checked 
.label, headerbar button.titlebutton:backdrop:insensitive:checked > .label,
-      .titlebar button.titlebutton:backdrop:insensitive:checked > .label, 
button.flat:backdrop:insensitive:active > .label, button.sidebar-button:backdrop:insensitive:active > .label, 
headerbar button.titlebutton:backdrop:insensitive:active > .label,
+      button:backdrop:insensitive:active > .label, button:backdrop:insensitive:checked > .label, 
button.flat:backdrop:insensitive:active > .label, button.sidebar-button:backdrop:insensitive:active > .label, 
headerbar button.titlebutton:backdrop:insensitive:active > .label,
       .titlebar button.titlebutton:backdrop:insensitive:active > .label, 
button.flat:backdrop:insensitive:checked > .label, button.sidebar-button:backdrop:insensitive:checked > 
.label, headerbar button.titlebutton:backdrop:insensitive:checked > .label,
       .titlebar button.titlebutton:backdrop:insensitive:checked > .label {
         color: inherit; }
@@ -429,23 +426,20 @@ button, headerbar button.titlebutton,
     icon-shadow: none; }
   button:insensitive, headerbar button.titlebutton:insensitive,
   .titlebar button.titlebutton:insensitive {
-    color: #949796;
+    color: #939695;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #333636);
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
-    button:insensitive > .label, headerbar button.titlebutton:insensitive > .label,
-    .titlebar button.titlebutton:insensitive > .label {
+    button:insensitive > .label {
       color: inherit; }
     button:insensitive:active, button:insensitive: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.1); }
-      button:insensitive:active > .label, headerbar button.titlebutton:insensitive:active > .label,
-      .titlebar button.titlebutton:insensitive:active > .label, button:insensitive:checked > .label, 
headerbar button.titlebutton:insensitive:checked > .label,
-      .titlebar button.titlebutton:insensitive:checked > .label {
+      button:insensitive:active > .label, button:insensitive:checked > .label {
         color: inherit; }
   button.osd, headerbar button.osd.titlebutton,
   .titlebar button.osd.titlebutton {
@@ -488,9 +482,9 @@ button, headerbar button.titlebutton,
       border: none;
       box-shadow: none; }
     button.osd:insensitive, button.osd:backdrop:insensitive {
-      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;
@@ -535,9 +529,9 @@ button, headerbar button.titlebutton,
       icon-shadow: none;
       outline-color: rgba(238, 238, 236, 0.3); }
     .osd button:insensitive, .osd button:backdrop:insensitive {
-      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;
@@ -579,9 +573,9 @@ button, headerbar button.titlebutton,
       .osd button.flat:insensitive, .osd button.sidebar-button:insensitive, .osd headerbar 
button.titlebutton:insensitive, headerbar .osd button.titlebutton:insensitive,
       .osd .titlebar button.titlebutton:insensitive,
       .titlebar .osd button.titlebutton:insensitive {
-        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;
@@ -650,7 +644,7 @@ button, headerbar button.titlebutton,
       box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 
238, 236, 0.1); }
     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;
@@ -659,32 +653,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:insensitive, button.suggested-action.flat:backdrop:insensitive, 
button.suggested-action.sidebar-button:backdrop:insensitive, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive,
       .titlebar button.suggested-action.titlebutton:backdrop:insensitive {
         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;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-        button.suggested-action:backdrop:insensitive > .label, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive > .label,
-        .titlebar button.suggested-action.titlebutton:backdrop:insensitive > .label, 
button.suggested-action.flat:backdrop:insensitive > .label, 
button.suggested-action.sidebar-button:backdrop:insensitive > .label, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive > .label,
+        button.suggested-action:backdrop:insensitive > .label, 
button.suggested-action.flat:backdrop:insensitive > .label, 
button.suggested-action.sidebar-button:backdrop:insensitive > .label, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive > .label,
         .titlebar button.suggested-action.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
         button.suggested-action:backdrop:insensitive:active, 
button.suggested-action:backdrop:insensitive:checked, 
button.suggested-action.flat:backdrop:insensitive:active, 
button.suggested-action.sidebar-button:backdrop:insensitive:active, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive:active,
         .titlebar button.suggested-action.titlebutton:backdrop:insensitive:active, 
button.suggested-action.flat:backdrop:insensitive:checked, 
button.suggested-action.sidebar-button:backdrop:insensitive:checked, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive:checked,
         .titlebar button.suggested-action.titlebutton:backdrop:insensitive: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:insensitive:active > .label, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive:active > .label,
-          .titlebar button.suggested-action.titlebutton:backdrop:insensitive:active > .label, 
button.suggested-action:backdrop:insensitive:checked > .label, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive:checked > .label,
-          .titlebar button.suggested-action.titlebutton:backdrop:insensitive:checked > .label, 
button.suggested-action.flat:backdrop:insensitive:active > .label, 
button.suggested-action.sidebar-button:backdrop:insensitive:active > .label, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive:active > .label,
+          button.suggested-action:backdrop:insensitive:active > .label, 
button.suggested-action:backdrop:insensitive:checked > .label, 
button.suggested-action.flat:backdrop:insensitive:active > .label, 
button.suggested-action.sidebar-button:backdrop:insensitive:active > .label, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive:active > .label,
           .titlebar button.suggested-action.titlebutton:backdrop:insensitive:active > .label, 
button.suggested-action.flat:backdrop:insensitive:checked > .label, 
button.suggested-action.sidebar-button:backdrop:insensitive:checked > .label, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive:checked > .label,
           .titlebar button.suggested-action.titlebutton:backdrop:insensitive:checked > .label {
             color: inherit; }
@@ -700,23 +691,20 @@ button, headerbar button.titlebutton,
       icon-shadow: none;
       color: rgba(33, 93, 156, 0.8); }
     button.suggested-action:insensitive {
-      color: #949796;
+      color: #939695;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #333636);
+      background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
-      button.suggested-action:insensitive > .label, headerbar 
button.suggested-action.titlebutton:insensitive > .label,
-      .titlebar button.suggested-action.titlebutton:insensitive > .label {
+      button.suggested-action:insensitive > .label {
         color: inherit; }
       button.suggested-action:insensitive:active, button.suggested-action:insensitive: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.1); }
-        button.suggested-action:insensitive:active > .label, headerbar 
button.suggested-action.titlebutton:insensitive:active > .label,
-        .titlebar button.suggested-action.titlebutton:insensitive:active > .label, 
button.suggested-action:insensitive:checked > .label, headerbar 
button.suggested-action.titlebutton:insensitive:checked > .label,
-        .titlebar button.suggested-action.titlebutton:insensitive:checked > .label {
+        button.suggested-action:insensitive:active > .label, button.suggested-action:insensitive:checked > 
.label {
           color: inherit; }
     .osd button.suggested-action {
       color: #eeeeec;
@@ -746,9 +734,9 @@ button, headerbar button.titlebutton,
         icon-shadow: none;
         outline-color: rgba(238, 238, 236, 0.3); }
       .osd button.suggested-action:insensitive, .osd button.suggested-action:backdrop:insensitive {
-        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;
@@ -797,7 +785,7 @@ button, headerbar button.titlebutton,
       box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 
238, 236, 0.1); }
     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;
@@ -813,25 +801,22 @@ button, headerbar button.titlebutton,
       button.destructive-action:backdrop:insensitive, button.destructive-action.flat:backdrop:insensitive, 
button.destructive-action.sidebar-button:backdrop:insensitive, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive,
       .titlebar button.destructive-action.titlebutton:backdrop:insensitive {
         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;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-        button.destructive-action:backdrop:insensitive > .label, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive > .label,
-        .titlebar button.destructive-action.titlebutton:backdrop:insensitive > .label, 
button.destructive-action.flat:backdrop:insensitive > .label, 
button.destructive-action.sidebar-button:backdrop:insensitive > .label, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive > .label,
+        button.destructive-action:backdrop:insensitive > .label, 
button.destructive-action.flat:backdrop:insensitive > .label, 
button.destructive-action.sidebar-button:backdrop:insensitive > .label, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive > .label,
         .titlebar button.destructive-action.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
         button.destructive-action:backdrop:insensitive:active, 
button.destructive-action:backdrop:insensitive:checked, 
button.destructive-action.flat:backdrop:insensitive:active, 
button.destructive-action.sidebar-button:backdrop:insensitive:active, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive:active,
         .titlebar button.destructive-action.titlebutton:backdrop:insensitive:active, 
button.destructive-action.flat:backdrop:insensitive:checked, 
button.destructive-action.sidebar-button:backdrop:insensitive:checked, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive:checked,
         .titlebar button.destructive-action.titlebutton:backdrop:insensitive: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:insensitive:active > .label, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive:active > .label,
-          .titlebar button.destructive-action.titlebutton:backdrop:insensitive:active > .label, 
button.destructive-action:backdrop:insensitive:checked > .label, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive:checked > .label,
-          .titlebar button.destructive-action.titlebutton:backdrop:insensitive:checked > .label, 
button.destructive-action.flat:backdrop:insensitive:active > .label, 
button.destructive-action.sidebar-button:backdrop:insensitive:active > .label, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive:active > .label,
+          button.destructive-action:backdrop:insensitive:active > .label, 
button.destructive-action:backdrop:insensitive:checked > .label, 
button.destructive-action.flat:backdrop:insensitive:active > .label, 
button.destructive-action.sidebar-button:backdrop:insensitive:active > .label, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive:active > .label,
           .titlebar button.destructive-action.titlebutton:backdrop:insensitive:active > .label, 
button.destructive-action.flat:backdrop:insensitive:checked > .label, 
button.destructive-action.sidebar-button:backdrop:insensitive:checked > .label, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive:checked > .label,
           .titlebar button.destructive-action.titlebutton:backdrop:insensitive:checked > .label {
             color: inherit; }
@@ -847,23 +832,20 @@ button, headerbar button.titlebutton,
       icon-shadow: none;
       color: rgba(213, 16, 16, 0.8); }
     button.destructive-action:insensitive {
-      color: #949796;
+      color: #939695;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #333636);
+      background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
-      button.destructive-action:insensitive > .label, headerbar 
button.destructive-action.titlebutton:insensitive > .label,
-      .titlebar button.destructive-action.titlebutton:insensitive > .label {
+      button.destructive-action:insensitive > .label {
         color: inherit; }
       button.destructive-action:insensitive:active, button.destructive-action:insensitive: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.1); }
-        button.destructive-action:insensitive:active > .label, headerbar 
button.destructive-action.titlebutton:insensitive:active > .label,
-        .titlebar button.destructive-action.titlebutton:insensitive:active > .label, 
button.destructive-action:insensitive:checked > .label, headerbar 
button.destructive-action.titlebutton:insensitive:checked > .label,
-        .titlebar button.destructive-action.titlebutton:insensitive:checked > .label {
+        button.destructive-action:insensitive:active > .label, button.destructive-action:insensitive:checked 
.label {
           color: inherit; }
     .osd button.destructive-action {
       color: #eeeeec;
@@ -893,9 +875,9 @@ button, headerbar button.titlebutton,
         icon-shadow: none;
         outline-color: rgba(238, 238, 236, 0.3); }
       .osd button.destructive-action:insensitive, .osd button.destructive-action:backdrop:insensitive {
-        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;
@@ -942,11 +924,7 @@ button, headerbar button.titlebutton,
       padding-top: 3px;
       padding-bottom: 3px; }
     .stack-switcher > button.text-button, .stack-switcher > GtkScaleButton.button.text-button,
-    .stack-switcher > GtkVolumeButton.button.text-button, headerbar .stack-switcher > 
button.text-button.titlebutton, headerbar .stack-switcher > GtkScaleButton.titlebutton.button.text-button,
-    headerbar .stack-switcher > GtkVolumeButton.titlebutton.button.text-button,
-    .titlebar .stack-switcher > button.text-button.titlebutton,
-    .titlebar .stack-switcher > GtkScaleButton.titlebutton.button.text-button,
-    .titlebar .stack-switcher > GtkVolumeButton.titlebutton.button.text-button {
+    .stack-switcher > GtkVolumeButton.button.text-button {
       padding: 5px 10px 6px; }
     .stack-switcher > button.image-button, headerbar .stack-switcher > button.titlebutton,
     .titlebar .stack-switcher > button.titlebutton {
@@ -975,7 +953,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;
@@ -985,8 +963,7 @@ button, headerbar button.titlebutton,
   text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
   icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
-  .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;
@@ -994,9 +971,7 @@ button, headerbar button.titlebutton,
     text-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
-  .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;
@@ -1004,56 +979,47 @@ button, headerbar button.titlebutton,
     text-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
     box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 
238, 236, 0.1); }
-  .inline-toolbar toolbutton > button:insensitive, .inline-toolbar headerbar toolbutton > 
button.titlebutton:insensitive,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:insensitive {
-    color: #949796;
+  .inline-toolbar toolbutton > button:insensitive {
+    color: #939695;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #333636);
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
     .inline-toolbar toolbutton > button:insensitive > .label {
       color: inherit; }
-  .inline-toolbar toolbutton > button:insensitive:active, .inline-toolbar headerbar toolbutton > 
button.titlebutton:insensitive:active,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:insensitive:active, .inline-toolbar toolbutton > 
button:insensitive:checked, .inline-toolbar headerbar toolbutton > button.titlebutton:insensitive:checked,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:insensitive:checked {
-    color: #949796;
+  .inline-toolbar toolbutton > button:insensitive:active, .inline-toolbar toolbutton > 
button:insensitive: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.1); }
     .inline-toolbar toolbutton > button:insensitive:active > .label, .inline-toolbar toolbutton > 
button:insensitive: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;
     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:insensitive, .inline-toolbar headerbar toolbutton > 
button.titlebutton:backdrop:insensitive,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop:insensitive {
+  .inline-toolbar toolbutton > button:backdrop:insensitive {
     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;
     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:insensitive > .label {
       color: inherit; }
-  .inline-toolbar toolbutton > button:backdrop:insensitive:active, .inline-toolbar headerbar toolbutton > 
button.titlebutton:backdrop:insensitive:active,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop:insensitive:active, .inline-toolbar 
toolbutton > button:backdrop:insensitive:checked, .inline-toolbar headerbar toolbutton > 
button.titlebutton:backdrop:insensitive:checked,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop:insensitive:checked {
+  .inline-toolbar toolbutton > button:backdrop:insensitive:active, .inline-toolbar toolbutton > 
button:backdrop:insensitive: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:insensitive:active > .label, .inline-toolbar toolbutton > 
button:backdrop:insensitive:checked > .label {
       color: inherit; }
@@ -1079,8 +1045,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,
@@ -1099,8 +1064,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,
@@ -1120,8 +1084,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,
@@ -1141,22 +1104,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; }
 
@@ -1206,7 +1165,7 @@ modelbutton.flat,
   outline-offset: -1px; }
   modelbutton.flat:hover,
   .menuitem.button.flat:hover {
-    background-color: #4b5150; }
+    background-color: #4b5050; }
 
 button.color, headerbar button.color.titlebutton,
 .titlebar button.color.titlebutton {
@@ -1234,17 +1193,17 @@ button.color, headerbar button.color.titlebutton,
   *:link:hover, button:hover:link, button:hover: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, button:backdrop:hover:selected:visited, .titlebar.selection-mode 
.subtitle:backdrop:hover:link,
   headerbar.selection-mode .subtitle:backdrop:hover:link {
     color: #215d9c; }
   *:link:selected, button:selected:link, button:selected:visited, .titlebar.selection-mode .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, button:visited, headerbar button.titlebutton:visited,
@@ -1252,8 +1211,8 @@ button:link, headerbar button.titlebutton:link,
   text-shadow: none; }
   button:link:hover, button:link:active, button:link:checked, button:visited:hover, button:visited:active, 
button:visited:checked {
     text-shadow: none; }
-  button:link > label, headerbar button.titlebutton:link > label,
-  .titlebar button.titlebutton:link > label, button:visited > label, headerbar button.titlebutton:visited > 
label,
+  button:link > label,
+  .titlebar button.titlebutton:link > label, button:visited > label,
   .titlebar button.titlebutton:visited > label {
     text-decoration-line: underline; }
 
@@ -1266,7 +1225,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) {
@@ -1275,13 +1234,13 @@ spinbutton:not(.vertical) .titlebar button.titlebutton,
     color: #eeeeec;
     background-color: rgba(238, 238, 236, 0.05); }
   spinbutton:not(.vertical) button:insensitive {
-    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:insensitive {
     background-image: none;
@@ -1334,7 +1293,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;
     icon-shadow: none;
-    color: #878a89;
+    color: #878989;
     border-color: rgba(0, 0, 0, 0.5);
     icon-shadow: none;
     box-shadow: none; }
@@ -1376,31 +1335,29 @@ spinbutton.vertical {
         icon-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
       spinbutton.vertical button:first-child:insensitive {
-        color: #949796;
+        color: #939695;
         border-color: #1c1f1f;
-        background-image: linear-gradient(to bottom, #333636);
+        background-image: linear-gradient(to bottom, #323636);
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        spinbutton.vertical button:first-child:insensitive > .label, spinbutton.vertical headerbar 
button.titlebutton:first-child:insensitive > .label,
-        spinbutton.vertical .titlebar button.titlebutton:first-child:insensitive > .label {
+        spinbutton.vertical button:first-child:insensitive > .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;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
         spinbutton.vertical button:first-child:backdrop:insensitive {
           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;
           icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-          spinbutton.vertical button:first-child:backdrop:insensitive > .label, spinbutton.vertical 
headerbar button.titlebutton:first-child:backdrop:insensitive > .label,
-          spinbutton.vertical .titlebar button.titlebutton:first-child:backdrop:insensitive > .label {
+          spinbutton.vertical button:first-child:backdrop:insensitive > .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:insensitive, spinbutton.vertical 
button:first-child:backdrop {
     border-radius: 3px 3px 0 0;
@@ -1436,9 +1393,9 @@ spinbutton.vertical {
     icon-shadow: none;
     outline-color: rgba(238, 238, 236, 0.3); }
   .osd spinbutton.vertical button:first-child:insensitive {
-    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;
@@ -1466,16 +1423,16 @@ combobox {
   -GtkComboBox-shadow-type: none;
   text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
   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-top: 3px;
     padding-bottom: 4px; }
   combobox:insensitive {
-    color: #949796;
+    color: #939695;
     text-shadow: none;
     icon-shadow: none; }
   combobox:backdrop {
-    color: #949796;
+    color: #939695;
     text-shadow: none;
     icon-shadow: none; }
   combobox:backdrop:insensitive {
@@ -1490,13 +1447,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; }
@@ -1532,11 +1487,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.1); }
+  box-shadow: inset 0 2px 3px -1px #242727, 0 1px rgba(238, 238, 236, 0.1); }
   .inline-toolbar:backdrop, searchbar:backdrop,
   .location-bar:backdrop {
-    border-color: #1f2222;
-    background-color: #303535;
+    border-color: #1e2222;
+    background-color: #2f3434;
     box-shadow: none; }
 
 /***************
@@ -1551,10 +1506,10 @@ headerbar {
   border-radius: 7px 7px 0 0;
   background-color: transparent;
   background-image: linear-gradient(to bottom, #434a4a, #393f3f);
-  box-shadow: inset 0 -1px #2e3232, inset 0 1px rgba(238, 238, 236, 0.1); }
+  box-shadow: inset 0 -1px #2d3232, inset 0 1px rgba(238, 238, 236, 0.1); }
   .titlebar:backdrop,
   headerbar:backdrop {
-    border-color: #1f2222;
+    border-color: #1e2222;
     background-color: #393f3f;
     background-image: none;
     box-shadow: inset 0 1px rgba(238, 238, 236, 0.1); }
@@ -1578,18 +1533,18 @@ headerbar {
     .titlebar .header-bar-separator:backdrop, .titlebar > GtkBox > separator.vertical:backdrop,
     headerbar .header-bar-separator:backdrop,
     headerbar > GtkBox > separator.vertical:backdrop {
-      border-image: linear-gradient(to bottom, rgba(31, 34, 34, 0.5)) 0 1/1px 1px; }
+      border-image: linear-gradient(to bottom, rgba(30, 34, 34, 0.5)) 0 1/1px 1px; }
   .titlebar.selection-mode,
   headerbar.selection-mode {
     color: #ffffff;
     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(43, 100, 160, 0.55); }
+    box-shadow: inset 0 -1px #1a4b7e, inset 0 1px rgba(43, 100, 160, 0.55); }
     .titlebar.selection-mode:backdrop,
     headerbar.selection-mode:backdrop {
       background-image: linear-gradient(to bottom, #215d9c);
-      box-shadow: inset 0 1px rgba(48, 104, 162, 0.46); }
+      box-shadow: inset 0 1px rgba(48, 103, 161, 0.46); }
     .titlebar.selection-mode button,
     headerbar.selection-mode button,
     headerbar.selection-mode .titlebar button.titlebutton,
@@ -1637,7 +1592,7 @@ headerbar {
       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;
@@ -1656,7 +1611,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: #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(43, 100, 160, 0);
@@ -1667,21 +1622,19 @@ headerbar {
         headerbar.selection-mode button.flat:backdrop:insensitive,
         headerbar.selection-mode button.sidebar-button:backdrop:insensitive,
         headerbar.selection-mode button.titlebutton:backdrop:insensitive {
-          color: #6f91b4;
+          color: #6f90b2;
           border-color: #0b1e33;
-          background-image: linear-gradient(to bottom, #22558b);
+          background-image: linear-gradient(to bottom, #22558a);
           text-shadow: none;
           icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0);
           border-color: #0f2b48; }
-          .titlebar.selection-mode button:backdrop:insensitive > .label, .titlebar.selection-mode headerbar 
button.titlebutton:backdrop:insensitive > .label, .titlebar.selection-mode button.flat:backdrop:insensitive > 
.label, .titlebar.selection-mode button.sidebar-button:backdrop:insensitive > .label, 
.titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive > .label,
+          .titlebar.selection-mode button:backdrop:insensitive > .label, .titlebar.selection-mode 
button.flat:backdrop:insensitive > .label, .titlebar.selection-mode 
button.sidebar-button:backdrop:insensitive > .label,
           .titlebar.selection-mode button.titlebutton:backdrop:insensitive > .label,
           headerbar.selection-mode button:backdrop:insensitive > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive > .label,
           headerbar.selection-mode button.flat:backdrop:insensitive > .label,
           headerbar.selection-mode button.sidebar-button:backdrop:insensitive > .label,
-          headerbar.selection-mode button.titlebutton:backdrop:insensitive > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive > .label {
+          headerbar.selection-mode button.titlebutton:backdrop:insensitive > .label {
             color: inherit; }
         .titlebar.selection-mode button:backdrop:insensitive:active, .titlebar.selection-mode 
button:backdrop:insensitive:checked, .titlebar.selection-mode button.flat:backdrop:insensitive:active, 
.titlebar.selection-mode button.sidebar-button:backdrop:insensitive:active,
         .titlebar.selection-mode button.titlebutton:backdrop:insensitive:active, .titlebar.selection-mode 
button.flat:backdrop:insensitive:checked, .titlebar.selection-mode 
button.sidebar-button:backdrop:insensitive:checked,
@@ -1694,26 +1647,22 @@ headerbar {
         headerbar.selection-mode button.flat:backdrop:insensitive:checked,
         headerbar.selection-mode button.sidebar-button:backdrop:insensitive:checked,
         headerbar.selection-mode button.titlebutton:backdrop:insensitive: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(43, 100, 160, 0);
           border-color: #0f2b48; }
-          .titlebar.selection-mode button:backdrop:insensitive:active > .label, .titlebar.selection-mode 
headerbar button.titlebutton:backdrop:insensitive:active > .label, .titlebar.selection-mode 
button:backdrop:insensitive:checked > .label, .titlebar.selection-mode headerbar 
button.titlebutton:backdrop:insensitive:checked > .label, .titlebar.selection-mode 
button.flat:backdrop:insensitive:active > .label, .titlebar.selection-mode 
button.sidebar-button:backdrop:insensitive:active > .label, .titlebar.selection-mode headerbar 
button.titlebutton:backdrop:insensitive:active > .label,
-          .titlebar.selection-mode button.titlebutton:backdrop:insensitive:active > .label, 
.titlebar.selection-mode button.flat:backdrop:insensitive:checked > .label, .titlebar.selection-mode 
button.sidebar-button:backdrop:insensitive:checked > .label, .titlebar.selection-mode headerbar 
button.titlebutton:backdrop:insensitive:checked > .label,
+          .titlebar.selection-mode button:backdrop:insensitive:active > .label, .titlebar.selection-mode 
button:backdrop:insensitive:checked > .label, .titlebar.selection-mode 
button.flat:backdrop:insensitive:active > .label, .titlebar.selection-mode 
button.sidebar-button:backdrop:insensitive:active > .label,
+          .titlebar.selection-mode button.titlebutton:backdrop:insensitive:active > .label, 
.titlebar.selection-mode button.flat:backdrop:insensitive:checked > .label, .titlebar.selection-mode 
button.sidebar-button:backdrop:insensitive:checked > .label,
           .titlebar.selection-mode button.titlebutton:backdrop:insensitive:checked > .label,
           headerbar.selection-mode button:backdrop:insensitive:active > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:active > .label,
           headerbar.selection-mode button:backdrop:insensitive:checked > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:checked > .label,
           headerbar.selection-mode button.flat:backdrop:insensitive:active > .label,
           headerbar.selection-mode button.sidebar-button:backdrop:insensitive:active > .label,
           headerbar.selection-mode button.titlebutton:backdrop:insensitive:active > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:active > .label,
           headerbar.selection-mode button.flat:backdrop:insensitive:checked > .label,
           headerbar.selection-mode button.sidebar-button:backdrop:insensitive:checked > .label,
-          headerbar.selection-mode button.titlebutton:backdrop:insensitive:checked > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:checked > .label {
+          headerbar.selection-mode button.titlebutton:backdrop:insensitive:checked > .label {
             color: inherit; }
       .titlebar.selection-mode button.flat:backdrop, .titlebar.selection-mode button.sidebar-button:backdrop,
       .titlebar.selection-mode button.titlebutton:backdrop, .titlebar.selection-mode 
button.flat:insensitive, .titlebar.selection-mode button.sidebar-button:insensitive,
@@ -1736,28 +1685,25 @@ headerbar {
         icon-shadow: none; }
       .titlebar.selection-mode button:insensitive,
       headerbar.selection-mode button:insensitive {
-        color: #91aac5;
+        color: #90aac4;
         border-color: #0b1e33;
-        background-image: linear-gradient(to bottom, #22558b);
+        background-image: linear-gradient(to bottom, #22558a);
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0.55); }
-        .titlebar.selection-mode button:insensitive > .label, .titlebar.selection-mode headerbar 
button.titlebutton:insensitive > .label,
-        headerbar.selection-mode button:insensitive > .label,
-        headerbar.selection-mode .titlebar button.titlebutton:insensitive > .label {
+        .titlebar.selection-mode button:insensitive > .label,
+        headerbar.selection-mode button:insensitive > .label {
           color: inherit; }
         .titlebar.selection-mode button:insensitive:active, .titlebar.selection-mode 
button:insensitive:checked,
         headerbar.selection-mode button:insensitive:active,
         headerbar.selection-mode button:insensitive: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(43, 100, 160, 0.55); }
-          .titlebar.selection-mode button:insensitive:active > .label, .titlebar.selection-mode headerbar 
button.titlebutton:insensitive:active > .label, .titlebar.selection-mode button:insensitive:checked > .label, 
.titlebar.selection-mode headerbar button.titlebutton:insensitive:checked > .label,
+          .titlebar.selection-mode button:insensitive:active > .label, .titlebar.selection-mode 
button:insensitive:checked > .label,
           headerbar.selection-mode button:insensitive:active > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:insensitive:active > .label,
-          headerbar.selection-mode button:insensitive:checked > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:insensitive:checked > .label {
+          headerbar.selection-mode button:insensitive:checked > .label {
             color: inherit; }
       .titlebar.selection-mode button.suggested-action,
       headerbar.selection-mode button.suggested-action {
@@ -1791,21 +1737,20 @@ headerbar {
           border-color: #0f2b48; }
         .titlebar.selection-mode button.suggested-action:insensitive,
         headerbar.selection-mode button.suggested-action:insensitive {
-          color: #949796;
+          color: #939695;
           border-color: #1c1f1f;
-          background-image: linear-gradient(to bottom, #333636);
+          background-image: linear-gradient(to bottom, #323636);
           text-shadow: none;
           icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0.55);
           border-color: #0f2b48; }
-          .titlebar.selection-mode button.suggested-action:insensitive > .label, .titlebar.selection-mode 
headerbar button.suggested-action.titlebutton:insensitive > .label,
-          headerbar.selection-mode button.suggested-action:insensitive > .label,
-          headerbar.selection-mode .titlebar button.suggested-action.titlebutton:insensitive > .label {
+          .titlebar.selection-mode button.suggested-action:insensitive > .label,
+          headerbar.selection-mode button.suggested-action:insensitive > .label {
             color: inherit; }
         .titlebar.selection-mode 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;
           icon-shadow: none;
@@ -1814,15 +1759,14 @@ headerbar {
         .titlebar.selection-mode button.suggested-action:backdrop:insensitive,
         headerbar.selection-mode button.suggested-action:backdrop:insensitive {
           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;
           icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0);
           border-color: #0f2b48; }
-          .titlebar.selection-mode button.suggested-action:backdrop:insensitive > .label, 
.titlebar.selection-mode headerbar button.suggested-action.titlebutton:backdrop:insensitive > .label,
-          headerbar.selection-mode button.suggested-action:backdrop:insensitive > .label,
-          headerbar.selection-mode .titlebar button.suggested-action.titlebutton:backdrop:insensitive > 
.label {
+          .titlebar.selection-mode button.suggested-action:backdrop:insensitive > .label,
+          headerbar.selection-mode button.suggested-action:backdrop:insensitive > .label {
             color: inherit; }
     .titlebar.selection-mode .selection-menu, .titlebar.selection-mode .selection-menu:backdrop,
     headerbar.selection-mode .selection-menu,
@@ -1893,33 +1837,33 @@ 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:insensitive {
-    color: #949796; }
+    color: #939695; }
     treeview.view:insensitive:selected {
-      color: #7a9ec4; }
+      color: #799dc3; }
       treeview.view:insensitive:selected:backdrop {
-        color: #648eba; }
+        color: #638db9; }
     treeview.view:insensitive:backdrop {
       color: #5d6767; }
   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 {
@@ -1933,7 +1877,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;
@@ -1957,13 +1901,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 {
@@ -1991,7 +1935,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:insensitive {
@@ -2018,7 +1962,7 @@ menubar,
       color: #4a90d9; }
     menubar > menuitem:insensitive,
     .menubar > menuitem:insensitive {
-      color: #949796;
+      color: #939695;
       box-shadow: none; }
 
 menu,
@@ -2040,14 +1984,14 @@ menu,
       background-color: #215d9c; }
     menu menuitem:insensitive,
     .menu menuitem:insensitive {
-      color: #949796; }
+      color: #939695; }
       menu menuitem:insensitive:backdrop,
       .menu menuitem:insensitive:backdrop {
         color: #5d6767; }
     menu menuitem:backdrop, menu menuitem:backdrop:hover,
     .menu menuitem:backdrop,
     .menu menuitem:backdrop:hover {
-      color: #949796;
+      color: #939695;
       background-color: #2c2c2c; }
     menu menuitem arrow,
     .menu menuitem arrow {
@@ -2061,13 +2005,13 @@ menu,
     border-radius: 0; }
     menu arrow.top,
     .menu arrow.top {
-      border-bottom: 1px solid #3d3d3d; }
+      border-bottom: 1px solid #3c3c3c; }
     menu arrow.bottom,
     .menu arrow.bottom {
-      border-top: 1px solid #3d3d3d; }
+      border-top: 1px solid #3c3c3c; }
     menu arrow:hover,
     .menu arrow:hover {
-      background-color: #3d3d3d; }
+      background-color: #3c3c3c; }
     menu arrow:insensitive,
     .menu arrow:insensitive {
       color: transparent;
@@ -2128,7 +2072,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 {
@@ -2142,11 +2086,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; }
@@ -2158,7 +2102,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; }
@@ -2170,7 +2114,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; }
@@ -2180,7 +2124,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; }
@@ -2188,7 +2132,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"); }
@@ -2199,15 +2143,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:insensitive {
-        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:insensitive {
         color: #5d6767; }
   notebook tab {
@@ -2236,7 +2180,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 {
@@ -2255,7 +2199,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 {
@@ -2274,7 +2218,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 {
@@ -2293,7 +2237,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 {
@@ -2302,17 +2246,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, notebook tab headerbar button.titlebutton, headerbar notebook tab 
button.titlebutton,
     notebook tab .titlebar button.titlebutton,
     .titlebar notebook tab button.titlebutton {
@@ -2347,7 +2291,7 @@ notebook {
       notebook tab button: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; }
       notebook tab button > image, notebook tab headerbar button.titlebutton > image, headerbar notebook tab 
button.titlebutton > image,
       notebook tab .titlebar button.titlebutton > image,
@@ -2393,15 +2337,15 @@ scrollbar {
     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:prelight:active {
       background-color: #2a76c6; }
     scrollbar slider:backdrop {
-      background-color: #5d6262; }
+      background-color: #5d6161; }
     scrollbar slider:insensitive {
       background-color: transparent; }
   scrollbar slider {
@@ -2454,16 +2398,16 @@ switch {
     box-shadow: 0 1px rgba(238, 238, 236, 0.1);
     text-shadow: 0 1px rgba(15, 43, 72, 0.5), 0 0 2px rgba(255, 255, 255, 0.6); }
   switch:insensitive {
-    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.1);
     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 {
@@ -2472,9 +2416,9 @@ switch {
       box-shadow: none; }
   switch:insensitive {
     color: #5d6767;
-    border-color: #1f2222;
+    border-color: #1e2222;
     background-image: none;
-    background-color: #333636; }
+    background-color: #323636; }
   switch slider {
     border: 1px solid;
     border-radius: 3px;
@@ -2485,7 +2429,7 @@ switch {
     text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1);
-    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);
@@ -2494,21 +2438,21 @@ switch {
     text-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1);
-    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:insensitive 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;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     switch:insensitive 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;
     icon-shadow: none;
@@ -2518,8 +2462,8 @@ switch {
     border-color: #0f2b48; }
   switch:backdrop:insensitive 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;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
@@ -2676,7 +2620,7 @@ check:backdrop:checked:insensitive {
 
 menu menuitem.check {
   -gtk-icon-source: -gtk-icontheme("checkbox-symbolic");
-  color: #a6a8a7;
+  color: #a5a8a6;
   icon-shadow: none; }
   menu menuitem.check:active, menu menuitem.check:checked {
     -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); }
@@ -2685,7 +2629,7 @@ menu menuitem.check {
   menu menuitem.check:hover {
     color: #ffffff; }
   menu menuitem.check:insensitive {
-    color: #676b6b; }
+    color: #666a6a; }
 
 radio {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark 2 
png"));
@@ -2833,7 +2777,7 @@ radio:backdrop:checked:insensitive {
 
 menu menuitem.radio {
   -gtk-icon-source: -gtk-icontheme("radio-symbolic");
-  color: #a6a8a7;
+  color: #a5a8a6;
   icon-shadow: none; }
   menu menuitem.radio:active, menu menuitem.radio:checked {
     -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); }
@@ -2842,7 +2786,7 @@ menu menuitem.radio {
   menu menuitem.radio:hover {
     color: #ffffff; }
   menu menuitem.radio:insensitive {
-    color: #676b6b; }
+    color: #666a6a; }
 
 .view.check, .view.radio,
 row .check, row .radio {
@@ -2896,7 +2840,7 @@ checkbutton.text-button, radiobutton.text-button {
   padding: 1px 2px 4px;
   outline-offset: 0; }
   checkbutton.text-button:insensitive, checkbutton.text-button:insensitive:active, 
checkbutton.text-button:insensitive:inconsistent, radiobutton.text-button:insensitive, 
radiobutton.text-button:insensitive:active, radiobutton.text-button:insensitive:inconsistent {
-    color: #949796; }
+    color: #939695; }
     checkbutton.text-button:insensitive:backdrop, checkbutton.text-button:insensitive:active:backdrop, 
checkbutton.text-button:insensitive:inconsistent:backdrop, radiobutton.text-button:insensitive:backdrop, 
radiobutton.text-button:insensitive:active:backdrop, 
radiobutton.text-button:insensitive:inconsistent:backdrop {
       color: #5d6767; }
 
@@ -2938,7 +2882,7 @@ scale {
       border: 1px solid;
       border-radius: 50%;
       border-color: #151717;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px #393f3f, inset 0 -1px #2b2f2f; }
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px #393f3f, inset 0 -1px #2a2f2f; }
       scale trough slider:hover {
         color: #eeeeec;
         outline-color: rgba(238, 238, 236, 0.3);
@@ -2953,18 +2897,18 @@ scale {
       scale trough slider:insensitive {
         border-style: solid;
         border-radius: 50%;
-        background-image: linear-gradient(to bottom, #333636);
+        background-image: linear-gradient(to bottom, #323636);
         box-shadow: none; }
       scale trough slider:backdrop {
         border-style: solid;
         border-radius: 50%;
-        border-color: #181a1a;
+        border-color: #171a1a;
         background-image: linear-gradient(to bottom, #393f3f);
         box-shadow: none; }
       scale trough slider:backdrop:insensitive {
         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;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
@@ -3035,15 +2979,15 @@ scale {
     scale trough:insensitive, scale trough.vertical:insensitive {
       border-color: #1c1f1f;
       background-image: none;
-      background-color: #333636;
+      background-color: #323636;
       box-shadow: 0 1px rgba(238, 238, 236, 0.1); }
     scale trough:backdrop {
-      border-color: #1f2222;
-      background-color: #2b2f2f;
+      border-color: #1e2222;
+      background-color: #2a2f2f;
       box-shadow: none; }
     scale trough:backdrop:insensitive, scale trough .highlight:backdrop:insensitive {
-      border-color: #1f2222;
-      background-color: #333636; }
+      border-color: #1e2222;
+      background-color: #323636; }
     .osd scale trough {
       border-color: rgba(0, 0, 0, 0.7);
       box-shadow: none;
@@ -3072,10 +3016,10 @@ scale {
     row:selected scale:insensitive, row:selected scale.highlight:insensitive {
       border-color: #215d9c;
       box-shadow: none;
-      background-color: #90aece;
+      background-color: #90aecd;
       background-image: none; }
       row:selected scale:insensitive:backdrop, row:selected scale.highlight:insensitive:backdrop {
-        background-color: #90aece; }
+        background-color: #90aecd; }
 
 scale marks {
   color: alpha(currentColor,0.5); }
@@ -3321,10 +3265,10 @@ progressbar {
   progressbar trough {
     border: 1px solid #1c1f1f;
     border-radius: 3px;
-    background-color: #2f3434; }
+    background-color: #2e3333; }
     progressbar trough:backdrop {
-      border-color: #1f2222;
-      background-color: #303535;
+      border-color: #1e2222;
+      background-color: #2f3434;
       box-shadow: 0 1px rgba(255, 255, 255, 0); }
 
 progressbar.horizontal progress {
@@ -3379,15 +3323,15 @@ levelbar {
     padding: 2px;
     border-radius: 3px;
     background-color: transparent;
-    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.1); }
     levelbar trough:backdrop {
       background-color: transparent;
-      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 {
@@ -3424,7 +3368,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 *
@@ -3438,14 +3382,14 @@ frame,
     border-style: none; }
   frame: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 frame {
   padding: 6px;
@@ -3465,7 +3409,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;
@@ -3483,7 +3427,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;
@@ -3501,7 +3445,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;
@@ -3519,7 +3463,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;
@@ -3580,7 +3524,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 {
@@ -3596,7 +3540,7 @@ list {
   border-color: #1c1f1f; }
   list:backdrop {
     background-color: #2c2c2c;
-    border-color: #1f2222; }
+    border-color: #1e2222; }
   list row {
     padding: 2px; }
 
@@ -3612,7 +3556,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; }
 
@@ -3655,8 +3599,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;
     icon-shadow: none;
@@ -3666,21 +3610,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:insensitive, row:selected button.flat:backdrop:insensitive, row:selected 
button.sidebar-button:backdrop:insensitive, row:selected headerbar button.titlebutton:backdrop:insensitive, 
headerbar row:selected button.titlebutton:backdrop:insensitive,
     row:selected .titlebar button.titlebutton:backdrop:insensitive,
     .titlebar row:selected button.titlebutton:backdrop:insensitive {
       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;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      row:selected button:backdrop:insensitive > .label, row:selected headerbar 
button.titlebutton:backdrop:insensitive > .label,
-      row:selected .titlebar button.titlebutton:backdrop:insensitive > .label, row:selected 
button.flat:backdrop:insensitive > .label, row:selected button.sidebar-button:backdrop:insensitive > .label, 
row:selected headerbar button.titlebutton:backdrop:insensitive > .label, headerbar row:selected 
button.titlebutton:backdrop:insensitive > .label,
+      row:selected button:backdrop:insensitive > .label, row:selected button.flat:backdrop:insensitive > 
.label, row:selected button.sidebar-button:backdrop:insensitive > .label, row:selected headerbar 
button.titlebutton:backdrop:insensitive > .label, headerbar row:selected 
button.titlebutton:backdrop:insensitive > .label,
       row:selected .titlebar button.titlebutton:backdrop:insensitive > .label,
       .titlebar row:selected button.titlebutton:backdrop:insensitive > .label {
         color: inherit; }
@@ -3690,12 +3633,10 @@ row:selected .titlebar button.titlebutton,
       row:selected .titlebar button.titlebutton:backdrop:insensitive:checked,
       .titlebar row:selected button.titlebutton:backdrop:insensitive: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:insensitive:active > .label, row:selected headerbar 
button.titlebutton:backdrop:insensitive:active > .label,
-        row:selected .titlebar button.titlebutton:backdrop:insensitive:active > .label, row:selected 
button:backdrop:insensitive:checked > .label, row:selected headerbar 
button.titlebutton:backdrop:insensitive:checked > .label,
-        row:selected .titlebar button.titlebutton:backdrop:insensitive:checked > .label, row:selected 
button.flat:backdrop:insensitive:active > .label, row:selected 
button.sidebar-button:backdrop:insensitive:active > .label, row:selected headerbar 
button.titlebutton:backdrop:insensitive:active > .label, headerbar row:selected 
button.titlebutton:backdrop:insensitive:active > .label,
+        row:selected button:backdrop:insensitive:active > .label, row:selected 
button:backdrop:insensitive:checked > .label, row:selected button.flat:backdrop:insensitive:active > .label, 
row:selected button.sidebar-button:backdrop:insensitive:active > .label, row:selected headerbar 
button.titlebutton:backdrop:insensitive:active > .label, headerbar row:selected 
button.titlebutton:backdrop:insensitive:active > .label,
         row:selected .titlebar button.titlebutton:backdrop:insensitive:active > .label,
         .titlebar row:selected button.titlebutton:backdrop:insensitive:active > .label, row:selected 
button.flat:backdrop:insensitive:checked > .label, row:selected 
button.sidebar-button:backdrop:insensitive:checked > .label, row:selected headerbar 
button.titlebutton:backdrop:insensitive:checked > .label, headerbar row:selected 
button.titlebutton:backdrop:insensitive:checked > .label,
         row:selected .titlebar button.titlebutton:backdrop:insensitive:checked > .label,
@@ -3710,25 +3651,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;
     icon-shadow: none;
-    color: #949796; }
+    color: #939695; }
   row:selected button:insensitive {
-    color: #949796;
+    color: #939695;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #333636);
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    row:selected button:insensitive > .label, row:selected headerbar button.titlebutton:insensitive > .label,
-    row:selected .titlebar button.titlebutton:insensitive > .label {
+    row:selected button:insensitive > .label {
       color: inherit; }
     row:selected button:insensitive:active, row:selected button:insensitive: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:insensitive:active > .label, row:selected headerbar 
button.titlebutton:insensitive:active > .label,
-      row:selected .titlebar button.titlebutton:insensitive:active > .label, row:selected 
button:insensitive:checked > .label, row:selected headerbar button.titlebutton:insensitive:checked > .label,
-      row:selected .titlebar button.titlebutton:insensitive:checked > .label {
+      row:selected button:insensitive:active > .label, row:selected button:insensitive:checked > .label {
         color: inherit; }
 
 row {
@@ -3799,9 +3737,9 @@ row {
     .app-notification button:insensitive, .app-notification button:backdrop:insensitive,
     .app-notification.frame button:insensitive,
     .app-notification.frame button:backdrop:insensitive {
-      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;
@@ -3844,17 +3782,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:insensitive {
-      color: rgba(148, 151, 150, 0.45); }
+      color: rgba(147, 150, 149, 0.45); }
   calendar:inconsistent, calendar:inconsistent: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 *
@@ -3897,31 +3835,29 @@ messagedialog.csd .dialog-action-area button {
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
     box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
   messagedialog.csd .dialog-action-area button:insensitive {
-    color: #949796;
+    color: #939695;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #333636);
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    messagedialog.csd .dialog-action-area button:insensitive > .label, messagedialog.csd .dialog-action-area 
headerbar button.titlebutton:insensitive > .label,
-    messagedialog.csd .dialog-action-area .titlebar button.titlebutton:insensitive > .label {
+    messagedialog.csd .dialog-action-area button:insensitive > .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;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   messagedialog.csd .dialog-action-area button:backdrop:insensitive {
     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;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    messagedialog.csd .dialog-action-area button:backdrop:insensitive > .label, messagedialog.csd 
.dialog-action-area headerbar button.titlebutton:backdrop:insensitive > .label,
-    messagedialog.csd .dialog-action-area .titlebar button.titlebutton:backdrop:insensitive > .label {
+    messagedialog.csd .dialog-action-area button:backdrop:insensitive > .label {
       color: inherit; }
   messagedialog.csd .dialog-action-area button.suggested-action {
     color: white;
@@ -3948,7 +3884,7 @@ messagedialog.csd .dialog-action-area button {
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
       box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), 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;
@@ -3956,23 +3892,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:insensitive {
         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;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        messagedialog.csd .dialog-action-area button.suggested-action:backdrop:insensitive > .label, 
messagedialog.csd .dialog-action-area headerbar button.suggested-action.titlebutton:backdrop:insensitive > 
.label,
-        messagedialog.csd .dialog-action-area .titlebar 
button.suggested-action.titlebutton:backdrop:insensitive > .label {
+        messagedialog.csd .dialog-action-area button.suggested-action:backdrop:insensitive > .label {
           color: inherit; }
     messagedialog.csd .dialog-action-area button.suggested-action:insensitive {
-      color: #949796;
+      color: #939695;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #333636);
+      background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      messagedialog.csd .dialog-action-area button.suggested-action:insensitive > .label, messagedialog.csd 
.dialog-action-area headerbar button.suggested-action.titlebutton:insensitive > .label,
-      messagedialog.csd .dialog-action-area .titlebar button.suggested-action.titlebutton:insensitive > 
.label {
+      messagedialog.csd .dialog-action-area button.suggested-action:insensitive > .label {
         color: inherit; }
   messagedialog.csd .dialog-action-area button.destructive-action {
     color: white;
@@ -3999,7 +3933,7 @@ messagedialog.csd .dialog-action-area button {
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.72078);
       box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), 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;
@@ -4007,23 +3941,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:insensitive {
         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;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        messagedialog.csd .dialog-action-area button.destructive-action:backdrop:insensitive > .label, 
messagedialog.csd .dialog-action-area headerbar button.destructive-action.titlebutton:backdrop:insensitive > 
.label,
-        messagedialog.csd .dialog-action-area .titlebar 
button.destructive-action.titlebutton:backdrop:insensitive > .label {
+        messagedialog.csd .dialog-action-area button.destructive-action:backdrop:insensitive > .label {
           color: inherit; }
     messagedialog.csd .dialog-action-area button.destructive-action:insensitive {
-      color: #949796;
+      color: #939695;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #333636);
+      background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      messagedialog.csd .dialog-action-area button.destructive-action:insensitive > .label, 
messagedialog.csd .dialog-action-area headerbar button.destructive-action.titlebutton:insensitive > .label,
-      messagedialog.csd .dialog-action-area .titlebar button.destructive-action.titlebutton:insensitive > 
.label {
+      messagedialog.csd .dialog-action-area button.destructive-action:insensitive > .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:insensitive, messagedialog.csd .dialog-action-area button:backdrop, messagedialog.csd 
.dialog-action-area button:backdrop:insensitive, 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:insensitive, messagedialog.csd .dialog-action-area 
button.suggested-action:insensitive, 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:insensitive, messagedialog.csd .dialog-action-area 
button.destructive-action:insensitive {
   border-left-style: solid;
@@ -4040,7 +3972,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 *
@@ -4049,7 +3981,7 @@ GtkFileChooserDialog .dialog-action-box {
   border: none;
   background-color: #313434; }
   .sidebar:backdrop {
-    background-color: #333636; }
+    background-color: #323535; }
 
 stacksidebar row {
   padding: 10px 4px; }
@@ -4081,9 +4013,7 @@ placessidebar row {
     padding: 5px;
     border-radius: 100%;
     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; }
@@ -4114,7 +4044,7 @@ paned {
   paned separator {
     background-color: #1c1f1f; }
     paned separator:backdrop {
-      background-color: #1f2222; }
+      background-color: #1e2222; }
   paned separator:selected {
     background-color: #215d9c; }
 
@@ -4129,7 +4059,7 @@ paned.wide {
   paned.wide.vertical separator {
     border-style: solid none; }
   paned.wide separator:backdrop {
-    border-color: #1f2222; }
+    border-color: #1e2222; }
 
 /**************
  * GtkInfoBar *
@@ -4196,29 +4126,22 @@ infobar {
     .question button:insensitive,
     .warning button:insensitive,
     .error button:insensitive {
-      color: #91aac5;
+      color: #90aac4;
       border-color: #0b1e33;
-      background-image: linear-gradient(to bottom, #22558b);
+      background-image: linear-gradient(to bottom, #22558a);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .info button:insensitive > .label, .info headerbar button.titlebutton:insensitive > .label,
-      .info .titlebar button.titlebutton:insensitive > .label,
+      .info button:insensitive > .label,
       .question button:insensitive > .label,
-      .question headerbar button.titlebutton:insensitive > .label,
-      .question .titlebar button.titlebutton:insensitive > .label,
       .warning button:insensitive > .label,
-      .warning headerbar button.titlebutton:insensitive > .label,
-      .warning .titlebar button.titlebutton:insensitive > .label,
-      .error button:insensitive > .label,
-      .error headerbar button.titlebutton:insensitive > .label,
-      .error .titlebar button.titlebutton:insensitive > .label {
+      .error button:insensitive > .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;
@@ -4229,24 +4152,17 @@ infobar {
       .question button:backdrop:insensitive,
       .warning button:backdrop:insensitive,
       .error button:backdrop:insensitive {
-        color: #6f91b4;
+        color: #6f90b2;
         border-color: #0b1e33;
-        background-image: linear-gradient(to bottom, #22558b);
+        background-image: linear-gradient(to bottom, #22558a);
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         border-color: #0b1e33; }
-        .info button:backdrop:insensitive > .label, .info headerbar button.titlebutton:backdrop:insensitive 
.label,
-        .info .titlebar button.titlebutton:backdrop:insensitive > .label,
+        .info button:backdrop:insensitive > .label,
         .question button:backdrop:insensitive > .label,
-        .question headerbar button.titlebutton:backdrop:insensitive > .label,
-        .question .titlebar button.titlebutton:backdrop:insensitive > .label,
         .warning button:backdrop:insensitive > .label,
-        .warning headerbar button.titlebutton:backdrop:insensitive > .label,
-        .warning .titlebar button.titlebutton:backdrop:insensitive > .label,
-        .error button:backdrop:insensitive > .label,
-        .error headerbar button.titlebutton:backdrop:insensitive > .label,
-        .error .titlebar button.titlebutton:backdrop:insensitive > .label {
+        .error button:backdrop:insensitive > .label {
           color: inherit; }
   .info label:selected, .info label:selected:focus, .info label:selected:hover,
   .question label:selected,
@@ -4361,8 +4277,8 @@ colorswatch {
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
     colorswatch#add-color-button:backdrop {
-      color: #949796;
-      border-color: #1f2222;
+      color: #939695;
+      border-color: #1e2222;
       background-image: linear-gradient(to bottom, #393f3f);
       text-shadow: none;
       icon-shadow: none;
@@ -4429,7 +4345,7 @@ decoration {
     border-radius: 0;
     margin: 4px;
     background-color: #393f3f;
-    border: solid 1px #1f2222;
+    border: solid 1px #1e2222;
     box-shadow: none; }
 
 headerbar button.titlebutton,
@@ -4459,7 +4375,7 @@ textview text selection, textview text selection:focus,
   textview text selection:insensitive,
   .view selection:insensitive, label selection:insensitive, .grid-child:insensitive:selected, entry 
selection:insensitive, spinbutton selection:insensitive, modelbutton.flat:insensitive:selected,
   .menuitem.button.flat:insensitive:selected, treeview.view:insensitive:selected, row:insensitive:selected, 
.sidebar :insensitive:selected, placessidebar row:selected:insensitive label {
-    color: #90aece; }
+    color: #90aecd; }
   textview text selection:backdrop,
   .view selection:backdrop, label selection:backdrop, .grid-child:backdrop:selected, entry 
selection:backdrop, spinbutton selection:backdrop, modelbutton.flat:backdrop:selected,
   .menuitem.button.flat:backdrop:selected, treeview.view:backdrop:selected, row:backdrop:selected, .sidebar 
:backdrop:selected {
@@ -4467,7 +4383,7 @@ textview text selection, textview text selection:focus,
     textview text selection:backdrop:insensitive,
     .view selection:backdrop:insensitive, label selection:backdrop:insensitive, 
.grid-child:backdrop:insensitive:selected, entry selection:backdrop:insensitive, spinbutton 
selection:backdrop:insensitive, modelbutton.flat:backdrop:insensitive:selected,
     .menuitem.button.flat:backdrop:insensitive:selected, treeview.view:backdrop:insensitive:selected, 
row:backdrop:insensitive:selected, .sidebar :backdrop:insensitive:selected, placessidebar 
row:selected:insensitive label:backdrop, placessidebar row:selected:backdrop:insensitive label {
-      color: #648eba; }
+      color: #638db9; }
 
 .monospace {
   font: Monospace; }
@@ -4551,9 +4467,9 @@ popover.touch-selection {
       icon-shadow: none;
       outline-color: rgba(238, 238, 236, 0.3); }
     popover.touch-selection button:insensitive, popover.touch-selection button:backdrop:insensitive {
-      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;
@@ -4685,16 +4601,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;
@@ -4715,7 +4631,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;
@@ -4725,7 +4641,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.1);
 @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 e640761..39cb166 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -36,7 +36,7 @@
   .background:backdrop {
     text-shadow: none;
     icon-shadow: none;
-    color: #8e9192;
+    color: #8d9091;
     background-color: #ededed; }
 
 /*
@@ -55,11 +55,11 @@
     background-color: white;
     color: #2e3436; }
   .gtkstyle-fallback:active {
-    background-color: #d4d4d4;
+    background-color: lightgray;
     color: #2e3436; }
   .gtkstyle-fallback:insensitive {
     background-color: #f4f4f4;
-    color: #8e9192; }
+    color: #8d9091; }
   .gtkstyle-fallback:selected {
     background-color: #4a90d9;
     color: #ffffff; }
@@ -70,7 +70,7 @@ textview text,
   background-color: #ffffff; }
   textview text:backdrop,
   .view:backdrop {
-    color: #333333;
+    color: #323232;
     background-color: white; }
 
 .rubberband,
@@ -84,9 +84,9 @@ treeview.view rubberband,
 label.separator {
   color: #2e3436; }
   label.separator:backdrop {
-    color: #8e9192; }
+    color: #8d9091; }
 label:insensitive {
-  color: #8e9192; }
+  color: #8d9091; }
   label:insensitive:backdrop {
     color: #c7c7c7; }
 
@@ -104,13 +104,13 @@ assistant .sidebar {
     border-left: 1px solid #a1a1a1; }
   assistant .sidebar:backdrop {
     background-color: white;
-    border-color: darkgray; }
+    border-color: #a8a8a8; }
 assistant.csd .sidebar {
   border-top-style: none; }
 assistant .sidebar label {
   padding: 6px 12px; }
 assistant .sidebar label.highlight {
-  background-color: #c7c8c8; }
+  background-color: #c6c8c8; }
 
 textview {
   background-color: #f6f6f6; }
@@ -195,22 +195,22 @@ entry, spinbutton {
   entry:insensitive, spinbutton:insensitive {
     background-color: transparent;
     background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
-    color: #8e9192;
+    color: #8d9091;
     border-color: #a1a1a1;
     background-image: linear-gradient(to bottom, #f4f4f4);
     box-shadow: 0 1px white; }
   entry:backdrop, spinbutton:backdrop {
     background-color: transparent;
     background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
-    color: #333333;
-    border-color: darkgray;
+    color: #323232;
+    border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, white);
     box-shadow: 0 1px rgba(255, 255, 255, 0); }
   entry:backdrop:insensitive, spinbutton:backdrop:insensitive {
     background-color: transparent;
     background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
     color: #c7c7c7;
-    border-color: darkgray;
+    border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #f4f4f4);
     box-shadow: 0 1px rgba(255, 255, 255, 0); }
   entry progress, spinbutton progress {
@@ -247,13 +247,13 @@ entry, spinbutton {
     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: #a5a7a8; }
+      color: #a3a6a7; }
   .osd entry, .osd spinbutton {
     background-color: transparent;
     background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
@@ -287,9 +287,9 @@ entry, spinbutton {
     .osd entry:insensitive, .osd spinbutton:insensitive {
       background-color: transparent;
       background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
-      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;
@@ -300,10 +300,10 @@ 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(:insensitive) + entry:not(:insensitive), .linked.vertical > 
spinbutton:not(:insensitive) + entry:not(:insensitive), .linked.vertical > entry:not(:insensitive) + 
spinbutton:not(:insensitive), .linked.vertical > spinbutton:not(:insensitive) + spinbutton:not(:insensitive) {
-  border-top-color: #e3e3e3;
+  border-top-color: #e2e2e2;
   background-image: linear-gradient(to bottom, #ffffff); }
   .linked.vertical > entry:not(:insensitive) + entry:not(:insensitive):backdrop, .linked.vertical > 
spinbutton:not(:insensitive) + entry:not(:insensitive):backdrop, .linked.vertical > entry:not(:insensitive) + 
spinbutton:not(:insensitive):backdrop, .linked.vertical > spinbutton:not(:insensitive) + 
spinbutton:not(:insensitive):backdrop {
-    border-top-color: #e5e5e5;
+    border-top-color: #e4e4e4;
     background-image: linear-gradient(to bottom, white); }
 .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;
@@ -378,8 +378,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: #8e9192;
-    border-color: darkgray;
+    color: #8d9091;
+    border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #ededed);
     text-shadow: none;
     icon-shadow: none;
@@ -388,32 +388,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: #8e9192;
-      border-color: darkgray;
-      background-image: linear-gradient(to bottom, #d5d5d5);
+      color: #8d9091;
+      border-color: #a8a8a8;
+      background-image: linear-gradient(to bottom, #d4d4d4);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
     button:backdrop:insensitive, button.flat:backdrop:insensitive, 
button.sidebar-button:backdrop:insensitive, headerbar button.titlebutton:backdrop:insensitive,
     .titlebar button.titlebutton:backdrop:insensitive {
       color: #c7c7c7;
-      border-color: darkgray;
+      border-color: #a8a8a8;
       background-image: linear-gradient(to bottom, #f4f4f4);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-      button:backdrop:insensitive > .label, headerbar button.titlebutton:backdrop:insensitive > .label,
-      .titlebar button.titlebutton:backdrop:insensitive > .label, button.flat:backdrop:insensitive > .label, 
button.sidebar-button:backdrop:insensitive > .label, headerbar button.titlebutton:backdrop:insensitive > 
.label,
+      button:backdrop:insensitive > .label, button.flat:backdrop:insensitive > .label, 
button.sidebar-button:backdrop:insensitive > .label, headerbar button.titlebutton:backdrop:insensitive > 
.label,
       .titlebar button.titlebutton:backdrop:insensitive > .label {
         color: inherit; }
     button:backdrop:insensitive:active, button:backdrop:insensitive:checked, 
button.flat:backdrop:insensitive:active, button.sidebar-button:backdrop:insensitive:active, headerbar 
button.titlebutton:backdrop:insensitive:active,
     .titlebar button.titlebutton:backdrop:insensitive:active, button.flat:backdrop:insensitive:checked, 
button.sidebar-button:backdrop:insensitive:checked, headerbar button.titlebutton:backdrop:insensitive:checked,
     .titlebar button.titlebutton:backdrop:insensitive:checked {
       color: #c7c7c7;
-      border-color: darkgray;
+      border-color: #a8a8a8;
       background-image: linear-gradient(to bottom, #e7e7e7);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-      button:backdrop:insensitive:active > .label, headerbar button.titlebutton:backdrop:insensitive:active 
.label,
-      .titlebar button.titlebutton:backdrop:insensitive:active > .label, button:backdrop:insensitive:checked 
.label, headerbar button.titlebutton:backdrop:insensitive:checked > .label,
-      .titlebar button.titlebutton:backdrop:insensitive:checked > .label, 
button.flat:backdrop:insensitive:active > .label, button.sidebar-button:backdrop:insensitive:active > .label, 
headerbar button.titlebutton:backdrop:insensitive:active > .label,
+      button:backdrop:insensitive:active > .label, button:backdrop:insensitive:checked > .label, 
button.flat:backdrop:insensitive:active > .label, button.sidebar-button:backdrop:insensitive:active > .label, 
headerbar button.titlebutton:backdrop:insensitive:active > .label,
       .titlebar button.titlebutton:backdrop:insensitive:active > .label, 
button.flat:backdrop:insensitive:checked > .label, button.sidebar-button:backdrop:insensitive:checked > 
.label, headerbar button.titlebutton:backdrop:insensitive:checked > .label,
       .titlebar button.titlebutton:backdrop:insensitive:checked > .label {
         color: inherit; }
@@ -429,23 +426,20 @@ button, headerbar button.titlebutton,
     icon-shadow: none; }
   button:insensitive, headerbar button.titlebutton:insensitive,
   .titlebar button.titlebutton:insensitive {
-    color: #8e9192;
+    color: #8d9091;
     border-color: #a1a1a1;
     background-image: linear-gradient(to bottom, #f4f4f4);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
-    button:insensitive > .label, headerbar button.titlebutton:insensitive > .label,
-    .titlebar button.titlebutton:insensitive > .label {
+    button:insensitive > .label {
       color: inherit; }
     button:insensitive:active, button:insensitive:checked {
-      color: #8e9192;
+      color: #8d9091;
       border-color: #a1a1a1;
-      background-image: linear-gradient(to bottom, #ececec, #f4f4f4);
+      background-image: linear-gradient(to bottom, #ebebeb, #f4f4f4);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
-      button:insensitive:active > .label, headerbar button.titlebutton:insensitive:active > .label,
-      .titlebar button.titlebutton:insensitive:active > .label, button:insensitive:checked > .label, 
headerbar button.titlebutton:insensitive:checked > .label,
-      .titlebar button.titlebutton:insensitive:checked > .label {
+      button:insensitive:active > .label, button:insensitive:checked > .label {
         color: inherit; }
   button.osd, headerbar button.osd.titlebutton,
   .titlebar button.osd.titlebutton {
@@ -488,9 +482,9 @@ button, headerbar button.titlebutton,
       border: none;
       box-shadow: none; }
     button.osd:insensitive, button.osd:backdrop:insensitive {
-      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;
@@ -535,9 +529,9 @@ button, headerbar button.titlebutton,
       icon-shadow: none;
       outline-color: rgba(238, 238, 236, 0.3); }
     .osd button:insensitive, .osd button:backdrop:insensitive {
-      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;
@@ -579,9 +573,9 @@ button, headerbar button.titlebutton,
       .osd button.flat:insensitive, .osd button.sidebar-button:insensitive, .osd headerbar 
button.titlebutton:insensitive, headerbar .osd button.titlebutton:insensitive,
       .osd .titlebar button.titlebutton:insensitive,
       .titlebar .osd button.titlebutton:insensitive {
-        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;
@@ -650,7 +644,7 @@ button, headerbar button.titlebutton,
       box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px white; }
     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;
@@ -659,32 +653,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:insensitive, button.suggested-action.flat:backdrop:insensitive, 
button.suggested-action.sidebar-button:backdrop:insensitive, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive,
       .titlebar button.suggested-action.titlebutton:backdrop:insensitive {
         color: #c7c7c7;
-        border-color: darkgray;
+        border-color: #a8a8a8;
         background-image: linear-gradient(to bottom, #f4f4f4);
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-        button.suggested-action:backdrop:insensitive > .label, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive > .label,
-        .titlebar button.suggested-action.titlebutton:backdrop:insensitive > .label, 
button.suggested-action.flat:backdrop:insensitive > .label, 
button.suggested-action.sidebar-button:backdrop:insensitive > .label, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive > .label,
+        button.suggested-action:backdrop:insensitive > .label, 
button.suggested-action.flat:backdrop:insensitive > .label, 
button.suggested-action.sidebar-button:backdrop:insensitive > .label, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive > .label,
         .titlebar button.suggested-action.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
         button.suggested-action:backdrop:insensitive:active, 
button.suggested-action:backdrop:insensitive:checked, 
button.suggested-action.flat:backdrop:insensitive:active, 
button.suggested-action.sidebar-button:backdrop:insensitive:active, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive:active,
         .titlebar button.suggested-action.titlebutton:backdrop:insensitive:active, 
button.suggested-action.flat:backdrop:insensitive:checked, 
button.suggested-action.sidebar-button:backdrop:insensitive:checked, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive:checked,
         .titlebar button.suggested-action.titlebutton:backdrop:insensitive: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:insensitive:active > .label, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive:active > .label,
-          .titlebar button.suggested-action.titlebutton:backdrop:insensitive:active > .label, 
button.suggested-action:backdrop:insensitive:checked > .label, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive:checked > .label,
-          .titlebar button.suggested-action.titlebutton:backdrop:insensitive:checked > .label, 
button.suggested-action.flat:backdrop:insensitive:active > .label, 
button.suggested-action.sidebar-button:backdrop:insensitive:active > .label, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive:active > .label,
+          button.suggested-action:backdrop:insensitive:active > .label, 
button.suggested-action:backdrop:insensitive:checked > .label, 
button.suggested-action.flat:backdrop:insensitive:active > .label, 
button.suggested-action.sidebar-button:backdrop:insensitive:active > .label, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive:active > .label,
           .titlebar button.suggested-action.titlebutton:backdrop:insensitive:active > .label, 
button.suggested-action.flat:backdrop:insensitive:checked > .label, 
button.suggested-action.sidebar-button:backdrop:insensitive:checked > .label, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive:checked > .label,
           .titlebar button.suggested-action.titlebutton:backdrop:insensitive:checked > .label {
             color: inherit; }
@@ -700,23 +691,20 @@ button, headerbar button.titlebutton,
       icon-shadow: none;
       color: rgba(74, 144, 217, 0.8); }
     button.suggested-action:insensitive {
-      color: #8e9192;
+      color: #8d9091;
       border-color: #a1a1a1;
       background-image: linear-gradient(to bottom, #f4f4f4);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
-      button.suggested-action:insensitive > .label, headerbar 
button.suggested-action.titlebutton:insensitive > .label,
-      .titlebar button.suggested-action.titlebutton:insensitive > .label {
+      button.suggested-action:insensitive > .label {
         color: inherit; }
       button.suggested-action:insensitive:active, button.suggested-action:insensitive: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 white; }
-        button.suggested-action:insensitive:active > .label, headerbar 
button.suggested-action.titlebutton:insensitive:active > .label,
-        .titlebar button.suggested-action.titlebutton:insensitive:active > .label, 
button.suggested-action:insensitive:checked > .label, headerbar 
button.suggested-action.titlebutton:insensitive:checked > .label,
-        .titlebar button.suggested-action.titlebutton:insensitive:checked > .label {
+        button.suggested-action:insensitive:active > .label, button.suggested-action:insensitive:checked > 
.label {
           color: inherit; }
     .osd button.suggested-action {
       color: #eeeeec;
@@ -746,9 +734,9 @@ button, headerbar button.titlebutton,
         icon-shadow: none;
         outline-color: rgba(238, 238, 236, 0.3); }
       .osd button.suggested-action:insensitive, .osd button.suggested-action:backdrop:insensitive {
-        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;
@@ -797,7 +785,7 @@ button, headerbar button.titlebutton,
       box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px white; }
     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;
@@ -806,32 +794,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:insensitive, button.destructive-action.flat:backdrop:insensitive, 
button.destructive-action.sidebar-button:backdrop:insensitive, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive,
       .titlebar button.destructive-action.titlebutton:backdrop:insensitive {
         color: #c7c7c7;
-        border-color: darkgray;
+        border-color: #a8a8a8;
         background-image: linear-gradient(to bottom, #f4f4f4);
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-        button.destructive-action:backdrop:insensitive > .label, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive > .label,
-        .titlebar button.destructive-action.titlebutton:backdrop:insensitive > .label, 
button.destructive-action.flat:backdrop:insensitive > .label, 
button.destructive-action.sidebar-button:backdrop:insensitive > .label, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive > .label,
+        button.destructive-action:backdrop:insensitive > .label, 
button.destructive-action.flat:backdrop:insensitive > .label, 
button.destructive-action.sidebar-button:backdrop:insensitive > .label, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive > .label,
         .titlebar button.destructive-action.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
         button.destructive-action:backdrop:insensitive:active, 
button.destructive-action:backdrop:insensitive:checked, 
button.destructive-action.flat:backdrop:insensitive:active, 
button.destructive-action.sidebar-button:backdrop:insensitive:active, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive:active,
         .titlebar button.destructive-action.titlebutton:backdrop:insensitive:active, 
button.destructive-action.flat:backdrop:insensitive:checked, 
button.destructive-action.sidebar-button:backdrop:insensitive:checked, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive:checked,
         .titlebar button.destructive-action.titlebutton:backdrop:insensitive: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:insensitive:active > .label, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive:active > .label,
-          .titlebar button.destructive-action.titlebutton:backdrop:insensitive:active > .label, 
button.destructive-action:backdrop:insensitive:checked > .label, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive:checked > .label,
-          .titlebar button.destructive-action.titlebutton:backdrop:insensitive:checked > .label, 
button.destructive-action.flat:backdrop:insensitive:active > .label, 
button.destructive-action.sidebar-button:backdrop:insensitive:active > .label, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive:active > .label,
+          button.destructive-action:backdrop:insensitive:active > .label, 
button.destructive-action:backdrop:insensitive:checked > .label, 
button.destructive-action.flat:backdrop:insensitive:active > .label, 
button.destructive-action.sidebar-button:backdrop:insensitive:active > .label, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive:active > .label,
           .titlebar button.destructive-action.titlebutton:backdrop:insensitive:active > .label, 
button.destructive-action.flat:backdrop:insensitive:checked > .label, 
button.destructive-action.sidebar-button:backdrop:insensitive:checked > .label, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive:checked > .label,
           .titlebar button.destructive-action.titlebutton:backdrop:insensitive:checked > .label {
             color: inherit; }
@@ -847,23 +832,20 @@ button, headerbar button.titlebutton,
       icon-shadow: none;
       color: rgba(239, 41, 41, 0.8); }
     button.destructive-action:insensitive {
-      color: #8e9192;
+      color: #8d9091;
       border-color: #a1a1a1;
       background-image: linear-gradient(to bottom, #f4f4f4);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
-      button.destructive-action:insensitive > .label, headerbar 
button.destructive-action.titlebutton:insensitive > .label,
-      .titlebar button.destructive-action.titlebutton:insensitive > .label {
+      button.destructive-action:insensitive > .label {
         color: inherit; }
       button.destructive-action:insensitive:active, button.destructive-action:insensitive: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 white; }
-        button.destructive-action:insensitive:active > .label, headerbar 
button.destructive-action.titlebutton:insensitive:active > .label,
-        .titlebar button.destructive-action.titlebutton:insensitive:active > .label, 
button.destructive-action:insensitive:checked > .label, headerbar 
button.destructive-action.titlebutton:insensitive:checked > .label,
-        .titlebar button.destructive-action.titlebutton:insensitive:checked > .label {
+        button.destructive-action:insensitive:active > .label, button.destructive-action:insensitive:checked 
.label {
           color: inherit; }
     .osd button.destructive-action {
       color: #eeeeec;
@@ -893,9 +875,9 @@ button, headerbar button.titlebutton,
         icon-shadow: none;
         outline-color: rgba(238, 238, 236, 0.3); }
       .osd button.destructive-action:insensitive, .osd button.destructive-action:backdrop:insensitive {
-        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;
@@ -942,11 +924,7 @@ button, headerbar button.titlebutton,
       padding-top: 3px;
       padding-bottom: 3px; }
     .stack-switcher > button.text-button, .stack-switcher > GtkScaleButton.button.text-button,
-    .stack-switcher > GtkVolumeButton.button.text-button, headerbar .stack-switcher > 
button.text-button.titlebutton, headerbar .stack-switcher > GtkScaleButton.titlebutton.button.text-button,
-    headerbar .stack-switcher > GtkVolumeButton.titlebutton.button.text-button,
-    .titlebar .stack-switcher > button.text-button.titlebutton,
-    .titlebar .stack-switcher > GtkScaleButton.titlebutton.button.text-button,
-    .titlebar .stack-switcher > GtkVolumeButton.titlebutton.button.text-button {
+    .stack-switcher > GtkVolumeButton.button.text-button {
       padding: 5px 10px 6px; }
     .stack-switcher > button.image-button, headerbar .stack-switcher > button.titlebutton,
     .titlebar .stack-switcher > button.titlebutton {
@@ -975,7 +953,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;
@@ -985,8 +963,7 @@ button, headerbar button.titlebutton,
   text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   box-shadow: inset 0 1px white, 0 1px white; }
-  .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: #a1a1a1;
@@ -994,9 +971,7 @@ button, headerbar button.titlebutton,
     text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     box-shadow: inset 0 1px white, 0 1px white; }
-  .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: #a1a1a1;
@@ -1004,9 +979,8 @@ button, headerbar button.titlebutton,
     text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px white; }
-  .inline-toolbar toolbutton > button:insensitive, .inline-toolbar headerbar toolbutton > 
button.titlebutton:insensitive,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:insensitive {
-    color: #8e9192;
+  .inline-toolbar toolbutton > button:insensitive {
+    color: #8d9091;
     border-color: #a1a1a1;
     background-image: linear-gradient(to bottom, #f4f4f4);
     text-shadow: none;
@@ -1014,45 +988,37 @@ button, headerbar button.titlebutton,
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
     .inline-toolbar toolbutton > button:insensitive > .label {
       color: inherit; }
-  .inline-toolbar toolbutton > button:insensitive:active, .inline-toolbar headerbar toolbutton > 
button.titlebutton:insensitive:active,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:insensitive:active, .inline-toolbar toolbutton > 
button:insensitive:checked, .inline-toolbar headerbar toolbutton > button.titlebutton:insensitive:checked,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:insensitive:checked {
-    color: #8e9192;
+  .inline-toolbar toolbutton > button:insensitive:active, .inline-toolbar toolbutton > 
button:insensitive:checked {
+    color: #8d9091;
     border-color: #a1a1a1;
-    background-image: linear-gradient(to bottom, #ececec, #f4f4f4);
+    background-image: linear-gradient(to bottom, #ebebeb, #f4f4f4);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
     .inline-toolbar toolbutton > button:insensitive:active > .label, .inline-toolbar toolbutton > 
button:insensitive:checked > .label {
       color: inherit; }
-  .inline-toolbar toolbutton > button:backdrop, .inline-toolbar headerbar toolbutton > 
button.titlebutton:backdrop,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop {
-    color: #8e9192;
-    border-color: darkgray;
+  .inline-toolbar toolbutton > button:backdrop {
+    color: #8d9091;
+    border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #ededed);
     text-shadow: none;
     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: #8e9192;
-    border-color: darkgray;
-    background-image: linear-gradient(to bottom, #d5d5d5);
+  .inline-toolbar toolbutton > button:backdrop:active, .inline-toolbar toolbutton > button:backdrop:checked {
+    color: #8d9091;
+    border-color: #a8a8a8;
+    background-image: linear-gradient(to bottom, #d4d4d4);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-  .inline-toolbar toolbutton > button:backdrop:insensitive, .inline-toolbar headerbar toolbutton > 
button.titlebutton:backdrop:insensitive,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop:insensitive {
+  .inline-toolbar toolbutton > button:backdrop:insensitive {
     color: #c7c7c7;
-    border-color: darkgray;
+    border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #f4f4f4);
     text-shadow: none;
     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:insensitive > .label {
       color: inherit; }
-  .inline-toolbar toolbutton > button:backdrop:insensitive:active, .inline-toolbar headerbar toolbutton > 
button.titlebutton:backdrop:insensitive:active,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop:insensitive:active, .inline-toolbar 
toolbutton > button:backdrop:insensitive:checked, .inline-toolbar headerbar toolbutton > 
button.titlebutton:backdrop:insensitive:checked,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop:insensitive:checked {
+  .inline-toolbar toolbutton > button:backdrop:insensitive:active, .inline-toolbar toolbutton > 
button:backdrop:insensitive:checked {
     color: #c7c7c7;
-    border-color: darkgray;
+    border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #e7e7e7);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
     .inline-toolbar toolbutton > button:backdrop:insensitive:active > .label, .inline-toolbar toolbutton > 
button:backdrop:insensitive:checked > .label {
@@ -1079,8 +1045,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,
@@ -1099,8 +1064,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,
@@ -1120,8 +1084,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,
@@ -1141,22 +1104,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; }
 
@@ -1206,7 +1165,7 @@ modelbutton.flat,
   outline-offset: -1px; }
   modelbutton.flat:hover,
   .menuitem.button.flat:hover {
-    background-color: #dadbdb; }
+    background-color: #d9dada; }
 
 button.color, headerbar button.color.titlebutton,
 .titlebar button.color.titlebutton {
@@ -1230,21 +1189,21 @@ button.color, headerbar button.color.titlebutton,
     *:selected *:link:visited, *:selected button:visited:link, *:selected button:visited, *:selected 
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, button:backdrop:hover:selected:visited, .titlebar.selection-mode 
.subtitle:backdrop:hover:link,
   headerbar.selection-mode .subtitle:backdrop:hover:link {
     color: #4a90d9; }
   *:link:selected, button:selected:link, button:selected:visited, .titlebar.selection-mode .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, button:visited, headerbar button.titlebutton:visited,
@@ -1252,8 +1211,8 @@ button:link, headerbar button.titlebutton:link,
   text-shadow: none; }
   button:link:hover, button:link:active, button:link:checked, button:visited:hover, button:visited:active, 
button:visited:checked {
     text-shadow: none; }
-  button:link > label, headerbar button.titlebutton:link > label,
-  .titlebar button.titlebutton:link > label, button:visited > label, headerbar button.titlebutton:visited > 
label,
+  button:link > label,
+  .titlebar button.titlebutton:link > label, button:visited > label,
   .titlebar button.titlebutton:visited > label {
     text-decoration-line: underline; }
 
@@ -1266,7 +1225,7 @@ spinbutton:not(.vertical) .titlebar button.titlebutton,
   background-image: none;
   border-style: none none none solid;
   border-color: rgba(161, 161, 161, 0.3);
-  color: #43484a;
+  color: #42484a;
   border-radius: 0;
   box-shadow: none; }
   spinbutton:not(.vertical) button:dir(rtl) {
@@ -1275,13 +1234,13 @@ spinbutton:not(.vertical) .titlebar button.titlebutton,
     color: #2e3436;
     background-color: rgba(46, 52, 54, 0.05); }
   spinbutton:not(.vertical) button:insensitive {
-    color: rgba(142, 145, 146, 0.3); }
+    color: rgba(141, 144, 145, 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: #999c9d;
-    border-color: rgba(169, 169, 169, 0.3);
+    color: #989b9c;
+    border-color: rgba(168, 168, 168, 0.3);
     background-color: transparent; }
   spinbutton:not(.vertical) button:backdrop:insensitive {
     background-image: none;
@@ -1334,7 +1293,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;
     icon-shadow: none;
-    color: #878a89;
+    color: #878989;
     border-color: rgba(0, 0, 0, 0.5);
     icon-shadow: none;
     box-shadow: none; }
@@ -1376,31 +1335,29 @@ spinbutton.vertical {
         icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
         box-shadow: inset 0 1px white; }
       spinbutton.vertical button:first-child:insensitive {
-        color: #8e9192;
+        color: #8d9091;
         border-color: #a1a1a1;
         background-image: linear-gradient(to bottom, #f4f4f4);
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        spinbutton.vertical button:first-child:insensitive > .label, spinbutton.vertical headerbar 
button.titlebutton:first-child:insensitive > .label,
-        spinbutton.vertical .titlebar button.titlebutton:first-child:insensitive > .label {
+        spinbutton.vertical button:first-child:insensitive > .label {
           color: inherit; }
       spinbutton.vertical button:first-child:backdrop {
-        color: #8e9192;
-        border-color: darkgray;
+        color: #8d9091;
+        border-color: #a8a8a8;
         background-image: linear-gradient(to bottom, #ededed);
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
         spinbutton.vertical button:first-child:backdrop:insensitive {
           color: #c7c7c7;
-          border-color: darkgray;
+          border-color: #a8a8a8;
           background-image: linear-gradient(to bottom, #f4f4f4);
           text-shadow: none;
           icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-          spinbutton.vertical button:first-child:backdrop:insensitive > .label, spinbutton.vertical 
headerbar button.titlebutton:first-child:backdrop:insensitive > .label,
-          spinbutton.vertical .titlebar button.titlebutton:first-child:backdrop:insensitive > .label {
+          spinbutton.vertical button:first-child:backdrop:insensitive > .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:insensitive, spinbutton.vertical 
button:first-child:backdrop {
     border-radius: 3px 3px 0 0;
@@ -1436,9 +1393,9 @@ spinbutton.vertical {
     icon-shadow: none;
     outline-color: rgba(238, 238, 236, 0.3); }
   .osd spinbutton.vertical button:first-child:insensitive {
-    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;
@@ -1466,16 +1423,16 @@ combobox {
   -GtkComboBox-shadow-type: none;
   text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   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-top: 3px;
     padding-bottom: 4px; }
   combobox:insensitive {
-    color: #8e9192;
+    color: #8d9091;
     text-shadow: none;
     icon-shadow: none; }
   combobox:backdrop {
-    color: #8e9192;
+    color: #8d9091;
     text-shadow: none;
     icon-shadow: none; }
   combobox:backdrop:insensitive {
@@ -1490,13 +1447,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; }
@@ -1535,8 +1490,8 @@ searchbar,
   box-shadow: inset 0 2px 3px -1px #b6b6b6, 0 1px white; }
   .inline-toolbar:backdrop, searchbar:backdrop,
   .location-bar:backdrop {
-    border-color: darkgray;
-    background-color: #d5d5d5;
+    border-color: #a8a8a8;
+    background-color: #d4d4d4;
     box-shadow: none; }
 
 /***************
@@ -1551,10 +1506,10 @@ headerbar {
   border-radius: 7px 7px 0 0;
   background-color: transparent;
   background-image: linear-gradient(to bottom, #f7f7f7, #ededed);
-  box-shadow: inset 0 -1px #dadada, inset 0 1px white; }
+  box-shadow: inset 0 -1px #d9d9d9, inset 0 1px white; }
   .titlebar:backdrop,
   headerbar:backdrop {
-    border-color: darkgray;
+    border-color: #a8a8a8;
     background-color: #ededed;
     background-image: none;
     box-shadow: inset 0 1px white; }
@@ -1578,18 +1533,18 @@ headerbar {
     .titlebar .header-bar-separator:backdrop, .titlebar > GtkBox > separator.vertical:backdrop,
     headerbar .header-bar-separator:backdrop,
     headerbar > GtkBox > separator.vertical:backdrop {
-      border-image: linear-gradient(to bottom, rgba(169, 169, 169, 0.5)) 0 1/1px 1px; }
+      border-image: linear-gradient(to bottom, rgba(168, 168, 168, 0.5)) 0 1/1px 1px; }
   .titlebar.selection-mode,
   headerbar.selection-mode {
     color: #ffffff;
     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 #a5c8ec; }
+    box-shadow: inset 0 -1px #3875b4, inset 0 1px #a4c7ec; }
     .titlebar.selection-mode:backdrop,
     headerbar.selection-mode:backdrop {
       background-image: linear-gradient(to bottom, #4a90d9);
-      box-shadow: inset 0 1px #b7d3f0; }
+      box-shadow: inset 0 1px #b6d2ef; }
     .titlebar.selection-mode button,
     headerbar.selection-mode button,
     headerbar.selection-mode .titlebar button.titlebutton,
@@ -1600,7 +1555,7 @@ headerbar {
       background-image: linear-gradient(to bottom, #5f9ddd, #4a90d9 40%, #3583d5);
       text-shadow: 0 -1px rgba(0, 0, 0, 0.54353);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.54353);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 1px #a5c8ec; }
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 1px #a4c7ec; }
       .titlebar.selection-mode button.flat, .titlebar.selection-mode button.sidebar-button,
       .titlebar.selection-mode button.titlebutton,
       headerbar.selection-mode button.flat,
@@ -1620,7 +1575,7 @@ headerbar {
         background-image: linear-gradient(to bottom, #85b4e5, #5b9add 40%, #4a90d9);
         text-shadow: 0 -1px rgba(0, 0, 0, 0.51153);
         icon-shadow: 0 -1px rgba(0, 0, 0, 0.51153);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 1px #a5c8ec; }
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 1px #a4c7ec; }
       .titlebar.selection-mode button:active, .titlebar.selection-mode button:checked,
       headerbar.selection-mode button:active,
       headerbar.selection-mode button:checked {
@@ -1630,19 +1585,19 @@ headerbar {
         background-image: linear-gradient(to bottom, #2b79cb, #2e7fd3 40%, #3583d5);
         text-shadow: 0 -1px rgba(0, 0, 0, 0.62353);
         icon-shadow: 0 -1px rgba(0, 0, 0, 0.62353);
-        box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px #a5c8ec; 
}
+        box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px #a4c7ec; 
}
       .titlebar.selection-mode button:backdrop, .titlebar.selection-mode button.flat:backdrop, 
.titlebar.selection-mode button.sidebar-button:backdrop,
       .titlebar.selection-mode 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: #dbe9f7;
+        color: #dae8f7;
         border-color: #4a90d9;
         background-image: linear-gradient(to bottom, #4a90d9);
         text-shadow: none;
         icon-shadow: none;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(165, 200, 236, 0);
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(164, 199, 236, 0);
         -gtk-image-effect: none;
         border-color: #184472; }
         .titlebar.selection-mode button:backdrop:active, .titlebar.selection-mode button:backdrop:checked, 
.titlebar.selection-mode button.flat:backdrop:active, .titlebar.selection-mode 
button.sidebar-button:backdrop:active,
@@ -1656,10 +1611,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: #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(165, 200, 236, 0);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(164, 199, 236, 0);
           border-color: #184472; }
         .titlebar.selection-mode button:backdrop:insensitive, .titlebar.selection-mode 
button.flat:backdrop:insensitive, .titlebar.selection-mode button.sidebar-button:backdrop:insensitive,
         .titlebar.selection-mode button.titlebutton:backdrop:insensitive,
@@ -1667,21 +1622,19 @@ headerbar {
         headerbar.selection-mode button.flat:backdrop:insensitive,
         headerbar.selection-mode button.sidebar-button:backdrop:insensitive,
         headerbar.selection-mode button.titlebutton:backdrop:insensitive {
-          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;
           icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(165, 200, 236, 0);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(164, 199, 236, 0);
           border-color: #184472; }
-          .titlebar.selection-mode button:backdrop:insensitive > .label, .titlebar.selection-mode headerbar 
button.titlebutton:backdrop:insensitive > .label, .titlebar.selection-mode button.flat:backdrop:insensitive > 
.label, .titlebar.selection-mode button.sidebar-button:backdrop:insensitive > .label, 
.titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive > .label,
+          .titlebar.selection-mode button:backdrop:insensitive > .label, .titlebar.selection-mode 
button.flat:backdrop:insensitive > .label, .titlebar.selection-mode 
button.sidebar-button:backdrop:insensitive > .label,
           .titlebar.selection-mode button.titlebutton:backdrop:insensitive > .label,
           headerbar.selection-mode button:backdrop:insensitive > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive > .label,
           headerbar.selection-mode button.flat:backdrop:insensitive > .label,
           headerbar.selection-mode button.sidebar-button:backdrop:insensitive > .label,
-          headerbar.selection-mode button.titlebutton:backdrop:insensitive > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive > .label {
+          headerbar.selection-mode button.titlebutton:backdrop:insensitive > .label {
             color: inherit; }
         .titlebar.selection-mode button:backdrop:insensitive:active, .titlebar.selection-mode 
button:backdrop:insensitive:checked, .titlebar.selection-mode button.flat:backdrop:insensitive:active, 
.titlebar.selection-mode button.sidebar-button:backdrop:insensitive:active,
         .titlebar.selection-mode button.titlebutton:backdrop:insensitive:active, .titlebar.selection-mode 
button.flat:backdrop:insensitive:checked, .titlebar.selection-mode 
button.sidebar-button:backdrop:insensitive:checked,
@@ -1694,26 +1647,22 @@ headerbar {
         headerbar.selection-mode button.flat:backdrop:insensitive:checked,
         headerbar.selection-mode button.sidebar-button:backdrop:insensitive:checked,
         headerbar.selection-mode button.titlebutton:backdrop:insensitive:checked {
-          color: #8db9e8;
-          border-color: #5094db;
-          background-image: linear-gradient(to bottom, #5094db);
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(165, 200, 236, 0);
+          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(164, 199, 236, 0);
           border-color: #184472; }
-          .titlebar.selection-mode button:backdrop:insensitive:active > .label, .titlebar.selection-mode 
headerbar button.titlebutton:backdrop:insensitive:active > .label, .titlebar.selection-mode 
button:backdrop:insensitive:checked > .label, .titlebar.selection-mode headerbar 
button.titlebutton:backdrop:insensitive:checked > .label, .titlebar.selection-mode 
button.flat:backdrop:insensitive:active > .label, .titlebar.selection-mode 
button.sidebar-button:backdrop:insensitive:active > .label, .titlebar.selection-mode headerbar 
button.titlebutton:backdrop:insensitive:active > .label,
-          .titlebar.selection-mode button.titlebutton:backdrop:insensitive:active > .label, 
.titlebar.selection-mode button.flat:backdrop:insensitive:checked > .label, .titlebar.selection-mode 
button.sidebar-button:backdrop:insensitive:checked > .label, .titlebar.selection-mode headerbar 
button.titlebutton:backdrop:insensitive:checked > .label,
+          .titlebar.selection-mode button:backdrop:insensitive:active > .label, .titlebar.selection-mode 
button:backdrop:insensitive:checked > .label, .titlebar.selection-mode 
button.flat:backdrop:insensitive:active > .label, .titlebar.selection-mode 
button.sidebar-button:backdrop:insensitive:active > .label,
+          .titlebar.selection-mode button.titlebutton:backdrop:insensitive:active > .label, 
.titlebar.selection-mode button.flat:backdrop:insensitive:checked > .label, .titlebar.selection-mode 
button.sidebar-button:backdrop:insensitive:checked > .label,
           .titlebar.selection-mode button.titlebutton:backdrop:insensitive:checked > .label,
           headerbar.selection-mode button:backdrop:insensitive:active > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:active > .label,
           headerbar.selection-mode button:backdrop:insensitive:checked > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:checked > .label,
           headerbar.selection-mode button.flat:backdrop:insensitive:active > .label,
           headerbar.selection-mode button.sidebar-button:backdrop:insensitive:active > .label,
           headerbar.selection-mode button.titlebutton:backdrop:insensitive:active > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:active > .label,
           headerbar.selection-mode button.flat:backdrop:insensitive:checked > .label,
           headerbar.selection-mode button.sidebar-button:backdrop:insensitive:checked > .label,
-          headerbar.selection-mode button.titlebutton:backdrop:insensitive:checked > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:checked > .label {
+          headerbar.selection-mode button.titlebutton:backdrop:insensitive:checked > .label {
             color: inherit; }
       .titlebar.selection-mode button.flat:backdrop, .titlebar.selection-mode button.sidebar-button:backdrop,
       .titlebar.selection-mode button.titlebutton:backdrop, .titlebar.selection-mode 
button.flat:insensitive, .titlebar.selection-mode button.sidebar-button:insensitive,
@@ -1736,28 +1685,25 @@ headerbar {
         icon-shadow: none; }
       .titlebar.selection-mode button:insensitive,
       headerbar.selection-mode button:insensitive {
-        color: #b2d0ef;
+        color: #b2cfee;
         border-color: #1c5187;
-        background-image: linear-gradient(to bottom, #65a1df);
+        background-image: linear-gradient(to bottom, #65a0de);
         text-shadow: none;
         icon-shadow: none;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px #a5c8ec; }
-        .titlebar.selection-mode button:insensitive > .label, .titlebar.selection-mode headerbar 
button.titlebutton:insensitive > .label,
-        headerbar.selection-mode button:insensitive > .label,
-        headerbar.selection-mode .titlebar button.titlebutton:insensitive > .label {
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px #a4c7ec; }
+        .titlebar.selection-mode button:insensitive > .label,
+        headerbar.selection-mode button:insensitive > .label {
           color: inherit; }
         .titlebar.selection-mode button:insensitive:active, .titlebar.selection-mode 
button:insensitive:checked,
         headerbar.selection-mode button:insensitive:active,
         headerbar.selection-mode button:insensitive:checked {
-          color: #b9d4f1;
+          color: #b9d3f0;
           border-color: #1c5187;
-          background-image: linear-gradient(to bottom, #4b8dd3, #5094db);
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px #a5c8ec; }
-          .titlebar.selection-mode button:insensitive:active > .label, .titlebar.selection-mode headerbar 
button.titlebutton:insensitive:active > .label, .titlebar.selection-mode button:insensitive:checked > .label, 
.titlebar.selection-mode headerbar button.titlebutton:insensitive:checked > .label,
+          background-image: linear-gradient(to bottom, #4a8cd1, #5093da);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px #a4c7ec; }
+          .titlebar.selection-mode button:insensitive:active > .label, .titlebar.selection-mode 
button:insensitive:checked > .label,
           headerbar.selection-mode button:insensitive:active > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:insensitive:active > .label,
-          headerbar.selection-mode button:insensitive:checked > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:insensitive:checked > .label {
+          headerbar.selection-mode button:insensitive:checked > .label {
             color: inherit; }
       .titlebar.selection-mode button.suggested-action,
       headerbar.selection-mode button.suggested-action {
@@ -1767,7 +1713,7 @@ headerbar {
         background-image: linear-gradient(to bottom, #fafafa, #ededed 40%, #e0e0e0);
         text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
         icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
-        box-shadow: inset 0 1px white, 0 1px #a5c8ec;
+        box-shadow: inset 0 1px white, 0 1px #a4c7ec;
         border-color: #184472; }
         .titlebar.selection-mode button.suggested-action:hover,
         headerbar.selection-mode button.suggested-action:hover {
@@ -1777,7 +1723,7 @@ headerbar {
           background-image: linear-gradient(to bottom, white, #f7f7f7 40%, #ededed);
           text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
           icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
-          box-shadow: inset 0 1px white, 0 1px #a5c8ec;
+          box-shadow: inset 0 1px white, 0 1px #a4c7ec;
           border-color: #184472; }
         .titlebar.selection-mode button.suggested-action:active,
         headerbar.selection-mode button.suggested-action:active {
@@ -1787,42 +1733,40 @@ headerbar {
           background-image: linear-gradient(to bottom, #d6d6d6, gainsboro 40%, #e0e0e0);
           text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
           icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
-          box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px 
#a5c8ec;
+          box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px 
#a4c7ec;
           border-color: #184472; }
         .titlebar.selection-mode button.suggested-action:insensitive,
         headerbar.selection-mode button.suggested-action:insensitive {
-          color: #8e9192;
+          color: #8d9091;
           border-color: #a1a1a1;
           background-image: linear-gradient(to bottom, #f4f4f4);
           text-shadow: none;
           icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px #a5c8ec;
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px #a4c7ec;
           border-color: #184472; }
-          .titlebar.selection-mode button.suggested-action:insensitive > .label, .titlebar.selection-mode 
headerbar button.suggested-action.titlebutton:insensitive > .label,
-          headerbar.selection-mode button.suggested-action:insensitive > .label,
-          headerbar.selection-mode .titlebar button.suggested-action.titlebutton:insensitive > .label {
+          .titlebar.selection-mode button.suggested-action:insensitive > .label,
+          headerbar.selection-mode button.suggested-action:insensitive > .label {
             color: inherit; }
         .titlebar.selection-mode button.suggested-action:backdrop,
         headerbar.selection-mode button.suggested-action:backdrop {
-          color: #8e9192;
-          border-color: darkgray;
+          color: #8d9091;
+          border-color: #a8a8a8;
           background-image: linear-gradient(to bottom, #ededed);
           text-shadow: none;
           icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(165, 200, 236, 0);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(164, 199, 236, 0);
           border-color: #184472; }
         .titlebar.selection-mode button.suggested-action:backdrop:insensitive,
         headerbar.selection-mode button.suggested-action:backdrop:insensitive {
           color: #c7c7c7;
-          border-color: darkgray;
+          border-color: #a8a8a8;
           background-image: linear-gradient(to bottom, #f4f4f4);
           text-shadow: none;
           icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(165, 200, 236, 0);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(164, 199, 236, 0);
           border-color: #184472; }
-          .titlebar.selection-mode button.suggested-action:backdrop:insensitive > .label, 
.titlebar.selection-mode headerbar button.suggested-action.titlebutton:backdrop:insensitive > .label,
-          headerbar.selection-mode button.suggested-action:backdrop:insensitive > .label,
-          headerbar.selection-mode .titlebar button.suggested-action.titlebutton:backdrop:insensitive > 
.label {
+          .titlebar.selection-mode button.suggested-action:backdrop:insensitive > .label,
+          headerbar.selection-mode button.suggested-action:backdrop:insensitive > .label {
             color: inherit; }
     .titlebar.selection-mode .selection-menu, .titlebar.selection-mode .selection-menu:backdrop,
     headerbar.selection-mode .selection-menu,
@@ -1893,15 +1837,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: #ededed; }
   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:insensitive {
-    color: #8e9192; }
+    color: #8d9091; }
     treeview.view:insensitive:selected {
       color: #92bce8; }
       treeview.view:insensitive:selected:backdrop {
@@ -1911,29 +1855,29 @@ treeview.view {
   treeview.view.separator:backdrop {
     color: rgba(0, 0, 0, 0.1); }
   treeview.view:backdrop {
-    border-left-color: #bebfc0;
+    border-left-color: #bdbebf;
     border-top: #ededed; }
   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: #b0b2b3; }
+      color: #afb1b2; }
   treeview.view.progressbar {
     color: #ffffff;
     border: 1px solid #184472;
@@ -1963,13 +1907,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 {
@@ -1997,7 +1941,7 @@ treeview.view header .titlebar button.titlebutton,
   treeview.view header button:backdrop {
     border-color: #ededed;
     border-style: none solid solid none;
-    color: #bebfc0;
+    color: #bdbebf;
     background-image: none;
     background-color: white; }
     treeview.view header button:backdrop:insensitive {
@@ -2024,7 +1968,7 @@ menubar,
       color: #2a76c6; }
     menubar > menuitem:insensitive,
     .menubar > menuitem:insensitive {
-      color: #8e9192;
+      color: #8d9091;
       box-shadow: none; }
 
 menu,
@@ -2046,14 +1990,14 @@ menu,
       background-color: #4a90d9; }
     menu menuitem:insensitive,
     .menu menuitem:insensitive {
-      color: #8e9192; }
+      color: #8d9091; }
       menu menuitem:insensitive:backdrop,
       .menu menuitem:insensitive:backdrop {
         color: #c7c7c7; }
     menu menuitem:backdrop, menu menuitem:backdrop:hover,
     .menu menuitem:backdrop,
     .menu menuitem:backdrop:hover {
-      color: #8e9192;
+      color: #8d9091;
       background-color: white; }
     menu menuitem arrow,
     .menu menuitem arrow {
@@ -2067,13 +2011,13 @@ menu,
     border-radius: 0; }
     menu arrow.top,
     .menu arrow.top {
-      border-bottom: 1px solid #eaebeb; }
+      border-bottom: 1px solid #eaeaea; }
     menu arrow.bottom,
     .menu arrow.bottom {
-      border-top: 1px solid #eaebeb; }
+      border-top: 1px solid #eaeaea; }
     menu arrow:hover,
     .menu arrow:hover {
-      background-color: #eaebeb; }
+      background-color: #eaeaea; }
     menu arrow:insensitive,
     .menu arrow:insensitive {
       color: transparent;
@@ -2134,7 +2078,7 @@ notebook {
   notebook.frame {
     border: 1px solid #a1a1a1; }
     notebook.frame:backdrop {
-      border-color: darkgray; }
+      border-color: #a8a8a8; }
   notebook header {
     background-color: #d6d6d6; }
     .frame notebook header {
@@ -2148,11 +2092,11 @@ notebook {
       .frame notebook header.left {
         border-right-width: 0; }
       .frame notebook header:backdrop {
-        border-color: darkgray; }
+        border-color: #a8a8a8; }
     notebook header.top {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 -1px #a1a1a1; }
       notebook header.top:backdrop {
-        box-shadow: inset 0 -1px darkgray; }
+        box-shadow: inset 0 -1px #a8a8a8; }
       notebook header.top tab {
         padding: 8px 20px;
         border-bottom-width: 3px; }
@@ -2164,7 +2108,7 @@ notebook {
     notebook header.bottom {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 1px #a1a1a1; }
       notebook header.bottom:backdrop {
-        box-shadow: inset 0 1px darkgray; }
+        box-shadow: inset 0 1px #a8a8a8; }
       notebook header.bottom tab {
         padding: 8px 20px;
         border-top-width: 3px; }
@@ -2176,7 +2120,7 @@ notebook {
     notebook header.right {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 1px 0 #a1a1a1; }
       notebook header.right:backdrop {
-        box-shadow: inset 1px 0 darkgray; }
+        box-shadow: inset 1px 0 #a8a8a8; }
       notebook header.right tab {
         padding: 5px 20px;
         border-left-width: 3px; }
@@ -2186,7 +2130,7 @@ notebook {
     notebook header.left {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset -1px 0 #a1a1a1; }
       notebook header.left:backdrop {
-        box-shadow: inset -1px 0 darkgray; }
+        box-shadow: inset -1px 0 #a8a8a8; }
       notebook header.left tab {
         padding: 5px 20px;
         border-right-width: 3px; }
@@ -2194,7 +2138,7 @@ notebook {
           border-bottom-width: 1px;
           border-top-width: 1px; }
     notebook header:backdrop {
-      background-color: #d5d5d5;
+      background-color: #d4d4d4;
       box-shadow: none; }
     notebook header.top tabs arrow.up, notebook header.bottom tabs arrow.up {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
@@ -2205,15 +2149,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: #8e9192; }
+      color: #8d9091; }
       notebook header tabs arrow:hover {
-        color: #5e6364; }
+        color: #5d6263; }
       notebook header tabs arrow:active {
         color: #2e3436; }
       notebook header tabs arrow:insensitive {
-        color: rgba(142, 145, 146, 0.3); }
+        color: rgba(141, 144, 145, 0.3); }
       notebook header tabs arrow:backdrop {
-        color: rgba(142, 145, 146, 0.4); }
+        color: rgba(141, 144, 145, 0.4); }
       notebook header tabs arrow:backdrop:insensitive {
         color: #c7c7c7; }
   notebook tab {
@@ -2242,7 +2186,7 @@ notebook {
         .top notebook tab.reorderable-page:active:hover {
           background-color: rgba(237, 237, 237, 0.7); }
         .top notebook tab.reorderable-page:active:backdrop {
-          border-color: darkgray;
+          border-color: #a8a8a8;
           background-color: #ededed;
           border-bottom-color: #4a90d9; }
       .top notebook tab.reorderable-page:backdrop {
@@ -2261,7 +2205,7 @@ notebook {
         .bottom notebook tab.reorderable-page:active:hover {
           background-color: rgba(237, 237, 237, 0.7); }
         .bottom notebook tab.reorderable-page:active:backdrop {
-          border-color: darkgray;
+          border-color: #a8a8a8;
           background-color: #ededed;
           border-top-color: #4a90d9; }
       .bottom notebook tab.reorderable-page:backdrop {
@@ -2280,7 +2224,7 @@ notebook {
         .left notebook tab.reorderable-page:active:hover {
           background-color: rgba(237, 237, 237, 0.7); }
         .left notebook tab.reorderable-page:active:backdrop {
-          border-color: darkgray;
+          border-color: #a8a8a8;
           background-color: #ededed;
           border-right-color: #4a90d9; }
       .left notebook tab.reorderable-page:backdrop {
@@ -2299,7 +2243,7 @@ notebook {
         .right notebook tab.reorderable-page:active:hover {
           background-color: rgba(237, 237, 237, 0.7); }
         .right notebook tab.reorderable-page:active:backdrop {
-          border-color: darkgray;
+          border-color: #a8a8a8;
           background-color: #ededed;
           border-left-color: #4a90d9; }
       .right notebook tab.reorderable-page:backdrop {
@@ -2308,17 +2252,17 @@ notebook {
     notebook tab label {
       padding: 0 2px;
       font-weight: bold;
-      color: #8e9192; }
+      color: #8d9091; }
       notebook tab label:backdrop {
-        color: #abacad; }
+        color: #aaabac; }
     notebook tab:hover label {
-      color: #5e6364; }
+      color: #5d6263; }
       notebook tab:hover label:backdrop {
-        color: #abacad; }
+        color: #aaabac; }
     notebook tab:active label {
       color: #2e3436; }
       notebook tab:active label:backdrop {
-        color: #8e9192; }
+        color: #8d9091; }
     notebook tab button, notebook tab headerbar button.titlebutton, headerbar notebook tab 
button.titlebutton,
     notebook tab .titlebar button.titlebutton,
     .titlebar notebook tab button.titlebutton {
@@ -2353,7 +2297,7 @@ notebook {
       notebook tab button:backdrop,
       notebook tab .titlebar button.titlebutton:backdrop,
       .titlebar notebook tab button.titlebutton:backdrop {
-        color: rgba(142, 145, 146, 0.3);
+        color: rgba(141, 144, 145, 0.3);
         border-color: transparent; }
       notebook tab button > image, notebook tab headerbar button.titlebutton > image, headerbar notebook tab 
button.titlebutton > image,
       notebook tab .titlebar button.titlebutton > image,
@@ -2399,15 +2343,15 @@ scrollbar {
     border: 1px none #a1a1a1; }
     scrollbar trough:backdrop {
       background-color: #e5e5e5;
-      border-color: darkgray; }
+      border-color: #a8a8a8; }
   scrollbar slider {
     background-color: #7a7e7f; }
     scrollbar slider:hover {
-      background-color: #54595b; }
+      background-color: #54595a; }
     scrollbar slider:prelight:active {
       background-color: #2a76c6; }
     scrollbar slider:backdrop {
-      background-color: #c7c8c9; }
+      background-color: #c6c7c8; }
     scrollbar slider:insensitive {
       background-color: transparent; }
   scrollbar slider {
@@ -2448,7 +2392,7 @@ switch {
   border: 1px solid #a1a1a1;
   border-radius: 3px;
   color: #2e3436;
-  background-image: linear-gradient(to bottom, #cfcfcf);
+  background-image: linear-gradient(to bottom, #cecece);
   text-shadow: 0 1px rgba(0, 0, 0, 0.1); }
   * {
     -GtkSwitch-slider-width: 45px;
@@ -2460,16 +2404,16 @@ switch {
     box-shadow: 0 1px white;
     text-shadow: 0 1px rgba(24, 68, 114, 0.5), 0 0 2px rgba(255, 255, 255, 0.6); }
   switch:insensitive {
-    color: #8e9192;
+    color: #8d9091;
     border-color: #a1a1a1;
     background-image: none;
     background-color: #f4f4f4;
     box-shadow: 0 1px white;
     text-shadow: none; }
   switch:backdrop {
-    color: #8e9192;
-    border-color: darkgray;
-    background-image: linear-gradient(to bottom, #d5d5d5);
+    color: #8d9091;
+    border-color: #a8a8a8;
+    background-image: linear-gradient(to bottom, #d4d4d4);
     box-shadow: none;
     text-shadow: none; }
     switch:backdrop:active {
@@ -2479,7 +2423,7 @@ switch {
       box-shadow: none; }
   switch:insensitive {
     color: #c7c7c7;
-    border-color: darkgray;
+    border-color: #a8a8a8;
     background-image: none;
     background-color: #f4f4f4; }
   switch slider {
@@ -2505,7 +2449,7 @@ switch {
   switch:active slider {
     border: 1px solid #184472; }
   switch:insensitive slider {
-    color: #8e9192;
+    color: #8d9091;
     border-color: #a1a1a1;
     background-image: linear-gradient(to bottom, #f4f4f4);
     text-shadow: none;
@@ -2514,8 +2458,8 @@ switch {
     switch:insensitive slider > .label {
       color: inherit; }
   switch:backdrop slider {
-    color: #8e9192;
-    border-color: darkgray;
+    color: #8d9091;
+    border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #ededed);
     text-shadow: none;
     icon-shadow: none;
@@ -2525,7 +2469,7 @@ switch {
     border-color: #4a90d9; }
   switch:backdrop:insensitive slider {
     color: #c7c7c7;
-    border-color: darkgray;
+    border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #f4f4f4);
     text-shadow: none;
     icon-shadow: none;
@@ -2775,7 +2719,7 @@ menu menuitem.check {
   menu menuitem.check:hover {
     color: #ffffff; }
   menu menuitem.check:insensitive {
-    color: #bebfc0; }
+    color: #bdbebf; }
 
 radio {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked.png"), url("assets/radio-unchecked 2 png"));
@@ -3004,7 +2948,7 @@ menu menuitem.radio {
   menu menuitem.radio:hover {
     color: #ffffff; }
   menu menuitem.radio:insensitive {
-    color: #bebfc0; }
+    color: #bdbebf; }
 
 .view.check, .view.radio,
 row .check, row .radio {
@@ -3058,7 +3002,7 @@ checkbutton.text-button, radiobutton.text-button {
   padding: 1px 2px 4px;
   outline-offset: 0; }
   checkbutton.text-button:insensitive, checkbutton.text-button:insensitive:active, 
checkbutton.text-button:insensitive:inconsistent, radiobutton.text-button:insensitive, 
radiobutton.text-button:insensitive:active, radiobutton.text-button:insensitive:inconsistent {
-    color: #8e9192; }
+    color: #8d9091; }
     checkbutton.text-button:insensitive:backdrop, checkbutton.text-button:insensitive:active:backdrop, 
checkbutton.text-button:insensitive:inconsistent:backdrop, radiobutton.text-button:insensitive:backdrop, 
radiobutton.text-button:insensitive:active:backdrop, 
radiobutton.text-button:insensitive:inconsistent:backdrop {
       color: #c7c7c7; }
 
@@ -3087,7 +3031,7 @@ scale {
   scale trough {
     border: 1px solid #a1a1a1;
     border-radius: 3px;
-    background-color: #cfcfcf;
+    background-color: #cecece;
     box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1), 0 1px white; }
     scale trough slider {
       color: #2e3436;
@@ -3120,12 +3064,12 @@ scale {
       scale trough slider:backdrop {
         border-style: solid;
         border-radius: 50%;
-        border-color: #a1a1a1;
+        border-color: #a0a0a0;
         background-image: linear-gradient(to bottom, #ededed);
         box-shadow: none; }
       scale trough slider:backdrop:insensitive {
         color: #c7c7c7;
-        border-color: darkgray;
+        border-color: #a8a8a8;
         background-image: linear-gradient(to bottom, #f4f4f4);
         text-shadow: none;
         icon-shadow: none;
@@ -3200,11 +3144,11 @@ scale {
       background-color: #f4f4f4;
       box-shadow: 0 1px white; }
     scale trough:backdrop {
-      border-color: darkgray;
+      border-color: #a8a8a8;
       background-color: #c7c7c7;
       box-shadow: none; }
     scale trough:backdrop:insensitive, scale trough .highlight:backdrop:insensitive {
-      border-color: darkgray;
+      border-color: #a8a8a8;
       background-color: #f4f4f4; }
     .osd scale trough {
       border-color: rgba(0, 0, 0, 0.7);
@@ -3234,10 +3178,10 @@ scale {
     row:selected scale:insensitive, row:selected scale.highlight:insensitive {
       border-color: #4a90d9;
       box-shadow: none;
-      background-color: #a5c8ec;
+      background-color: #a4c7ec;
       background-image: none; }
       row:selected scale:insensitive:backdrop, row:selected scale.highlight:insensitive:backdrop {
-        background-color: #a5c8ec; }
+        background-color: #a4c7ec; }
 
 scale marks {
   color: alpha(currentColor,0.5); }
@@ -3485,8 +3429,8 @@ progressbar {
     border-radius: 3px;
     background-color: #d2d2d2; }
     progressbar trough:backdrop {
-      border-color: darkgray;
-      background-color: #d5d5d5;
+      border-color: #a8a8a8;
+      background-color: #d4d4d4;
       box-shadow: 0 1px rgba(255, 255, 255, 0); }
 
 progressbar.horizontal progress {
@@ -3548,8 +3492,8 @@ levelbar {
     levelbar trough:backdrop {
       background-color: transparent;
       background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
-      color: #333333;
-      border-color: darkgray;
+      color: #323232;
+      border-color: #a8a8a8;
       background-image: linear-gradient(to bottom, white);
       box-shadow: 0 1px rgba(255, 255, 255, 0); }
   levelbar.horizontal.discrete block {
@@ -3586,7 +3530,7 @@ levelbar {
     border-color: rgba(46, 52, 54, 0.2);
     box-shadow: none; }
     levelbar block.empty:backdrop {
-      border-color: rgba(142, 145, 146, 0.15); }
+      border-color: rgba(141, 144, 145, 0.15); }
 
 /**********
  * Frames *
@@ -3600,14 +3544,14 @@ frame,
     border-style: none; }
   frame:backdrop,
   .frame:backdrop {
-    border-color: darkgray; }
+    border-color: #a8a8a8; }
 
 paper {
   border: 1px solid #a1a1a1;
   background: white;
   padding: 0; }
   paper:backdrop {
-    border-color: darkgray; }
+    border-color: #a8a8a8; }
 
 actionbar frame {
   padding: 6px;
@@ -3627,7 +3571,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(darkgray), to(rgba(169, 169, 
169, 0)));
+    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#a8a8a8), to(rgba(168, 168, 
168, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center top;
@@ -3645,7 +3589,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(darkgray), to(rgba(169, 
169, 169, 0)));
+    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#a8a8a8), to(rgba(168, 
168, 168, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center bottom;
@@ -3663,7 +3607,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(darkgray), to(rgba(169, 
169, 169, 0)));
+    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#a8a8a8), to(rgba(168, 168, 
168, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: left center;
@@ -3681,7 +3625,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(darkgray), to(rgba(169, 
169, 169, 0)));
+    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#a8a8a8), to(rgba(168, 
168, 168, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: right center;
@@ -3742,7 +3686,7 @@ scrolledwindow junction {
     border-image-slice: 0 1 0 0; }
   placessidebar junction:backdrop,
   scrolledwindow junction:backdrop {
-    border-image-source: linear-gradient(to bottom, darkgray 1px, transparent 1px);
+    border-image-source: linear-gradient(to bottom, #a8a8a8 1px, transparent 1px);
     background-color: #e5e5e5; }
 
 separator {
@@ -3758,7 +3702,7 @@ list {
   border-color: #a1a1a1; }
   list:backdrop {
     background-color: white;
-    border-color: darkgray; }
+    border-color: #a8a8a8; }
   list row {
     padding: 2px; }
 
@@ -3774,7 +3718,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; }
 
@@ -3820,8 +3764,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: #8e9192;
-    border-color: darkgray;
+    color: #8d9091;
+    border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #ededed);
     text-shadow: none;
     icon-shadow: none;
@@ -3832,23 +3776,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: #8e9192;
-      border-color: darkgray;
-      background-image: linear-gradient(to bottom, #d5d5d5);
+      color: #8d9091;
+      border-color: #a8a8a8;
+      background-image: linear-gradient(to bottom, #d4d4d4);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       border-color: #184472; }
     row:selected button:backdrop:insensitive, row:selected button.flat:backdrop:insensitive, row:selected 
button.sidebar-button:backdrop:insensitive, row:selected headerbar button.titlebutton:backdrop:insensitive, 
headerbar row:selected button.titlebutton:backdrop:insensitive,
     row:selected .titlebar button.titlebutton:backdrop:insensitive,
     .titlebar row:selected button.titlebutton:backdrop:insensitive {
       color: #c7c7c7;
-      border-color: darkgray;
+      border-color: #a8a8a8;
       background-image: linear-gradient(to bottom, #f4f4f4);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       border-color: #184472; }
-      row:selected button:backdrop:insensitive > .label, row:selected headerbar 
button.titlebutton:backdrop:insensitive > .label,
-      row:selected .titlebar button.titlebutton:backdrop:insensitive > .label, row:selected 
button.flat:backdrop:insensitive > .label, row:selected button.sidebar-button:backdrop:insensitive > .label, 
row:selected headerbar button.titlebutton:backdrop:insensitive > .label, headerbar row:selected 
button.titlebutton:backdrop:insensitive > .label,
+      row:selected button:backdrop:insensitive > .label, row:selected button.flat:backdrop:insensitive > 
.label, row:selected button.sidebar-button:backdrop:insensitive > .label, row:selected headerbar 
button.titlebutton:backdrop:insensitive > .label, headerbar row:selected 
button.titlebutton:backdrop:insensitive > .label,
       row:selected .titlebar button.titlebutton:backdrop:insensitive > .label,
       .titlebar row:selected button.titlebutton:backdrop:insensitive > .label {
         color: inherit; }
@@ -3858,13 +3801,11 @@ row:selected .titlebar button.titlebutton,
       row:selected .titlebar button.titlebutton:backdrop:insensitive:checked,
       .titlebar row:selected button.titlebutton:backdrop:insensitive:checked {
         color: #c7c7c7;
-        border-color: darkgray;
+        border-color: #a8a8a8;
         background-image: linear-gradient(to bottom, #e7e7e7);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         border-color: #184472; }
-        row:selected button:backdrop:insensitive:active > .label, row:selected headerbar 
button.titlebutton:backdrop:insensitive:active > .label,
-        row:selected .titlebar button.titlebutton:backdrop:insensitive:active > .label, row:selected 
button:backdrop:insensitive:checked > .label, row:selected headerbar 
button.titlebutton:backdrop:insensitive:checked > .label,
-        row:selected .titlebar button.titlebutton:backdrop:insensitive:checked > .label, row:selected 
button.flat:backdrop:insensitive:active > .label, row:selected 
button.sidebar-button:backdrop:insensitive:active > .label, row:selected headerbar 
button.titlebutton:backdrop:insensitive:active > .label, headerbar row:selected 
button.titlebutton:backdrop:insensitive:active > .label,
+        row:selected button:backdrop:insensitive:active > .label, row:selected 
button:backdrop:insensitive:checked > .label, row:selected button.flat:backdrop:insensitive:active > .label, 
row:selected button.sidebar-button:backdrop:insensitive:active > .label, row:selected headerbar 
button.titlebutton:backdrop:insensitive:active > .label, headerbar row:selected 
button.titlebutton:backdrop:insensitive:active > .label,
         row:selected .titlebar button.titlebutton:backdrop:insensitive:active > .label,
         .titlebar row:selected button.titlebutton:backdrop:insensitive:active > .label, row:selected 
button.flat:backdrop:insensitive:checked > .label, row:selected 
button.sidebar-button:backdrop:insensitive:checked > .label, row:selected headerbar 
button.titlebutton:backdrop:insensitive:checked > .label, headerbar row:selected 
button.titlebutton:backdrop:insensitive:checked > .label,
         row:selected .titlebar button.titlebutton:backdrop:insensitive:checked > .label,
@@ -3881,24 +3822,21 @@ row:selected .titlebar button.titlebutton,
     icon-shadow: none;
     color: white; }
   row:selected button:insensitive {
-    color: #8e9192;
+    color: #8d9091;
     border-color: #a1a1a1;
     background-image: linear-gradient(to bottom, #f4f4f4);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     border-color: #184472; }
-    row:selected button:insensitive > .label, row:selected headerbar button.titlebutton:insensitive > .label,
-    row:selected .titlebar button.titlebutton:insensitive > .label {
+    row:selected button:insensitive > .label {
       color: inherit; }
     row:selected button:insensitive:active, row:selected button:insensitive:checked {
-      color: #8e9192;
+      color: #8d9091;
       border-color: #a1a1a1;
-      background-image: linear-gradient(to bottom, #ececec, #f4f4f4);
+      background-image: linear-gradient(to bottom, #ebebeb, #f4f4f4);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      row:selected button:insensitive:active > .label, row:selected headerbar 
button.titlebutton:insensitive:active > .label,
-      row:selected .titlebar button.titlebutton:insensitive:active > .label, row:selected 
button:insensitive:checked > .label, row:selected headerbar button.titlebutton:insensitive:checked > .label,
-      row:selected .titlebar button.titlebutton:insensitive:checked > .label {
+      row:selected button:insensitive:active > .label, row:selected button:insensitive:checked > .label {
         color: inherit; }
 
 row {
@@ -3969,9 +3907,9 @@ row {
     .app-notification button:insensitive, .app-notification button:backdrop:insensitive,
     .app-notification.frame button:insensitive,
     .app-notification.frame button:backdrop:insensitive {
-      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;
@@ -4014,17 +3952,17 @@ calendar {
     calendar.button:hover {
       color: #2e3436; }
     calendar.button:backdrop {
-      color: rgba(142, 145, 146, 0.45); }
+      color: rgba(141, 144, 145, 0.45); }
     calendar.button:insensitive {
-      color: rgba(142, 145, 146, 0.45); }
+      color: rgba(141, 144, 145, 0.45); }
   calendar:inconsistent, calendar:inconsistent:backdrop {
     color: alpha(currentColor,0.55); }
   calendar.highlight, calendar.highlight:backdrop {
     font-size: smaller;
     color: #2e3436; }
   calendar:backdrop {
-    color: #333333;
-    border-color: darkgray; }
+    color: #323232;
+    border-color: #a8a8a8; }
 
 /***********
  * Dialogs *
@@ -4069,31 +4007,29 @@ messagedialog.csd .dialog-action-area button {
     icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
   messagedialog.csd .dialog-action-area button:insensitive {
-    color: #8e9192;
+    color: #8d9091;
     border-color: #a1a1a1;
     background-image: linear-gradient(to bottom, #f4f4f4);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    messagedialog.csd .dialog-action-area button:insensitive > .label, messagedialog.csd .dialog-action-area 
headerbar button.titlebutton:insensitive > .label,
-    messagedialog.csd .dialog-action-area .titlebar button.titlebutton:insensitive > .label {
+    messagedialog.csd .dialog-action-area button:insensitive > .label {
       color: inherit; }
   messagedialog.csd .dialog-action-area button:backdrop {
-    color: #8e9192;
-    border-color: darkgray;
+    color: #8d9091;
+    border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #ededed);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   messagedialog.csd .dialog-action-area button:backdrop:insensitive {
     color: #c7c7c7;
-    border-color: darkgray;
+    border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #f4f4f4);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    messagedialog.csd .dialog-action-area button:backdrop:insensitive > .label, messagedialog.csd 
.dialog-action-area headerbar button.titlebutton:backdrop:insensitive > .label,
-    messagedialog.csd .dialog-action-area .titlebar button.titlebutton:backdrop:insensitive > .label {
+    messagedialog.csd .dialog-action-area button:backdrop:insensitive > .label {
       color: inherit; }
   messagedialog.csd .dialog-action-area button.suggested-action {
     color: white;
@@ -4120,7 +4056,7 @@ messagedialog.csd .dialog-action-area button {
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.62353);
       box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), 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;
@@ -4128,23 +4064,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:insensitive {
         color: #c7c7c7;
-        border-color: darkgray;
+        border-color: #a8a8a8;
         background-image: linear-gradient(to bottom, #f4f4f4);
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        messagedialog.csd .dialog-action-area button.suggested-action:backdrop:insensitive > .label, 
messagedialog.csd .dialog-action-area headerbar button.suggested-action.titlebutton:backdrop:insensitive > 
.label,
-        messagedialog.csd .dialog-action-area .titlebar 
button.suggested-action.titlebutton:backdrop:insensitive > .label {
+        messagedialog.csd .dialog-action-area button.suggested-action:backdrop:insensitive > .label {
           color: inherit; }
     messagedialog.csd .dialog-action-area button.suggested-action:insensitive {
-      color: #8e9192;
+      color: #8d9091;
       border-color: #a1a1a1;
       background-image: linear-gradient(to bottom, #f4f4f4);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      messagedialog.csd .dialog-action-area button.suggested-action:insensitive > .label, messagedialog.csd 
.dialog-action-area headerbar button.suggested-action.titlebutton:insensitive > .label,
-      messagedialog.csd .dialog-action-area .titlebar button.suggested-action.titlebutton:insensitive > 
.label {
+      messagedialog.csd .dialog-action-area button.suggested-action:insensitive > .label {
         color: inherit; }
   messagedialog.csd .dialog-action-area button.destructive-action {
     color: white;
@@ -4171,7 +4105,7 @@ messagedialog.csd .dialog-action-area button {
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
       box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), 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;
@@ -4179,23 +4113,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:insensitive {
         color: #c7c7c7;
-        border-color: darkgray;
+        border-color: #a8a8a8;
         background-image: linear-gradient(to bottom, #f4f4f4);
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        messagedialog.csd .dialog-action-area button.destructive-action:backdrop:insensitive > .label, 
messagedialog.csd .dialog-action-area headerbar button.destructive-action.titlebutton:backdrop:insensitive > 
.label,
-        messagedialog.csd .dialog-action-area .titlebar 
button.destructive-action.titlebutton:backdrop:insensitive > .label {
+        messagedialog.csd .dialog-action-area button.destructive-action:backdrop:insensitive > .label {
           color: inherit; }
     messagedialog.csd .dialog-action-area button.destructive-action:insensitive {
-      color: #8e9192;
+      color: #8d9091;
       border-color: #a1a1a1;
       background-image: linear-gradient(to bottom, #f4f4f4);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      messagedialog.csd .dialog-action-area button.destructive-action:insensitive > .label, 
messagedialog.csd .dialog-action-area headerbar button.destructive-action.titlebutton:insensitive > .label,
-      messagedialog.csd .dialog-action-area .titlebar button.destructive-action.titlebutton:insensitive > 
.label {
+      messagedialog.csd .dialog-action-area button.destructive-action:insensitive > .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:insensitive, messagedialog.csd .dialog-action-area button:backdrop, messagedialog.csd 
.dialog-action-area button:backdrop:insensitive, 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:insensitive, messagedialog.csd .dialog-action-area 
button.suggested-action:insensitive, 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:insensitive, messagedialog.csd .dialog-action-area 
button.destructive-action:insensitive {
   border-left-style: solid;
@@ -4212,7 +4144,7 @@ messagedialog.csd .dialog-action-area button:first-child {
 GtkFileChooserDialog .dialog-action-box {
   border-top: 1px solid #a1a1a1; }
   GtkFileChooserDialog .dialog-action-box:backdrop {
-    border-top-color: darkgray; }
+    border-top-color: #a8a8a8; }
 
 /***********
  * Sidebar *
@@ -4253,9 +4185,7 @@ placessidebar row {
     padding: 5px;
     border-radius: 100%;
     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; }
@@ -4286,7 +4216,7 @@ paned {
   paned separator {
     background-color: #a1a1a1; }
     paned separator:backdrop {
-      background-color: darkgray; }
+      background-color: #a8a8a8; }
   paned separator:selected {
     background-color: #4a90d9; }
 
@@ -4301,7 +4231,7 @@ paned.wide {
   paned.wide.vertical separator {
     border-style: solid none; }
   paned.wide separator:backdrop {
-    border-color: darkgray; }
+    border-color: #a8a8a8; }
 
 /**************
  * GtkInfoBar *
@@ -4368,29 +4298,22 @@ infobar {
     .question button:insensitive,
     .warning button:insensitive,
     .error button:insensitive {
-      color: #b2d0ef;
+      color: #b2cfee;
       border-color: #1c5187;
-      background-image: linear-gradient(to bottom, #65a1df);
+      background-image: linear-gradient(to bottom, #65a0de);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .info button:insensitive > .label, .info headerbar button.titlebutton:insensitive > .label,
-      .info .titlebar button.titlebutton:insensitive > .label,
+      .info button:insensitive > .label,
       .question button:insensitive > .label,
-      .question headerbar button.titlebutton:insensitive > .label,
-      .question .titlebar button.titlebutton:insensitive > .label,
       .warning button:insensitive > .label,
-      .warning headerbar button.titlebutton:insensitive > .label,
-      .warning .titlebar button.titlebutton:insensitive > .label,
-      .error button:insensitive > .label,
-      .error headerbar button.titlebutton:insensitive > .label,
-      .error .titlebar button.titlebutton:insensitive > .label {
+      .error button:insensitive > .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;
@@ -4401,24 +4324,17 @@ infobar {
       .question button:backdrop:insensitive,
       .warning button:backdrop:insensitive,
       .error button:backdrop:insensitive {
-        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;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         border-color: #1c5187; }
-        .info button:backdrop:insensitive > .label, .info headerbar button.titlebutton:backdrop:insensitive 
.label,
-        .info .titlebar button.titlebutton:backdrop:insensitive > .label,
+        .info button:backdrop:insensitive > .label,
         .question button:backdrop:insensitive > .label,
-        .question headerbar button.titlebutton:backdrop:insensitive > .label,
-        .question .titlebar button.titlebutton:backdrop:insensitive > .label,
         .warning button:backdrop:insensitive > .label,
-        .warning headerbar button.titlebutton:backdrop:insensitive > .label,
-        .warning .titlebar button.titlebutton:backdrop:insensitive > .label,
-        .error button:backdrop:insensitive > .label,
-        .error headerbar button.titlebutton:backdrop:insensitive > .label,
-        .error .titlebar button.titlebutton:backdrop:insensitive > .label {
+        .error button:backdrop:insensitive > .label {
           color: inherit; }
   .info label:selected, .info label:selected:focus, .info label:selected:hover,
   .question label:selected,
@@ -4533,8 +4449,8 @@ colorswatch {
       icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
       box-shadow: inset 0 1px white, 0 1px white; }
     colorswatch#add-color-button:backdrop {
-      color: #8e9192;
-      border-color: darkgray;
+      color: #8d9091;
+      border-color: #a8a8a8;
       background-image: linear-gradient(to bottom, #ededed);
       text-shadow: none;
       icon-shadow: none;
@@ -4601,7 +4517,7 @@ decoration {
     border-radius: 0;
     margin: 4px;
     background-color: #ededed;
-    border: solid 1px darkgray;
+    border: solid 1px #a8a8a8;
     box-shadow: none; }
 
 headerbar button.titlebutton,
@@ -4632,7 +4548,7 @@ textview text selection, textview text selection:focus,
   textview text selection:insensitive,
   .view selection:insensitive, label selection:insensitive, .grid-child:insensitive:selected, entry 
selection:insensitive, spinbutton selection:insensitive, modelbutton.flat:insensitive:selected,
   .menuitem.button.flat:insensitive:selected, treeview.view:insensitive:selected, row:insensitive:selected, 
.sidebar :insensitive:selected, placessidebar row:selected:insensitive label {
-    color: #a5c8ec; }
+    color: #a4c7ec; }
   textview text selection:backdrop,
   .view selection:backdrop, label selection:backdrop, .grid-child:backdrop:selected, entry 
selection:backdrop, spinbutton selection:backdrop, modelbutton.flat:backdrop:selected,
   .menuitem.button.flat:backdrop:selected, treeview.view:backdrop:selected, row:backdrop:selected, .sidebar 
:backdrop:selected {
@@ -4724,9 +4640,9 @@ popover.touch-selection {
       icon-shadow: none;
       outline-color: rgba(238, 238, 236, 0.3); }
     popover.touch-selection button:insensitive, popover.touch-selection button:backdrop:insensitive {
-      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;
@@ -4861,13 +4777,13 @@ base background color of insensitive widgets */
 @define-color insensitive_bg_color #f4f4f4;
 /*
 text foreground color of insensitive widgets */
- define-color insensitive_fg_color #8e9192;
+ define-color insensitive_fg_color #8d9091;
 /*
 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 #8e9192;
+ define-color theme_unfocused_fg_color #8d9091;
 /*
 text color for entries, views and content in general on backdrop windows */
 @define-color theme_unfocused_text_color black;
@@ -4888,7 +4804,7 @@ widgets main borders color */
 @define-color borders #a1a1a1;
 /*
 widgets main borders color on backdrop windows */
- define-color unfocused_borders darkgray;
+ define-color unfocused_borders #a8a8a8;
 /*
 these are pretty self explicative */
 @define-color warning_color #f57900;
@@ -4898,7 +4814,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 #8e9192;
+ define-color wm_unfocused_title #8d9091;
 @define-color wm_highlight white;
 @define-color wm_borders_edge white;
 @define-color wm_bg_a shade(#ededed, 1.2);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]