[gtk+/wip/csoriano/pathbar-prototype: 174/176] prototype don't look pls :)



commit 90075aa607cb3e26191635ce0c7f4ed1eb02482d
Author: Carlos Soriano <csoriano gnome org>
Date:   Thu Oct 22 20:15:34 2015 +0200

    prototype don't look pls :)

 gtk/gtk.h                                |    2 +
 gtk/gtkfilechooserwidget.c               |   12 +-
 gtk/gtkpathbar.c                         | 2031 +++---------------------------
 gtk/gtkpathbar.h                         |   87 +-
 gtk/theme/Adwaita/_common.scss           |   29 +-
 gtk/theme/Adwaita/gtk-contained-dark.css |  792 +++++++------
 gtk/theme/Adwaita/gtk-contained.css      |  712 ++++++-----
 gtk/ui/gtkpathbar.ui                     |   64 +-
 tests/Makefile.am                        |    5 +
 9 files changed, 1113 insertions(+), 2621 deletions(-)
---
diff --git a/gtk/gtk.h b/gtk/gtk.h
index ae556d4..9829e9a 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -150,6 +150,8 @@
 #include <gtk/gtkoverlay.h>
 #include <gtk/gtkpagesetup.h>
 #include <gtk/gtkpapersize.h>
+#include <gtk/gtkpathbar.h>
+#include <gtk/gtkpapersize.h>
 #include <gtk/gtkpaned.h>
 #include <gtk/gtkplacessidebar.h>
 #include <gtk/gtkpopover.h>
diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index 387f618..76ae085 100644
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -3017,7 +3017,7 @@ put_recent_folder_in_pathbar (GtkFileChooserWidget *impl, GtkTreeIter *iter)
   gtk_tree_model_get (GTK_TREE_MODEL (priv->recent_model), iter,
                       MODEL_COL_FILE, &file,
                       -1);
-  _gtk_path_bar_set_file (GTK_PATH_BAR (priv->browse_path_bar), file, FALSE);
+  //_gtk_path_bar_set_file (GTK_PATH_BAR (priv->browse_path_bar), file, FALSE);
   g_object_unref (file);
 }
 
@@ -5465,7 +5465,7 @@ update_current_folder_get_info_cb (GCancellable *cancellable,
   if (! _gtk_file_info_consider_as_directory (info))
     goto out;
 
-  _gtk_path_bar_set_file (GTK_PATH_BAR (priv->browse_path_bar), data->file, data->keep_trail);
+  //_gtk_path_bar_set_file (GTK_PATH_BAR (priv->browse_path_bar), data->file, data->keep_trail);
 
   if (priv->current_folder != data->file)
     {
@@ -7929,7 +7929,7 @@ up_folder_handler (GtkFileChooserWidget *impl)
 {
   GtkFileChooserWidgetPrivate *priv = impl->priv;
 
-  _gtk_path_bar_up (GTK_PATH_BAR (priv->browse_path_bar));
+  //_gtk_path_bar_up (GTK_PATH_BAR (priv->browse_path_bar));
 }
 
 /* Handler for the "down-folder" keybinding signal */
@@ -7938,7 +7938,7 @@ down_folder_handler (GtkFileChooserWidget *impl)
 {
   GtkFileChooserWidgetPrivate *priv = impl->priv;
 
-  _gtk_path_bar_down (GTK_PATH_BAR (priv->browse_path_bar));
+  //_gtk_path_bar_down (GTK_PATH_BAR (priv->browse_path_bar));
 }
 
 /* Handler for the "home-folder" keybinding signal */
@@ -8532,9 +8532,9 @@ post_process_ui (GtkFileChooserWidget *impl)
   g_list_free (cells);
 
   /* Set the GtkPathBar file system backend */
-  _gtk_path_bar_set_file_system (GTK_PATH_BAR (impl->priv->browse_path_bar), impl->priv->file_system);
+  //_gtk_path_bar_set_file_system (GTK_PATH_BAR (impl->priv->browse_path_bar), impl->priv->file_system);
   file = g_file_new_for_path ("/");
-  _gtk_path_bar_set_file (GTK_PATH_BAR (impl->priv->browse_path_bar), file, FALSE);
+  //_gtk_path_bar_set_file (GTK_PATH_BAR (impl->priv->browse_path_bar), file, FALSE);
   g_object_unref (file);
 
   /* Set the fixed size icon renderer, this requires
diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c
index 33d64f6..e5de066 100644
--- a/gtk/gtkpathbar.c
+++ b/gtk/gtkpathbar.c
@@ -1,1933 +1,276 @@
-/* -*- Mode: C; c-file-style: "gnu"; tab-width: 8 -*- */
 /* gtkpathbar.c
- * Copyright (C) 2004  Red Hat, Inc.,  Jonathan Blandford <jrb gnome org>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * Copyright (C) 2015 Red Hat
  *
- * This library is distributed in the hope that it will be useful,
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ * Authors: Carlos Soriano <csoriano gnome org>
  */
 
 #include "config.h"
 
 #include "gtkpathbar.h"
+#include "gtkbutton.h"
+#include "gtktogglebutton.h"
+#include "gtklabel.h"
+#include "gtkbuilder.h"
+#include "gtkstylecontext.h"
 
-#include <string.h>
-
-#include "gtkbox.h"
-#include "gtkdnd.h"
-#include "gtkicontheme.h"
-#include "gtkimage.h"
 #include "gtkintl.h"
-#include "gtklabel.h"
-#include "gtkmain.h"
 #include "gtkmarshalers.h"
-#include "gtksettings.h"
-#include "gtktogglebutton.h"
-#include "gtkwidgetpath.h"
-#include "gtkwidgetprivate.h"
+#include "gtktypebuiltins.h"
 
 struct _GtkPathBarPrivate
 {
-  GtkFileSystem *file_system;
-  GFile *root_file;
-  GFile *home_file;
-  GFile *desktop_file;
-
-  GCancellable *get_info_cancellable;
-
-  GIcon *root_icon;
-  GIcon *home_icon;
-  GIcon *desktop_icon;
+  GtkWidget *path_box;
+  GtkWidget *overflow_button;
 
-  GdkWindow *event_window;
-
-  GList *button_list;
-  GList *first_scrolled_button;
-  GList *fake_root;
-  GtkWidget *up_slider_button;
-  GtkWidget *down_slider_button;
-  guint settings_signal_id;
-  gint16 slider_width;
-  gint16 button_offset;
-  guint timer;
-  guint slider_visible : 1;
-  guint need_timer     : 1;
-  guint ignore_click   : 1;
-  guint scrolling_up   : 1;
-  guint scrolling_down : 1;
+  gchar *path;
 };
 
+G_DEFINE_TYPE_WITH_PRIVATE (GtkPathBar, gtk_path_bar, GTK_TYPE_BOX)
+
 enum {
-  PATH_CLICKED,
+  POPULATE_POPUP,
   LAST_SIGNAL
 };
 
-typedef enum {
-  NORMAL_BUTTON,
-  ROOT_BUTTON,
-  HOME_BUTTON,
-  DESKTOP_BUTTON
-} ButtonType;
-
-#define BUTTON_DATA(x) ((ButtonData *)(x))
-
-#define SCROLL_DELAY_FACTOR 5
-#define TIMEOUT_INITIAL     500
-#define TIMEOUT_REPEAT      50
-
-static guint path_bar_signals [LAST_SIGNAL] = { 0 };
-
-/* Icon size for if we can't get it from the theme */
-#define FALLBACK_ICON_SIZE 16
-
-typedef struct _ButtonData ButtonData;
-
-struct _ButtonData
-{
-  GtkWidget *button;
-  ButtonType type;
-  char *dir_name;
-  GFile *file;
-  GtkWidget *image;
-  GtkWidget *label;
-  GCancellable *cancellable;
-  guint ignore_changes : 1;
-  guint file_is_hidden : 1;
+enum {
+  PROP_0,
+  PROP_PATH,
+  LAST_PROP
 };
-/* This macro is used to check if a button can be used as a fake root.
- * All buttons in front of a fake root are automatically hidden when in a
- * directory below a fake root and replaced with the "<" arrow button.
- */
-#define BUTTON_IS_FAKE_ROOT(button) ((button)->type == HOME_BUTTON)
-
-G_DEFINE_TYPE_WITH_PRIVATE (GtkPathBar, gtk_path_bar, GTK_TYPE_CONTAINER)
-
-static void gtk_path_bar_finalize                 (GObject          *object);
-static void gtk_path_bar_dispose                  (GObject          *object);
-static void gtk_path_bar_realize                  (GtkWidget        *widget);
-static void gtk_path_bar_unrealize                (GtkWidget        *widget);
-static void gtk_path_bar_get_preferred_width      (GtkWidget        *widget,
-                                                   gint             *minimum,
-                                                   gint             *natural);
-static void gtk_path_bar_get_preferred_height     (GtkWidget        *widget,
-                                                   gint             *minimum,
-                                                   gint             *natural);
-static void gtk_path_bar_map                      (GtkWidget        *widget);
-static void gtk_path_bar_unmap                    (GtkWidget        *widget);
-static void gtk_path_bar_size_allocate            (GtkWidget        *widget,
-                                                  GtkAllocation    *allocation);
-static void gtk_path_bar_add                      (GtkContainer     *container,
-                                                  GtkWidget        *widget);
-static void gtk_path_bar_remove                   (GtkContainer     *container,
-                                                  GtkWidget        *widget);
-static void gtk_path_bar_forall                   (GtkContainer     *container,
-                                                  gboolean          include_internals,
-                                                  GtkCallback       callback,
-                                                  gpointer          callback_data);
-static GtkWidgetPath *gtk_path_bar_get_path_for_child (GtkContainer *container,
-                                                       GtkWidget    *child);
-static gboolean gtk_path_bar_scroll               (GtkWidget        *widget,
-                                                  GdkEventScroll   *event);
-static void gtk_path_bar_scroll_up                (GtkPathBar       *path_bar);
-static void gtk_path_bar_scroll_down              (GtkPathBar       *path_bar);
-static void gtk_path_bar_stop_scrolling           (GtkPathBar       *path_bar);
-static gboolean gtk_path_bar_slider_up_defocus    (GtkWidget        *widget,
-                                                  GdkEventButton   *event,
-                                                  GtkPathBar       *path_bar);
-static gboolean gtk_path_bar_slider_down_defocus  (GtkWidget        *widget,
-                                                  GdkEventButton   *event,
-                                                  GtkPathBar       *path_bar);
-static gboolean gtk_path_bar_slider_button_press  (GtkWidget        *widget,
-                                                  GdkEventButton   *event,
-                                                  GtkPathBar       *path_bar);
-static gboolean gtk_path_bar_slider_button_release(GtkWidget        *widget,
-                                                  GdkEventButton   *event,
-                                                  GtkPathBar       *path_bar);
-static void gtk_path_bar_grab_notify              (GtkWidget        *widget,
-                                                  gboolean          was_grabbed);
-static void gtk_path_bar_state_changed            (GtkWidget        *widget,
-                                                  GtkStateType      previous_state);
-static void gtk_path_bar_style_updated            (GtkWidget        *widget);
-static void gtk_path_bar_screen_changed           (GtkWidget        *widget,
-                                                  GdkScreen        *previous_screen);
-static void gtk_path_bar_check_icon_theme         (GtkPathBar       *path_bar);
-static void gtk_path_bar_update_button_appearance (GtkPathBar       *path_bar,
-                                                  ButtonData       *button_data,
-                                                  gboolean          current_dir);
-
-static void
-on_slider_unmap (GtkWidget  *widget,
-                GtkPathBar *path_bar)
-{
-  if (path_bar->priv->timer &&
-      ((widget == path_bar->priv->up_slider_button && path_bar->priv->scrolling_up) ||
-       (widget == path_bar->priv->down_slider_button && path_bar->priv->scrolling_down)))
-    gtk_path_bar_stop_scrolling (path_bar);
-}
-
-static void
-gtk_path_bar_init (GtkPathBar *path_bar)
-{
-  GtkStyleContext *context;
-
-  path_bar->priv = gtk_path_bar_get_instance_private (path_bar);
-
-  gtk_widget_init_template (GTK_WIDGET (path_bar));
-
-  /* Add the children manually because GtkPathBar derives from an abstract class,
-   * Glade cannot edit a <template> in gtkpathbar.ui if it's only a GtkContainer.
-   */
-  gtk_container_add (GTK_CONTAINER (path_bar), path_bar->priv->down_slider_button);
-  gtk_container_add (GTK_CONTAINER (path_bar), path_bar->priv->up_slider_button);
-
-  /* GtkBuilder wont let us connect 'swapped' without specifying the signal's
-   * user data in the .ui file
-   */
-  g_signal_connect_swapped (path_bar->priv->up_slider_button, "clicked",
-                           G_CALLBACK (gtk_path_bar_scroll_up), path_bar);
-  g_signal_connect_swapped (path_bar->priv->down_slider_button, "clicked",
-                           G_CALLBACK (gtk_path_bar_scroll_down), path_bar);
-
-  gtk_widget_set_has_window (GTK_WIDGET (path_bar), FALSE);
-  gtk_widget_set_redraw_on_allocate (GTK_WIDGET (path_bar), FALSE);
-
-  context = gtk_widget_get_style_context (GTK_WIDGET (path_bar));
-  gtk_style_context_add_class (context, "path-bar");
-  gtk_style_context_add_class (context, GTK_STYLE_CLASS_LINKED);
-
-  path_bar->priv->get_info_cancellable = NULL;
-}
-
-static void
-gtk_path_bar_class_init (GtkPathBarClass *path_bar_class)
-{
-  GObjectClass *gobject_class;
-  GtkWidgetClass *widget_class;
-  GtkContainerClass *container_class;
-
-  gobject_class = (GObjectClass *) path_bar_class;
-  widget_class = (GtkWidgetClass *) path_bar_class;
-  container_class = (GtkContainerClass *) path_bar_class;
-
-  gobject_class->finalize = gtk_path_bar_finalize;
-  gobject_class->dispose = gtk_path_bar_dispose;
-
-  widget_class->get_preferred_width = gtk_path_bar_get_preferred_width;
-  widget_class->get_preferred_height = gtk_path_bar_get_preferred_height;
-  widget_class->realize = gtk_path_bar_realize;
-  widget_class->unrealize = gtk_path_bar_unrealize;
-  widget_class->map = gtk_path_bar_map;
-  widget_class->unmap = gtk_path_bar_unmap;
-  widget_class->size_allocate = gtk_path_bar_size_allocate;
-  widget_class->style_updated = gtk_path_bar_style_updated;
-  widget_class->screen_changed = gtk_path_bar_screen_changed;
-  widget_class->grab_notify = gtk_path_bar_grab_notify;
-  widget_class->state_changed = gtk_path_bar_state_changed;
-  widget_class->scroll_event = gtk_path_bar_scroll;
-
-  container_class->add = gtk_path_bar_add;
-  container_class->forall = gtk_path_bar_forall;
-  container_class->remove = gtk_path_bar_remove;
-  container_class->get_path_for_child = gtk_path_bar_get_path_for_child;
-  gtk_container_class_handle_border_width (container_class);
-  /* FIXME: */
-  /*  container_class->child_type = gtk_path_bar_child_type;*/
-
-  path_bar_signals [PATH_CLICKED] =
-    g_signal_new (I_("path-clicked"),
-                 G_OBJECT_CLASS_TYPE (gobject_class),
-                 G_SIGNAL_RUN_FIRST,
-                 G_STRUCT_OFFSET (GtkPathBarClass, path_clicked),
-                 NULL, NULL,
-                 _gtk_marshal_VOID__POINTER_POINTER_BOOLEAN,
-                 G_TYPE_NONE, 3,
-                 G_TYPE_POINTER,
-                 G_TYPE_POINTER,
-                 G_TYPE_BOOLEAN);
-
-  /* Bind class to template
-   */
-  gtk_widget_class_set_template_from_resource (widget_class,
-                                              "/org/gtk/libgtk/ui/gtkpathbar.ui");
-
-  gtk_widget_class_bind_template_child_private (widget_class, GtkPathBar, up_slider_button);
-  gtk_widget_class_bind_template_child_private (widget_class, GtkPathBar, down_slider_button);
-
-  gtk_widget_class_bind_template_callback (widget_class, gtk_path_bar_slider_button_press);
-  gtk_widget_class_bind_template_callback (widget_class, gtk_path_bar_slider_button_release);
-  gtk_widget_class_bind_template_callback (widget_class, gtk_path_bar_slider_up_defocus);
-  gtk_widget_class_bind_template_callback (widget_class, gtk_path_bar_slider_down_defocus);
-  gtk_widget_class_bind_template_callback (widget_class, gtk_path_bar_scroll_up);
-  gtk_widget_class_bind_template_callback (widget_class, gtk_path_bar_scroll_down);
-  gtk_widget_class_bind_template_callback (widget_class, on_slider_unmap);
-}
-
-
-static void
-gtk_path_bar_finalize (GObject *object)
-{
-  GtkPathBar *path_bar;
-
-  path_bar = GTK_PATH_BAR (object);
-
-  gtk_path_bar_stop_scrolling (path_bar);
-
-  g_list_free (path_bar->priv->button_list);
-  g_clear_object (&path_bar->priv->root_file);
-  g_clear_object (&path_bar->priv->home_file);
-  g_clear_object (&path_bar->priv->desktop_file);
-
-  g_clear_object (&path_bar->priv->root_icon);
-  g_clear_object (&path_bar->priv->home_icon);
-  g_clear_object (&path_bar->priv->desktop_icon);
-
-  g_clear_object (&path_bar->priv->file_system);
-
-  G_OBJECT_CLASS (gtk_path_bar_parent_class)->finalize (object);
-}
-
-/* Removes the settings signal handler.  It's safe to call multiple times */
-static void
-remove_settings_signal (GtkPathBar *path_bar,
-                       GdkScreen  *screen)
-{
-  if (path_bar->priv->settings_signal_id)
-    {
-      GtkSettings *settings;
-
-      settings = gtk_settings_get_for_screen (screen);
-      g_signal_handler_disconnect (settings,
-                                  path_bar->priv->settings_signal_id);
-      path_bar->priv->settings_signal_id = 0;
-    }
-}
-
-static void
-gtk_path_bar_dispose (GObject *object)
-{
-  GtkPathBar *path_bar = GTK_PATH_BAR (object);
-
-  remove_settings_signal (path_bar, gtk_widget_get_screen (GTK_WIDGET (object)));
-
-  if (path_bar->priv->get_info_cancellable)
-    g_cancellable_cancel (path_bar->priv->get_info_cancellable);
-  path_bar->priv->get_info_cancellable = NULL;
-
-  G_OBJECT_CLASS (gtk_path_bar_parent_class)->dispose (object);
-}
-
-/* Size requisition:
- * 
- * Ideally, our size is determined by another widget, and we are just filling
- * available space.
- */
-static void
-gtk_path_bar_get_preferred_width (GtkWidget *widget,
-                                  gint      *minimum,
-                                  gint      *natural)
-{
-  ButtonData *button_data;
-  GtkPathBar *path_bar;
-  GList *list;
-  gint child_height;
-  gint height;
-  gint child_min, child_nat;
-
-  path_bar = GTK_PATH_BAR (widget);
-
-  *minimum = *natural = 0;
-  height = 0;
-
-  for (list = path_bar->priv->button_list; list; list = list->next)
-    {
-      button_data = BUTTON_DATA (list->data);
-      gtk_widget_get_preferred_width (button_data->button, &child_min, &child_nat);
-      gtk_widget_get_preferred_height (button_data->button, &child_height, NULL);
-      height = MAX (height, child_height);
-
-      if (button_data->type == NORMAL_BUTTON)
-        {
-          /* Use 2*Height as button width because of ellipsized label.  */
-          child_min = MAX (child_min, child_height * 2);
-          child_nat = MAX (child_min, child_height * 2);
-        }
-
-      *minimum = MAX (*minimum, child_min);
-      *natural = *natural + child_nat;
-    }
-
-  /* Add space for slider, if we have more than one path */
-  /* Theoretically, the slider could be bigger than the other button.  But we're
-   * not going to worry about that now.
-   */
-  path_bar->priv->slider_width = MIN (height * 2 / 3 + 5, height);
-  if (path_bar->priv->button_list && path_bar->priv->button_list->next != NULL)
-    {
-      *minimum += path_bar->priv->slider_width * 2;
-      *natural += path_bar->priv->slider_width * 2;
-    }
-}
-
-static void
-gtk_path_bar_get_preferred_height (GtkWidget *widget,
-                                   gint      *minimum,
-                                   gint      *natural)
-{
-  ButtonData *button_data;
-  GtkPathBar *path_bar;
-  GList *list;
-  gint child_min, child_nat;
-
-  path_bar = GTK_PATH_BAR (widget);
-
-  *minimum = *natural = 0;
-
-  for (list = path_bar->priv->button_list; list; list = list->next)
-    {
-      button_data = BUTTON_DATA (list->data);
-      gtk_widget_get_preferred_height (button_data->button, &child_min, &child_nat);
-
-      *minimum = MAX (*minimum, child_min);
-      *natural = MAX (*natural, child_nat);
-    }
-}
-
-static void
-gtk_path_bar_update_slider_buttons (GtkPathBar *path_bar)
-{
-  if (path_bar->priv->button_list)
-    {
-      GtkWidget *button;
-
-      button = BUTTON_DATA (path_bar->priv->button_list->data)->button;
-      if (gtk_widget_get_child_visible (button))
-       {
-         gtk_path_bar_stop_scrolling (path_bar);
-         gtk_widget_set_sensitive (path_bar->priv->down_slider_button, FALSE);
-       }
-      else
-       gtk_widget_set_sensitive (path_bar->priv->down_slider_button, TRUE);
-
-      button = BUTTON_DATA (g_list_last (path_bar->priv->button_list)->data)->button;
-      if (gtk_widget_get_child_visible (button))
-       {
-         gtk_path_bar_stop_scrolling (path_bar);
-         gtk_widget_set_sensitive (path_bar->priv->up_slider_button, FALSE);
-       }
-      else
-       gtk_widget_set_sensitive (path_bar->priv->up_slider_button, TRUE);
-    }
-}
-
-static void
-gtk_path_bar_map (GtkWidget *widget)
-{
-  gdk_window_show (GTK_PATH_BAR (widget)->priv->event_window);
-
-  GTK_WIDGET_CLASS (gtk_path_bar_parent_class)->map (widget);
-}
-
-static void
-gtk_path_bar_unmap (GtkWidget *widget)
-{
-  gtk_path_bar_stop_scrolling (GTK_PATH_BAR (widget));
-  gdk_window_hide (GTK_PATH_BAR (widget)->priv->event_window);
-
-  GTK_WIDGET_CLASS (gtk_path_bar_parent_class)->unmap (widget);
-}
-
-static void
-gtk_path_bar_realize (GtkWidget *widget)
-{
-  GtkPathBar *path_bar;
-  GtkAllocation allocation;
-  GdkWindow *window;
-  GdkWindowAttr attributes;
-  gint attributes_mask;
-
-  gtk_widget_set_realized (widget, TRUE);
-
-  path_bar = GTK_PATH_BAR (widget);
-  window = gtk_widget_get_parent_window (widget);
-  gtk_widget_set_window (widget, window);
-  g_object_ref (window);
-
-  gtk_widget_get_allocation (widget, &allocation);
-
-  attributes.window_type = GDK_WINDOW_CHILD;
-  attributes.x = allocation.x;
-  attributes.y = allocation.y;
-  attributes.width = allocation.width;
-  attributes.height = allocation.height;
-  attributes.wclass = GDK_INPUT_ONLY;
-  attributes.event_mask = gtk_widget_get_events (widget);
-  attributes.event_mask |= GDK_SCROLL_MASK;
-  attributes_mask = GDK_WA_X | GDK_WA_Y;
-
-  path_bar->priv->event_window = gdk_window_new (gtk_widget_get_parent_window (widget),
-                                           &attributes, attributes_mask);
-  gtk_widget_register_window (widget, path_bar->priv->event_window);
-}
-
-static void
-gtk_path_bar_unrealize (GtkWidget *widget)
-{
-  GtkPathBar *path_bar;
-
-  path_bar = GTK_PATH_BAR (widget);
-
-  gtk_widget_unregister_window (widget, path_bar->priv->event_window);
-  gdk_window_destroy (path_bar->priv->event_window);
-  path_bar->priv->event_window = NULL;
-
-  GTK_WIDGET_CLASS (gtk_path_bar_parent_class)->unrealize (widget);
-}
-
-static void
-child_ordering_changed (GtkPathBar *path_bar)
-{
-  GList *l;
-
-  if (path_bar->priv->up_slider_button)
-    _gtk_widget_invalidate_style_context (path_bar->priv->up_slider_button,
-                                          GTK_CSS_CHANGE_POSITION | GTK_CSS_CHANGE_SIBLING_POSITION);
-  if (path_bar->priv->down_slider_button)
-    _gtk_widget_invalidate_style_context (path_bar->priv->down_slider_button,
-                                          GTK_CSS_CHANGE_POSITION | GTK_CSS_CHANGE_SIBLING_POSITION);
-
-  for (l = path_bar->priv->button_list; l; l = l->next)
-    {
-      ButtonData *data = l->data;
-
-      _gtk_widget_invalidate_style_context (data->button,
-                                            GTK_CSS_CHANGE_POSITION | GTK_CSS_CHANGE_SIBLING_POSITION);
-    }
-}
-
-/* This is a tad complicated
- */
-static void
-gtk_path_bar_size_allocate (GtkWidget     *widget,
-                           GtkAllocation *allocation)
-{
-  GtkWidget *child;
-  GtkPathBar *path_bar = GTK_PATH_BAR (widget);
-  GtkTextDirection direction;
-  GtkAllocation child_allocation;
-  GList *list, *first_button;
-  gint width;
-  gint allocation_width;
-  gboolean need_sliders = FALSE;
-  gint up_slider_offset = 0;
-  gint down_slider_offset = 0;
-  GtkRequisition child_requisition;
-  gboolean needs_reorder = FALSE;
-
-  gtk_widget_set_allocation (widget, allocation);
-
-  if (gtk_widget_get_realized (widget))
-    gdk_window_move_resize (path_bar->priv->event_window,
-                           allocation->x, allocation->y,
-                           allocation->width, allocation->height);
-
-  /* No path is set; we don't have to allocate anything. */
-  if (path_bar->priv->button_list == NULL)
-    {
-      _gtk_widget_set_simple_clip (widget, NULL);
-
-      return;
-    }
-
-  direction = gtk_widget_get_direction (widget);
-  allocation_width = allocation->width;
-
-  /* First, we check to see if we need the scrollbars. */
-  if (path_bar->priv->fake_root)
-    width = path_bar->priv->slider_width;
-  else
-    width = 0;
-
-  for (list = path_bar->priv->button_list; list; list = list->next)
-    {
-      child = BUTTON_DATA (list->data)->button;
-
-      gtk_widget_get_preferred_size (child, &child_requisition, NULL);
-
-      width += child_requisition.width;
-      if (list == path_bar->priv->fake_root)
-       break;
-    }
-
-  if (width <= allocation_width)
-    {
-      if (path_bar->priv->fake_root)
-       first_button = path_bar->priv->fake_root;
-      else
-       first_button = g_list_last (path_bar->priv->button_list);
-    }
-  else
-    {
-      gboolean reached_end = FALSE;
-      gint slider_space = 2 * path_bar->priv->slider_width;
-
-      if (path_bar->priv->first_scrolled_button)
-       first_button = path_bar->priv->first_scrolled_button;
-      else
-       first_button = path_bar->priv->button_list;
-      need_sliders = TRUE;
-      
-      /* To see how much space we have, and how many buttons we can display.
-       * We start at the first button, count forward until hit the new
-       * button, then count backwards.
-       */
-      /* Count down the path chain towards the end. */
-      gtk_widget_get_preferred_size (BUTTON_DATA (first_button->data)->button,
-                                     &child_requisition, NULL);
-
-      width = child_requisition.width;
-      list = first_button->prev;
-      while (list && !reached_end)
-       {
-         child = BUTTON_DATA (list->data)->button;
-
-          gtk_widget_get_preferred_size (child, &child_requisition, NULL);
-
-         if (width + child_requisition.width + slider_space > allocation_width)
-           reached_end = TRUE;
-         else if (list == path_bar->priv->fake_root)
-           break;
-         else
-           width += child_requisition.width;
-
-         list = list->prev;
-       }
-
-      /* Finally, we walk up, seeing how many of the previous buttons we can
-       * add */
-      while (first_button->next && !reached_end)
-       {
-         child = BUTTON_DATA (first_button->next->data)->button;
-
-          gtk_widget_get_preferred_size (child, &child_requisition, NULL);
-
-         if (width + child_requisition.width + slider_space > allocation_width)
-           {
-             reached_end = TRUE;
-           }
-         else
-           {
-             width += child_requisition.width;
-             if (first_button == path_bar->priv->fake_root)
-               break;
-             first_button = first_button->next;
-           }
-       }
-    }
-
-  /* Now, we allocate space to the buttons */
-  child_allocation.y = allocation->y;
-  child_allocation.height = allocation->height;
-
-  if (direction == GTK_TEXT_DIR_RTL)
-    {
-      child_allocation.x = allocation->x + allocation->width;
-      if (need_sliders || path_bar->priv->fake_root)
-       {
-         child_allocation.x -= path_bar->priv->slider_width;
-         up_slider_offset = allocation->width - path_bar->priv->slider_width;
-       }
-    }
-  else
-    {
-      child_allocation.x = allocation->x;
-      if (need_sliders || path_bar->priv->fake_root)
-       {
-         up_slider_offset = 0;
-         child_allocation.x += path_bar->priv->slider_width;
-       }
-    }
-
-  for (list = first_button; list; list = list->prev)
-    {
-      GtkAllocation widget_allocation;
-      ButtonData *button_data;
-
-      button_data = BUTTON_DATA (list->data);
-      child = button_data->button;
-
-      gtk_widget_get_preferred_size (child, &child_requisition, NULL);
-
-      child_allocation.width = MIN (child_requisition.width,
-                                   allocation_width - 2 * path_bar->priv->slider_width);
-
-      if (direction == GTK_TEXT_DIR_RTL)
-       child_allocation.x -= child_allocation.width;
-
-      /* Check to see if we've don't have any more space to allocate buttons */
-      if (need_sliders && direction == GTK_TEXT_DIR_RTL)
-       {
-          gtk_widget_get_allocation (widget, &widget_allocation);
-         if (child_allocation.x - path_bar->priv->slider_width < widget_allocation.x)
-           break;
-       }
-      else if (need_sliders && direction == GTK_TEXT_DIR_LTR)
-       {
-          gtk_widget_get_allocation (widget, &widget_allocation);
-         if (child_allocation.x + child_allocation.width + path_bar->priv->slider_width >
-             widget_allocation.x + allocation_width)
-           break;
-       }
-
-      if (child_allocation.width < child_requisition.width)
-       {
-         if (!gtk_widget_get_has_tooltip (child))
-           gtk_widget_set_tooltip_text (child, button_data->dir_name);
-       }
-      else if (gtk_widget_get_has_tooltip (child))
-       gtk_widget_set_tooltip_text (child, NULL);
-      
-      needs_reorder |= gtk_widget_get_child_visible (child) == FALSE;
-      gtk_widget_set_child_visible (child, TRUE);
-      gtk_widget_size_allocate (child, &child_allocation);
-
-      if (direction == GTK_TEXT_DIR_RTL)
-        {
-          down_slider_offset = child_allocation.x - allocation->x - path_bar->priv->slider_width;
-        }
-      else
-        {
-          down_slider_offset += child_allocation.width;
-          child_allocation.x += child_allocation.width;
-        }
-    }
-  /* Now we go hide all the widgets that don't fit */
-  while (list)
-    {
-      child = BUTTON_DATA (list->data)->button;
-      needs_reorder |= gtk_widget_get_child_visible (child) == TRUE;
-      gtk_widget_set_child_visible (child, FALSE);
-      list = list->prev;
-    }
-  for (list = first_button->next; list; list = list->next)
-    {
-      child = BUTTON_DATA (list->data)->button;
-      needs_reorder |= gtk_widget_get_child_visible (child) == TRUE;
-      gtk_widget_set_child_visible (child, FALSE);
-    }
-
-  if (need_sliders || path_bar->priv->fake_root)
-    {
-      child_allocation.width = path_bar->priv->slider_width;
-      child_allocation.x = up_slider_offset + allocation->x;
-      gtk_widget_size_allocate (path_bar->priv->up_slider_button, &child_allocation);
-
-      needs_reorder |= gtk_widget_get_child_visible (path_bar->priv->up_slider_button) == FALSE;
-      gtk_widget_set_child_visible (path_bar->priv->up_slider_button, TRUE);
-      gtk_widget_show_all (path_bar->priv->up_slider_button);
-
-      if (direction == GTK_TEXT_DIR_LTR)
-        down_slider_offset += path_bar->priv->slider_width;
-    }
-  else
-    {
-      needs_reorder |= gtk_widget_get_child_visible (path_bar->priv->up_slider_button) == TRUE;
-      gtk_widget_set_child_visible (path_bar->priv->up_slider_button, FALSE);
-    }
-      
-  if (need_sliders)
-    {
-      child_allocation.width = path_bar->priv->slider_width;
-      child_allocation.x = down_slider_offset + allocation->x;
-      
-      gtk_widget_size_allocate (path_bar->priv->down_slider_button, &child_allocation);
-
-      needs_reorder |= gtk_widget_get_child_visible (path_bar->priv->down_slider_button) == FALSE;
-      gtk_widget_set_child_visible (path_bar->priv->down_slider_button, TRUE);
-      gtk_widget_show_all (path_bar->priv->down_slider_button);
-      gtk_path_bar_update_slider_buttons (path_bar);
-    }
-  else
-    {
-      needs_reorder |= gtk_widget_get_child_visible (path_bar->priv->down_slider_button) == TRUE;
-      gtk_widget_set_child_visible (path_bar->priv->down_slider_button, FALSE);
-    }
-
-  if (needs_reorder)
-    child_ordering_changed (path_bar);
-
-  _gtk_widget_set_simple_clip (widget, NULL);
-}
-
-static void
-gtk_path_bar_style_updated (GtkWidget *widget)
-{
-  GTK_WIDGET_CLASS (gtk_path_bar_parent_class)->style_updated (widget);
-
-  gtk_path_bar_check_icon_theme (GTK_PATH_BAR (widget));
-}
-
-static void
-gtk_path_bar_screen_changed (GtkWidget *widget,
-                            GdkScreen *previous_screen)
-{
-  if (GTK_WIDGET_CLASS (gtk_path_bar_parent_class)->screen_changed)
-    GTK_WIDGET_CLASS (gtk_path_bar_parent_class)->screen_changed (widget, previous_screen);
-
-  /* We might nave a new settings, so we remove the old one */
-  if (previous_screen)
-    remove_settings_signal (GTK_PATH_BAR (widget), previous_screen);
-
-  gtk_path_bar_check_icon_theme (GTK_PATH_BAR (widget));
-}
-
-static gboolean
-gtk_path_bar_scroll (GtkWidget      *widget,
-                    GdkEventScroll *event)
-{
-  switch (event->direction)
-    {
-    case GDK_SCROLL_RIGHT:
-    case GDK_SCROLL_DOWN:
-      gtk_path_bar_scroll_down (GTK_PATH_BAR (widget));
-      break;
-    case GDK_SCROLL_LEFT:
-    case GDK_SCROLL_UP:
-      gtk_path_bar_scroll_up (GTK_PATH_BAR (widget));
-      break;
-    case GDK_SCROLL_SMOOTH:
-      break;
-    }
-
-  return TRUE;
-}
-
-static void
-gtk_path_bar_add (GtkContainer *container,
-                 GtkWidget    *widget)
-
-{
-  gtk_widget_set_parent (widget, GTK_WIDGET (container));
-}
-
-static void
-gtk_path_bar_remove_1 (GtkContainer *container,
-                      GtkWidget    *widget)
-{
-  gboolean was_visible = gtk_widget_get_visible (widget);
-  gtk_widget_unparent (widget);
-  if (was_visible)
-    gtk_widget_queue_resize (GTK_WIDGET (container));
-}
-
-static void
-gtk_path_bar_remove (GtkContainer *container,
-                    GtkWidget    *widget)
-{
-  GtkPathBar *path_bar;
-  GList *children;
-
-  path_bar = GTK_PATH_BAR (container);
-
-  if (widget == path_bar->priv->up_slider_button)
-    {
-      gtk_path_bar_remove_1 (container, widget);
-      path_bar->priv->up_slider_button = NULL;
-      return;
-    }
-
-  if (widget == path_bar->priv->down_slider_button)
-    {
-      gtk_path_bar_remove_1 (container, widget);
-      path_bar->priv->down_slider_button = NULL;
-      return;
-    }
-
-  children = path_bar->priv->button_list;
-  while (children)
-    {
-      if (widget == BUTTON_DATA (children->data)->button)
-       {
-         gtk_path_bar_remove_1 (container, widget);
-         path_bar->priv->button_list = g_list_remove_link (path_bar->priv->button_list, children);
-         g_list_free (children);
-         return;
-       }
-      
-      children = children->next;
-    }
-}
-
-static void
-gtk_path_bar_forall (GtkContainer *container,
-                    gboolean      include_internals,
-                    GtkCallback   callback,
-                    gpointer      callback_data)
-{
-  GtkPathBar *path_bar;
-  GList *children;
-
-  g_return_if_fail (callback != NULL);
-  path_bar = GTK_PATH_BAR (container);
-
-  children = path_bar->priv->button_list;
-  while (children)
-    {
-      GtkWidget *child;
-      child = BUTTON_DATA (children->data)->button;
-      children = children->next;
-
-      (* callback) (child, callback_data);
-    }
-
-  if (path_bar->priv->up_slider_button)
-    (* callback) (path_bar->priv->up_slider_button, callback_data);
-
-  if (path_bar->priv->down_slider_button)
-    (* callback) (path_bar->priv->down_slider_button, callback_data);
-}
-
-static GtkWidgetPath *
-gtk_path_bar_get_path_for_child (GtkContainer *container,
-                                 GtkWidget    *child)
-{
-  GtkPathBar *path_bar = GTK_PATH_BAR (container);
-  GtkWidgetPath *path;
-
-  path = _gtk_widget_create_path (GTK_WIDGET (path_bar));
-
-  if (gtk_widget_get_visible (child) &&
-      gtk_widget_get_child_visible (child))
-    {
-      GtkWidgetPath *sibling_path;
-      GList *visible_children;
-      GList *l;
-      int pos;
-
-      /* 1. Build the list of visible children, in visually left-to-right order
-       * (i.e. independently of the widget's direction).  Note that our
-       * button_list is stored in innermost-to-outermost path order!
-       */
-
-      visible_children = NULL;
-
-      if (gtk_widget_get_visible (path_bar->priv->down_slider_button) &&
-          gtk_widget_get_child_visible (path_bar->priv->down_slider_button))
-        visible_children = g_list_prepend (visible_children, path_bar->priv->down_slider_button);
-
-      for (l = path_bar->priv->button_list; l; l = l->next)
-        {
-          ButtonData *data = l->data;
-
-          if (gtk_widget_get_visible (data->button) &&
-              gtk_widget_get_child_visible (data->button))
-            visible_children = g_list_prepend (visible_children, data->button);
-        }
-
-      if (gtk_widget_get_visible (path_bar->priv->up_slider_button) &&
-          gtk_widget_get_child_visible (path_bar->priv->up_slider_button))
-        visible_children = g_list_prepend (visible_children, path_bar->priv->up_slider_button);
-
-      if (gtk_widget_get_direction (GTK_WIDGET (path_bar)) == GTK_TEXT_DIR_RTL)
-        visible_children = g_list_reverse (visible_children);
-
-      /* 2. Find the index of the child within that list */
-
-      pos = 0;
-
-      for (l = visible_children; l; l = l->next)
-        {
-          GtkWidget *button = l->data;
-
-          if (button == child)
-            break;
 
-          pos++;
-        }
-
-      /* 3. Build the path */
-
-      sibling_path = gtk_widget_path_new ();
-
-      for (l = visible_children; l; l = l->next)
-        gtk_widget_path_append_for_widget (sibling_path, l->data);
-
-      gtk_widget_path_append_with_siblings (path, sibling_path, pos);
-
-      g_list_free (visible_children);
-      gtk_widget_path_unref (sibling_path);
-    }
-  else
-    gtk_widget_path_append_for_widget (path, child);
-
-  return path;
-}
-
-static void
-gtk_path_bar_scroll_down (GtkPathBar *path_bar)
-{
-  GtkAllocation allocation, button_allocation;
-  GList *list;
-  GList *down_button = NULL;
-  gint space_available;
-
-  if (path_bar->priv->ignore_click)
-    {
-      path_bar->priv->ignore_click = FALSE;
-      return;   
-    }
-
-  if (gtk_widget_get_child_visible (BUTTON_DATA (path_bar->priv->button_list->data)->button))
-    {
-      /* Return if the last button is already visible */
-      return;
-    }
-
-  gtk_widget_queue_resize (GTK_WIDGET (path_bar));
-
-  /* We find the button at the 'down' end that we have to make
-   * visible */
-  for (list = path_bar->priv->button_list; list; list = list->next)
-    {
-      if (list->next && gtk_widget_get_child_visible (BUTTON_DATA (list->next->data)->button))
-       {
-         down_button = list;
-         break;
-       }
-    }
-
-  gtk_widget_get_allocation (GTK_WIDGET (path_bar), &allocation);
-  gtk_widget_get_allocation (BUTTON_DATA (down_button->data)->button, &button_allocation);
-
-  space_available = (allocation.width
-                    - 2 * path_bar->priv->slider_width
-                     - button_allocation.width);
-  path_bar->priv->first_scrolled_button = down_button;
-  
-  /* We have space_available free space that's not being used.  
-   * So we walk down from the end, adding buttons until we use all free space.
-   */
-  while (space_available > 0)
-    {
-      path_bar->priv->first_scrolled_button = down_button;
-      down_button = down_button->next;
-      if (!down_button)
-       break;
-      space_available -= button_allocation.width;
-    }
-}
+static GParamSpec *path_bar_properties[LAST_PROP] = { NULL, };
+static guint path_bar_signals[LAST_SIGNAL] = { 0 };
 
 static void
-gtk_path_bar_scroll_up (GtkPathBar *path_bar)
-{
-  GList *list;
-
-  if (path_bar->priv->ignore_click)
-    {
-      path_bar->priv->ignore_click = FALSE;
-      return;   
-    }
-
-  list = g_list_last (path_bar->priv->button_list);
-
-  if (gtk_widget_get_child_visible (BUTTON_DATA (list->data)->button))
-    {
-      /* Return if the first button is already visible */
-      return;
-    }
-
-  gtk_widget_queue_resize (GTK_WIDGET (path_bar));
-
-  for ( ; list; list = list->prev)
-    {
-      if (list->prev && gtk_widget_get_child_visible (BUTTON_DATA (list->prev->data)->button))
-       {
-         if (list->prev == path_bar->priv->fake_root)
-           path_bar->priv->fake_root = NULL;
-         path_bar->priv->first_scrolled_button = list;
-         return;
-       }
-    }
-}
-
-static gboolean
-gtk_path_bar_scroll_timeout (GtkPathBar *path_bar)
-{
-  gboolean retval = FALSE;
-
-  if (path_bar->priv->timer)
-    {
-      if (path_bar->priv->scrolling_up)
-       gtk_path_bar_scroll_up (path_bar);
-      else if (path_bar->priv->scrolling_down)
-       gtk_path_bar_scroll_down (path_bar);
-
-      if (path_bar->priv->need_timer) 
-       {
-         path_bar->priv->need_timer = FALSE;
-
-         path_bar->priv->timer = gdk_threads_add_timeout (TIMEOUT_REPEAT * SCROLL_DELAY_FACTOR,
-                                          (GSourceFunc)gtk_path_bar_scroll_timeout,
-                                          path_bar);
-          g_source_set_name_by_id (path_bar->priv->timer, "[gtk+] gtk_path_bar_scroll_timeout");
-       }
-      else
-       retval = TRUE;
-    }
-
-  return retval;
-}
-
-static void 
-gtk_path_bar_stop_scrolling (GtkPathBar *path_bar)
-{
-  if (path_bar->priv->timer)
-    {
-      g_source_remove (path_bar->priv->timer);
-      path_bar->priv->timer = 0;
-      path_bar->priv->need_timer = FALSE;
-    }
-}
-
-static gboolean
-gtk_path_bar_slider_up_defocus (GtkWidget      *widget,
-                                    GdkEventButton *event,
-                                    GtkPathBar     *path_bar)
-{
-  GList *list;
-  GList *up_button = NULL;
-
-  if (event->type != GDK_FOCUS_CHANGE)
-    return FALSE;
-
-  for (list = g_list_last (path_bar->priv->button_list); list; list = list->prev)
-    {
-      if (gtk_widget_get_child_visible (BUTTON_DATA (list->data)->button))
-        {
-          up_button = list;
-          break;
-        }
-    }
-
-  /* don't let the focus vanish */
-  if ((!gtk_widget_is_sensitive (path_bar->priv->up_slider_button)) ||
-      (!gtk_widget_get_child_visible (path_bar->priv->up_slider_button)))
-    gtk_widget_grab_focus (BUTTON_DATA (up_button->data)->button);
-
-  return FALSE;
-}
-
-static gboolean
-gtk_path_bar_slider_down_defocus (GtkWidget      *widget,
-                                    GdkEventButton *event,
-                                    GtkPathBar     *path_bar)
-{
-  GList *list;
-  GList *down_button = NULL;
-
-  if (event->type != GDK_FOCUS_CHANGE)
-    return FALSE;
-
-  for (list = path_bar->priv->button_list; list; list = list->next)
-    {
-      if (gtk_widget_get_child_visible (BUTTON_DATA (list->data)->button))
-        {
-          down_button = list;
-          break;
-        }
-    }
-
-  /* don't let the focus vanish */
-  if ((!gtk_widget_is_sensitive (path_bar->priv->down_slider_button)) ||
-      (!gtk_widget_get_child_visible (path_bar->priv->down_slider_button)))
-    gtk_widget_grab_focus (BUTTON_DATA (down_button->data)->button);
-
-  return FALSE;
-}
-
-static gboolean
-gtk_path_bar_slider_button_press (GtkWidget      *widget, 
-                                 GdkEventButton *event,
-                                 GtkPathBar     *path_bar)
+on_path_chunk_button_clicked (GtkPathBar *self,
+                              GtkButton  *path_chunk_button)
 {
-  if (event->type != GDK_BUTTON_PRESS || event->button != GDK_BUTTON_PRIMARY)
-    return FALSE;
-
-  path_bar->priv->ignore_click = FALSE;
-
-  if (widget == path_bar->priv->up_slider_button)
-    {
-      path_bar->priv->scrolling_down = FALSE;
-      path_bar->priv->scrolling_up = TRUE;
-      gtk_path_bar_scroll_up (path_bar);
-    }
-  else if (widget == path_bar->priv->down_slider_button)
-    {
-      path_bar->priv->scrolling_up = FALSE;
-      path_bar->priv->scrolling_down = TRUE;
-      gtk_path_bar_scroll_down (path_bar);
-    }
-
-  if (!path_bar->priv->timer)
-    {
-      path_bar->priv->need_timer = TRUE;
-      path_bar->priv->timer = gdk_threads_add_timeout (TIMEOUT_INITIAL,
-                                      (GSourceFunc)gtk_path_bar_scroll_timeout,
-                                      path_bar);
-      g_source_set_name_by_id (path_bar->priv->timer, "[gtk+] gtk_path_bar_scroll_timeout");
-    }
-
-  return FALSE;
+  g_print ("cliked %s\n", gtk_button_get_label (GTK_BUTTON (path_chunk_button)));
 }
 
-static gboolean
-gtk_path_bar_slider_button_release (GtkWidget      *widget, 
-                                   GdkEventButton *event,
-                                   GtkPathBar     *path_bar)
+GtkWidget *
+create_separator ()
 {
-  if (event->type != GDK_BUTTON_RELEASE)
-    return FALSE;
-
-  path_bar->priv->ignore_click = TRUE;
-  gtk_path_bar_stop_scrolling (path_bar);
-
-  return FALSE;
-}
+  GtkWidget *label;
 
-static void
-gtk_path_bar_grab_notify (GtkWidget *widget,
-                         gboolean   was_grabbed)
-{
-  if (!was_grabbed)
-    gtk_path_bar_stop_scrolling (GTK_PATH_BAR (widget));
-}
+  label = gtk_label_new ("/");
+  gtk_widget_set_sensitive (label, FALSE);
 
-static void
-gtk_path_bar_state_changed (GtkWidget    *widget,
-                           GtkStateType  previous_state)
-{
-  if (!gtk_widget_is_sensitive (widget))
-    gtk_path_bar_stop_scrolling (GTK_PATH_BAR (widget));
+  return label;
 }
 
-
-/* Changes the icons wherever it is needed */
-static void
-reload_icons (GtkPathBar *path_bar)
+GtkWidget *
+create_path_chunk (GtkPathBar  *self,
+                   const gchar *label)
 {
-  GList *list;
-
-  g_clear_object (&path_bar->priv->root_icon);
-  g_clear_object (&path_bar->priv->home_icon);
-  g_clear_object (&path_bar->priv->desktop_icon);
-
-  for (list = path_bar->priv->button_list; list; list = list->next)
-    {
-      ButtonData *button_data;
-      gboolean current_dir;
+  GtkWidget *button;
+  GtkStyleContext *style;
 
-      button_data = BUTTON_DATA (list->data);
-      if (button_data->type != NORMAL_BUTTON)
-       {
-         current_dir = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button_data->button));
-         gtk_path_bar_update_button_appearance (path_bar, button_data, current_dir);
-       }
-    }
-}
+  button = gtk_toggle_button_new_with_label (label);
+  g_signal_connect_swapped (button, "clicked",
+                            G_CALLBACK (on_path_chunk_button_clicked), self);
+  style = gtk_widget_get_style_context (button);
+  gtk_style_context_add_class (style, "image-button");
+  gtk_style_context_add_class (style, "flat");
+  gtk_style_context_add_class (style, "button-simplic");
 
-static void
-change_icon_theme (GtkPathBar *path_bar)
-{
-  reload_icons (path_bar);
+  return button;
 }
 
-/* Callback used when a GtkSettings value changes */
-static void
-settings_notify_cb (GObject    *object,
-                   GParamSpec *pspec,
-                   GtkPathBar *path_bar)
+void
+gtk_path_bar_set_path (GtkPathBar  *self,
+                       const gchar *path)
 {
-  const char *name;
+  gchar ** splitted_path;
 
-  name = g_param_spec_get_name (pspec);
+  g_return_if_fail (GTK_IS_PATH_BAR (self));
 
-  if (strcmp (name, "gtk-icon-theme-name") == 0)
-    change_icon_theme (path_bar);
-}
+  gtk_container_foreach (GTK_CONTAINER (self), (GtkCallback) gtk_widget_destroy, NULL);
 
-static void
-gtk_path_bar_check_icon_theme (GtkPathBar *path_bar)
-{
-  if (path_bar->priv->settings_signal_id == 0)
+  splitted_path = g_strsplit (path, "/", -1);
+  for (guint i = 0; i < g_strv_length (splitted_path); i++)
     {
-      GtkSettings *settings;
-
-      settings = gtk_settings_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (path_bar)));
-      path_bar->priv->settings_signal_id = g_signal_connect (settings, "notify",
-                                                             G_CALLBACK (settings_notify_cb), path_bar);
+      if (g_strcmp0 (splitted_path[i], "") == 0)
+        continue;
+      gtk_container_add (GTK_CONTAINER (self), create_path_chunk (self, splitted_path[i]));
+      gtk_container_add (GTK_CONTAINER (self), create_separator ());
     }
 
-  change_icon_theme (path_bar);
-}
+  g_object_notify_by_pspec (G_OBJECT (self), path_bar_properties[PROP_PATH]);
 
-/* Public functions and their helpers */
-static void
-gtk_path_bar_clear_buttons (GtkPathBar *path_bar)
-{
-  while (path_bar->priv->button_list != NULL)
-    {
-      gtk_container_remove (GTK_CONTAINER (path_bar), BUTTON_DATA 
(path_bar->priv->button_list->data)->button);
-    }
-  path_bar->priv->first_scrolled_button = NULL;
-  path_bar->priv->fake_root = NULL;
+  g_strfreev (splitted_path);
 }
 
-static void
-button_clicked_cb (GtkWidget *button,
-                  gpointer   data)
+GtkWidget *
+gtk_path_bar_new (void)
 {
-  ButtonData *button_data;
-  GtkPathBar *path_bar;
-  GList *button_list;
-  gboolean child_is_hidden;
-  GFile *child_file;
-
-  button_data = BUTTON_DATA (data);
-  if (button_data->ignore_changes)
-    return;
-
-  path_bar = GTK_PATH_BAR (gtk_widget_get_parent (button));
-
-  button_list = g_list_find (path_bar->priv->button_list, button_data);
-  g_assert (button_list != NULL);
-
-  g_signal_handlers_block_by_func (button,
-                                  G_CALLBACK (button_clicked_cb), data);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
-  g_signal_handlers_unblock_by_func (button,
-                                    G_CALLBACK (button_clicked_cb), data);
-
-  if (button_list->prev)
-    {
-      ButtonData *child_data;
-
-      child_data = BUTTON_DATA (button_list->prev->data);
-      child_file = child_data->file;
-      child_is_hidden = child_data->file_is_hidden;
-    }
-  else
-    {
-      child_file = NULL;
-      child_is_hidden = FALSE;
-    }
-
-  g_signal_emit (path_bar, path_bar_signals [PATH_CLICKED], 0,
-                button_data->file, child_file, child_is_hidden);
+  return g_object_new (GTK_TYPE_PATH_BAR, NULL);
 }
 
-struct SetButtonImageData
-{
-  GtkPathBar *path_bar;
-  ButtonData *button_data;
-};
-
 static void
-set_button_image_get_info_cb (GCancellable *cancellable,
-                             GFileInfo    *info,
-                             const GError *error,
-                             gpointer      user_data)
+gtk_path_bar_finalize (GObject *object)
 {
-  gboolean cancelled = g_cancellable_is_cancelled (cancellable);
-  GIcon *icon;
-  struct SetButtonImageData *data = user_data;
-
-  if (cancellable != data->button_data->cancellable)
-    goto out;
-
-  data->button_data->cancellable = NULL;
-
-  if (!data->button_data->button)
-    {
-      g_free (data->button_data);
-      goto out;
-    }
-
-  if (cancelled || error)
-    goto out;
+  GtkPathBar *self = (GtkPathBar *)object;
+  GtkPathBarPrivate *priv = gtk_path_bar_get_instance_private (self);
 
-  icon = g_file_info_get_symbolic_icon (info);
-  gtk_image_set_from_gicon (GTK_IMAGE (data->button_data->image), icon, GTK_ICON_SIZE_BUTTON);
+  g_free (priv->path);
 
-  switch (data->button_data->type)
-    {
-      case HOME_BUTTON:
-        g_set_object (&data->path_bar->priv->home_icon, icon);
-       break;
-
-      case DESKTOP_BUTTON:
-        g_set_object (&data->path_bar->priv->desktop_icon, icon);
-       break;
-
-      default:
-       break;
-    };
-
-out:
-  g_free (data);
-  g_object_unref (cancellable);
+  G_OBJECT_CLASS (gtk_path_bar_parent_class)->finalize (object);
 }
 
 static void
-set_button_image (GtkPathBar *path_bar,
-                 ButtonData *button_data)
+gtk_path_bar_get_property (GObject    *object,
+                           guint       prop_id,
+                           GValue     *value,
+                           GParamSpec *pspec)
 {
-  GtkFileSystemVolume *volume;
-  struct SetButtonImageData *data;
+  GtkPathBar *self = GTK_PATH_BAR (object);
+  GtkPathBarPrivate *priv = gtk_path_bar_get_instance_private (self);
 
-  switch (button_data->type)
+  switch (prop_id)
     {
-    case ROOT_BUTTON:
-
-      if (path_bar->priv->root_icon != NULL)
-        {
-          gtk_image_set_from_gicon (GTK_IMAGE (button_data->image), path_bar->priv->root_icon, 
GTK_ICON_SIZE_BUTTON);
-         break;
-       }
-
-      volume = _gtk_file_system_get_volume_for_file (path_bar->priv->file_system, path_bar->priv->root_file);
-      if (volume == NULL)
-       return;
-
-      path_bar->priv->root_icon = _gtk_file_system_volume_get_symbolic_icon (volume);
-      _gtk_file_system_volume_unref (volume);
-      gtk_image_set_from_gicon (GTK_IMAGE (button_data->image), path_bar->priv->root_icon, 
GTK_ICON_SIZE_BUTTON);
-
-      break;
-
-    case HOME_BUTTON:
-      if (path_bar->priv->home_icon != NULL)
-        {
-          gtk_image_set_from_gicon (GTK_IMAGE (button_data->image), path_bar->priv->home_icon, 
GTK_ICON_SIZE_BUTTON);
-         break;
-       }
-
-      data = g_new0 (struct SetButtonImageData, 1);
-      data->path_bar = path_bar;
-      data->button_data = button_data;
-
-      if (button_data->cancellable)
-       g_cancellable_cancel (button_data->cancellable);
-
-      button_data->cancellable =
-        _gtk_file_system_get_info (path_bar->priv->file_system,
-                                  path_bar->priv->home_file,
-                                  "standard::symbolic-icon",
-                                  set_button_image_get_info_cb,
-                                  data);
-      break;
-
-    case DESKTOP_BUTTON:
-      if (path_bar->priv->desktop_icon != NULL)
-        {
-          gtk_image_set_from_gicon (GTK_IMAGE (button_data->image), path_bar->priv->desktop_icon, 
GTK_ICON_SIZE_BUTTON);
-         break;
-       }
-
-      data = g_new0 (struct SetButtonImageData, 1);
-      data->path_bar = path_bar;
-      data->button_data = button_data;
-
-      if (button_data->cancellable)
-       g_cancellable_cancel (button_data->cancellable);
-
-      button_data->cancellable =
-        _gtk_file_system_get_info (path_bar->priv->file_system,
-                                  path_bar->priv->desktop_file,
-                                  "standard::symbolic-icon",
-                                  set_button_image_get_info_cb,
-                                  data);
+    case PROP_PATH:
+      g_value_set_string (value, priv->path);
       break;
     default:
-      break;
-    }
-}
-
-static void
-button_data_free (ButtonData *button_data)
-{
-  if (button_data->file)
-    g_object_unref (button_data->file);
-  button_data->file = NULL;
-
-  g_free (button_data->dir_name);
-  button_data->dir_name = NULL;
-
-  button_data->button = NULL;
-
-  if (button_data->cancellable)
-    g_cancellable_cancel (button_data->cancellable);
-  else
-    g_free (button_data);
-}
-
-static const char *
-get_dir_name (ButtonData *button_data)
-{
-  return button_data->dir_name;
-}
-
-static void
-gtk_path_bar_update_button_appearance (GtkPathBar *path_bar,
-                                      ButtonData *button_data,
-                                      gboolean    current_dir)
-{
-  const gchar *dir_name = get_dir_name (button_data);
-  GtkStyleContext *context;
-
-  context = gtk_widget_get_style_context (button_data->button);
-
-  gtk_style_context_remove_class (context, "text-button");
-  gtk_style_context_remove_class (context, "image-button");
-
-  if (button_data->label != NULL)
-    {
-      gtk_label_set_text (GTK_LABEL (button_data->label), dir_name);
-      if (button_data->image == NULL)
-        gtk_style_context_add_class (context, "text-button");
-    }
-
-  if (button_data->image != NULL)
-    {
-      set_button_image (path_bar, button_data);
-      if (button_data->label == NULL)
-        gtk_style_context_add_class (context, "image-button");
-    }
-
-  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button_data->button)) != current_dir)
-    {
-      button_data->ignore_changes = TRUE;
-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button_data->button), current_dir);
-      button_data->ignore_changes = FALSE;
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
     }
 }
 
-static ButtonType
-find_button_type (GtkPathBar  *path_bar,
-                 GFile       *file)
-{
-  if (path_bar->priv->root_file != NULL &&
-      g_file_equal (file, path_bar->priv->root_file))
-    return ROOT_BUTTON;
-  if (path_bar->priv->home_file != NULL &&
-      g_file_equal (file, path_bar->priv->home_file))
-    return HOME_BUTTON;
-  if (path_bar->priv->desktop_file != NULL &&
-      g_file_equal (file, path_bar->priv->desktop_file))
-    return DESKTOP_BUTTON;
-
- return NORMAL_BUTTON;
-}
-
 static void
-button_drag_data_get_cb (GtkWidget        *widget,
-                         GdkDragContext   *context,
-                         GtkSelectionData *selection_data,
-                         guint             info,
-                         guint             time_,
-                         gpointer          data)
-{
-  ButtonData *button_data;
-  char *uris[2];
-
-  button_data = data;
-
-  uris[0] = g_file_get_uri (button_data->file);
-  uris[1] = NULL;
-
-  gtk_selection_data_set_uris (selection_data, uris);
-
-  g_free (uris[0]);
-}
-
-static ButtonData *
-make_directory_button (GtkPathBar  *path_bar,
-                      const char  *dir_name,
-                      GFile       *file,
-                      gboolean     current_dir,
-                      gboolean     file_is_hidden)
+gtk_path_bar_set_property (GObject      *object,
+                           guint         prop_id,
+                           const GValue *value,
+                           GParamSpec   *pspec)
 {
-  AtkObject *atk_obj;
-  GtkWidget *child = NULL;
-  ButtonData *button_data;
-
-  file_is_hidden = !! file_is_hidden;
-  /* Is it a special button? */
-  button_data = g_new0 (ButtonData, 1);
+  GtkPathBar *self = GTK_PATH_BAR (object);
 
-  button_data->type = find_button_type (path_bar, file);
-  button_data->button = gtk_toggle_button_new ();
-  atk_obj = gtk_widget_get_accessible (button_data->button);
-  gtk_button_set_focus_on_click (GTK_BUTTON (button_data->button), FALSE);
-  gtk_widget_add_events (button_data->button, GDK_SCROLL_MASK);
-
-  switch (button_data->type)
+  switch (prop_id)
     {
-    case ROOT_BUTTON:
-      button_data->image = gtk_image_new ();
-      child = button_data->image;
-      button_data->label = NULL;
-      atk_object_set_name (atk_obj, _("File System Root"));
-      break;
-    case HOME_BUTTON:
-    case DESKTOP_BUTTON:
-      button_data->image = gtk_image_new ();
-      button_data->label = gtk_label_new (NULL);
-      child = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_box_pack_start (GTK_BOX (child), button_data->image, FALSE, FALSE, 0);
-      gtk_box_pack_start (GTK_BOX (child), button_data->label, FALSE, FALSE, 0);
-      break;
-    case NORMAL_BUTTON:
+    case PROP_PATH:
+      gtk_path_bar_set_path (self, g_value_get_string (value));
     default:
-      button_data->label = gtk_label_new (NULL);
-      child = button_data->label;
-      button_data->image = NULL;
-    }
-
-  button_data->dir_name = g_strdup (dir_name);
-  button_data->file = g_object_ref (file);
-  button_data->file_is_hidden = file_is_hidden;
-
-  gtk_container_add (GTK_CONTAINER (button_data->button), child);
-  gtk_widget_show_all (button_data->button);
-
-  gtk_path_bar_update_button_appearance (path_bar, button_data, current_dir);
-
-  g_signal_connect (button_data->button, "clicked",
-                   G_CALLBACK (button_clicked_cb),
-                   button_data);
-  g_object_weak_ref (G_OBJECT (button_data->button),
-                    (GWeakNotify) button_data_free, button_data);
-
-  gtk_drag_source_set (button_data->button,
-                      GDK_BUTTON1_MASK,
-                      NULL, 0,
-                      GDK_ACTION_COPY);
-  gtk_drag_source_add_uri_targets (button_data->button);
-  g_signal_connect (button_data->button, "drag-data-get",
-                   G_CALLBACK (button_drag_data_get_cb), button_data);
-
-  return button_data;
-}
-
-static gboolean
-gtk_path_bar_check_parent_path (GtkPathBar         *path_bar,
-                               GFile              *file)
-{
-  GList *list;
-  GList *current_path = NULL;
-  gboolean need_new_fake_root = FALSE;
-
-  for (list = path_bar->priv->button_list; list; list = list->next)
-    {
-      ButtonData *button_data;
-
-      button_data = list->data;
-      if (g_file_equal (file, button_data->file))
-       {
-         current_path = list;
-         break;
-       }
-      if (list == path_bar->priv->fake_root)
-       need_new_fake_root = TRUE;
-    }
-
-  if (current_path)
-    {
-      if (need_new_fake_root)
-       {
-         path_bar->priv->fake_root = NULL;
-         for (list = current_path; list; list = list->next)
-           {
-             ButtonData *button_data;
-
-             button_data = list->data;
-             if (BUTTON_IS_FAKE_ROOT (button_data))
-               {
-                 path_bar->priv->fake_root = list;
-                 break;
-               }
-           }
-       }
-
-      for (list = path_bar->priv->button_list; list; list = list->next)
-       {
-         gtk_path_bar_update_button_appearance (path_bar,
-                                                BUTTON_DATA (list->data),
-                                                (list == current_path) ? TRUE : FALSE);
-       }
-
-      if (!gtk_widget_get_child_visible (BUTTON_DATA (current_path->data)->button))
-       {
-         path_bar->priv->first_scrolled_button = current_path;
-         gtk_widget_queue_resize (GTK_WIDGET (path_bar));
-       }
-
-      return TRUE;
-    }
-  return FALSE;
-}
-
-
-struct SetFileInfo
-{
-  GFile *file;
-  GFile *parent_file;
-  GtkPathBar *path_bar;
-  GList *new_buttons;
-  GList *fake_root;
-  gboolean first_directory;
-};
-
-static void
-gtk_path_bar_set_file_finish (struct SetFileInfo *info,
-                              gboolean            result)
-{
-  if (result)
-    {
-      GList *l;
-
-      gtk_path_bar_clear_buttons (info->path_bar);
-      info->path_bar->priv->button_list = g_list_reverse (info->new_buttons);
-      info->path_bar->priv->fake_root = info->fake_root;
-
-      for (l = info->path_bar->priv->button_list; l; l = l->next)
-       {
-         GtkWidget *button = BUTTON_DATA (l->data)->button;
-         gtk_container_add (GTK_CONTAINER (info->path_bar), button);
-       }
-
-      child_ordering_changed (info->path_bar);
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
     }
-  else
-    {
-      GList *l;
-
-      for (l = info->new_buttons; l; l = l->next)
-       {
-         ButtonData *button_data;
-
-         button_data = BUTTON_DATA (l->data);
-         gtk_widget_destroy (button_data->button);
-       }
-
-      g_list_free (info->new_buttons);
-    }
-
-  if (info->file)
-    g_object_unref (info->file);
-  if (info->parent_file)
-    g_object_unref (info->parent_file);
-
-  g_free (info);
 }
 
 static void
-gtk_path_bar_get_info_callback (GCancellable *cancellable,
-                               GFileInfo    *info,
-                               const GError *error,
-                               gpointer      data)
-{
-  gboolean cancelled = g_cancellable_is_cancelled (cancellable);
-  struct SetFileInfo *file_info = data;
-  ButtonData *button_data;
-  const gchar *display_name;
-  gboolean is_hidden;
-
-  if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-    return;
-
-  if (cancellable != file_info->path_bar->priv->get_info_cancellable)
-    {
-      gtk_path_bar_set_file_finish (file_info, FALSE);
-      g_object_unref (cancellable);
-      return;
-    }
-
-  g_object_unref (cancellable);
-  file_info->path_bar->priv->get_info_cancellable = NULL;
-
-  if (cancelled || !info)
-    {
-      gtk_path_bar_set_file_finish (file_info, FALSE);
-      return;
-    }
-
-  display_name = g_file_info_get_display_name (info);
-  is_hidden = g_file_info_get_is_hidden (info) || g_file_info_get_is_backup (info);
-
-  button_data = make_directory_button (file_info->path_bar, display_name,
-                                       file_info->file,
-                                      file_info->first_directory, is_hidden);
-  g_object_unref (file_info->file);
-
-  file_info->new_buttons = g_list_prepend (file_info->new_buttons, button_data);
-
-  if (BUTTON_IS_FAKE_ROOT (button_data))
-    file_info->fake_root = file_info->new_buttons;
-
-  /* We have assigned the info for the innermost button, i.e. the deepest directory.
-   * Now, go on to fetch the info for this directory's parent.
-   */
-
-  file_info->file = file_info->parent_file;
-  file_info->first_directory = FALSE;
-
-  if (!file_info->file)
-    {
-      /* No parent?  Okay, we are done. */
-      gtk_path_bar_set_file_finish (file_info, TRUE);
-      return;
-    }
-
-  file_info->parent_file = g_file_get_parent (file_info->file);
-
-  /* Recurse asynchronously */
-  file_info->path_bar->priv->get_info_cancellable =
-    _gtk_file_system_get_info (file_info->path_bar->priv->file_system,
-                              file_info->file,
-                              "standard::display-name,standard::is-hidden,standard::is-backup",
-                              gtk_path_bar_get_info_callback,
-                              file_info);
-}
-
-void
-_gtk_path_bar_set_file (GtkPathBar *path_bar,
-                        GFile      *file,
-                        gboolean    keep_trail)
+get_preferred_width_for_height (GtkWidget *self,
+                                gint       for_height,
+                                gint      *min_width,
+                                gint      *nat_width)
 {
-  struct SetFileInfo *info;
-
-  g_return_if_fail (GTK_IS_PATH_BAR (path_bar));
-  g_return_if_fail (G_IS_FILE (file));
-
-  /* Check whether the new path is already present in the pathbar as buttons.
-   * This could be a parent directory or a previous selected subdirectory.
+  GList *children;
+  GList *l;
+  gint children_nat_width;
+
+  children = gtk_container_get_children (GTK_CONTAINER (self));
+  children_nat_width = 0;
+  *min_width = 0;
+  *nat_width = 0;
+
+  for (l = children; l != NULL; l = l->next)
+    {
+      gtk_widget_get_preferred_width (l->data, NULL, &children_nat_width);
+      *nat_width += children_nat_width;
+    }
+  g_print ("nat width %d\n", *nat_width);
+}
+
+static void
+gtk_path_bar_class_init (GtkPathBarClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  object_class->finalize = gtk_path_bar_finalize;
+  object_class->get_property = gtk_path_bar_get_property;
+  object_class->set_property = gtk_path_bar_set_property;
+
+  widget_class->get_preferred_width_for_height = get_preferred_width_for_height;
+
+  /**
+   * GtkPlacesSidebar::populate-popup:
+   * @sidebar: the object which received the signal.
+   * @container: (type Gtk.Widget): a #GtkMenu or another #GtkContainer
+   * @selected_item: (type Gio.File) (nullable): #GFile with the item to which the popup should refer, or 
#NULL in the case of a @selected_volume.
+   * @selected_volume: (type Gio.Volume) (nullable): #GVolume if the selected item is a volume, or #NULL if 
it is a file.
+   *
+   * The places sidebar emits this signal when the user invokes a contextual
+   * popup on one of its items. In the signal handler, the application may
+   * add extra items to the menu as appropriate. For example, a file manager
+   * may want to add a "Properties" command to the menu.
+   *
+   * It is not necessary to store the @selected_item for each menu item;
+   * during their callbacks, the application can use gtk_places_sidebar_get_location()
+   * to get the file to which the item refers.
+   *
+   * The @selected_item argument may be %NULL in case the selection refers to
+   * a volume. In this case, @selected_volume will be non-%NULL. In this case,
+   * the calling application will have to g_object_ref() the @selected_volume and
+   * keep it around to use it in the callback.
+   *
+   * The @container and all its contents are destroyed after the user
+   * dismisses the popup. The popup is re-created (and thus, this signal is
+   * emitted) every time the user activates the contextual menu.
+   *
+   * Before 3.18, the @container always was a #GtkMenu, and you were expected
+   * to add your items as #GtkMenuItems. Since 3.18, the popup may be implemented
+   * as a #GtkPopover, in which case @container will be something else, e.g. a
+   * #GtkBox, to which you may add #GtkModelButtons or other widgets, such as
+   * #GtkEntries, #GtkSpinButtons, etc. If your application can deal with this
+   * situation, you can set #GtkPlacesSidebar::populate-all to %TRUE to request
+   * that this signal is emitted for populating popovers as well.
+   *
+   * Since: 3.10
    */
-  if (keep_trail && gtk_path_bar_check_parent_path (path_bar, file))
-    return;
-
-  info = g_new0 (struct SetFileInfo, 1);
-  info->file = g_object_ref (file);
-  info->path_bar = path_bar;
-  info->first_directory = TRUE;
-  info->parent_file = g_file_get_parent (info->file);
-
-  if (path_bar->priv->get_info_cancellable)
-    g_cancellable_cancel (path_bar->priv->get_info_cancellable);
-
-  path_bar->priv->get_info_cancellable =
-    _gtk_file_system_get_info (path_bar->priv->file_system,
-                               info->file,
-                               "standard::display-name,standard::is-hidden,standard::is-backup",
-                               gtk_path_bar_get_info_callback,
-                               info);
-
-}
-
-/* FIXME: This should be a construct-only property */
-void
-_gtk_path_bar_set_file_system (GtkPathBar    *path_bar,
-                              GtkFileSystem *file_system)
-{
-  const char *home;
+  path_bar_signals [POPULATE_POPUP] =
+          g_signal_new (I_("populate-popup"),
+                        G_OBJECT_CLASS_TYPE (object_class),
+                        G_SIGNAL_RUN_FIRST,
+                        G_STRUCT_OFFSET (GtkPathBarClass, populate_popup),
+                        NULL, NULL,
+                        _gtk_marshal_VOID__OBJECT_STRING,
+                        G_TYPE_NONE, 2,
+                        GTK_TYPE_WIDGET,
+                        G_TYPE_STRING);
 
-  g_return_if_fail (GTK_IS_PATH_BAR (path_bar));
+  path_bar_properties[PROP_PATH] =
+          g_param_spec_string ("path",
+                               P_("Path"),
+                               P_("The path managed by the path bar. Should use UNIX path specs"),
+                               NULL,
+                               G_PARAM_READWRITE);
 
-  g_assert (path_bar->priv->file_system == NULL);
+  g_object_class_install_properties (object_class, LAST_PROP, path_bar_properties);
 
-  path_bar->priv->file_system = g_object_ref (file_system);
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/ui/gtkpathbar.ui");
 
-  home = g_get_home_dir ();
-  if (home != NULL)
-    {
-      const gchar *desktop;
+  gtk_widget_class_bind_template_child_private (widget_class, GtkPathBar, overflow_button);
+  gtk_widget_class_bind_template_child_private (widget_class, GtkPathBar, path_box);
 
-      path_bar->priv->home_file = g_file_new_for_path (home);
-      /* FIXME: Need file system backend specific way of getting the
-       * Desktop path.
-       */
-      desktop = g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP);
-      if (desktop != NULL)
-        path_bar->priv->desktop_file = g_file_new_for_path (desktop);
-      else 
-        path_bar->priv->desktop_file = NULL;
-    }
-  else
-    {
-      path_bar->priv->home_file = NULL;
-      path_bar->priv->desktop_file = NULL;
-    }
-  path_bar->priv->root_file = g_file_new_for_path ("/");
-}
-
-/**
- * _gtk_path_bar_up:
- * @path_bar: a #GtkPathBar
- * 
- * If the selected button in the pathbar is not the furthest button “up” (in the
- * root direction), act as if the user clicked on the next button up.
- **/
-void
-_gtk_path_bar_up (GtkPathBar *path_bar)
-{
-  GList *l;
+  gtk_widget_class_bind_template_callback (widget_class, on_path_chunk_button_clicked);
 
-  for (l = path_bar->priv->button_list; l; l = l->next)
-    {
-      GtkWidget *button = BUTTON_DATA (l->data)->button;
-      if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)))
-       {
-         if (l->next)
-           {
-             GtkWidget *next_button = BUTTON_DATA (l->next->data)->button;
-             button_clicked_cb (next_button, l->next->data);
-           }
-         break;
-       }
-    }
+  gtk_widget_class_set_css_name (widget_class, "path-bar");
 }
 
-/**
- * _gtk_path_bar_down:
- * @path_bar: a #GtkPathBar
- * 
- * If the selected button in the pathbar is not the furthest button “down” (in the
- * leaf direction), act as if the user clicked on the next button down.
- **/
-void
-_gtk_path_bar_down (GtkPathBar *path_bar)
+static void
+gtk_path_bar_init (GtkPathBar *self)
 {
-  GList *l;
-
-  for (l = path_bar->priv->button_list; l; l = l->next)
-    {
-      GtkWidget *button = BUTTON_DATA (l->data)->button;
-      if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)))
-       {
-         if (l->prev)
-           {
-             GtkWidget *prev_button = BUTTON_DATA (l->prev->data)->button;
-             button_clicked_cb (prev_button, l->prev->data);
-           }
-         break;
-       }
-    }
+  g_type_ensure (GTK_TYPE_BOX);
+  gtk_widget_init_template (GTK_WIDGET (self));
 }
diff --git a/gtk/gtkpathbar.h b/gtk/gtkpathbar.h
index 7fdd7b3..ff79e04 100644
--- a/gtk/gtkpathbar.h
+++ b/gtk/gtkpathbar.h
@@ -1,67 +1,76 @@
 /* gtkpathbar.h
- * Copyright (C) 2004  Red Hat, Inc.,  Jonathan Blandford <jrb gnome org>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * Copyright (C) 2015 Red Hat
  *
- * This library is distributed in the hope that it will be useful,
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ * Authors: Carlos Soriano <csoriano gnome org>
  */
 
 #ifndef __GTK_PATH_BAR_H__
 #define __GTK_PATH_BAR_H__
 
-#include "gtkcontainer.h"
-#include "gtkfilesystem.h"
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
+#include <gtk/gtkbox.h>
 
 G_BEGIN_DECLS
 
-typedef struct _GtkPathBar        GtkPathBar;
-typedef struct _GtkPathBarClass   GtkPathBarClass;
+#define GTK_TYPE_PATH_BAR (gtk_path_bar_get_type())
+#define GTK_PATH_BAR(obj)        (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PATH_BAR, GtkPathBar))
+#define GTK_PATH_BAR_CLASS(klass)(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PATH_BAR, GtkPathBarClass))
+#define GTK_IS_PATH_BAR(obj)     (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PATH_BAR))
+#define GTK_IS_PATH_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PATH_BAR)
+#define GTK_PATH_BAR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PATH_BAR, GtkPathBarClass))
+
+typedef struct _GtkPathBar GtkPathBar;
+typedef struct _GtkPathBarClass GtkPathBarClass;
 typedef struct _GtkPathBarPrivate GtkPathBarPrivate;
 
+struct _GtkPathBarClass
+{
+  GtkBoxClass parent;
 
-#define GTK_TYPE_PATH_BAR                 (gtk_path_bar_get_type ())
-#define GTK_PATH_BAR(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PATH_BAR, GtkPathBar))
-#define GTK_PATH_BAR_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PATH_BAR, 
GtkPathBarClass))
-#define GTK_IS_PATH_BAR(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PATH_BAR))
-#define GTK_IS_PATH_BAR_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PATH_BAR))
-#define GTK_PATH_BAR_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PATH_BAR, 
GtkPathBarClass))
+  /*< public >*/
 
-struct _GtkPathBar
-{
-  GtkContainer parent;
+  void                (* populate_popup)              (GtkPathBar       *path_bar,
+                                                       const gchar      *selected_path);
+
+  /*< private >*/
 
-  GtkPathBarPrivate *priv;
+  /* Padding for future expansion */
+  gpointer reserved[10];
 };
 
-struct _GtkPathBarClass
+struct _GtkPathBar
 {
-  GtkContainerClass parent_class;
-
-  void (* path_clicked) (GtkPathBar  *path_bar,
-                        GFile       *file,
-                        GFile       *child_file,
-                        gboolean     child_is_hidden);
+  GtkBox parent_instance;
 };
 
-GDK_AVAILABLE_IN_ALL
+GDK_AVAILABLE_IN_3_18
 GType    gtk_path_bar_get_type (void) G_GNUC_CONST;
-void     _gtk_path_bar_set_file_system (GtkPathBar         *path_bar,
-                                       GtkFileSystem      *file_system);
-void     _gtk_path_bar_set_file        (GtkPathBar         *path_bar,
-                                       GFile              *file,
-                                       gboolean            keep_trail);
-void     _gtk_path_bar_up              (GtkPathBar *path_bar);
-void     _gtk_path_bar_down            (GtkPathBar *path_bar);
+GDK_AVAILABLE_IN_3_18
+GtkWidget*            gtk_path_bar_new                (void);
+GDK_AVAILABLE_IN_3_18
+void                  gtk_path_bar_set_path           (GtkPathBar       *path_bar,
+                                                       const gchar      *location);
+GDK_AVAILABLE_IN_3_18
+const gchar*          gtk_path_bar_get_path           (GtkPathBar       *path_bar);
 
 G_END_DECLS
 
 #endif /* __GTK_PATH_BAR_H__ */
+
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 0d4d646..b2e6a50 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1241,20 +1241,23 @@ GtkComboBox {
  * Pathbars *
  ************/
 
-.path-bar .button {
-  padding: 5px 6px 6px;
-  &:first-child { padding-left: 8px; }
-  &:last-child { padding-right: 8px; }
-  &:only-child {
-    padding-left: 12px;
-    padding-right: 12px;
-  }
+.path-bar .button.flat {
+    background-image: none;
+    border-radius: 0px;
+    border-color: transparent;
+    box-shadow: 0px 0px 0px;
+    margin: 0px;
+    opacity: 0.55;
+    padding: 3px 8px 4px;
 
-  // the following is for spacing the icon and the label inside the home button
-  & label:last-child { padding-left: 2px; }
-  & label:first-child { padding-right: 2px; }
-  & label:only-child { padding-right: 0; padding-left: 0; }
-  image { padding-top: 1px; }
+    &:hover {
+      box-shadow: 0px 2px 0px mix($selected_bg_color, $selected_fg_color, 0.25);
+    }
+
+    &:checked {
+      box-shadow: 0px 2px 0px $selected_bg_color;
+      color: $fg_color;
+    }
 }
 
 /**************
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index e94a1e5..60b8afd 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: #939695;
+    color: #949796;
     background-color: #393f3f; }
 
 /*
@@ -58,8 +58,8 @@
     background-color: #212424;
     color: #eeeeec; }
   .gtkstyle-fallback:insensitive {
-    background-color: #323636;
-    color: #939695; }
+    background-color: #333636;
+    color: #949796; }
   .gtkstyle-fallback:selected {
     background-color: #215d9c;
     color: #ffffff; }
@@ -68,7 +68,7 @@
   color: white;
   background-color: #292929; }
   .view:backdrop {
-    color: #d4d4d4;
+    color: #d5d5d5;
     background-color: #2c2c2c; }
   .view:selected, GtkCalendar:selected {
     border-radius: 3px; }
@@ -80,9 +80,9 @@
 label.separator {
   color: #eeeeec; }
   label.separator:backdrop {
-    color: #939695; }
+    color: #949796; }
 label:insensitive {
-  color: #939695; }
+  color: #949796; }
   label:insensitive:backdrop {
     color: #5d6767; }
 
@@ -100,18 +100,18 @@ GtkAssistant .sidebar {
     border-left: 1px solid #1c1f1f; }
   GtkAssistant .sidebar:backdrop {
     background-color: #2c2c2c;
-    border-color: #1e2222; }
+    border-color: #1f2222; }
 GtkAssistant.csd .sidebar {
   border-top-style: none; }
 GtkAssistant .sidebar label {
   padding: 6px 12px; }
 GtkAssistant .sidebar label.highlight {
-  background-color: #5d6261; }
+  background-color: #5d6262; }
 
 GtkTextView {
   background-color: #313434; }
   GtkTextView:backdrop {
-    background-color: #323535; }
+    background-color: #333636; }
 
 .grid-child {
   padding: 3px;
@@ -158,7 +158,7 @@ entry {
   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, #1c1f1f, #232525 3px, #292929 90%);
+  background-image: linear-gradient(to bottom, #1d2020, #242525 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); }
@@ -171,7 +171,7 @@ entry {
   entry.flat, entry.flat:focus {
     padding: 2px;
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
     color: white;
     border-color: #1c1f1f;
     box-shadow: inset 0 0 0 1px rgba(33, 93, 156, 0);
@@ -179,29 +179,29 @@ entry {
     border-radius: 0; }
   entry:focus {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
     box-shadow: inset 0 0 0 1px #215d9c, 0 1px rgba(238, 238, 236, 0.1);
     border-color: #0f2b48; }
   entry:insensitive {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
-    color: #939695;
+    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+    color: #949796;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #323636);
+    background-image: linear-gradient(to bottom, #333636);
     box-shadow: 0 1px rgba(238, 238, 236, 0.1); }
   entry:backdrop {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
-    color: #d4d4d4;
-    border-color: #1e2222;
+    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+    color: #d5d5d5;
+    border-color: #1f2222;
     background-image: linear-gradient(to bottom, #2c2c2c);
     box-shadow: 0 1px rgba(238, 238, 236, 0); }
   entry:backdrop:insensitive {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
     color: #5d6767;
-    border-color: #1e2222;
-    background-image: linear-gradient(to bottom, #323636);
+    border-color: #1f2222;
+    background-image: linear-gradient(to bottom, #333636);
     box-shadow: 0 1px rgba(238, 238, 236, 0); }
   entry progress {
     margin: 1px;
@@ -221,7 +221,7 @@ entry {
     border-color: #1a0000; }
     entry.error:focus {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+      background-image: linear-gradient(to bottom, #1d2020, #242525 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, entry.error:selected:focus {
@@ -231,22 +231,22 @@ entry {
     border-color: #432100; }
     entry.warning:focus {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+      background-image: linear-gradient(to bottom, #1d2020, #242525 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, entry.warning:selected:focus {
       background-color: #f57900; }
   entry image {
-    color: #c6c6c5; }
+    color: #c7c7c5; }
     entry image:hover {
       color: #eeeeec; }
     entry image:active {
       color: #215d9c; }
     entry image:backdrop {
-      color: #7e8080; }
+      color: #7f8281; }
   .osd entry {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+    background-image: linear-gradient(to bottom, #1d2020, #242525 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));
@@ -256,7 +256,7 @@ entry {
     icon-shadow: 0 1px black; }
     .osd entry:focus {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
       color: white;
       border-color: #215d9c;
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
@@ -266,7 +266,7 @@ entry {
       icon-shadow: 0 1px black; }
     .osd entry:backdrop {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+      background-image: linear-gradient(to bottom, #1d2020, #242525 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));
@@ -276,10 +276,10 @@ entry {
       icon-shadow: none; }
     .osd entry:insensitive {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
-      color: #878989;
+      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+      color: #878a89;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -293,7 +293,7 @@ entry {
   border-top-color: #252626;
   background-image: linear-gradient(to bottom, #292929); }
   .linked.vertical > entry:not(:insensitive) + .entry:not(:insensitive):backdrop {
-    border-top-color: #272929;
+    border-top-color: #282929;
     background-image: linear-gradient(to bottom, #2c2c2c); }
 .linked.vertical > entry + entry:focus:not(:last-child) {
   border-top-color: #0f2b48;
@@ -367,8 +367,8 @@ entry {
   .button:backdrop, .header-bar .button.titlebutton:backdrop,
   .titlebar .button.titlebutton:backdrop, .button.flat:backdrop, .sidebar-button.button:backdrop, 
.header-bar .titlebutton.button:backdrop,
   .titlebar .titlebutton.button:backdrop {
-    color: #939695;
-    border-color: #1e2222;
+    color: #949796;
+    border-color: #1f2222;
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     icon-shadow: none;
@@ -377,29 +377,32 @@ entry {
     .button:backdrop:active, .button:backdrop:checked, .button.flat:backdrop:active, 
.sidebar-button.button:backdrop:active, .header-bar .titlebutton.button:backdrop:active,
     .titlebar .titlebutton.button:backdrop:active, .button.flat:backdrop:checked, 
.sidebar-button.button:backdrop:checked, .header-bar .titlebutton.button:backdrop:checked,
     .titlebar .titlebutton.button:backdrop:checked {
-      color: #939695;
-      border-color: #1e2222;
-      background-image: linear-gradient(to bottom, #2f3434);
+      color: #949796;
+      border-color: #1f2222;
+      background-image: linear-gradient(to bottom, #303535);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
     .button:backdrop:insensitive, .button.flat:backdrop:insensitive, 
.sidebar-button.button:backdrop:insensitive, .header-bar .titlebutton.button:backdrop:insensitive,
     .titlebar .titlebutton.button:backdrop:insensitive {
       color: #5d6767;
-      border-color: #1e2222;
-      background-image: linear-gradient(to bottom, #323636);
+      border-color: #1f2222;
+      background-image: linear-gradient(to bottom, #333636);
       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, .button.flat:backdrop:insensitive > .label, 
.sidebar-button.button:backdrop:insensitive > .label, .header-bar .titlebutton.button:backdrop:insensitive > 
.label,
+      .button:backdrop:insensitive > .label, .header-bar .button.titlebutton:backdrop:insensitive > .label,
+      .titlebar .button.titlebutton:backdrop:insensitive > .label, .button.flat:backdrop:insensitive > 
.label, .sidebar-button.button:backdrop:insensitive > .label, .header-bar 
.titlebutton.button:backdrop:insensitive > .label,
       .titlebar .titlebutton.button:backdrop:insensitive > .label {
         color: inherit; }
     .button:backdrop:insensitive:active, .button:backdrop:insensitive:checked, 
.button.flat:backdrop:insensitive:active, .sidebar-button.button:backdrop:insensitive:active, .header-bar 
.titlebutton.button:backdrop:insensitive:active,
     .titlebar .titlebutton.button:backdrop:insensitive:active, .button.flat:backdrop:insensitive:checked, 
.sidebar-button.button:backdrop:insensitive:checked, .header-bar 
.titlebutton.button:backdrop:insensitive:checked,
     .titlebar .titlebutton.button:backdrop:insensitive:checked {
       color: #5d6767;
-      border-color: #1e2222;
-      background-image: linear-gradient(to bottom, #262929);
+      border-color: #1f2222;
+      background-image: linear-gradient(to bottom, #272929);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-      .button:backdrop:insensitive:active > .label, .button:backdrop:insensitive:checked > .label, 
.button.flat:backdrop:insensitive:active > .label, .sidebar-button.button:backdrop:insensitive:active > 
.label, .header-bar .titlebutton.button:backdrop:insensitive:active > .label,
+      .button:backdrop:insensitive:active > .label, .header-bar 
.button.titlebutton:backdrop:insensitive:active > .label,
+      .titlebar .button.titlebutton:backdrop:insensitive:active > .label, 
.button:backdrop:insensitive:checked > .label, .header-bar .button.titlebutton:backdrop:insensitive:checked > 
.label,
+      .titlebar .button.titlebutton:backdrop:insensitive:checked > .label, 
.button.flat:backdrop:insensitive:active > .label, .sidebar-button.button:backdrop:insensitive:active > 
.label, .header-bar .titlebutton.button:backdrop:insensitive:active > .label,
       .titlebar .titlebutton.button:backdrop:insensitive:active > .label, 
.button.flat:backdrop:insensitive:checked > .label, .sidebar-button.button:backdrop:insensitive:checked > 
.label, .header-bar .titlebutton.button:backdrop:insensitive:checked > .label,
       .titlebar .titlebutton.button:backdrop:insensitive:checked > .label {
         color: inherit; }
@@ -415,20 +418,23 @@ entry {
     icon-shadow: none; }
   .button:insensitive, .header-bar .button.titlebutton:insensitive,
   .titlebar .button.titlebutton:insensitive {
-    color: #939695;
+    color: #949796;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #323636);
+    background-image: linear-gradient(to bottom, #333636);
     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 {
+    .button:insensitive > .label, .header-bar .button.titlebutton:insensitive > .label,
+    .titlebar .button.titlebutton:insensitive > .label {
       color: inherit; }
     .button:insensitive:active, .button:insensitive:checked {
-      color: #939695;
+      color: #949796;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #2f3333, #323636);
+      background-image: linear-gradient(to bottom, #313434, #333636);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
-      .button:insensitive:active > .label, .button:insensitive:checked > .label {
+      .button:insensitive:active > .label, .header-bar .button.titlebutton:insensitive:active > .label,
+      .titlebar .button.titlebutton:insensitive:active > .label, .button:insensitive:checked > .label, 
.header-bar .button.titlebutton:insensitive:checked > .label,
+      .titlebar .button.titlebutton:insensitive:checked > .label {
         color: inherit; }
   .button.osd, .header-bar .osd.button.titlebutton,
   .titlebar .osd.button.titlebutton {
@@ -472,9 +478,9 @@ entry {
       border: none;
       box-shadow: none; }
     .button.osd:insensitive, .button.osd:backdrop:insensitive {
-      color: #878989;
+      color: #878a89;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -519,9 +525,9 @@ entry {
       icon-shadow: none;
       outline-color: rgba(238, 238, 236, 0.3); }
     .osd .button:insensitive, .osd .button:backdrop:insensitive {
-      color: #878989;
+      color: #878a89;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -563,9 +569,9 @@ entry {
       .osd .button.flat:insensitive, .osd .sidebar-button.button:insensitive, .osd .header-bar 
.titlebutton.button:insensitive, .header-bar .osd .titlebutton.button:insensitive,
       .osd .titlebar .titlebutton.button:insensitive,
       .titlebar .osd .titlebutton.button:insensitive {
-        color: #878989;
+        color: #878a89;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -634,7 +640,7 @@ entry {
       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, 
.suggested-action.sidebar-button.button:backdrop, .header-bar .suggested-action.titlebutton.button:backdrop,
     .titlebar .suggested-action.titlebutton.button:backdrop {
-      color: #d2deeb;
+      color: #d3dfeb;
       border-color: #0b1e33;
       background-image: linear-gradient(to bottom, #215d9c);
       text-shadow: none;
@@ -643,29 +649,32 @@ entry {
       .button.suggested-action:backdrop:active, .button.suggested-action:backdrop:checked, 
.button.suggested-action.flat:backdrop:active, .suggested-action.sidebar-button.button:backdrop:active, 
.header-bar .suggested-action.titlebutton.button:backdrop:active,
       .titlebar .suggested-action.titlebutton.button:backdrop:active, 
.button.suggested-action.flat:backdrop:checked, .suggested-action.sidebar-button.button:backdrop:checked, 
.header-bar .suggested-action.titlebutton.button:backdrop:checked,
       .titlebar .suggested-action.titlebutton.button:backdrop:checked {
-        color: #d0d9e2;
+        color: #d1dae3;
         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, 
.suggested-action.sidebar-button.button:backdrop:insensitive, .header-bar 
.suggested-action.titlebutton.button:backdrop:insensitive,
       .titlebar .suggested-action.titlebutton.button:backdrop:insensitive {
         color: #5d6767;
-        border-color: #1e2222;
-        background-image: linear-gradient(to bottom, #323636);
+        border-color: #1f2222;
+        background-image: linear-gradient(to bottom, #333636);
         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, 
.button.suggested-action.flat:backdrop:insensitive > .label, 
.suggested-action.sidebar-button.button:backdrop:insensitive > .label, .header-bar 
.suggested-action.titlebutton.button:backdrop:insensitive > .label,
+        .button.suggested-action:backdrop:insensitive > .label, .header-bar 
.suggested-action.button.titlebutton:backdrop:insensitive > .label,
+        .titlebar .suggested-action.button.titlebutton:backdrop:insensitive > .label, 
.button.suggested-action.flat:backdrop:insensitive > .label, 
.suggested-action.sidebar-button.button:backdrop:insensitive > .label, .header-bar 
.suggested-action.titlebutton.button:backdrop:insensitive > .label,
         .titlebar .suggested-action.titlebutton.button:backdrop:insensitive > .label {
           color: inherit; }
         .button.suggested-action:backdrop:insensitive:active, 
.button.suggested-action:backdrop:insensitive:checked, 
.button.suggested-action.flat:backdrop:insensitive:active, 
.suggested-action.sidebar-button.button:backdrop:insensitive:active, .header-bar 
.suggested-action.titlebutton.button:backdrop:insensitive:active,
         .titlebar .suggested-action.titlebutton.button:backdrop:insensitive:active, 
.button.suggested-action.flat:backdrop:insensitive:checked, 
.suggested-action.sidebar-button.button:backdrop:insensitive:checked, .header-bar 
.suggested-action.titlebutton.button:backdrop:insensitive:checked,
         .titlebar .suggested-action.titlebutton.button:backdrop:insensitive:checked {
-          color: #6c88a5;
+          color: #6c88a7;
           border-color: #0b1e33;
-          background-image: linear-gradient(to bottom, #1d4876);
+          background-image: linear-gradient(to bottom, #1d4877);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-          .button.suggested-action:backdrop:insensitive:active > .label, 
.button.suggested-action:backdrop:insensitive:checked > .label, 
.button.suggested-action.flat:backdrop:insensitive:active > .label, 
.suggested-action.sidebar-button.button:backdrop:insensitive:active > .label, .header-bar 
.suggested-action.titlebutton.button:backdrop:insensitive:active > .label,
+          .button.suggested-action:backdrop:insensitive:active > .label, .header-bar 
.suggested-action.button.titlebutton:backdrop:insensitive:active > .label,
+          .titlebar .suggested-action.button.titlebutton:backdrop:insensitive:active > .label, 
.button.suggested-action:backdrop:insensitive:checked > .label, .header-bar 
.suggested-action.button.titlebutton:backdrop:insensitive:checked > .label,
+          .titlebar .suggested-action.button.titlebutton:backdrop:insensitive:checked > .label, 
.button.suggested-action.flat:backdrop:insensitive:active > .label, 
.suggested-action.sidebar-button.button:backdrop:insensitive:active > .label, .header-bar 
.suggested-action.titlebutton.button:backdrop:insensitive:active > .label,
           .titlebar .suggested-action.titlebutton.button:backdrop:insensitive:active > .label, 
.button.suggested-action.flat:backdrop:insensitive:checked > .label, 
.suggested-action.sidebar-button.button:backdrop:insensitive:checked > .label, .header-bar 
.suggested-action.titlebutton.button:backdrop:insensitive:checked > .label,
           .titlebar .suggested-action.titlebutton.button:backdrop:insensitive:checked > .label {
             color: inherit; }
@@ -681,20 +690,23 @@ entry {
       icon-shadow: none;
       color: rgba(33, 93, 156, 0.8); }
     .button.suggested-action:insensitive {
-      color: #939695;
+      color: #949796;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #323636);
+      background-image: linear-gradient(to bottom, #333636);
       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 {
+      .button.suggested-action:insensitive > .label, .header-bar 
.suggested-action.button.titlebutton:insensitive > .label,
+      .titlebar .suggested-action.button.titlebutton:insensitive > .label {
         color: inherit; }
       .button.suggested-action:insensitive:active, .button.suggested-action:insensitive:checked {
-        color: #a4b5c8;
+        color: #a5b6c9;
         border-color: #0b1e33;
-        background-image: linear-gradient(to bottom, #1b436f, #1d4876);
+        background-image: linear-gradient(to bottom, #1b4470, #1d4877);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
-        .button.suggested-action:insensitive:active > .label, .button.suggested-action:insensitive:checked > 
.label {
+        .button.suggested-action:insensitive:active > .label, .header-bar 
.suggested-action.button.titlebutton:insensitive:active > .label,
+        .titlebar .suggested-action.button.titlebutton:insensitive:active > .label, 
.button.suggested-action:insensitive:checked > .label, .header-bar 
.suggested-action.button.titlebutton:insensitive:checked > .label,
+        .titlebar .suggested-action.button.titlebutton:insensitive:checked > .label {
           color: inherit; }
     .osd .button.suggested-action {
       color: #eeeeec;
@@ -724,9 +736,9 @@ entry {
         icon-shadow: none;
         outline-color: rgba(238, 238, 236, 0.3); }
       .osd .button.suggested-action:insensitive, .osd .button.suggested-action:backdrop:insensitive {
-        color: #878989;
+        color: #878a89;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -775,7 +787,7 @@ entry {
       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, 
.destructive-action.sidebar-button.button:backdrop, .header-bar 
.destructive-action.titlebutton.button:backdrop,
     .titlebar .destructive-action.titlebutton.button:backdrop {
-      color: #f6cfcf;
+      color: #f7cfcf;
       border-color: #5e0707;
       background-image: linear-gradient(to bottom, #d51010);
       text-shadow: none;
@@ -791,22 +803,25 @@ entry {
       .button.destructive-action:backdrop:insensitive, .button.destructive-action.flat:backdrop:insensitive, 
.destructive-action.sidebar-button.button:backdrop:insensitive, .header-bar 
.destructive-action.titlebutton.button:backdrop:insensitive,
       .titlebar .destructive-action.titlebutton.button:backdrop:insensitive {
         color: #5d6767;
-        border-color: #1e2222;
-        background-image: linear-gradient(to bottom, #323636);
+        border-color: #1f2222;
+        background-image: linear-gradient(to bottom, #333636);
         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, 
.button.destructive-action.flat:backdrop:insensitive > .label, 
.destructive-action.sidebar-button.button:backdrop:insensitive > .label, .header-bar 
.destructive-action.titlebutton.button:backdrop:insensitive > .label,
+        .button.destructive-action:backdrop:insensitive > .label, .header-bar 
.destructive-action.button.titlebutton:backdrop:insensitive > .label,
+        .titlebar .destructive-action.button.titlebutton:backdrop:insensitive > .label, 
.button.destructive-action.flat:backdrop:insensitive > .label, 
.destructive-action.sidebar-button.button:backdrop:insensitive > .label, .header-bar 
.destructive-action.titlebutton.button:backdrop:insensitive > .label,
         .titlebar .destructive-action.titlebutton.button:backdrop:insensitive > .label {
           color: inherit; }
         .button.destructive-action:backdrop:insensitive:active, 
.button.destructive-action:backdrop:insensitive:checked, 
.button.destructive-action.flat:backdrop:insensitive:active, 
.destructive-action.sidebar-button.button:backdrop:insensitive:active, .header-bar 
.destructive-action.titlebutton.button:backdrop:insensitive:active,
         .titlebar .destructive-action.titlebutton.button:backdrop:insensitive:active, 
.button.destructive-action.flat:backdrop:insensitive:checked, 
.destructive-action.sidebar-button.button:backdrop:insensitive:checked, .header-bar 
.destructive-action.titlebutton.button:backdrop:insensitive:checked,
         .titlebar .destructive-action.titlebutton.button:backdrop:insensitive:checked {
-          color: #c36464;
+          color: #c46565;
           border-color: #5e0707;
-          background-image: linear-gradient(to bottom, #a41111);
+          background-image: linear-gradient(to bottom, #a41212);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-          .button.destructive-action:backdrop:insensitive:active > .label, 
.button.destructive-action:backdrop:insensitive:checked > .label, 
.button.destructive-action.flat:backdrop:insensitive:active > .label, 
.destructive-action.sidebar-button.button:backdrop:insensitive:active > .label, .header-bar 
.destructive-action.titlebutton.button:backdrop:insensitive:active > .label,
+          .button.destructive-action:backdrop:insensitive:active > .label, .header-bar 
.destructive-action.button.titlebutton:backdrop:insensitive:active > .label,
+          .titlebar .destructive-action.button.titlebutton:backdrop:insensitive:active > .label, 
.button.destructive-action:backdrop:insensitive:checked > .label, .header-bar 
.destructive-action.button.titlebutton:backdrop:insensitive:checked > .label,
+          .titlebar .destructive-action.button.titlebutton:backdrop:insensitive:checked > .label, 
.button.destructive-action.flat:backdrop:insensitive:active > .label, 
.destructive-action.sidebar-button.button:backdrop:insensitive:active > .label, .header-bar 
.destructive-action.titlebutton.button:backdrop:insensitive:active > .label,
           .titlebar .destructive-action.titlebutton.button:backdrop:insensitive:active > .label, 
.button.destructive-action.flat:backdrop:insensitive:checked > .label, 
.destructive-action.sidebar-button.button:backdrop:insensitive:checked > .label, .header-bar 
.destructive-action.titlebutton.button:backdrop:insensitive:checked > .label,
           .titlebar .destructive-action.titlebutton.button:backdrop:insensitive:checked > .label {
             color: inherit; }
@@ -822,20 +837,23 @@ entry {
       icon-shadow: none;
       color: rgba(213, 16, 16, 0.8); }
     .button.destructive-action:insensitive {
-      color: #939695;
+      color: #949796;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #323636);
+      background-image: linear-gradient(to bottom, #333636);
       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 {
+      .button.destructive-action:insensitive > .label, .header-bar 
.destructive-action.button.titlebutton:insensitive > .label,
+      .titlebar .destructive-action.button.titlebutton:insensitive > .label {
         color: inherit; }
       .button.destructive-action:insensitive:active, .button.destructive-action:insensitive:checked {
-        color: #da9f9f;
+        color: #dba0a0;
         border-color: #5e0707;
-        background-image: linear-gradient(to bottom, #9d1010, #a41111);
+        background-image: linear-gradient(to bottom, #9d1111, #a41212);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
-        .button.destructive-action:insensitive:active > .label, 
.button.destructive-action:insensitive:checked > .label {
+        .button.destructive-action:insensitive:active > .label, .header-bar 
.destructive-action.button.titlebutton:insensitive:active > .label,
+        .titlebar .destructive-action.button.titlebutton:insensitive:active > .label, 
.button.destructive-action:insensitive:checked > .label, .header-bar 
.destructive-action.button.titlebutton:insensitive:checked > .label,
+        .titlebar .destructive-action.button.titlebutton:insensitive:checked > .label {
           color: inherit; }
     .osd .button.destructive-action {
       color: #eeeeec;
@@ -865,9 +883,9 @@ entry {
         icon-shadow: none;
         outline-color: rgba(238, 238, 236, 0.3); }
       .osd .button.destructive-action:insensitive, .osd .button.destructive-action:backdrop:insensitive {
-        color: #878989;
+        color: #878a89;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -914,7 +932,8 @@ entry {
       padding-right: 6px;
       padding-top: 3px;
       padding-bottom: 3px; }
-    .stack-switcher > .button.text-button {
+    .stack-switcher > .button.text-button, .header-bar .stack-switcher > .text-button.button.titlebutton,
+    .titlebar .stack-switcher > .text-button.button.titlebutton {
       padding: 5px 10px 6px; }
     .stack-switcher > .button.image-button, .stack-switcher > GtkScaleButton.button,
     .stack-switcher > GtkVolumeButton.button, .header-bar .stack-switcher > .titlebutton.button,
@@ -954,7 +973,8 @@ entry {
   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 GtkToolButton > .button:hover {
+  .inline-toolbar GtkToolButton > .button:hover, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:hover,
+  .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:hover {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #1c1f1f;
@@ -962,7 +982,9 @@ entry {
     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 GtkToolButton > .button:active, .inline-toolbar GtkToolButton > .button:checked {
+  .inline-toolbar GtkToolButton > .button:active, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:active,
+  .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:active, .inline-toolbar GtkToolButton > 
.button:checked, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton:checked,
+  .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:checked {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #1c1f1f;
@@ -970,47 +992,56 @@ entry {
     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 GtkToolButton > .button:insensitive {
-    color: #939695;
+  .inline-toolbar GtkToolButton > .button:insensitive, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:insensitive,
+  .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:insensitive {
+    color: #949796;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #323636);
+    background-image: linear-gradient(to bottom, #333636);
     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 GtkToolButton > .button:insensitive > .label {
       color: inherit; }
-  .inline-toolbar GtkToolButton > .button:insensitive:active, .inline-toolbar GtkToolButton > 
.button:insensitive:checked {
-    color: #939695;
+  .inline-toolbar GtkToolButton > .button:insensitive:active, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:insensitive:active,
+  .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:insensitive:active, .inline-toolbar 
GtkToolButton > .button:insensitive:checked, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:insensitive:checked,
+  .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:insensitive:checked {
+    color: #949796;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #2f3333, #323636);
+    background-image: linear-gradient(to bottom, #313434, #333636);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
     .inline-toolbar GtkToolButton > .button:insensitive:active > .label, .inline-toolbar GtkToolButton > 
.button:insensitive:checked > .label {
       color: inherit; }
-  .inline-toolbar GtkToolButton > .button:backdrop {
-    color: #939695;
-    border-color: #1e2222;
+  .inline-toolbar GtkToolButton > .button:backdrop, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:backdrop,
+  .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop {
+    color: #949796;
+    border-color: #1f2222;
     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 GtkToolButton > .button:backdrop:active, .inline-toolbar GtkToolButton > 
.button:backdrop:checked {
-    color: #939695;
-    border-color: #1e2222;
-    background-image: linear-gradient(to bottom, #2f3434);
+  .inline-toolbar GtkToolButton > .button:backdrop:active, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:backdrop:active,
+  .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop:active, .inline-toolbar 
GtkToolButton > .button:backdrop:checked, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:backdrop:checked,
+  .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop:checked {
+    color: #949796;
+    border-color: #1f2222;
+    background-image: linear-gradient(to bottom, #303535);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-  .inline-toolbar GtkToolButton > .button:backdrop:insensitive {
+  .inline-toolbar GtkToolButton > .button:backdrop:insensitive, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:backdrop:insensitive,
+  .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop:insensitive {
     color: #5d6767;
-    border-color: #1e2222;
-    background-image: linear-gradient(to bottom, #323636);
+    border-color: #1f2222;
+    background-image: linear-gradient(to bottom, #333636);
     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 GtkToolButton > .button:backdrop:insensitive > .label {
       color: inherit; }
-  .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active, .inline-toolbar GtkToolButton > 
.button:backdrop:insensitive:checked {
+  .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active, .inline-toolbar .header-bar 
GtkToolButton > .button.titlebutton:backdrop:insensitive:active,
+  .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop:insensitive:active, .inline-toolbar 
GtkToolButton > .button:backdrop:insensitive:checked, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:backdrop:insensitive:checked,
+  .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop:insensitive:checked {
     color: #5d6767;
-    border-color: #1e2222;
-    background-image: linear-gradient(to bottom, #262929);
+    border-color: #1f2222;
+    background-image: linear-gradient(to bottom, #272929);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
     .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active > .label, .inline-toolbar 
GtkToolButton > .button:backdrop:insensitive:checked > .label {
       color: inherit; }
@@ -1038,7 +1069,8 @@ entry {
   border-radius: 0;
   border-right-style: none; }
 
-.linked:not(.vertical) > entry:first-child, .inline-toolbar .button:first-child, .linked > 
.button:first-child, .inline-toolbar.toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar 
GtkToolButton:first-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:first-child > 
.button.flat, .inline-toolbar.location-bar GtkToolButton:first-child > .button.flat, .inline-toolbar.toolbar 
GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar GtkToolButton:first-child > 
.sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:first-child > .sidebar-button.button, 
.inline-toolbar.location-bar GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar .header-bar 
GtkToolButton:first-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:first-child > 
.button.titlebutton,
+.linked:not(.vertical) > entry:first-child, .inline-toolbar .button:first-child, .linked > 
.button:first-child, .header-bar .linked > .button.titlebutton:first-child,
+.titlebar .linked > .button.titlebutton:first-child, .inline-toolbar.toolbar GtkToolButton:first-child > 
.button.flat, .inline-toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar.search-bar 
GtkToolButton:first-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:first-child > 
.button.flat, .inline-toolbar.toolbar GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar 
GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:first-child > 
.sidebar-button.button, .inline-toolbar.location-bar GtkToolButton:first-child > .sidebar-button.button, 
.inline-toolbar .header-bar GtkToolButton:first-child > .button.titlebutton, .header-bar .inline-toolbar 
GtkToolButton:first-child > .button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:first-child > .button.titlebutton,
 .titlebar .inline-toolbar GtkToolButton:first-child > .button.titlebutton,
 .inline-toolbar.toolbar GtkToolButton:backdrop:first-child > .button.flat,
@@ -1056,7 +1088,8 @@ entry {
 .linked > GtkComboBoxText:first-child > .the-button-in-the-combobox {
   border-top-left-radius: 3px;
   border-bottom-left-radius: 3px; }
-.linked:not(.vertical) > entry:last-child, .inline-toolbar .button:last-child, .linked > .button:last-child, 
.inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > 
.button.flat, .inline-toolbar.search-bar GtkToolButton:last-child > .button.flat, 
.inline-toolbar.location-bar GtkToolButton:last-child > .button.flat, .inline-toolbar.toolbar 
GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar GtkToolButton:last-child > 
.sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:last-child > .sidebar-button.button, 
.inline-toolbar.location-bar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar .header-bar 
GtkToolButton:last-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:last-child > 
.button.titlebutton,
+.linked:not(.vertical) > entry:last-child, .inline-toolbar .button:last-child, .linked > .button:last-child, 
.header-bar .linked > .button.titlebutton:last-child,
+.titlebar .linked > .button.titlebutton:last-child, .inline-toolbar.toolbar GtkToolButton:last-child > 
.button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar.search-bar 
GtkToolButton:last-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:last-child > 
.button.flat, .inline-toolbar.toolbar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar 
GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:last-child > 
.sidebar-button.button, .inline-toolbar.location-bar GtkToolButton:last-child > .sidebar-button.button, 
.inline-toolbar .header-bar GtkToolButton:last-child > .button.titlebutton, .header-bar .inline-toolbar 
GtkToolButton:last-child > .button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:last-child > .button.titlebutton,
 .titlebar .inline-toolbar GtkToolButton:last-child > .button.titlebutton,
 .inline-toolbar.toolbar GtkToolButton:backdrop:last-child > .button.flat,
@@ -1075,7 +1108,8 @@ entry {
   border-top-right-radius: 3px;
   border-bottom-right-radius: 3px;
   border-right-style: solid; }
-.linked:not(.vertical) > entry:only-child, .inline-toolbar .button:only-child, .linked > .button:only-child, 
.inline-toolbar.toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar GtkToolButton:only-child > 
.button.flat, .inline-toolbar.search-bar GtkToolButton:only-child > .button.flat, 
.inline-toolbar.location-bar GtkToolButton:only-child > .button.flat, .inline-toolbar.toolbar 
GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar GtkToolButton:only-child > 
.sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:only-child > .sidebar-button.button, 
.inline-toolbar.location-bar GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar .header-bar 
GtkToolButton:only-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:only-child > 
.button.titlebutton,
+.linked:not(.vertical) > entry:only-child, .inline-toolbar .button:only-child, .linked > .button:only-child, 
.header-bar .linked > .button.titlebutton:only-child,
+.titlebar .linked > .button.titlebutton:only-child, .inline-toolbar.toolbar GtkToolButton:only-child > 
.button.flat, .inline-toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar.search-bar 
GtkToolButton:only-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:only-child > 
.button.flat, .inline-toolbar.toolbar GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar 
GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:only-child > 
.sidebar-button.button, .inline-toolbar.location-bar GtkToolButton:only-child > .sidebar-button.button, 
.inline-toolbar .header-bar GtkToolButton:only-child > .button.titlebutton, .header-bar .inline-toolbar 
GtkToolButton:only-child > .button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:only-child > .button.titlebutton,
 .titlebar .inline-toolbar GtkToolButton:only-child > .button.titlebutton,
 .inline-toolbar.toolbar GtkToolButton:backdrop:only-child > .button.flat,
@@ -1094,21 +1128,25 @@ entry {
   border-radius: 3px;
   border-style: solid; }
 
-.linked.vertical > entry, .linked.vertical > .button, .linked.vertical > .button:hover, .linked.vertical > 
.button:active, .linked.vertical > .button:checked, .linked.vertical > .button:backdrop, .linked.vertical > 
GtkComboBoxText > .the-button-in-the-combobox,
+.linked.vertical > entry, .linked.vertical > .button, .header-bar .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 > 
GtkComboBoxText > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox > .the-button-in-the-combobox {
   border-style: solid solid none solid;
   border-radius: 0; }
 
-.linked.vertical > entry:first-child, .linked.vertical > .button:first-child, .linked.vertical > 
GtkComboBoxText:first-child > .the-button-in-the-combobox,
+.linked.vertical > entry:first-child, .linked.vertical > .button:first-child, .header-bar .linked.vertical > 
.button.titlebutton:first-child,
+.titlebar .linked.vertical > .button.titlebutton:first-child, .linked.vertical > GtkComboBoxText:first-child 
.the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox {
   border-top-left-radius: 3px;
   border-top-right-radius: 3px; }
-.linked.vertical > entry:last-child, .linked.vertical > .button:last-child, .linked.vertical > 
GtkComboBoxText:last-child > .the-button-in-the-combobox,
+.linked.vertical > entry:last-child, .linked.vertical > .button:last-child, .header-bar .linked.vertical > 
.button.titlebutton:last-child,
+.titlebar .linked.vertical > .button.titlebutton:last-child, .linked.vertical > GtkComboBoxText:last-child > 
.the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox {
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border-style: solid; }
-.linked.vertical > entry:only-child, .linked.vertical > .button:only-child, .linked.vertical > 
GtkComboBoxText:only-child > .the-button-in-the-combobox,
+.linked.vertical > entry:only-child, .linked.vertical > .button:only-child, .header-bar .linked.vertical > 
.button.titlebutton:only-child,
+.titlebar .linked.vertical > .button.titlebutton:only-child, .linked.vertical > GtkComboBoxText:only-child > 
.the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox {
   border-radius: 3px;
   border-style: solid; }
@@ -1155,7 +1193,7 @@ notebook tab .titlebar .button.titlebutton,
   outline-offset: -1px; }
   .menuitem.button.flat:hover, .menuitem.sidebar-button.button:hover, .header-bar 
.menuitem.titlebutton.button:hover,
   .titlebar .menuitem.titlebutton.button:hover {
-    background-color: #4b5050; }
+    background-color: #4b5150; }
 
 GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton,
 .titlebar GtkColorButton.button.titlebutton {
@@ -1181,17 +1219,17 @@ GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton,
   *:link:hover, .button:hover:link, .button:hover:visited {
     color: #74aae2; }
     *:selected *:link:hover, *:selected .button:hover:link, *:selected .button:hover:visited {
-      color: #e8eef5; }
+      color: #e9eff5; }
   *:link:active, .button:active:link, .button:active:visited {
     color: #4a90d9; }
     *:selected *:link:active, *:selected .button:active:link, *:selected .button:active:visited {
-      color: #d2deeb; }
+      color: #d3dfeb; }
   *: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,
   .header-bar.selection-mode .subtitle:backdrop:hover:link {
     color: #215d9c; }
   *:link:selected, .button:selected:link, .button:selected:visited, .titlebar.selection-mode .subtitle:link,
   .header-bar.selection-mode .subtitle:link, *:selected *:link, *:selected .button:link, *:selected 
.button:visited {
-    color: #d2deeb; }
+    color: #d3dfeb; }
 
 .button:link, .header-bar .button.titlebutton:link,
 .titlebar .button.titlebutton:link, .button:visited, .header-bar .button.titlebutton:visited,
@@ -1211,7 +1249,7 @@ GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton,
   background-image: none;
   border-style: none none none solid;
   border-color: rgba(28, 31, 31, 0.3);
-  color: #dadad8;
+  color: #dadad9;
   border-radius: 0;
   box-shadow: none; }
   .spinbutton:not(.vertical) .button:dir(rtl) {
@@ -1220,13 +1258,13 @@ GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton,
     color: #eeeeec;
     background-color: rgba(238, 238, 236, 0.05); }
   .spinbutton:not(.vertical) .button:insensitive {
-    color: rgba(147, 150, 149, 0.3); }
+    color: rgba(148, 151, 150, 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: #888b8a;
-    border-color: rgba(30, 34, 34, 0.3);
+    color: #8a8c8b;
+    border-color: rgba(31, 34, 34, 0.3);
     background-color: transparent; }
   .spinbutton:not(.vertical) .button:backdrop:insensitive {
     background-image: none;
@@ -1279,7 +1317,7 @@ GtkColorButton.button, .header-bar GtkColorButton.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: #878989;
+    color: #878a89;
     border-color: rgba(0, 0, 0, 0.5);
     icon-shadow: none;
     box-shadow: none; }
@@ -1315,29 +1353,31 @@ GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton,
       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: #939695;
+      color: #949796;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #323636);
+      background-image: linear-gradient(to bottom, #333636);
       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 .button:first-child:insensitive > .label, .spinbutton.vertical .header-bar 
.button.titlebutton:first-child:insensitive > .label,
+      .spinbutton.vertical .titlebar .button.titlebutton:first-child:insensitive > .label {
         color: inherit; }
     .spinbutton.vertical .button:first-child:backdrop {
-      color: #939695;
-      border-color: #1e2222;
+      color: #949796;
+      border-color: #1f2222;
       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: #1e2222;
-        background-image: linear-gradient(to bottom, #323636);
+        border-color: #1f2222;
+        background-image: linear-gradient(to bottom, #333636);
         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 .button:first-child:backdrop:insensitive > .label, .spinbutton.vertical 
.header-bar .button.titlebutton:first-child:backdrop:insensitive > .label,
+        .spinbutton.vertical .titlebar .button.titlebutton:first-child:backdrop:insensitive > .label {
           color: inherit; }
 .spinbutton.vertical.entry {
   border-radius: 0;
@@ -1377,9 +1417,9 @@ GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton,
     icon-shadow: none;
     outline-color: rgba(238, 238, 236, 0.3); }
   .osd .spinbutton.vertical .button:first-child:insensitive {
-    color: #878989;
+    color: #878a89;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+    background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -1411,11 +1451,11 @@ GtkComboBox {
     padding-top: 3px;
     padding-bottom: 4px; }
   GtkComboBox:insensitive {
-    color: #939695;
+    color: #949796;
     text-shadow: none;
     icon-shadow: none; }
   GtkComboBox:backdrop {
-    color: #939695;
+    color: #949796;
     text-shadow: none;
     icon-shadow: none; }
   GtkComboBox:backdrop:insensitive {
@@ -1465,10 +1505,10 @@ GtkComboBox {
   border-style: solid;
   border-color: #1c1f1f;
   background-color: #303535;
-  box-shadow: inset 0 2px 3px -1px #242727, 0 1px rgba(238, 238, 236, 0.1); }
+  box-shadow: inset 0 2px 3px -1px #242828, 0 1px rgba(238, 238, 236, 0.1); }
   .inline-toolbar:backdrop, .search-bar:backdrop, .location-bar:backdrop {
-    border-color: #1e2222;
-    background-color: #2f3434;
+    border-color: #1f2222;
+    background-color: #303535;
     box-shadow: none; }
 
 /***************
@@ -1483,10 +1523,10 @@ GtkComboBox {
   border-radius: 7px 7px 0 0;
   background-color: transparent;
   background-image: linear-gradient(to bottom, #434a4a, #393f3f);
-  box-shadow: inset 0 -1px #2d3232, inset 0 1px rgba(238, 238, 236, 0.1); }
+  box-shadow: inset 0 -1px #2e3232, inset 0 1px rgba(238, 238, 236, 0.1); }
   .titlebar:backdrop,
   .header-bar:backdrop {
-    border-color: #1e2222;
+    border-color: #1f2222;
     background-color: #393f3f;
     background-image: none;
     box-shadow: inset 0 1px rgba(238, 238, 236, 0.1); }
@@ -1510,18 +1550,18 @@ GtkComboBox {
     .titlebar .header-bar-separator:backdrop, .titlebar > GtkBox > separator.vertical:backdrop,
     .header-bar .header-bar-separator:backdrop,
     .header-bar > GtkBox > separator.vertical:backdrop {
-      border-image: linear-gradient(to bottom, rgba(30, 34, 34, 0.5)) 0 1/1px 1px; }
+      border-image: linear-gradient(to bottom, rgba(31, 34, 34, 0.5)) 0 1/1px 1px; }
   .titlebar.selection-mode,
   .header-bar.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 #1a4b7e, inset 0 1px rgba(43, 100, 160, 0.55); }
+    box-shadow: inset 0 -1px #1b4c7f, inset 0 1px rgba(43, 100, 160, 0.55); }
     .titlebar.selection-mode:backdrop,
     .header-bar.selection-mode:backdrop {
       background-image: linear-gradient(to bottom, #215d9c);
-      box-shadow: inset 0 1px rgba(48, 103, 161, 0.46); }
+      box-shadow: inset 0 1px rgba(48, 104, 162, 0.46); }
     .titlebar.selection-mode .button,
     .header-bar.selection-mode .button {
       color: #ffffff;
@@ -1567,7 +1607,7 @@ GtkComboBox {
       .header-bar.selection-mode .button.flat:backdrop,
       .header-bar.selection-mode .sidebar-button.button:backdrop,
       .header-bar.selection-mode .titlebutton.button:backdrop {
-        color: #d2deeb;
+        color: #d3dfeb;
         border-color: #0b1e33;
         background-image: linear-gradient(to bottom, #215d9c);
         text-shadow: none;
@@ -1586,7 +1626,7 @@ GtkComboBox {
         .header-bar.selection-mode .button.flat:backdrop:checked,
         .header-bar.selection-mode .sidebar-button.button:backdrop:checked,
         .header-bar.selection-mode .titlebutton.button:backdrop:checked {
-          color: #d0d9e2;
+          color: #d1dae3;
           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);
@@ -1597,19 +1637,21 @@ GtkComboBox {
         .header-bar.selection-mode .button.flat:backdrop:insensitive,
         .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive,
         .header-bar.selection-mode .titlebutton.button:backdrop:insensitive {
-          color: #6f90b2;
+          color: #6f91b4;
           border-color: #0b1e33;
-          background-image: linear-gradient(to bottom, #22558a);
+          background-image: linear-gradient(to bottom, #22558b);
           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 
.button.flat:backdrop:insensitive > .label, .titlebar.selection-mode 
.sidebar-button.button:backdrop:insensitive > .label,
+          .titlebar.selection-mode .button:backdrop:insensitive > .label, .titlebar.selection-mode 
.header-bar .button.titlebutton:backdrop:insensitive > .label, .titlebar.selection-mode 
.button.flat:backdrop:insensitive > .label, .titlebar.selection-mode 
.sidebar-button.button:backdrop:insensitive > .label, .titlebar.selection-mode .header-bar 
.titlebutton.button:backdrop:insensitive > .label,
           .titlebar.selection-mode .titlebutton.button:backdrop:insensitive > .label,
           .header-bar.selection-mode .button:backdrop:insensitive > .label,
+          .header-bar.selection-mode .titlebar .button.titlebutton:backdrop:insensitive > .label,
           .header-bar.selection-mode .button.flat:backdrop:insensitive > .label,
           .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive > .label,
-          .header-bar.selection-mode .titlebutton.button:backdrop:insensitive > .label {
+          .header-bar.selection-mode .titlebutton.button:backdrop:insensitive > .label,
+          .header-bar.selection-mode .titlebar .titlebutton.button: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 .sidebar-button.button:backdrop:insensitive:active,
         .titlebar.selection-mode .titlebutton.button:backdrop:insensitive:active, .titlebar.selection-mode 
.button.flat:backdrop:insensitive:checked, .titlebar.selection-mode 
.sidebar-button.button:backdrop:insensitive:checked,
@@ -1622,22 +1664,26 @@ GtkComboBox {
         .header-bar.selection-mode .button.flat:backdrop:insensitive:checked,
         .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive:checked,
         .header-bar.selection-mode .titlebutton.button:backdrop:insensitive:checked {
-          color: #6c88a5;
+          color: #6c88a7;
           border-color: #0b1e33;
-          background-image: linear-gradient(to bottom, #1d4876);
+          background-image: linear-gradient(to bottom, #1d4877);
           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 
.button:backdrop:insensitive:checked > .label, .titlebar.selection-mode 
.button.flat:backdrop:insensitive:active > .label, .titlebar.selection-mode 
.sidebar-button.button:backdrop:insensitive:active > .label,
-          .titlebar.selection-mode .titlebutton.button:backdrop:insensitive:active > .label, 
.titlebar.selection-mode .button.flat:backdrop:insensitive:checked > .label, .titlebar.selection-mode 
.sidebar-button.button:backdrop:insensitive:checked > .label,
+          .titlebar.selection-mode .button:backdrop:insensitive:active > .label, .titlebar.selection-mode 
.header-bar .button.titlebutton:backdrop:insensitive:active > .label, .titlebar.selection-mode 
.button:backdrop:insensitive:checked > .label, .titlebar.selection-mode .header-bar 
.button.titlebutton:backdrop:insensitive:checked > .label, .titlebar.selection-mode 
.button.flat:backdrop:insensitive:active > .label, .titlebar.selection-mode 
.sidebar-button.button:backdrop:insensitive:active > .label, .titlebar.selection-mode .header-bar 
.titlebutton.button:backdrop:insensitive:active > .label,
+          .titlebar.selection-mode .titlebutton.button:backdrop:insensitive:active > .label, 
.titlebar.selection-mode .button.flat:backdrop:insensitive:checked > .label, .titlebar.selection-mode 
.sidebar-button.button:backdrop:insensitive:checked > .label, .titlebar.selection-mode .header-bar 
.titlebutton.button:backdrop:insensitive:checked > .label,
           .titlebar.selection-mode .titlebutton.button:backdrop:insensitive:checked > .label,
           .header-bar.selection-mode .button:backdrop:insensitive:active > .label,
+          .header-bar.selection-mode .titlebar .button.titlebutton:backdrop:insensitive:active > .label,
           .header-bar.selection-mode .button:backdrop:insensitive:checked > .label,
+          .header-bar.selection-mode .titlebar .button.titlebutton:backdrop:insensitive:checked > .label,
           .header-bar.selection-mode .button.flat:backdrop:insensitive:active > .label,
           .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive:active > .label,
           .header-bar.selection-mode .titlebutton.button:backdrop:insensitive:active > .label,
+          .header-bar.selection-mode .titlebar .titlebutton.button:backdrop:insensitive:active > .label,
           .header-bar.selection-mode .button.flat:backdrop:insensitive:checked > .label,
           .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive:checked > .label,
-          .header-bar.selection-mode .titlebutton.button:backdrop:insensitive:checked > .label {
+          .header-bar.selection-mode .titlebutton.button:backdrop:insensitive:checked > .label,
+          .header-bar.selection-mode .titlebar .titlebutton.button:backdrop:insensitive:checked > .label {
             color: inherit; }
       .titlebar.selection-mode .button.flat:backdrop, .titlebar.selection-mode 
.sidebar-button.button:backdrop,
       .titlebar.selection-mode .titlebutton.button:backdrop, .titlebar.selection-mode 
.button.flat:insensitive, .titlebar.selection-mode .sidebar-button.button:insensitive,
@@ -1660,25 +1706,28 @@ GtkComboBox {
         icon-shadow: none; }
       .titlebar.selection-mode .button:insensitive,
       .header-bar.selection-mode .button:insensitive {
-        color: #90aac4;
+        color: #91aac5;
         border-color: #0b1e33;
-        background-image: linear-gradient(to bottom, #22558a);
+        background-image: linear-gradient(to bottom, #22558b);
         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,
-        .header-bar.selection-mode .button:insensitive > .label {
+        .titlebar.selection-mode .button:insensitive > .label, .titlebar.selection-mode .header-bar 
.button.titlebutton:insensitive > .label,
+        .header-bar.selection-mode .button:insensitive > .label,
+        .header-bar.selection-mode .titlebar .button.titlebutton:insensitive > .label {
           color: inherit; }
         .titlebar.selection-mode .button:insensitive:active, .titlebar.selection-mode 
.button:insensitive:checked,
         .header-bar.selection-mode .button:insensitive:active,
         .header-bar.selection-mode .button:insensitive:checked {
-          color: #a4b5c8;
+          color: #a5b6c9;
           border-color: #0b1e33;
-          background-image: linear-gradient(to bottom, #1b436f, #1d4876);
+          background-image: linear-gradient(to bottom, #1b4470, #1d4877);
           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 
.button:insensitive:checked > .label,
+          .titlebar.selection-mode .button:insensitive:active > .label, .titlebar.selection-mode .header-bar 
.button.titlebutton:insensitive:active > .label, .titlebar.selection-mode .button:insensitive:checked > 
.label, .titlebar.selection-mode .header-bar .button.titlebutton:insensitive:checked > .label,
           .header-bar.selection-mode .button:insensitive:active > .label,
-          .header-bar.selection-mode .button:insensitive:checked > .label {
+          .header-bar.selection-mode .titlebar .button.titlebutton:insensitive:active > .label,
+          .header-bar.selection-mode .button:insensitive:checked > .label,
+          .header-bar.selection-mode .titlebar .button.titlebutton:insensitive:checked > .label {
             color: inherit; }
       .titlebar.selection-mode .button.suggested-action,
       .header-bar.selection-mode .button.suggested-action {
@@ -1712,20 +1761,21 @@ GtkComboBox {
           border-color: #0f2b48; }
         .titlebar.selection-mode .button.suggested-action:insensitive,
         .header-bar.selection-mode .button.suggested-action:insensitive {
-          color: #939695;
+          color: #949796;
           border-color: #1c1f1f;
-          background-image: linear-gradient(to bottom, #323636);
+          background-image: linear-gradient(to bottom, #333636);
           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,
-          .header-bar.selection-mode .button.suggested-action:insensitive > .label {
+          .titlebar.selection-mode .button.suggested-action:insensitive > .label, .titlebar.selection-mode 
.header-bar .suggested-action.button.titlebutton:insensitive > .label,
+          .header-bar.selection-mode .button.suggested-action:insensitive > .label,
+          .header-bar.selection-mode .titlebar .suggested-action.button.titlebutton:insensitive > .label {
             color: inherit; }
         .titlebar.selection-mode .button.suggested-action:backdrop,
         .header-bar.selection-mode .button.suggested-action:backdrop {
-          color: #939695;
-          border-color: #1e2222;
+          color: #949796;
+          border-color: #1f2222;
           background-image: linear-gradient(to bottom, #393f3f);
           text-shadow: none;
           icon-shadow: none;
@@ -1734,14 +1784,15 @@ GtkComboBox {
         .titlebar.selection-mode .button.suggested-action:backdrop:insensitive,
         .header-bar.selection-mode .button.suggested-action:backdrop:insensitive {
           color: #5d6767;
-          border-color: #1e2222;
-          background-image: linear-gradient(to bottom, #323636);
+          border-color: #1f2222;
+          background-image: linear-gradient(to bottom, #333636);
           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,
-          .header-bar.selection-mode .button.suggested-action:backdrop:insensitive > .label {
+          .titlebar.selection-mode .button.suggested-action:backdrop:insensitive > .label, 
.titlebar.selection-mode .header-bar .suggested-action.button.titlebutton:backdrop:insensitive > .label,
+          .header-bar.selection-mode .button.suggested-action:backdrop:insensitive > .label,
+          .header-bar.selection-mode .titlebar .suggested-action.button.titlebutton:backdrop:insensitive > 
.label {
             color: inherit; }
     .titlebar.selection-mode .selection-menu, .titlebar.selection-mode .selection-menu:backdrop,
     .header-bar.selection-mode .selection-menu,
@@ -1774,28 +1825,25 @@ GtkComboBox {
 /************
  * Pathbars *
  ************/
-.path-bar .button, .path-bar .header-bar .button.titlebutton, .header-bar .path-bar .button.titlebutton,
-.path-bar .titlebar .button.titlebutton,
-.titlebar .path-bar .button.titlebutton {
-  padding: 5px 6px 6px; }
-  .path-bar .button:first-child {
-    padding-left: 8px; }
-  .path-bar .button:last-child {
-    padding-right: 8px; }
-  .path-bar .button:only-child {
-    padding-left: 12px;
-    padding-right: 12px; }
-  .path-bar .button label:last-child {
-    padding-left: 2px; }
-  .path-bar .button label:first-child {
-    padding-right: 2px; }
-  .path-bar .button label:only-child {
-    padding-right: 0;
-    padding-left: 0; }
-  .path-bar .button image, .path-bar .header-bar .button.titlebutton image, .header-bar .path-bar 
.button.titlebutton image,
-  .path-bar .titlebar .button.titlebutton image,
-  .titlebar .path-bar .button.titlebutton image {
-    padding-top: 1px; }
+.path-bar .button.flat, .path-bar .sidebar-button.button, .path-bar .header-bar .titlebutton.button, 
.header-bar .path-bar .titlebutton.button,
+.path-bar .titlebar .titlebutton.button,
+.titlebar .path-bar .titlebutton.button {
+  background-image: none;
+  border-radius: 0px;
+  border-color: transparent;
+  box-shadow: 0px 0px 0px;
+  margin: 0px;
+  opacity: 0.55;
+  padding: 3px 8px 4px; }
+  .path-bar .button.flat:hover, .path-bar .sidebar-button.button:hover, .path-bar .header-bar 
.titlebutton.button:hover, .header-bar .path-bar .titlebutton.button:hover,
+  .path-bar .titlebar .titlebutton.button:hover,
+  .titlebar .path-bar .titlebutton.button:hover {
+    box-shadow: 0px 2px 0px #feffff; }
+  .path-bar .button.flat:checked, .path-bar .sidebar-button.button:checked, .path-bar .header-bar 
.titlebutton.button:checked, .header-bar .path-bar .titlebutton.button:checked,
+  .path-bar .titlebar .titlebutton.button:checked,
+  .titlebar .path-bar .titlebutton.button:checked {
+    box-shadow: 0px 2px 0px #215d9c;
+    color: #eeeeec; }
 
 /**************
  * Tree Views *
@@ -1806,33 +1854,33 @@ GtkTreeView.view {
   -GtkTreeView-tree-line-width: 1;
   -GtkTreeView-tree-line-pattern: '';
   -GtkTreeView-expander-size: 16;
-  border-left-color: #8b8b8a;
+  border-left-color: #8c8c8b;
   border-top-color: #393f3f; }
   GtkTreeView.view:selected {
     border-radius: 0; }
   GtkTreeView.view:selected, GtkTreeView.view:backdrop:selected {
-    border-left-color: #90aecd;
+    border-left-color: #90aece;
     border-top-color: rgba(238, 238, 236, 0.1); }
   GtkTreeView.view:insensitive {
-    color: #939695; }
+    color: #949796; }
     GtkTreeView.view:insensitive:selected {
-      color: #799dc3; }
+      color: #7a9ec4; }
       GtkTreeView.view:insensitive:selected:backdrop {
-        color: #638db9; }
+        color: #648eba; }
     GtkTreeView.view:insensitive:backdrop {
       color: #5d6767; }
   GtkTreeView.view.separator:backdrop {
     color: rgba(0, 0, 0, 0.1); }
   GtkTreeView.view:backdrop {
-    border-left-color: #666a6a;
+    border-left-color: #676b6b;
     border-top: #393f3f; }
   GtkTreeView.view.dnd {
     border-style: solid none;
     border-width: 1px;
-    border-color: #87a5c4; }
+    border-color: #88a6c4; }
   GtkTreeView.view.expander {
     -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
-    color: #b2b2b1; }
+    color: #b3b3b2; }
     GtkTreeView.view.expander:dir(rtl) {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
     GtkTreeView.view.expander:hover {
@@ -1846,7 +1894,7 @@ GtkTreeView.view {
     GtkTreeView.view.expander:checked {
       -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
     GtkTreeView.view.expander:backdrop {
-      color: #747675; }
+      color: #757776; }
   GtkTreeView.view.progressbar {
     border: 1px solid #0f2b48;
     border-radius: 4px;
@@ -1871,7 +1919,7 @@ GtkTreeView.view {
 column-header .button, column-header .header-bar .button.titlebutton, .header-bar column-header 
.button.titlebutton,
 column-header .titlebar .button.titlebutton,
 .titlebar column-header .button.titlebutton {
-  color: #8b8b8a;
+  color: #8c8c8b;
   background-color: #292929;
   font-weight: bold;
   text-shadow: none;
@@ -1879,7 +1927,7 @@ column-header .titlebar .button.titlebutton,
   column-header .button:hover, column-header .header-bar .button.titlebutton:hover, .header-bar 
column-header .button.titlebutton:hover,
   column-header .titlebar .button.titlebutton:hover,
   .titlebar column-header .button.titlebutton:hover {
-    color: #bcbcbb;
+    color: #bdbdbc;
     box-shadow: none;
     transition: none; }
   column-header .button:active, column-header .header-bar .button.titlebutton:active, .header-bar 
column-header .button.titlebutton:active,
@@ -1920,7 +1968,7 @@ column-header .titlebar .button.titlebutton,
   .titlebar column-header .button.titlebutton:backdrop {
     border-color: #393f3f;
     border-style: none solid solid none;
-    color: #666a6a;
+    color: #676b6b;
     background-image: none;
     background-color: #2c2c2c; }
     column-header .button:backdrop:insensitive {
@@ -1942,7 +1990,7 @@ column-header .titlebar .button.titlebutton,
       box-shadow: inset 0 -3px #215d9c;
       color: #4a90d9; }
     .menubar > .menuitem:insensitive {
-      color: #939695;
+      color: #949796;
       box-shadow: none; }
 
 .menu {
@@ -1959,11 +2007,11 @@ column-header .titlebar .button.titlebutton,
       color: #ffffff;
       background-color: #215d9c; }
     .menu .menuitem:insensitive {
-      color: #939695; }
+      color: #949796; }
       .menu .menuitem:insensitive:backdrop {
         color: #5d6767; }
     .menu .menuitem:backdrop, .menu .menuitem:backdrop:hover {
-      color: #939695;
+      color: #949796;
       background-color: #2c2c2c; }
     .menu .menuitem.arrow {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
@@ -1974,11 +2022,11 @@ column-header .titlebar .button.titlebutton,
     border-style: none;
     border-radius: 0; }
     .menu.button.top {
-      border-bottom: 1px solid #3c3c3c; }
+      border-bottom: 1px solid #3d3d3c; }
     .menu.button.bottom {
-      border-top: 1px solid #3c3c3c; }
+      border-top: 1px solid #3d3d3c; }
     .menu.button:hover {
-      background-color: #3c3c3c; }
+      background-color: #3d3d3c; }
     .menu.button:insensitive {
       color: transparent;
       background-color: transparent;
@@ -2046,7 +2094,7 @@ notebook {
     notebook.frame.left {
       border-left-width: 0; }
     notebook.frame:backdrop {
-      border-color: #1e2222; }
+      border-color: #1f2222; }
   notebook.header {
     background-color: #303535; }
     notebook.header.frame {
@@ -2060,25 +2108,25 @@ notebook {
       notebook.header.frame.left {
         border-right-width: 0; }
       notebook.header.frame:backdrop {
-        border-color: #1e2222; }
+        border-color: #1f2222; }
     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 #1e2222; }
+        box-shadow: inset 0 -1px #1f2222; }
     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 #1e2222; }
+        box-shadow: inset 0 1px #1f2222; }
     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 #1e2222; }
+        box-shadow: inset 1px 0 #1f2222; }
     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 #1e2222; }
+        box-shadow: inset -1px 0 #1f2222; }
     notebook.header:backdrop {
-      background-color: #2f3434;
+      background-color: #303535;
       box-shadow: none; }
   notebook tab {
     border-width: 0;
@@ -2155,7 +2203,7 @@ notebook {
         notebook tab.reorderable-page.top:active:hover {
           background-color: rgba(57, 63, 63, 0.7); }
         notebook tab.reorderable-page.top:active:backdrop {
-          border-color: #1e2222;
+          border-color: #1f2222;
           background-color: #393f3f;
           border-bottom-color: #215d9c; }
       notebook tab.reorderable-page.top:backdrop {
@@ -2174,7 +2222,7 @@ notebook {
         notebook tab.reorderable-page.bottom:active:hover {
           background-color: rgba(57, 63, 63, 0.7); }
         notebook tab.reorderable-page.bottom:active:backdrop {
-          border-color: #1e2222;
+          border-color: #1f2222;
           background-color: #393f3f;
           border-top-color: #215d9c; }
       notebook tab.reorderable-page.bottom:backdrop {
@@ -2193,7 +2241,7 @@ notebook {
         notebook tab.reorderable-page.left:active:hover {
           background-color: rgba(57, 63, 63, 0.7); }
         notebook tab.reorderable-page.left:active:backdrop {
-          border-color: #1e2222;
+          border-color: #1f2222;
           background-color: #393f3f;
           border-right-color: #215d9c; }
       notebook tab.reorderable-page.left:backdrop {
@@ -2212,7 +2260,7 @@ notebook {
         notebook tab.reorderable-page.right:active:hover {
           background-color: rgba(57, 63, 63, 0.7); }
         notebook tab.reorderable-page.right:active:backdrop {
-          border-color: #1e2222;
+          border-color: #1f2222;
           background-color: #393f3f;
           border-left-color: #215d9c; }
       notebook tab.reorderable-page.right:backdrop {
@@ -2221,17 +2269,17 @@ notebook {
     notebook tab label {
       padding: 0 2px;
       font-weight: bold;
-      color: #939695; }
+      color: #949796; }
       notebook tab label:backdrop {
-        color: #787e7e; }
+        color: #797f7f; }
     notebook tab:hover label {
-      color: #c0c2c0; }
+      color: #c1c3c1; }
       notebook tab:hover label:backdrop {
-        color: #787e7e; }
+        color: #797f7f; }
     notebook tab:active label {
       color: #eeeeec; }
       notebook tab:active label:backdrop {
-        color: #939695; }
+        color: #949796; }
     notebook tab .button, notebook tab .header-bar .button.titlebutton, .header-bar notebook tab 
.button.titlebutton,
     notebook tab .titlebar .button.titlebutton,
     .titlebar notebook tab .button.titlebutton {
@@ -2266,22 +2314,22 @@ notebook {
       notebook tab .button:backdrop, notebook tab .header-bar .button.titlebutton:backdrop, .header-bar 
notebook tab .button.titlebutton:backdrop,
       notebook tab .titlebar .button.titlebutton:backdrop,
       .titlebar notebook tab .button.titlebutton:backdrop {
-        color: rgba(147, 150, 149, 0.3);
+        color: rgba(148, 151, 150, 0.3);
         border-color: transparent; }
       notebook tab .button > image, notebook tab .header-bar .button.titlebutton > image, .header-bar 
notebook tab .button.titlebutton > image,
       notebook tab .titlebar .button.titlebutton > image,
       .titlebar notebook tab .button.titlebutton > image {
         padding: 2px; }
   notebook.arrow {
-    color: #939695; }
+    color: #949796; }
     notebook.arrow:hover {
-      color: #c0c2c0; }
+      color: #c1c3c1; }
     notebook.arrow:active {
       color: #eeeeec; }
     notebook.arrow:insensitive {
-      color: rgba(147, 150, 149, 0.3); }
+      color: rgba(148, 151, 150, 0.3); }
     notebook.arrow:backdrop {
-      color: rgba(147, 150, 149, 0.4); }
+      color: rgba(148, 151, 150, 0.4); }
       notebook.arrow:backdrop:insensitive {
         color: #5d6767; }
 
@@ -2324,15 +2372,15 @@ notebook {
     border: 1px none #1c1f1f; }
     .scrollbar .trough:backdrop {
       background-color: #323737;
-      border-color: #1e2222; }
+      border-color: #1f2222; }
   .scrollbar .slider {
-    background-color: #a5a8a6; }
+    background-color: #a6a8a7; }
     .scrollbar .slider:hover {
-      background-color: #c9cbc9; }
+      background-color: #cacbc9; }
     .scrollbar .slider:prelight:active {
       background-color: #2a76c6; }
     .scrollbar .slider:backdrop {
-      background-color: #5d6161; }
+      background-color: #5d6262; }
     .scrollbar .slider:insensitive {
       background-color: transparent; }
   .scrollbar .slider {
@@ -2372,7 +2420,7 @@ notebook {
     border-image-slice: 0 1 0 0; }
   .scrollbars-junction:backdrop,
   .scrollbars-junction.frame:backdrop {
-    border-image-source: linear-gradient(to bottom, #1e2222 1px, transparent 1px);
+    border-image-source: linear-gradient(to bottom, #1f2222 1px, transparent 1px);
     background-color: #323737; }
 
 /**********
@@ -2399,16 +2447,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: #939695;
+    color: #949796;
     border-color: #1c1f1f;
     background-image: none;
-    background-color: #323636;
+    background-color: #333636;
     box-shadow: 0 1px rgba(238, 238, 236, 0.1);
     text-shadow: none; }
   switch:backdrop {
-    color: #939695;
-    border-color: #1e2222;
-    background-image: linear-gradient(to bottom, #2f3434);
+    color: #949796;
+    border-color: #1f2222;
+    background-image: linear-gradient(to bottom, #303535);
     box-shadow: none;
     text-shadow: none; }
     switch:backdrop:active {
@@ -2417,9 +2465,9 @@ switch {
       box-shadow: none; }
   switch:insensitive {
     color: #5d6767;
-    border-color: #1e2222;
+    border-color: #1f2222;
     background-image: none;
-    background-color: #323636; }
+    background-color: #333636; }
   switch slider {
     border: 1px solid;
     border-radius: 3px;
@@ -2430,7 +2478,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 
#2a2f2f; }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px rgba(57, 63, 63, 0.6), inset 0 -1px 
#2b2f2f; }
   switch:hover slider {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
@@ -2439,21 +2487,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 
#2a2f2f; }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px rgba(57, 63, 63, 0.6), inset 0 -1px 
#2b2f2f; }
   switch:active slider {
     border: 1px solid #0f2b48; }
   switch:insensitive slider {
-    color: #939695;
+    color: #949796;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #323636);
+    background-image: linear-gradient(to bottom, #333636);
     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: #939695;
-    border-color: #1e2222;
+    color: #949796;
+    border-color: #1f2222;
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     icon-shadow: none;
@@ -2463,8 +2511,8 @@ switch {
     border-color: #0f2b48; }
   switch:backdrop:insensitive slider {
     color: #5d6767;
-    border-color: #1e2222;
-    background-image: linear-gradient(to bottom, #323636);
+    border-color: #1f2222;
+    background-image: linear-gradient(to bottom, #333636);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
@@ -2603,7 +2651,7 @@ switch {
 
 .menu .menuitem.check {
   -gtk-icon-source: -gtk-icontheme("checkbox-symbolic");
-  color: #a5a8a6;
+  color: #a6a8a7;
   icon-shadow: none; }
   .menu .menuitem.check:active, .menu .menuitem.check:checked {
     -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); }
@@ -2612,7 +2660,7 @@ switch {
   .menu .menuitem.check:hover {
     color: #ffffff; }
   .menu .menuitem.check:insensitive {
-    color: #666a6a; }
+    color: #676b6b; }
 
 .radio {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark 2 
png"));
@@ -2742,7 +2790,7 @@ switch {
 
 .menu .menuitem.radio {
   -gtk-icon-source: -gtk-icontheme("radio-symbolic");
-  color: #a5a8a6;
+  color: #a6a8a7;
   icon-shadow: none; }
   .menu .menuitem.radio:active, .menu .menuitem.radio:checked {
     -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); }
@@ -2751,7 +2799,7 @@ switch {
   .menu .menuitem.radio:hover {
     color: #ffffff; }
   .menu .menuitem.radio:insensitive {
-    color: #666a6a; }
+    color: #676b6b; }
 
 .view.check, .view.radio,
 .list-row .check, list-row .radio {
@@ -2805,7 +2853,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   padding: 1px 2px 4px;
   outline-offset: 0; }
   GtkCheckButton.text-button:insensitive, GtkCheckButton.text-button:insensitive:active, 
GtkCheckButton.text-button:insensitive:inconsistent, GtkRadioButton.text-button:insensitive, 
GtkRadioButton.text-button:insensitive:active, GtkRadioButton.text-button:insensitive:inconsistent {
-    color: #939695; }
+    color: #949796; }
     GtkCheckButton.text-button:insensitive:backdrop, GtkCheckButton.text-button:insensitive:active:backdrop, 
GtkCheckButton.text-button:insensitive:inconsistent:backdrop, 
GtkRadioButton.text-button:insensitive:backdrop, GtkRadioButton.text-button:insensitive:active:backdrop, 
GtkRadioButton.text-button:insensitive:inconsistent:backdrop {
       color: #5d6767; }
 
@@ -2843,7 +2891,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     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 #2a2f2f; }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px #393f3f, inset 0 -1px #2b2f2f; }
     .scale.slider:hover,
     .scale.scale-has-marks-above.scale-has-marks-below.slider:hover,
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:hover {
@@ -2862,22 +2910,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:insensitive {
       border-style: solid;
       border-radius: 50%;
-      background-image: linear-gradient(to bottom, #323636);
+      background-image: linear-gradient(to bottom, #333636);
       box-shadow: none; }
     .scale.slider:backdrop,
     .scale.scale-has-marks-above.scale-has-marks-below.slider:backdrop,
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:backdrop {
       border-style: solid;
       border-radius: 50%;
-      border-color: #171a1a;
+      border-color: #181a1a;
       background-image: linear-gradient(to bottom, #393f3f);
       box-shadow: none; }
     .scale.slider:backdrop:insensitive,
     .scale.scale-has-marks-above.scale-has-marks-below.slider:backdrop:insensitive,
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:backdrop:insensitive {
       color: #5d6767;
-      border-color: #1e2222;
-      background-image: linear-gradient(to bottom, #323636);
+      border-color: #1f2222;
+      background-image: linear-gradient(to bottom, #333636);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
@@ -2964,21 +3012,21 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.vertical:insensitive {
       border-color: #1c1f1f;
       background-image: none;
-      background-color: #323636;
+      background-color: #333636;
       box-shadow: 0 1px rgba(238, 238, 236, 0.1); }
     .scale.trough:backdrop,
     .scale.scale-has-marks-above.scale-has-marks-below.trough:backdrop,
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:backdrop {
-      border-color: #1e2222;
-      background-color: #2a2f2f;
+      border-color: #1f2222;
+      background-color: #2b2f2f;
       box-shadow: none; }
     .scale.trough:backdrop:insensitive, .scale.trough .highlight:backdrop:insensitive,
     .scale.scale-has-marks-above.scale-has-marks-below.trough:backdrop:insensitive,
     .scale.scale-has-marks-above.scale-has-marks-below.trough .highlight:backdrop:insensitive,
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:backdrop:insensitive,
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough .highlight:backdrop:insensitive {
-      border-color: #1e2222;
-      background-color: #323636; }
+      border-color: #1f2222;
+      background-color: #333636; }
     .osd .scale.trough, .osd
     .scale.scale-has-marks-above.scale-has-marks-below.trough, .osd
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough {
@@ -3032,14 +3080,14 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight:insensitive {
       border-color: #215d9c;
       box-shadow: none;
-      background-color: #90aecd;
+      background-color: #90aece;
       background-image: none; }
       .list-row:selected .scale:insensitive:backdrop, .list-row:selected 
.scale.trough.highlight:insensitive:backdrop, .list-row:selected
       .scale.scale-has-marks-above.scale-has-marks-below:insensitive:backdrop, .list-row:selected
       .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight:insensitive:backdrop, 
.list-row:selected
       .scale.vertical.scale-has-marks-above.scale-has-marks-below:insensitive:backdrop, .list-row:selected
       .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight:insensitive:backdrop {
-        background-color: #90aecd; }
+        background-color: #90aece; }
 
 .scale.scale-has-marks-below {
   -GtkScale-slider-length: 20;
@@ -3294,10 +3342,10 @@ GtkProgressBar {
   GtkProgressBar.trough {
     border: 1px solid #1c1f1f;
     border-radius: 3px;
-    background-color: #2e3333; }
+    background-color: #2f3434; }
     GtkProgressBar.trough:backdrop {
-      border-color: #1e2222;
-      background-color: #2f3434;
+      border-color: #1f2222;
+      background-color: #303535;
       box-shadow: 0 1px rgba(255, 255, 255, 0); }
     GtkProgressBar.trough.osd {
       border-style: none;
@@ -3352,15 +3400,15 @@ GtkProgressBar {
     padding: 2px;
     border-radius: 3px;
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+    background-image: linear-gradient(to bottom, #1d2020, #242525 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); }
     .level-bar.trough:backdrop {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
-      color: #d4d4d4;
-      border-color: #1e2222;
+      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+      color: #d5d5d5;
+      border-color: #1f2222;
       background-image: linear-gradient(to bottom, #2c2c2c);
       box-shadow: 0 1px rgba(238, 238, 236, 0); }
   .level-bar.fill-block {
@@ -3390,7 +3438,7 @@ GtkProgressBar {
       border-color: rgba(238, 238, 236, 0.1);
       box-shadow: none; }
       .level-bar.fill-block.empty-fill-block:backdrop {
-        border-color: rgba(147, 150, 149, 0.15); }
+        border-color: rgba(148, 151, 150, 0.15); }
 
 /**********
  * Frames *
@@ -3401,7 +3449,7 @@ GtkProgressBar {
   .frame.flat {
     border-style: none; }
   .frame:backdrop {
-    border-color: #1e2222; }
+    border-color: #1f2222; }
   .frame.action-bar {
     padding: 6px;
     border-width: 1px 0 0; }
@@ -3422,7 +3470,7 @@ separator {
   border-color: #1c1f1f; }
   .list:backdrop {
     background-color: #2c2c2c;
-    border-color: #1e2222; }
+    border-color: #1f2222; }
 
 .list-row,
 .grid-child {
@@ -3437,7 +3485,7 @@ separator {
 .list-row.activatable:selected:active {
   box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); }
 .list-row.activatable:selected.has-open-popup, .list-row.activatable:selected:hover {
-  background-color: #356ba4; }
+  background-color: #356ca4; }
 .list-row.activatable:selected:backdrop {
   background-color: #215d9c; }
 
@@ -3478,8 +3526,8 @@ separator {
   .list-row:selected .button:backdrop, .list-row:selected .button.flat:backdrop, .list-row:selected 
.sidebar-button.button:backdrop, .list-row:selected .header-bar .titlebutton.button:backdrop, .header-bar 
.list-row:selected .titlebutton.button:backdrop,
   .list-row:selected .titlebar .titlebutton.button:backdrop,
   .titlebar .list-row:selected .titlebutton.button:backdrop {
-    color: #939695;
-    border-color: #1e2222;
+    color: #949796;
+    border-color: #1f2222;
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     icon-shadow: none;
@@ -3489,20 +3537,21 @@ separator {
     .titlebar .list-row:selected .titlebutton.button:backdrop:active, .list-row:selected 
.button.flat:backdrop:checked, .list-row:selected .sidebar-button.button:backdrop:checked, .list-row:selected 
.header-bar .titlebutton.button:backdrop:checked, .header-bar .list-row:selected 
.titlebutton.button:backdrop:checked,
     .list-row:selected .titlebar .titlebutton.button:backdrop:checked,
     .titlebar .list-row:selected .titlebutton.button:backdrop:checked {
-      color: #939695;
-      border-color: #1e2222;
-      background-image: linear-gradient(to bottom, #2f3434);
+      color: #949796;
+      border-color: #1f2222;
+      background-image: linear-gradient(to bottom, #303535);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     .list-row:selected .button:backdrop:insensitive, .list-row:selected .button.flat:backdrop:insensitive, 
.list-row:selected .sidebar-button.button:backdrop:insensitive, .list-row:selected .header-bar 
.titlebutton.button:backdrop:insensitive, .header-bar .list-row:selected 
.titlebutton.button:backdrop:insensitive,
     .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive,
     .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive {
       color: #5d6767;
-      border-color: #1e2222;
-      background-image: linear-gradient(to bottom, #323636);
+      border-color: #1f2222;
+      background-image: linear-gradient(to bottom, #333636);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .list-row:selected .button:backdrop:insensitive > .label, .list-row:selected 
.button.flat:backdrop:insensitive > .label, .list-row:selected .sidebar-button.button:backdrop:insensitive > 
.label, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive > .label, .header-bar 
.list-row:selected .titlebutton.button:backdrop:insensitive > .label,
+      .list-row:selected .button:backdrop:insensitive > .label, .list-row:selected .header-bar 
.button.titlebutton:backdrop:insensitive > .label,
+      .list-row:selected .titlebar .button.titlebutton:backdrop:insensitive > .label, .list-row:selected 
.button.flat:backdrop:insensitive > .label, .list-row:selected .sidebar-button.button:backdrop:insensitive > 
.label, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive > .label, .header-bar 
.list-row:selected .titlebutton.button:backdrop:insensitive > .label,
       .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive > .label,
       .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive > .label {
         color: inherit; }
@@ -3512,10 +3561,12 @@ separator {
       .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive:checked,
       .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:checked {
         color: #5d6767;
-        border-color: #1e2222;
-        background-image: linear-gradient(to bottom, #262929);
+        border-color: #1f2222;
+        background-image: linear-gradient(to bottom, #272929);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        .list-row:selected .button:backdrop:insensitive:active > .label, .list-row:selected 
.button:backdrop:insensitive:checked > .label, .list-row:selected .button.flat:backdrop:insensitive:active > 
.label, .list-row:selected .sidebar-button.button:backdrop:insensitive:active > .label, .list-row:selected 
.header-bar .titlebutton.button:backdrop:insensitive:active > .label, .header-bar .list-row:selected 
.titlebutton.button:backdrop:insensitive:active > .label,
+        .list-row:selected .button:backdrop:insensitive:active > .label, .list-row:selected .header-bar 
.button.titlebutton:backdrop:insensitive:active > .label,
+        .list-row:selected .titlebar .button.titlebutton:backdrop:insensitive:active > .label, 
.list-row:selected .button:backdrop:insensitive:checked > .label, .list-row:selected .header-bar 
.button.titlebutton:backdrop:insensitive:checked > .label,
+        .list-row:selected .titlebar .button.titlebutton:backdrop:insensitive:checked > .label, 
.list-row:selected .button.flat:backdrop:insensitive:active > .label, .list-row:selected 
.sidebar-button.button:backdrop:insensitive:active > .label, .list-row:selected .header-bar 
.titlebutton.button:backdrop:insensitive:active > .label, .header-bar .list-row:selected 
.titlebutton.button:backdrop:insensitive:active > .label,
         .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive:active > .label,
         .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:active > .label, 
.list-row:selected .button.flat:backdrop:insensitive:checked > .label, .list-row:selected 
.sidebar-button.button:backdrop:insensitive:checked > .label, .list-row:selected .header-bar 
.titlebutton.button:backdrop:insensitive:checked > .label, .header-bar .list-row:selected 
.titlebutton.button:backdrop:insensitive:checked > .label,
         .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive:checked > .label,
@@ -3530,22 +3581,25 @@ separator {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
     text-shadow: none;
     icon-shadow: none;
-    color: #939695; }
+    color: #949796; }
   .list-row:selected .button:insensitive {
-    color: #939695;
+    color: #949796;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #323636);
+    background-image: linear-gradient(to bottom, #333636);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    .list-row:selected .button:insensitive > .label {
+    .list-row:selected .button:insensitive > .label, .list-row:selected .header-bar 
.button.titlebutton:insensitive > .label,
+    .list-row:selected .titlebar .button.titlebutton:insensitive > .label {
       color: inherit; }
     .list-row:selected .button:insensitive:active, .list-row:selected .button:insensitive:checked {
-      color: #939695;
+      color: #949796;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #2f3333, #323636);
+      background-image: linear-gradient(to bottom, #313434, #333636);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .list-row:selected .button:insensitive:active > .label, .list-row:selected .button:insensitive:checked 
.label {
+      .list-row:selected .button:insensitive:active > .label, .list-row:selected .header-bar 
.button.titlebutton:insensitive:active > .label,
+      .list-row:selected .titlebar .button.titlebutton:insensitive:active > .label, .list-row:selected 
.button:insensitive:checked > .label, .list-row:selected .header-bar .button.titlebutton:insensitive:checked 
.label,
+      .list-row:selected .titlebar .button.titlebutton:insensitive:checked > .label {
         color: inherit; }
 
 .list-row {
@@ -3616,9 +3670,9 @@ separator {
     .app-notification .button:insensitive, .app-notification .button:backdrop:insensitive,
     .app-notification.frame .button:insensitive,
     .app-notification.frame .button:backdrop:insensitive {
-      color: #878989;
+      color: #878a89;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -3664,18 +3718,18 @@ GtkCalendar {
       color: #eeeeec; }
     GtkCalendar.button:backdrop, .header-bar GtkCalendar.button.titlebutton:backdrop,
     .titlebar GtkCalendar.button.titlebutton:backdrop {
-      color: rgba(147, 150, 149, 0.45); }
+      color: rgba(148, 151, 150, 0.45); }
     GtkCalendar.button:insensitive, .header-bar GtkCalendar.button.titlebutton:insensitive,
     .titlebar GtkCalendar.button.titlebutton:insensitive {
-      color: rgba(147, 150, 149, 0.45); }
+      color: rgba(148, 151, 150, 0.45); }
   GtkCalendar:inconsistent, GtkCalendar:inconsistent:backdrop {
     color: alpha(currentColor,0.55); }
   GtkCalendar.highlight, GtkCalendar.highlight:backdrop {
     font-size: smaller;
     color: #eeeeec; }
   GtkCalendar:backdrop {
-    color: #d4d4d4;
-    border-color: #1e2222; }
+    color: #d5d5d5;
+    border-color: #1f2222; }
 
 /***********
  * Dialogs *
@@ -3716,29 +3770,31 @@ GtkCalendar {
     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); }
   .message-dialog.csd .dialog-action-area .button:insensitive {
-    color: #939695;
+    color: #949796;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #323636);
+    background-image: linear-gradient(to bottom, #333636);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    .message-dialog.csd .dialog-action-area .button:insensitive > .label {
+    .message-dialog.csd .dialog-action-area .button:insensitive > .label, .message-dialog.csd 
.dialog-action-area .header-bar .button.titlebutton:insensitive > .label,
+    .message-dialog.csd .dialog-action-area .titlebar .button.titlebutton:insensitive > .label {
       color: inherit; }
   .message-dialog.csd .dialog-action-area .button:backdrop {
-    color: #939695;
-    border-color: #1e2222;
+    color: #949796;
+    border-color: #1f2222;
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   .message-dialog.csd .dialog-action-area .button:backdrop:insensitive {
     color: #5d6767;
-    border-color: #1e2222;
-    background-image: linear-gradient(to bottom, #323636);
+    border-color: #1f2222;
+    background-image: linear-gradient(to bottom, #333636);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    .message-dialog.csd .dialog-action-area .button:backdrop:insensitive > .label {
+    .message-dialog.csd .dialog-action-area .button:backdrop:insensitive > .label, .message-dialog.csd 
.dialog-action-area .header-bar .button.titlebutton:backdrop:insensitive > .label,
+    .message-dialog.csd .dialog-action-area .titlebar .button.titlebutton:backdrop:insensitive > .label {
       color: inherit; }
   .message-dialog.csd .dialog-action-area .button.suggested-action {
     color: white;
@@ -3765,7 +3821,7 @@ GtkCalendar {
       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); }
     .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop {
-      color: #d2deeb;
+      color: #d3dfeb;
       border-color: #0b1e33;
       background-image: linear-gradient(to bottom, #215d9c);
       text-shadow: none;
@@ -3773,21 +3829,23 @@ GtkCalendar {
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive {
         color: #5d6767;
-        border-color: #1e2222;
-        background-image: linear-gradient(to bottom, #323636);
+        border-color: #1f2222;
+        background-image: linear-gradient(to bottom, #333636);
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive > .label {
+        .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive > .label, 
.message-dialog.csd .dialog-action-area .header-bar .suggested-action.button.titlebutton:backdrop:insensitive 
.label,
+        .message-dialog.csd .dialog-action-area .titlebar 
.suggested-action.button.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
     .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive {
-      color: #939695;
+      color: #949796;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #323636);
+      background-image: linear-gradient(to bottom, #333636);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive > .label {
+      .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive > .label, 
.message-dialog.csd .dialog-action-area .header-bar .suggested-action.button.titlebutton:insensitive > .label,
+      .message-dialog.csd .dialog-action-area .titlebar .suggested-action.button.titlebutton:insensitive > 
.label {
         color: inherit; }
   .message-dialog.csd .dialog-action-area .button.destructive-action {
     color: white;
@@ -3814,7 +3872,7 @@ GtkCalendar {
       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); }
     .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop {
-      color: #f6cfcf;
+      color: #f7cfcf;
       border-color: #5e0707;
       background-image: linear-gradient(to bottom, #d51010);
       text-shadow: none;
@@ -3822,21 +3880,23 @@ GtkCalendar {
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive {
         color: #5d6767;
-        border-color: #1e2222;
-        background-image: linear-gradient(to bottom, #323636);
+        border-color: #1f2222;
+        background-image: linear-gradient(to bottom, #333636);
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive > .label {
+        .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive > .label, 
.message-dialog.csd .dialog-action-area .header-bar 
.destructive-action.button.titlebutton:backdrop:insensitive > .label,
+        .message-dialog.csd .dialog-action-area .titlebar 
.destructive-action.button.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
     .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive {
-      color: #939695;
+      color: #949796;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #323636);
+      background-image: linear-gradient(to bottom, #333636);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive > .label {
+      .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive > .label, 
.message-dialog.csd .dialog-action-area .header-bar .destructive-action.button.titlebutton:insensitive > 
.label,
+      .message-dialog.csd .dialog-action-area .titlebar .destructive-action.button.titlebutton:insensitive > 
.label {
         color: inherit; }
 .message-dialog.csd .dialog-action-area .button, .message-dialog.csd .dialog-action-area .button:hover, 
.message-dialog.csd .dialog-action-area .button:active, .message-dialog.csd .dialog-action-area 
.button:insensitive, .message-dialog.csd .dialog-action-area .button:backdrop, .message-dialog.csd 
.dialog-action-area .button:backdrop:insensitive, .message-dialog.csd .dialog-action-area 
.button.suggested-action, .message-dialog.csd .dialog-action-area .button.suggested-action:hover, 
.message-dialog.csd .dialog-action-area .button.suggested-action:active, .message-dialog.csd 
.dialog-action-area .button.suggested-action:backdrop, .message-dialog.csd .dialog-action-area 
.button.suggested-action:backdrop:insensitive, .message-dialog.csd .dialog-action-area 
.button.suggested-action:insensitive, .message-dialog.csd .dialog-action-area .button.destructive-action, 
.message-dialog.csd .dialog-action-area .button.destructive-action:hover, .message-dialog.csd 
.dialog-action-area .button
 .destructive-action:active, .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop, 
.message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive, .message-dialog.csd 
.dialog-action-area .button.destructive-action:insensitive {
   border-left-style: solid;
@@ -3860,7 +3920,7 @@ GtkFileChooserDialog .search-bar {
 GtkFileChooserDialog .dialog-action-box {
   border-top: 1px solid #1c1f1f; }
   GtkFileChooserDialog .dialog-action-box:backdrop {
-    border-top-color: #1e2222; }
+    border-top-color: #1f2222; }
 
 /***********
  * Sidebar *
@@ -3869,7 +3929,7 @@ GtkFileChooserDialog .dialog-action-box {
   border: none;
   background-color: #313434; }
   .sidebar:backdrop {
-    background-color: #323535; }
+    background-color: #333636; }
 
 GtkSidebarRow.list-row {
   padding: 0px; }
@@ -3900,7 +3960,9 @@ GtkPlacesSidebar.sidebar .sidebar-new-bookmark-row {
   GtkVolumeButton.sidebar-button.button, .header-bar .sidebar-button.titlebutton.button,
   .titlebar .sidebar-button.titlebutton.button {
     padding: 5px; }
-  .sidebar-button.button:not(:hover):not(:active) > image, .sidebar-button.button:backdrop > image {
+  .sidebar-button.button:not(:hover):not(:active) > image, .header-bar 
.sidebar-button.button.titlebutton:not(:hover):not(:active) > image,
+  .titlebar .sidebar-button.button.titlebutton:not(:hover):not(:active) > image, 
.sidebar-button.button:backdrop > image, .header-bar .sidebar-button.button.titlebutton:backdrop > image,
+  .titlebar .sidebar-button.button.titlebutton:backdrop > image {
     opacity: 0.7; }
 
 .sidebar-item {
@@ -3936,7 +3998,7 @@ GtkPaned {
   GtkPaned .pane-separator {
     background-color: #1c1f1f; }
     GtkPaned .pane-separator:backdrop {
-      background-color: #1e2222; }
+      background-color: #1f2222; }
 
 GtkPaned.wide {
   -GtkPaned-handle-size: 5;
@@ -3949,7 +4011,7 @@ GtkPaned.wide {
   GtkPaned.wide.vertical .pane-separator {
     border-style: solid none; }
   GtkPaned.wide .pane-separator:backdrop {
-    border-color: #1e2222; }
+    border-color: #1f2222; }
 
 /**************
  * GtkInfoBar *
@@ -4016,22 +4078,29 @@ infobar {
     .question .button:insensitive,
     .warning .button:insensitive,
     .error .button:insensitive {
-      color: #90aac4;
+      color: #91aac5;
       border-color: #0b1e33;
-      background-image: linear-gradient(to bottom, #22558a);
+      background-image: linear-gradient(to bottom, #22558b);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .info .button:insensitive > .label,
+      .info .button:insensitive > .label, .info .header-bar .button.titlebutton:insensitive > .label,
+      .info .titlebar .button.titlebutton:insensitive > .label,
       .question .button:insensitive > .label,
+      .question .header-bar .button.titlebutton:insensitive > .label,
+      .question .titlebar .button.titlebutton:insensitive > .label,
       .warning .button:insensitive > .label,
-      .error .button:insensitive > .label {
+      .warning .header-bar .button.titlebutton:insensitive > .label,
+      .warning .titlebar .button.titlebutton:insensitive > .label,
+      .error .button:insensitive > .label,
+      .error .header-bar .button.titlebutton:insensitive > .label,
+      .error .titlebar .button.titlebutton:insensitive > .label {
         color: inherit; }
     .info .button:backdrop,
     .question .button:backdrop,
     .warning .button:backdrop,
     .error .button:backdrop {
-      color: #d2deeb;
+      color: #d3dfeb;
       border-color: #0b1e33;
       background-image: linear-gradient(to bottom, #215d9c);
       text-shadow: none;
@@ -4042,17 +4111,24 @@ infobar {
       .question .button:backdrop:insensitive,
       .warning .button:backdrop:insensitive,
       .error .button:backdrop:insensitive {
-        color: #6f90b2;
+        color: #6f91b4;
         border-color: #0b1e33;
-        background-image: linear-gradient(to bottom, #22558a);
+        background-image: linear-gradient(to bottom, #22558b);
         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 .button:backdrop:insensitive > .label, .info .header-bar 
.button.titlebutton:backdrop:insensitive > .label,
+        .info .titlebar .button.titlebutton:backdrop:insensitive > .label,
         .question .button:backdrop:insensitive > .label,
+        .question .header-bar .button.titlebutton:backdrop:insensitive > .label,
+        .question .titlebar .button.titlebutton:backdrop:insensitive > .label,
         .warning .button:backdrop:insensitive > .label,
-        .error .button:backdrop:insensitive > .label {
+        .warning .header-bar .button.titlebutton:backdrop:insensitive > .label,
+        .warning .titlebar .button.titlebutton:backdrop:insensitive > .label,
+        .error .button:backdrop:insensitive > .label,
+        .error .header-bar .button.titlebutton:backdrop:insensitive > .label,
+        .error .titlebar .button.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
   .info label:selected, .info label:selected:focus, .info label:selected:hover,
   .question label:selected,
@@ -4176,8 +4252,8 @@ GtkColorSwatch {
       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); }
     GtkColorSwatch#add-color-button:backdrop {
-      color: #939695;
-      border-color: #1e2222;
+      color: #949796;
+      border-color: #1f2222;
       background-image: linear-gradient(to bottom, #393f3f);
       text-shadow: none;
       icon-shadow: none;
@@ -4244,7 +4320,7 @@ decoration {
     border-radius: 0;
     margin: 4px;
     background-color: #393f3f;
-    border: solid 1px #1e2222;
+    border: solid 1px #1f2222;
     box-shadow: none; }
 
 .header-bar .titlebutton.button,
@@ -4269,13 +4345,13 @@ decoration {
   color: #ffffff; }
   .view:insensitive:selected, GtkCalendar:insensitive:selected, label:insensitive:selected, 
.grid-child:insensitive:selected, entry:insensitive:selected, .menuitem.button.flat:insensitive:selected, 
.menuitem.sidebar-button.button:insensitive:selected, .header-bar 
.menuitem.titlebutton.button:insensitive:selected,
   .titlebar .menuitem.titlebutton.button:insensitive:selected, .list-row:insensitive:selected, 
.sidebar:insensitive:selected, GtkPlacesSidebar.sidebar .list-row:selected:insensitive label {
-    color: #90aecd; }
+    color: #90aece; }
   .view:backdrop:selected, GtkCalendar:backdrop:selected, label:backdrop:selected, 
.grid-child:backdrop:selected, entry:backdrop:selected, .menuitem.button.flat:backdrop:selected, 
.menuitem.sidebar-button.button:backdrop:selected, .header-bar .menuitem.titlebutton.button:backdrop:selected,
   .titlebar .menuitem.titlebutton.button:backdrop:selected, .list-row:backdrop:selected, 
.sidebar:backdrop:selected {
     color: #ffffff; }
     .view:backdrop:insensitive:selected, GtkCalendar:backdrop:insensitive:selected, 
label:backdrop:insensitive:selected, .grid-child:backdrop:insensitive:selected, 
entry:backdrop:insensitive:selected, .menuitem.button.flat:backdrop:insensitive:selected, 
.menuitem.sidebar-button.button:backdrop:insensitive:selected, .header-bar 
.menuitem.titlebutton.button:backdrop:insensitive:selected,
     .titlebar .menuitem.titlebutton.button:backdrop:insensitive:selected, 
.list-row:backdrop:insensitive:selected, .sidebar:backdrop:insensitive:selected, GtkPlacesSidebar.sidebar 
.list-row:selected:insensitive label:backdrop, GtkPlacesSidebar.sidebar 
.list-row:selected:backdrop:insensitive label {
-      color: #638db9; }
+      color: #648eba; }
 
 .monospace {
   font: Monospace; }
@@ -4378,9 +4454,9 @@ decoration {
       icon-shadow: none;
       outline-color: rgba(238, 238, 236, 0.3); }
     .touch-selection .button:insensitive, .touch-selection .button:backdrop:insensitive {
-      color: #878989;
+      color: #878a89;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -4481,7 +4557,7 @@ decoration {
   border: none;
   box-shadow: none; }
   .overshoot.top:backdrop {
-    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#1e2222), to(rgba(30, 34, 34, 
0)));
+    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#1f2222), to(rgba(31, 34, 34, 
0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center top;
@@ -4497,7 +4573,7 @@ decoration {
   border: none;
   box-shadow: none; }
   .overshoot.bottom:backdrop {
-    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#1e2222), to(rgba(30, 
34, 34, 0)));
+    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#1f2222), to(rgba(31, 
34, 34, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center bottom;
@@ -4513,7 +4589,7 @@ decoration {
   border: none;
   box-shadow: none; }
   .overshoot.left:backdrop {
-    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#1e2222), to(rgba(30, 34, 
34, 0)));
+    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#1f2222), to(rgba(31, 34, 
34, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: left center;
@@ -4529,7 +4605,7 @@ decoration {
   border: none;
   box-shadow: none; }
   .overshoot.right:backdrop {
-    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#1e2222), to(rgba(30, 34, 
34, 0)));
+    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#1f2222), to(rgba(31, 34, 
34, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: right center;
@@ -4612,16 +4688,16 @@ text/foreground color of selections */
 @define-color theme_selected_fg_color #ffffff;
 /*
 base background color of insensitive widgets */
- define-color insensitive_bg_color #323636;
+ define-color insensitive_bg_color #333636;
 /*
 text foreground color of insensitive widgets */
- define-color insensitive_fg_color #939695;
+ define-color insensitive_fg_color #949796;
 /*
 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 #939695;
+ define-color theme_unfocused_fg_color #949796;
 /*
 text color for entries, views and content in general on backdrop windows */
 @define-color theme_unfocused_text_color white;
@@ -4642,7 +4718,7 @@ widgets main borders color */
 @define-color borders #1c1f1f;
 /*
 widgets main borders color on backdrop windows */
- define-color unfocused_borders #1e2222;
+ define-color unfocused_borders #1f2222;
 /*
 these are pretty self explicative */
 @define-color warning_color #f57900;
@@ -4652,7 +4728,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 #939695;
+ define-color wm_unfocused_title #949796;
 @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 6862f51..dd3a733 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: #8d9091;
+    color: #8e9192;
     background-color: #ededed; }
 
 /*
@@ -59,7 +59,7 @@
     color: #2e3436; }
   .gtkstyle-fallback:insensitive {
     background-color: #f4f4f4;
-    color: #8d9091; }
+    color: #8e9192; }
   .gtkstyle-fallback:selected {
     background-color: #4a90d9;
     color: #ffffff; }
@@ -68,7 +68,7 @@
   color: black;
   background-color: #ffffff; }
   .view:backdrop {
-    color: #323232;
+    color: #333333;
     background-color: white; }
   .view:selected, GtkCalendar:selected {
     border-radius: 3px; }
@@ -80,9 +80,9 @@
 label.separator {
   color: #2e3436; }
   label.separator:backdrop {
-    color: #8d9091; }
+    color: #8e9192; }
 label:insensitive {
-  color: #8d9091; }
+  color: #8e9192; }
   label:insensitive:backdrop {
     color: #c7c7c7; }
 
@@ -100,13 +100,13 @@ GtkAssistant .sidebar {
     border-left: 1px solid #a1a1a1; }
   GtkAssistant .sidebar:backdrop {
     background-color: white;
-    border-color: #a8a8a8; }
+    border-color: darkgray; }
 GtkAssistant.csd .sidebar {
   border-top-style: none; }
 GtkAssistant .sidebar label {
   padding: 6px 12px; }
 GtkAssistant .sidebar label.highlight {
-  background-color: #c6c8c8; }
+  background-color: #c7c8c8; }
 
 GtkTextView {
   background-color: #f6f6f6; }
@@ -185,22 +185,22 @@ entry {
   entry:insensitive {
     background-color: transparent;
     background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
-    color: #8d9091;
+    color: #8e9192;
     border-color: #a1a1a1;
     background-image: linear-gradient(to bottom, #f4f4f4);
     box-shadow: 0 1px white; }
   entry:backdrop {
     background-color: transparent;
     background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
-    color: #323232;
-    border-color: #a8a8a8;
+    color: #333333;
+    border-color: darkgray;
     background-image: linear-gradient(to bottom, white);
     box-shadow: 0 1px rgba(255, 255, 255, 0); }
   entry:backdrop:insensitive {
     background-color: transparent;
     background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
     color: #c7c7c7;
-    border-color: #a8a8a8;
+    border-color: darkgray;
     background-image: linear-gradient(to bottom, #f4f4f4);
     box-shadow: 0 1px rgba(255, 255, 255, 0); }
   entry progress {
@@ -237,13 +237,13 @@ entry {
     entry.warning:selected, entry.warning:selected:focus {
       background-color: #f57900; }
   entry image {
-    color: #575c5e; }
+    color: #585d5e; }
     entry image:hover {
       color: #2e3436; }
     entry image:active {
       color: #4a90d9; }
     entry image:backdrop {
-      color: #a3a6a7; }
+      color: #a5a7a8; }
   .osd entry {
     background-color: transparent;
     background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
@@ -277,9 +277,9 @@ entry {
     .osd entry:insensitive {
       background-color: transparent;
       background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
-      color: #878989;
+      color: #878a89;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -290,10 +290,10 @@ entry {
 .linked.vertical > entry:focus:not(:last-child) {
   box-shadow: inset 0 0 0 1px #4a90d9; }
 .linked.vertical > entry:not(:insensitive) + .entry:not(:insensitive) {
-  border-top-color: #e2e2e2;
+  border-top-color: #e3e3e3;
   background-image: linear-gradient(to bottom, #ffffff); }
   .linked.vertical > entry:not(:insensitive) + .entry:not(:insensitive):backdrop {
-    border-top-color: #e4e4e4;
+    border-top-color: #e5e5e5;
     background-image: linear-gradient(to bottom, white); }
 .linked.vertical > entry + entry:focus:not(:last-child) {
   border-top-color: #4a90d9;
@@ -367,8 +367,8 @@ entry {
   .button:backdrop, .header-bar .button.titlebutton:backdrop,
   .titlebar .button.titlebutton:backdrop, .button.flat:backdrop, .sidebar-button.button:backdrop, 
.header-bar .titlebutton.button:backdrop,
   .titlebar .titlebutton.button:backdrop {
-    color: #8d9091;
-    border-color: #a8a8a8;
+    color: #8e9192;
+    border-color: darkgray;
     background-image: linear-gradient(to bottom, #ededed);
     text-shadow: none;
     icon-shadow: none;
@@ -377,29 +377,32 @@ entry {
     .button:backdrop:active, .button:backdrop:checked, .button.flat:backdrop:active, 
.sidebar-button.button:backdrop:active, .header-bar .titlebutton.button:backdrop:active,
     .titlebar .titlebutton.button:backdrop:active, .button.flat:backdrop:checked, 
.sidebar-button.button:backdrop:checked, .header-bar .titlebutton.button:backdrop:checked,
     .titlebar .titlebutton.button:backdrop:checked {
-      color: #8d9091;
-      border-color: #a8a8a8;
-      background-image: linear-gradient(to bottom, #d4d4d4);
+      color: #8e9192;
+      border-color: darkgray;
+      background-image: linear-gradient(to bottom, #d5d5d5);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
     .button:backdrop:insensitive, .button.flat:backdrop:insensitive, 
.sidebar-button.button:backdrop:insensitive, .header-bar .titlebutton.button:backdrop:insensitive,
     .titlebar .titlebutton.button:backdrop:insensitive {
       color: #c7c7c7;
-      border-color: #a8a8a8;
+      border-color: darkgray;
       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, .button.flat:backdrop:insensitive > .label, 
.sidebar-button.button:backdrop:insensitive > .label, .header-bar .titlebutton.button:backdrop:insensitive > 
.label,
+      .button:backdrop:insensitive > .label, .header-bar .button.titlebutton:backdrop:insensitive > .label,
+      .titlebar .button.titlebutton:backdrop:insensitive > .label, .button.flat:backdrop:insensitive > 
.label, .sidebar-button.button:backdrop:insensitive > .label, .header-bar 
.titlebutton.button:backdrop:insensitive > .label,
       .titlebar .titlebutton.button:backdrop:insensitive > .label {
         color: inherit; }
     .button:backdrop:insensitive:active, .button:backdrop:insensitive:checked, 
.button.flat:backdrop:insensitive:active, .sidebar-button.button:backdrop:insensitive:active, .header-bar 
.titlebutton.button:backdrop:insensitive:active,
     .titlebar .titlebutton.button:backdrop:insensitive:active, .button.flat:backdrop:insensitive:checked, 
.sidebar-button.button:backdrop:insensitive:checked, .header-bar 
.titlebutton.button:backdrop:insensitive:checked,
     .titlebar .titlebutton.button:backdrop:insensitive:checked {
       color: #c7c7c7;
-      border-color: #a8a8a8;
+      border-color: darkgray;
       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, .button:backdrop:insensitive:checked > .label, 
.button.flat:backdrop:insensitive:active > .label, .sidebar-button.button:backdrop:insensitive:active > 
.label, .header-bar .titlebutton.button:backdrop:insensitive:active > .label,
+      .button:backdrop:insensitive:active > .label, .header-bar 
.button.titlebutton:backdrop:insensitive:active > .label,
+      .titlebar .button.titlebutton:backdrop:insensitive:active > .label, 
.button:backdrop:insensitive:checked > .label, .header-bar .button.titlebutton:backdrop:insensitive:checked > 
.label,
+      .titlebar .button.titlebutton:backdrop:insensitive:checked > .label, 
.button.flat:backdrop:insensitive:active > .label, .sidebar-button.button:backdrop:insensitive:active > 
.label, .header-bar .titlebutton.button:backdrop:insensitive:active > .label,
       .titlebar .titlebutton.button:backdrop:insensitive:active > .label, 
.button.flat:backdrop:insensitive:checked > .label, .sidebar-button.button:backdrop:insensitive:checked > 
.label, .header-bar .titlebutton.button:backdrop:insensitive:checked > .label,
       .titlebar .titlebutton.button:backdrop:insensitive:checked > .label {
         color: inherit; }
@@ -415,20 +418,23 @@ entry {
     icon-shadow: none; }
   .button:insensitive, .header-bar .button.titlebutton:insensitive,
   .titlebar .button.titlebutton:insensitive {
-    color: #8d9091;
+    color: #8e9192;
     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 {
+    .button:insensitive > .label, .header-bar .button.titlebutton:insensitive > .label,
+    .titlebar .button.titlebutton:insensitive > .label {
       color: inherit; }
     .button:insensitive:active, .button:insensitive:checked {
-      color: #8d9091;
+      color: #8e9192;
       border-color: #a1a1a1;
-      background-image: linear-gradient(to bottom, #ebebeb, #f4f4f4);
+      background-image: linear-gradient(to bottom, #ececec, #f4f4f4);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
-      .button:insensitive:active > .label, .button:insensitive:checked > .label {
+      .button:insensitive:active > .label, .header-bar .button.titlebutton:insensitive:active > .label,
+      .titlebar .button.titlebutton:insensitive:active > .label, .button:insensitive:checked > .label, 
.header-bar .button.titlebutton:insensitive:checked > .label,
+      .titlebar .button.titlebutton:insensitive:checked > .label {
         color: inherit; }
   .button.osd, .header-bar .osd.button.titlebutton,
   .titlebar .osd.button.titlebutton {
@@ -472,9 +478,9 @@ entry {
       border: none;
       box-shadow: none; }
     .button.osd:insensitive, .button.osd:backdrop:insensitive {
-      color: #878989;
+      color: #878a89;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -519,9 +525,9 @@ entry {
       icon-shadow: none;
       outline-color: rgba(238, 238, 236, 0.3); }
     .osd .button:insensitive, .osd .button:backdrop:insensitive {
-      color: #878989;
+      color: #878a89;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -563,9 +569,9 @@ entry {
       .osd .button.flat:insensitive, .osd .sidebar-button.button:insensitive, .osd .header-bar 
.titlebutton.button:insensitive, .header-bar .osd .titlebutton.button:insensitive,
       .osd .titlebar .titlebutton.button:insensitive,
       .titlebar .osd .titlebutton.button:insensitive {
-        color: #878989;
+        color: #878a89;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -634,7 +640,7 @@ entry {
       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, 
.suggested-action.sidebar-button.button:backdrop, .header-bar .suggested-action.titlebutton.button:backdrop,
     .titlebar .suggested-action.titlebutton.button:backdrop {
-      color: #dae8f7;
+      color: #dbe9f7;
       border-color: #4a90d9;
       background-image: linear-gradient(to bottom, #4a90d9);
       text-shadow: none;
@@ -643,29 +649,32 @@ entry {
       .button.suggested-action:backdrop:active, .button.suggested-action:backdrop:checked, 
.button.suggested-action.flat:backdrop:active, .suggested-action.sidebar-button.button:backdrop:active, 
.header-bar .suggested-action.titlebutton.button:backdrop:active,
       .titlebar .suggested-action.titlebutton.button:backdrop:active, 
.button.suggested-action.flat:backdrop:checked, .suggested-action.sidebar-button.button:backdrop:checked, 
.header-bar .suggested-action.titlebutton.button:backdrop:checked,
       .titlebar .suggested-action.titlebutton.button:backdrop:checked {
-        color: #d4e3f3;
+        color: #d4e4f4;
         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, 
.suggested-action.sidebar-button.button:backdrop:insensitive, .header-bar 
.suggested-action.titlebutton.button:backdrop:insensitive,
       .titlebar .suggested-action.titlebutton.button:backdrop:insensitive {
         color: #c7c7c7;
-        border-color: #a8a8a8;
+        border-color: darkgray;
         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, 
.button.suggested-action.flat:backdrop:insensitive > .label, 
.suggested-action.sidebar-button.button:backdrop:insensitive > .label, .header-bar 
.suggested-action.titlebutton.button:backdrop:insensitive > .label,
+        .button.suggested-action:backdrop:insensitive > .label, .header-bar 
.suggested-action.button.titlebutton:backdrop:insensitive > .label,
+        .titlebar .suggested-action.button.titlebutton:backdrop:insensitive > .label, 
.button.suggested-action.flat:backdrop:insensitive > .label, 
.suggested-action.sidebar-button.button:backdrop:insensitive > .label, .header-bar 
.suggested-action.titlebutton.button:backdrop:insensitive > .label,
         .titlebar .suggested-action.titlebutton.button:backdrop:insensitive > .label {
           color: inherit; }
         .button.suggested-action:backdrop:insensitive:active, 
.button.suggested-action:backdrop:insensitive:checked, 
.button.suggested-action.flat:backdrop:insensitive:active, 
.suggested-action.sidebar-button.button:backdrop:insensitive:active, .header-bar 
.suggested-action.titlebutton.button:backdrop:insensitive:active,
         .titlebar .suggested-action.titlebutton.button:backdrop:insensitive:active, 
.button.suggested-action.flat:backdrop:insensitive:checked, 
.suggested-action.sidebar-button.button:backdrop:insensitive:checked, .header-bar 
.suggested-action.titlebutton.button:backdrop:insensitive:checked,
         .titlebar .suggested-action.titlebutton.button:backdrop:insensitive:checked {
-          color: #8db8e6;
-          border-color: #5093da;
-          background-image: linear-gradient(to bottom, #5093da);
+          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(255, 255, 255, 0); }
-          .button.suggested-action:backdrop:insensitive:active > .label, 
.button.suggested-action:backdrop:insensitive:checked > .label, 
.button.suggested-action.flat:backdrop:insensitive:active > .label, 
.suggested-action.sidebar-button.button:backdrop:insensitive:active > .label, .header-bar 
.suggested-action.titlebutton.button:backdrop:insensitive:active > .label,
+          .button.suggested-action:backdrop:insensitive:active > .label, .header-bar 
.suggested-action.button.titlebutton:backdrop:insensitive:active > .label,
+          .titlebar .suggested-action.button.titlebutton:backdrop:insensitive:active > .label, 
.button.suggested-action:backdrop:insensitive:checked > .label, .header-bar 
.suggested-action.button.titlebutton:backdrop:insensitive:checked > .label,
+          .titlebar .suggested-action.button.titlebutton:backdrop:insensitive:checked > .label, 
.button.suggested-action.flat:backdrop:insensitive:active > .label, 
.suggested-action.sidebar-button.button:backdrop:insensitive:active > .label, .header-bar 
.suggested-action.titlebutton.button:backdrop:insensitive:active > .label,
           .titlebar .suggested-action.titlebutton.button:backdrop:insensitive:active > .label, 
.button.suggested-action.flat:backdrop:insensitive:checked > .label, 
.suggested-action.sidebar-button.button:backdrop:insensitive:checked > .label, .header-bar 
.suggested-action.titlebutton.button:backdrop:insensitive:checked > .label,
           .titlebar .suggested-action.titlebutton.button:backdrop:insensitive:checked > .label {
             color: inherit; }
@@ -681,20 +690,23 @@ entry {
       icon-shadow: none;
       color: rgba(74, 144, 217, 0.8); }
     .button.suggested-action:insensitive {
-      color: #8d9091;
+      color: #8e9192;
       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 {
+      .button.suggested-action:insensitive > .label, .header-bar 
.suggested-action.button.titlebutton:insensitive > .label,
+      .titlebar .suggested-action.button.titlebutton:insensitive > .label {
         color: inherit; }
       .button.suggested-action:insensitive:active, .button.suggested-action:insensitive:checked {
-        color: #b9d3f0;
+        color: #b9d4f1;
         border-color: #1c5187;
-        background-image: linear-gradient(to bottom, #4a8cd1, #5093da);
+        background-image: linear-gradient(to bottom, #4b8dd3, #5094db);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
-        .button.suggested-action:insensitive:active > .label, .button.suggested-action:insensitive:checked > 
.label {
+        .button.suggested-action:insensitive:active > .label, .header-bar 
.suggested-action.button.titlebutton:insensitive:active > .label,
+        .titlebar .suggested-action.button.titlebutton:insensitive:active > .label, 
.button.suggested-action:insensitive:checked > .label, .header-bar 
.suggested-action.button.titlebutton:insensitive:checked > .label,
+        .titlebar .suggested-action.button.titlebutton:insensitive:checked > .label {
           color: inherit; }
     .osd .button.suggested-action {
       color: #eeeeec;
@@ -724,9 +736,9 @@ entry {
         icon-shadow: none;
         outline-color: rgba(238, 238, 236, 0.3); }
       .osd .button.suggested-action:insensitive, .osd .button.suggested-action:backdrop:insensitive {
-        color: #878989;
+        color: #878a89;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -775,7 +787,7 @@ entry {
       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, 
.destructive-action.sidebar-button.button:backdrop, .header-bar 
.destructive-action.titlebutton.button:backdrop,
     .titlebar .destructive-action.titlebutton.button:backdrop {
-      color: #fbd4d4;
+      color: #fcd4d4;
       border-color: #ef2929;
       background-image: linear-gradient(to bottom, #ef2929);
       text-shadow: none;
@@ -784,29 +796,32 @@ entry {
       .button.destructive-action:backdrop:active, .button.destructive-action:backdrop:checked, 
.button.destructive-action.flat:backdrop:active, .destructive-action.sidebar-button.button:backdrop:active, 
.header-bar .destructive-action.titlebutton.button:backdrop:active,
       .titlebar .destructive-action.titlebutton.button:backdrop:active, 
.button.destructive-action.flat:backdrop:checked, .destructive-action.sidebar-button.button:backdrop:checked, 
.header-bar .destructive-action.titlebutton.button:backdrop:checked,
       .titlebar .destructive-action.titlebutton.button:backdrop:checked {
-        color: #f6cfcf;
+        color: #f7cfcf;
         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, 
.destructive-action.sidebar-button.button:backdrop:insensitive, .header-bar 
.destructive-action.titlebutton.button:backdrop:insensitive,
       .titlebar .destructive-action.titlebutton.button:backdrop:insensitive {
         color: #c7c7c7;
-        border-color: #a8a8a8;
+        border-color: darkgray;
         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, 
.button.destructive-action.flat:backdrop:insensitive > .label, 
.destructive-action.sidebar-button.button:backdrop:insensitive > .label, .header-bar 
.destructive-action.titlebutton.button:backdrop:insensitive > .label,
+        .button.destructive-action:backdrop:insensitive > .label, .header-bar 
.destructive-action.button.titlebutton:backdrop:insensitive > .label,
+        .titlebar .destructive-action.button.titlebutton:backdrop:insensitive > .label, 
.button.destructive-action.flat:backdrop:insensitive > .label, 
.destructive-action.sidebar-button.button:backdrop:insensitive > .label, .header-bar 
.destructive-action.titlebutton.button:backdrop:insensitive > .label,
         .titlebar .destructive-action.titlebutton.button:backdrop:insensitive > .label {
           color: inherit; }
         .button.destructive-action:backdrop:insensitive:active, 
.button.destructive-action:backdrop:insensitive:checked, 
.button.destructive-action.flat:backdrop:insensitive:active, 
.destructive-action.sidebar-button.button:backdrop:insensitive:active, .header-bar 
.destructive-action.titlebutton.button:backdrop:insensitive:active,
         .titlebar .destructive-action.titlebutton.button:backdrop:insensitive:active, 
.button.destructive-action.flat:backdrop:insensitive:checked, 
.destructive-action.sidebar-button.button:backdrop:insensitive:checked, .header-bar 
.destructive-action.titlebutton.button:backdrop:insensitive:checked,
         .titlebar .destructive-action.titlebutton.button:backdrop:insensitive:checked {
-          color: #f47979;
+          color: #f57979;
           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, 
.button.destructive-action:backdrop:insensitive:checked > .label, 
.button.destructive-action.flat:backdrop:insensitive:active > .label, 
.destructive-action.sidebar-button.button:backdrop:insensitive:active > .label, .header-bar 
.destructive-action.titlebutton.button:backdrop:insensitive:active > .label,
+          .button.destructive-action:backdrop:insensitive:active > .label, .header-bar 
.destructive-action.button.titlebutton:backdrop:insensitive:active > .label,
+          .titlebar .destructive-action.button.titlebutton:backdrop:insensitive:active > .label, 
.button.destructive-action:backdrop:insensitive:checked > .label, .header-bar 
.destructive-action.button.titlebutton:backdrop:insensitive:checked > .label,
+          .titlebar .destructive-action.button.titlebutton:backdrop:insensitive:checked > .label, 
.button.destructive-action.flat:backdrop:insensitive:active > .label, 
.destructive-action.sidebar-button.button:backdrop:insensitive:active > .label, .header-bar 
.destructive-action.titlebutton.button:backdrop:insensitive:active > .label,
           .titlebar .destructive-action.titlebutton.button:backdrop:insensitive:active > .label, 
.button.destructive-action.flat:backdrop:insensitive:checked > .label, 
.destructive-action.sidebar-button.button:backdrop:insensitive:checked > .label, .header-bar 
.destructive-action.titlebutton.button:backdrop:insensitive:checked > .label,
           .titlebar .destructive-action.titlebutton.button:backdrop:insensitive:checked > .label {
             color: inherit; }
@@ -822,20 +837,23 @@ entry {
       icon-shadow: none;
       color: rgba(239, 41, 41, 0.8); }
     .button.destructive-action:insensitive {
-      color: #8d9091;
+      color: #8e9192;
       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 {
+      .button.destructive-action:insensitive > .label, .header-bar 
.destructive-action.button.titlebutton:insensitive > .label,
+      .titlebar .destructive-action.button.titlebutton:insensitive > .label {
         color: inherit; }
       .button.destructive-action:insensitive:active, .button.destructive-action:insensitive:checked {
-        color: #f8acac;
+        color: #f9adad;
         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, 
.button.destructive-action:insensitive:checked > .label {
+        .button.destructive-action:insensitive:active > .label, .header-bar 
.destructive-action.button.titlebutton:insensitive:active > .label,
+        .titlebar .destructive-action.button.titlebutton:insensitive:active > .label, 
.button.destructive-action:insensitive:checked > .label, .header-bar 
.destructive-action.button.titlebutton:insensitive:checked > .label,
+        .titlebar .destructive-action.button.titlebutton:insensitive:checked > .label {
           color: inherit; }
     .osd .button.destructive-action {
       color: #eeeeec;
@@ -865,9 +883,9 @@ entry {
         icon-shadow: none;
         outline-color: rgba(238, 238, 236, 0.3); }
       .osd .button.destructive-action:insensitive, .osd .button.destructive-action:backdrop:insensitive {
-        color: #878989;
+        color: #878a89;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -914,7 +932,8 @@ entry {
       padding-right: 6px;
       padding-top: 3px;
       padding-bottom: 3px; }
-    .stack-switcher > .button.text-button {
+    .stack-switcher > .button.text-button, .header-bar .stack-switcher > .text-button.button.titlebutton,
+    .titlebar .stack-switcher > .text-button.button.titlebutton {
       padding: 5px 10px 6px; }
     .stack-switcher > .button.image-button, .stack-switcher > GtkScaleButton.button,
     .stack-switcher > GtkVolumeButton.button, .header-bar .stack-switcher > .titlebutton.button,
@@ -954,7 +973,8 @@ entry {
   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 GtkToolButton > .button:hover {
+  .inline-toolbar GtkToolButton > .button:hover, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:hover,
+  .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:hover {
     color: #2e3436;
     outline-color: rgba(46, 52, 54, 0.3);
     border-color: #a1a1a1;
@@ -962,7 +982,9 @@ entry {
     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 GtkToolButton > .button:active, .inline-toolbar GtkToolButton > .button:checked {
+  .inline-toolbar GtkToolButton > .button:active, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:active,
+  .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:active, .inline-toolbar GtkToolButton > 
.button:checked, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton:checked,
+  .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:checked {
     color: #2e3436;
     outline-color: rgba(46, 52, 54, 0.3);
     border-color: #a1a1a1;
@@ -970,8 +992,9 @@ entry {
     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 GtkToolButton > .button:insensitive {
-    color: #8d9091;
+  .inline-toolbar GtkToolButton > .button:insensitive, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:insensitive,
+  .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:insensitive {
+    color: #8e9192;
     border-color: #a1a1a1;
     background-image: linear-gradient(to bottom, #f4f4f4);
     text-shadow: none;
@@ -979,37 +1002,45 @@ entry {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
     .inline-toolbar GtkToolButton > .button:insensitive > .label {
       color: inherit; }
-  .inline-toolbar GtkToolButton > .button:insensitive:active, .inline-toolbar GtkToolButton > 
.button:insensitive:checked {
-    color: #8d9091;
+  .inline-toolbar GtkToolButton > .button:insensitive:active, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:insensitive:active,
+  .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:insensitive:active, .inline-toolbar 
GtkToolButton > .button:insensitive:checked, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:insensitive:checked,
+  .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:insensitive:checked {
+    color: #8e9192;
     border-color: #a1a1a1;
-    background-image: linear-gradient(to bottom, #ebebeb, #f4f4f4);
+    background-image: linear-gradient(to bottom, #ececec, #f4f4f4);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
     .inline-toolbar GtkToolButton > .button:insensitive:active > .label, .inline-toolbar GtkToolButton > 
.button:insensitive:checked > .label {
       color: inherit; }
-  .inline-toolbar GtkToolButton > .button:backdrop {
-    color: #8d9091;
-    border-color: #a8a8a8;
+  .inline-toolbar GtkToolButton > .button:backdrop, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:backdrop,
+  .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop {
+    color: #8e9192;
+    border-color: darkgray;
     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 GtkToolButton > .button:backdrop:active, .inline-toolbar GtkToolButton > 
.button:backdrop:checked {
-    color: #8d9091;
-    border-color: #a8a8a8;
-    background-image: linear-gradient(to bottom, #d4d4d4);
+  .inline-toolbar GtkToolButton > .button:backdrop:active, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:backdrop:active,
+  .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop:active, .inline-toolbar 
GtkToolButton > .button:backdrop:checked, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:backdrop:checked,
+  .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop:checked {
+    color: #8e9192;
+    border-color: darkgray;
+    background-image: linear-gradient(to bottom, #d5d5d5);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-  .inline-toolbar GtkToolButton > .button:backdrop:insensitive {
+  .inline-toolbar GtkToolButton > .button:backdrop:insensitive, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:backdrop:insensitive,
+  .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop:insensitive {
     color: #c7c7c7;
-    border-color: #a8a8a8;
+    border-color: darkgray;
     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 GtkToolButton > .button:backdrop:insensitive > .label {
       color: inherit; }
-  .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active, .inline-toolbar GtkToolButton > 
.button:backdrop:insensitive:checked {
+  .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active, .inline-toolbar .header-bar 
GtkToolButton > .button.titlebutton:backdrop:insensitive:active,
+  .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop:insensitive:active, .inline-toolbar 
GtkToolButton > .button:backdrop:insensitive:checked, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:backdrop:insensitive:checked,
+  .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop:insensitive:checked {
     color: #c7c7c7;
-    border-color: #a8a8a8;
+    border-color: darkgray;
     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 GtkToolButton > .button:backdrop:insensitive:active > .label, .inline-toolbar 
GtkToolButton > .button:backdrop:insensitive:checked > .label {
@@ -1038,7 +1069,8 @@ entry {
   border-radius: 0;
   border-right-style: none; }
 
-.linked:not(.vertical) > entry:first-child, .inline-toolbar .button:first-child, .linked > 
.button:first-child, .inline-toolbar.toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar 
GtkToolButton:first-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:first-child > 
.button.flat, .inline-toolbar.location-bar GtkToolButton:first-child > .button.flat, .inline-toolbar.toolbar 
GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar GtkToolButton:first-child > 
.sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:first-child > .sidebar-button.button, 
.inline-toolbar.location-bar GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar .header-bar 
GtkToolButton:first-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:first-child > 
.button.titlebutton,
+.linked:not(.vertical) > entry:first-child, .inline-toolbar .button:first-child, .linked > 
.button:first-child, .header-bar .linked > .button.titlebutton:first-child,
+.titlebar .linked > .button.titlebutton:first-child, .inline-toolbar.toolbar GtkToolButton:first-child > 
.button.flat, .inline-toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar.search-bar 
GtkToolButton:first-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:first-child > 
.button.flat, .inline-toolbar.toolbar GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar 
GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:first-child > 
.sidebar-button.button, .inline-toolbar.location-bar GtkToolButton:first-child > .sidebar-button.button, 
.inline-toolbar .header-bar GtkToolButton:first-child > .button.titlebutton, .header-bar .inline-toolbar 
GtkToolButton:first-child > .button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:first-child > .button.titlebutton,
 .titlebar .inline-toolbar GtkToolButton:first-child > .button.titlebutton,
 .inline-toolbar.toolbar GtkToolButton:backdrop:first-child > .button.flat,
@@ -1056,7 +1088,8 @@ entry {
 .linked > GtkComboBoxText:first-child > .the-button-in-the-combobox {
   border-top-left-radius: 3px;
   border-bottom-left-radius: 3px; }
-.linked:not(.vertical) > entry:last-child, .inline-toolbar .button:last-child, .linked > .button:last-child, 
.inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > 
.button.flat, .inline-toolbar.search-bar GtkToolButton:last-child > .button.flat, 
.inline-toolbar.location-bar GtkToolButton:last-child > .button.flat, .inline-toolbar.toolbar 
GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar GtkToolButton:last-child > 
.sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:last-child > .sidebar-button.button, 
.inline-toolbar.location-bar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar .header-bar 
GtkToolButton:last-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:last-child > 
.button.titlebutton,
+.linked:not(.vertical) > entry:last-child, .inline-toolbar .button:last-child, .linked > .button:last-child, 
.header-bar .linked > .button.titlebutton:last-child,
+.titlebar .linked > .button.titlebutton:last-child, .inline-toolbar.toolbar GtkToolButton:last-child > 
.button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar.search-bar 
GtkToolButton:last-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:last-child > 
.button.flat, .inline-toolbar.toolbar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar 
GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:last-child > 
.sidebar-button.button, .inline-toolbar.location-bar GtkToolButton:last-child > .sidebar-button.button, 
.inline-toolbar .header-bar GtkToolButton:last-child > .button.titlebutton, .header-bar .inline-toolbar 
GtkToolButton:last-child > .button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:last-child > .button.titlebutton,
 .titlebar .inline-toolbar GtkToolButton:last-child > .button.titlebutton,
 .inline-toolbar.toolbar GtkToolButton:backdrop:last-child > .button.flat,
@@ -1075,7 +1108,8 @@ entry {
   border-top-right-radius: 3px;
   border-bottom-right-radius: 3px;
   border-right-style: solid; }
-.linked:not(.vertical) > entry:only-child, .inline-toolbar .button:only-child, .linked > .button:only-child, 
.inline-toolbar.toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar GtkToolButton:only-child > 
.button.flat, .inline-toolbar.search-bar GtkToolButton:only-child > .button.flat, 
.inline-toolbar.location-bar GtkToolButton:only-child > .button.flat, .inline-toolbar.toolbar 
GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar GtkToolButton:only-child > 
.sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:only-child > .sidebar-button.button, 
.inline-toolbar.location-bar GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar .header-bar 
GtkToolButton:only-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:only-child > 
.button.titlebutton,
+.linked:not(.vertical) > entry:only-child, .inline-toolbar .button:only-child, .linked > .button:only-child, 
.header-bar .linked > .button.titlebutton:only-child,
+.titlebar .linked > .button.titlebutton:only-child, .inline-toolbar.toolbar GtkToolButton:only-child > 
.button.flat, .inline-toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar.search-bar 
GtkToolButton:only-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:only-child > 
.button.flat, .inline-toolbar.toolbar GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar 
GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:only-child > 
.sidebar-button.button, .inline-toolbar.location-bar GtkToolButton:only-child > .sidebar-button.button, 
.inline-toolbar .header-bar GtkToolButton:only-child > .button.titlebutton, .header-bar .inline-toolbar 
GtkToolButton:only-child > .button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:only-child > .button.titlebutton,
 .titlebar .inline-toolbar GtkToolButton:only-child > .button.titlebutton,
 .inline-toolbar.toolbar GtkToolButton:backdrop:only-child > .button.flat,
@@ -1094,21 +1128,25 @@ entry {
   border-radius: 3px;
   border-style: solid; }
 
-.linked.vertical > entry, .linked.vertical > .button, .linked.vertical > .button:hover, .linked.vertical > 
.button:active, .linked.vertical > .button:checked, .linked.vertical > .button:backdrop, .linked.vertical > 
GtkComboBoxText > .the-button-in-the-combobox,
+.linked.vertical > entry, .linked.vertical > .button, .header-bar .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 > 
GtkComboBoxText > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox > .the-button-in-the-combobox {
   border-style: solid solid none solid;
   border-radius: 0; }
 
-.linked.vertical > entry:first-child, .linked.vertical > .button:first-child, .linked.vertical > 
GtkComboBoxText:first-child > .the-button-in-the-combobox,
+.linked.vertical > entry:first-child, .linked.vertical > .button:first-child, .header-bar .linked.vertical > 
.button.titlebutton:first-child,
+.titlebar .linked.vertical > .button.titlebutton:first-child, .linked.vertical > GtkComboBoxText:first-child 
.the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox {
   border-top-left-radius: 3px;
   border-top-right-radius: 3px; }
-.linked.vertical > entry:last-child, .linked.vertical > .button:last-child, .linked.vertical > 
GtkComboBoxText:last-child > .the-button-in-the-combobox,
+.linked.vertical > entry:last-child, .linked.vertical > .button:last-child, .header-bar .linked.vertical > 
.button.titlebutton:last-child,
+.titlebar .linked.vertical > .button.titlebutton:last-child, .linked.vertical > GtkComboBoxText:last-child > 
.the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox {
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border-style: solid; }
-.linked.vertical > entry:only-child, .linked.vertical > .button:only-child, .linked.vertical > 
GtkComboBoxText:only-child > .the-button-in-the-combobox,
+.linked.vertical > entry:only-child, .linked.vertical > .button:only-child, .header-bar .linked.vertical > 
.button.titlebutton:only-child,
+.titlebar .linked.vertical > .button.titlebutton:only-child, .linked.vertical > GtkComboBoxText:only-child > 
.the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox {
   border-radius: 3px;
   border-style: solid; }
@@ -1155,7 +1193,7 @@ notebook tab .titlebar .button.titlebutton,
   outline-offset: -1px; }
   .menuitem.button.flat:hover, .menuitem.sidebar-button.button:hover, .header-bar 
.menuitem.titlebutton.button:hover,
   .titlebar .menuitem.titlebutton.button:hover {
-    background-color: #d9dada; }
+    background-color: #dadbdb; }
 
 GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton,
 .titlebar GtkColorButton.button.titlebutton {
@@ -1177,21 +1215,21 @@ GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton,
   .titlebar .button.titlebutton:visited {
     color: #215d9c; }
     *:selected *:link:visited, *:selected .button:visited {
-      color: #b6d2ef; }
+      color: #b7d3f0; }
   *:link:hover, .button:hover:link, .button:hover:visited {
     color: #4a90d9; }
     *:selected *:link:hover, *:selected .button:hover:link, *:selected .button:hover:visited {
-      color: #ecf3fb; }
+      color: #edf4fb; }
   *:link:active, .button:active:link, .button:active:visited {
     color: #2a76c6; }
     *:selected *:link:active, *:selected .button:active:link, *:selected .button:active:visited {
-      color: #dae8f7; }
+      color: #dbe9f7; }
   *: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,
   .header-bar.selection-mode .subtitle:backdrop:hover:link {
     color: #4a90d9; }
   *:link:selected, .button:selected:link, .button:selected:visited, .titlebar.selection-mode .subtitle:link,
   .header-bar.selection-mode .subtitle:link, *:selected *:link, *:selected .button:link, *:selected 
.button:visited {
-    color: #dae8f7; }
+    color: #dbe9f7; }
 
 .button:link, .header-bar .button.titlebutton:link,
 .titlebar .button.titlebutton:link, .button:visited, .header-bar .button.titlebutton:visited,
@@ -1211,7 +1249,7 @@ GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton,
   background-image: none;
   border-style: none none none solid;
   border-color: rgba(161, 161, 161, 0.3);
-  color: #42484a;
+  color: #43484a;
   border-radius: 0;
   box-shadow: none; }
   .spinbutton:not(.vertical) .button:dir(rtl) {
@@ -1220,13 +1258,13 @@ GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton,
     color: #2e3436;
     background-color: rgba(46, 52, 54, 0.05); }
   .spinbutton:not(.vertical) .button:insensitive {
-    color: rgba(141, 144, 145, 0.3); }
+    color: rgba(142, 145, 146, 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: #989b9c;
-    border-color: rgba(168, 168, 168, 0.3);
+    color: #999c9d;
+    border-color: rgba(169, 169, 169, 0.3);
     background-color: transparent; }
   .spinbutton:not(.vertical) .button:backdrop:insensitive {
     background-image: none;
@@ -1279,7 +1317,7 @@ GtkColorButton.button, .header-bar GtkColorButton.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: #878989;
+    color: #878a89;
     border-color: rgba(0, 0, 0, 0.5);
     icon-shadow: none;
     box-shadow: none; }
@@ -1315,29 +1353,31 @@ GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton,
       icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
       box-shadow: inset 0 1px white; }
     .spinbutton.vertical .button:first-child:insensitive {
-      color: #8d9091;
+      color: #8e9192;
       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 .button:first-child:insensitive > .label, .spinbutton.vertical .header-bar 
.button.titlebutton:first-child:insensitive > .label,
+      .spinbutton.vertical .titlebar .button.titlebutton:first-child:insensitive > .label {
         color: inherit; }
     .spinbutton.vertical .button:first-child:backdrop {
-      color: #8d9091;
-      border-color: #a8a8a8;
+      color: #8e9192;
+      border-color: darkgray;
       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: #a8a8a8;
+        border-color: darkgray;
         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 .button:first-child:backdrop:insensitive > .label, .spinbutton.vertical 
.header-bar .button.titlebutton:first-child:backdrop:insensitive > .label,
+        .spinbutton.vertical .titlebar .button.titlebutton:first-child:backdrop:insensitive > .label {
           color: inherit; }
 .spinbutton.vertical.entry {
   border-radius: 0;
@@ -1377,9 +1417,9 @@ GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton,
     icon-shadow: none;
     outline-color: rgba(238, 238, 236, 0.3); }
   .osd .spinbutton.vertical .button:first-child:insensitive {
-    color: #878989;
+    color: #878a89;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+    background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -1411,11 +1451,11 @@ GtkComboBox {
     padding-top: 3px;
     padding-bottom: 4px; }
   GtkComboBox:insensitive {
-    color: #8d9091;
+    color: #8e9192;
     text-shadow: none;
     icon-shadow: none; }
   GtkComboBox:backdrop {
-    color: #8d9091;
+    color: #8e9192;
     text-shadow: none;
     icon-shadow: none; }
   GtkComboBox:backdrop:insensitive {
@@ -1467,8 +1507,8 @@ GtkComboBox {
   background-color: #d6d6d6;
   box-shadow: inset 0 2px 3px -1px #b6b6b6, 0 1px white; }
   .inline-toolbar:backdrop, .search-bar:backdrop, .location-bar:backdrop {
-    border-color: #a8a8a8;
-    background-color: #d4d4d4;
+    border-color: darkgray;
+    background-color: #d5d5d5;
     box-shadow: none; }
 
 /***************
@@ -1483,10 +1523,10 @@ GtkComboBox {
   border-radius: 7px 7px 0 0;
   background-color: transparent;
   background-image: linear-gradient(to bottom, #f7f7f7, #ededed);
-  box-shadow: inset 0 -1px #d9d9d9, inset 0 1px white; }
+  box-shadow: inset 0 -1px #dadada, inset 0 1px white; }
   .titlebar:backdrop,
   .header-bar:backdrop {
-    border-color: #a8a8a8;
+    border-color: darkgray;
     background-color: #ededed;
     background-image: none;
     box-shadow: inset 0 1px white; }
@@ -1510,18 +1550,18 @@ GtkComboBox {
     .titlebar .header-bar-separator:backdrop, .titlebar > GtkBox > separator.vertical:backdrop,
     .header-bar .header-bar-separator:backdrop,
     .header-bar > GtkBox > separator.vertical:backdrop {
-      border-image: linear-gradient(to bottom, rgba(168, 168, 168, 0.5)) 0 1/1px 1px; }
+      border-image: linear-gradient(to bottom, rgba(169, 169, 169, 0.5)) 0 1/1px 1px; }
   .titlebar.selection-mode,
   .header-bar.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 #3875b4, inset 0 1px #a4c7ec; }
+    box-shadow: inset 0 -1px #3975b5, inset 0 1px #a5c8ec; }
     .titlebar.selection-mode:backdrop,
     .header-bar.selection-mode:backdrop {
       background-image: linear-gradient(to bottom, #4a90d9);
-      box-shadow: inset 0 1px #b6d2ef; }
+      box-shadow: inset 0 1px #b7d3f0; }
     .titlebar.selection-mode .button,
     .header-bar.selection-mode .button {
       color: #ffffff;
@@ -1530,7 +1570,7 @@ GtkComboBox {
       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 #a4c7ec; }
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 1px #a5c8ec; }
       .titlebar.selection-mode .button.flat, .titlebar.selection-mode .sidebar-button.button,
       .titlebar.selection-mode .titlebutton.button,
       .header-bar.selection-mode .button.flat,
@@ -1550,7 +1590,7 @@ GtkComboBox {
         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 #a4c7ec; }
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 1px #a5c8ec; }
       .titlebar.selection-mode .button:active, .titlebar.selection-mode .button:checked,
       .header-bar.selection-mode .button:active,
       .header-bar.selection-mode .button:checked {
@@ -1560,19 +1600,19 @@ GtkComboBox {
         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 #a4c7ec; 
}
+        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; 
}
       .titlebar.selection-mode .button:backdrop, .titlebar.selection-mode .button.flat:backdrop, 
.titlebar.selection-mode .sidebar-button.button:backdrop,
       .titlebar.selection-mode .titlebutton.button:backdrop,
       .header-bar.selection-mode .button:backdrop,
       .header-bar.selection-mode .button.flat:backdrop,
       .header-bar.selection-mode .sidebar-button.button:backdrop,
       .header-bar.selection-mode .titlebutton.button:backdrop {
-        color: #dae8f7;
+        color: #dbe9f7;
         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(164, 199, 236, 0);
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(165, 200, 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 
.sidebar-button.button:backdrop:active,
@@ -1586,10 +1626,10 @@ GtkComboBox {
         .header-bar.selection-mode .button.flat:backdrop:checked,
         .header-bar.selection-mode .sidebar-button.button:backdrop:checked,
         .header-bar.selection-mode .titlebutton.button:backdrop:checked {
-          color: #d4e3f3;
+          color: #d4e4f4;
           border-color: #2a76c6;
           background-image: linear-gradient(to bottom, #2a76c6);
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(164, 199, 236, 0);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(165, 200, 236, 0);
           border-color: #184472; }
         .titlebar.selection-mode .button:backdrop:insensitive, .titlebar.selection-mode 
.button.flat:backdrop:insensitive, .titlebar.selection-mode .sidebar-button.button:backdrop:insensitive,
         .titlebar.selection-mode .titlebutton.button:backdrop:insensitive,
@@ -1597,19 +1637,21 @@ GtkComboBox {
         .header-bar.selection-mode .button.flat:backdrop:insensitive,
         .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive,
         .header-bar.selection-mode .titlebutton.button:backdrop:insensitive {
-          color: #9ac1e9;
-          border-color: #65a0de;
-          background-image: linear-gradient(to bottom, #65a0de);
+          color: #9bc2ea;
+          border-color: #65a1df;
+          background-image: linear-gradient(to bottom, #65a1df);
           text-shadow: none;
           icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(164, 199, 236, 0);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(165, 200, 236, 0);
           border-color: #184472; }
-          .titlebar.selection-mode .button:backdrop:insensitive > .label, .titlebar.selection-mode 
.button.flat:backdrop:insensitive > .label, .titlebar.selection-mode 
.sidebar-button.button:backdrop:insensitive > .label,
+          .titlebar.selection-mode .button:backdrop:insensitive > .label, .titlebar.selection-mode 
.header-bar .button.titlebutton:backdrop:insensitive > .label, .titlebar.selection-mode 
.button.flat:backdrop:insensitive > .label, .titlebar.selection-mode 
.sidebar-button.button:backdrop:insensitive > .label, .titlebar.selection-mode .header-bar 
.titlebutton.button:backdrop:insensitive > .label,
           .titlebar.selection-mode .titlebutton.button:backdrop:insensitive > .label,
           .header-bar.selection-mode .button:backdrop:insensitive > .label,
+          .header-bar.selection-mode .titlebar .button.titlebutton:backdrop:insensitive > .label,
           .header-bar.selection-mode .button.flat:backdrop:insensitive > .label,
           .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive > .label,
-          .header-bar.selection-mode .titlebutton.button:backdrop:insensitive > .label {
+          .header-bar.selection-mode .titlebutton.button:backdrop:insensitive > .label,
+          .header-bar.selection-mode .titlebar .titlebutton.button: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 .sidebar-button.button:backdrop:insensitive:active,
         .titlebar.selection-mode .titlebutton.button:backdrop:insensitive:active, .titlebar.selection-mode 
.button.flat:backdrop:insensitive:checked, .titlebar.selection-mode 
.sidebar-button.button:backdrop:insensitive:checked,
@@ -1622,22 +1664,26 @@ GtkComboBox {
         .header-bar.selection-mode .button.flat:backdrop:insensitive:checked,
         .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive:checked,
         .header-bar.selection-mode .titlebutton.button:backdrop:insensitive:checked {
-          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);
+          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);
           border-color: #184472; }
-          .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 
.sidebar-button.button:backdrop:insensitive:active > .label,
-          .titlebar.selection-mode .titlebutton.button:backdrop:insensitive:active > .label, 
.titlebar.selection-mode .button.flat:backdrop:insensitive:checked > .label, .titlebar.selection-mode 
.sidebar-button.button:backdrop:insensitive:checked > .label,
+          .titlebar.selection-mode .button:backdrop:insensitive:active > .label, .titlebar.selection-mode 
.header-bar .button.titlebutton:backdrop:insensitive:active > .label, .titlebar.selection-mode 
.button:backdrop:insensitive:checked > .label, .titlebar.selection-mode .header-bar 
.button.titlebutton:backdrop:insensitive:checked > .label, .titlebar.selection-mode 
.button.flat:backdrop:insensitive:active > .label, .titlebar.selection-mode 
.sidebar-button.button:backdrop:insensitive:active > .label, .titlebar.selection-mode .header-bar 
.titlebutton.button:backdrop:insensitive:active > .label,
+          .titlebar.selection-mode .titlebutton.button:backdrop:insensitive:active > .label, 
.titlebar.selection-mode .button.flat:backdrop:insensitive:checked > .label, .titlebar.selection-mode 
.sidebar-button.button:backdrop:insensitive:checked > .label, .titlebar.selection-mode .header-bar 
.titlebutton.button:backdrop:insensitive:checked > .label,
           .titlebar.selection-mode .titlebutton.button:backdrop:insensitive:checked > .label,
           .header-bar.selection-mode .button:backdrop:insensitive:active > .label,
+          .header-bar.selection-mode .titlebar .button.titlebutton:backdrop:insensitive:active > .label,
           .header-bar.selection-mode .button:backdrop:insensitive:checked > .label,
+          .header-bar.selection-mode .titlebar .button.titlebutton:backdrop:insensitive:checked > .label,
           .header-bar.selection-mode .button.flat:backdrop:insensitive:active > .label,
           .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive:active > .label,
           .header-bar.selection-mode .titlebutton.button:backdrop:insensitive:active > .label,
+          .header-bar.selection-mode .titlebar .titlebutton.button:backdrop:insensitive:active > .label,
           .header-bar.selection-mode .button.flat:backdrop:insensitive:checked > .label,
           .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive:checked > .label,
-          .header-bar.selection-mode .titlebutton.button:backdrop:insensitive:checked > .label {
+          .header-bar.selection-mode .titlebutton.button:backdrop:insensitive:checked > .label,
+          .header-bar.selection-mode .titlebar .titlebutton.button:backdrop:insensitive:checked > .label {
             color: inherit; }
       .titlebar.selection-mode .button.flat:backdrop, .titlebar.selection-mode 
.sidebar-button.button:backdrop,
       .titlebar.selection-mode .titlebutton.button:backdrop, .titlebar.selection-mode 
.button.flat:insensitive, .titlebar.selection-mode .sidebar-button.button:insensitive,
@@ -1660,25 +1706,28 @@ GtkComboBox {
         icon-shadow: none; }
       .titlebar.selection-mode .button:insensitive,
       .header-bar.selection-mode .button:insensitive {
-        color: #b2cfee;
+        color: #b2d0ef;
         border-color: #1c5187;
-        background-image: linear-gradient(to bottom, #65a0de);
+        background-image: linear-gradient(to bottom, #65a1df);
         text-shadow: none;
         icon-shadow: none;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px #a4c7ec; }
-        .titlebar.selection-mode .button:insensitive > .label,
-        .header-bar.selection-mode .button:insensitive > .label {
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px #a5c8ec; }
+        .titlebar.selection-mode .button:insensitive > .label, .titlebar.selection-mode .header-bar 
.button.titlebutton:insensitive > .label,
+        .header-bar.selection-mode .button:insensitive > .label,
+        .header-bar.selection-mode .titlebar .button.titlebutton:insensitive > .label {
           color: inherit; }
         .titlebar.selection-mode .button:insensitive:active, .titlebar.selection-mode 
.button:insensitive:checked,
         .header-bar.selection-mode .button:insensitive:active,
         .header-bar.selection-mode .button:insensitive:checked {
-          color: #b9d3f0;
+          color: #b9d4f1;
           border-color: #1c5187;
-          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,
+          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 .header-bar 
.button.titlebutton:insensitive:active > .label, .titlebar.selection-mode .button:insensitive:checked > 
.label, .titlebar.selection-mode .header-bar .button.titlebutton:insensitive:checked > .label,
           .header-bar.selection-mode .button:insensitive:active > .label,
-          .header-bar.selection-mode .button:insensitive:checked > .label {
+          .header-bar.selection-mode .titlebar .button.titlebutton:insensitive:active > .label,
+          .header-bar.selection-mode .button:insensitive:checked > .label,
+          .header-bar.selection-mode .titlebar .button.titlebutton:insensitive:checked > .label {
             color: inherit; }
       .titlebar.selection-mode .button.suggested-action,
       .header-bar.selection-mode .button.suggested-action {
@@ -1688,7 +1737,7 @@ GtkComboBox {
         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 #a4c7ec;
+        box-shadow: inset 0 1px white, 0 1px #a5c8ec;
         border-color: #184472; }
         .titlebar.selection-mode .button.suggested-action:hover,
         .header-bar.selection-mode .button.suggested-action:hover {
@@ -1698,7 +1747,7 @@ GtkComboBox {
           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 #a4c7ec;
+          box-shadow: inset 0 1px white, 0 1px #a5c8ec;
           border-color: #184472; }
         .titlebar.selection-mode .button.suggested-action:active,
         .header-bar.selection-mode .button.suggested-action:active {
@@ -1708,40 +1757,42 @@ GtkComboBox {
           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 
#a4c7ec;
+          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;
           border-color: #184472; }
         .titlebar.selection-mode .button.suggested-action:insensitive,
         .header-bar.selection-mode .button.suggested-action:insensitive {
-          color: #8d9091;
+          color: #8e9192;
           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 #a4c7ec;
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px #a5c8ec;
           border-color: #184472; }
-          .titlebar.selection-mode .button.suggested-action:insensitive > .label,
-          .header-bar.selection-mode .button.suggested-action:insensitive > .label {
+          .titlebar.selection-mode .button.suggested-action:insensitive > .label, .titlebar.selection-mode 
.header-bar .suggested-action.button.titlebutton:insensitive > .label,
+          .header-bar.selection-mode .button.suggested-action:insensitive > .label,
+          .header-bar.selection-mode .titlebar .suggested-action.button.titlebutton:insensitive > .label {
             color: inherit; }
         .titlebar.selection-mode .button.suggested-action:backdrop,
         .header-bar.selection-mode .button.suggested-action:backdrop {
-          color: #8d9091;
-          border-color: #a8a8a8;
+          color: #8e9192;
+          border-color: darkgray;
           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(164, 199, 236, 0);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(165, 200, 236, 0);
           border-color: #184472; }
         .titlebar.selection-mode .button.suggested-action:backdrop:insensitive,
         .header-bar.selection-mode .button.suggested-action:backdrop:insensitive {
           color: #c7c7c7;
-          border-color: #a8a8a8;
+          border-color: darkgray;
           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(164, 199, 236, 0);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(165, 200, 236, 0);
           border-color: #184472; }
-          .titlebar.selection-mode .button.suggested-action:backdrop:insensitive > .label,
-          .header-bar.selection-mode .button.suggested-action:backdrop:insensitive > .label {
+          .titlebar.selection-mode .button.suggested-action:backdrop:insensitive > .label, 
.titlebar.selection-mode .header-bar .suggested-action.button.titlebutton:backdrop:insensitive > .label,
+          .header-bar.selection-mode .button.suggested-action:backdrop:insensitive > .label,
+          .header-bar.selection-mode .titlebar .suggested-action.button.titlebutton:backdrop:insensitive > 
.label {
             color: inherit; }
     .titlebar.selection-mode .selection-menu, .titlebar.selection-mode .selection-menu:backdrop,
     .header-bar.selection-mode .selection-menu,
@@ -1774,28 +1825,25 @@ GtkComboBox {
 /************
  * Pathbars *
  ************/
-.path-bar .button, .path-bar .header-bar .button.titlebutton, .header-bar .path-bar .button.titlebutton,
-.path-bar .titlebar .button.titlebutton,
-.titlebar .path-bar .button.titlebutton {
-  padding: 5px 6px 6px; }
-  .path-bar .button:first-child {
-    padding-left: 8px; }
-  .path-bar .button:last-child {
-    padding-right: 8px; }
-  .path-bar .button:only-child {
-    padding-left: 12px;
-    padding-right: 12px; }
-  .path-bar .button label:last-child {
-    padding-left: 2px; }
-  .path-bar .button label:first-child {
-    padding-right: 2px; }
-  .path-bar .button label:only-child {
-    padding-right: 0;
-    padding-left: 0; }
-  .path-bar .button image, .path-bar .header-bar .button.titlebutton image, .header-bar .path-bar 
.button.titlebutton image,
-  .path-bar .titlebar .button.titlebutton image,
-  .titlebar .path-bar .button.titlebutton image {
-    padding-top: 1px; }
+.path-bar .button.flat, .path-bar .sidebar-button.button, .path-bar .header-bar .titlebutton.button, 
.header-bar .path-bar .titlebutton.button,
+.path-bar .titlebar .titlebutton.button,
+.titlebar .path-bar .titlebutton.button {
+  background-image: none;
+  border-radius: 0px;
+  border-color: transparent;
+  box-shadow: 0px 0px 0px;
+  margin: 0px;
+  opacity: 0.55;
+  padding: 3px 8px 4px; }
+  .path-bar .button.flat:hover, .path-bar .sidebar-button.button:hover, .path-bar .header-bar 
.titlebutton.button:hover, .header-bar .path-bar .titlebutton.button:hover,
+  .path-bar .titlebar .titlebutton.button:hover,
+  .titlebar .path-bar .titlebutton.button:hover {
+    box-shadow: 0px 2px 0px white; }
+  .path-bar .button.flat:checked, .path-bar .sidebar-button.button:checked, .path-bar .header-bar 
.titlebutton.button:checked, .header-bar .path-bar .titlebutton.button:checked,
+  .path-bar .titlebar .titlebutton.button:checked,
+  .titlebar .path-bar .titlebutton.button:checked {
+    box-shadow: 0px 2px 0px #4a90d9;
+    color: #2e3436; }
 
 /**************
  * Tree Views *
@@ -1806,15 +1854,15 @@ GtkTreeView.view {
   -GtkTreeView-tree-line-width: 1;
   -GtkTreeView-tree-line-pattern: '';
   -GtkTreeView-expander-size: 16;
-  border-left-color: #96999a;
+  border-left-color: #979a9b;
   border-top-color: #ededed; }
   GtkTreeView.view:selected {
     border-radius: 0; }
   GtkTreeView.view:selected, GtkTreeView.view:backdrop:selected {
-    border-left-color: #a4c7ec;
+    border-left-color: #a5c8ec;
     border-top-color: rgba(46, 52, 54, 0.1); }
   GtkTreeView.view:insensitive {
-    color: #8d9091; }
+    color: #8e9192; }
     GtkTreeView.view:insensitive:selected {
       color: #92bce8; }
       GtkTreeView.view:insensitive:selected:backdrop {
@@ -1824,29 +1872,29 @@ GtkTreeView.view {
   GtkTreeView.view.separator:backdrop {
     color: rgba(0, 0, 0, 0.1); }
   GtkTreeView.view:backdrop {
-    border-left-color: #bdbebf;
+    border-left-color: #bebfc0;
     border-top: #ededed; }
   GtkTreeView.view.dnd {
     border-style: solid none;
     border-width: 1px;
-    border-color: #3c6287; }
+    border-color: #3c6288; }
   GtkTreeView.view.expander {
     -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
-    color: #6c7072; }
+    color: #6d7172; }
     GtkTreeView.view.expander:dir(rtl) {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
     GtkTreeView.view.expander:hover {
       color: #2e3436; }
     GtkTreeView.view.expander:selected {
-      color: #c8ddf3; }
+      color: #c9def4; }
       GtkTreeView.view.expander:selected:hover {
         color: #ffffff; }
       GtkTreeView.view.expander:selected:backdrop {
-        color: #c8ddf3; }
+        color: #c9def4; }
     GtkTreeView.view.expander:checked {
       -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
     GtkTreeView.view.expander:backdrop {
-      color: #afb1b2; }
+      color: #b0b2b3; }
   GtkTreeView.view.progressbar {
     color: #ffffff;
     border: 1px solid #184472;
@@ -1877,7 +1925,7 @@ GtkTreeView.view {
 column-header .button, column-header .header-bar .button.titlebutton, .header-bar column-header 
.button.titlebutton,
 column-header .titlebar .button.titlebutton,
 .titlebar column-header .button.titlebutton {
-  color: #96999a;
+  color: #979a9b;
   background-color: #ffffff;
   font-weight: bold;
   text-shadow: none;
@@ -1885,7 +1933,7 @@ column-header .titlebar .button.titlebutton,
   column-header .button:hover, column-header .header-bar .button.titlebutton:hover, .header-bar 
column-header .button.titlebutton:hover,
   column-header .titlebar .button.titlebutton:hover,
   .titlebar column-header .button.titlebutton:hover {
-    color: #626668;
+    color: #636769;
     box-shadow: none;
     transition: none; }
   column-header .button:active, column-header .header-bar .button.titlebutton:active, .header-bar 
column-header .button.titlebutton:active,
@@ -1926,7 +1974,7 @@ column-header .titlebar .button.titlebutton,
   .titlebar column-header .button.titlebutton:backdrop {
     border-color: #ededed;
     border-style: none solid solid none;
-    color: #bdbebf;
+    color: #bebfc0;
     background-image: none;
     background-color: white; }
     column-header .button:backdrop:insensitive {
@@ -1948,7 +1996,7 @@ column-header .titlebar .button.titlebutton,
       box-shadow: inset 0 -3px #4a90d9;
       color: #2a76c6; }
     .menubar > .menuitem:insensitive {
-      color: #8d9091;
+      color: #8e9192;
       box-shadow: none; }
 
 .menu {
@@ -1965,11 +2013,11 @@ column-header .titlebar .button.titlebutton,
       color: #ffffff;
       background-color: #4a90d9; }
     .menu .menuitem:insensitive {
-      color: #8d9091; }
+      color: #8e9192; }
       .menu .menuitem:insensitive:backdrop {
         color: #c7c7c7; }
     .menu .menuitem:backdrop, .menu .menuitem:backdrop:hover {
-      color: #8d9091;
+      color: #8e9192;
       background-color: white; }
     .menu .menuitem.arrow {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
@@ -1980,11 +2028,11 @@ column-header .titlebar .button.titlebutton,
     border-style: none;
     border-radius: 0; }
     .menu.button.top {
-      border-bottom: 1px solid #eaeaea; }
+      border-bottom: 1px solid #eaebeb; }
     .menu.button.bottom {
-      border-top: 1px solid #eaeaea; }
+      border-top: 1px solid #eaebeb; }
     .menu.button:hover {
-      background-color: #eaeaea; }
+      background-color: #eaebeb; }
     .menu.button:insensitive {
       color: transparent;
       background-color: transparent;
@@ -2052,7 +2100,7 @@ notebook {
     notebook.frame.left {
       border-left-width: 0; }
     notebook.frame:backdrop {
-      border-color: #a8a8a8; }
+      border-color: darkgray; }
   notebook.header {
     background-color: #d6d6d6; }
     notebook.header.frame {
@@ -2066,25 +2114,25 @@ notebook {
       notebook.header.frame.left {
         border-right-width: 0; }
       notebook.header.frame:backdrop {
-        border-color: #a8a8a8; }
+        border-color: darkgray; }
     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 #a8a8a8; }
+        box-shadow: inset 0 -1px darkgray; }
     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 #a8a8a8; }
+        box-shadow: inset 0 1px darkgray; }
     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 #a8a8a8; }
+        box-shadow: inset 1px 0 darkgray; }
     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 #a8a8a8; }
+        box-shadow: inset -1px 0 darkgray; }
     notebook.header:backdrop {
-      background-color: #d4d4d4;
+      background-color: #d5d5d5;
       box-shadow: none; }
   notebook tab {
     border-width: 0;
@@ -2161,7 +2209,7 @@ notebook {
         notebook tab.reorderable-page.top:active:hover {
           background-color: rgba(237, 237, 237, 0.7); }
         notebook tab.reorderable-page.top:active:backdrop {
-          border-color: #a8a8a8;
+          border-color: darkgray;
           background-color: #ededed;
           border-bottom-color: #4a90d9; }
       notebook tab.reorderable-page.top:backdrop {
@@ -2180,7 +2228,7 @@ notebook {
         notebook tab.reorderable-page.bottom:active:hover {
           background-color: rgba(237, 237, 237, 0.7); }
         notebook tab.reorderable-page.bottom:active:backdrop {
-          border-color: #a8a8a8;
+          border-color: darkgray;
           background-color: #ededed;
           border-top-color: #4a90d9; }
       notebook tab.reorderable-page.bottom:backdrop {
@@ -2199,7 +2247,7 @@ notebook {
         notebook tab.reorderable-page.left:active:hover {
           background-color: rgba(237, 237, 237, 0.7); }
         notebook tab.reorderable-page.left:active:backdrop {
-          border-color: #a8a8a8;
+          border-color: darkgray;
           background-color: #ededed;
           border-right-color: #4a90d9; }
       notebook tab.reorderable-page.left:backdrop {
@@ -2218,7 +2266,7 @@ notebook {
         notebook tab.reorderable-page.right:active:hover {
           background-color: rgba(237, 237, 237, 0.7); }
         notebook tab.reorderable-page.right:active:backdrop {
-          border-color: #a8a8a8;
+          border-color: darkgray;
           background-color: #ededed;
           border-left-color: #4a90d9; }
       notebook tab.reorderable-page.right:backdrop {
@@ -2227,17 +2275,17 @@ notebook {
     notebook tab label {
       padding: 0 2px;
       font-weight: bold;
-      color: #8d9091; }
+      color: #8e9192; }
       notebook tab label:backdrop {
-        color: #aaabac; }
+        color: #abacad; }
     notebook tab:hover label {
-      color: #5d6263; }
+      color: #5e6364; }
       notebook tab:hover label:backdrop {
-        color: #aaabac; }
+        color: #abacad; }
     notebook tab:active label {
       color: #2e3436; }
       notebook tab:active label:backdrop {
-        color: #8d9091; }
+        color: #8e9192; }
     notebook tab .button, notebook tab .header-bar .button.titlebutton, .header-bar notebook tab 
.button.titlebutton,
     notebook tab .titlebar .button.titlebutton,
     .titlebar notebook tab .button.titlebutton {
@@ -2272,22 +2320,22 @@ notebook {
       notebook tab .button:backdrop, notebook tab .header-bar .button.titlebutton:backdrop, .header-bar 
notebook tab .button.titlebutton:backdrop,
       notebook tab .titlebar .button.titlebutton:backdrop,
       .titlebar notebook tab .button.titlebutton:backdrop {
-        color: rgba(141, 144, 145, 0.3);
+        color: rgba(142, 145, 146, 0.3);
         border-color: transparent; }
       notebook tab .button > image, notebook tab .header-bar .button.titlebutton > image, .header-bar 
notebook tab .button.titlebutton > image,
       notebook tab .titlebar .button.titlebutton > image,
       .titlebar notebook tab .button.titlebutton > image {
         padding: 2px; }
   notebook.arrow {
-    color: #8d9091; }
+    color: #8e9192; }
     notebook.arrow:hover {
-      color: #5d6263; }
+      color: #5e6364; }
     notebook.arrow:active {
       color: #2e3436; }
     notebook.arrow:insensitive {
-      color: rgba(141, 144, 145, 0.3); }
+      color: rgba(142, 145, 146, 0.3); }
     notebook.arrow:backdrop {
-      color: rgba(141, 144, 145, 0.4); }
+      color: rgba(142, 145, 146, 0.4); }
       notebook.arrow:backdrop:insensitive {
         color: #c7c7c7; }
 
@@ -2330,15 +2378,15 @@ notebook {
     border: 1px none #a1a1a1; }
     .scrollbar .trough:backdrop {
       background-color: #e5e5e5;
-      border-color: #a8a8a8; }
+      border-color: darkgray; }
   .scrollbar .slider {
     background-color: #7a7e7f; }
     .scrollbar .slider:hover {
-      background-color: #54595a; }
+      background-color: #54595b; }
     .scrollbar .slider:prelight:active {
       background-color: #2a76c6; }
     .scrollbar .slider:backdrop {
-      background-color: #c6c7c8; }
+      background-color: #c7c8c9; }
     .scrollbar .slider:insensitive {
       background-color: transparent; }
   .scrollbar .slider {
@@ -2378,7 +2426,7 @@ notebook {
     border-image-slice: 0 1 0 0; }
   .scrollbars-junction:backdrop,
   .scrollbars-junction.frame:backdrop {
-    border-image-source: linear-gradient(to bottom, #a8a8a8 1px, transparent 1px);
+    border-image-source: linear-gradient(to bottom, darkgray 1px, transparent 1px);
     background-color: #e5e5e5; }
 
 /**********
@@ -2396,7 +2444,7 @@ switch {
   border: 1px solid #a1a1a1;
   border-radius: 3px;
   color: #2e3436;
-  background-image: linear-gradient(to bottom, #cecece);
+  background-image: linear-gradient(to bottom, #cfcfcf);
   text-shadow: 0 1px rgba(0, 0, 0, 0.1); }
   switch:active {
     background-image: linear-gradient(to bottom, #4a90d9 2px, #63a0de);
@@ -2405,16 +2453,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: #8d9091;
+    color: #8e9192;
     border-color: #a1a1a1;
     background-image: none;
     background-color: #f4f4f4;
     box-shadow: 0 1px white;
     text-shadow: none; }
   switch:backdrop {
-    color: #8d9091;
-    border-color: #a8a8a8;
-    background-image: linear-gradient(to bottom, #d4d4d4);
+    color: #8e9192;
+    border-color: darkgray;
+    background-image: linear-gradient(to bottom, #d5d5d5);
     box-shadow: none;
     text-shadow: none; }
     switch:backdrop:active {
@@ -2424,7 +2472,7 @@ switch {
       box-shadow: none; }
   switch:insensitive {
     color: #c7c7c7;
-    border-color: #a8a8a8;
+    border-color: darkgray;
     background-image: none;
     background-color: #f4f4f4; }
   switch slider {
@@ -2450,7 +2498,7 @@ switch {
   switch:active slider {
     border: 1px solid #184472; }
   switch:insensitive slider {
-    color: #8d9091;
+    color: #8e9192;
     border-color: #a1a1a1;
     background-image: linear-gradient(to bottom, #f4f4f4);
     text-shadow: none;
@@ -2459,8 +2507,8 @@ switch {
     switch:insensitive slider > .label {
       color: inherit; }
   switch:backdrop slider {
-    color: #8d9091;
-    border-color: #a8a8a8;
+    color: #8e9192;
+    border-color: darkgray;
     background-image: linear-gradient(to bottom, #ededed);
     text-shadow: none;
     icon-shadow: none;
@@ -2470,7 +2518,7 @@ switch {
     border-color: #4a90d9; }
   switch:backdrop:insensitive slider {
     color: #c7c7c7;
-    border-color: #a8a8a8;
+    border-color: darkgray;
     background-image: linear-gradient(to bottom, #f4f4f4);
     text-shadow: none;
     icon-shadow: none;
@@ -2702,7 +2750,7 @@ switch {
   .menu .menuitem.check:hover {
     color: #ffffff; }
   .menu .menuitem.check:insensitive {
-    color: #bdbebf; }
+    color: #bebfc0; }
 
 .radio {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked.png"), url("assets/radio-unchecked 2 png"));
@@ -2913,7 +2961,7 @@ switch {
   .menu .menuitem.radio:hover {
     color: #ffffff; }
   .menu .menuitem.radio:insensitive {
-    color: #bdbebf; }
+    color: #bebfc0; }
 
 .view.check, .view.radio,
 .list-row .check, list-row .radio {
@@ -2967,7 +3015,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   padding: 1px 2px 4px;
   outline-offset: 0; }
   GtkCheckButton.text-button:insensitive, GtkCheckButton.text-button:insensitive:active, 
GtkCheckButton.text-button:insensitive:inconsistent, GtkRadioButton.text-button:insensitive, 
GtkRadioButton.text-button:insensitive:active, GtkRadioButton.text-button:insensitive:inconsistent {
-    color: #8d9091; }
+    color: #8e9192; }
     GtkCheckButton.text-button:insensitive:backdrop, GtkCheckButton.text-button:insensitive:active:backdrop, 
GtkCheckButton.text-button:insensitive:inconsistent:backdrop, 
GtkRadioButton.text-button:insensitive:backdrop, GtkRadioButton.text-button:insensitive:active:backdrop, 
GtkRadioButton.text-button:insensitive:inconsistent:backdrop {
       color: #c7c7c7; }
 
@@ -3031,14 +3079,14 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:backdrop {
       border-style: solid;
       border-radius: 50%;
-      border-color: #a0a0a0;
+      border-color: #a1a1a1;
       background-image: linear-gradient(to bottom, #ededed);
       box-shadow: none; }
     .scale.slider:backdrop:insensitive,
     .scale.scale-has-marks-above.scale-has-marks-below.slider:backdrop:insensitive,
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:backdrop:insensitive {
       color: #c7c7c7;
-      border-color: #a8a8a8;
+      border-color: darkgray;
       background-image: linear-gradient(to bottom, #f4f4f4);
       text-shadow: none;
       icon-shadow: none;
@@ -3101,7 +3149,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     margin: 10px;
     border: 1px solid #a1a1a1;
     border-radius: 3px;
-    background-color: #cecece;
+    background-color: #cfcfcf;
     box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1), 0 1px white; }
     .scale.trough.highlight,
     .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight,
@@ -3131,7 +3179,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     .scale.trough:backdrop,
     .scale.scale-has-marks-above.scale-has-marks-below.trough:backdrop,
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:backdrop {
-      border-color: #a8a8a8;
+      border-color: darkgray;
       background-color: #c7c7c7;
       box-shadow: none; }
     .scale.trough:backdrop:insensitive, .scale.trough .highlight:backdrop:insensitive,
@@ -3139,7 +3187,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     .scale.scale-has-marks-above.scale-has-marks-below.trough .highlight:backdrop:insensitive,
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:backdrop:insensitive,
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough .highlight:backdrop:insensitive {
-      border-color: #a8a8a8;
+      border-color: darkgray;
       background-color: #f4f4f4; }
     .osd .scale.trough, .osd
     .scale.scale-has-marks-above.scale-has-marks-below.trough, .osd
@@ -3194,14 +3242,14 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight:insensitive {
       border-color: #4a90d9;
       box-shadow: none;
-      background-color: #a4c7ec;
+      background-color: #a5c8ec;
       background-image: none; }
       .list-row:selected .scale:insensitive:backdrop, .list-row:selected 
.scale.trough.highlight:insensitive:backdrop, .list-row:selected
       .scale.scale-has-marks-above.scale-has-marks-below:insensitive:backdrop, .list-row:selected
       .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight:insensitive:backdrop, 
.list-row:selected
       .scale.vertical.scale-has-marks-above.scale-has-marks-below:insensitive:backdrop, .list-row:selected
       .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight:insensitive:backdrop {
-        background-color: #a4c7ec; }
+        background-color: #a5c8ec; }
 
 .scale.scale-has-marks-below {
   -GtkScale-slider-length: 20;
@@ -3458,8 +3506,8 @@ GtkProgressBar {
     border-radius: 3px;
     background-color: #d2d2d2; }
     GtkProgressBar.trough:backdrop {
-      border-color: #a8a8a8;
-      background-color: #d4d4d4;
+      border-color: darkgray;
+      background-color: #d5d5d5;
       box-shadow: 0 1px rgba(255, 255, 255, 0); }
     GtkProgressBar.trough.osd {
       border-style: none;
@@ -3521,8 +3569,8 @@ GtkProgressBar {
     .level-bar.trough:backdrop {
       background-color: transparent;
       background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
-      color: #323232;
-      border-color: #a8a8a8;
+      color: #333333;
+      border-color: darkgray;
       background-image: linear-gradient(to bottom, white);
       box-shadow: 0 1px rgba(255, 255, 255, 0); }
   .level-bar.fill-block {
@@ -3552,7 +3600,7 @@ GtkProgressBar {
       border-color: rgba(46, 52, 54, 0.2);
       box-shadow: none; }
       .level-bar.fill-block.empty-fill-block:backdrop {
-        border-color: rgba(141, 144, 145, 0.15); }
+        border-color: rgba(142, 145, 146, 0.15); }
 
 /**********
  * Frames *
@@ -3563,7 +3611,7 @@ GtkProgressBar {
   .frame.flat {
     border-style: none; }
   .frame:backdrop {
-    border-color: #a8a8a8; }
+    border-color: darkgray; }
   .frame.action-bar {
     padding: 6px;
     border-width: 1px 0 0; }
@@ -3584,7 +3632,7 @@ separator {
   border-color: #a1a1a1; }
   .list:backdrop {
     background-color: white;
-    border-color: #a8a8a8; }
+    border-color: darkgray; }
 
 .list-row,
 .grid-child {
@@ -3599,7 +3647,7 @@ separator {
 .list-row.activatable:selected:active {
   box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); }
 .list-row.activatable:selected.has-open-popup, .list-row.activatable:selected:hover {
-  background-color: #4786c8; }
+  background-color: #4787c9; }
 .list-row.activatable:selected:backdrop {
   background-color: #4a90d9; }
 
@@ -3643,8 +3691,8 @@ separator {
   .list-row:selected .button:backdrop, .list-row:selected .button.flat:backdrop, .list-row:selected 
.sidebar-button.button:backdrop, .list-row:selected .header-bar .titlebutton.button:backdrop, .header-bar 
.list-row:selected .titlebutton.button:backdrop,
   .list-row:selected .titlebar .titlebutton.button:backdrop,
   .titlebar .list-row:selected .titlebutton.button:backdrop {
-    color: #8d9091;
-    border-color: #a8a8a8;
+    color: #8e9192;
+    border-color: darkgray;
     background-image: linear-gradient(to bottom, #ededed);
     text-shadow: none;
     icon-shadow: none;
@@ -3655,22 +3703,23 @@ separator {
     .titlebar .list-row:selected .titlebutton.button:backdrop:active, .list-row:selected 
.button.flat:backdrop:checked, .list-row:selected .sidebar-button.button:backdrop:checked, .list-row:selected 
.header-bar .titlebutton.button:backdrop:checked, .header-bar .list-row:selected 
.titlebutton.button:backdrop:checked,
     .list-row:selected .titlebar .titlebutton.button:backdrop:checked,
     .titlebar .list-row:selected .titlebutton.button:backdrop:checked {
-      color: #8d9091;
-      border-color: #a8a8a8;
-      background-image: linear-gradient(to bottom, #d4d4d4);
+      color: #8e9192;
+      border-color: darkgray;
+      background-image: linear-gradient(to bottom, #d5d5d5);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       border-color: #184472; }
     .list-row:selected .button:backdrop:insensitive, .list-row:selected .button.flat:backdrop:insensitive, 
.list-row:selected .sidebar-button.button:backdrop:insensitive, .list-row:selected .header-bar 
.titlebutton.button:backdrop:insensitive, .header-bar .list-row:selected 
.titlebutton.button:backdrop:insensitive,
     .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive,
     .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive {
       color: #c7c7c7;
-      border-color: #a8a8a8;
+      border-color: darkgray;
       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; }
-      .list-row:selected .button:backdrop:insensitive > .label, .list-row:selected 
.button.flat:backdrop:insensitive > .label, .list-row:selected .sidebar-button.button:backdrop:insensitive > 
.label, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive > .label, .header-bar 
.list-row:selected .titlebutton.button:backdrop:insensitive > .label,
+      .list-row:selected .button:backdrop:insensitive > .label, .list-row:selected .header-bar 
.button.titlebutton:backdrop:insensitive > .label,
+      .list-row:selected .titlebar .button.titlebutton:backdrop:insensitive > .label, .list-row:selected 
.button.flat:backdrop:insensitive > .label, .list-row:selected .sidebar-button.button:backdrop:insensitive > 
.label, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive > .label, .header-bar 
.list-row:selected .titlebutton.button:backdrop:insensitive > .label,
       .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive > .label,
       .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive > .label {
         color: inherit; }
@@ -3680,11 +3729,13 @@ separator {
       .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive:checked,
       .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:checked {
         color: #c7c7c7;
-        border-color: #a8a8a8;
+        border-color: darkgray;
         background-image: linear-gradient(to bottom, #e7e7e7);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         border-color: #184472; }
-        .list-row:selected .button:backdrop:insensitive:active > .label, .list-row:selected 
.button:backdrop:insensitive:checked > .label, .list-row:selected .button.flat:backdrop:insensitive:active > 
.label, .list-row:selected .sidebar-button.button:backdrop:insensitive:active > .label, .list-row:selected 
.header-bar .titlebutton.button:backdrop:insensitive:active > .label, .header-bar .list-row:selected 
.titlebutton.button:backdrop:insensitive:active > .label,
+        .list-row:selected .button:backdrop:insensitive:active > .label, .list-row:selected .header-bar 
.button.titlebutton:backdrop:insensitive:active > .label,
+        .list-row:selected .titlebar .button.titlebutton:backdrop:insensitive:active > .label, 
.list-row:selected .button:backdrop:insensitive:checked > .label, .list-row:selected .header-bar 
.button.titlebutton:backdrop:insensitive:checked > .label,
+        .list-row:selected .titlebar .button.titlebutton:backdrop:insensitive:checked > .label, 
.list-row:selected .button.flat:backdrop:insensitive:active > .label, .list-row:selected 
.sidebar-button.button:backdrop:insensitive:active > .label, .list-row:selected .header-bar 
.titlebutton.button:backdrop:insensitive:active > .label, .header-bar .list-row:selected 
.titlebutton.button:backdrop:insensitive:active > .label,
         .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive:active > .label,
         .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:active > .label, 
.list-row:selected .button.flat:backdrop:insensitive:checked > .label, .list-row:selected 
.sidebar-button.button:backdrop:insensitive:checked > .label, .list-row:selected .header-bar 
.titlebutton.button:backdrop:insensitive:checked > .label, .header-bar .list-row:selected 
.titlebutton.button:backdrop:insensitive:checked > .label,
         .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive:checked > .label,
@@ -3701,21 +3752,24 @@ separator {
     icon-shadow: none;
     color: white; }
   .list-row:selected .button:insensitive {
-    color: #8d9091;
+    color: #8e9192;
     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; }
-    .list-row:selected .button:insensitive > .label {
+    .list-row:selected .button:insensitive > .label, .list-row:selected .header-bar 
.button.titlebutton:insensitive > .label,
+    .list-row:selected .titlebar .button.titlebutton:insensitive > .label {
       color: inherit; }
     .list-row:selected .button:insensitive:active, .list-row:selected .button:insensitive:checked {
-      color: #8d9091;
+      color: #8e9192;
       border-color: #a1a1a1;
-      background-image: linear-gradient(to bottom, #ebebeb, #f4f4f4);
+      background-image: linear-gradient(to bottom, #ececec, #f4f4f4);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .list-row:selected .button:insensitive:active > .label, .list-row:selected .button:insensitive:checked 
.label {
+      .list-row:selected .button:insensitive:active > .label, .list-row:selected .header-bar 
.button.titlebutton:insensitive:active > .label,
+      .list-row:selected .titlebar .button.titlebutton:insensitive:active > .label, .list-row:selected 
.button:insensitive:checked > .label, .list-row:selected .header-bar .button.titlebutton:insensitive:checked 
.label,
+      .list-row:selected .titlebar .button.titlebutton:insensitive:checked > .label {
         color: inherit; }
 
 .list-row {
@@ -3786,9 +3840,9 @@ separator {
     .app-notification .button:insensitive, .app-notification .button:backdrop:insensitive,
     .app-notification.frame .button:insensitive,
     .app-notification.frame .button:backdrop:insensitive {
-      color: #878989;
+      color: #878a89;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -3834,18 +3888,18 @@ GtkCalendar {
       color: #2e3436; }
     GtkCalendar.button:backdrop, .header-bar GtkCalendar.button.titlebutton:backdrop,
     .titlebar GtkCalendar.button.titlebutton:backdrop {
-      color: rgba(141, 144, 145, 0.45); }
+      color: rgba(142, 145, 146, 0.45); }
     GtkCalendar.button:insensitive, .header-bar GtkCalendar.button.titlebutton:insensitive,
     .titlebar GtkCalendar.button.titlebutton:insensitive {
-      color: rgba(141, 144, 145, 0.45); }
+      color: rgba(142, 145, 146, 0.45); }
   GtkCalendar:inconsistent, GtkCalendar:inconsistent:backdrop {
     color: alpha(currentColor,0.55); }
   GtkCalendar.highlight, GtkCalendar.highlight:backdrop {
     font-size: smaller;
     color: #2e3436; }
   GtkCalendar:backdrop {
-    color: #323232;
-    border-color: #a8a8a8; }
+    color: #333333;
+    border-color: darkgray; }
 
 /***********
  * Dialogs *
@@ -3888,29 +3942,31 @@ GtkCalendar {
     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); }
   .message-dialog.csd .dialog-action-area .button:insensitive {
-    color: #8d9091;
+    color: #8e9192;
     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); }
-    .message-dialog.csd .dialog-action-area .button:insensitive > .label {
+    .message-dialog.csd .dialog-action-area .button:insensitive > .label, .message-dialog.csd 
.dialog-action-area .header-bar .button.titlebutton:insensitive > .label,
+    .message-dialog.csd .dialog-action-area .titlebar .button.titlebutton:insensitive > .label {
       color: inherit; }
   .message-dialog.csd .dialog-action-area .button:backdrop {
-    color: #8d9091;
-    border-color: #a8a8a8;
+    color: #8e9192;
+    border-color: darkgray;
     background-image: linear-gradient(to bottom, #ededed);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   .message-dialog.csd .dialog-action-area .button:backdrop:insensitive {
     color: #c7c7c7;
-    border-color: #a8a8a8;
+    border-color: darkgray;
     background-image: linear-gradient(to bottom, #f4f4f4);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    .message-dialog.csd .dialog-action-area .button:backdrop:insensitive > .label {
+    .message-dialog.csd .dialog-action-area .button:backdrop:insensitive > .label, .message-dialog.csd 
.dialog-action-area .header-bar .button.titlebutton:backdrop:insensitive > .label,
+    .message-dialog.csd .dialog-action-area .titlebar .button.titlebutton:backdrop:insensitive > .label {
       color: inherit; }
   .message-dialog.csd .dialog-action-area .button.suggested-action {
     color: white;
@@ -3937,7 +3993,7 @@ GtkCalendar {
       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); }
     .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop {
-      color: #dae8f7;
+      color: #dbe9f7;
       border-color: #4a90d9;
       background-image: linear-gradient(to bottom, #4a90d9);
       text-shadow: none;
@@ -3945,21 +4001,23 @@ GtkCalendar {
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive {
         color: #c7c7c7;
-        border-color: #a8a8a8;
+        border-color: darkgray;
         background-image: linear-gradient(to bottom, #f4f4f4);
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive > .label {
+        .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive > .label, 
.message-dialog.csd .dialog-action-area .header-bar .suggested-action.button.titlebutton:backdrop:insensitive 
.label,
+        .message-dialog.csd .dialog-action-area .titlebar 
.suggested-action.button.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
     .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive {
-      color: #8d9091;
+      color: #8e9192;
       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); }
-      .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive > .label {
+      .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive > .label, 
.message-dialog.csd .dialog-action-area .header-bar .suggested-action.button.titlebutton:insensitive > .label,
+      .message-dialog.csd .dialog-action-area .titlebar .suggested-action.button.titlebutton:insensitive > 
.label {
         color: inherit; }
   .message-dialog.csd .dialog-action-area .button.destructive-action {
     color: white;
@@ -3986,7 +4044,7 @@ GtkCalendar {
       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); }
     .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop {
-      color: #fbd4d4;
+      color: #fcd4d4;
       border-color: #ef2929;
       background-image: linear-gradient(to bottom, #ef2929);
       text-shadow: none;
@@ -3994,21 +4052,23 @@ GtkCalendar {
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive {
         color: #c7c7c7;
-        border-color: #a8a8a8;
+        border-color: darkgray;
         background-image: linear-gradient(to bottom, #f4f4f4);
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive > .label {
+        .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive > .label, 
.message-dialog.csd .dialog-action-area .header-bar 
.destructive-action.button.titlebutton:backdrop:insensitive > .label,
+        .message-dialog.csd .dialog-action-area .titlebar 
.destructive-action.button.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
     .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive {
-      color: #8d9091;
+      color: #8e9192;
       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); }
-      .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive > .label {
+      .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive > .label, 
.message-dialog.csd .dialog-action-area .header-bar .destructive-action.button.titlebutton:insensitive > 
.label,
+      .message-dialog.csd .dialog-action-area .titlebar .destructive-action.button.titlebutton:insensitive > 
.label {
         color: inherit; }
 .message-dialog.csd .dialog-action-area .button, .message-dialog.csd .dialog-action-area .button:hover, 
.message-dialog.csd .dialog-action-area .button:active, .message-dialog.csd .dialog-action-area 
.button:insensitive, .message-dialog.csd .dialog-action-area .button:backdrop, .message-dialog.csd 
.dialog-action-area .button:backdrop:insensitive, .message-dialog.csd .dialog-action-area 
.button.suggested-action, .message-dialog.csd .dialog-action-area .button.suggested-action:hover, 
.message-dialog.csd .dialog-action-area .button.suggested-action:active, .message-dialog.csd 
.dialog-action-area .button.suggested-action:backdrop, .message-dialog.csd .dialog-action-area 
.button.suggested-action:backdrop:insensitive, .message-dialog.csd .dialog-action-area 
.button.suggested-action:insensitive, .message-dialog.csd .dialog-action-area .button.destructive-action, 
.message-dialog.csd .dialog-action-area .button.destructive-action:hover, .message-dialog.csd 
.dialog-action-area .button
 .destructive-action:active, .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop, 
.message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive, .message-dialog.csd 
.dialog-action-area .button.destructive-action:insensitive {
   border-left-style: solid;
@@ -4032,7 +4092,7 @@ GtkFileChooserDialog .search-bar {
 GtkFileChooserDialog .dialog-action-box {
   border-top: 1px solid #a1a1a1; }
   GtkFileChooserDialog .dialog-action-box:backdrop {
-    border-top-color: #a8a8a8; }
+    border-top-color: darkgray; }
 
 /***********
  * Sidebar *
@@ -4072,7 +4132,9 @@ GtkPlacesSidebar.sidebar .sidebar-new-bookmark-row {
   GtkVolumeButton.sidebar-button.button, .header-bar .sidebar-button.titlebutton.button,
   .titlebar .sidebar-button.titlebutton.button {
     padding: 5px; }
-  .sidebar-button.button:not(:hover):not(:active) > image, .sidebar-button.button:backdrop > image {
+  .sidebar-button.button:not(:hover):not(:active) > image, .header-bar 
.sidebar-button.button.titlebutton:not(:hover):not(:active) > image,
+  .titlebar .sidebar-button.button.titlebutton:not(:hover):not(:active) > image, 
.sidebar-button.button:backdrop > image, .header-bar .sidebar-button.button.titlebutton:backdrop > image,
+  .titlebar .sidebar-button.button.titlebutton:backdrop > image {
     opacity: 0.7; }
 
 .sidebar-item {
@@ -4108,7 +4170,7 @@ GtkPaned {
   GtkPaned .pane-separator {
     background-color: #a1a1a1; }
     GtkPaned .pane-separator:backdrop {
-      background-color: #a8a8a8; }
+      background-color: darkgray; }
 
 GtkPaned.wide {
   -GtkPaned-handle-size: 5;
@@ -4121,7 +4183,7 @@ GtkPaned.wide {
   GtkPaned.wide.vertical .pane-separator {
     border-style: solid none; }
   GtkPaned.wide .pane-separator:backdrop {
-    border-color: #a8a8a8; }
+    border-color: darkgray; }
 
 /**************
  * GtkInfoBar *
@@ -4188,22 +4250,29 @@ infobar {
     .question .button:insensitive,
     .warning .button:insensitive,
     .error .button:insensitive {
-      color: #b2cfee;
+      color: #b2d0ef;
       border-color: #1c5187;
-      background-image: linear-gradient(to bottom, #65a0de);
+      background-image: linear-gradient(to bottom, #65a1df);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .info .button:insensitive > .label,
+      .info .button:insensitive > .label, .info .header-bar .button.titlebutton:insensitive > .label,
+      .info .titlebar .button.titlebutton:insensitive > .label,
       .question .button:insensitive > .label,
+      .question .header-bar .button.titlebutton:insensitive > .label,
+      .question .titlebar .button.titlebutton:insensitive > .label,
       .warning .button:insensitive > .label,
-      .error .button:insensitive > .label {
+      .warning .header-bar .button.titlebutton:insensitive > .label,
+      .warning .titlebar .button.titlebutton:insensitive > .label,
+      .error .button:insensitive > .label,
+      .error .header-bar .button.titlebutton:insensitive > .label,
+      .error .titlebar .button.titlebutton:insensitive > .label {
         color: inherit; }
     .info .button:backdrop,
     .question .button:backdrop,
     .warning .button:backdrop,
     .error .button:backdrop {
-      color: #dae8f7;
+      color: #dbe9f7;
       border-color: #4a90d9;
       background-image: linear-gradient(to bottom, #4a90d9);
       text-shadow: none;
@@ -4214,17 +4283,24 @@ infobar {
       .question .button:backdrop:insensitive,
       .warning .button:backdrop:insensitive,
       .error .button:backdrop:insensitive {
-        color: #9ac1e9;
-        border-color: #65a0de;
-        background-image: linear-gradient(to bottom, #65a0de);
+        color: #9bc2ea;
+        border-color: #65a1df;
+        background-image: linear-gradient(to bottom, #65a1df);
         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 .button:backdrop:insensitive > .label, .info .header-bar 
.button.titlebutton:backdrop:insensitive > .label,
+        .info .titlebar .button.titlebutton:backdrop:insensitive > .label,
         .question .button:backdrop:insensitive > .label,
+        .question .header-bar .button.titlebutton:backdrop:insensitive > .label,
+        .question .titlebar .button.titlebutton:backdrop:insensitive > .label,
         .warning .button:backdrop:insensitive > .label,
-        .error .button:backdrop:insensitive > .label {
+        .warning .header-bar .button.titlebutton:backdrop:insensitive > .label,
+        .warning .titlebar .button.titlebutton:backdrop:insensitive > .label,
+        .error .button:backdrop:insensitive > .label,
+        .error .header-bar .button.titlebutton:backdrop:insensitive > .label,
+        .error .titlebar .button.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
   .info label:selected, .info label:selected:focus, .info label:selected:hover,
   .question label:selected,
@@ -4348,8 +4424,8 @@ GtkColorSwatch {
       icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
       box-shadow: inset 0 1px white, 0 1px white; }
     GtkColorSwatch#add-color-button:backdrop {
-      color: #8d9091;
-      border-color: #a8a8a8;
+      color: #8e9192;
+      border-color: darkgray;
       background-image: linear-gradient(to bottom, #ededed);
       text-shadow: none;
       icon-shadow: none;
@@ -4416,7 +4492,7 @@ decoration {
     border-radius: 0;
     margin: 4px;
     background-color: #ededed;
-    border: solid 1px #a8a8a8;
+    border: solid 1px darkgray;
     box-shadow: none; }
 
 .header-bar .titlebutton.button,
@@ -4442,7 +4518,7 @@ decoration {
   outline-color: rgba(255, 255, 255, 0.3); }
   .view:insensitive:selected, GtkCalendar:insensitive:selected, label:insensitive:selected, 
.grid-child:insensitive:selected, entry:insensitive:selected, .menuitem.button.flat:insensitive:selected, 
.menuitem.sidebar-button.button:insensitive:selected, .header-bar 
.menuitem.titlebutton.button:insensitive:selected,
   .titlebar .menuitem.titlebutton.button:insensitive:selected, .list-row:insensitive:selected, 
.sidebar:insensitive:selected, GtkPlacesSidebar.sidebar .list-row:selected:insensitive label {
-    color: #a4c7ec; }
+    color: #a5c8ec; }
   .view:backdrop:selected, GtkCalendar:backdrop:selected, label:backdrop:selected, 
.grid-child:backdrop:selected, entry:backdrop:selected, .menuitem.button.flat:backdrop:selected, 
.menuitem.sidebar-button.button:backdrop:selected, .header-bar .menuitem.titlebutton.button:backdrop:selected,
   .titlebar .menuitem.titlebutton.button:backdrop:selected, .list-row:backdrop:selected, 
.sidebar:backdrop:selected {
     color: #ffffff; }
@@ -4551,9 +4627,9 @@ decoration {
       icon-shadow: none;
       outline-color: rgba(238, 238, 236, 0.3); }
     .touch-selection .button:insensitive, .touch-selection .button:backdrop:insensitive {
-      color: #878989;
+      color: #878a89;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -4654,7 +4730,7 @@ decoration {
   border: none;
   box-shadow: none; }
   .overshoot.top:backdrop {
-    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#a8a8a8), to(rgba(168, 168, 
168, 0)));
+    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(darkgray), to(rgba(169, 169, 
169, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center top;
@@ -4670,7 +4746,7 @@ decoration {
   border: none;
   box-shadow: none; }
   .overshoot.bottom:backdrop {
-    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#a8a8a8), to(rgba(168, 
168, 168, 0)));
+    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(darkgray), to(rgba(169, 
169, 169, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center bottom;
@@ -4686,7 +4762,7 @@ decoration {
   border: none;
   box-shadow: none; }
   .overshoot.left:backdrop {
-    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#a8a8a8), to(rgba(168, 168, 
168, 0)));
+    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(darkgray), to(rgba(169, 
169, 169, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: left center;
@@ -4702,7 +4778,7 @@ decoration {
   border: none;
   box-shadow: none; }
   .overshoot.right:backdrop {
-    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#a8a8a8), to(rgba(168, 
168, 168, 0)));
+    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(darkgray), to(rgba(169, 
169, 169, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: right center;
@@ -4788,13 +4864,13 @@ base background color of insensitive widgets */
 @define-color insensitive_bg_color #f4f4f4;
 /*
 text foreground color of insensitive widgets */
- define-color insensitive_fg_color #8d9091;
+ define-color insensitive_fg_color #8e9192;
 /*
 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 #8d9091;
+ define-color theme_unfocused_fg_color #8e9192;
 /*
 text color for entries, views and content in general on backdrop windows */
 @define-color theme_unfocused_text_color black;
@@ -4815,7 +4891,7 @@ widgets main borders color */
 @define-color borders #a1a1a1;
 /*
 widgets main borders color on backdrop windows */
- define-color unfocused_borders #a8a8a8;
+ define-color unfocused_borders darkgray;
 /*
 these are pretty self explicative */
 @define-color warning_color #f57900;
@@ -4825,7 +4901,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 #8d9091;
+ define-color wm_unfocused_title #8e9192;
 @define-color wm_highlight white;
 @define-color wm_borders_edge white;
 @define-color wm_bg_a shade(#ededed, 1.2);
diff --git a/gtk/ui/gtkpathbar.ui b/gtk/ui/gtkpathbar.ui
index d9a433d..b20ca63 100644
--- a/gtk/ui/gtkpathbar.ui
+++ b/gtk/ui/gtkpathbar.ui
@@ -1,54 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk30">
-  <!-- interface-requires gtk+ 3.10 -->
-  <object class="GtkButton" id="down_slider_button">
-    <property name="visible">1</property>
-    <property name="can_focus">1</property>
-    <property name="receives_default">1</property>
-    <property name="focus_on_click">0</property>
-    <child internal-child="accessible">
-      <object class="AtkObject" id="down_slider_button-atkobject">
-        <property name="AtkObject::accessible-name" translatable="yes">Down Path</property>
-      </object>
-    </child>
-    <signal name="button-press-event" handler="gtk_path_bar_slider_button_press" swapped="no"/>
-    <signal name="button-release-event" handler="gtk_path_bar_slider_button_release" swapped="no"/>
-    <signal name="focus-out-event" handler="gtk_path_bar_slider_down_defocus" swapped="no"/>
-    <signal name="unmap" handler="on_slider_unmap" swapped="no"/>
+  <template class="GtkPathBar" parent="GtkBox">
+    <property name="visible">true</property>
+    <property name="orientation">horizontal</property>
+    <property name="vexpand">false</property>
     <child>
-      <object class="GtkImage">
-        <property name="visible">1</property>
-        <property name="icon-name">pan-end-symbolic</property>
-        <property name="icon-size">1</property>
-      </object>
-    </child>
-    <style>
-      <class name="image-button"/>
-    </style>
-  </object>
-  <object class="GtkButton" id="up_slider_button">
-    <property name="visible">1</property>
-    <property name="can_focus">1</property>
-    <property name="receives_default">1</property>
-    <property name="focus_on_click">0</property>
-    <child internal-child="accessible">
-      <object class="AtkObject" id="up_slider_button-atkobject">
-        <property name="AtkObject::accessible-name" translatable="yes">Up Path</property>
+      <object class="GtkButton" id="overflow_button">
+        <property name="visible">true</property>
+        <property name="no-show-all">true</property>
+        <child>
+          <object class="GtkImage">
+            <property name="visible">true</property>
+            <property name="icon_name">image-loading-symbolic</property>
+            <property name="icon_size">1</property>
+          </object>
+        </child>
+        <style>
+          <class name="image-button"/>
+        </style>
       </object>
     </child>
-    <signal name="button-press-event" handler="gtk_path_bar_slider_button_press" swapped="no"/>
-    <signal name="button-release-event" handler="gtk_path_bar_slider_button_release" swapped="no"/>
-    <signal name="focus-out-event" handler="gtk_path_bar_slider_up_defocus" swapped="no"/>
-    <signal name="unmap" handler="on_slider_unmap" swapped="no"/>
     <child>
-      <object class="GtkImage">
-        <property name="visible">1</property>
-        <property name="icon-name">pan-start-symbolic</property>
-        <property name="icon-size">1</property>
+      <object class="GtkBox" id="path_box">
+        <property name="visible">true</property>
       </object>
     </child>
     <style>
-      <class name="image-button"/>
+      <class name="path-bar"/>
     </style>
-  </object>
+  </template>
 </interface>
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 50f2986..447a1f8 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -106,6 +106,7 @@ noinst_PROGRAMS =  $(TEST_PROGS)    \
        testorientable                  \
        testoverlay                     \
        testoverlaystyleclass           \
+       testpathbar                     \
        testprint                       \
        testrecentchooser               \
        testrecentchoosermenu           \
@@ -301,6 +302,7 @@ testanimation_DEPENDENCIES = $(TEST_DEPS)
 testpixbuf_save_DEPENDENCIES = $(TEST_DEPS)
 testpixbuf_color_DEPENDENCIES = $(TEST_DEPS)
 testpixbuf_scale_DEPENDENCIES = $(TEST_DEPS)
+testpathbar_DEPENDENCIES = $(TEST_DEPS)
 testgmenu_DEPENDENCIES = $(TEST_DEPS)
 testlogout_DEPENDENCIES = $(TEST_DEPS)
 teststack_DEPENDENCIES = $(TEST_DEPS)
@@ -399,6 +401,9 @@ testtoolbar_SOURCES =       \
 testmenubutton_SOURCES =       \
        testmenubutton.c
 
+testpathbar_SOURCES =          \
+       testpathbar.c
+
 testprint_SOURCES =            \
        testprint.c             \
        testprintfileoperation.h \



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