changeset 17:ca246bc0af4a

Update to GTK 3.18 and regenerate assets
author IBBoard <dev@ibboard.co.uk>
date Sat, 09 Jul 2016 15:25:37 +0100
parents 504f558b5340
children cf44599f0382
files README.md gtk-3.0/README gtk-3.0/_colors.scss gtk-3.0/_common.scss gtk-3.0/_drawing.scss gtk-3.0/assets.svg gtk-3.0/assets.txt gtk-3.0/assets/checkbox-checked-active-selectionmode.png gtk-3.0/assets/checkbox-checked-active-selectionmode@2.png gtk-3.0/assets/checkbox-checked-backdrop-selectionmode.png gtk-3.0/assets/checkbox-checked-backdrop-selectionmode@2.png gtk-3.0/assets/checkbox-checked-hover-selectionmode.png gtk-3.0/assets/checkbox-checked-hover-selectionmode@2.png gtk-3.0/assets/checkbox-checked-selectionmode.png gtk-3.0/assets/checkbox-checked-selectionmode@2.png gtk-3.0/assets/selected-checkbox-checked-active.png gtk-3.0/assets/selected-checkbox-checked-active@2.png gtk-3.0/assets/selected-checkbox-checked-backdrop-insensitive.png gtk-3.0/assets/selected-checkbox-checked-backdrop-insensitive@2.png gtk-3.0/assets/selected-checkbox-checked-backdrop.png gtk-3.0/assets/selected-checkbox-checked-backdrop@2.png gtk-3.0/assets/selected-checkbox-checked-hover.png gtk-3.0/assets/selected-checkbox-checked-hover@2.png gtk-3.0/assets/selected-checkbox-checked-insensitive.png gtk-3.0/assets/selected-checkbox-checked-insensitive@2.png gtk-3.0/assets/selected-checkbox-checked.png gtk-3.0/assets/selected-checkbox-checked@2.png gtk-3.0/assets/selected-checkbox-mixed-active.png gtk-3.0/assets/selected-checkbox-mixed-active@2.png gtk-3.0/assets/selected-checkbox-mixed-backdrop-insensitive.png gtk-3.0/assets/selected-checkbox-mixed-backdrop-insensitive@2.png gtk-3.0/assets/selected-checkbox-mixed-backdrop.png gtk-3.0/assets/selected-checkbox-mixed-backdrop@2.png gtk-3.0/assets/selected-checkbox-mixed-hover.png gtk-3.0/assets/selected-checkbox-mixed-hover@2.png gtk-3.0/assets/selected-checkbox-mixed-insensitive.png gtk-3.0/assets/selected-checkbox-mixed-insensitive@2.png gtk-3.0/assets/selected-checkbox-mixed.png gtk-3.0/assets/selected-checkbox-mixed@2.png gtk-3.0/assets/selected-checkbox-unchecked-active.png gtk-3.0/assets/selected-checkbox-unchecked-active@2.png gtk-3.0/assets/selected-checkbox-unchecked-backdrop-insensitive.png gtk-3.0/assets/selected-checkbox-unchecked-backdrop-insensitive@2.png gtk-3.0/assets/selected-checkbox-unchecked-backdrop.png gtk-3.0/assets/selected-checkbox-unchecked-backdrop@2.png gtk-3.0/assets/selected-checkbox-unchecked-hover.png gtk-3.0/assets/selected-checkbox-unchecked-hover@2.png gtk-3.0/assets/selected-checkbox-unchecked-insensitive.png gtk-3.0/assets/selected-checkbox-unchecked-insensitive@2.png gtk-3.0/assets/selected-checkbox-unchecked.png gtk-3.0/assets/selected-checkbox-unchecked@2.png gtk-3.0/assets/selected-radio-checked-active.png gtk-3.0/assets/selected-radio-checked-active@2.png gtk-3.0/assets/selected-radio-checked-backdrop-insensitive.png gtk-3.0/assets/selected-radio-checked-backdrop-insensitive@2.png gtk-3.0/assets/selected-radio-checked-backdrop.png gtk-3.0/assets/selected-radio-checked-backdrop@2.png gtk-3.0/assets/selected-radio-checked-hover.png gtk-3.0/assets/selected-radio-checked-hover@2.png gtk-3.0/assets/selected-radio-checked-insensitive.png gtk-3.0/assets/selected-radio-checked-insensitive@2.png gtk-3.0/assets/selected-radio-checked.png gtk-3.0/assets/selected-radio-checked@2.png gtk-3.0/assets/selected-radio-mixed-active.png gtk-3.0/assets/selected-radio-mixed-active@2.png gtk-3.0/assets/selected-radio-mixed-backdrop-insensitive.png gtk-3.0/assets/selected-radio-mixed-backdrop-insensitive@2.png gtk-3.0/assets/selected-radio-mixed-backdrop.png gtk-3.0/assets/selected-radio-mixed-backdrop@2.png gtk-3.0/assets/selected-radio-mixed-hover.png gtk-3.0/assets/selected-radio-mixed-hover@2.png gtk-3.0/assets/selected-radio-mixed-insensitive.png gtk-3.0/assets/selected-radio-mixed-insensitive@2.png gtk-3.0/assets/selected-radio-mixed.png gtk-3.0/assets/selected-radio-mixed@2.png gtk-3.0/assets/selected-radio-unchecked-active.png gtk-3.0/assets/selected-radio-unchecked-active@2.png gtk-3.0/assets/selected-radio-unchecked-backdrop-insensitive.png gtk-3.0/assets/selected-radio-unchecked-backdrop-insensitive@2.png gtk-3.0/assets/selected-radio-unchecked-backdrop.png gtk-3.0/assets/selected-radio-unchecked-backdrop@2.png gtk-3.0/assets/selected-radio-unchecked-hover.png gtk-3.0/assets/selected-radio-unchecked-hover@2.png gtk-3.0/assets/selected-radio-unchecked-insensitive.png gtk-3.0/assets/selected-radio-unchecked-insensitive@2.png gtk-3.0/assets/selected-radio-unchecked.png gtk-3.0/assets/selected-radio-unchecked@2.png gtk-3.0/assets/slider-horz-scale-has-marks-above-active-dark.png gtk-3.0/assets/slider-horz-scale-has-marks-above-active-dark@2.png gtk-3.0/assets/slider-horz-scale-has-marks-below-active-dark.png gtk-3.0/assets/slider-horz-scale-has-marks-below-active-dark@2.png gtk-3.0/assets/slider-vert-scale-has-marks-above-active-dark.png gtk-3.0/assets/slider-vert-scale-has-marks-above-active-dark@2.png gtk-3.0/assets/slider-vert-scale-has-marks-below-active-dark.png gtk-3.0/assets/slider-vert-scale-has-marks-below-active-dark@2.png gtk-3.0/assets/text-select-end-active-dark.png gtk-3.0/assets/text-select-end-active-dark@2.png gtk-3.0/assets/text-select-end-active.png gtk-3.0/assets/text-select-end-active@2.png gtk-3.0/assets/text-select-end-dark.png gtk-3.0/assets/text-select-end-dark@2.png gtk-3.0/assets/text-select-end-hover-dark.png gtk-3.0/assets/text-select-end-hover-dark@2.png gtk-3.0/assets/text-select-end-hover.png gtk-3.0/assets/text-select-end-hover@2.png gtk-3.0/assets/text-select-end.png gtk-3.0/assets/text-select-end@2.png gtk-3.0/assets/text-select-start-active-dark.png gtk-3.0/assets/text-select-start-active-dark@2.png gtk-3.0/assets/text-select-start-active.png gtk-3.0/assets/text-select-start-active@2.png gtk-3.0/assets/text-select-start-dark.png gtk-3.0/assets/text-select-start-dark@2.png gtk-3.0/assets/text-select-start-hover-dark.png gtk-3.0/assets/text-select-start-hover-dark@2.png gtk-3.0/assets/text-select-start-hover.png gtk-3.0/assets/text-select-start-hover@2.png gtk-3.0/assets/text-select-start.png gtk-3.0/assets/text-select-start@2.png gtk-3.0/gtk-contained-dark.css gtk-3.0/gtk-contained.css gtk-3.0/gtk-dark.css gtk-3.0/gtk.css gtk-3.0/gtk.scss
diffstat 124 files changed, 4418 insertions(+), 3018 deletions(-) [+]
line wrap: on
line diff
--- a/README.md	Sat Jul 09 11:48:31 2016 +0100
+++ b/README.md	Sat Jul 09 15:25:37 2016 +0100
@@ -11,7 +11,7 @@
 The Theme
 ---------
 
-Adwaita Dark Green includes GTK2, GTK3 (3.16) and Metacity themes.
+Adwaita Dark Green includes GTK2, GTK3 (3.18) and Metacity themes.
 
 The following screenshots were taken at [revision ecae148f2522](https://dev.ibboard.co.uk/repos/other/Adwaita-Dark-Green/rev/ecae148f2522)
 
--- a/gtk-3.0/README	Sat Jul 09 11:48:31 2016 +0100
+++ b/gtk-3.0/README	Sat Jul 09 15:25:37 2016 +0100
@@ -2,15 +2,15 @@
 -------
 
 * Do not edit the CSS directly, edit the source SCSS files and process them with SASS (run 
-  `/.parse-sass.sh` when you have the required sofwtare installed, as described below)
-* To be able to use the lates/adequate version of sass, install ruby, gem, sass & bundle. 
+  `./parse-sass.sh` when you have the required software installed, as described below)
+* To be able to use the latest/adequate version of sass, install ruby, gem, sass & bundle.
   On Fedora F20, this is done with `sudo dnf install rubygems && gem install bundle && bundle install`
   from the same directory this README resides in.
 
 How to tweak the theme
 ----------------------
 
-Adwaita is a complex themes, so to keep it maintainable it's written and processed in SASS, the
+Adwaita is a complex theme, so to keep it maintainable it's written and processed in SASS. The
 generated CSS is then transformed into a gresource file during gtk build and used at runtime in a 
 non-legible or editable form.
 
--- a/gtk-3.0/_colors.scss	Sat Jul 09 11:48:31 2016 +0100
+++ b/gtk-3.0/_colors.scss	Sat Jul 09 15:25:37 2016 +0100
@@ -16,6 +16,8 @@
 $link_visited_color: if($variant == 'light', darken($selected_bg_color,20%), lighten($selected_bg_color,10%));
 $top_hilight: $borders_edge;
 
+$menu_color: if($variant == 'light', $base_color, mix($bg_color, $base_color, 20%));
+
 $scrollbar_bg_color: darken($bg_color, 7%);
 
 $warning_color: #f57900;
@@ -30,7 +32,7 @@
 $osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 50%);
 $osd_borders_color: transparentize(black, 0.3);
 
-$sidebar_bg_color: lighten($bg_color,5%);
+$sidebar_bg_color: mix($bg_color, $base_color, 50%);
 
 $tooltip_borders_color: transparentize(white, 0.9);
 
@@ -46,9 +48,10 @@
 $backdrop_fg_color: mix($fg_color, $backdrop_bg_color, 50%);
 $backdrop_insensitive_color: if($variant == 'light', darken($backdrop_bg_color, 15%), lighten($backdrop_bg_color, 15%));
 $backdrop_selected_fg_color: $selected_fg_color;
-$backdrop_selected_bg_color: desaturate($selected_bg_color,100%);
 $backdrop_borders_color: mix($borders_color, $bg_color, 90%);
 $backdrop_dark_fill: mix($backdrop_borders_color, $backdrop_bg_color, 35%);
-$backdrop_sidebar_bg_color: lighten($backdrop_bg_color,5%);
+$backdrop_sidebar_bg_color: mix($backdrop_bg_color, $backdrop_base_color, 50%);
 
 $backdrop_scrollbar_bg_color: darken($backdrop_bg_color, 3%);
+
+$backdrop_menu_color: if($variant == 'light', $backdrop_base_color, mix($backdrop_bg_color, $backdrop_base_color, 20%));
--- a/gtk-3.0/_common.scss	Sat Jul 09 11:48:31 2016 +0100
+++ b/gtk-3.0/_common.scss	Sat Jul 09 15:25:37 2016 +0100
@@ -3,6 +3,7 @@
 }
 
 $ease-out-quad: cubic-bezier(0.25, 0.46, 0.45, 0.94);
+$asset_suffix: if($variant=='dark', '-dark', '');
 
 * {
   padding: 0;
@@ -36,7 +37,7 @@
   -GtkWidget-focus-line-width: 1; //
 
   -GtkWidget-text-handle-width: 20;
-  -GtkWidget-text-handle-height: 20;
+  -GtkWidget-text-handle-height: 24;
 
   -GtkDialog-button-spacing: 4;
   -GtkDialog-action-area-border: 0;
@@ -119,8 +120,8 @@
 }
 
 .rubberband {
-  border: 1px solid $selected_bg_color;
-  background-color: transparentize($selected_bg_color,0.8);
+  border: 1px solid darken($selected_bg_color, 10%);
+  background-color: transparentize(darken($selected_bg_color, 10%), 0.8);
 }
 
 .label {
@@ -260,36 +261,23 @@
     &:backdrop { background-color: transparent; }
   }
 
-  .linked > & { //FIXME: use same buttons linking logic and template
-    border-radius: 0;
-    &:first-child {
-      border-top-left-radius: 3px;
-      border-bottom-left-radius: 3px;
-      &:dir(rtl) { border-right-style: none;}
-    }
-    &:last-child {
-      border-top-right-radius: 3px;
-      border-bottom-right-radius: 3px;
-      border-left-style: none;
-      &:dir(rtl) { border-left-style: solid; }
-    }
+  .linked:not(.vertical) > & { @extend %linked; }
+
+  .linked:not(.vertical) > &:focus + .entry,
+  .linked:not(.vertical) > &:focus + .button,
+  .linked:not(.vertical) > &:focus + GtkComboBox > .the-button-in-the-combobox,
+  .linked:not(.vertical) > &:focus + GtkComboBoxText > .the-button-in-the-combobox {
+    border-left-color: entry_focus_border(); // colors the border of the widget following a focused entry
   }
 
-  &.error { // FIXME: dark variant love needed
-    color: $error_color;
-    border-color: $error_color;
-    &:focus { @include entry(focus, $error_color); }
-    &:selected, &:selected:focus {
-      background-color: $error_color;
-    }
-  }
-
-  &.warning { // FIXME: dark variant love needed
-    color: $warning_color;
-    border-color: $warning_color;
-    &:focus { @include entry(focus, $warning_color); }
-    &:selected, &:selected:focus {
-      background-color: $warning_color;
+  // entry error and warning style
+  @each $e_type, $e_color in (error, $error_color),
+                             (warning, $warning_color) {
+    &.#{$e_type} {
+      color: $e_color;
+      border-color: entry_focus_border($e_color);
+      &:focus { @include entry(focus, $e_color); }
+      &:selected, &:selected:focus { background-color: $e_color; }
     }
   }
 
@@ -300,78 +288,6 @@
     &:backdrop { color: mix($backdrop_fg_color, $backdrop_base_color, 80%); }
   }
 
-  .linked.vertical > & { //FIXME comment stuff and make the whole thing smarter.
-    @include entry(normal, $edge: none);
-    background-image: linear-gradient(to bottom, $base_color);
-    border-bottom-color: mix($borders_color, $base_color, 30%);
-    box-shadow: none;
-    @extend %linked_vertical;
-    &:focus {
-      border-color: entry_focus_border($selected_bg_color);
-      box-shadow: entry_focus_glow($selected_bg_color),
-                  0 -1px 0 0 entry_focus_border($selected_bg_color);
-      @extend %linked_vertical;
-    }
-    &:insensitive {
-      @include entry(insensitive, $edge: none);
-      border-bottom-color: mix($borders_color, $base_color, 30%);
-      @extend %linked_vertical;
-      &:backdrop {
-        @include entry(backdrop-insensitive, $edge: none);
-        border-bottom-color: mix($backdrop_borders_color, $backdrop_base_color, 30%);
-        @extend %linked_vertical;
-      }
-    }
-    &:backdrop {
-      @include entry(backdrop, $edge: none);
-      border-bottom-color: mix($backdrop_borders_color, $backdrop_base_color, 30%);
-      @extend %linked_vertical;
-    }
-    &:first-child {
-      @include entry(normal, $edge: none);
-      border-bottom-color: mix($borders_color, $base_color, 30%);
-      &:focus { @include entry(focus, $edge: none); }
-      &:insensitive {
-        @include entry(insensitive, $edge: none);
-        border-bottom-color: mix($backdrop_borders_color, $backdrop_base_color, 30%);
-        @extend %linked_vertical:first-child;
-        &:backdrop {
-          @include entry(backdrop-insensitive, $edge: none);
-          border-bottom-color: mix($backdrop_borders_color, $backdrop_base_color, 30%);
-          border-top-style: solid;
-        }
-      }
-      &:backdrop {
-        @include entry(backdrop, $edge: none);
-        border-bottom-color: mix($backdrop_borders_color, $backdrop_base_color, 30%);
-        @extend %linked_vertical:first-child;
-      }
-    }
-    &:last-child {
-      @include entry(normal);
-      background-image: linear-gradient(to bottom, $base_color);
-      box-shadow: _widget_edge();
-      &:focus {
-        border-color: entry_focus_border($selected_bg_color);
-        box-shadow: entry_focus_glow($selected_bg_color),
-                    0 -1px 0 0 entry_focus_border($selected_bg_color),
-                    _widget_edge();
-        @extend %linked_vertical:last-child;
-      }
-      &:insensitive {
-        @include entry(insensitive);
-        @extend %linked_vertical:last-child;
-        &:backdrop {
-          @include entry(backdrop-insensitive);
-          @extend %linked_vertical:last-child;
-        }
-      }
-      &:backdrop {
-        @include entry(backdrop);
-        @extend %linked_vertical:last-child;
-      }
-    }
-  }
   .osd & {
     @include entry(osd);
     &:focus { @include entry(osd-focus); }
@@ -380,6 +296,46 @@
   }
 }
 
+// Vertically linked entries
+// FIXME: take care of "colored" entries
+.linked.vertical {
+  > .entry { @extend %linked_vertical; }
+
+  // remove the edge hilight and the focus shadow (unfortunatelly)
+  > .entry:not(:last-child) { box-shadow: none; }
+  // add back the focus shadow
+  > .entry:focus:not(:last-child) { box-shadow: entry_focus_shadow(); }
+
+  // brighter border between linked entries
+  > .entry:not(:insensitive) + .entry:not(:insensitive) {
+    border-top-color: mix($borders_color, $base_color, 30%);
+    background-image: linear-gradient(to bottom, $base_color);
+    &:backdrop {
+      border-top-color: mix($backdrop_borders_color, $backdrop_base_color, 30%);
+      background-image: linear-gradient(to bottom, $backdrop_base_color);
+    }
+  }
+
+  // color back the top border of a linked focused entry following another entry and add back the focus shadow.
+  > .entry + .entry:focus:not(:last-child) {
+    border-top-color: entry_focus_border();
+    box-shadow: entry_focus_shadow();
+  }
+  // just recolor the top border on the last focused entry, since we don't reset the shadow here letting that be
+  // inherited by the entry styling.
+  > .entry + .entry:focus:last-child {
+    border-top-color: entry_focus_border();
+  }
+
+  // this takes care of coloring the top border of the focused entry subsequent widget.
+  // :not(:only-child) is a specificity bump hack.
+  > .entry:focus:not(:only-child) + .entry,
+  > .entry:focus:not(:only-child) + .button,
+  > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+  > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-top-color: entry_focus_border(); }
+}
+
+
 /***********
  * Buttons *
  ***********/
@@ -558,7 +514,7 @@
 
   // Suggested and Destructive Action buttons
   @each $b_type, $b_color in (suggested-action, $selected_bg_color),
-                              (destructive-action, $destructive_color) {
+                             (destructive-action, $destructive_color) {
     &.#{$b_type} {
       @include button(normal, $b_color, white);
       &.flat {
@@ -737,32 +693,26 @@
 .inline-toolbar.toolbar GtkToolButton,
 .inline-toolbar.toolbar GtkToolButton:backdrop {
   & > .button.flat { @extend %linked_middle; }
-  &:dir(rtl) > .button.flat { @extend %linked_middle:dir(rtl); }
   &:first-child > .button.flat { @extend %linked:first-child; }
   &:last-child > .button.flat { @extend %linked:last-child; }
-  &:last-child:dir(rtl) > .button.flat { @extend %linked:last-child:dir(rtl); }
   &:only-child > .button.flat { @extend %linked:only-child; }
 }
 
 %linked_middle {
   border-radius: 0;
-  border-left-style: none;
-  &:dir(rtl) {
-    border-radius: 0; // needed when including %linked_middle:dir(rtl)
-    border-right-style: none;
-    border-left-style: solid
-  }
+  border-right-style: none;
 }
 
 %linked {
   @extend %linked_middle;
   &:first-child {
-    border-radius: 3px 0 0 3px;
-    border-left-style: solid;
+    border-top-left-radius: 3px;
+    border-bottom-left-radius: 3px;
   }
   &:last-child {
-    border-radius: 0 3px 3px 0;
-    &:dir(rtl) { border-right-style: solid; }
+    border-top-right-radius: 3px;
+    border-bottom-right-radius: 3px;
+    border-right-style: solid;
   }
   &:only-child {
     border-radius: 3px;
@@ -771,19 +721,20 @@
 }
 
 %linked_vertical_middle {
-  border-left-style: solid;
-  border-top-style: none;
+  border-style: solid solid none solid;
   border-radius: 0;
 }
 
 %linked_vertical{
   @extend %linked_vertical_middle;
   &:first-child {
-    border-style: solid;
-    border-radius: 3px 3px 0 0;
+    border-top-left-radius: 3px;
+    border-top-right-radius: 3px;
   }
   &:last-child {
-    border-radius: 0 0 3px 3px;
+    border-bottom-left-radius: 3px;
+    border-bottom-right-radius: 3px;
+    border-style: solid;
   }
   &:only-child {
     border-radius: 3px;
@@ -865,6 +816,9 @@
                                  //a weird transition which for some reason
                                  //makes borders blink on hover
   }
+  & > .label {
+    text-decoration-line: underline;
+  }
 }
 
 /*****************
@@ -1020,14 +974,12 @@
  * ComboBoxes *
  **************/
 GtkComboBox {
-  > .button { padding-top: 3px; padding-bottom: 4px; } // Otherwise combos
-                                                       // are bigger then
-                                                       // buttons
+  > .the-button-in-the-combobox { padding-top: 3px; padding-bottom: 4px; } // Otherwise combos
+                                                                           // are bigger then
+                                                                           // buttons
   -GtkComboBox-arrow-scaling: 0.5;
   -GtkComboBox-shadow-type: none;
 
-  box-shadow: 0 1px $borders_edge;
-
   @include _button_text_shadow;
 
   &:insensitive {
@@ -1048,37 +1000,59 @@
     // always disable separators
     -GtkWidget-wide-separators: true;
   }
-  &.combobox-entry .entry { @extend %linked; }
-  &.combobox-entry .button, &.combobox-entry .button:backdrop {
-    // It is needed to specify the backdrop button or it gets overridden
-    @extend %linked;
+  &.combobox-entry .entry {
+    &:dir(ltr) {
+      border-top-right-radius: 0;
+      border-bottom-right-radius: 0;
+    }
+    &:dir(rtl) {
+      border-top-left-radius: 0;
+      border-bottom-left-radius: 0;
+    }
+  }
+  &.combobox-entry .button {
+    &:dir(ltr) {
+      border-top-left-radius: 0;
+      border-bottom-left-radius: 0;
+      border-left-style: none;
+    }
+    &:dir(rtl) {
+      border-top-right-radius: 0;
+      border-bottom-right-radius: 0;
+      border-right-style: none;
+    }
   }
 }
 
-.linked > GtkComboBox > .button {
+.linked > GtkComboBox > .the-button-in-the-combobox,
+.linked > GtkComboBoxText > .the-button-in-the-combobox {
   // the combo is a composite widget so the way we do button linkind doesn't
   // work, special case needed. See
   // https://bugzilla.gnome.org/show_bug.cgi?id=733979
-  &:dir(ltr) { @extend %linked_middle; } // specificity bump
-  &:dir(rtl) { @extend %linked_middle:dir(rtl); }
+  &:dir(ltr),
+  &:dir(rtl) { @extend %linked_middle; } // specificity bump
 }
-.linked > GtkComboBox:first-child > .button {
+.linked > GtkComboBox:first-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:first-child > .the-button-in-the-combobox {
   @extend %linked:first-child;
 }
-.linked > GtkComboBox:last-child > .button {
+.linked > GtkComboBox:last-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:last-child > .the-button-in-the-combobox {
   @extend %linked:last-child;
 }
-.linked > GtkComboBox:only-child > .button {
+.linked > GtkComboBox:only-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:only-child > .the-button-in-the-combobox {
   @extend %linked:only-child;
 }
-.linked.vertical > GtkComboBoxText > .button,
-.linked.vertical > GtkComboBox > .button { @extend %linked_vertical_middle; }
-.linked.vertical > GtkComboBoxText:first-child > .button,
-.linked.vertical > GtkComboBox:first-child > .button { @extend %linked_vertical:first-child; }
-.linked.vertical > GtkComboBoxText:last-child > .button,
-.linked.vertical > GtkComboBox:last-child > .button { @extend %linked_vertical:last-child; }
-.linked.vertical > GtkComboBoxText:only-child > .button,
-.linked.vertical > GtkComboBox:only-child > .button { @extend %linked_vertical:only-child; }
+
+.linked.vertical > GtkComboBoxText > .the-button-in-the-combobox,
+.linked.vertical > GtkComboBox > .the-button-in-the-combobox { @extend %linked_vertical_middle; }
+.linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox,
+.linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox { @extend %linked_vertical:first-child; }
+.linked.vertical > GtkComboBoxText:last-child > .the-button-in-the-combobox,
+.linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox { @extend %linked_vertical:last-child; }
+.linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox,
+.linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox { @extend %linked_vertical:only-child; }
 
 /************
  * Toolbars *
@@ -1336,6 +1310,8 @@
   border-left-color: mix($fg_color, $base_color, 50%); // this is actually the tree lines color,
   border-top-color: $bg_color;                         // while this is the grid lines color, better then nothing
 
+  &.rubberband { @extend .rubberband; } // to avoid borders being overridden by the previously set props
+
   &:selected { border-radius: 0; } // rest border radius in lists
 
   &:selected, &:backdrop:selected {
@@ -1535,9 +1511,10 @@
 .menu {
   margin: 4px;
   padding: 0px;
-  background-color: $base_color;
+  background-color: $menu_color;
   border: 1px solid $borders_color; // adds borders in a non composited env
   .csd & { border: none; }  // axes borders in a composited env
+  &:backdrop { background-color: $backdrop_menu_color; }
   .menuitem {
     text-shadow: none;
     padding: 4px;
@@ -1551,7 +1528,7 @@
     }
     &:backdrop, &:backdrop:hover {
       color: $backdrop_fg_color;
-      background-color: $backdrop_base_color;
+      background-color: transparent;
     }
     //submenu indicators
     &.arrow { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); }
@@ -1608,17 +1585,6 @@
   &.osd { @extend %osd; }
 }
 
-//touch selection handlebars for the Popover.osd above
-.entry.cursor-handle,
-.cursor-handle {
-  background-color: transparent;
-  background-image: none;
-  box-shadow: none;
-  border-style: none;
-  &.top { -gtk-icon-source: -gtk-icontheme('selection-start-symbolic'); }
-  &.bottom { -gtk-icon-source: -gtk-icontheme('selection-end-symbolic'); }
-}
-
 /*****************
  * Notebooks and *
  * Tabs          *
@@ -2029,6 +1995,8 @@
 GtkSwitch {
   -GtkSwitch-slider-width: 45px; // 55px is the right value to make it as tall
                                  // as buttons, not doing that for now
+  -GtkSwitch-slider-height: 27px;
+
   font-weight: bold;
   font-size: smaller;
   outline-offset: -4px;
@@ -2130,7 +2098,6 @@
 // draw regular check and radio items using our PNG assets
 // all assets are rendered from assets.svg. never add pngs directly
 
-$asset_suffix: if($variant=='dark', '-dark', '');
 @each $w,$a in ('check', 'checkbox'),
                ('radio','radio') {
 
@@ -2194,14 +2161,6 @@
   &:selected, &:hover { icon-shadow: none; }
 }
 
-//content view (grid/list)
-
-.content-view {
-  background-color: darken($bg_color,7%);
-  &:backdrop { background-color: darken($bg_color,7%); }
-  &.rubberband { @extend .rubberband; }
-}
-
 //selection-mode
 @each $s,$as in ('','-selectionmode'),
                   (':hover', '-hover-selectionmode'),
@@ -2211,7 +2170,7 @@
                   (':checked:hover', '-checked-hover-selectionmode'),
                   (':checked:active', '-checked-active-selectionmode'),
                   (':backdrop:checked', '-checked-backdrop-selectionmode') {
-  .view.content-view.check#{$s} {
+  .view.content-view.check#{$s}:not(.list) {
     icon-shadow: none;
     -gtk-icon-source: -gtk-scaled(url("assets/checkbox#{$as}.png"),
                                     url("assets/checkbox#{$as}@2.png"));
@@ -2337,6 +2296,7 @@
       border-color: $backdrop_borders_color;
       background-color: $insensitive_bg_color;
     }
+
     //OSD troughs
     .osd & {
       border-color: $osd_borders_color;
@@ -2360,9 +2320,25 @@
       }
     }
   }
+  // scales on selected list rows
+  .list-row:selected & {
+    border-color: $selected_borders_color;
+    &.trough {
+      box-shadow: inset 1px 1px transparentize(black, 0.9);
+      &:backdrop { box-shadow: none; }
+      &.highlight:backdrop { border-color: $selected_borders_color; }
+    }
+    &:insensitive,
+    &.trough.highlight:insensitive {
+      border-color: $selected_bg_color;
+      box-shadow: none;
+      background-color: mix($selected_fg_color, $selected_bg_color, 50%);
+      background-image: none;
+      &:backdrop { background-color: mix($backdrop_selected_fg_color, $selected_bg_color, 50%); }
+    }
+  }
 }
 
-$asset_suffix: if($variant=='dark', '-dark', '');
 @each $d,$dn in ('', 'horz'),
                 ('.vertical', 'vert') {
   @each $w,$we in  ('scale-has-marks-below','scale_marks_below'),
@@ -2372,6 +2348,8 @@
       -GtkRange-slider-width: 24;
       -GtkRange-trough-border: 2;
 
+      color: gtkalpha(currentColor, 0.5); // marks color
+
       @extend %#{$we}_#{$dn};
 
       @each $s,$as in ('',''),
@@ -2498,11 +2476,6 @@
  * Level Bar *
  *************/
 
-.level-bar.vertical {
-  -GtkLevelBar-min-block-width: 3;
-  -GtkLevelBar-min-block-height: 34;
-}
-
 .level-bar {
   box-shadow: _widget_edge(); // needs to be set here to avoid clipping
   -GtkLevelBar-min-block-width: 34;
@@ -2596,7 +2569,7 @@
  * Lists *
  *********/
 
-.list, .list-row {
+.list {
   background-color: $base_color;
   border-color: $borders_color;
   &:backdrop {
@@ -2610,28 +2583,11 @@
   padding: 2px;
 }
 
-.list-row.button,
-.list-row.button:backdrop,
-.list-row.button:backdrop:active,
-.list-row.button:backdrop:checked,
-.list-row.button:backdrop:insensitive,
-.list-row.button:backdrop:insensitive:active,
-.list-row.button:backdrop:insensitive:checked,
-.list-row.button:insensitive:active,
-.list-row.button:insensitive:checked {
-  // reset button inherited stuff
-  @extend %undecorated_button;
-  background-color: transparentize($base_color,1); // for the transition
-  border-style: none; // I need no borders here
-  border-radius: 0;   // and no rounded corners
-  box-shadow: none;   // and no box-shadow
-
-}
-
-.list-row.button {
+.list-row.activatable {
   // let's take care of background colors
   &:hover {
-    background-color: mix($fg_color, $base_color, 5%);
+    //background-color: mix($fg_color, $base_color, 5%);
+    background-color: if(variant == light, transparentize($fg_color, 0.9), transparentize($fg_color, 0.95));
   }
   &:active {
     box-shadow: inset 0 2px 2px -2px transparentize(black, 0.8);
@@ -2694,8 +2650,8 @@
 }
 
 // transition
-.list-row, list-row.button {
-  transition: all 300ms $ease-out-quad;
+.list-row {
+  transition: all 150ms $ease-out-quad;
   &:hover { transition: none; }
 }
 
@@ -2782,10 +2738,18 @@
       @extend %undecorated_button;
       color: transparentize($backdrop_fg_color,0.55);
     }
+
+    &:insensitive {
+      @extend %undecorated_button;
+      color:  transparentize($insensitive_fg_color,0.55);
+    }
   }
 
-  &:inconsistent, &:inconsistent:backdrop,
-  &.highlight, &.highlight:backdrop { color: gtkalpha(currentColor, 0.55); }
+  &:inconsistent, &:inconsistent:backdrop { color: gtkalpha(currentColor, 0.55); }
+  &.highlight, &.highlight:backdrop {
+    font-size: smaller;
+    color: $fg_color;
+  }
 
 
   &:backdrop {
@@ -2803,8 +2767,6 @@
 }
 
 .message-dialog { // Message Dialog styling
-  -GtkDialog-button-spacing: 0;
-
   @if $variant==light {
     // the bright variant as a slightly darker bg which in this case clashes with the window decoration, overriding
     &.background { background-color: $bg_color; }
@@ -2914,7 +2876,7 @@
 
 .sidebar {
   border: none;
-  background-color: $sidebar_bg_color;
+  background-color: mix($bg_color, $base_color, 50%);
 
   &:backdrop {
     background-color: $backdrop_sidebar_bg_color;
@@ -2925,46 +2887,60 @@
   }
 }
 
-// Places sidebar is a special case, since the view here have to look like chrome not content, so we override text color
-GtkPlacesSidebar.sidebar .view {
-
-  color: $fg_color;
-  background-color: transparent;
-
-  .separator,
-  .separator:backdrop { @extend .separator; }
-
-  .image { // icons color
-    color: mix($fg_color, $sidebar_bg_color, 70%);
-
-    &:selected {
-      color: mix($selected_fg_color, $selected_bg_color, 90%);
-
-      &:backdrop { color: mix($backdrop_selected_fg_color, $selected_bg_color, 90%); }
-    }
-
-    &:insensitive { color: mix($insensitive_fg_color, $sidebar_bg_color, 70%); }
-
-    &:backdrop {
-      color: mix($backdrop_fg_color, $sidebar_bg_color, 70%);
-
-      &:insensitive { color: mix($backdrop_insensitive_color, $sidebar_bg_color, 70%); }
-    }
+$_placesidebar_icons_opacity: 0.7;
+GtkSidebarRow {
+  // Needs overriding of the GtkListBoxRow padding
+  &.list-row {
+    padding: 0px;
   }
-
-  &:insensitive { color: $insensitive_fg_color; }
-
-  &:backdrop {
-    color: $backdrop_fg_color;
-
-    &:insensitive { color: $backdrop_insensitive_color; }
+  // Using margins/padding directly in the SidebarRow
+  // will make the animation of the new bookmark row jump
+  .sidebar-revealer {
+    padding: 4px 14px 4px 12px;
   }
-
-  &:selected {
-    @extend %selected_items;
+  .sidebar-icon {
+    opacity: $_placesidebar_icons_opacity; // dim the device icons
+    &:dir(ltr) { padding-right: 8px; }
+    &:dir(rtl) { padding-left: 8px; }
+  }
+  .sidebar-label {
+    &:dir(ltr) { padding-right: 2px; }
+    &:dir(rtl) { padding-left: 2px; }
   }
 }
 
+GtkPlacesSidebar.sidebar {
+  // in the sidebar case it makes no sense to click the selected row
+  .list-row:selected:active { box-shadow: none; }
+
+   // looks like the label doesn't get all the states so work around
+  .list-row:selected:insensitive .label { @extend %selected_items:insensitive; }
+  .list-row:selected:backdrop:insensitive .label { @extend %selected_items:backdrop:insensitive; }
+
+  .sidebar-placeholder-row {
+    border: solid 1px $selected_bg_color;
+  }
+
+  .sidebar-new-bookmark-row {
+    color: $selected_bg_color;
+  }
+
+  @at-root .sidebar-button.button { // @at-root needded to not change the specificity making button styling inheritance broken
+                                    // so istead of "GtkPlacesSidebar.sidebar .sidebar-button.button" [specificity 0,0,3,1]
+                                    // the extended selector ".sidebar-button.button" [specificity 0,0,2,0]
+
+    &.image-button { padding: 5px; }
+
+    @extend .button.flat;
+    border-radius: 100%;
+    outline-radius: 100%;
+    &:not(:hover):not(:active) > GtkImage,
+    &:backdrop > GtkImage { opacity: $_placesidebar_icons_opacity };
+  }
+  // this is for indicating which sidebar row generated a popover
+  // see https://bugzilla.gnome.org/show_bug.cgi?id=754411
+  .has-open-popup { @extend .list-row.activatable:hover; }
+}
 
 .sidebar-item {
   padding: 10px 4px;
@@ -2978,6 +2954,25 @@
   }
 }
 
+/****************
+ * File chooser *
+ ****************/
+
+GtkPlacesView {
+  .server-list-button > GtkImage {
+    transition: 200ms $ease-out-quad;
+    -gtk-icon-transform: rotate(0turn);
+  }
+
+  .server-list-button:checked > GtkImage {
+    transition: 200ms $ease-out-quad;
+    -gtk-icon-transform: rotate(-0.5turn);
+  }
+
+  .list-row.activatable:hover {
+    background-color: transparent;
+  }
+}
 
 /*********
  * Paned *
@@ -3113,6 +3108,10 @@
 
   // we need to re-set the shadow here since it get axed by the previous bit
   &:selected { box-shadow: $_colorswatch_shadow; }
+  &:insensitive {
+    box-shadow: none;
+    opacity: 0.5;
+  }
 
   // base color corners rounding
   // to avoid the artifacts caused by rounded corner anti-aliasing the base color
@@ -3190,12 +3189,12 @@
   // indicator and keynav outline colors
   &.color-dark {
     color: white;
-    outline-color: transparentize(black, 0.7);
+    outline-color: transparentize(white, 0.5);
     &:backdrop { color: transparentize(white, 0.7); }
   }
   &.color-light {
     color: black;
-    outline-color: transparentize(white, 0.5);
+    outline-color: transparentize(black, 0.5);
     &:backdrop { color: transparentize(black, 0.7); }
   }
 
@@ -3222,19 +3221,45 @@
  * Misc *
  ********/
 
-.scale-popup .button { // +/- buttons on GtkVolumeButton popup
-  padding: 6px;
-  &:hover {
-    @extend %undecorated_button;
-    background-color: transparentize($fg_color,0.9);
-    border-radius: 5px;
+//content view (grid/list)
+.content-view {
+  background-color: darken($bg_color,7%);
+  &:hover { -gtk-image-effect: highlight; }
+  &:backdrop { background-color: darken($bg_color,7%); }
+  &.rubberband { @extend .rubberband; }
+}
+
+.scale-popup {
+
+   .osd & { @extend %osd; }
+
+   .osd & .button.flat {  //FIXME: quick hack, redo properly
+     padding: 6px;
+     border-style: none;
+     border-radius: 5px;
+   }
+
+  .button { // +/- buttons on GtkVolumeButton popup
+    padding: 6px;
+    &:hover {
+      @extend %undecorated_button;
+      background-color: transparentize($fg_color,0.9);
+      border-radius: 5px;
+    }
+    &:backdrop,
+    &:backdrop:hover,
+    &:backdrop:insensitive { @extend %undecorated_button; }
   }
-  &:backdrop,
-  &:backdrop:hover,
-  &:backdrop:insensitive { @extend %undecorated_button; }
 }
 
-GtkVolumeButton.button { padding: 8px; }
+GtkScaleButton.button,
+GtkVolumeButton.button {
+  // I assume both are image-button *by default*
+  // with the image-button/text-button classes automagically applied depending on the button child these selectors can be deleted.
+  @extend .image-button;
+
+  &.text-button { @extend .text-button }
+}
 
 /**********************
  * Window Decorations *
@@ -3273,7 +3298,7 @@
     box-shadow: 0 0 0 1px $_wm_border; //just doing borders, wm draws actual shadows
   }
   &.csd {
-    .popup {
+    &.popup {
       border-radius: 0;
       box-shadow: 0 1px 2px transparentize(black, 0.8),
                   0 0 0 1px transparentize($_wm_border,0.1);
@@ -3322,20 +3347,99 @@
   @if $variant == 'light' {
     outline-color: transparentize($selected_fg_color, 0.7);
   }
+  &:insensitive { color: mix($selected_fg_color, $selected_bg_color, 50%); }
   &:backdrop {
     color: $backdrop_selected_fg_color;
-    background-color: $backdrop_selected_bg_color;
+    &:insensitive {
+      color: mix($backdrop_selected_fg_color, $selected_bg_color, 30%);
+    }
+  }
+}
+
+.monospace {
+  font: Monospace;
+}
+
+/**********************
+ * Touch Copy & Paste *
+ *********************/
+
+//touch selection handlebars for the Popover.osd above
+.entry.cursor-handle,
+.cursor-handle {
+  background-color: transparent;
+  background-image: none;
+  box-shadow: none;
+  border-style: none;
+  @each $s,$as in ('',''),
+                  (':hover','-hover'),
+                  (':active','-active') { //no need for insensitive and backdrop
+                    &.top#{$s}:dir(ltr), &.bottom#{$s}:dir(rtl) {
+                      $_url: 'assets/text-select-start#{$as}#{$asset_suffix}';
+                      -gtk-icon-source: -gtk-scaled(url('#{$_url}.png'),
+                                        url('#{$_url}@2.png'));
+                      padding-left: 10px;
+                    }
+                    &.bottom#{$s}:dir(ltr), &.top#{$s}:dir(rtl) {
+                      $_url: 'assets/text-select-end#{$as}#{$asset_suffix}';
+                      -gtk-icon-source: -gtk-scaled(url('#{$_url}.png'),
+                                        url('#{$_url}@2.png'));
+                      padding-right: 10px;
+                    }
+                    &.insertion-cursor#{$s}:dir(ltr), &.insertion-cursor#{$s}:dir(rtl) {
+                      $_url: 'assets/slider-horz-scale-has-marks-above#{$as}#{$asset_suffix}';
+                      -gtk-icon-source: -gtk-scaled(url('#{$_url}.png'),
+                                        url('#{$_url}@2.png'));
+     }
   }
 }
 
 /* Decouple the font of context menus from their entry/textview */
-.touch-selection,
 .context-menu {
   font: initial;
 }
 
-.monospace {
-  font: Monospace;
+.touch-selection {
+  font: initial;
+  color: $osd_fg_color;
+  border: none;
+  background-color: opacify($osd_bg_color,0.2);
+  background-clip: padding-box;
+  outline-color: transparentize($osd_fg_color, 0.7);
+  box-shadow: none;
+  text-shadow: 0 1px black;
+  icon-shadow: 0 1px black;
+  &:backdrop { text-shadow: none; }
+  .button {
+    @include button(osd);
+    &:hover { @include button(osd-hover); }
+    &:active, &:checked { @include button(osd-active); }
+    &:insensitive, &:backdrop:insensitive { @include button(osd-insensitive); }
+    &:backdrop { @include button(osd-backdrop); }
+  }
+  // checkboxes and radios to use the -dark style for OSD style popovers
+  @each $w,$a in ('check', 'checkbox'),
+                 ('radio','radio') {
+    @each $s,$as in ('','-unchecked'),
+                  (':hover', '-unchecked-hover'),
+                  (':active', '-unchecked-active'),
+                  (':insensitive','-unchecked-insensitive'),
+                  (':inconsistent', '-mixed'),
+                  (':inconsistent:hover', '-mixed-hover'),
+                  (':inconsistent:selected', '-mixed-active'),
+                  (':inconsistent:insensitive', '-mixed-insensitive'),
+                  (':checked', '-checked'),
+                  (':checked:insensitive','-checked-insensitive'),
+                  (':checked:hover', '-checked-hover'),
+                  (':checked:active', '-checked-active'),
+                  (':backdrop:checked', '-checked-backdrop') {
+    .#{$w}#{$s} {
+      icon-shadow: none;
+      -gtk-icon-source: -gtk-scaled(url("assets/#{$a}#{$as}-dark.png"),
+                                    url("assets/#{$a}#{$as}-dark@2.png"));
+      }
+    }
+  }
 }
 
 // This is used by GtkScrolledWindow, when content is touch-dragged past boundaries.
--- a/gtk-3.0/_drawing.scss	Sat Jul 09 11:48:31 2016 +0100
+++ b/gtk-3.0/_drawing.scss	Sat Jul 09 15:25:37 2016 +0100
@@ -19,19 +19,22 @@
 
 // entries
 
-@function entry_focus_border($fc) {
+@function entry_focus_border($fc:$selected_bg_color) {
   @if $variant == 'light' { @return $fc; }
   @else { @return if($fc==$selected_bg_color, $selected_borders_color, darken($fc,35%)); }
 }
 
-@function entry_focus_glow($fc) {
-  $_focus_glow_color: if($variant=='light', transparentize($fc,0.85),
-                                            transparentize($fc,0.3));
-  @return inset 0 0 0 1px $_focus_glow_color;
+@function entry_focus_shadow($fc:$selected_bg_color) {
+  @return inset 0 0 0 1px $fc;
 }
 
 @function entry_gradient($c) {
-  @return linear-gradient(to bottom, darken($c,3%), $c 90%);
+  @if $variant=='light' { @return linear-gradient(to bottom, mix($borders_color, $c, 35%),
+                                                             mix($borders_color, $c, 7%) 3px,
+                                                             $c 90%); }
+  @else { @return linear-gradient(to bottom, mix($borders_color, $c, 95%),
+                                             mix($borders_color, $c, 40%) 3px,
+                                             $c 90%); }
 }
 
 @mixin entry($t, $fc:$selected_bg_color, $edge: $borders_edge) {
@@ -46,51 +49,40 @@
 // possible $t values:
 // normal, focus, insensitive, backdrop, backdrop-insensitive, osd, osd-focus, osd-backdrop;
 //
+
   background-color: transparent;
   background-image: entry_gradient($base_color);
   $_blank_edge: if($edge == none, none, 0 1px transparentize($edge,1));
   $_entry_edge: if($edge == none, none, _widget_edge($edge));
-  $_inner_shadows: inset 0 3px transparentize(black, 0.98),
-                   inset 0 2px transparentize(black, 0.97),
-                   inset 0 1px transparentize(black, 0.92);
 
-  // we need to match the same shadow types (inset/outset) in various states
-  // hence transparent shadows istead of resetting them when not needed
-  $_blank_inner_shadows: inset 0 3px transparentize(black, 1),
-                         inset 0 2px transparentize(black, 1),
-                         inset 0 1px transparentize(black, 1);
   @if $t==normal {
     color: $text_color;
     border-color: $borders_color;
-    @include _shadows($_inner_shadows,
-                      entry_focus_glow(transparentize($fc,1)),
-                      $_entry_edge);
-    // the second transparent shadow is needed for the transition to work
+    @include _shadows(entry_focus_shadow(transparentize($fc,1)), $_entry_edge);
+    // for the transition to work the number of shadows in different states needs to match, hence the transparent shadow here.
   }
   @if $t==focus {
-    @include _shadows($_inner_shadows,
-                      entry_focus_glow($fc),
-                      $_entry_edge);
+    @include _shadows(entry_focus_shadow($fc), $_entry_edge);
     border-color: entry_focus_border($fc);
   }
   @if $t==insensitive {
     color: $insensitive_fg_color;
     border-color: $borders_color;
     background-image: linear-gradient(to bottom, $insensitive_bg_color);
-    @include _shadows($_blank_inner_shadows, $_entry_edge);
+    box-shadow: $_entry_edge;
 
   }
   @if $t==backdrop {
     color: $backdrop_text_color;
     border-color: $backdrop_borders_color;
     background-image: linear-gradient(to bottom, $backdrop_base_color);
-    @include _shadows($_blank_inner_shadows, $_blank_edge);
+    box-shadow: $_blank_edge;
   }
   @if $t==backdrop-insensitive {
     color: $backdrop_insensitive_color;
     border-color: $backdrop_borders_color;
     background-image: linear-gradient(to bottom, $insensitive_bg_color);
-    @include _shadows($_blank_inner_shadows, $_blank_edge);
+    box-shadow: $_blank_edge;
   }
   @if $t==osd {
     color: $osd_text_color;
@@ -106,7 +98,7 @@
     border-color: $selected_bg_color;
     background-image: linear-gradient(to bottom, transparentize(opacify($osd_borders_color, 1), 0.5));
     background-clip: padding-box;
-    box-shadow: entry_focus_glow($selected_bg_color);
+    box-shadow: entry_focus_shadow($fc);
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
   }
--- a/gtk-3.0/assets.svg	Sat Jul 09 11:48:31 2016 +0100
+++ b/gtk-3.0/assets.svg	Sat Jul 09 15:25:37 2016 +0100
@@ -880,26 +880,6 @@
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient5581-5-2-4-6-8-7"
-       id="linearGradient8655"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0882418,0,0,0.36290768,-35.769827,-13.055003)"
-       x1="63.568954"
-       y1="127.16142"
-       x2="63.568954"
-       y2="152.6618" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#pushed-27-4-47-7-1"
-       id="linearGradient8767"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3656216,0,0,0.46323921,-51.116279,-156.72118)"
-       x1="60.805183"
-       y1="446.62411"
-       x2="60.805183"
-       y2="404.45575" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#pushed-27-4-47-7-4-3"
        id="linearGradient4834"
        gradientUnits="userSpaceOnUse"
@@ -1054,38 +1034,8 @@
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient5581-5-2-4-6-8-7-38-6"
-       id="linearGradient6046"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.0317573,0,0,1.0053174,-102.66338,-0.82153381)"
-       x1="63.568954"
-       y1="127.05545"
-       x2="63.568954"
-       y2="152.76778" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5581-5-2-4-6-8-7-0"
-       id="linearGradient6048"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.0317573,0,0,1.0053174,-102.66338,-0.82153381)"
-       x1="63.568954"
-       y1="127.16142"
-       x2="63.568954"
-       y2="152.6618" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9524-6-0-1-0-3-8"
-       id="linearGradient6050"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.025641,0,0,1,-102.29487,0)"
-       x1="63.568954"
-       y1="124.97202"
-       x2="63.568954"
-       y2="154.85121" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#pushed-27-4-47-7-7"
-       id="linearGradient6052"
+       xlink:href="#pushed-27-4-47-7-4-3-1"
+       id="linearGradient10479"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(3.025641,0,0,1,-102.29487,-280)"
        x1="60.805183"
@@ -1095,7 +1045,27 @@
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient9524-6-0-1-3-9-4-6"
-       id="linearGradient6054"
+       id="linearGradient10481"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.025641,0,0,1,-102.29487,0)"
+       x1="63.568954"
+       y1="124.97202"
+       x2="63.568954"
+       y2="154.85121" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#pushed-27-4-47-7-7"
+       id="linearGradient10483"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.025641,0,0,1,-102.29487,-280)"
+       x1="60.805183"
+       y1="446.62411"
+       x2="60.805183"
+       y2="404.45575" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9524-6-0-1-0-3-8"
+       id="linearGradient10485"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(3.025641,0,0,1,-102.29487,0)"
        x1="63.568954"
@@ -1104,14 +1074,244 @@
        y2="154.85121" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#pushed-27-4-47-7-4-3-1"
-       id="linearGradient6056"
+       xlink:href="#linearGradient5581-5-2-4-6-8-7-0"
+       id="linearGradient10487"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.025641,0,0,1,-102.29487,-280)"
+       gradientTransform="matrix(3.0317573,0,0,1.0053174,-102.66338,-0.82153381)"
+       x1="63.568954"
+       y1="127.16142"
+       x2="63.568954"
+       y2="152.6618" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5581-5-2-4-6-8-7-38-6"
+       id="linearGradient10489"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.0317573,0,0,1.0053174,-102.66338,-0.82153381)"
+       x1="63.568954"
+       y1="127.05545"
+       x2="63.568954"
+       y2="152.76778" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#pushed-27-4-47-7-1"
+       id="linearGradient10491"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3656216,0,0,0.46323921,-51.116279,-156.72118)"
        x1="60.805183"
        y1="446.62411"
        x2="60.805183"
        y2="404.45575" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5581-5-2-4-6-8-7"
+       id="linearGradient10493"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0882418,0,0,0.36290768,-35.769827,-13.055003)"
+       x1="63.568954"
+       y1="127.16142"
+       x2="63.568954"
+       y2="152.6618" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9524-6-0-1-0-3"
+       id="linearGradient7117-1-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.025641,0,0,1,-287.29777,12.621634)"
+       x1="95.453751"
+       y1="-12.24312"
+       x2="95.453751"
+       y2="6.2584834" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9524-6-0-1-0-3"
+       id="linearGradient7117-1-2-4-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.025641,0,0,1,-377.29832,12.622171)"
+       x1="95.453751"
+       y1="-12.24312"
+       x2="95.453751"
+       y2="6.2584834" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5581-5-2-4-6-8-7-38-7-2"
+       id="linearGradient10615"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.0317572,0,0,-1.0076035,492.69371,-5.491158)"
+       x1="94.883377"
+       y1="-16.46591"
+       x2="94.883377"
+       y2="2.869415" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9524-6-0-1-0-3-2-90-4"
+       id="linearGradient10617"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.025641,0,0,-1,492.3252,-1.275635)"
+       x1="95.453751"
+       y1="-12.24312"
+       x2="95.453751"
+       y2="6.2584834" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9524-6-0-1-0-3-2"
+       id="linearGradient10619"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.025641,0,0,-1,492.3252,-1.2756348)"
+       x1="95.453751"
+       y1="-12.24312"
+       x2="95.453751"
+       y2="6.2584834" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5581-5-2-4-6-8-7-35-8"
+       id="linearGradient4838-7-9-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.0317573,0,0,1.0053174,-102.66338,-0.82153846)"
+       x1="95.213127"
+       y1="167.30688"
+       x2="95.213127"
+       y2="186.8056" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5581-5-2-4-6-8-7-35-8"
+       id="linearGradient10840-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.0317573,0,0,1.0053174,17.336617,179.17846)"
+       x1="98.595253"
+       y1="-9.236434"
+       x2="98.595253"
+       y2="9.2269421" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5581-5-2-4-6-8-7-35-8-1"
+       id="linearGradient10867"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.0317573,0,0,1.0053174,-102.66338,-0.82153381)"
+       x1="99.528183"
+       y1="9.5786257"
+       x2="99.528183"
+       y2="-8.0055418" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5581-5-2-4-6-8-7-35-8"
+       id="linearGradient10867-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.0317573,0,0,-1.0053174,642.69371,179.54591)"
+       x1="99.528183"
+       y1="9.5786257"
+       x2="99.528183"
+       y2="-8.0055418" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5581-5-2-4-6-8-7-35-8-0"
+       id="linearGradient7101-3-6-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.0317573,0,0,1.0053174,-102.66338,29.178471)"
+       x1="94.996544"
+       y1="167.37457"
+       x2="94.996544"
+       y2="185.89658" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5581-5-2-4-6-8-7-35-8-0-2-7-34"
+       id="linearGradient11025"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.0317573,0,0,1.0053174,-102.66338,-0.82153381)"
+       x1="98.344261"
+       y1="10.781056"
+       x2="98.344261"
+       y2="-9.2648945" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5581-5-2-4-6-8-7-35-8-0"
+       id="linearGradient7101-3-0-4-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.0317573,0,0,1.0053174,-102.66338,59.178471)"
+       x1="94.996544"
+       y1="167.37457"
+       x2="94.996544"
+       y2="185.89658" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5581-5-2-4-6-8-7-35-8-0"
+       id="linearGradient11066-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.0317573,0,0,1.0053174,17.336617,239.17846)"
+       x1="99.006401"
+       y1="-10.013041"
+       x2="99.006401"
+       y2="9.3838177" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5581-5-2-4-6-8-7-35-8-0-2-7-7-3"
+       id="linearGradient11093"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.0317573,0,0,1.0053174,-102.66338,-0.82153381)"
+       x1="97.192268"
+       y1="11.37324"
+       x2="97.192268"
+       y2="-9.0183306" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5581-5-2-4-6-8-7-38-7-2"
+       id="linearGradient12902"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.0317572,0,0,-1.0076035,492.69371,-5.491158)"
+       x1="94.883377"
+       y1="-16.46591"
+       x2="94.883377"
+       y2="2.869415" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9524-6-0-1-0-3-2-90-4"
+       id="linearGradient12904"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.025641,0,0,-1,492.3252,-1.275635)"
+       x1="95.453751"
+       y1="-12.24312"
+       x2="95.453751"
+       y2="6.2584834" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9524-6-0-1-0-3-2"
+       id="linearGradient12906"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.025641,0,0,-1,492.3252,-1.2756348)"
+       x1="95.453751"
+       y1="-12.24312"
+       x2="95.453751"
+       y2="6.2584834" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5581-5-2-4-6-8-7-35-8-1"
+       id="linearGradient12908"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.0317573,0,0,1.0053174,-102.66338,-0.82153381)"
+       x1="99.528183"
+       y1="9.5786257"
+       x2="99.528183"
+       y2="-8.0055418" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5581-5-2-4-6-8-7-35-8-0-2-7-7-3"
+       id="linearGradient12910"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.0317573,0,0,1.0053174,-102.66338,-0.82153381)"
+       x1="97.192268"
+       y1="11.37324"
+       x2="97.192268"
+       y2="-9.0183306" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5581-5-2-4-6-8-7-35-8-0-2-7-34"
+       id="linearGradient12912"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.0317573,0,0,1.0053174,-102.66338,-0.82153381)"
+       x1="98.344261"
+       y1="10.781056"
+       x2="98.344261"
+       y2="-9.2648945" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -1120,26 +1320,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.4142136"
-     inkscape:cx="183.28188"
-     inkscape:cy="912.64523"
+     inkscape:zoom="1"
+     inkscape:cx="338.22771"
+     inkscape:cy="815.02446"
      inkscape:document-units="px"
-     inkscape:current-layer="layer3"
+     inkscape:current-layer="layer1"
      showgrid="false"
      showborder="false"
-     inkscape:window-width="1918"
-     inkscape:window-height="1013"
+     inkscape:window-width="2560"
+     inkscape:window-height="1376"
      inkscape:window-x="0"
      inkscape:window-y="27"
-     inkscape:window-maximized="0"
-     inkscape:snap-nodes="true"
+     inkscape:window-maximized="1"
+     inkscape:snap-nodes="false"
      inkscape:snap-bbox="true"
      inkscape:bbox-paths="true"
      inkscape:snap-global="true"
      showguides="false"
      inkscape:guide-bbox="true"
      inkscape:bbox-nodes="true"
-     inkscape:object-nodes="true">
+     inkscape:object-nodes="false">
     <inkscape:grid
        type="xygrid"
        id="grid10919"
@@ -1170,9 +1370,9 @@
      inkscape:label="superbackdrop"
      style="display:inline">
     <rect
-       style="color:#000000;fill:#393f3f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#393f3f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;enable-background:accumulate"
        id="rect18026"
-       width="350"
+       width="392.87714"
        height="470"
        x="-7"
        y="155.36218"
@@ -1184,28 +1384,28 @@
        y="-155.36218"
        x="-7"
        height="440"
-       width="350"
+       width="392.87714"
        id="rect18028"
-       style="color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;enable-background:accumulate"
        transform="scale(1,-1)" />
     <rect
        ry="0"
        rx="0"
        y="155.36218"
-       x="342"
+       x="385"
        height="470"
-       width="350"
+       width="307"
        id="rect8047"
-       style="color:#000000;fill:#5e7f3e;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;enable-background:accumulate" />
     <rect
        ry="0"
        rx="0"
        y="-284.63782"
-       x="343"
+       x="385.87714"
        height="440"
-       width="349"
+       width="306.12286"
        id="rect8047-5"
-       style="color:#000000;fill:#5e7f3e;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;enable-background:accumulate" />
   </g>
   <g
      inkscape:label="assets"
@@ -4675,7 +4875,7 @@
          inkscape:connector-curvature="0"
          id="path3497-8-2-0-3"
          d="m 201.71751,170.6638 c -3.70998,-3.71842 -9.72504,-3.71842 -13.43502,0 -3.70999,3.71841 -3.70999,9.74716 0,13.46558 l 6.71751,6.73279 6.71751,-6.73279 c 3.70999,-3.71842 3.70999,-9.74716 0,-13.46558 z"
-         style="color:#000000;fill:url(#linearGradient7101-3-0);fill-opacity:1;fill-rule:nonzero;stroke:#14375d;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         style="color:#000000;fill:url(#linearGradient7101-3-0);fill-opacity:1;fill-rule:nonzero;stroke:#385c14;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <g
          transform="translate(0,180)"
          id="g4740-3-3-5"
@@ -4706,7 +4906,7 @@
          inkscape:connector-curvature="0"
          id="path3497-3-5-7"
          d="m 218.28249,184.08308 c 3.70998,3.72257 9.72504,3.72256 13.43502,0 3.70999,-3.72257 3.70999,-9.75803 0,-13.4806 L 225,163.86218 l -6.71751,6.7403 c -3.70999,3.72257 -3.70999,9.75803 0,13.4806 z"
-         style="color:#000000;fill:url(#linearGradient7101-3-0-6);fill-opacity:1;fill-rule:nonzero;stroke:#14375d;stroke-width:1.00027823;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         style="color:#000000;fill:url(#linearGradient7101-3-0-6);fill-opacity:1;fill-rule:nonzero;stroke:#385c14;stroke-width:1.00027823;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <g
          id="g4740-2-9-6-9"
          style="display:inline"
@@ -4737,7 +4937,7 @@
          inkscape:connector-curvature="0"
          id="path3497-0-7-4-4-6"
          d="m 261.70963,184.0925 c 3.7205,-3.70999 3.7205,-9.72505 0,-13.43503 -3.72049,-3.70998 -9.75259,-3.70998 -13.47308,0 l -6.73655,6.71751 6.73655,6.71752 c 3.72049,3.70998 9.75259,3.70998 13.47308,0 z"
-         style="color:#000000;fill:url(#linearGradient7101-3-0-9);fill-opacity:1;fill-rule:nonzero;stroke:#14375d;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         style="color:#000000;fill:url(#linearGradient7101-3-0-9);fill-opacity:1;fill-rule:nonzero;stroke:#385c14;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <g
          transform="translate(0,180)"
          id="g5028-6-2-0"
@@ -4768,7 +4968,7 @@
          inkscape:connector-curvature="0"
          id="path3497-0-9-0-6"
          d="m 278.29038,170.65747 c -3.7205,3.70998 -3.7205,9.72505 0,13.43503 3.72049,3.70998 9.75259,3.70998 13.47308,0 l 6.73655,-6.71752 -6.73655,-6.71751 c -3.72049,-3.70998 -9.75259,-3.70999 -13.47308,0 z"
-         style="color:#000000;fill:url(#linearGradient7101-3-0-4);fill-opacity:1;fill-rule:nonzero;stroke:#14375d;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         style="color:#000000;fill:url(#linearGradient7101-3-0-4);fill-opacity:1;fill-rule:nonzero;stroke:#385c14;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <g
          id="g5028-9-6-2-0"
          style="display:inline"
@@ -4792,14 +4992,14 @@
     </g>
     <g
        inkscape:label="#g10801"
-       transform="matrix(1.990788,0,0,1.9939718,294.59299,125.13908)"
+       transform="matrix(1.990788,0,0,1.9939718,334.59299,125.13908)"
        id="checkbox-checked-selectionmode">
       <g
          id="use8051"
          transform="matrix(1.003504,0,0,1.0019017,19.813776,-0.08723712)">
         <rect
            ry="4.1330299"
-           style="opacity:0.3;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.48329952;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.48329952;marker:none;enable-background:accumulate"
            id="rect8196"
            width="20.022388"
            height="20.022388"
@@ -4810,7 +5010,7 @@
            id="g8323">
           <rect
              ry="2.1659286"
-             style="color:#000000;fill:url(#linearGradient8655);fill-opacity:1;stroke:#555753;stroke-width:0.49806672;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:1"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient10493);fill-opacity:1;stroke:#555753;stroke-width:0.49806672;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
              id="rect8133"
              width="10.610355"
              height="10.524323"
@@ -4821,19 +5021,19 @@
              inkscape:connector-curvature="0"
              id="path8135"
              d="m 19.391061,40.242103 0,0.746384 c 0,0.995613 0.820325,1.772664 1.841514,1.772664 l 6.531232,0 c 1.021188,0 1.81696,-0.777051 1.81696,-1.772664 l 0,-0.746384 c 0,0.995611 -0.795772,1.772664 -1.81696,1.772664 l -6.531232,0 c -1.021189,0 -1.841514,-0.777053 -1.841514,-1.772664 z"
-             style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#c7c7c7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#c7c7c7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;enable-background:accumulate" />
           <path
              sodipodi:nodetypes="csssscssc"
              inkscape:connector-curvature="0"
              id="path8137"
              d="m 19.391061,39.586662 0,0.785713 c 0,1.048072 0.820325,1.866067 1.841514,1.866067 l 6.531232,0 c 1.021188,0 1.81696,-0.817995 1.81696,-1.866067 l 0,-0.785713 c 0,1.048072 -0.795772,2.170876 -1.81696,2.170876 l -6.531232,0 c -1.021189,0 -1.841514,-1.122804 -1.841514,-2.170876 z"
-             style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ededed;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.50055969;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ededed;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.50055969;marker:none;enable-background:accumulate" />
         </g>
       </g>
       <g
          id="g8055">
         <path
-           style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#5e7f3e;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;-inkscape-font-specification:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#467319;fill-opacity:1;stroke:none;stroke-width:3;marker:none;enable-background:accumulate"
            d="m 50.868001,31.261445 -6.9811,6.803452 -1.871896,-1.861821 -2.138425,-0.01553 0.01122,1.689654 2.936988,2.921189 c 0.586676,0.58328 1.537597,0.58328 2.124273,0 l 7.996316,-8.031103 0.002,-1.561674 z"
            id="path8059"
            inkscape:connector-curvature="0"
@@ -4842,7 +5042,7 @@
     </g>
     <g
        id="checkbox-checked-hover-selectionmode"
-       transform="matrix(1.9947791,0,0,1.9939719,294.38167,169.09433)"
+       transform="matrix(1.9947791,0,0,1.9939719,334.38167,169.09433)"
        inkscape:label="#g10801">
       <use
          transform="matrix(1.0014962,0,0,1.0019016,19.880068,-0.06479538)"
@@ -4865,7 +5065,7 @@
            width="100%"
            height="100%" />
         <rect
-           style="opacity:0.68300003;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;paint-order:normal;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.68300003;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
            id="rect8587"
            width="10.124799"
            height="10.08457"
@@ -4886,7 +5086,7 @@
     </g>
     <g
        inkscape:label="#g10801"
-       transform="matrix(1.9947791,0,0,1.9939719,294.38167,213.04961)"
+       transform="matrix(1.9947791,0,0,1.9939719,334.38167,213.04961)"
        id="checkbox-checked-active-selectionmode">
       <use
          height="100%"
@@ -4917,7 +5117,7 @@
     </g>
     <g
        inkscape:label="#g10801"
-       transform="matrix(1.9947791,0,0,1.9939719,294.38167,256.96017)"
+       transform="matrix(1.9947791,0,0,1.9939719,334.38167,256.96017)"
        id="checkbox-checked-backdrop-selectionmode">
       <use
          transform="matrix(1.0014962,0,0,1.0019016,19.880068,0.00248762)"
@@ -4930,7 +5130,7 @@
          height="100%" />
       <rect
          ry="2.1665556"
-         style="color:#000000;fill:#ededed;fill-opacity:1;fill-rule:nonzero;stroke:#555753;stroke-width:0.49543846;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ededed;fill-opacity:1;fill-rule:nonzero;stroke:#555753;stroke-width:0.49543846;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
          id="use8386"
          width="10.542755"
          height="10.527368"
@@ -4954,11 +5154,11 @@
          inkscape:connector-curvature="0"
          id="path8109"
          d="m 50.868001,31.380439 -6.981099,6.843039 -1.871897,-1.872655 -2.138425,-0.01563 0.01122,1.699485 2.936988,2.938187 c 0.586676,0.586674 1.537597,0.586674 2.124274,0 l 7.996315,-8.077832 0.002,-1.570761 z"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#5e7f3e;fill-opacity:1;stroke:none;stroke-width:2.99699715;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill-rule:nonzero" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;-inkscape-font-specification:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#467319;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99699712;marker:none;enable-background:accumulate" />
     </g>
     <g
        id="checkbox-selectionmode"
-       transform="matrix(1.990788,0,0,1.9939718,338.59299,125.13908)"
+       transform="matrix(1.990788,0,0,1.9939718,378.59299,125.13908)"
        inkscape:label="#g10801">
       <g
          transform="matrix(1.003504,0,0,1.0019017,19.813776,-0.08723712)"
@@ -4988,7 +5188,7 @@
        id="sjhgfjsgf" />
     <g
        id="checkbox-active-selectionmode"
-       transform="matrix(1.9947791,0,0,1.9939719,338.38167,213.04961)"
+       transform="matrix(1.9947791,0,0,1.9939719,378.38167,213.04961)"
        inkscape:label="#g10801">
       <use
          transform="matrix(1.0014962,0,0,1.0019016,19.880067,-0.04236769)"
@@ -5010,18 +5210,18 @@
            height="13.505371"
            width="13.341726"
            id="rect8176"
-           style="color:#000000;fill:url(#linearGradient8767);fill-opacity:1;fill-rule:nonzero;stroke:#555753;stroke-width:0.47996393;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient10491);fill-opacity:1;fill-rule:nonzero;stroke:#555753;stroke-width:0.47996393;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
            ry="2.7794352" />
         <path
            inkscape:connector-curvature="0"
            id="path8178"
            d="m 18.088488,34.607345 0,-0.986346 c 0,-1.315724 1.029805,-2.342598 2.311766,-2.342598 l 8.199058,0 c 1.281961,0 2.28095,1.026874 2.28095,2.342598 l 0,0.986346 c 0,-1.315702 -0.998989,-2.342598 -2.28095,-2.342598 l -8.199058,0 c -1.281961,0 -2.311766,1.026896 -2.311766,2.342598 z"
-           style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.07000002;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.07000002;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;enable-background:accumulate" />
       </g>
     </g>
     <g
        id="checkbox-backdrop-selectionmode"
-       transform="matrix(1.9947791,0,0,1.9939719,338.38167,256.96017)"
+       transform="matrix(1.9947791,0,0,1.9939719,378.38167,256.96017)"
        inkscape:label="#g10801">
       <g
          style="display:inline"
@@ -5051,11 +5251,11 @@
          height="10.527368"
          width="10.542755"
          id="use8099"
-         style="color:#000000;fill:#ededed;fill-opacity:1;fill-rule:nonzero;stroke:#555753;stroke-width:0.49543846;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ededed;fill-opacity:1;fill-rule:nonzero;stroke:#555753;stroke-width:0.49543846;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
          ry="2.1665556" />
     </g>
     <g
-       transform="matrix(1.9947791,0,0,1.9939719,338.38167,169.09433)"
+       transform="matrix(1.9947791,0,0,1.9939719,378.38167,169.09433)"
        style="display:inline"
        id="checkbox-hover-selectionmode"
        inkscape:label="#g8503">
@@ -5085,15 +5285,15 @@
          height="10.08457"
          width="10.124799"
          id="rect8378"
-         style="opacity:0.68300003;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;paint-order:normal;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" />
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.68300003;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
     </g>
     <g
        style="display:inline"
        id="selected-radio-unchecked"
-       transform="matrix(0.93617253,0,0,0.93566004,263.21685,-244.76083)"
+       transform="matrix(0.93617253,0,0,0.93566004,303.21685,-244.76083)"
        inkscape:label="#g15805">
       <rect
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
          id="rect14348-4-0"
          width="17.090866"
          height="17.100227"
@@ -5109,7 +5309,7 @@
              id="g5428-8-1-7-7">
             <rect
                ry="15.453857"
-               style="color:#000000;fill:url(#linearGradient6046);fill-opacity:1;fill-rule:nonzero;stroke:#3c5127;stroke-width:2.08222389;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+               style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient10489);fill-opacity:1;fill-rule:nonzero;stroke:#457218;stroke-width:2.08222389;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
                id="rect5147-9-1-7-81"
                width="29.385006"
                height="28.919117"
@@ -5122,26 +5322,26 @@
            inkscape:connector-curvature="0"
            id="rect5147-9-1-7-4-24"
            d="m 208.0967,269.64077 c -0.006,0.11897 -0.0334,0.24687 -0.0334,0.36738 0,3.84862 3.09665,6.94697 6.94316,6.94697 3.84651,0 6.94316,-3.09835 6.94316,-6.94697 0,-0.12051 -0.0273,-0.24841 -0.0333,-0.36738 -0.3543,3.51156 -3.30368,6.24559 -6.90979,6.24559 -3.60611,0 -6.55549,-2.73403 -6.90978,-6.24559 z"
-           style="color:#000000;fill:#c7c7c7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#c7c7c7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;enable-background:accumulate" />
         <path
            inkscape:connector-curvature="0"
            id="rect5147-9-1-7-4-3-0-49"
            d="m 208.16346,268.93939 c -0.0346,0.22741 -0.0487,0.46549 -0.0668,0.70138 0.35429,3.51156 3.30367,6.24559 6.90978,6.24559 3.60611,0 6.55549,-2.73403 6.90978,-6.24559 -0.0182,-0.23589 -0.0322,-0.47397 -0.0668,-0.70138 -0.51523,3.33254 -3.36353,5.8782 -6.84302,5.8782 -3.47949,0 -6.32779,-2.54566 -6.84302,-5.8782 z"
-           style="color:#000000;fill:#f3f3f3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f3f3f3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;enable-background:accumulate" />
         <path
            inkscape:connector-curvature="0"
            id="rect5147-9-1-7-4-1-7"
            d="m 208.0967,270.36184 c -0.006,-0.11897 -0.0334,-0.24687 -0.0334,-0.36738 0,-3.84862 3.09665,-6.94697 6.94316,-6.94697 3.84651,0 6.94316,3.09835 6.94316,6.94697 0,0.12051 -0.0273,0.24841 -0.0333,0.36738 -0.3543,-3.51156 -3.30368,-6.24559 -6.90979,-6.24559 -3.60611,0 -6.55549,2.73403 -6.90978,6.24559 z"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;enable-background:accumulate" />
       </g>
     </g>
     <g
        style="display:inline"
        id="selected-radio-checked"
-       transform="matrix(0.93340838,0,0,0.93289741,50.43693,-244.03704)"
+       transform="matrix(0.93340838,0,0,0.93289741,90.43693,-244.03704)"
        inkscape:label="#g2928">
       <rect
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
          id="rect14348-4-1-8"
          width="17.141478"
          height="17.150867"
@@ -5165,7 +5365,7 @@
            height="5.5533452"
            width="5.5564694"
            id="use15101-6-2-9"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.08838987;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.08838987;marker:none;enable-background:accumulate"
            ry="8.0419083" />
         <rect
            rx="2.7766726"
@@ -5174,14 +5374,14 @@
            height="5.5533452"
            width="5.5564694"
            id="use15101-6-6"
-           style="color:#000000;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:2.08838987;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:2.08838987;marker:none;enable-background:accumulate"
            ry="2.7766726" />
       </g>
     </g>
     <g
        style="display:inline"
        id="selected-checkbox-checked"
-       transform="matrix(0.99650823,0,0,0.99810193,360.25541,-29.912922)"
+       transform="matrix(0.99650823,0,0,0.99810193,400.25541,-29.912922)"
        inkscape:label="#g10801">
       <use
          transform="matrix(1.003504,0,0,1.0019017,19.813776,-0.08723712)"
@@ -5198,27 +5398,27 @@
          height="16.030426"
          width="16.023939"
          id="rect13523-5-8"
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
       <g
          id="g5708-7">
         <path
            id="path12830-4-17-08-9"
            transform="matrix(1.003504,0,0,1.0019017,-0.25630433,39.988835)"
            d="M 50.9375,-7.59375 44,-0.75 42.125,-2.625 40,-2.65625 l 0,1.71875 2.9375,2.90625 c 0.584627,0.5855605 1.540374,0.5855605 2.125,0 l 5.9375,-6 0,-3.5625 -0.0625,0 z"
-           style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.7;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;-inkscape-font-specification:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:3;marker:none;enable-background:accumulate"
            inkscape:connector-curvature="0" />
         <path
            sodipodi:nodetypes="cccccccccc"
            inkscape:connector-curvature="0"
            id="path12830-4-17-07"
            d="m 50.868001,31.380423 -6.9811,6.843038 -1.871896,-1.872654 -2.138425,-0.01563 0.01122,1.699486 2.936988,2.938186 c 0.586676,0.586674 1.537597,0.586674 2.124273,0 l 7.996316,-8.077832 0.002,-1.570761 z"
-           style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:sans-serif;-inkscape-font-specification:sans-serif" />
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;-inkscape-font-specification:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:3;marker:none;enable-background:accumulate" />
       </g>
     </g>
     <g
        style="display:inline"
        id="selected-radio-mixed"
-       transform="matrix(0.93617253,0,0,0.93566004,368.83241,-28.033029)"
+       transform="matrix(0.93617253,0,0,0.93566004,408.83241,-28.033029)"
        inkscape:label="#g10885">
       <use
          transform="translate(-70.089173,-231.63092)"
@@ -5230,7 +5430,7 @@
          width="1"
          height="1" />
       <rect
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
          id="rect14348-4-9-9"
          width="17.090866"
          height="17.100227"
@@ -5240,7 +5440,7 @@
          id="use7164-1"
          transform="matrix(1.0681792,0,0,1.0687642,118.74234,-2.1022682)">
         <rect
-           style="opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99191427;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99191427;marker:none;enable-background:accumulate"
            id="rect4477-2"
            width="9"
            height="2.9687538"
@@ -5249,7 +5449,7 @@
            rx="1.4843769"
            ry="1.4843769" />
         <rect
-           style="color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99191427;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99191427;marker:none;enable-background:accumulate"
            id="rect4479-7"
            width="9"
            height="2.9687538"
@@ -5262,7 +5462,7 @@
     <g
        style="display:inline"
        id="selected-checkbox-mixed"
-       transform="translate(399.99573,-29.999989)"
+       transform="translate(439.99573,-29.999989)"
        inkscape:label="#g14334">
       <use
          transform="translate(0.004272,-3.9091922e-6)"
@@ -5274,7 +5474,7 @@
          width="1"
          height="1" />
       <rect
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
          id="rect14348-0"
          width="16"
          height="16"
@@ -5290,7 +5490,7 @@
            height="2.9687538"
            width="9"
            id="rect5203-9-2-2"
-           style="opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99191427;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99191427;marker:none;enable-background:accumulate" />
         <rect
            ry="1.4843769"
            rx="1.4843769"
@@ -5299,14 +5499,14 @@
            height="2.9687538"
            width="9"
            id="rect5203-9-8"
-           style="color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99191427;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99191427;marker:none;enable-background:accumulate" />
       </g>
     </g>
     <g
        style="display:inline"
        id="selected-checkbox-unchecked"
        inkscape:label="#g14325"
-       transform="translate(360,-29.999989)">
+       transform="translate(400,-29.999989)">
       <g
          style="display:inline"
          id="g15812-6-6-1-4"
@@ -5325,12 +5525,12 @@
          height="16"
          width="16"
          id="rect13523-3"
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
       <g
          id="g5400-4">
         <rect
            ry="6"
-           style="color:#000000;fill:url(#linearGradient6048);fill-opacity:1;stroke:#3c5127;stroke-width:2.09697676;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient10487);fill-opacity:1;stroke:#457218;stroke-width:2.09697676;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
            id="rect5147-9-1-5-7-6-9"
            width="29.559635"
            height="29.154205"
@@ -5341,15 +5541,15 @@
         <path
            inkscape:connector-curvature="0"
            id="rect5147-9-1-5-7-6-1-7-3"
-           d="m 18,40.999983 0,1 c 0,1.333912 1.044053,2.375 2.34375,2.375 l 8.3125,0 c 1.299697,0 2.3125,-1.041088 2.3125,-2.375 l 0,-1 c 0,1.333912 -1.012803,2.375 -2.3125,2.375 l -8.3125,0 C 19.044053,43.374983 18,42.333895 18,40.999983 z"
-           style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#c7c7c7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+           d="m 18,40.999983 0,1 c 0,1.333912 1.044053,2.375 2.34375,2.375 l 8.3125,0 c 1.299697,0 2.3125,-1.041088 2.3125,-2.375 l 0,-1 c 0,1.333912 -1.012803,2.375 -2.3125,2.375 l -8.3125,0 C 19.044053,43.374983 18,42.333895 18,40.999983 Z"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#c7c7c7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;enable-background:accumulate" />
         <path
            inkscape:connector-curvature="0"
            id="rect5147-9-1-5-7-6-1-7-7-8"
-           d="m 18,39.999983 0,1 c 0,1.333912 1.044053,2.375 2.34375,2.375 l 8.3125,0 c 1.299697,0 2.3125,-1.041088 2.3125,-2.375 l 0,-1 c 0,1.333912 -1.012803,2.375 -2.3125,2.375 l -8.3125,0 C 19.044053,42.374983 18,41.333895 18,39.999983 z"
-           style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ededed;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+           d="m 18,39.999983 0,1 c 0,1.333912 1.044053,2.375 2.34375,2.375 l 8.3125,0 c 1.299697,0 2.3125,-1.041088 2.3125,-2.375 l 0,-1 c 0,1.333912 -1.012803,2.375 -2.3125,2.375 l -8.3125,0 C 19.044053,42.374983 18,41.333895 18,39.999983 Z"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ededed;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;enable-background:accumulate" />
         <path
-           style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;enable-background:accumulate"
            d="m 18,34.737183 0,-1 c 0,-1.333912 1.044053,-2.375 2.34375,-2.375 l 8.3125,0 c 1.299697,0 2.3125,1.041088 2.3125,2.375 l 0,1 c 0,-1.333912 -1.012803,-2.375 -2.3125,-2.375 l -8.3125,0 c -1.299697,0 -2.34375,1.041088 -2.34375,2.375 z"
            id="rect5147-9-1-5-7-6-1-7-7-5-02"
            inkscape:connector-curvature="0" />
@@ -5358,7 +5558,7 @@
     <g
        style="display:inline"
        inkscape:label="#g10801"
-       transform="matrix(0.99850603,0,0,0.99810197,360.14963,-9.9129244)"
+       transform="matrix(0.99850603,0,0,0.99810197,400.14963,-9.9129244)"
        id="selected-checkbox-checked-hover">
       <use
          transform="matrix(1.0014962,0,0,1.0019016,19.880069,-0.08722936)"
@@ -5370,7 +5570,7 @@
          width="1"
          height="1" />
       <rect
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
          id="rect14466-5"
          width="16.023939"
          height="16.030426"
@@ -5389,7 +5589,7 @@
     <g
        style="display:inline"
        inkscape:label="#g14334"
-       transform="translate(399.99573,-9.9999894)"
+       transform="translate(439.99573,-9.9999894)"
        id="selected-checkbox-mixed-hover">
       <use
          transform="translate(0.004272,0)"
@@ -5406,7 +5606,7 @@
          height="16"
          width="16"
          id="rect14482-6"
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
       <use
          transform="translate(-4.609375e-7,-5e-5)"
          style="display:inline"
@@ -5421,14 +5621,14 @@
        style="display:inline"
        inkscape:label="#g14325"
        id="selected-checkbox-unchecked-hover"
-       transform="translate(360,-9.9999894)">
+       transform="translate(400,-9.9999894)">
       <g
          transform="translate(0,-3.9660404e-6)"
          style="display:inline"
          id="g5400-0-59">
         <rect
            ry="6"
-           style="color:#000000;fill:url(#linearGradient6050);fill-opacity:1;fill-rule:nonzero;stroke:#3c5127;stroke-width:2.09697652;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient10485);fill-opacity:1;fill-rule:nonzero;stroke:#457218;stroke-width:2.09697652;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
            id="rect5147-9-1-5-7-6-4-1"
            width="29.559635"
            height="29.154205"
@@ -5439,21 +5639,21 @@
         <path
            inkscape:connector-curvature="0"
            id="rect5147-9-1-5-7-6-1-7-78-7"
-           d="m 18,40.999983 0,1 c 0,1.333912 1.044053,2.375 2.34375,2.375 l 8.3125,0 c 1.299697,0 2.3125,-1.041088 2.3125,-2.375 l 0,-1 c 0,1.333912 -1.012803,2.375 -2.3125,2.375 l -8.3125,0 C 19.044053,43.374983 18,42.333895 18,40.999983 z"
-           style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#e0e0e0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+           d="m 18,40.999983 0,1 c 0,1.333912 1.044053,2.375 2.34375,2.375 l 8.3125,0 c 1.299697,0 2.3125,-1.041088 2.3125,-2.375 l 0,-1 c 0,1.333912 -1.012803,2.375 -2.3125,2.375 l -8.3125,0 C 19.044053,43.374983 18,42.333895 18,40.999983 Z"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#e0e0e0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;enable-background:accumulate" />
         <path
            inkscape:connector-curvature="0"
            id="rect5147-9-1-5-7-6-1-7-7-3-8"
-           d="m 18,39.999983 0,1 c 0,1.333912 1.044053,2.375 2.34375,2.375 l 8.3125,0 c 1.299697,0 2.3125,-1.041088 2.3125,-2.375 l 0,-1 c 0,1.333912 -1.012803,2.375 -2.3125,2.375 l -8.3125,0 C 19.044053,42.374983 18,41.333895 18,39.999983 z"
-           style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.4;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+           d="m 18,39.999983 0,1 c 0,1.333912 1.044053,2.375 2.34375,2.375 l 8.3125,0 c 1.299697,0 2.3125,-1.041088 2.3125,-2.375 l 0,-1 c 0,1.333912 -1.012803,2.375 -2.3125,2.375 l -8.3125,0 C 19.044053,42.374983 18,41.333895 18,39.999983 Z"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.4;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;enable-background:accumulate" />
         <path
-           style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;enable-background:accumulate"
            d="m 18,34.737187 0,-1 c 0,-1.333912 1.044053,-2.375 2.34375,-2.375 l 8.3125,0 c 1.299697,0 2.3125,1.041088 2.3125,2.375 l 0,1 c 0,-1.333912 -1.012803,-2.375 -2.3125,-2.375 l -8.3125,0 c -1.299697,0 -2.34375,1.041088 -2.34375,2.375 z"
            id="rect5147-9-1-5-7-6-1-7-7-5-0-4"
            inkscape:connector-curvature="0" />
       </g>
       <rect
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
          id="rect14506-2"
          width="16"
          height="16"
@@ -5463,7 +5663,7 @@
     <g
        style="display:inline"
        id="selected-checkbox-checked-active"
-       transform="matrix(0.99850603,0,0,0.99810197,360.14963,10.087075)"
+       transform="matrix(0.99850603,0,0,0.99810197,400.14963,10.087075)"
        inkscape:label="#g10801">
       <use
          style="display:inline"
@@ -5480,12 +5680,12 @@
          height="16.030426"
          width="16.023939"
          id="rect14685-4"
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
       <path
          inkscape:connector-curvature="0"
          id="path12830-4-17-08-5-9"
          d="m 50.863858,32.380676 -6.94788,6.856765 -1.877805,-1.878566 -2.12818,-0.03131 0,1.722018 2.941895,2.911777 c 0.585502,0.586674 1.542679,0.586674 2.12818,0 l 5.946383,-6.01141 0,-3.569274 -0.06259,0 z"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:sans-serif;-inkscape-font-specification:sans-serif" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;-inkscape-font-specification:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:3;marker:none;enable-background:accumulate" />
       <use
          transform="matrix(0.99799921,0,0,0.99999996,0.1059371,1.6393686e-5)"
          style="display:inline"
@@ -5499,7 +5699,7 @@
     <g
        style="display:inline"
        id="selected-checkbox-mixed-active"
-       transform="translate(399.99573,10.00001)"
+       transform="translate(439.99573,10.00001)"
        inkscape:label="#g14334">
       <use
          style="display:inline"
@@ -5511,14 +5711,14 @@
          width="1"
          height="1" />
       <rect
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
          id="rect14701-5"
          width="16"
          height="16"
          x="17"
          y="30.362183" />
       <rect
-         style="opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99191427;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99191427;marker:none;enable-background:accumulate"
          id="use5812-4-5"
          width="9"
          height="2.9687538"
@@ -5540,14 +5740,14 @@
        style="display:inline"
        id="selected-checkbox-unchecked-active"
        inkscape:label="#g14325"
-       transform="translate(360,10.00001)">
+       transform="translate(400,10.00001)">
       <g
          transform="translate(0,-3.9660404e-6)"
          style="display:inline"
          id="g5400-0-5-9">
         <rect
            ry="6"
-           style="color:#000000;fill:url(#linearGradient6052);fill-opacity:1;fill-rule:nonzero;stroke:#3c5127;stroke-width:2.09697652;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient10483);fill-opacity:1;fill-rule:nonzero;stroke:#457218;stroke-width:2.09697652;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
            id="rect5147-9-1-5-7-6-4-8-8"
            width="29.559635"
            height="29.154205"
@@ -5556,7 +5756,7 @@
            rx="6"
            transform="matrix(0.47304779,0,0,0.4807373,-6.3607039,-29.396216)" />
         <path
-           style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.07000002;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.07000002;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;enable-background:accumulate"
            d="m 18,34.737187 0,-1 c 0,-1.333912 1.044053,-2.375 2.34375,-2.375 l 8.3125,0 c 1.299697,0 2.3125,1.041088 2.3125,2.375 l 0,1 c 0,-1.333912 -1.012803,-2.375 -2.3125,-2.375 l -8.3125,0 c -1.299697,0 -2.34375,1.041088 -2.34375,2.375 z"
            id="rect5147-9-1-5-7-6-1-7-7-5-0-5-6"
            inkscape:connector-curvature="0" />
@@ -5567,12 +5767,12 @@
          height="16"
          width="16"
          id="rect14725-3"
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
     </g>
     <g
        style="display:inline"
        inkscape:label="#g10801"
-       transform="matrix(0.99850603,0,0,0.99810197,360.14963,30.087076)"
+       transform="matrix(0.99850603,0,0,0.99810197,400.14963,30.087076)"
        id="selected-checkbox-checked-insensitive">
       <use
          transform="matrix(1.0014962,0,0,1.0019016,19.880069,-0.08722936)"
@@ -5603,14 +5803,14 @@
            id="g15013-9" />
       </g>
       <rect
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
          id="rect15021-7"
          width="16.023939"
          height="16.030426"
          x="36.905502"
          y="30.332689" />
       <path
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#8d9091;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;-inkscape-font-specification:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#8d9091;fill-opacity:1;stroke:none;stroke-width:3;marker:none;enable-background:accumulate"
          d="m 50.868001,31.380439 -6.981099,6.843039 -1.871897,-1.872655 -2.138425,-0.01563 0.01122,1.699485 2.936988,2.938187 c 0.586676,0.586674 1.537597,0.586674 2.124274,0 l 7.996315,-8.077832 0.002,-1.570761 z"
          id="path12830-4-17-2-7"
          inkscape:connector-curvature="0"
@@ -5619,7 +5819,7 @@
     <g
        style="display:inline"
        inkscape:label="#g14334"
-       transform="translate(399.99573,30.000011)"
+       transform="translate(439.99573,30.000011)"
        id="selected-checkbox-mixed-insensitive">
       <use
          transform="translate(0.004272,0)"
@@ -5636,9 +5836,9 @@
          height="16"
          width="16"
          id="rect15025-0"
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <rect
-         style="color:#000000;fill:#8d9091;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99491191;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
+      <rect
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#8d9091;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99491191;marker:none;enable-background:accumulate"
          id="rect5203-3"
          width="9"
          height="2.9687538"
@@ -5651,14 +5851,14 @@
        style="display:inline"
        inkscape:label="#g14325"
        id="selected-checkbox-unchecked-insensitive"
-       transform="translate(360,30.000011)">
+       transform="translate(400,30.000011)">
       <g
          transform="translate(0,-3.9660404e-6)"
-         style="fill:#ededed;fill-opacity:1;display:inline"
+         style="display:inline;fill:#ededed;fill-opacity:1"
          id="g5400-0-5-7-6">
         <rect
            ry="6"
-           style="color:#000000;fill:#f4f4f4;fill-opacity:1;fill-rule:nonzero;stroke:#3c5127;stroke-width:2.09697652;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f4f4f4;fill-opacity:1;fill-rule:nonzero;stroke:#457218;stroke-width:2.09697652;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
            id="rect5147-9-1-5-7-6-4-8-3-8"
            width="29.559635"
            height="29.154205"
@@ -5668,7 +5868,7 @@
            transform="matrix(0.47304779,0,0,0.4807373,-6.3607039,-29.396216)" />
       </g>
       <rect
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
          id="rect15057-7"
          width="16"
          height="16"
@@ -5676,7 +5876,7 @@
          y="30.362183" />
     </g>
     <g
-       transform="matrix(0.93617253,0,0,0.93566004,263.21685,-224.76083)"
+       transform="matrix(0.93617253,0,0,0.93566004,303.21685,-224.76083)"
        id="selected-radio-unchecked-hover"
        style="display:inline"
        inkscape:label="#g15392">
@@ -5691,7 +5891,7 @@
              id="g5428-8-1-7-1-1">
             <rect
                ry="15.453857"
-               style="color:#000000;fill:url(#linearGradient6054);fill-opacity:1;fill-rule:nonzero;stroke:#3c5127;stroke-width:2.08222342;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+               style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient10481);fill-opacity:1;fill-rule:nonzero;stroke:#457218;stroke-width:2.08222342;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
                id="rect5147-9-1-7-8-5"
                width="29.385006"
                height="28.919117"
@@ -5704,20 +5904,20 @@
            inkscape:connector-curvature="0"
            id="rect5147-9-1-7-4-2-0"
            d="m 208.0967,269.64077 c -0.006,0.11897 -0.0334,0.24687 -0.0334,0.36738 0,3.84862 3.09665,6.94697 6.94316,6.94697 3.84651,0 6.94316,-3.09835 6.94316,-6.94697 0,-0.12051 -0.0273,-0.24841 -0.0333,-0.36738 -0.3543,3.51156 -3.30368,6.24559 -6.90979,6.24559 -3.60611,0 -6.55549,-2.73403 -6.90978,-6.24559 z"
-           style="color:#000000;fill:#e0e0e0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.06847179;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#e0e0e0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.06847179;marker:none;enable-background:accumulate" />
         <path
            inkscape:connector-curvature="0"
            id="rect5147-9-1-7-4-3-0-4-9"
            d="m 208.16346,268.93939 c -0.0346,0.22741 -0.0487,0.46549 -0.0668,0.70138 0.35429,3.51156 3.30367,6.24559 6.90978,6.24559 3.60611,0 6.55549,-2.73403 6.90978,-6.24559 -0.0182,-0.23589 -0.0322,-0.47397 -0.0668,-0.70138 -0.51523,3.33254 -3.36353,5.8782 -6.84302,5.8782 -3.47949,0 -6.32779,-2.54566 -6.84302,-5.8782 z"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;enable-background:accumulate" />
         <path
            inkscape:connector-curvature="0"
            id="rect5147-9-1-7-4-1-9-0"
            d="m 208.0967,270.36184 c -0.006,-0.11897 -0.0334,-0.24687 -0.0334,-0.36738 0,-3.84862 3.09665,-6.94697 6.94316,-6.94697 3.84651,0 6.94316,3.09835 6.94316,6.94697 0,0.12051 -0.0273,0.24841 -0.0333,0.36738 -0.3543,-3.51156 -3.30368,-6.24559 -6.90979,-6.24559 -3.60611,0 -6.55549,2.73403 -6.90978,6.24559 z"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;enable-background:accumulate" />
       </g>
       <rect
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
          id="rect14348-4-7-0"
          width="17.090866"
          height="17.100227"
@@ -5725,12 +5925,12 @@
          y="261.97873" />
     </g>
     <g
-       transform="matrix(0.93893373,0,0,0.93841974,47.91186,-225.48385)"
+       transform="matrix(0.93893373,0,0,0.93841974,87.91186,-225.48385)"
        id="selected-radio-checked-hover"
        style="display:inline"
        inkscape:label="#g15404">
       <rect
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
          id="rect14348-4-79-9"
          width="17.040606"
          height="17.049938"
@@ -5750,7 +5950,7 @@
          transform="matrix(0.99411529,0,0,0.99411529,2.6893006,1.5417626)">
         <rect
            ry="8.0419083"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.08838987;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.08838987;marker:none;enable-background:accumulate"
            id="rect4483-5"
            width="5.5564694"
            height="5.5533452"
@@ -5759,7 +5959,7 @@
            rx="7.9057436" />
         <rect
            ry="2.7766726"
-           style="color:#000000;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:2.08838987;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:2.08838987;marker:none;enable-background:accumulate"
            id="rect4485-6"
            width="5.5564694"
            height="5.5533452"
@@ -5770,11 +5970,11 @@
     </g>
     <g
        style="display:inline"
-       transform="matrix(0.93619363,0,0,0.93568113,368.82935,-8.0338405)"
+       transform="matrix(0.93619363,0,0,0.93568113,408.82935,-8.0338405)"
        id="selected-radio-mixed-hover"
        inkscape:label="#g15422">
       <rect
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
          id="rect14348-4-8-6"
          width="17.090481"
          height="17.099842"
@@ -5793,7 +5993,7 @@
          id="use7508-3"
          transform="matrix(1.0681551,0,0,1.0687402,118.74293,-2.1013573)">
         <rect
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99191427;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99191427;marker:none;enable-background:accumulate"
            id="rect7530-3"
            width="9"
            height="2.9687538"
@@ -5802,7 +6002,7 @@
            rx="1.4843769"
            ry="1.4843769" />
         <rect
-           style="color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99191427;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99191427;marker:none;enable-background:accumulate"
            id="rect7532-7"
            width="9"
            height="2.9687538"
@@ -5815,10 +6015,10 @@
     <g
        style="display:inline"
        id="selected-radio-unchecked-active"
-       transform="matrix(0.93344283,0,0,0.93293183,263.78164,-204.04631)"
+       transform="matrix(0.93344283,0,0,0.93293183,303.78164,-204.04631)"
        inkscape:label="#g15458">
       <rect
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
          id="rect14348-4-7-3-2"
          width="17.140844"
          height="17.150234"
@@ -5836,7 +6036,7 @@
              id="g5428-8-1-7-18-2">
             <rect
                ry="15.453857"
-               style="color:#000000;fill:url(#linearGradient6056);fill-opacity:1;fill-rule:nonzero;stroke:#3c5127;stroke-width:2.08222342;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+               style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient10479);fill-opacity:1;fill-rule:nonzero;stroke:#457218;stroke-width:2.08222342;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
                id="rect5147-9-1-7-88-7"
                width="29.385006"
                height="28.919117"
@@ -5849,11 +6049,11 @@
            inkscape:connector-curvature="0"
            id="rect5147-9-1-7-4-1-2-6"
            d="m 208.0967,270.36184 c -0.006,-0.11897 -0.0334,-0.24687 -0.0334,-0.36738 0,-3.84862 3.09665,-6.94697 6.94316,-6.94697 3.84651,0 6.94316,3.09835 6.94316,6.94697 0,0.12051 -0.0273,0.24841 -0.0333,0.36738 -0.3543,-3.51156 -3.30368,-6.24559 -6.90979,-6.24559 -3.60611,0 -6.55549,2.73403 -6.90978,6.24559 z"
-           style="opacity:0.07000002;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.07000002;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;enable-background:accumulate" />
       </g>
     </g>
     <g
-       transform="matrix(0.93893104,0,0,0.93841705,282.64584,-205.48314)"
+       transform="matrix(0.93893104,0,0,0.93841705,322.64584,-205.48314)"
        id="selected-radio-checked-active"
        style="display:inline"
        inkscape:label="#g16048">
@@ -5874,7 +6074,7 @@
            id="g16052-3" />
       </g>
       <rect
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
          id="rect14348-4-7-4-9"
          width="17.040653"
          height="17.049988"
@@ -5882,7 +6082,7 @@
          y="261.97876" />
       <rect
          ry="7.9946065"
-         style="opacity:0.7;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.08838987;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.08838987;marker:none;enable-background:accumulate"
          id="use15101-5-8-9"
          width="5.5237875"
          height="5.5206814"
@@ -5891,7 +6091,7 @@
          rx="7.8592429" />
       <rect
          ry="2.7603407"
-         style="color:#000000;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:2.08838987;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:2.08838987;marker:none;enable-background:accumulate"
          id="use15101-5-64"
          width="5.5237875"
          height="5.5206814"
@@ -5902,7 +6102,7 @@
     <g
        style="display:inline"
        id="selected-radio-mixed-active"
-       transform="matrix(0.93617253,0,0,0.93566004,303.21685,-204.76083)"
+       transform="matrix(0.93617253,0,0,0.93566004,343.21685,-204.76083)"
        inkscape:label="#g16079">
       <use
          transform="matrix(0.99708419,0,0,0.99708419,0.60329674,0.76365256)"
@@ -5921,14 +6121,14 @@
            id="g16083-3" />
       </g>
       <rect
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
          id="rect14348-4-7-32-3"
          width="17.090866"
          height="17.100227"
          x="206.99057"
          y="261.97873" />
       <rect
-         style="opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99191427;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99191427;marker:none;enable-background:accumulate"
          id="rect7532-0-4-6"
          width="9.6136122"
          height="3.1728981"
@@ -5937,7 +6137,7 @@
          rx="1.5855805"
          ry="1.586449" />
       <rect
-         style="color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99191427;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99191427;marker:none;enable-background:accumulate"
          id="rect7532-0-3"
          width="9.6136122"
          height="3.1728981"
@@ -5947,12 +6147,12 @@
          ry="1.586449" />
     </g>
     <g
-       transform="matrix(0.93617253,0,0,0.93566004,263.21685,-184.76083)"
+       transform="matrix(0.93617253,0,0,0.93566004,303.21685,-184.76083)"
        id="selected-radio-unchecked-insensitive"
        style="display:inline"
        inkscape:label="#g15524">
       <rect
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
          id="rect14348-4-7-5-3"
          width="17.090866"
          height="17.100227"
@@ -5969,7 +6169,7 @@
              id="g5428-8-1-7-18-8-9">
             <rect
                ry="15.453857"
-               style="color:#000000;fill:#f4f4f4;fill-opacity:1;fill-rule:nonzero;stroke:#3c5127;stroke-width:2.08222342;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+               style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f4f4f4;fill-opacity:1;fill-rule:nonzero;stroke:#457218;stroke-width:2.08222342;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
                id="rect5147-9-1-7-88-8-8"
                width="29.385006"
                height="28.919117"
@@ -5981,12 +6181,12 @@
       </g>
     </g>
     <g
-       transform="matrix(0.93893373,0,0,0.93841974,47.91186,-185.48385)"
+       transform="matrix(0.93893373,0,0,0.93841974,87.91186,-185.48385)"
        id="selected-radio-checked-insensitive"
        style="display:inline"
        inkscape:label="#g15536">
       <rect
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
          id="rect14348-4-7-9-5"
          width="17.040606"
          height="17.049938"
@@ -6003,7 +6203,7 @@
          height="1" />
       <rect
          ry="2.7603328"
-         style="color:#000000;fill:#8d9091;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.19056797;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#8d9091;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.19056797;marker:none;enable-background:accumulate"
          id="use15101-5-6-0"
          width="5.5237718"
          height="5.5206656"
@@ -6013,11 +6213,11 @@
     </g>
     <g
        style="display:inline"
-       transform="matrix(0.93341132,0,0,0.93290035,369.21044,32.050762)"
+       transform="matrix(0.93341132,0,0,0.93290035,409.21044,32.050762)"
        id="selected-radio-mixed-insensitive"
        inkscape:label="#g15554">
       <rect
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
          id="rect14348-4-7-98-9"
          width="17.141424"
          height="17.150812"
@@ -6033,7 +6233,7 @@
          width="1"
          height="1" />
       <rect
-         style="color:#000000;fill:#8d9091;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.20944476;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#8d9091;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.20944476;marker:none;enable-background:accumulate"
          id="rect7532-0-7-4"
          width="9.6420517"
          height="3.1822839"
@@ -6045,7 +6245,7 @@
     <g
        style="display:inline"
        id="selected-checkbox-checked-backdrop"
-       transform="matrix(0.99850603,0,0,0.99810197,360.14963,50.087076)"
+       transform="matrix(0.99850603,0,0,0.99810197,400.14963,50.087076)"
        inkscape:label="#g10801">
       <use
          transform="matrix(1.0014962,0,0,1.0019016,19.880069,-0.08722939)"
@@ -6074,9 +6274,9 @@
          height="16.030426"
          width="16.023939"
          id="rect19941-8"
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
       <path
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#54595a;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;-inkscape-font-specification:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#54595a;fill-opacity:1;stroke:none;stroke-width:3;marker:none;enable-background:accumulate"
          d="m 50.868001,31.380439 -6.981099,6.843039 -1.871897,-1.872655 -2.138425,-0.01563 0.01122,1.699485 2.936988,2.938187 c 0.586676,0.586674 1.537597,0.586674 2.124274,0 l 7.996315,-8.077832 0.002,-1.570761 z"
          id="path12830-4-17-2-3-2"
          inkscape:connector-curvature="0"
@@ -6085,7 +6285,7 @@
     <g
        style="display:inline"
        id="selected-checkbox-mixed-backdrop"
-       transform="translate(399.99573,50.000011)"
+       transform="translate(439.99573,50.000011)"
        inkscape:label="#g14334">
       <use
          transform="translate(0.004272,-2.9802322e-8)"
@@ -6097,7 +6297,7 @@
          width="1"
          height="1" />
       <rect
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
          id="rect19945-7"
          width="16"
          height="16"
@@ -6116,7 +6316,7 @@
         </g>
       </g>
       <rect
-         style="color:#000000;fill:#54595a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99491191;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#54595a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99491191;marker:none;enable-background:accumulate"
          id="rect5203-6-0"
          width="9"
          height="2.9687538"
@@ -6127,12 +6327,12 @@
     </g>
     <g
        style="display:inline"
-       transform="translate(360,50.000011)"
+       transform="translate(400,50.000011)"
        id="selected-checkbox-unchecked-backdrop"
        inkscape:label="#g14325">
       <rect
          ry="2.8844237"
-         style="color:#000000;fill:#ededed;fill-opacity:1;fill-rule:nonzero;stroke:#3c5127;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ededed;fill-opacity:1;fill-rule:nonzero;stroke:#457218;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
          id="rect5147-9-1-5-7-6-4-8-3-0-2"
          width="13.98312"
          height="14.015514"
@@ -6145,23 +6345,23 @@
          height="16"
          width="16"
          id="rect19971-4"
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
     </g>
     <g
        inkscape:label="#g15524"
        style="display:inline"
        id="selected-radio-unchecked-backdrop"
-       transform="matrix(0.93617253,0,0,0.93566004,263.21685,-164.76083)">
+       transform="matrix(0.93617253,0,0,0.93566004,303.21685,-164.76083)">
       <rect
          y="261.97873"
          x="206.99057"
          height="17.100227"
          width="17.090866"
          id="rect19981-6"
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
       <rect
          ry="7.9957981"
-         style="color:#000000;fill:#ededed;fill-opacity:1;fill-rule:nonzero;stroke:#3c5127;stroke-width:1.06847155;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ededed;fill-opacity:1;fill-rule:nonzero;stroke:#457218;stroke-width:1.06847155;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
          id="rect5147-9-1-7-88-8-5-5"
          width="14.954509"
          height="14.9627"
@@ -6173,14 +6373,14 @@
        inkscape:label="#g15536"
        style="display:inline"
        id="selected-radio-checked-backdrop"
-       transform="matrix(0.93893373,0,0,0.93841974,47.91186,-165.48385)">
+       transform="matrix(0.93893373,0,0,0.93841974,87.91186,-165.48385)">
       <rect
          y="261.97876"
          x="456.99057"
          height="17.049938"
          width="17.040606"
          id="rect19995-7"
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
       <use
          transform="matrix(0.99705922,0,0,0.99705921,250.60873,0.77046669)"
          style="display:inline"
@@ -6192,7 +6392,7 @@
          height="1" />
       <rect
          ry="2.7603328"
-         style="color:#000000;fill:#54595a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.19056797;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#54595a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.19056797;marker:none;enable-background:accumulate"
          id="use15101-5-6-3-92"
          width="5.5237718"
          height="5.5206656"
@@ -6204,14 +6404,14 @@
        style="display:inline"
        inkscape:label="#g15554"
        id="selected-radio-mixed-backdrop"
-       transform="matrix(0.93341132,0,0,0.93290035,369.21044,52.050762)">
+       transform="matrix(0.93341132,0,0,0.93290035,409.21044,52.050762)">
       <rect
          y="30.347755"
          x="136.90137"
          height="17.150812"
          width="17.141424"
          id="rect20011-1"
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
       <use
          transform="matrix(1.0029582,0,0,1.0029582,-70.701511,-232.40595)"
          style="display:inline"
@@ -6222,7 +6422,7 @@
          width="1"
          height="1" />
       <rect
-         style="color:#000000;fill:#54595a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.20944476;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#54595a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.20944476;marker:none;enable-background:accumulate"
          id="rect7532-0-7-9-0"
          width="9.6420517"
          height="3.1822839"
@@ -6234,7 +6434,7 @@
     <g
        style="display:inline"
        inkscape:label="#g10801"
-       transform="matrix(0.99850603,0,0,0.99810197,360.14963,70.087071)"
+       transform="matrix(0.99850603,0,0,0.99810197,400.14963,70.087071)"
        id="selected-checkbox-checked-backdrop-insensitive">
       <use
          transform="matrix(1.0014962,0,0,1.0019016,19.880069,-0.08722438)"
@@ -6265,14 +6465,14 @@
            id="g20177-1" />
       </g>
       <rect
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
          id="rect20181-3"
          width="16.023939"
          height="16.030426"
          x="36.905502"
          y="30.332689" />
       <path
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#c7c7c7;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;-inkscape-font-specification:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#c7c7c7;fill-opacity:1;stroke:none;stroke-width:3;marker:none;enable-background:accumulate"
          d="m 50.868001,31.380443 -6.981098,6.843039 -1.871898,-1.872655 -2.138425,-0.01563 0.01122,1.699485 2.936988,2.938186 c 0.586676,0.586675 1.537597,0.586675 2.124275,0 l 7.996314,-8.077832 0.002,-1.57076 z"
          id="path12830-4-17-2-3-9-3"
          inkscape:connector-curvature="0"
@@ -6281,7 +6481,7 @@
     <g
        style="display:inline"
        inkscape:label="#g14334"
-       transform="translate(399.99573,70.000011)"
+       transform="translate(439.99573,70.000011)"
        id="selected-checkbox-mixed-backdrop-insensitive">
       <use
          transform="translate(0.004272,-2.9802322e-8)"
@@ -6298,7 +6498,7 @@
          height="16"
          width="16"
          id="rect20185-0"
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
       <g
          transform="matrix(0.92951982,0,0,0.92914368,-156.74643,-212.9618)"
          id="g20187-2"
@@ -6321,7 +6521,7 @@
            transform="translate(-400.08917,-231.63092)" />
       </g>
       <rect
-         style="color:#000000;fill:#c7c7c7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99491191;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#c7c7c7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99491191;marker:none;enable-background:accumulate"
          id="rect5203-6-8-9"
          width="9"
          height="2.9687538"
@@ -6334,10 +6534,10 @@
        style="display:inline"
        inkscape:label="#g14325"
        id="selected-checkbox-unchecked-backdrop-insensitive"
-       transform="translate(360,70.000011)">
+       transform="translate(400,70.000011)">
       <rect
          ry="2.8844237"
-         style="color:#000000;fill:#f4f4f4;fill-opacity:1;fill-rule:nonzero;stroke:#3c5127;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f4f4f4;fill-opacity:1;fill-rule:nonzero;stroke:#457218;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
          id="rect5147-9-1-5-7-6-4-8-3-0-7-0"
          width="13.98312"
          height="14.015514"
@@ -6345,7 +6545,7 @@
          y="30.862183"
          rx="2.8382866" />
       <rect
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
          id="rect20211-5"
          width="16"
          height="16"
@@ -6353,12 +6553,12 @@
          y="30.362183" />
     </g>
     <g
-       transform="matrix(0.93617253,0,0,0.93566004,263.21685,-144.76083)"
+       transform="matrix(0.93617253,0,0,0.93566004,303.21685,-144.76083)"
        id="selected-radio-unchecked-backdrop-insensitive"
        style="display:inline"
        inkscape:label="#g15524">
       <rect
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
          id="rect20221-1"
          width="17.090866"
          height="17.100227"
@@ -6366,7 +6566,7 @@
          y="261.97873" />
       <rect
          ry="7.9957981"
-         style="color:#000000;fill:#f4f4f4;fill-opacity:1;fill-rule:nonzero;stroke:#3c5127;stroke-width:1.06847155;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f4f4f4;fill-opacity:1;fill-rule:nonzero;stroke:#457218;stroke-width:1.06847155;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
          id="rect5147-9-1-7-88-8-5-7-2"
          width="14.954509"
          height="14.9627"
@@ -6375,7 +6575,7 @@
          rx="7.8516736" />
     </g>
     <g
-       transform="matrix(0.93893373,0,0,0.93841974,47.91186,-145.48385)"
+       transform="matrix(0.93893373,0,0,0.93841974,87.91186,-145.48385)"
        id="selected-radio-checked-backdrop-insensitive"
        style="display:inline"
        inkscape:label="#g15536">
@@ -6392,7 +6592,7 @@
         </g>
       </g>
       <rect
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
          id="rect20235-3"
          width="17.040606"
          height="17.049938"
@@ -6409,7 +6609,7 @@
          height="1" />
       <rect
          ry="2.7603328"
-         style="color:#000000;fill:#c7c7c7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.19056797;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#c7c7c7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.19056797;marker:none;enable-background:accumulate"
          id="use15101-5-6-3-9-4"
          width="5.5237718"
          height="5.5206656"
@@ -6419,11 +6619,11 @@
     </g>
     <g
        style="display:inline"
-       transform="matrix(0.93341132,0,0,0.93290035,369.21044,72.050761)"
+       transform="matrix(0.93341132,0,0,0.93290035,409.21044,72.050761)"
        id="selected-radio-mixed-backdrop-insensitive"
        inkscape:label="#g15554">
       <rect
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
          id="rect20251-9"
          width="17.141424"
          height="17.150812"
@@ -6439,7 +6639,7 @@
          width="1"
          height="1" />
       <rect
-         style="color:#000000;fill:#c7c7c7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.20944476;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#c7c7c7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.20944476;marker:none;enable-background:accumulate"
          id="rect7532-0-7-9-6-6"
          width="9.6420517"
          height="3.1822839"
@@ -6448,5 +6648,417 @@
          rx="1.590271"
          ry="1.5911419" />
     </g>
+    <g
+       id="text-select-end"
+       transform="matrix(-1,0,0,-1,540.03033,-21.275635)"
+       inkscape:label="#g5515">
+      <path
+         sodipodi:nodetypes="ssscss"
+         inkscape:connector-curvature="0"
+         id="path10579"
+         d="m 201.71751,-9.3362027 c -3.70998,-3.7184223 -9.72504,-3.7184173 -13.43502,0 -3.70999,3.718416 -4.20188,13.4440732 3.62392,16.0288414 l 12.62392,4.1695293 -0.16117,-6.7327914 c -0.1257,-5.251176 1.05834,-9.7471583 -2.65165,-13.4655793 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient10615);fill-opacity:1;fill-rule:nonzero;stroke:#999999;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <g
+         id="g10581">
+        <path
+           inkscape:connector-curvature="0"
+           id="path10630"
+           d="m 195,-11.560975 c -2.30863,10e-7 -4.61312,0.859113 -6.375,2.625001 -1.88818,1.8924693 -2.53881,4.5333927 -2.40403,7.0075825 0.12078,-2.1382318 0.77209,-4.3719345 2.40403,-6.0075825 1.76188,-1.7658876 4.06637,-2.625 6.375,-2.625001 2.30863,-1e-6 4.61312,0.8591114 6.375,2.625001 1.63194,1.6356505 2.50422,3.7367683 2.625,5.875 0.13081,-2.4697869 -0.7403,-4.9860195 -2.625,-6.875 -1.76188,-1.76589 -4.06637,-2.625002 -6.375,-2.625001 z"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c0c0c0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.93591636;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+           sodipodi:nodetypes="sscssscss" />
+        <path
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.93591636;marker:none;enable-background:accumulate"
+           d="m 195,-10.500316 c -2.30863,10e-7 -4.61312,0.8591138 -6.375,2.6250022 -1.88818,1.8924693 -2.49461,4.3124219 -2.35983,6.7866117 0.12078,-2.1382318 0.72789,-4.1509637 2.35983,-5.7866117 1.76188,-1.7658876 4.06637,-2.6250004 6.375,-2.6250014 2.30863,-1e-6 4.61312,0.8591118 6.375,2.6250014 1.63194,1.6356505 2.50422,3.7367683 2.625,5.875 0.13081,-2.4697869 -0.7403,-4.9860195 -2.625,-6.875 -1.76188,-1.7658904 -4.06637,-2.6250032 -6.375,-2.6250022 z"
+           id="path10583"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sscssscss" />
+        <path
+           sodipodi:nodetypes="ccccccccc"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f9f9f9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.93591636;marker:none;enable-background:accumulate"
+           d="m 186.22098,-1.1362622 c 0.113,2.1497091 2.0766,6.5869279 6.51409,7.5414344 L 203.97227,9.7763966 204,-2.4178932 c -0.001,-0.020511 0.001,-0.041996 0,-0.0625 -0.01,-0.155035 -0.0445,-0.3142975 -0.0625,-0.46875 L 203.08839,8.715736 192.91183,5.7587256 c -5.47891,-1.2800965 -6.69085,-6.8949878 -6.69085,-6.8949878 z"
+           id="path10587"
+           inkscape:connector-curvature="0" />
+      </g>
+      <rect
+         y="-12.637817"
+         x="185"
+         height="24"
+         width="20"
+         id="rect10589"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    </g>
+    <g
+       inkscape:label="#g5515"
+       transform="matrix(-1,0,0,-1,540.03033,38.724365)"
+       id="text-select-end-active">
+      <path
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient10617);fill-opacity:1;fill-rule:nonzero;stroke:#5e7f3e;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m 201.71751,-9.3362027 c -3.70998,-3.7184223 -9.72504,-3.7184173 -13.43502,0 -3.70999,3.718416 -4.20188,13.4440732 3.62392,16.0288414 l 12.62392,4.1695293 -0.16117,-6.7327914 c -0.1257,-5.251176 1.05834,-9.7471583 -2.65165,-13.4655793 z"
+         id="path10593"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ssscss" />
+      <g
+         id="g10595">
+        <path
+           inkscape:connector-curvature="0"
+           id="path10597"
+           d="m 195,-10.146756 c -2.30863,10e-7 -4.61312,0.8591115 -6.375,2.6249957 -1.88818,1.8924693 -2.75978,4.4008102 -2.625,6.875 0.12078,-2.1382318 0.99306,-4.239352 2.625,-5.875 1.76188,-1.7658857 4.06637,-2.6249962 6.375,-2.6249972 2.30863,-1e-6 4.61312,0.8591095 6.375,2.6249972 1.63194,1.6356505 2.50422,3.7367683 2.625,5.875 0.13081,-2.4697869 -0.7403,-4.9860195 -2.625,-6.875 -1.76188,-1.7658862 -4.06637,-2.6249967 -6.375,-2.6249957 z"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.93591636;marker:none;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path10599"
+           d="m 186.0625,-3.65625 c -0.0184,0.1578753 -0.0524,0.3102699 -0.0625,0.46875 9.6e-4,0.021167 -0.001,0.041339 0,0.0625 0.113,2.14970912 2.14189,7.4244497 4.39277,8.0275703 L 203.97227,9.0692894 204,-3.125 c -0.001,-0.020511 0.001,-0.041996 0,-0.0625 -0.01,-0.155035 -0.0445,-0.3142975 -0.0625,-0.46875 L 203.08839,8.0086292 190.56954,4.2561237 C 187.92042,3.5462945 186.27213,-1.672031 186.0625,-3.65625 Z"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f9f9f9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.93591636;marker:none;enable-background:accumulate"
+           sodipodi:nodetypes="ccccccccccc" />
+      </g>
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect10601"
+         width="20"
+         height="24"
+         x="185"
+         y="-12.637817" />
+    </g>
+    <g
+       id="text-select-end-hover"
+       transform="matrix(-1,0,0,-1,540.03033,8.7243652)"
+       inkscape:label="#g5515">
+      <path
+         sodipodi:nodetypes="ssscss"
+         inkscape:connector-curvature="0"
+         id="path10605"
+         d="m 201.71751,-9.3362027 c -3.70998,-3.7184223 -9.72504,-3.7184173 -13.43502,0 -3.70999,3.718416 -4.20188,13.4440732 3.62392,16.0288414 l 12.62392,4.1695293 -0.16117,-6.7327914 c -0.1257,-5.251176 1.05834,-9.7471583 -2.65165,-13.4655793 z"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient10619);fill-opacity:1;fill-rule:nonzero;stroke:#a1a1a1;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <g
+         id="g10607">
+        <path
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.93591636;marker:none;enable-background:accumulate"
+           d="m 195,-10.034007 c -2.30863,1e-6 -4.61312,0.8591115 -6.375,2.6249973 -1.88818,1.8924693 -2.75978,4.4008102 -2.625,6.875 0.12078,-2.1382318 0.99306,-4.239352 2.625,-5.875 1.76188,-1.765887 4.06637,-2.6249981 6.375,-2.6249991 2.30863,-10e-7 4.61312,0.8591101 6.375,2.6249991 1.63194,1.6356505 2.50422,3.7367683 2.625,5.875 0.13081,-2.4697869 -0.7403,-4.9860195 -2.625,-6.875 -1.76188,-1.7658878 -4.06637,-2.6249983 -6.375,-2.6249973 z"
+           id="path10609"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="ccccccccccc"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f9f9f9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.93591636;marker:none;enable-background:accumulate"
+           d="m 186.0625,-3.65625 c -0.0184,0.1578753 -0.0524,0.3102699 -0.0625,0.46875 9.6e-4,0.021167 -0.001,0.041339 0,0.0625 0.113,2.14970912 2.14189,7.4244497 4.39277,8.0275703 L 203.97227,9.0692894 204,-3.125 c -0.001,-0.020511 0.001,-0.041996 0,-0.0625 -0.01,-0.155035 -0.0445,-0.3142975 -0.0625,-0.46875 L 203.08839,8.0086292 190.56954,4.2561237 C 187.92042,3.5462945 186.27213,-1.672031 186.0625,-3.65625 Z"
+           id="path10611"
+           inkscape:connector-curvature="0" />
+      </g>
+      <rect
+         y="-12.637817"
+         x="185"
+         height="24"
+         width="20"
+         id="rect10613"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    </g>
+    <g
+       inkscape:label="#g5515"
+       transform="matrix(-1,0,0,-1,540.03033,178.72437)"
+       id="text-select-end-dark">
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient10867);fill-opacity:1;fill-rule:nonzero;stroke:#1c1f1f;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto"
+         d="m 201.71751,-9.3362027 c -3.70998,-3.7184223 -9.72504,-3.7184173 -13.43502,0 -3.70999,3.718416 -4.20188,13.4440732 3.62392,16.0288414 l 12.62392,4.1695293 -0.16117,-6.7327914 c -0.1257,-5.251176 1.05834,-9.7471583 -2.65165,-13.4655793 z"
+         id="path10686"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ssscss" />
+      <g
+         id="g10688">
+        <path
+           sodipodi:nodetypes="sscssscss"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#2a2f2f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;filter-blend-mode:normal;filter-gaussianBlur-deviation:0"
+           d="m 195,-11.560975 c -2.30863,10e-7 -4.61312,0.859113 -6.375,2.625001 -1.88818,1.8924693 -2.53881,4.5333927 -2.40403,7.0075825 0.12078,-2.1382318 0.77209,-4.3719345 2.40403,-6.0075825 1.76188,-1.7658876 4.06637,-2.625 6.375,-2.625001 2.30863,-1e-6 4.61312,0.8591114 6.375,2.625001 1.63194,1.6356505 2.50422,3.7367683 2.625,5.875 0.13081,-2.4697869 -0.7403,-4.9860195 -2.625,-6.875 -1.76188,-1.76589 -4.06637,-2.625002 -6.375,-2.625001 z"
+           id="path10690"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="sscssscss"
+           inkscape:connector-curvature="0"
+           id="path10692"
+           d="m 195,-10.500316 c -2.30863,10e-7 -4.61312,0.8591138 -6.375,2.6250022 -1.88818,1.8924693 -2.49461,4.3124219 -2.35983,6.7866117 0.12078,-2.1382318 0.72789,-4.1509637 2.35983,-5.7866117 1.76188,-1.7658876 4.06637,-2.6250004 6.375,-2.6250014 2.30863,-1e-6 4.61312,0.8591118 6.375,2.6250014 1.63194,1.6356505 2.50422,3.7367683 2.625,5.875 0.13081,-2.4697869 -0.7403,-4.9860195 -2.625,-6.875 -1.76188,-1.7658904 -4.06637,-2.6250032 -6.375,-2.6250022 z"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#3e4444;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path10694"
+           d="m 186.22098,-1.1362622 c 0.113,2.1497091 2.0766,6.5869279 6.51409,7.5414344 L 203.97227,9.7763966 204,-2.4178932 c -0.001,-0.020511 0.001,-0.041996 0,-0.0625 -0.01,-0.155035 -0.0445,-0.3142975 -0.0625,-0.46875 L 203.08839,8.715736 192.91183,5.7587256 c -5.47891,-1.2800965 -6.69085,-6.8949878 -6.69085,-6.8949878 z"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:0.15;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto"
+           sodipodi:nodetypes="ccccccccc" />
+      </g>
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect10696"
+         width="20"
+         height="24"
+         x="185"
+         y="-12.637817" />
+    </g>
+    <g
+       id="text-select-end-active-dark"
+       transform="matrix(-1,0,0,-1,540.03033,238.72437)"
+       inkscape:label="#g5515">
+      <path
+         sodipodi:nodetypes="ssscss"
+         inkscape:connector-curvature="0"
+         id="path10700"
+         d="m 201.71751,-9.3362027 c -3.70998,-3.7184223 -9.72504,-3.7184173 -13.43502,0 -3.70999,3.718416 -4.20188,13.4440732 3.62392,16.0288414 l 12.62392,4.1695293 -0.16117,-6.7327914 c -0.1257,-5.251176 1.05834,-9.7471583 -2.65165,-13.4655793 z"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient11093);fill-opacity:1;fill-rule:nonzero;stroke:#385c14;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;filter-blend-mode:normal;filter-gaussianBlur-deviation:0" />
+      <g
+         id="g10702">
+        <path
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.15;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+           d="m 195,-10.677087 c -2.30863,1e-6 -4.61312,0.8591124 -6.375,2.6249966 -1.88818,1.8924693 -2.75978,4.4008102 -2.625,6.875 0.12078,-2.1382318 0.99306,-4.239352 2.625,-5.875 1.76188,-1.7658857 4.06637,-2.6249962 6.375,-2.6249972 2.30863,-10e-7 4.61312,0.8591095 6.375,2.6249972 1.63194,1.6356505 2.50422,3.7367683 2.625,5.875 0.13081,-2.4697869 -0.7403,-4.9860195 -2.625,-6.875 -1.76188,-1.7658862 -4.06637,-2.6249976 -6.375,-2.6249966 z"
+           id="path10704"
+           inkscape:connector-curvature="0" />
+      </g>
+      <rect
+         y="-12.637817"
+         x="185"
+         height="24"
+         width="20"
+         id="rect10708"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path10694-2"
+         d="m 186.22101,-1.136263 c 0.113,2.14971 2.0766,6.58693 6.51409,7.54144 L 203.9723,9.776397 204,-2.417893 c -0.001,-0.0205 0.001,-0.042 0,-0.0625 -0.01,-0.15503 -0.0445,-0.3143 -0.0625,-0.46875 l -0.84911,11.66488 -10.17656,-2.95701 c -5.47891,-1.2801 -6.69085,-6.89499 -6.69085,-6.89499 z"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.15;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;filter-blend-mode:normal;filter-gaussianBlur-deviation:0"
+         sodipodi:nodetypes="ccccccccc" />
+    </g>
+    <g
+       inkscape:label="#g5515"
+       transform="matrix(-1,0,0,-1,540.03033,208.72437)"
+       id="text-select-end-hover-dark">
+      <path
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient11025);fill-opacity:1;fill-rule:nonzero;stroke:#1c1f1f;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;filter-blend-mode:normal;filter-gaussianBlur-deviation:0"
+         d="m 201.71751,-9.3362027 c -3.70998,-3.7184223 -9.72504,-3.7184173 -13.43502,0 -3.70999,3.718416 -4.20188,13.4440732 3.62392,16.0288414 l 12.62392,4.1695293 -0.16117,-6.7327914 c -0.1257,-5.251176 1.05834,-9.7471583 -2.65165,-13.4655793 z"
+         id="path10712"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ssscss" />
+      <g
+         id="g10714" />
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect10720"
+         width="20"
+         height="24"
+         x="185"
+         y="-12.637817" />
+      <path
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.15;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;filter-blend-mode:normal;filter-gaussianBlur-deviation:0"
+         d="m 195,-10.784583 c -2.30863,0 -4.61312,0.8591104 -6.375,2.6250004 -1.88818,1.89247 -2.49461,4.31242 -2.35983,6.78661 0.12078,-2.13823 0.72789,-4.15096 2.35983,-5.78661 1.76188,-1.76589 4.06637,-2.625 6.375,-2.625 2.30863,0 4.61312,0.85911 6.375,2.625 1.63194,1.63565 2.50422,3.73677 2.625,5.875 0.13081,-2.46979 -0.7403,-4.98602 -2.625,-6.875 -1.76188,-1.76589 -4.06637,-2.6250004 -6.375,-2.6250004 z"
+         id="path10956"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="sscssscss" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path10694-1"
+         d="m 186.22101,-1.136263 c 0.113,2.14971 2.0766,6.58693 6.51409,7.54144 L 203.9723,9.776397 204,-2.417893 c -0.001,-0.0205 0.001,-0.042 0,-0.0625 -0.01,-0.15503 -0.0445,-0.3143 -0.0625,-0.46875 l -0.84911,11.66488 -10.17656,-2.95701 c -5.47891,-1.2801 -6.69085,-6.89499 -6.69085,-6.89499 z"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.15;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         sodipodi:nodetypes="ccccccccc" />
+    </g>
+    <g
+       inkscape:label="#g5515"
+       transform="matrix(1,0,0,-1,122,-21.275635)"
+       id="text-select-start">
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient12902);fill-opacity:1;fill-rule:nonzero;stroke:#999999;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         d="m 201.71751,-9.3362027 c -3.70998,-3.7184223 -9.72504,-3.7184173 -13.43502,0 -3.70999,3.718416 -4.20188,13.4440732 3.62392,16.0288414 l 12.62392,4.1695293 -0.16117,-6.7327914 c -0.1257,-5.251176 1.05834,-9.7471583 -2.65165,-13.4655793 z"
+         id="path12828"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ssscss" />
+      <g
+         id="g12830">
+        <path
+           sodipodi:nodetypes="sscssscss"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c0c0c0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.93591636;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+           d="m 195,-11.560975 c -2.30863,10e-7 -4.61312,0.859113 -6.375,2.625001 -1.88818,1.8924693 -2.53881,4.5333927 -2.40403,7.0075825 0.12078,-2.1382318 0.77209,-4.3719345 2.40403,-6.0075825 1.76188,-1.7658876 4.06637,-2.625 6.375,-2.625001 2.30863,-1e-6 4.61312,0.8591114 6.375,2.625001 1.63194,1.6356505 2.50422,3.7367683 2.625,5.875 0.13081,-2.4697869 -0.7403,-4.9860195 -2.625,-6.875 -1.76188,-1.76589 -4.06637,-2.625002 -6.375,-2.625001 z"
+           id="path12832"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="sscssscss"
+           inkscape:connector-curvature="0"
+           id="path12834"
+           d="m 195,-10.500316 c -2.30863,10e-7 -4.61312,0.8591138 -6.375,2.6250022 -1.88818,1.8924693 -2.49461,4.3124219 -2.35983,6.7866117 0.12078,-2.1382318 0.72789,-4.1509637 2.35983,-5.7866117 1.76188,-1.7658876 4.06637,-2.6250004 6.375,-2.6250014 2.30863,-1e-6 4.61312,0.8591118 6.375,2.6250014 1.63194,1.6356505 2.50422,3.7367683 2.625,5.875 0.13081,-2.4697869 -0.7403,-4.9860195 -2.625,-6.875 -1.76188,-1.7658904 -4.06637,-2.6250032 -6.375,-2.6250022 z"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.93591636;marker:none;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path12836"
+           d="m 186.22098,-1.1362622 c 0.113,2.1497091 2.0766,6.5869279 6.51409,7.5414344 L 203.97227,9.7763966 204,-2.4178932 c -0.001,-0.020511 0.001,-0.041996 0,-0.0625 -0.01,-0.155035 -0.0445,-0.3142975 -0.0625,-0.46875 L 203.08839,8.715736 192.91183,5.7587256 c -5.47891,-1.2800965 -6.69085,-6.8949878 -6.69085,-6.8949878 z"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f9f9f9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.93591636;marker:none;enable-background:accumulate"
+           sodipodi:nodetypes="ccccccccc" />
+      </g>
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect12838"
+         width="20"
+         height="24"
+         x="185"
+         y="-12.637817" />
+    </g>
+    <g
+       id="text-select-start-active"
+       transform="matrix(1,0,0,-1,122,38.724365)"
+       inkscape:label="#g5515">
+      <path
+         sodipodi:nodetypes="ssscss"
+         inkscape:connector-curvature="0"
+         id="path12842"
+         d="m 201.71751,-9.3362027 c -3.70998,-3.7184223 -9.72504,-3.7184173 -13.43502,0 -3.70999,3.718416 -4.20188,13.4440732 3.62392,16.0288414 l 12.62392,4.1695293 -0.16117,-6.7327914 c -0.1257,-5.251176 1.05834,-9.7471583 -2.65165,-13.4655793 z"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient12904);fill-opacity:1;fill-rule:nonzero;stroke:#5e7f3e;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <g
+         id="g12844">
+        <path
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.93591636;marker:none;enable-background:accumulate"
+           d="m 195,-10.146756 c -2.30863,10e-7 -4.61312,0.8591115 -6.375,2.6249957 -1.88818,1.8924693 -2.75978,4.4008102 -2.625,6.875 0.12078,-2.1382318 0.99306,-4.239352 2.625,-5.875 1.76188,-1.7658857 4.06637,-2.6249962 6.375,-2.6249972 2.30863,-1e-6 4.61312,0.8591095 6.375,2.6249972 1.63194,1.6356505 2.50422,3.7367683 2.625,5.875 0.13081,-2.4697869 -0.7403,-4.9860195 -2.625,-6.875 -1.76188,-1.7658862 -4.06637,-2.6249967 -6.375,-2.6249957 z"
+           id="path12846"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="ccccccccccc"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f9f9f9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.93591636;marker:none;enable-background:accumulate"
+           d="m 186.0625,-3.65625 c -0.0184,0.1578753 -0.0524,0.3102699 -0.0625,0.46875 9.6e-4,0.021167 -0.001,0.041339 0,0.0625 0.113,2.14970912 2.14189,7.4244497 4.39277,8.0275703 L 203.97227,9.0692894 204,-3.125 c -0.001,-0.020511 0.001,-0.041996 0,-0.0625 -0.01,-0.155035 -0.0445,-0.3142975 -0.0625,-0.46875 L 203.08839,8.0086292 190.56954,4.2561237 C 187.92042,3.5462945 186.27213,-1.672031 186.0625,-3.65625 Z"
+           id="path12848"
+           inkscape:connector-curvature="0" />
+      </g>
+      <rect
+         y="-12.637817"
+         x="185"
+         height="24"
+         width="20"
+         id="rect12850"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    </g>
+    <g
+       inkscape:label="#g5515"
+       transform="matrix(1,0,0,-1,122,8.7243652)"
+       id="text-select-start-hover">
+      <path
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient12906);fill-opacity:1;fill-rule:nonzero;stroke:#a1a1a1;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m 201.71751,-9.3362027 c -3.70998,-3.7184223 -9.72504,-3.7184173 -13.43502,0 -3.70999,3.718416 -4.20188,13.4440732 3.62392,16.0288414 l 12.62392,4.1695293 -0.16117,-6.7327914 c -0.1257,-5.251176 1.05834,-9.7471583 -2.65165,-13.4655793 z"
+         id="path12854"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ssscss" />
+      <g
+         id="g12856">
+        <path
+           inkscape:connector-curvature="0"
+           id="path12858"
+           d="m 195,-10.034007 c -2.30863,1e-6 -4.61312,0.8591115 -6.375,2.6249973 -1.88818,1.8924693 -2.75978,4.4008102 -2.625,6.875 0.12078,-2.1382318 0.99306,-4.239352 2.625,-5.875 1.76188,-1.765887 4.06637,-2.6249981 6.375,-2.6249991 2.30863,-10e-7 4.61312,0.8591101 6.375,2.6249991 1.63194,1.6356505 2.50422,3.7367683 2.625,5.875 0.13081,-2.4697869 -0.7403,-4.9860195 -2.625,-6.875 -1.76188,-1.7658878 -4.06637,-2.6249983 -6.375,-2.6249973 z"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.93591636;marker:none;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path12860"
+           d="m 186.0625,-3.65625 c -0.0184,0.1578753 -0.0524,0.3102699 -0.0625,0.46875 9.6e-4,0.021167 -0.001,0.041339 0,0.0625 0.113,2.14970912 2.14189,7.4244497 4.39277,8.0275703 L 203.97227,9.0692894 204,-3.125 c -0.001,-0.020511 0.001,-0.041996 0,-0.0625 -0.01,-0.155035 -0.0445,-0.3142975 -0.0625,-0.46875 L 203.08839,8.0086292 190.56954,4.2561237 C 187.92042,3.5462945 186.27213,-1.672031 186.0625,-3.65625 Z"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f9f9f9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.93591636;marker:none;enable-background:accumulate"
+           sodipodi:nodetypes="ccccccccccc" />
+      </g>
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect12862"
+         width="20"
+         height="24"
+         x="185"
+         y="-12.637817" />
+    </g>
+    <g
+       id="text-select-start-dark"
+       transform="matrix(1,0,0,-1,122,178.72437)"
+       inkscape:label="#g5515">
+      <path
+         sodipodi:nodetypes="ssscss"
+         inkscape:connector-curvature="0"
+         id="path12866"
+         d="m 201.71751,-9.3362027 c -3.70998,-3.7184223 -9.72504,-3.7184173 -13.43502,0 -3.70999,3.718416 -4.20188,13.4440732 3.62392,16.0288414 l 12.62392,4.1695293 -0.16117,-6.7327914 c -0.1257,-5.251176 1.05834,-9.7471583 -2.65165,-13.4655793 z"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient12908);fill-opacity:1;fill-rule:nonzero;stroke:#1c1f1f;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <g
+         id="g12868">
+        <path
+           inkscape:connector-curvature="0"
+           id="path12870"
+           d="m 195,-11.560975 c -2.30863,10e-7 -4.61312,0.859113 -6.375,2.625001 -1.88818,1.8924693 -2.53881,4.5333927 -2.40403,7.0075825 0.12078,-2.1382318 0.77209,-4.3719345 2.40403,-6.0075825 1.76188,-1.7658876 4.06637,-2.625 6.375,-2.625001 2.30863,-1e-6 4.61312,0.8591114 6.375,2.625001 1.63194,1.6356505 2.50422,3.7367683 2.625,5.875 0.13081,-2.4697869 -0.7403,-4.9860195 -2.625,-6.875 -1.76188,-1.76589 -4.06637,-2.625002 -6.375,-2.625001 z"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#2a2f2f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+           sodipodi:nodetypes="sscssscss" />
+        <path
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#3e4444;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+           d="m 195,-10.500316 c -2.30863,10e-7 -4.61312,0.8591138 -6.375,2.6250022 -1.88818,1.8924693 -2.49461,4.3124219 -2.35983,6.7866117 0.12078,-2.1382318 0.72789,-4.1509637 2.35983,-5.7866117 1.76188,-1.7658876 4.06637,-2.6250004 6.375,-2.6250014 2.30863,-1e-6 4.61312,0.8591118 6.375,2.6250014 1.63194,1.6356505 2.50422,3.7367683 2.625,5.875 0.13081,-2.4697869 -0.7403,-4.9860195 -2.625,-6.875 -1.76188,-1.7658904 -4.06637,-2.6250032 -6.375,-2.6250022 z"
+           id="path12872"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sscssscss" />
+        <path
+           sodipodi:nodetypes="ccccccccc"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.15;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+           d="m 186.22098,-1.1362622 c 0.113,2.1497091 2.0766,6.5869279 6.51409,7.5414344 L 203.97227,9.7763966 204,-2.4178932 c -0.001,-0.020511 0.001,-0.041996 0,-0.0625 -0.01,-0.155035 -0.0445,-0.3142975 -0.0625,-0.46875 L 203.08839,8.715736 192.91183,5.7587256 c -5.47891,-1.2800965 -6.69085,-6.8949878 -6.69085,-6.8949878 z"
+           id="path12874"
+           inkscape:connector-curvature="0" />
+      </g>
+      <rect
+         y="-12.637817"
+         x="185"
+         height="24"
+         width="20"
+         id="rect12876"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    </g>
+    <g
+       inkscape:label="#g5515"
+       transform="matrix(1,0,0,-1,122,238.72437)"
+       id="text-select-start-active-dark">
+      <path
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient12910);fill-opacity:1;fill-rule:nonzero;stroke:#385c14;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m 201.71751,-9.3362027 c -3.70998,-3.7184223 -9.72504,-3.7184173 -13.43502,0 -3.70999,3.718416 -4.20188,13.4440732 3.62392,16.0288414 l 12.62392,4.1695293 -0.16117,-6.7327914 c -0.1257,-5.251176 1.05834,-9.7471583 -2.65165,-13.4655793 z"
+         id="path12880"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ssscss" />
+      <g
+         id="g12882">
+        <path
+           inkscape:connector-curvature="0"
+           id="path12884"
+           d="m 195,-10.677087 c -2.30863,1e-6 -4.61312,0.8591124 -6.375,2.6249966 -1.88818,1.8924693 -2.75978,4.4008102 -2.625,6.875 0.12078,-2.1382318 0.99306,-4.239352 2.625,-5.875 1.76188,-1.7658857 4.06637,-2.6249962 6.375,-2.6249972 2.30863,-10e-7 4.61312,0.8591095 6.375,2.6249972 1.63194,1.6356505 2.50422,3.7367683 2.625,5.875 0.13081,-2.4697869 -0.7403,-4.9860195 -2.625,-6.875 -1.76188,-1.7658862 -4.06637,-2.6249976 -6.375,-2.6249966 z"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.15;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      </g>
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect12886"
+         width="20"
+         height="24"
+         x="185"
+         y="-12.637817" />
+      <path
+         sodipodi:nodetypes="ccccccccc"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.15;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m 186.22101,-1.136263 c 0.113,2.14971 2.0766,6.58693 6.51409,7.54144 L 203.9723,9.776397 204,-2.417893 c -0.001,-0.0205 0.001,-0.042 0,-0.0625 -0.01,-0.15503 -0.0445,-0.3143 -0.0625,-0.46875 l -0.84911,11.66488 -10.17656,-2.95701 c -5.47891,-1.2801 -6.69085,-6.89499 -6.69085,-6.89499 z"
+         id="path12888"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="text-select-start-hover-dark"
+       transform="matrix(1,0,0,-1,122,208.72437)"
+       inkscape:label="#g5515">
+      <path
+         sodipodi:nodetypes="ssscss"
+         inkscape:connector-curvature="0"
+         id="path12892"
+         d="m 201.71751,-9.3362027 c -3.70998,-3.7184223 -9.72504,-3.7184173 -13.43502,0 -3.70999,3.718416 -4.20188,13.4440732 3.62392,16.0288414 l 12.62392,4.1695293 -0.16117,-6.7327914 c -0.1257,-5.251176 1.05834,-9.7471583 -2.65165,-13.4655793 z"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient12912);fill-opacity:1;fill-rule:nonzero;stroke:#1c1f1f;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <g
+         id="g12894" />
+      <rect
+         y="-12.637817"
+         x="185"
+         height="24"
+         width="20"
+         id="rect12896"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <path
+         sodipodi:nodetypes="sscssscss"
+         inkscape:connector-curvature="0"
+         id="path12898"
+         d="m 195,-10.784583 c -2.30863,0 -4.61312,0.8591104 -6.375,2.6250004 -1.88818,1.89247 -2.49461,4.31242 -2.35983,6.78661 0.12078,-2.13823 0.72789,-4.15096 2.35983,-5.78661 1.76188,-1.76589 4.06637,-2.625 6.375,-2.625 2.30863,0 4.61312,0.85911 6.375,2.625 1.63194,1.63565 2.50422,3.73677 2.625,5.875 0.13081,-2.46979 -0.7403,-4.98602 -2.625,-6.875 -1.76188,-1.76589 -4.06637,-2.6250004 -6.375,-2.6250004 z"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.15;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <path
+         sodipodi:nodetypes="ccccccccc"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.15;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m 186.22101,-1.136263 c 0.113,2.14971 2.0766,6.58693 6.51409,7.54144 L 203.9723,9.776397 204,-2.417893 c -0.001,-0.0205 0.001,-0.042 0,-0.0625 -0.01,-0.15503 -0.0445,-0.3143 -0.0625,-0.46875 l -0.84911,11.66488 -10.17656,-2.95701 c -5.47891,-1.2801 -6.69085,-6.89499 -6.69085,-6.89499 z"
+         id="path12900"
+         inkscape:connector-curvature="0" />
+    </g>
   </g>
 </svg>
--- a/gtk-3.0/assets.txt	Sat Jul 09 11:48:31 2016 +0100
+++ b/gtk-3.0/assets.txt	Sat Jul 09 15:25:37 2016 +0100
@@ -70,6 +70,18 @@
 selected-radio-mixed-insensitive
 selected-radio-mixed-backdrop
 selected-radio-mixed-backdrop-insensitive
+text-select-end
+text-select-end-hover
+text-select-end-active
+text-select-start
+text-select-start-hover
+text-select-start-active
+text-select-end-dark
+text-select-end-hover-dark
+text-select-end-active-dark
+text-select-start-dark
+text-select-start-hover-dark
+text-select-start-active-dark
 checkbox-checked-dark
 checkbox-checked-hover-dark
 checkbox-checked-active-dark
Binary file gtk-3.0/assets/checkbox-checked-active-selectionmode.png has changed
Binary file gtk-3.0/assets/checkbox-checked-active-selectionmode@2.png has changed
Binary file gtk-3.0/assets/checkbox-checked-backdrop-selectionmode.png has changed
Binary file gtk-3.0/assets/checkbox-checked-backdrop-selectionmode@2.png has changed
Binary file gtk-3.0/assets/checkbox-checked-hover-selectionmode.png has changed
Binary file gtk-3.0/assets/checkbox-checked-hover-selectionmode@2.png has changed
Binary file gtk-3.0/assets/checkbox-checked-selectionmode.png has changed
Binary file gtk-3.0/assets/checkbox-checked-selectionmode@2.png has changed
Binary file gtk-3.0/assets/selected-checkbox-checked-active.png has changed
Binary file gtk-3.0/assets/selected-checkbox-checked-active@2.png has changed
Binary file gtk-3.0/assets/selected-checkbox-checked-backdrop-insensitive.png has changed
Binary file gtk-3.0/assets/selected-checkbox-checked-backdrop-insensitive@2.png has changed
Binary file gtk-3.0/assets/selected-checkbox-checked-backdrop.png has changed
Binary file gtk-3.0/assets/selected-checkbox-checked-backdrop@2.png has changed
Binary file gtk-3.0/assets/selected-checkbox-checked-hover.png has changed
Binary file gtk-3.0/assets/selected-checkbox-checked-hover@2.png has changed
Binary file gtk-3.0/assets/selected-checkbox-checked-insensitive.png has changed
Binary file gtk-3.0/assets/selected-checkbox-checked-insensitive@2.png has changed
Binary file gtk-3.0/assets/selected-checkbox-checked.png has changed
Binary file gtk-3.0/assets/selected-checkbox-checked@2.png has changed
Binary file gtk-3.0/assets/selected-checkbox-mixed-active.png has changed
Binary file gtk-3.0/assets/selected-checkbox-mixed-active@2.png has changed
Binary file gtk-3.0/assets/selected-checkbox-mixed-backdrop-insensitive.png has changed
Binary file gtk-3.0/assets/selected-checkbox-mixed-backdrop-insensitive@2.png has changed
Binary file gtk-3.0/assets/selected-checkbox-mixed-backdrop.png has changed
Binary file gtk-3.0/assets/selected-checkbox-mixed-backdrop@2.png has changed
Binary file gtk-3.0/assets/selected-checkbox-mixed-hover.png has changed
Binary file gtk-3.0/assets/selected-checkbox-mixed-hover@2.png has changed
Binary file gtk-3.0/assets/selected-checkbox-mixed-insensitive.png has changed
Binary file gtk-3.0/assets/selected-checkbox-mixed-insensitive@2.png has changed
Binary file gtk-3.0/assets/selected-checkbox-mixed.png has changed
Binary file gtk-3.0/assets/selected-checkbox-mixed@2.png has changed
Binary file gtk-3.0/assets/selected-checkbox-unchecked-active.png has changed
Binary file gtk-3.0/assets/selected-checkbox-unchecked-active@2.png has changed
Binary file gtk-3.0/assets/selected-checkbox-unchecked-backdrop-insensitive.png has changed
Binary file gtk-3.0/assets/selected-checkbox-unchecked-backdrop-insensitive@2.png has changed
Binary file gtk-3.0/assets/selected-checkbox-unchecked-backdrop.png has changed
Binary file gtk-3.0/assets/selected-checkbox-unchecked-backdrop@2.png has changed
Binary file gtk-3.0/assets/selected-checkbox-unchecked-hover.png has changed
Binary file gtk-3.0/assets/selected-checkbox-unchecked-hover@2.png has changed
Binary file gtk-3.0/assets/selected-checkbox-unchecked-insensitive.png has changed
Binary file gtk-3.0/assets/selected-checkbox-unchecked-insensitive@2.png has changed
Binary file gtk-3.0/assets/selected-checkbox-unchecked.png has changed
Binary file gtk-3.0/assets/selected-checkbox-unchecked@2.png has changed
Binary file gtk-3.0/assets/selected-radio-checked-active.png has changed
Binary file gtk-3.0/assets/selected-radio-checked-active@2.png has changed
Binary file gtk-3.0/assets/selected-radio-checked-backdrop-insensitive.png has changed
Binary file gtk-3.0/assets/selected-radio-checked-backdrop-insensitive@2.png has changed
Binary file gtk-3.0/assets/selected-radio-checked-backdrop.png has changed
Binary file gtk-3.0/assets/selected-radio-checked-backdrop@2.png has changed
Binary file gtk-3.0/assets/selected-radio-checked-hover.png has changed
Binary file gtk-3.0/assets/selected-radio-checked-hover@2.png has changed
Binary file gtk-3.0/assets/selected-radio-checked-insensitive.png has changed
Binary file gtk-3.0/assets/selected-radio-checked-insensitive@2.png has changed
Binary file gtk-3.0/assets/selected-radio-checked.png has changed
Binary file gtk-3.0/assets/selected-radio-checked@2.png has changed
Binary file gtk-3.0/assets/selected-radio-mixed-active.png has changed
Binary file gtk-3.0/assets/selected-radio-mixed-active@2.png has changed
Binary file gtk-3.0/assets/selected-radio-mixed-backdrop-insensitive.png has changed
Binary file gtk-3.0/assets/selected-radio-mixed-backdrop-insensitive@2.png has changed
Binary file gtk-3.0/assets/selected-radio-mixed-backdrop.png has changed
Binary file gtk-3.0/assets/selected-radio-mixed-backdrop@2.png has changed
Binary file gtk-3.0/assets/selected-radio-mixed-hover.png has changed
Binary file gtk-3.0/assets/selected-radio-mixed-hover@2.png has changed
Binary file gtk-3.0/assets/selected-radio-mixed-insensitive.png has changed
Binary file gtk-3.0/assets/selected-radio-mixed-insensitive@2.png has changed
Binary file gtk-3.0/assets/selected-radio-mixed.png has changed
Binary file gtk-3.0/assets/selected-radio-mixed@2.png has changed
Binary file gtk-3.0/assets/selected-radio-unchecked-active.png has changed
Binary file gtk-3.0/assets/selected-radio-unchecked-active@2.png has changed
Binary file gtk-3.0/assets/selected-radio-unchecked-backdrop-insensitive.png has changed
Binary file gtk-3.0/assets/selected-radio-unchecked-backdrop-insensitive@2.png has changed
Binary file gtk-3.0/assets/selected-radio-unchecked-backdrop.png has changed
Binary file gtk-3.0/assets/selected-radio-unchecked-backdrop@2.png has changed
Binary file gtk-3.0/assets/selected-radio-unchecked-hover.png has changed
Binary file gtk-3.0/assets/selected-radio-unchecked-hover@2.png has changed
Binary file gtk-3.0/assets/selected-radio-unchecked-insensitive.png has changed
Binary file gtk-3.0/assets/selected-radio-unchecked-insensitive@2.png has changed
Binary file gtk-3.0/assets/selected-radio-unchecked.png has changed
Binary file gtk-3.0/assets/selected-radio-unchecked@2.png has changed
Binary file gtk-3.0/assets/slider-horz-scale-has-marks-above-active-dark.png has changed
Binary file gtk-3.0/assets/slider-horz-scale-has-marks-above-active-dark@2.png has changed
Binary file gtk-3.0/assets/slider-horz-scale-has-marks-below-active-dark.png has changed
Binary file gtk-3.0/assets/slider-horz-scale-has-marks-below-active-dark@2.png has changed
Binary file gtk-3.0/assets/slider-vert-scale-has-marks-above-active-dark.png has changed
Binary file gtk-3.0/assets/slider-vert-scale-has-marks-above-active-dark@2.png has changed
Binary file gtk-3.0/assets/slider-vert-scale-has-marks-below-active-dark.png has changed
Binary file gtk-3.0/assets/slider-vert-scale-has-marks-below-active-dark@2.png has changed
Binary file gtk-3.0/assets/text-select-end-active-dark.png has changed
Binary file gtk-3.0/assets/text-select-end-active-dark@2.png has changed
Binary file gtk-3.0/assets/text-select-end-active.png has changed
Binary file gtk-3.0/assets/text-select-end-active@2.png has changed
Binary file gtk-3.0/assets/text-select-end-dark.png has changed
Binary file gtk-3.0/assets/text-select-end-dark@2.png has changed
Binary file gtk-3.0/assets/text-select-end-hover-dark.png has changed
Binary file gtk-3.0/assets/text-select-end-hover-dark@2.png has changed
Binary file gtk-3.0/assets/text-select-end-hover.png has changed
Binary file gtk-3.0/assets/text-select-end-hover@2.png has changed
Binary file gtk-3.0/assets/text-select-end.png has changed
Binary file gtk-3.0/assets/text-select-end@2.png has changed
Binary file gtk-3.0/assets/text-select-start-active-dark.png has changed
Binary file gtk-3.0/assets/text-select-start-active-dark@2.png has changed
Binary file gtk-3.0/assets/text-select-start-active.png has changed
Binary file gtk-3.0/assets/text-select-start-active@2.png has changed
Binary file gtk-3.0/assets/text-select-start-dark.png has changed
Binary file gtk-3.0/assets/text-select-start-dark@2.png has changed
Binary file gtk-3.0/assets/text-select-start-hover-dark.png has changed
Binary file gtk-3.0/assets/text-select-start-hover-dark@2.png has changed
Binary file gtk-3.0/assets/text-select-start-hover.png has changed
Binary file gtk-3.0/assets/text-select-start-hover@2.png has changed
Binary file gtk-3.0/assets/text-select-start.png has changed
Binary file gtk-3.0/assets/text-select-start@2.png has changed
--- a/gtk-3.0/gtk-contained-dark.css	Sat Jul 09 11:48:31 2016 +0100
+++ b/gtk-3.0/gtk-contained-dark.css	Sat Jul 09 15:25:37 2016 +0100
@@ -17,7 +17,7 @@
   -GtkWidget-focus-padding: 2;
   -GtkWidget-focus-line-width: 1;
   -GtkWidget-text-handle-width: 20;
-  -GtkWidget-text-handle-height: 20;
+  -GtkWidget-text-handle-height: 24;
   -GtkDialog-button-spacing: 4;
   -GtkDialog-action-area-border: 0;
   -GtkStatusbar-shadow-type: none;
@@ -73,20 +73,20 @@
   .view:selected, GtkCalendar:selected {
     border-radius: 3px; }
 
-.rubberband, .content-view.rubberband {
-  border: 1px solid #215d9c;
-  background-color: rgba(33, 93, 156, 0.2); }
+.rubberband, GtkTreeView.view.rubberband, .content-view.rubberband {
+  border: 1px solid #184472;
+  background-color: rgba(24, 68, 114, 0.2); }
 
-.label.separator, GtkPlacesSidebar.sidebar .view .label.separator {
+.label.separator {
   color: #eeeeec; }
-  .label.separator:backdrop, GtkPlacesSidebar.sidebar .view .label.separator:backdrop {
+  .label.separator:backdrop {
     color: #939695; }
 .label:insensitive {
   color: #939695; }
   .label:insensitive:backdrop {
     color: #5d6767; }
 
-.dim-label, .label.separator, GtkPlacesSidebar.sidebar .view .label.separator, .titlebar .subtitle,
+.dim-label, .label.separator, .titlebar .subtitle,
 .header-bar .subtitle {
   opacity: 0.55;
   text-shadow: none; }
@@ -120,7 +120,7 @@
     outline-offset: -2px; }
 
 .popover.osd, .app-notification,
-.app-notification.frame, .osd {
+.app-notification.frame, .osd .scale-popup, .osd {
   color: #eeeeec;
   border: none;
   background-color: rgba(32, 37, 38, 0.7);
@@ -129,7 +129,7 @@
   box-shadow: none;
   text-shadow: 0 1px black;
   icon-shadow: 0 1px black; }
-  .popover.osd:backdrop, .app-notification:backdrop, .osd:backdrop {
+  .popover.osd:backdrop, .app-notification:backdrop, .osd .scale-popup:backdrop, .osd:backdrop {
     text-shadow: none; }
 
 /*********************
@@ -158,10 +158,10 @@
   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, #212121, #292929 90%);
+  background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
   color: white;
   border-color: #1c1f1f;
-  box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(33, 93, 156, 0), 0 1px rgba(238, 238, 236, 0.1); }
+  box-shadow: inset 0 0 0 1px rgba(33, 93, 156, 0), 0 1px rgba(238, 238, 236, 0.1); }
   .entry.image.left {
     padding-left: 0; }
   .entry.image.right {
@@ -169,38 +169,38 @@
   .entry.flat, .entry.flat:focus {
     padding: 2px;
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #212121, #292929 90%);
+    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
     color: white;
     border-color: #1c1f1f;
-    box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(33, 93, 156, 0);
+    box-shadow: inset 0 0 0 1px rgba(33, 93, 156, 0);
     border: none;
     border-radius: 0; }
   .entry:focus {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #212121, #292929 90%);
-    box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(33, 93, 156, 0.7), 0 1px rgba(238, 238, 236, 0.1);
+    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+    box-shadow: inset 0 0 0 1px #215d9c, 0 1px rgba(238, 238, 236, 0.1);
     border-color: #0f2b48; }
   .entry:insensitive {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #212121, #292929 90%);
+    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
     color: #939695;
     border-color: #1c1f1f;
     background-image: linear-gradient(to bottom, #323636);
-    box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(238, 238, 236, 0.1); }
+    box-shadow: 0 1px rgba(238, 238, 236, 0.1); }
   .entry:backdrop {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #212121, #292929 90%);
+    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
     color: #d4d4d4;
     border-color: #1e2222;
     background-image: linear-gradient(to bottom, #2c2c2c);
-    box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(238, 238, 236, 0); }
+    box-shadow: 0 1px rgba(238, 238, 236, 0); }
   .entry:backdrop:insensitive {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #212121, #292929 90%);
+    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
     color: #5d6767;
     border-color: #1e2222;
     background-image: linear-gradient(to bottom, #323636);
-    box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(238, 238, 236, 0); }
+    box-shadow: 0 1px rgba(238, 238, 236, 0); }
   .entry.progressbar {
     margin: 1px;
     border-radius: 0;
@@ -212,36 +212,25 @@
     box-shadow: none; }
     .entry.progressbar:backdrop {
       background-color: transparent; }
-  .linked > .entry {
-    border-radius: 0; }
-    .linked > .entry:first-child {
-      border-top-left-radius: 3px;
-      border-bottom-left-radius: 3px; }
-      .linked > .entry:first-child:dir(rtl) {
-        border-right-style: none; }
-    .linked > .entry:last-child {
-      border-top-right-radius: 3px;
-      border-bottom-right-radius: 3px;
-      border-left-style: none; }
-      .linked > .entry:last-child:dir(rtl) {
-        border-left-style: solid; }
+  .linked:not(.vertical) > .entry:focus + .entry, .linked:not(.vertical) > .entry:focus + .button, .linked:not(.vertical) > .entry:focus + GtkComboBox > .the-button-in-the-combobox, .linked:not(.vertical) > .entry:focus + GtkComboBoxText > .the-button-in-the-combobox {
+    border-left-color: #0f2b48; }
   .entry.error {
     color: #cc0000;
-    border-color: #cc0000; }
+    border-color: #1a0000; }
     .entry.error:focus {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #212121, #292929 90%);
-      box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(204, 0, 0, 0.7), 0 1px rgba(238, 238, 236, 0.1);
+      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+      box-shadow: inset 0 0 0 1px #cc0000, 0 1px rgba(238, 238, 236, 0.1);
       border-color: #1a0000; }
     .entry.error:selected, .entry.error:selected:focus {
       background-color: #cc0000; }
   .entry.warning {
     color: #f57900;
-    border-color: #f57900; }
+    border-color: #432100; }
     .entry.warning:focus {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #212121, #292929 90%);
-      box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(245, 121, 0, 0.7), 0 1px rgba(238, 238, 236, 0.1);
+      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+      box-shadow: inset 0 0 0 1px #f57900, 0 1px rgba(238, 238, 236, 0.1);
       border-color: #432100; }
     .entry.warning:selected, .entry.warning:selected:focus {
       background-color: #f57900; }
@@ -253,114 +242,9 @@
       color: #215d9c; }
     .entry.image:backdrop {
       color: #7e8080; }
-  .linked.vertical > .entry {
-    background-color: transparent;
-    background-image: linear-gradient(to bottom, #212121, #292929 90%);
-    color: white;
-    border-color: #1c1f1f;
-    box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(33, 93, 156, 0);
-    background-image: linear-gradient(to bottom, #292929);
-    border-bottom-color: #252626;
-    box-shadow: none; }
-    .linked.vertical > .entry:focus {
-      border-color: #0f2b48;
-      box-shadow: inset 0 0 0 1px rgba(33, 93, 156, 0.7), 0 -1px 0 0 #0f2b48; }
-    .linked.vertical > .entry:insensitive {
-      background-color: transparent;
-      background-image: linear-gradient(to bottom, #212121, #292929 90%);
-      color: #939695;
-      border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #323636);
-      box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent;
-      border-bottom-color: #252626; }
-      .linked.vertical > .entry:insensitive:backdrop {
-        background-color: transparent;
-        background-image: linear-gradient(to bottom, #212121, #292929 90%);
-        color: #5d6767;
-        border-color: #1e2222;
-        background-image: linear-gradient(to bottom, #323636);
-        box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent;
-        border-bottom-color: #272929; }
-    .linked.vertical > .entry:backdrop {
-      background-color: transparent;
-      background-image: linear-gradient(to bottom, #212121, #292929 90%);
-      color: #d4d4d4;
-      border-color: #1e2222;
-      background-image: linear-gradient(to bottom, #2c2c2c);
-      box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent;
-      border-bottom-color: #272929; }
-    .linked.vertical > .entry:first-child {
-      background-color: transparent;
-      background-image: linear-gradient(to bottom, #212121, #292929 90%);
-      color: white;
-      border-color: #1c1f1f;
-      box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(33, 93, 156, 0);
-      border-bottom-color: #252626; }
-      .linked.vertical > .entry:first-child:focus {
-        background-color: transparent;
-        background-image: linear-gradient(to bottom, #212121, #292929 90%);
-        box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(33, 93, 156, 0.7);
-        border-color: #0f2b48; }
-      .linked.vertical > .entry:first-child:insensitive {
-        background-color: transparent;
-        background-image: linear-gradient(to bottom, #212121, #292929 90%);
-        color: #939695;
-        border-color: #1c1f1f;
-        background-image: linear-gradient(to bottom, #323636);
-        box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent;
-        border-bottom-color: #272929; }
-        .linked.vertical > .entry:first-child:insensitive:backdrop {
-          background-color: transparent;
-          background-image: linear-gradient(to bottom, #212121, #292929 90%);
-          color: #5d6767;
-          border-color: #1e2222;
-          background-image: linear-gradient(to bottom, #323636);
-          box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent;
-          border-bottom-color: #272929;
-          border-top-style: solid; }
-      .linked.vertical > .entry:first-child:backdrop {
-        background-color: transparent;
-        background-image: linear-gradient(to bottom, #212121, #292929 90%);
-        color: #d4d4d4;
-        border-color: #1e2222;
-        background-image: linear-gradient(to bottom, #2c2c2c);
-        box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent;
-        border-bottom-color: #272929; }
-    .linked.vertical > .entry:last-child {
-      background-color: transparent;
-      background-image: linear-gradient(to bottom, #212121, #292929 90%);
-      color: white;
-      border-color: #1c1f1f;
-      box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(33, 93, 156, 0), 0 1px rgba(238, 238, 236, 0.1);
-      background-image: linear-gradient(to bottom, #292929);
-      box-shadow: 0 1px rgba(238, 238, 236, 0.1); }
-      .linked.vertical > .entry:last-child:focus {
-        border-color: #0f2b48;
-        box-shadow: inset 0 0 0 1px rgba(33, 93, 156, 0.7), 0 -1px 0 0 #0f2b48, 0 1px rgba(238, 238, 236, 0.1); }
-      .linked.vertical > .entry:last-child:insensitive {
-        background-color: transparent;
-        background-image: linear-gradient(to bottom, #212121, #292929 90%);
-        color: #939695;
-        border-color: #1c1f1f;
-        background-image: linear-gradient(to bottom, #323636);
-        box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(238, 238, 236, 0.1); }
-        .linked.vertical > .entry:last-child:insensitive:backdrop {
-          background-color: transparent;
-          background-image: linear-gradient(to bottom, #212121, #292929 90%);
-          color: #5d6767;
-          border-color: #1e2222;
-          background-image: linear-gradient(to bottom, #323636);
-          box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(238, 238, 236, 0); }
-      .linked.vertical > .entry:last-child:backdrop {
-        background-color: transparent;
-        background-image: linear-gradient(to bottom, #212121, #292929 90%);
-        color: #d4d4d4;
-        border-color: #1e2222;
-        background-image: linear-gradient(to bottom, #2c2c2c);
-        box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(238, 238, 236, 0); }
   .osd .entry {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #212121, #292929 90%);
+    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
@@ -370,17 +254,17 @@
     icon-shadow: 0 1px black; }
     .osd .entry:focus {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #212121, #292929 90%);
+      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
       color: white;
       border-color: #215d9c;
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
       background-clip: padding-box;
-      box-shadow: inset 0 0 0 1px rgba(33, 93, 156, 0.7);
+      box-shadow: inset 0 0 0 1px #215d9c;
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black; }
     .osd .entry:backdrop {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #212121, #292929 90%);
+      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
@@ -390,7 +274,7 @@
       icon-shadow: none; }
     .osd .entry:insensitive {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #212121, #292929 90%);
+      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
       color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
@@ -399,6 +283,27 @@
       text-shadow: none;
       icon-shadow: none; }
 
+.linked.vertical > .entry:not(:last-child) {
+  box-shadow: none; }
+.linked.vertical > .entry:focus:not(:last-child) {
+  box-shadow: inset 0 0 0 1px #215d9c; }
+.linked.vertical > .entry:not(:insensitive) + .entry:not(:insensitive) {
+  border-top-color: #252626;
+  background-image: linear-gradient(to bottom, #292929); }
+  .linked.vertical > .entry:not(:insensitive) + .entry:not(:insensitive):backdrop {
+    border-top-color: #272929;
+    background-image: linear-gradient(to bottom, #2c2c2c); }
+.linked.vertical > .entry + .entry:focus:not(:last-child) {
+  border-top-color: #0f2b48;
+  box-shadow: inset 0 0 0 1px #215d9c; }
+.linked.vertical > .entry + .entry:focus:last-child {
+  border-top-color: #0f2b48; }
+.linked.vertical > .entry:focus:not(:only-child) + .entry,
+.linked.vertical > .entry:focus:not(:only-child) + .button,
+.linked.vertical > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+.linked.vertical > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox {
+  border-top-color: #0f2b48; }
+
 /***********
  * Buttons *
  ***********/
@@ -420,7 +325,7 @@
   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); }
-  .button.flat, .header-bar .titlebutton.button,
+  .button.flat, .sidebar-button.button, .header-bar .titlebutton.button,
   .titlebar .titlebutton.button {
     border-color: transparent;
     background-color: transparent;
@@ -429,11 +334,11 @@
     text-shadow: none;
     icon-shadow: none;
     transition: none; }
-    .button.flat:hover, .header-bar .titlebutton.button:hover,
+    .button.flat:hover, .sidebar-button.button:hover, .header-bar .titlebutton.button:hover,
     .titlebar .titlebutton.button:hover {
       transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
       transition-duration: 500ms; }
-      .button.flat:hover:active, .header-bar .titlebutton.button:hover:active,
+      .button.flat:hover:active, .sidebar-button.button:hover:active, .header-bar .titlebutton.button:hover:active,
       .titlebar .titlebutton.button:hover:active {
         transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
   .button:hover, .header-bar .button.titlebutton:hover,
@@ -458,7 +363,7 @@
     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);
     transition-duration: 50ms; }
   .button:backdrop, .header-bar .button.titlebutton:backdrop,
-  .titlebar .button.titlebutton:backdrop, .button.flat:backdrop, .header-bar .titlebutton.button: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;
@@ -467,14 +372,14 @@
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
     -gtk-image-effect: none; }
-    .button:backdrop:active, .button:backdrop:checked, .button.flat:backdrop:active, .header-bar .titlebutton.button:backdrop:active,
-    .titlebar .titlebutton.button:backdrop:active, .button.flat:backdrop:checked, .header-bar .titlebutton.button:backdrop:checked,
+    .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);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-    .button:backdrop:insensitive, .button.flat:backdrop:insensitive, .header-bar .titlebutton.button:backdrop:insensitive,
+    .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;
@@ -483,11 +388,11 @@
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
       .button:backdrop:insensitive > .label, .header-bar .button.titlebutton:backdrop:insensitive > .label,
-      .titlebar .button.titlebutton:backdrop:insensitive > .label, .button.flat:backdrop:insensitive > .label, .header-bar .titlebutton.button: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, .header-bar .titlebutton.button:backdrop:insensitive:active,
-    .titlebar .titlebutton.button:backdrop:insensitive:active, .button.flat:backdrop:insensitive:checked, .header-bar .titlebutton.button:backdrop:insensitive:checked,
+    .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;
@@ -495,13 +400,13 @@
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
       .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, .header-bar .titlebutton.button:backdrop:insensitive:active > .label,
-      .titlebar .titlebutton.button:backdrop:insensitive:active > .label, .button.flat:backdrop:insensitive:checked > .label, .header-bar .titlebutton.button: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; }
-  .button.flat:backdrop, .header-bar .titlebutton.button:backdrop,
-  .titlebar .titlebutton.button:backdrop, .button.flat:insensitive, .header-bar .titlebutton.button:insensitive,
-  .titlebar .titlebutton.button:insensitive, .button.flat:backdrop:insensitive, .header-bar .titlebutton.button:backdrop:insensitive,
+  .button.flat:backdrop, .sidebar-button.button:backdrop, .header-bar .titlebutton.button:backdrop,
+  .titlebar .titlebutton.button:backdrop, .button.flat:insensitive, .sidebar-button.button:insensitive, .header-bar .titlebutton.button:insensitive,
+  .titlebar .titlebutton.button:insensitive, .button.flat:backdrop:insensitive, .sidebar-button.button:backdrop:insensitive, .header-bar .titlebutton.button:backdrop:insensitive,
   .titlebar .titlebutton.button:backdrop:insensitive {
     border-color: transparent;
     background-color: transparent;
@@ -544,7 +449,8 @@
     outline-color: rgba(238, 238, 236, 0.3);
     border: none;
     box-shadow: none; }
-    .button.osd.image-button, .header-bar .osd.titlebutton.button,
+    .button.osd.image-button, GtkScaleButton.button.osd,
+    GtkVolumeButton.button.osd, .header-bar .osd.titlebutton.button,
     .titlebar .osd.titlebutton.button {
       padding: 13px; }
     .button.osd:hover {
@@ -648,7 +554,7 @@
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none; }
-    .osd .button.flat, .osd .header-bar .titlebutton.button, .header-bar .osd .titlebutton.button,
+    .osd .button.flat, .osd .sidebar-button.button, .osd .header-bar .titlebutton.button, .header-bar .osd .titlebutton.button,
     .osd .titlebar .titlebutton.button,
     .titlebar .osd .titlebutton.button {
       border-color: transparent;
@@ -660,7 +566,7 @@
       box-shadow: none;
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black; }
-      .osd .button.flat:hover, .osd .header-bar .titlebutton.button:hover, .header-bar .osd .titlebutton.button:hover,
+      .osd .button.flat:hover, .osd .sidebar-button.button:hover, .osd .header-bar .titlebutton.button:hover, .header-bar .osd .titlebutton.button:hover,
       .osd .titlebar .titlebutton.button:hover,
       .titlebar .osd .titlebutton.button:hover {
         color: white;
@@ -674,7 +580,7 @@
         background-clip: padding-box;
         border-color: transparent;
         box-shadow: none; }
-      .osd .button.flat:insensitive, .osd .header-bar .titlebutton.button:insensitive, .header-bar .osd .titlebutton.button:insensitive,
+      .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;
@@ -687,7 +593,7 @@
         background-image: none;
         border-color: transparent;
         box-shadow: none; }
-      .osd .button.flat:backdrop, .osd .header-bar .titlebutton.button:backdrop, .header-bar .osd .titlebutton.button:backdrop,
+      .osd .button.flat:backdrop, .osd .sidebar-button.button:backdrop, .osd .header-bar .titlebutton.button:backdrop, .header-bar .osd .titlebutton.button:backdrop,
       .osd .titlebar .titlebutton.button:backdrop,
       .titlebar .osd .titlebutton.button:backdrop {
         border-color: transparent;
@@ -696,9 +602,9 @@
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
         text-shadow: none;
         icon-shadow: none; }
-      .osd .button.flat:active, .osd .header-bar .titlebutton.button:active, .header-bar .osd .titlebutton.button:active,
+      .osd .button.flat:active, .osd .sidebar-button.button:active, .osd .header-bar .titlebutton.button:active, .header-bar .osd .titlebutton.button:active,
       .osd .titlebar .titlebutton.button:active,
-      .titlebar .osd .titlebutton.button:active, .osd .button.flat:checked, .osd .header-bar .titlebutton.button:checked, .header-bar .osd .titlebutton.button:checked,
+      .titlebar .osd .titlebutton.button:active, .osd .button.flat:checked, .osd .sidebar-button.button:checked, .osd .header-bar .titlebutton.button:checked, .header-bar .osd .titlebutton.button:checked,
       .osd .titlebar .titlebutton.button:checked,
       .titlebar .osd .titlebutton.button:checked {
         color: white;
@@ -721,7 +627,7 @@
     text-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
-    .button.suggested-action.flat, .header-bar .suggested-action.titlebutton.button,
+    .button.suggested-action.flat, .suggested-action.sidebar-button.button, .header-bar .suggested-action.titlebutton.button,
     .titlebar .suggested-action.titlebutton.button {
       border-color: transparent;
       background-color: transparent;
@@ -746,7 +652,7 @@
       text-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
       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), 0 1px rgba(238, 238, 236, 0.1); }
-    .button.suggested-action:backdrop, .button.suggested-action.flat:backdrop, .header-bar .suggested-action.titlebutton.button:backdrop,
+    .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;
       border-color: #0b1e33;
@@ -754,14 +660,14 @@
       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:active, .button.suggested-action:backdrop:checked, .button.suggested-action.flat:backdrop:active, .header-bar .suggested-action.titlebutton.button:backdrop:active,
-      .titlebar .suggested-action.titlebutton.button:backdrop:active, .button.suggested-action.flat:backdrop:checked, .header-bar .suggested-action.titlebutton.button:backdrop:checked,
+      .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;
         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, .header-bar .suggested-action.titlebutton.button:backdrop:insensitive,
+      .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;
@@ -770,11 +676,11 @@
         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, .header-bar .suggested-action.button.titlebutton:backdrop:insensitive > .label,
-        .titlebar .suggested-action.button.titlebutton:backdrop:insensitive > .label, .button.suggested-action.flat:backdrop:insensitive > .label, .header-bar .suggested-action.titlebutton.button: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, .header-bar .suggested-action.titlebutton.button:backdrop:insensitive:active,
-        .titlebar .suggested-action.titlebutton.button:backdrop:insensitive:active, .button.suggested-action.flat:backdrop:insensitive:checked, .header-bar .suggested-action.titlebutton.button:backdrop:insensitive:checked,
+        .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;
           border-color: #0b1e33;
@@ -782,13 +688,13 @@
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
           .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, .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, .header-bar .suggested-action.titlebutton.button: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; }
-    .button.suggested-action.flat:backdrop, .header-bar .suggested-action.titlebutton.button:backdrop,
-    .titlebar .suggested-action.titlebutton.button:backdrop, .button.suggested-action.flat:insensitive, .header-bar .suggested-action.titlebutton.button:insensitive,
-    .titlebar .suggested-action.titlebutton.button:insensitive, .button.suggested-action.flat:backdrop:insensitive, .header-bar .suggested-action.titlebutton.button:backdrop:insensitive,
+    .button.suggested-action.flat:backdrop, .suggested-action.sidebar-button.button:backdrop, .header-bar .suggested-action.titlebutton.button:backdrop,
+    .titlebar .suggested-action.titlebutton.button:backdrop, .button.suggested-action.flat:insensitive, .suggested-action.sidebar-button.button:insensitive, .header-bar .suggested-action.titlebutton.button:insensitive,
+    .titlebar .suggested-action.titlebutton.button: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 {
       border-color: transparent;
       background-color: transparent;
@@ -868,7 +774,7 @@
     text-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.3), 0 1px rgba(238, 238, 236, 0.1); }
-    .button.destructive-action.flat, .header-bar .destructive-action.titlebutton.button,
+    .button.destructive-action.flat, .destructive-action.sidebar-button.button, .header-bar .destructive-action.titlebutton.button,
     .titlebar .destructive-action.titlebutton.button {
       border-color: transparent;
       background-color: transparent;
@@ -893,7 +799,7 @@
       text-shadow: 0 -1px rgba(0, 0, 0, 0.72078);
       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), 0 1px rgba(238, 238, 236, 0.1); }
-    .button.destructive-action:backdrop, .button.destructive-action.flat:backdrop, .header-bar .destructive-action.titlebutton.button:backdrop,
+    .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;
       border-color: #5e0707;
@@ -901,14 +807,14 @@
       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:active, .button.destructive-action:backdrop:checked, .button.destructive-action.flat:backdrop:active, .header-bar .destructive-action.titlebutton.button:backdrop:active,
-      .titlebar .destructive-action.titlebutton.button:backdrop:active, .button.destructive-action.flat:backdrop:checked, .header-bar .destructive-action.titlebutton.button:backdrop:checked,
+      .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: #edcece;
         border-color: #5e0707;
         background-image: linear-gradient(to bottom, #a60c0c);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-      .button.destructive-action:backdrop:insensitive, .button.destructive-action.flat:backdrop:insensitive, .header-bar .destructive-action.titlebutton.button:backdrop:insensitive,
+      .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;
@@ -917,11 +823,11 @@
         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, .header-bar .destructive-action.button.titlebutton:backdrop:insensitive > .label,
-        .titlebar .destructive-action.button.titlebutton:backdrop:insensitive > .label, .button.destructive-action.flat:backdrop:insensitive > .label, .header-bar .destructive-action.titlebutton.button: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, .header-bar .destructive-action.titlebutton.button:backdrop:insensitive:active,
-        .titlebar .destructive-action.titlebutton.button:backdrop:insensitive:active, .button.destructive-action.flat:backdrop:insensitive:checked, .header-bar .destructive-action.titlebutton.button:backdrop:insensitive:checked,
+        .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;
           border-color: #5e0707;
@@ -929,13 +835,13 @@
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
           .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, .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, .header-bar .destructive-action.titlebutton.button: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; }
-    .button.destructive-action.flat:backdrop, .header-bar .destructive-action.titlebutton.button:backdrop,
-    .titlebar .destructive-action.titlebutton.button:backdrop, .button.destructive-action.flat:insensitive, .header-bar .destructive-action.titlebutton.button:insensitive,
-    .titlebar .destructive-action.titlebutton.button:insensitive, .button.destructive-action.flat:backdrop:insensitive, .header-bar .destructive-action.titlebutton.button:backdrop:insensitive,
+    .button.destructive-action.flat:backdrop, .destructive-action.sidebar-button.button:backdrop, .header-bar .destructive-action.titlebutton.button:backdrop,
+    .titlebar .destructive-action.titlebutton.button:backdrop, .button.destructive-action.flat:insensitive, .destructive-action.sidebar-button.button:insensitive, .header-bar .destructive-action.titlebutton.button:insensitive,
+    .titlebar .destructive-action.titlebutton.button: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 {
       border-color: transparent;
       background-color: transparent;
@@ -1006,20 +912,25 @@
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none; }
-  .button.image-button, .header-bar .titlebutton.button,
+  .button.image-button, GtkScaleButton.button,
+  GtkVolumeButton.button, .header-bar .titlebutton.button,
   .titlebar .titlebutton.button {
     padding: 8px; }
-  .button.text-button, .header-bar .text-button.button.titlebutton,
+  .button.text-button, GtkScaleButton.button.text-button,
+  GtkVolumeButton.button.text-button, .header-bar .text-button.button.titlebutton,
   .titlebar .text-button.button.titlebutton {
     padding-left: 16px;
     padding-right: 16px; }
-  .button.text-button.image-button, .header-bar .text-button.titlebutton.button,
+  .button.text-button.image-button, GtkScaleButton.button.text-button,
+  GtkVolumeButton.button.text-button, .header-bar .text-button.titlebutton.button,
   .titlebar .text-button.titlebutton.button {
     padding: 5px 8px 6px; }
-    .button.text-button.image-button .label:first-child, .header-bar .text-button.titlebutton.button .label:first-child,
+    .button.text-button.image-button .label:first-child, GtkScaleButton.button.text-button .label:first-child,
+    GtkVolumeButton.button.text-button .label:first-child, .header-bar .text-button.titlebutton.button .label:first-child,
     .titlebar .text-button.titlebutton.button .label:first-child {
       padding-left: 8px; }
-    .button.text-button.image-button .label:last-child, .header-bar .text-button.titlebutton.button .label:last-child,
+    .button.text-button.image-button .label:last-child, GtkScaleButton.button.text-button .label:last-child,
+    GtkVolumeButton.button.text-button .label:last-child, .header-bar .text-button.titlebutton.button .label:last-child,
     .titlebar .text-button.titlebutton.button .label:last-child {
       padding-right: 8px; }
   .stack-switcher > .button, .header-bar .stack-switcher > .button.titlebutton,
@@ -1037,7 +948,8 @@
     .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, .header-bar .stack-switcher > .titlebutton.button,
+    .stack-switcher > .button.image-button, .stack-switcher > GtkScaleButton.button,
+    .stack-switcher > GtkVolumeButton.button, .header-bar .stack-switcher > .titlebutton.button,
     .titlebar .stack-switcher > .titlebutton.button {
       padding: 5px 2px; }
     .stack-switcher > .button.needs-attention:active > .label, .stack-switcher > .button.needs-attention:active > GtkImage, .stack-switcher > .button.needs-attention:checked > .label, .stack-switcher > .button.needs-attention:checked > GtkImage {
@@ -1147,157 +1059,140 @@
     .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active > .label, .inline-toolbar GtkToolButton > .button:backdrop:insensitive:checked > .label {
       color: inherit; }
 
-.inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.search-bar GtkToolButton > .button.flat, .inline-toolbar.location-bar GtkToolButton > .button.flat, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton > .button.titlebutton,
+.inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.search-bar GtkToolButton > .button.flat, .inline-toolbar.location-bar GtkToolButton > .button.flat, .inline-toolbar.toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton > .sidebar-button.button, .inline-toolbar.location-bar GtkToolButton > .sidebar-button.button, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton > .button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton > .button.titlebutton,
 .titlebar .inline-toolbar GtkToolButton > .button.titlebutton,
 .inline-toolbar.toolbar GtkToolButton:backdrop > .button.flat,
 .inline-toolbar GtkToolButton:backdrop > .button.flat,
 .inline-toolbar.search-bar GtkToolButton:backdrop > .button.flat,
 .inline-toolbar.location-bar GtkToolButton:backdrop > .button.flat,
+.inline-toolbar.toolbar GtkToolButton:backdrop > .sidebar-button.button,
+.inline-toolbar GtkToolButton:backdrop > .sidebar-button.button,
+.inline-toolbar.search-bar GtkToolButton:backdrop > .sidebar-button.button,
+.inline-toolbar.location-bar GtkToolButton:backdrop > .sidebar-button.button,
 .inline-toolbar .header-bar GtkToolButton:backdrop > .button.titlebutton,
 .header-bar .inline-toolbar GtkToolButton:backdrop > .button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:backdrop > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:backdrop > .button.titlebutton, .osd .button:hover, .osd .button:active, .osd .button:checked, .osd .button:backdrop:active, .osd .button:backdrop:checked, .osd .button:insensitive, .osd .button:backdrop:insensitive, .osd .button:backdrop, .osd .button.suggested-action, .osd .button.suggested-action:hover, .osd .button.suggested-action:active, .osd .button.suggested-action:checked, .osd .button.suggested-action:backdrop:active, .osd .button.suggested-action:backdrop:checked, .osd .button.suggested-action:insensitive, .osd .button.suggested-action:backdrop:insensitive, .osd .button.suggested-action:backdrop, .osd .button.destructive-action, .osd .button.destructive-action:hover, .osd .button.destructive-action:active, .osd .button.destructive-action:checked, .osd .button.destructive-action:backdrop:active, .osd .button.destructive-action:backdrop:checked, .osd .button.destructive-action:insensitive, .osd .button.destructive-action:backdrop:insensitive, .osd .button.destructive-action:backdrop, .inline-toolbar .button, .inline-toolbar .header-bar .button.titlebutton, .header-bar .inline-toolbar .button.titlebutton,
+.titlebar .inline-toolbar GtkToolButton:backdrop > .button.titlebutton, .linked:not(.vertical) > .entry, .osd .button:hover, .osd .button:active, .osd .button:checked, .osd .button:backdrop:active, .osd .button:backdrop:checked, .osd .button:insensitive, .osd .button:backdrop:insensitive, .osd .button:backdrop, .osd .button.suggested-action, .osd .button.suggested-action:hover, .osd .button.suggested-action:active, .osd .button.suggested-action:checked, .osd .button.suggested-action:backdrop:active, .osd .button.suggested-action:backdrop:checked, .osd .button.suggested-action:insensitive, .osd .button.suggested-action:backdrop:insensitive, .osd .button.suggested-action:backdrop, .osd .button.destructive-action, .osd .button.destructive-action:hover, .osd .button.destructive-action:active, .osd .button.destructive-action:checked, .osd .button.destructive-action:backdrop:active, .osd .button.destructive-action:backdrop:checked, .osd .button.destructive-action:insensitive, .osd .button.destructive-action:backdrop:insensitive, .osd .button.destructive-action:backdrop, .inline-toolbar .button, .inline-toolbar .header-bar .button.titlebutton, .header-bar .inline-toolbar .button.titlebutton,
 .inline-toolbar .titlebar .button.titlebutton,
 .titlebar .inline-toolbar .button.titlebutton, .inline-toolbar .button:backdrop, .linked > .button, .header-bar .linked > .button.titlebutton,
-.titlebar .linked > .button.titlebutton, .linked > .button:hover, .linked > .button:active, .linked > .button:checked, .linked > .button:backdrop, GtkComboBox.combobox-entry .entry, GtkComboBox.combobox-entry .button, GtkComboBox.combobox-entry .header-bar .button.titlebutton, .header-bar GtkComboBox.combobox-entry .button.titlebutton,
-GtkComboBox.combobox-entry .titlebar .button.titlebutton,
-.titlebar GtkComboBox.combobox-entry .button.titlebutton, GtkComboBox.combobox-entry .button:backdrop, .linked > GtkComboBox > .button:dir(ltr) {
+.titlebar .linked > .button.titlebutton, .linked > .button:hover, .linked > .button:active, .linked > .button:checked, .linked > .button:backdrop, .linked > GtkComboBox > .the-button-in-the-combobox:dir(ltr), .linked > GtkComboBox > .the-button-in-the-combobox:dir(rtl),
+.linked > GtkComboBoxText > .the-button-in-the-combobox:dir(ltr),
+.linked > GtkComboBoxText > .the-button-in-the-combobox:dir(rtl) {
   border-radius: 0;
-  border-left-style: none; }
-  .inline-toolbar GtkToolButton > .button.flat:dir(rtl), .inline-toolbar .header-bar GtkToolButton > .button.titlebutton:dir(rtl), .header-bar .inline-toolbar GtkToolButton > .button.titlebutton:dir(rtl),
-  .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:dir(rtl),
-  .titlebar .inline-toolbar GtkToolButton > .button.titlebutton:dir(rtl),
-  .inline-toolbar GtkToolButton:backdrop > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar.search-bar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar.location-bar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar .header-bar GtkToolButton:dir(rtl) > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:dir(rtl) > .button.titlebutton,
-  .inline-toolbar .titlebar GtkToolButton:dir(rtl) > .button.titlebutton,
-  .titlebar .inline-toolbar GtkToolButton:dir(rtl) > .button.titlebutton,
-  .inline-toolbar.toolbar GtkToolButton:backdrop:dir(rtl) > .button.flat,
-  .inline-toolbar GtkToolButton:backdrop:dir(rtl) > .button.flat,
-  .inline-toolbar.search-bar GtkToolButton:backdrop:dir(rtl) > .button.flat,
-  .inline-toolbar.location-bar GtkToolButton:backdrop:dir(rtl) > .button.flat,
-  .inline-toolbar .header-bar GtkToolButton:backdrop:dir(rtl) > .button.titlebutton,
-  .header-bar .inline-toolbar GtkToolButton:backdrop:dir(rtl) > .button.titlebutton,
-  .inline-toolbar .titlebar GtkToolButton:backdrop:dir(rtl) > .button.titlebutton,
-  .titlebar .inline-toolbar GtkToolButton:backdrop:dir(rtl) > .button.titlebutton, .osd .button:dir(rtl):hover, .osd .button:dir(rtl):active, .osd .button:dir(rtl):checked, .osd .button:dir(rtl):insensitive, .osd .button:dir(rtl):backdrop, .osd .button.suggested-action:dir(rtl), .osd .button.destructive-action:dir(rtl), .inline-toolbar .button:dir(rtl), .linked > .button:dir(rtl), .header-bar .linked > .button.titlebutton:dir(rtl),
-  .titlebar .linked > .button.titlebutton:dir(rtl), GtkComboBox.combobox-entry .entry:dir(rtl), GtkComboBox.combobox-entry .button:dir(rtl), .linked > GtkComboBox > .button:dir(rtl) {
-    border-radius: 0;
-    border-right-style: none;
-    border-left-style: solid; }
+  border-right-style: none; }
 
-.osd .button:first-child:hover, .osd .button:first-child:active, .osd .button:first-child:checked, .osd .button:first-child:insensitive, .osd .button:first-child:backdrop, .osd .button.suggested-action:first-child, .osd .button.destructive-action: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 .header-bar GtkToolButton:first-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:first-child > .button.titlebutton,
+.linked:not(.vertical) > .entry:first-child, .osd .button:first-child:hover, .osd .button:first-child:active, .osd .button:first-child:checked, .osd .button:first-child:insensitive, .osd .button:first-child:backdrop, .osd .button.suggested-action:first-child, .osd .button.destructive-action: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,
 .inline-toolbar GtkToolButton:backdrop:first-child > .button.flat,
 .inline-toolbar.search-bar GtkToolButton:backdrop:first-child > .button.flat,
 .inline-toolbar.location-bar GtkToolButton:backdrop:first-child > .button.flat,
+.inline-toolbar.toolbar GtkToolButton:backdrop:first-child > .sidebar-button.button,
+.inline-toolbar GtkToolButton:backdrop:first-child > .sidebar-button.button,
+.inline-toolbar.search-bar GtkToolButton:backdrop:first-child > .sidebar-button.button,
+.inline-toolbar.location-bar GtkToolButton:backdrop:first-child > .sidebar-button.button,
 .inline-toolbar .header-bar GtkToolButton:backdrop:first-child > .button.titlebutton,
 .header-bar .inline-toolbar GtkToolButton:backdrop:first-child > .button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:backdrop:first-child > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:backdrop:first-child > .button.titlebutton, GtkComboBox.combobox-entry .entry:first-child, GtkComboBox.combobox-entry .button:first-child, .linked > GtkComboBox:first-child > .button {
-  border-radius: 3px 0 0 3px;
-  border-left-style: solid; }
-.osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .osd .button:last-child:backdrop, .osd .button.suggested-action:last-child, .osd .button.destructive-action: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 .header-bar GtkToolButton:last-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:last-child > .button.titlebutton,
+.titlebar .inline-toolbar GtkToolButton:backdrop:first-child > .button.titlebutton, .linked > GtkComboBox:first-child > .the-button-in-the-combobox,
+.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, .osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .osd .button:last-child:backdrop, .osd .button.suggested-action:last-child, .osd .button.destructive-action: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,
 .inline-toolbar GtkToolButton:backdrop:last-child > .button.flat,
 .inline-toolbar.search-bar GtkToolButton:backdrop:last-child > .button.flat,
 .inline-toolbar.location-bar GtkToolButton:backdrop:last-child > .button.flat,
+.inline-toolbar.toolbar GtkToolButton:backdrop:last-child > .sidebar-button.button,
+.inline-toolbar GtkToolButton:backdrop:last-child > .sidebar-button.button,
+.inline-toolbar.search-bar GtkToolButton:backdrop:last-child > .sidebar-button.button,
+.inline-toolbar.location-bar GtkToolButton:backdrop:last-child > .sidebar-button.button,
 .inline-toolbar .header-bar GtkToolButton:backdrop:last-child > .button.titlebutton,
 .header-bar .inline-toolbar GtkToolButton:backdrop:last-child > .button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:backdrop:last-child > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:backdrop:last-child > .button.titlebutton, GtkComboBox.combobox-entry .entry:last-child, GtkComboBox.combobox-entry .button:last-child, .linked > GtkComboBox:last-child > .button {
-  border-radius: 0 3px 3px 0; }
-  .osd .button:last-child:dir(rtl):hover, .osd .button:last-child:dir(rtl):active, .osd .button:last-child:dir(rtl):checked, .osd .button:last-child:dir(rtl):insensitive, .osd .button:last-child:dir(rtl):backdrop, .osd .button.suggested-action:last-child:dir(rtl), .osd .button.destructive-action:last-child:dir(rtl), .inline-toolbar .button:last-child:dir(rtl), .linked > .button:last-child:dir(rtl), .header-bar .linked > .button.titlebutton:last-child:dir(rtl),
-  .titlebar .linked > .button.titlebutton:last-child:dir(rtl), .inline-toolbar GtkToolButton:last-child > .button.flat:dir(rtl), .inline-toolbar .header-bar GtkToolButton:last-child > .button.titlebutton:dir(rtl), .header-bar .inline-toolbar GtkToolButton:last-child > .button.titlebutton:dir(rtl),
-  .inline-toolbar .titlebar GtkToolButton:last-child > .button.titlebutton:dir(rtl),
-  .titlebar .inline-toolbar GtkToolButton:last-child > .button.titlebutton:dir(rtl),
-  .inline-toolbar GtkToolButton:backdrop:last-child > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.search-bar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.location-bar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar .header-bar GtkToolButton:last-child:dir(rtl) > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.titlebutton,
-  .inline-toolbar .titlebar GtkToolButton:last-child:dir(rtl) > .button.titlebutton,
-  .titlebar .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.titlebutton,
-  .inline-toolbar.toolbar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat,
-  .inline-toolbar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat,
-  .inline-toolbar.search-bar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat,
-  .inline-toolbar.location-bar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat,
-  .inline-toolbar .header-bar GtkToolButton:backdrop:last-child:dir(rtl) > .button.titlebutton,
-  .header-bar .inline-toolbar GtkToolButton:backdrop:last-child:dir(rtl) > .button.titlebutton,
-  .inline-toolbar .titlebar GtkToolButton:backdrop:last-child:dir(rtl) > .button.titlebutton,
-  .titlebar .inline-toolbar GtkToolButton:backdrop:last-child:dir(rtl) > .button.titlebutton, GtkComboBox.combobox-entry .entry:last-child:dir(rtl), GtkComboBox.combobox-entry .button:last-child:dir(rtl), .linked > GtkComboBox:last-child > .button:dir(rtl) {
-    border-right-style: solid; }
-.osd .button:only-child:hover, .osd .button:only-child:active, .osd .button:only-child:checked, .osd .button:only-child:insensitive, .osd .button:only-child:backdrop, .osd .button.suggested-action:only-child, .osd .button.destructive-action: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 .header-bar GtkToolButton:only-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:only-child > .button.titlebutton,
+.titlebar .inline-toolbar GtkToolButton:backdrop:last-child > .button.titlebutton, .linked > GtkComboBox:last-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:last-child > .the-button-in-the-combobox {
+  border-top-right-radius: 3px;
+  border-bottom-right-radius: 3px;
+  border-right-style: solid; }
+.linked:not(.vertical) > .entry:only-child, .osd .button:only-child:hover, .osd .button:only-child:active, .osd .button:only-child:checked, .osd .button:only-child:insensitive, .osd .button:only-child:backdrop, .osd .button.suggested-action:only-child, .osd .button.destructive-action: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,
 .inline-toolbar GtkToolButton:backdrop:only-child > .button.flat,
 .inline-toolbar.search-bar GtkToolButton:backdrop:only-child > .button.flat,
 .inline-toolbar.location-bar GtkToolButton:backdrop:only-child > .button.flat,
+.inline-toolbar.toolbar GtkToolButton:backdrop:only-child > .sidebar-button.button,
+.inline-toolbar GtkToolButton:backdrop:only-child > .sidebar-button.button,
+.inline-toolbar.search-bar GtkToolButton:backdrop:only-child > .sidebar-button.button,
+.inline-toolbar.location-bar GtkToolButton:backdrop:only-child > .sidebar-button.button,
 .inline-toolbar .header-bar GtkToolButton:backdrop:only-child > .button.titlebutton,
 .header-bar .inline-toolbar GtkToolButton:backdrop:only-child > .button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:backdrop:only-child > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:backdrop:only-child > .button.titlebutton, GtkComboBox.combobox-entry .entry:only-child, GtkComboBox.combobox-entry .button:only-child, .linked > GtkComboBox:only-child > .button {
+.titlebar .inline-toolbar GtkToolButton:backdrop:only-child > .button.titlebutton, .linked > GtkComboBox:only-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:only-child > .the-button-in-the-combobox {
   border-radius: 3px;
   border-style: solid; }
 
-.linked.vertical > .entry, .linked.vertical > .entry:focus, .linked.vertical > .entry:insensitive, .linked.vertical > .entry:insensitive:backdrop, .linked.vertical > .entry:backdrop, .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 > .button,
-.linked.vertical > GtkComboBox > .button {
-  border-left-style: solid;
-  border-top-style: none;
+.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, .header-bar .linked.vertical > .button.titlebutton:first-child,
-.titlebar .linked.vertical > .button.titlebutton:first-child, .linked.vertical > GtkComboBoxText:first-child > .button,
-.linked.vertical > GtkComboBox:first-child > .button {
-  border-style: solid;
-  border-radius: 3px 3px 0 0; }
+.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, .header-bar .linked.vertical > .button.titlebutton:last-child,
-.titlebar .linked.vertical > .button.titlebutton:last-child, .linked.vertical > GtkComboBoxText:last-child > .button,
-.linked.vertical > GtkComboBox:last-child > .button {
-  border-radius: 0 0 3px 3px; }
+.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, .header-bar .linked.vertical > .button.titlebutton:only-child,
-.titlebar .linked.vertical > .button.titlebutton:only-child, .linked.vertical > GtkComboBoxText:only-child > .button,
-.linked.vertical > GtkComboBox:only-child > .button {
+.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; }
 
-.menuitem.button.flat, .header-bar .menuitem.titlebutton.button,
-.titlebar .menuitem.titlebutton.button, .menuitem.button.flat:backdrop, .menuitem.button.flat:backdrop:hover, .header-bar .menuitem.titlebutton.button:backdrop:hover,
+.menuitem.button.flat, .menuitem.sidebar-button.button, .header-bar .menuitem.titlebutton.button,
+.titlebar .menuitem.titlebutton.button, .menuitem.button.flat:backdrop, .menuitem.sidebar-button.button:backdrop, .menuitem.button.flat:backdrop:hover, .menuitem.sidebar-button.button:backdrop:hover, .header-bar .menuitem.titlebutton.button:backdrop:hover,
 .titlebar .menuitem.titlebutton.button:backdrop:hover, .button:link, .header-bar .button.titlebutton:link,
 .titlebar .button.titlebutton:link, .button:visited, .header-bar .button.titlebutton:visited,
 .titlebar .button.titlebutton:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .button:link:backdrop, .button:visited:backdrop, .menu.button, .header-bar .menu.button.titlebutton,
 .titlebar .menu.button.titlebutton, .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, .list-row.button, .header-bar .list-row.button.titlebutton,
-.titlebar .list-row.button.titlebutton,
-.list-row.button:backdrop,
-.list-row.button:backdrop:active,
-.list-row.button:backdrop:checked,
-.list-row.button:backdrop:insensitive,
-.list-row.button:backdrop:insensitive:active,
-.list-row.button:backdrop:insensitive:checked,
-.list-row.button:insensitive:active,
-.list-row.button:insensitive:checked, .app-notification .button.flat, .app-notification .header-bar .titlebutton.button, .header-bar .app-notification .titlebutton.button,
+.titlebar .notebook tab .button.titlebutton, .app-notification .button.flat, .app-notification .sidebar-button.button, .app-notification .header-bar .titlebutton.button, .header-bar .app-notification .titlebutton.button,
 .app-notification .titlebar .titlebutton.button,
 .titlebar .app-notification .titlebutton.button,
-.app-notification.frame .button.flat, .app-notification .button.flat:backdrop, .app-notification .button.flat:insensitive, .app-notification .button.flat:backdrop:insensitive, .app-notification .header-bar .titlebutton.button:backdrop:insensitive, .header-bar .app-notification .titlebutton.button:backdrop:insensitive,
+.app-notification.frame .button.flat,
+.app-notification.frame .sidebar-button.button, .app-notification .button.flat:backdrop, .app-notification .sidebar-button.button:backdrop, .app-notification .button.flat:insensitive, .app-notification .sidebar-button.button:insensitive, .app-notification .button.flat:backdrop:insensitive, .app-notification .sidebar-button.button:backdrop:insensitive, .app-notification .header-bar .titlebutton.button:backdrop:insensitive, .header-bar .app-notification .titlebutton.button:backdrop:insensitive,
 .app-notification .titlebar .titlebutton.button:backdrop:insensitive,
 .titlebar .app-notification .titlebutton.button:backdrop:insensitive,
 .app-notification.frame .button.flat:backdrop,
+.app-notification.frame .sidebar-button.button:backdrop,
 .app-notification.frame .header-bar .button.titlebutton:backdrop,
 .header-bar .app-notification.frame .button.titlebutton:backdrop,
 .app-notification.frame .titlebar .button.titlebutton:backdrop,
 .titlebar .app-notification.frame .button.titlebutton:backdrop,
 .app-notification.frame .button.flat:insensitive,
+.app-notification.frame .sidebar-button.button:insensitive,
 .app-notification.frame .header-bar .button.titlebutton:insensitive,
 .header-bar .app-notification.frame .button.titlebutton:insensitive,
 .app-notification.frame .titlebar .button.titlebutton:insensitive,
 .titlebar .app-notification.frame .button.titlebutton:insensitive,
-.app-notification.frame .button.flat:backdrop:insensitive, GtkCalendar.button, .header-bar GtkCalendar.button.titlebutton,
-.titlebar GtkCalendar.button.titlebutton, GtkCalendar.button:hover, GtkCalendar.button:backdrop, .scale-popup .button:hover, .scale-popup .button:backdrop, .scale-popup .button:backdrop:hover, .scale-popup .button:backdrop:insensitive {
+.app-notification.frame .button.flat:backdrop:insensitive,
+.app-notification.frame .sidebar-button.button:backdrop:insensitive, GtkCalendar.button, .header-bar GtkCalendar.button.titlebutton,
+.titlebar GtkCalendar.button.titlebutton, GtkCalendar.button:hover, GtkCalendar.button:backdrop, GtkCalendar.button:insensitive, .scale-popup .button:hover, .scale-popup .button:backdrop, .scale-popup .button:backdrop:hover, .scale-popup .button:backdrop:insensitive {
   border-color: transparent;
   background-color: transparent;
   background-image: none;
@@ -1306,10 +1201,10 @@
   icon-shadow: none; }
 
 /* menu buttons */
-.menuitem.button.flat, .header-bar .menuitem.titlebutton.button,
+.menuitem.button.flat, .menuitem.sidebar-button.button, .header-bar .menuitem.titlebutton.button,
 .titlebar .menuitem.titlebutton.button {
   outline-offset: -1px; }
-  .menuitem.button.flat:hover, .header-bar .menuitem.titlebutton.button:hover,
+  .menuitem.button.flat:hover, .menuitem.sidebar-button.button:hover, .header-bar .menuitem.titlebutton.button:hover,
   .titlebar .menuitem.titlebutton.button:hover {
     background-color: #4b5050; }
 
@@ -1355,6 +1250,10 @@
   text-shadow: none; }
   .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked {
     text-shadow: none; }
+  .button:link > .label, .header-bar .button.titlebutton:link > .label,
+  .titlebar .button.titlebutton:link > .label, .button:visited > .label, .header-bar .button.titlebutton:visited > .label,
+  .titlebar .button.titlebutton:visited > .label {
+    text-decoration-line: underline; }
 
 /*****************
  * GtkSpinButton *
@@ -1562,11 +1461,9 @@
 GtkComboBox {
   -GtkComboBox-arrow-scaling: 0.5;
   -GtkComboBox-shadow-type: none;
-  box-shadow: 0 1px rgba(238, 238, 236, 0.1);
   text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
   icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176); }
-  GtkComboBox > .button, .header-bar GtkComboBox > .button.titlebutton,
-  .titlebar GtkComboBox > .button.titlebutton {
+  GtkComboBox > .the-button-in-the-combobox {
     padding-top: 3px;
     padding-bottom: 4px; }
   GtkComboBox:insensitive {
@@ -1581,8 +1478,22 @@
     color: #5d6767; }
   GtkComboBox .menuitem {
     text-shadow: none; }
-  GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .view .vertical.separator, GtkPlacesSidebar.sidebar .view GtkComboBox .vertical.separator {
+  GtkComboBox .separator.vertical {
     -GtkWidget-wide-separators: true; }
+  GtkComboBox.combobox-entry .entry:dir(ltr) {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0; }
+  GtkComboBox.combobox-entry .entry:dir(rtl) {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0; }
+  GtkComboBox.combobox-entry .button:dir(ltr) {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+    border-left-style: none; }
+  GtkComboBox.combobox-entry .button:dir(rtl) {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+    border-right-style: none; }
 
 /************
  * Toolbars *
@@ -1646,10 +1557,8 @@
     padding-left: 12px;
     padding-right: 12px; }
   .titlebar .header-bar-separator, .titlebar > GtkBox > .separator.vertical,
-  GtkPlacesSidebar.sidebar .view .titlebar > GtkBox > .vertical.separator:backdrop,
   .header-bar .header-bar-separator,
-  .header-bar > GtkBox > .separator.vertical,
-  GtkPlacesSidebar.sidebar .view .header-bar > GtkBox > .vertical.separator:backdrop {
+  .header-bar > GtkBox > .separator.vertical {
     -GtkWidget-wide-separators: true;
     -GtkWidget-separator-width: 1px;
     border-width: 0 1px;
@@ -1678,9 +1587,10 @@
       text-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(43, 100, 160, 0.55); }
-      .titlebar.selection-mode .button.flat,
+      .titlebar.selection-mode .button.flat, .titlebar.selection-mode .sidebar-button.button,
       .titlebar.selection-mode .titlebutton.button,
       .header-bar.selection-mode .button.flat,
+      .header-bar.selection-mode .sidebar-button.button,
       .header-bar.selection-mode .titlebutton.button {
         border-color: transparent;
         background-color: transparent;
@@ -1707,10 +1617,11 @@
         text-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
         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), 0 1px rgba(43, 100, 160, 0.55); }
-      .titlebar.selection-mode .button:backdrop, .titlebar.selection-mode .button.flat:backdrop,
+      .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: #d2deeb;
         border-color: #0b1e33;
@@ -1720,24 +1631,27 @@
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0);
         -gtk-image-effect: none;
         border-color: #0f2b48; }
-        .titlebar.selection-mode .button:backdrop:active, .titlebar.selection-mode .button:backdrop:checked, .titlebar.selection-mode .button.flat:backdrop:active,
-        .titlebar.selection-mode .titlebutton.button:backdrop:active, .titlebar.selection-mode .button.flat:backdrop:checked,
+        .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,
+        .titlebar.selection-mode .titlebutton.button:backdrop:active, .titlebar.selection-mode .button.flat:backdrop:checked, .titlebar.selection-mode .sidebar-button.button:backdrop:checked,
         .titlebar.selection-mode .titlebutton.button:backdrop:checked,
         .header-bar.selection-mode .button:backdrop:active,
         .header-bar.selection-mode .button:backdrop:checked,
         .header-bar.selection-mode .button.flat:backdrop:active,
+        .header-bar.selection-mode .sidebar-button.button:backdrop:active,
         .header-bar.selection-mode .titlebutton.button:backdrop:active,
         .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;
           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);
           border-color: #0f2b48; }
-        .titlebar.selection-mode .button:backdrop:insensitive, .titlebar.selection-mode .button.flat:backdrop:insensitive,
+        .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,
         .header-bar.selection-mode .button:backdrop:insensitive,
         .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;
           border-color: #0b1e33;
@@ -1746,51 +1660,59 @@
           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 .header-bar .button.titlebutton:backdrop:insensitive > .label, .titlebar.selection-mode .button.flat:backdrop:insensitive > .label, .titlebar.selection-mode .header-bar .titlebutton.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 .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 .titlebutton.button:backdrop:insensitive:active, .titlebar.selection-mode .button.flat:backdrop:insensitive:checked,
+        .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,
         .titlebar.selection-mode .titlebutton.button:backdrop:insensitive:checked,
         .header-bar.selection-mode .button:backdrop:insensitive:active,
         .header-bar.selection-mode .button:backdrop:insensitive:checked,
         .header-bar.selection-mode .button.flat:backdrop:insensitive:active,
+        .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive:active,
         .header-bar.selection-mode .titlebutton.button:backdrop:insensitive:active,
         .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;
           border-color: #0b1e33;
           background-image: linear-gradient(to bottom, #1d4876);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0);
           border-color: #0f2b48; }
-          .titlebar.selection-mode .button:backdrop:insensitive:active > .label, .titlebar.selection-mode .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 .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 .header-bar .titlebutton.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 .titlebar .titlebutton.button:backdrop:insensitive:checked > .label {
             color: inherit; }
-      .titlebar.selection-mode .button.flat:backdrop,
-      .titlebar.selection-mode .titlebutton.button:backdrop, .titlebar.selection-mode .button.flat:insensitive,
-      .titlebar.selection-mode .titlebutton.button:insensitive, .titlebar.selection-mode .button.flat:insensitive:backdrop,
+      .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,
+      .titlebar.selection-mode .titlebutton.button:insensitive, .titlebar.selection-mode .button.flat:insensitive:backdrop, .titlebar.selection-mode .sidebar-button.button:insensitive:backdrop,
       .titlebar.selection-mode .titlebutton.button:insensitive:backdrop,
       .header-bar.selection-mode .button.flat:backdrop,
+      .header-bar.selection-mode .sidebar-button.button:backdrop,
       .header-bar.selection-mode .titlebutton.button:backdrop,
       .header-bar.selection-mode .button.flat:insensitive,
+      .header-bar.selection-mode .sidebar-button.button:insensitive,
       .header-bar.selection-mode .titlebutton.button:insensitive,
       .header-bar.selection-mode .button.flat:insensitive:backdrop,
+      .header-bar.selection-mode .sidebar-button.button:insensitive:backdrop,
       .header-bar.selection-mode .titlebutton.button:insensitive:backdrop {
         border-color: transparent;
         background-color: transparent;
@@ -2093,10 +2015,12 @@
 .menu {
   margin: 4px;
   padding: 0px;
-  background-color: #292929;
+  background-color: #2c2d2d;
   border: 1px solid #1c1f1f; }
   .csd .menu {
     border: none; }
+  .menu:backdrop {
+    background-color: #2e2f2f; }
   .menu .menuitem {
     text-shadow: none;
     padding: 4px; }
@@ -2109,7 +2033,7 @@
         color: #5d6767; }
     .menu .menuitem:backdrop, .menu .menuitem:backdrop:hover {
       color: #939695;
-      background-color: #2c2c2c; }
+      background-color: transparent; }
     .menu .menuitem.arrow {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
     .menu .menuitem.arrow:dir(rtl) {
@@ -2151,10 +2075,11 @@
   .popover > .location-bar, .popover.osd > .toolbar, .popover.osd > .inline-toolbar, .popover.osd > .search-bar, .popover.osd > .location-bar {
     border-style: none;
     background-color: transparent; }
-  .popover .button.flat, .popover .header-bar .titlebutton.button, .header-bar .popover .titlebutton.button,
+  .popover .button.flat, .popover .sidebar-button.button, .popover .header-bar .titlebutton.button, .header-bar .popover .titlebutton.button,
   .popover .titlebar .titlebutton.button,
   .titlebar .popover .titlebutton.button,
   .popover .button.flat:hover,
+  .popover .sidebar-button.button:hover,
   .popover .header-bar .titlebutton.button:hover,
   .header-bar .popover .titlebutton.button:hover,
   .popover .titlebar .titlebutton.button:hover,
@@ -2162,19 +2087,6 @@
     text-shadow: none;
     transition: none; }
 
-.entry.cursor-handle,
-.cursor-handle {
-  background-color: transparent;
-  background-image: none;
-  box-shadow: none;
-  border-style: none; }
-  .entry.cursor-handle.top,
-  .cursor-handle.top {
-    -gtk-icon-source: -gtk-icontheme("selection-start-symbolic"); }
-  .entry.cursor-handle.bottom,
-  .cursor-handle.bottom {
-    -gtk-icon-source: -gtk-icontheme("selection-end-symbolic"); }
-
 /*****************
  * Notebooks and *
  * Tabs          *
@@ -2531,6 +2443,7 @@
  **********/
 GtkSwitch {
   -GtkSwitch-slider-width: 45px;
+  -GtkSwitch-slider-height: 27px;
   font-weight: bold;
   font-size: smaller;
   outline-offset: -4px;
@@ -2627,126 +2540,126 @@
 .check {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .check.button.flat, .header-bar .check.titlebutton.button,
+  .check.button.flat, .check.sidebar-button.button, .header-bar .check.titlebutton.button,
   .titlebar .check.titlebutton.button {
     icon-shadow: none; }
 
 .check:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-hover-dark.png"), url("assets/checkbox-unchecked-hover-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .check:hover.button.flat, .header-bar .check.titlebutton.button:hover,
+  .check:hover.button.flat, .check.sidebar-button.button:hover, .header-bar .check.titlebutton.button:hover,
   .titlebar .check.titlebutton.button:hover {
     icon-shadow: none; }
 
 .check:active {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-active-dark.png"), url("assets/checkbox-unchecked-active-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .check:active.button.flat, .header-bar .check.titlebutton.button:active,
+  .check:active.button.flat, .check.sidebar-button.button:active, .header-bar .check.titlebutton.button:active,
   .titlebar .check.titlebutton.button:active {
     icon-shadow: none; }
 
 .check:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .check:insensitive.button.flat, .header-bar .check.titlebutton.button:insensitive,
+  .check:insensitive.button.flat, .check.sidebar-button.button:insensitive, .header-bar .check.titlebutton.button:insensitive,
   .titlebar .check.titlebutton.button:insensitive {
     icon-shadow: none; }
 
 .check:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-backdrop-dark.png"), url("assets/checkbox-unchecked-backdrop-dark@2.png"));
   icon-shadow: none; }
-  .check:backdrop.button.flat, .header-bar .check.titlebutton.button:backdrop,
+  .check:backdrop.button.flat, .check.sidebar-button.button:backdrop, .header-bar .check.titlebutton.button:backdrop,
   .titlebar .check.titlebutton.button:backdrop {
     icon-shadow: none; }
 
 .check:backdrop:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-backdrop-insensitive-dark.png"), url("assets/checkbox-unchecked-backdrop-insensitive-dark@2.png"));
   icon-shadow: none; }
-  .check:backdrop:insensitive.button.flat, .header-bar .check.titlebutton.button:backdrop:insensitive,
+  .check:backdrop:insensitive.button.flat, .check.sidebar-button.button:backdrop:insensitive, .header-bar .check.titlebutton.button:backdrop:insensitive,
   .titlebar .check.titlebutton.button:backdrop:insensitive {
     icon-shadow: none; }
 
 .check:inconsistent {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .check:inconsistent.button.flat, .header-bar .check.titlebutton.button:inconsistent,
+  .check:inconsistent.button.flat, .check.sidebar-button.button:inconsistent, .header-bar .check.titlebutton.button:inconsistent,
   .titlebar .check.titlebutton.button:inconsistent {
     icon-shadow: none; }
 
 .check:inconsistent:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-hover-dark.png"), url("assets/checkbox-mixed-hover-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .check:inconsistent:hover.button.flat, .header-bar .check.titlebutton.button:inconsistent:hover,
+  .check:inconsistent:hover.button.flat, .check.sidebar-button.button:inconsistent:hover, .header-bar .check.titlebutton.button:inconsistent:hover,
   .titlebar .check.titlebutton.button:inconsistent:hover {
     icon-shadow: none; }
 
 .check:inconsistent:selected {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-active-dark.png"), url("assets/checkbox-mixed-active-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .check:inconsistent:selected.button.flat, .header-bar .check.titlebutton.button:inconsistent:selected,
+  .check:inconsistent:selected.button.flat, .check.sidebar-button.button:inconsistent:selected, .header-bar .check.titlebutton.button:inconsistent:selected,
   .titlebar .check.titlebutton.button:inconsistent:selected {
     icon-shadow: none; }
 
 .check:inconsistent:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-backdrop-dark.png"), url("assets/checkbox-mixed-backdrop-dark@2.png"));
   icon-shadow: none; }
-  .check:inconsistent:backdrop.button.flat, .header-bar .check.titlebutton.button:inconsistent:backdrop,
+  .check:inconsistent:backdrop.button.flat, .check.sidebar-button.button:inconsistent:backdrop, .header-bar .check.titlebutton.button:inconsistent:backdrop,
   .titlebar .check.titlebutton.button:inconsistent:backdrop {
     icon-shadow: none; }
 
 .check:inconsistent:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .check:inconsistent:insensitive.button.flat, .header-bar .check.titlebutton.button:inconsistent:insensitive,
+  .check:inconsistent:insensitive.button.flat, .check.sidebar-button.button:inconsistent:insensitive, .header-bar .check.titlebutton.button:inconsistent:insensitive,
   .titlebar .check.titlebutton.button:inconsistent:insensitive {
     icon-shadow: none; }
 
 .check:inconsistent:insensitive:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-backdrop-insensitive-dark.png"), url("assets/checkbox-mixed-backdrop-insensitive-dark@2.png"));
   icon-shadow: none; }
-  .check:inconsistent:insensitive:backdrop.button.flat, .header-bar .check.titlebutton.button:inconsistent:insensitive:backdrop,
+  .check:inconsistent:insensitive:backdrop.button.flat, .check.sidebar-button.button:inconsistent:insensitive:backdrop, .header-bar .check.titlebutton.button:inconsistent:insensitive:backdrop,
   .titlebar .check.titlebutton.button:inconsistent:insensitive:backdrop {
     icon-shadow: none; }
 
 .check:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .check:checked.button.flat, .header-bar .check.titlebutton.button:checked,
+  .check:checked.button.flat, .check.sidebar-button.button:checked, .header-bar .check.titlebutton.button:checked,
   .titlebar .check.titlebutton.button:checked {
     icon-shadow: none; }
 
 .check:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .check:checked:insensitive.button.flat, .header-bar .check.titlebutton.button:checked:insensitive,
+  .check:checked:insensitive.button.flat, .check.sidebar-button.button:checked:insensitive, .header-bar .check.titlebutton.button:checked:insensitive,
   .titlebar .check.titlebutton.button:checked:insensitive {
     icon-shadow: none; }
 
 .check:checked:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-hover-dark.png"), url("assets/checkbox-checked-hover-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .check:checked:hover.button.flat, .header-bar .check.titlebutton.button:checked:hover,
+  .check:checked:hover.button.flat, .check.sidebar-button.button:checked:hover, .header-bar .check.titlebutton.button:checked:hover,
   .titlebar .check.titlebutton.button:checked:hover {
     icon-shadow: none; }
 
 .check:checked:active {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-active-dark.png"), url("assets/checkbox-checked-active-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .check:checked:active.button.flat, .header-bar .check.titlebutton.button:checked:active,
+  .check:checked:active.button.flat, .check.sidebar-button.button:checked:active, .header-bar .check.titlebutton.button:checked:active,
   .titlebar .check.titlebutton.button:checked:active {
     icon-shadow: none; }
 
 .check:backdrop:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-dark.png"), url("assets/checkbox-checked-backdrop-dark@2.png"));
   icon-shadow: none; }
-  .check:backdrop:checked.button.flat, .header-bar .check.titlebutton.button:backdrop:checked,
+  .check:backdrop:checked.button.flat, .check.sidebar-button.button:backdrop:checked, .header-bar .check.titlebutton.button:backdrop:checked,
   .titlebar .check.titlebutton.button:backdrop:checked {
     icon-shadow: none; }
 
 .check:backdrop:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-insensitive-dark.png"), url("assets/checkbox-checked-backdrop-insensitive-dark@2.png"));
   icon-shadow: none; }
-  .check:backdrop:checked:insensitive.button.flat, .header-bar .check.titlebutton.button:backdrop:checked:insensitive,
+  .check:backdrop:checked:insensitive.button.flat, .check.sidebar-button.button:backdrop:checked:insensitive, .header-bar .check.titlebutton.button:backdrop:checked:insensitive,
   .titlebar .check.titlebutton.button:backdrop:checked:insensitive {
     icon-shadow: none; }
 
@@ -2766,126 +2679,126 @@
 .radio {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .radio.button.flat, .header-bar .radio.titlebutton.button,
+  .radio.button.flat, .radio.sidebar-button.button, .header-bar .radio.titlebutton.button,
   .titlebar .radio.titlebutton.button {
     icon-shadow: none; }
 
 .radio:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-hover-dark.png"), url("assets/radio-unchecked-hover-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .radio:hover.button.flat, .header-bar .radio.titlebutton.button:hover,
+  .radio:hover.button.flat, .radio.sidebar-button.button:hover, .header-bar .radio.titlebutton.button:hover,
   .titlebar .radio.titlebutton.button:hover {
     icon-shadow: none; }
 
 .radio:active {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-active-dark.png"), url("assets/radio-unchecked-active-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .radio:active.button.flat, .header-bar .radio.titlebutton.button:active,
+  .radio:active.button.flat, .radio.sidebar-button.button:active, .header-bar .radio.titlebutton.button:active,
   .titlebar .radio.titlebutton.button:active {
     icon-shadow: none; }
 
 .radio:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .radio:insensitive.button.flat, .header-bar .radio.titlebutton.button:insensitive,
+  .radio:insensitive.button.flat, .radio.sidebar-button.button:insensitive, .header-bar .radio.titlebutton.button:insensitive,
   .titlebar .radio.titlebutton.button:insensitive {
     icon-shadow: none; }
 
 .radio:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-backdrop-dark.png"), url("assets/radio-unchecked-backdrop-dark@2.png"));
   icon-shadow: none; }
-  .radio:backdrop.button.flat, .header-bar .radio.titlebutton.button:backdrop,
+  .radio:backdrop.button.flat, .radio.sidebar-button.button:backdrop, .header-bar .radio.titlebutton.button:backdrop,
   .titlebar .radio.titlebutton.button:backdrop {
     icon-shadow: none; }
 
 .radio:backdrop:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-backdrop-insensitive-dark.png"), url("assets/radio-unchecked-backdrop-insensitive-dark@2.png"));
   icon-shadow: none; }
-  .radio:backdrop:insensitive.button.flat, .header-bar .radio.titlebutton.button:backdrop:insensitive,
+  .radio:backdrop:insensitive.button.flat, .radio.sidebar-button.button:backdrop:insensitive, .header-bar .radio.titlebutton.button:backdrop:insensitive,
   .titlebar .radio.titlebutton.button:backdrop:insensitive {
     icon-shadow: none; }
 
 .radio:inconsistent {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .radio:inconsistent.button.flat, .header-bar .radio.titlebutton.button:inconsistent,
+  .radio:inconsistent.button.flat, .radio.sidebar-button.button:inconsistent, .header-bar .radio.titlebutton.button:inconsistent,
   .titlebar .radio.titlebutton.button:inconsistent {
     icon-shadow: none; }
 
 .radio:inconsistent:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-hover-dark.png"), url("assets/radio-mixed-hover-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .radio:inconsistent:hover.button.flat, .header-bar .radio.titlebutton.button:inconsistent:hover,
+  .radio:inconsistent:hover.button.flat, .radio.sidebar-button.button:inconsistent:hover, .header-bar .radio.titlebutton.button:inconsistent:hover,
   .titlebar .radio.titlebutton.button:inconsistent:hover {
     icon-shadow: none; }
 
 .radio:inconsistent:selected {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active-dark.png"), url("assets/radio-mixed-active-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .radio:inconsistent:selected.button.flat, .header-bar .radio.titlebutton.button:inconsistent:selected,
+  .radio:inconsistent:selected.button.flat, .radio.sidebar-button.button:inconsistent:selected, .header-bar .radio.titlebutton.button:inconsistent:selected,
   .titlebar .radio.titlebutton.button:inconsistent:selected {
     icon-shadow: none; }
 
 .radio:inconsistent:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-backdrop-dark.png"), url("assets/radio-mixed-backdrop-dark@2.png"));
   icon-shadow: none; }
-  .radio:inconsistent:backdrop.button.flat, .header-bar .radio.titlebutton.button:inconsistent:backdrop,
+  .radio:inconsistent:backdrop.button.flat, .radio.sidebar-button.button:inconsistent:backdrop, .header-bar .radio.titlebutton.button:inconsistent:backdrop,
   .titlebar .radio.titlebutton.button:inconsistent:backdrop {
     icon-shadow: none; }
 
 .radio:inconsistent:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .radio:inconsistent:insensitive.button.flat, .header-bar .radio.titlebutton.button:inconsistent:insensitive,
+  .radio:inconsistent:insensitive.button.flat, .radio.sidebar-button.button:inconsistent:insensitive, .header-bar .radio.titlebutton.button:inconsistent:insensitive,
   .titlebar .radio.titlebutton.button:inconsistent:insensitive {
     icon-shadow: none; }
 
 .radio:inconsistent:insensitive:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-backdrop-insensitive-dark.png"), url("assets/radio-mixed-backdrop-insensitive-dark@2.png"));
   icon-shadow: none; }
-  .radio:inconsistent:insensitive:backdrop.button.flat, .header-bar .radio.titlebutton.button:inconsistent:insensitive:backdrop,
+  .radio:inconsistent:insensitive:backdrop.button.flat, .radio.sidebar-button.button:inconsistent:insensitive:backdrop, .header-bar .radio.titlebutton.button:inconsistent:insensitive:backdrop,
   .titlebar .radio.titlebutton.button:inconsistent:insensitive:backdrop {
     icon-shadow: none; }
 
 .radio:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .radio:checked.button.flat, .header-bar .radio.titlebutton.button:checked,
+  .radio:checked.button.flat, .radio.sidebar-button.button:checked, .header-bar .radio.titlebutton.button:checked,
   .titlebar .radio.titlebutton.button:checked {
     icon-shadow: none; }
 
 .radio:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .radio:checked:insensitive.button.flat, .header-bar .radio.titlebutton.button:checked:insensitive,
+  .radio:checked:insensitive.button.flat, .radio.sidebar-button.button:checked:insensitive, .header-bar .radio.titlebutton.button:checked:insensitive,
   .titlebar .radio.titlebutton.button:checked:insensitive {
     icon-shadow: none; }
 
 .radio:checked:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-hover-dark.png"), url("assets/radio-checked-hover-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .radio:checked:hover.button.flat, .header-bar .radio.titlebutton.button:checked:hover,
+  .radio:checked:hover.button.flat, .radio.sidebar-button.button:checked:hover, .header-bar .radio.titlebutton.button:checked:hover,
   .titlebar .radio.titlebutton.button:checked:hover {
     icon-shadow: none; }
 
 .radio:checked:active {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-active-dark.png"), url("assets/radio-checked-active-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .radio:checked:active.button.flat, .header-bar .radio.titlebutton.button:checked:active,
+  .radio:checked:active.button.flat, .radio.sidebar-button.button:checked:active, .header-bar .radio.titlebutton.button:checked:active,
   .titlebar .radio.titlebutton.button:checked:active {
     icon-shadow: none; }
 
 .radio:backdrop:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop-dark.png"), url("assets/radio-checked-backdrop-dark@2.png"));
   icon-shadow: none; }
-  .radio:backdrop:checked.button.flat, .header-bar .radio.titlebutton.button:backdrop:checked,
+  .radio:backdrop:checked.button.flat, .radio.sidebar-button.button:backdrop:checked, .header-bar .radio.titlebutton.button:backdrop:checked,
   .titlebar .radio.titlebutton.button:backdrop:checked {
     icon-shadow: none; }
 
 .radio:backdrop:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop-insensitive-dark.png"), url("assets/radio-checked-backdrop-insensitive-dark@2.png"));
   icon-shadow: none; }
-  .radio:backdrop:checked:insensitive.button.flat, .header-bar .radio.titlebutton.button:backdrop:checked:insensitive,
+  .radio:backdrop:checked:insensitive.button.flat, .radio.sidebar-button.button:backdrop:checked:insensitive, .header-bar .radio.titlebutton.button:backdrop:checked:insensitive,
   .titlebar .radio.titlebutton.button:backdrop:checked:insensitive {
     icon-shadow: none; }
 
@@ -2910,47 +2823,42 @@
   .list-row .check:hover, list-row .radio:selected, list-row .radio:hover {
     icon-shadow: none; }
 
-.content-view {
-  background-color: #282c2c; }
-  .content-view:backdrop {
-    background-color: #282c2c; }
-
-.view.content-view.check {
+.view.content-view.check:not(.list) {
   icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-selectionmode.png"), url("assets/checkbox-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:hover {
+.view.content-view.check:hover:not(.list) {
   icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-hover-selectionmode.png"), url("assets/checkbox-hover-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:active {
+.view.content-view.check:active:not(.list) {
   icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-active-selectionmode.png"), url("assets/checkbox-active-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:backdrop {
+.view.content-view.check:backdrop:not(.list) {
   icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-backdrop-selectionmode.png"), url("assets/checkbox-backdrop-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:checked {
+.view.content-view.check:checked:not(.list) {
   icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-selectionmode.png"), url("assets/checkbox-checked-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:checked:hover {
+.view.content-view.check:checked:hover:not(.list) {
   icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-hover-selectionmode.png"), url("assets/checkbox-checked-hover-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:checked:active {
+.view.content-view.check:checked:active:not(.list) {
   icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-active-selectionmode.png"), url("assets/checkbox-checked-active-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:backdrop:checked {
+.view.content-view.check:backdrop:checked:not(.list) {
   icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-selectionmode.png"), url("assets/checkbox-checked-backdrop-selectionmode@2.png"));
   background-color: transparent; }
@@ -3163,11 +3071,43 @@
       .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:backdrop {
         border-color: rgba(0, 0, 0, 0.7);
         background-image: none; }
+  .list-row:selected .scale, .list-row:selected
+  .scale.scale-has-marks-above.scale-has-marks-below, .list-row:selected
+  .scale.vertical.scale-has-marks-above.scale-has-marks-below {
+    border-color: #0f2b48; }
+    .list-row:selected .scale.trough, .list-row:selected
+    .scale.scale-has-marks-above.scale-has-marks-below.trough, .list-row:selected
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough {
+      box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); }
+      .list-row:selected .scale.trough:backdrop, .list-row:selected
+      .scale.scale-has-marks-above.scale-has-marks-below.trough:backdrop, .list-row:selected
+      .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:backdrop {
+        box-shadow: none; }
+      .list-row:selected .scale.trough.highlight:backdrop, .list-row:selected
+      .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight:backdrop, .list-row:selected
+      .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight:backdrop {
+        border-color: #0f2b48; }
+    .list-row:selected .scale:insensitive, .list-row:selected .scale.trough.highlight:insensitive, .list-row:selected
+    .scale.scale-has-marks-above.scale-has-marks-below:insensitive, .list-row:selected
+    .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight:insensitive, .list-row:selected
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below:insensitive, .list-row:selected
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight:insensitive {
+      border-color: #215d9c;
+      box-shadow: none;
+      background-color: #90aecd;
+      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; }
 
 .scale.scale-has-marks-below {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
-  -GtkRange-trough-border: 2; }
+  -GtkRange-trough-border: 2;
+  color: alpha(currentColor,0.5); }
   .scale.scale-has-marks-below.slider {
     border-style: none;
     border-radius: 0;
@@ -3220,7 +3160,8 @@
 .scale.scale-has-marks-above {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
-  -GtkRange-trough-border: 2; }
+  -GtkRange-trough-border: 2;
+  color: alpha(currentColor,0.5); }
   .scale.scale-has-marks-above.slider {
     border-style: none;
     border-radius: 0;
@@ -3273,7 +3214,8 @@
 .scale.vertical.scale-has-marks-below {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
-  -GtkRange-trough-border: 2; }
+  -GtkRange-trough-border: 2;
+  color: alpha(currentColor,0.5); }
   .scale.vertical.scale-has-marks-below.slider {
     border-style: none;
     border-radius: 0;
@@ -3326,7 +3268,8 @@
 .scale.vertical.scale-has-marks-above {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
-  -GtkRange-trough-border: 2; }
+  -GtkRange-trough-border: 2;
+  color: alpha(currentColor,0.5); }
   .scale.vertical.scale-has-marks-above.slider {
     border-style: none;
     border-radius: 0;
@@ -3459,10 +3402,6 @@
 /*************
  * Level Bar *
  *************/
-.level-bar.vertical {
-  -GtkLevelBar-min-block-width: 3;
-  -GtkLevelBar-min-block-height: 34; }
-
 .level-bar {
   box-shadow: 0 1px rgba(238, 238, 236, 0.1);
   -GtkLevelBar-min-block-width: 34;
@@ -3475,17 +3414,17 @@
     padding: 2px;
     border-radius: 3px;
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #212121, #292929 90%);
+    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
     color: white;
     border-color: #1c1f1f;
-    box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(33, 93, 156, 0), 0 1px rgba(238, 238, 236, 0.1); }
+    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, #212121, #292929 90%);
+      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
       color: #d4d4d4;
       border-color: #1e2222;
       background-image: linear-gradient(to bottom, #2c2c2c);
-      box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(238, 238, 236, 0); }
+      box-shadow: 0 1px rgba(238, 238, 236, 0); }
   .level-bar.fill-block {
     border: 1px solid #1c5187;
     background-color: #215d9c;
@@ -3532,19 +3471,18 @@
 GtkScrolledWindow GtkViewport.frame {
   border-style: none; }
 
-.separator, GtkPlacesSidebar.sidebar .view .separator,
-GtkPlacesSidebar.sidebar .view .separator:backdrop {
+.separator {
   color: rgba(0, 0, 0, 0.1); }
-  GtkFileChooserButton .separator.vertical, GtkFileChooserButton GtkPlacesSidebar.sidebar .view .vertical.separator, GtkPlacesSidebar.sidebar .view GtkFileChooserButton .vertical.separator, GtkFontButton .separator.vertical, GtkFontButton GtkPlacesSidebar.sidebar .view .vertical.separator, GtkPlacesSidebar.sidebar .view GtkFontButton .vertical.separator {
+  GtkFileChooserButton .separator.vertical, GtkFontButton .separator.vertical {
     -GtkWidget-wide-separators: true; }
 
 /*********
  * Lists *
  *********/
-.list, .list-row {
+.list {
   background-color: #292929;
   border-color: #1c1f1f; }
-  .list:backdrop, .list-row:backdrop {
+  .list:backdrop {
     background-color: #2c2c2c;
     border-color: #1e2222; }
 
@@ -3552,32 +3490,17 @@
 .grid-child {
   padding: 2px; }
 
-.list-row.button, .header-bar .list-row.button.titlebutton,
-.titlebar .list-row.button.titlebutton,
-.list-row.button:backdrop,
-.list-row.button:backdrop:active,
-.list-row.button:backdrop:checked,
-.list-row.button:backdrop:insensitive,
-.list-row.button:backdrop:insensitive:active,
-.list-row.button:backdrop:insensitive:checked,
-.list-row.button:insensitive:active,
-.list-row.button:insensitive:checked {
-  background-color: rgba(41, 41, 41, 0);
-  border-style: none;
-  border-radius: 0;
-  box-shadow: none; }
-
-.list-row.button:hover {
-  background-color: #323232; }
-.list-row.button:active {
+.list-row.activatable:hover, GtkPlacesSidebar.sidebar .has-open-popup {
+  background-color: rgba(238, 238, 236, 0.05); }
+.list-row.activatable:active {
   box-shadow: inset 0 2px 2px -2px rgba(0, 0, 0, 0.2); }
-.list-row.button:backdrop:hover {
+.list-row.activatable:backdrop:hover, GtkPlacesSidebar.sidebar .has-open-popup:backdrop {
   background-color: transparent; }
-.list-row.button:selected:active {
+.list-row.activatable:selected:active {
   box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); }
-.list-row.button:selected:hover {
+.list-row.activatable:selected:hover, GtkPlacesSidebar.sidebar .has-open-popup:selected {
   background-color: #356ba4; }
-.list-row.button:selected:backdrop {
+.list-row.activatable:selected:backdrop {
   background-color: #215d9c; }
 
 .list-row:selected .button {
@@ -3588,7 +3511,7 @@
   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); }
-  .list-row:selected .button.flat, .list-row:selected .header-bar .titlebutton.button, .header-bar .list-row:selected .titlebutton.button,
+  .list-row:selected .button.flat, .list-row:selected .sidebar-button.button, .list-row:selected .header-bar .titlebutton.button, .header-bar .list-row:selected .titlebutton.button,
   .list-row:selected .titlebar .titlebutton.button,
   .titlebar .list-row:selected .titlebutton.button {
     border-color: transparent;
@@ -3614,7 +3537,7 @@
     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); }
-  .list-row:selected .button:backdrop, .list-row:selected .button.flat:backdrop, .list-row:selected .header-bar .titlebutton.button:backdrop, .header-bar .list-row:selected .titlebutton.button:backdrop,
+  .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;
@@ -3623,16 +3546,16 @@
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    .list-row:selected .button:backdrop:active, .list-row:selected .button:backdrop:checked, .list-row:selected .button.flat:backdrop:active, .list-row:selected .header-bar .titlebutton.button:backdrop:active, .header-bar .list-row:selected .titlebutton.button:backdrop:active,
+    .list-row:selected .button:backdrop:active, .list-row:selected .button:backdrop:checked, .list-row:selected .button.flat:backdrop:active, .list-row:selected .sidebar-button.button:backdrop:active, .list-row:selected .header-bar .titlebutton.button:backdrop:active, .header-bar .list-row:selected .titlebutton.button:backdrop:active,
     .list-row:selected .titlebar .titlebutton.button:backdrop:active,
-    .titlebar .list-row:selected .titlebutton.button:backdrop:active, .list-row:selected .button.flat:backdrop:checked, .list-row:selected .header-bar .titlebutton.button:backdrop:checked, .header-bar .list-row:selected .titlebutton.button:backdrop:checked,
+    .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);
       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 .header-bar .titlebutton.button:backdrop:insensitive, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive,
+    .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;
@@ -3642,13 +3565,13 @@
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       .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 .header-bar .titlebutton.button:backdrop:insensitive > .label, .header-bar .list-row:selected .titlebutton.button: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; }
-      .list-row:selected .button:backdrop:insensitive:active, .list-row:selected .button:backdrop:insensitive:checked, .list-row:selected .button.flat:backdrop:insensitive:active, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive:active, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:active,
+      .list-row:selected .button:backdrop:insensitive:active, .list-row:selected .button:backdrop:insensitive:checked, .list-row:selected .button.flat:backdrop:insensitive:active, .list-row:selected .sidebar-button.button:backdrop:insensitive:active, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive:active, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:active,
       .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive:active,
-      .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:active, .list-row:selected .button.flat:backdrop:insensitive:checked, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive:checked, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:checked,
+      .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:active, .list-row:selected .button.flat:backdrop:insensitive:checked, .list-row:selected .sidebar-button.button:backdrop:insensitive:checked, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive:checked, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:checked,
       .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive:checked,
       .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:checked {
         color: #5d6767;
@@ -3657,13 +3580,13 @@
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
         .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 .header-bar .titlebutton.button:backdrop:insensitive:active > .label, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:active > .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 .header-bar .titlebutton.button:backdrop:insensitive:checked > .label, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:checked > .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,
         .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:checked > .label {
           color: inherit; }
-  .list-row:selected .button.flat:backdrop, .list-row:selected .header-bar .titlebutton.button:backdrop, .header-bar .list-row:selected .titlebutton.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 {
     border-color: transparent;
@@ -3693,11 +3616,9 @@
       .list-row:selected .titlebar .button.titlebutton:insensitive:checked > .label {
         color: inherit; }
 
-.list-row, list-row.button, .header-bar list-row.button.titlebutton,
-.titlebar list-row.button.titlebutton {
-  transition: all 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
-  .list-row:hover, list-row.button:hover, .header-bar list-row.button.titlebutton:hover,
-  .titlebar list-row.button.titlebutton:hover {
+.list-row {
+  transition: all 150ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
+  .list-row:hover {
     transition: none; }
 
 /*********************
@@ -3726,10 +3647,11 @@
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
     outline-color: rgba(238, 238, 236, 0.3); }
-    .app-notification .button.flat, .app-notification .header-bar .titlebutton.button, .header-bar .app-notification .titlebutton.button,
+    .app-notification .button.flat, .app-notification .sidebar-button.button, .app-notification .header-bar .titlebutton.button, .header-bar .app-notification .titlebutton.button,
     .app-notification .titlebar .titlebutton.button,
     .titlebar .app-notification .titlebutton.button,
     .app-notification.frame .button.flat,
+    .app-notification.frame .sidebar-button.button,
     .app-notification.frame .header-bar .titlebutton.button,
     .header-bar .app-notification.frame .titlebutton.button,
     .app-notification.frame .titlebar .titlebutton.button,
@@ -3811,8 +3733,14 @@
     GtkCalendar.button:backdrop, .header-bar GtkCalendar.button.titlebutton:backdrop,
     .titlebar GtkCalendar.button.titlebutton:backdrop {
       color: rgba(147, 150, 149, 0.45); }
-  GtkCalendar:inconsistent, GtkCalendar:inconsistent:backdrop, GtkCalendar.highlight, GtkCalendar.highlight:backdrop {
+    GtkCalendar.button:insensitive, .header-bar GtkCalendar.button.titlebutton:insensitive,
+    .titlebar GtkCalendar.button.titlebutton:insensitive {
+      color: rgba(147, 150, 149, 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; }
@@ -3823,180 +3751,178 @@
 .message-dialog .dialog-action-area .button {
   padding: 8px; }
 
-.message-dialog {
-  -GtkDialog-button-spacing: 0; }
-  .message-dialog .titlebar {
-    border-style: none;
-    box-shadow: inset 0 1px rgba(238, 238, 236, 0.1); }
-  .message-dialog.csd.background {
-    border-bottom-left-radius: 9px;
-    border-bottom-right-radius: 9px; }
-  .message-dialog.csd .dialog-action-area .button {
-    padding: 12px;
-    border-radius: 0;
+.message-dialog .titlebar {
+  border-style: none;
+  box-shadow: inset 0 1px rgba(238, 238, 236, 0.1); }
+.message-dialog.csd.background {
+  border-bottom-left-radius: 9px;
+  border-bottom-right-radius: 9px; }
+.message-dialog.csd .dialog-action-area .button {
+  padding: 12px;
+  border-radius: 0;
+  color: #eeeeec;
+  outline-color: rgba(238, 238, 236, 0.3);
+  border-color: #1c1f1f;
+  background-image: linear-gradient(to bottom, #454c4c, #393f3f 40%, #2d3232);
+  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); }
+  .message-dialog.csd .dialog-action-area .button:hover {
+    color: #eeeeec;
+    outline-color: rgba(238, 238, 236, 0.3);
+    border-color: #1c1f1f;
+    background-image: linear-gradient(to bottom, #5b6464, #434a4a 40%, #393f3f);
+    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); }
+  .message-dialog.csd .dialog-action-area .button:active {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #454c4c, #393f3f 40%, #2d3232);
-    text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
-    icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
+    background-image: linear-gradient(to bottom, #232727, #292d2d 40%, #2d3232);
+    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); }
+  .message-dialog.csd .dialog-action-area .button:insensitive {
+    color: #939695;
+    border-color: #1c1f1f;
+    background-image: linear-gradient(to bottom, #323636);
+    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 .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;
+    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);
+    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 .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;
+    outline-color: rgba(255, 255, 255, 0.3);
+    border-color: #0b1e33;
+    background-image: linear-gradient(to bottom, #256ab1, #215d9c 40%, #1c5187);
+    text-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
+    icon-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
-    .message-dialog.csd .dialog-action-area .button:hover {
-      color: #eeeeec;
-      outline-color: rgba(238, 238, 236, 0.3);
-      border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #5b6464, #434a4a 40%, #393f3f);
-      text-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
-      icon-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
+    .message-dialog.csd .dialog-action-area .button.suggested-action:hover {
+      color: white;
+      outline-color: rgba(255, 255, 255, 0.3);
+      border-color: #0b1e33;
+      background-image: linear-gradient(to bottom, #3180d4, #2467ad 40%, #215d9c);
+      text-shadow: 0 -1px rgba(0, 0, 0, 0.67153);
+      icon-shadow: 0 -1px rgba(0, 0, 0, 0.67153);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
-    .message-dialog.csd .dialog-action-area .button:active {
-      color: #eeeeec;
-      outline-color: rgba(238, 238, 236, 0.3);
-      border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #232727, #292d2d 40%, #2d3232);
-      text-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
-      icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
+    .message-dialog.csd .dialog-action-area .button.suggested-action:active {
+      color: white;
+      outline-color: rgba(255, 255, 255, 0.3);
+      border-color: #0b1e33;
+      background-image: linear-gradient(to bottom, #194776, #1b4d80 40%, #1c5187);
+      text-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
+      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:insensitive {
+    .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop {
+      color: #d2deeb;
+      border-color: #0b1e33;
+      background-image: linear-gradient(to bottom, #215d9c);
+      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 {
+        color: #5d6767;
+        border-color: #1e2222;
+        background-image: linear-gradient(to bottom, #323636);
+        text-shadow: none;
+        icon-shadow: none;
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+        .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;
       border-color: #1c1f1f;
       background-image: linear-gradient(to bottom, #323636);
       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 .header-bar .button.titlebutton:insensitive > .label,
-      .message-dialog.csd .dialog-action-area .titlebar .button.titlebutton: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:backdrop {
-      color: #939695;
-      border-color: #1e2222;
-      background-image: linear-gradient(to bottom, #393f3f);
+  .message-dialog.csd .dialog-action-area .button.destructive-action {
+    color: white;
+    outline-color: rgba(255, 255, 255, 0.3);
+    border-color: #5e0707;
+    background-image: linear-gradient(to bottom, #ed1212, #d51010 40%, #bd0e0e);
+    text-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
+    icon-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.3); }
+    .message-dialog.csd .dialog-action-area .button.destructive-action:hover {
+      color: white;
+      outline-color: rgba(255, 255, 255, 0.3);
+      border-color: #5e0707;
+      background-image: linear-gradient(to bottom, #f03c3c, #e81111 40%, #d51010);
+      text-shadow: 0 -1px rgba(0, 0, 0, 0.60878);
+      icon-shadow: 0 -1px rgba(0, 0, 0, 0.60878);
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.3); }
+    .message-dialog.csd .dialog-action-area .button.destructive-action:active {
+      color: white;
+      outline-color: rgba(255, 255, 255, 0.3);
+      border-color: #5e0707;
+      background-image: linear-gradient(to bottom, #aa0d0d, #b60e0e 40%, #bd0e0e);
+      text-shadow: 0 -1px rgba(0, 0, 0, 0.72078);
+      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;
+      border-color: #5e0707;
+      background-image: linear-gradient(to bottom, #d51010);
       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;
+      .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive {
+        color: #5d6767;
+        border-color: #1e2222;
+        background-image: linear-gradient(to bottom, #323636);
+        text-shadow: none;
+        icon-shadow: none;
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+        .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;
+      border-color: #1c1f1f;
       background-image: linear-gradient(to bottom, #323636);
       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 .header-bar .button.titlebutton:backdrop:insensitive > .label,
-      .message-dialog.csd .dialog-action-area .titlebar .button.titlebutton:backdrop: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.suggested-action {
-      color: white;
-      outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #0b1e33;
-      background-image: linear-gradient(to bottom, #256ab1, #215d9c 40%, #1c5187);
-      text-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
-      icon-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
-      .message-dialog.csd .dialog-action-area .button.suggested-action:hover {
-        color: white;
-        outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #0b1e33;
-        background-image: linear-gradient(to bottom, #3180d4, #2467ad 40%, #215d9c);
-        text-shadow: 0 -1px rgba(0, 0, 0, 0.67153);
-        icon-shadow: 0 -1px rgba(0, 0, 0, 0.67153);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
-      .message-dialog.csd .dialog-action-area .button.suggested-action:active {
-        color: white;
-        outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #0b1e33;
-        background-image: linear-gradient(to bottom, #194776, #1b4d80 40%, #1c5187);
-        text-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
-        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;
-        border-color: #0b1e33;
-        background-image: linear-gradient(to bottom, #215d9c);
-        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 {
-          color: #5d6767;
-          border-color: #1e2222;
-          background-image: linear-gradient(to bottom, #323636);
-          text-shadow: none;
-          icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-          .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;
-        border-color: #1c1f1f;
-        background-image: linear-gradient(to bottom, #323636);
-        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 .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;
-      outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5e0707;
-      background-image: linear-gradient(to bottom, #ed1212, #d51010 40%, #bd0e0e);
-      text-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
-      icon-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.3); }
-      .message-dialog.csd .dialog-action-area .button.destructive-action:hover {
-        color: white;
-        outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #5e0707;
-        background-image: linear-gradient(to bottom, #f03c3c, #e81111 40%, #d51010);
-        text-shadow: 0 -1px rgba(0, 0, 0, 0.60878);
-        icon-shadow: 0 -1px rgba(0, 0, 0, 0.60878);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.3); }
-      .message-dialog.csd .dialog-action-area .button.destructive-action:active {
-        color: white;
-        outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #5e0707;
-        background-image: linear-gradient(to bottom, #aa0d0d, #b60e0e 40%, #bd0e0e);
-        text-shadow: 0 -1px rgba(0, 0, 0, 0.72078);
-        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;
-        border-color: #5e0707;
-        background-image: linear-gradient(to bottom, #d51010);
-        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 {
-          color: #5d6767;
-          border-color: #1e2222;
-          background-image: linear-gradient(to bottom, #323636);
-          text-shadow: none;
-          icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-          .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;
-        border-color: #1c1f1f;
-        background-image: linear-gradient(to bottom, #323636);
-        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 .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;
-    border-right-style: none;
-    border-bottom-style: none; }
-  .message-dialog.csd .dialog-action-area .button:last-child {
-    border-bottom-right-radius: 7px;
-    outline-bottom-right-radius: 5px; }
-  .message-dialog.csd .dialog-action-area .button:first-child {
-    border-left-style: none;
-    border-bottom-left-radius: 7px;
-    outline-bottom-left-radius: 5px; }
+.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;
+  border-right-style: none;
+  border-bottom-style: none; }
+.message-dialog.csd .dialog-action-area .button:last-child {
+  border-bottom-right-radius: 7px;
+  outline-bottom-right-radius: 5px; }
+.message-dialog.csd .dialog-action-area .button:first-child {
+  border-left-style: none;
+  border-bottom-left-radius: 7px;
+  outline-bottom-left-radius: 5px; }
 
 GtkFileChooserDialog .search-bar {
   background-color: #292929;
@@ -4015,31 +3941,43 @@
  ***********/
 .sidebar {
   border: none;
-  background-color: #454c4c; }
+  background-color: #313434; }
   .sidebar:backdrop {
-    background-color: #454c4c; }
+    background-color: #323535; }
+
+GtkSidebarRow.list-row {
+  padding: 0px; }
+GtkSidebarRow .sidebar-revealer {
+  padding: 4px 14px 4px 12px; }
+GtkSidebarRow .sidebar-icon {
+  opacity: 0.7; }
+  GtkSidebarRow .sidebar-icon:dir(ltr) {
+    padding-right: 8px; }
+  GtkSidebarRow .sidebar-icon:dir(rtl) {
+    padding-left: 8px; }
+GtkSidebarRow .sidebar-label:dir(ltr) {
+  padding-right: 2px; }
+GtkSidebarRow .sidebar-label:dir(rtl) {
+  padding-left: 2px; }
 
-GtkPlacesSidebar.sidebar .view {
-  color: #eeeeec;
-  background-color: transparent; }
-  GtkPlacesSidebar.sidebar .view .image {
-    color: #bbbdbc; }
-    GtkPlacesSidebar.sidebar .view .image:selected {
-      color: #e8eef5; }
-      GtkPlacesSidebar.sidebar .view .image:selected:backdrop {
-        color: #e8eef5; }
-    GtkPlacesSidebar.sidebar .view .image:insensitive {
-      color: #7b7f7f; }
-    GtkPlacesSidebar.sidebar .view .image:backdrop {
-      color: #7b7f7f; }
-      GtkPlacesSidebar.sidebar .view .image:backdrop:insensitive {
-        color: #555e5e; }
-  GtkPlacesSidebar.sidebar .view:insensitive {
-    color: #939695; }
-  GtkPlacesSidebar.sidebar .view:backdrop {
-    color: #939695; }
-    GtkPlacesSidebar.sidebar .view:backdrop:insensitive {
-      color: #5d6767; }
+GtkPlacesSidebar.sidebar .list-row:selected:active {
+  box-shadow: none; }
+GtkPlacesSidebar.sidebar .sidebar-placeholder-row {
+  border: solid 1px #215d9c; }
+GtkPlacesSidebar.sidebar .sidebar-new-bookmark-row {
+  color: #215d9c; }
+.sidebar-button.button, .header-bar .sidebar-button.button.titlebutton,
+.titlebar .sidebar-button.button.titlebutton {
+  border-radius: 100%;
+  outline-radius: 100%; }
+  .sidebar-button.button.image-button, GtkScaleButton.sidebar-button.button,
+  GtkVolumeButton.sidebar-button.button, .header-bar .sidebar-button.titlebutton.button,
+  .titlebar .sidebar-button.titlebutton.button {
+    padding: 5px; }
+  .sidebar-button.button:not(:hover):not(:active) > GtkImage, .header-bar .sidebar-button.button.titlebutton:not(:hover):not(:active) > GtkImage,
+  .titlebar .sidebar-button.button.titlebutton:not(:hover):not(:active) > GtkImage, .sidebar-button.button:backdrop > GtkImage, .header-bar .sidebar-button.button.titlebutton:backdrop > GtkImage,
+  .titlebar .sidebar-button.button.titlebutton:backdrop > GtkImage {
+    opacity: 0.7; }
 
 .sidebar-item {
   padding: 10px 4px; }
@@ -4049,6 +3987,18 @@
   .sidebar-item.needs-attention > .label {
     background-size: 6px 6px, 0 0; }
 
+/****************
+ * File chooser *
+ ****************/
+GtkPlacesView .server-list-button > GtkImage {
+  transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+  -gtk-icon-transform: rotate(0turn); }
+GtkPlacesView .server-list-button:checked > GtkImage {
+  transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+  -gtk-icon-transform: rotate(-0.5turn); }
+GtkPlacesView .list-row.activatable:hover, GtkPlacesView GtkPlacesSidebar.sidebar .has-open-popup, GtkPlacesSidebar.sidebar GtkPlacesView .has-open-popup {
+  background-color: transparent; }
+
 /*********
  * Paned *
  *********/
@@ -4241,6 +4191,9 @@
       border-color: #ffffff; }
   GtkColorSwatch:selected {
     box-shadow: inset 0 1px rgba(0, 0, 0, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
+  GtkColorSwatch:insensitive {
+    box-shadow: none;
+    opacity: 0.5; }
   GtkColorSwatch.top {
     border-top-left-radius: 6px;
     border-top-right-radius: 6px; }
@@ -4287,12 +4240,12 @@
       box-shadow: none; }
   GtkColorSwatch.color-dark {
     color: white;
-    outline-color: rgba(0, 0, 0, 0.3); }
+    outline-color: rgba(255, 255, 255, 0.5); }
     GtkColorSwatch.color-dark:backdrop {
       color: rgba(255, 255, 255, 0.3); }
   GtkColorSwatch.color-light {
     color: black;
-    outline-color: rgba(255, 255, 255, 0.5); }
+    outline-color: rgba(0, 0, 0, 0.5); }
     GtkColorSwatch.color-light:backdrop {
       color: rgba(0, 0, 0, 0.3); }
   GtkColorSwatch.overlay, GtkColorSwatch.overlay:selected {
@@ -4335,6 +4288,19 @@
 /********
  * Misc *
  ********/
+.content-view {
+  background-color: #282c2c; }
+  .content-view:hover {
+    -gtk-image-effect: highlight; }
+  .content-view:backdrop {
+    background-color: #282c2c; }
+
+.osd .scale-popup .button.flat, .osd .scale-popup .sidebar-button.button, .osd .scale-popup .header-bar .titlebutton.button, .header-bar .osd .scale-popup .titlebutton.button,
+.osd .scale-popup .titlebar .titlebutton.button,
+.titlebar .osd .scale-popup .titlebutton.button {
+  padding: 6px;
+  border-style: none;
+  border-radius: 5px; }
 .scale-popup .button, .scale-popup .header-bar .button.titlebutton, .header-bar .scale-popup .button.titlebutton,
 .scale-popup .titlebar .button.titlebutton,
 .titlebar .scale-popup .button.titlebutton {
@@ -4343,10 +4309,6 @@
     background-color: rgba(238, 238, 236, 0.1);
     border-radius: 5px; }
 
-GtkVolumeButton.button, .header-bar GtkVolumeButton.button.titlebutton,
-.titlebar GtkVolumeButton.button.titlebutton {
-  padding: 8px; }
-
 /**********************
  * Window Decorations *
  *********************/
@@ -4364,7 +4326,7 @@
     box-shadow: none; }
   .window-frame.ssd {
     box-shadow: 0 0 0 1px rgba(28, 31, 31, 0.9); }
-  .window-frame.csd .popup {
+  .window-frame.csd.popup {
     border-radius: 0;
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(28, 31, 31, 0.8); }
   .window-frame.csd.tooltip {
@@ -4396,22 +4358,214 @@
   .titlebar.selection-mode .titlebutton.button:backdrop {
     icon-shadow: none; }
 
-.view:selected, GtkCalendar:selected, .label:selected, .label:selected:focus, .label:selected:hover, .grid-child:selected, .entry:selected, .entry:selected:focus, .menuitem.button.flat:selected, .header-bar .menuitem.titlebutton.button:selected,
-.titlebar .menuitem.titlebutton.button:selected, .list-row:selected, .sidebar:selected, GtkPlacesSidebar.sidebar .view:selected, GtkPlacesSidebar.sidebar GtkCalendar:selected {
+.view:selected, GtkCalendar:selected, .label:selected, .label:selected:focus, .label:selected:hover, .grid-child:selected, .entry:selected, .entry:selected:focus, .menuitem.button.flat:selected, .menuitem.sidebar-button.button:selected, .header-bar .menuitem.titlebutton.button:selected,
+.titlebar .menuitem.titlebutton.button:selected, .list-row:selected, .sidebar:selected {
   background-color: #215d9c;
   color: #ffffff; }
-  .view:backdrop:selected, GtkCalendar:backdrop:selected, .label:backdrop:selected, .grid-child:backdrop:selected, .entry:backdrop:selected, .menuitem.button.flat:backdrop:selected, .header-bar .menuitem.titlebutton.button:backdrop:selected,
-  .titlebar .menuitem.titlebutton.button:backdrop:selected, .list-row:backdrop:selected, .sidebar:backdrop:selected, GtkPlacesSidebar.sidebar .view:backdrop:selected, GtkPlacesSidebar.sidebar GtkCalendar:backdrop:selected {
-    color: #ffffff;
-    background-color: #5e5e5e; }
+  .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; }
+  .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; }
+
+.monospace {
+  font: Monospace; }
+
+/**********************
+ * Touch Copy & Paste *
+ *********************/
+.entry.cursor-handle,
+.cursor-handle {
+  background-color: transparent;
+  background-image: none;
+  box-shadow: none;
+  border-style: none; }
+  .entry.cursor-handle.top:dir(ltr), .entry.cursor-handle.bottom:dir(rtl),
+  .cursor-handle.top:dir(ltr),
+  .cursor-handle.bottom:dir(rtl) {
+    -gtk-icon-source: -gtk-scaled(url("assets/text-select-start-dark.png"), url("assets/text-select-start-dark@2.png"));
+    padding-left: 10px; }
+  .entry.cursor-handle.bottom:dir(ltr), .entry.cursor-handle.top:dir(rtl),
+  .cursor-handle.bottom:dir(ltr),
+  .cursor-handle.top:dir(rtl) {
+    -gtk-icon-source: -gtk-scaled(url("assets/text-select-end-dark.png"), url("assets/text-select-end-dark@2.png"));
+    padding-right: 10px; }
+  .entry.cursor-handle.insertion-cursor:dir(ltr), .entry.cursor-handle.insertion-cursor:dir(rtl),
+  .cursor-handle.insertion-cursor:dir(ltr),
+  .cursor-handle.insertion-cursor:dir(rtl) {
+    -gtk-icon-source: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-dark.png"), url("assets/slider-horz-scale-has-marks-above-dark@2.png")); }
+  .entry.cursor-handle.top:hover:dir(ltr), .entry.cursor-handle.bottom:hover:dir(rtl),
+  .cursor-handle.top:hover:dir(ltr),
+  .cursor-handle.bottom:hover:dir(rtl) {
+    -gtk-icon-source: -gtk-scaled(url("assets/text-select-start-hover-dark.png"), url("assets/text-select-start-hover-dark@2.png"));
+    padding-left: 10px; }
+  .entry.cursor-handle.bottom:hover:dir(ltr), .entry.cursor-handle.top:hover:dir(rtl),
+  .cursor-handle.bottom:hover:dir(ltr),
+  .cursor-handle.top:hover:dir(rtl) {
+    -gtk-icon-source: -gtk-scaled(url("assets/text-select-end-hover-dark.png"), url("assets/text-select-end-hover-dark@2.png"));
+    padding-right: 10px; }
+  .entry.cursor-handle.insertion-cursor:hover:dir(ltr), .entry.cursor-handle.insertion-cursor:hover:dir(rtl),
+  .cursor-handle.insertion-cursor:hover:dir(ltr),
+  .cursor-handle.insertion-cursor:hover:dir(rtl) {
+    -gtk-icon-source: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-hover-dark.png"), url("assets/slider-horz-scale-has-marks-above-hover-dark@2.png")); }
+  .entry.cursor-handle.top:active:dir(ltr), .entry.cursor-handle.bottom:active:dir(rtl),
+  .cursor-handle.top:active:dir(ltr),
+  .cursor-handle.bottom:active:dir(rtl) {
+    -gtk-icon-source: -gtk-scaled(url("assets/text-select-start-active-dark.png"), url("assets/text-select-start-active-dark@2.png"));
+    padding-left: 10px; }
+  .entry.cursor-handle.bottom:active:dir(ltr), .entry.cursor-handle.top:active:dir(rtl),
+  .cursor-handle.bottom:active:dir(ltr),
+  .cursor-handle.top:active:dir(rtl) {
+    -gtk-icon-source: -gtk-scaled(url("assets/text-select-end-active-dark.png"), url("assets/text-select-end-active-dark@2.png"));
+    padding-right: 10px; }
+  .entry.cursor-handle.insertion-cursor:active:dir(ltr), .entry.cursor-handle.insertion-cursor:active:dir(rtl),
+  .cursor-handle.insertion-cursor:active:dir(ltr),
+  .cursor-handle.insertion-cursor:active:dir(rtl) {
+    -gtk-icon-source: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-active-dark.png"), url("assets/slider-horz-scale-has-marks-above-active-dark@2.png")); }
 
 /* Decouple the font of context menus from their entry/textview */
-.touch-selection,
 .context-menu {
   font: initial; }
 
-.monospace {
-  font: Monospace; }
+.touch-selection {
+  font: initial;
+  color: #eeeeec;
+  border: none;
+  background-color: rgba(32, 37, 38, 0.9);
+  background-clip: padding-box;
+  outline-color: rgba(238, 238, 236, 0.3);
+  box-shadow: none;
+  text-shadow: 0 1px black;
+  icon-shadow: 0 1px black; }
+  .touch-selection:backdrop {
+    text-shadow: none; }
+  .touch-selection .button, .touch-selection .header-bar .button.titlebutton, .header-bar .touch-selection .button.titlebutton,
+  .touch-selection .titlebar .button.titlebutton,
+  .titlebar .touch-selection .button.titlebutton {
+    color: #eeeeec;
+    border-color: rgba(0, 0, 0, 0.7);
+    background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
+    background-clip: padding-box;
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
+    text-shadow: 0 1px black;
+    icon-shadow: 0 1px black;
+    outline-color: rgba(238, 238, 236, 0.3); }
+    .touch-selection .button:hover {
+      color: white;
+      border-color: rgba(0, 0, 0, 0.7);
+      background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.7));
+      background-clip: padding-box;
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
+      text-shadow: 0 1px black;
+      icon-shadow: 0 1px black;
+      outline-color: rgba(238, 238, 236, 0.3); }
+    .touch-selection .button:active, .touch-selection .button:checked {
+      color: white;
+      border-color: rgba(0, 0, 0, 0.7);
+      background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
+      background-clip: padding-box;
+      box-shadow: none;
+      text-shadow: none;
+      icon-shadow: none;
+      outline-color: rgba(238, 238, 236, 0.3); }
+    .touch-selection .button:insensitive, .touch-selection .button:backdrop:insensitive {
+      color: #878989;
+      border-color: rgba(0, 0, 0, 0.7);
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+      background-clip: padding-box;
+      box-shadow: none;
+      text-shadow: none;
+      icon-shadow: none; }
+    .touch-selection .button:backdrop {
+      color: #eeeeec;
+      border-color: rgba(0, 0, 0, 0.7);
+      background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
+      background-clip: padding-box;
+      box-shadow: none;
+      text-shadow: none;
+      icon-shadow: none; }
+  .touch-selection .check {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); }
+  .touch-selection .check:hover {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-hover-dark.png"), url("assets/checkbox-unchecked-hover-dark@2.png")); }
+  .touch-selection .check:active {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-active-dark.png"), url("assets/checkbox-unchecked-active-dark@2.png")); }
+  .touch-selection .check:insensitive {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); }
+  .touch-selection .check:inconsistent {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); }
+  .touch-selection .check:inconsistent:hover {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-hover-dark.png"), url("assets/checkbox-mixed-hover-dark@2.png")); }
+  .touch-selection .check:inconsistent:selected {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-active-dark.png"), url("assets/checkbox-mixed-active-dark@2.png")); }
+  .touch-selection .check:inconsistent:insensitive {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); }
+  .touch-selection .check:checked {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); }
+  .touch-selection .check:checked:insensitive {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); }
+  .touch-selection .check:checked:hover {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-hover-dark.png"), url("assets/checkbox-checked-hover-dark@2.png")); }
+  .touch-selection .check:checked:active {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-active-dark.png"), url("assets/checkbox-checked-active-dark@2.png")); }
+  .touch-selection .check:backdrop:checked {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-dark.png"), url("assets/checkbox-checked-backdrop-dark@2.png")); }
+  .touch-selection .radio {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); }
+  .touch-selection .radio:hover {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-hover-dark.png"), url("assets/radio-unchecked-hover-dark@2.png")); }
+  .touch-selection .radio:active {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-active-dark.png"), url("assets/radio-unchecked-active-dark@2.png")); }
+  .touch-selection .radio:insensitive {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); }
+  .touch-selection .radio:inconsistent {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); }
+  .touch-selection .radio:inconsistent:hover {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-hover-dark.png"), url("assets/radio-mixed-hover-dark@2.png")); }
+  .touch-selection .radio:inconsistent:selected {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active-dark.png"), url("assets/radio-mixed-active-dark@2.png")); }
+  .touch-selection .radio:inconsistent:insensitive {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); }
+  .touch-selection .radio:checked {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); }
+  .touch-selection .radio:checked:insensitive {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); }
+  .touch-selection .radio:checked:hover {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-hover-dark.png"), url("assets/radio-checked-hover-dark@2.png")); }
+  .touch-selection .radio:checked:active {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-active-dark.png"), url("assets/radio-checked-active-dark@2.png")); }
+  .touch-selection .radio:backdrop:checked {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop-dark.png"), url("assets/radio-checked-backdrop-dark@2.png")); }
 
 .overshoot.top {
   background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#040404), to(rgba(4, 4, 4, 0))), -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(238, 238, 236, 0.07)), to(rgba(238, 238, 236, 0)));
--- a/gtk-3.0/gtk-contained.css	Sat Jul 09 11:48:31 2016 +0100
+++ b/gtk-3.0/gtk-contained.css	Sat Jul 09 15:25:37 2016 +0100
@@ -17,7 +17,7 @@
   -GtkWidget-focus-padding: 2;
   -GtkWidget-focus-line-width: 1;
   -GtkWidget-text-handle-width: 20;
-  -GtkWidget-text-handle-height: 20;
+  -GtkWidget-text-handle-height: 24;
   -GtkDialog-button-spacing: 4;
   -GtkDialog-action-area-border: 0;
   -GtkStatusbar-shadow-type: none;
@@ -73,20 +73,20 @@
   .view:selected, GtkCalendar:selected {
     border-radius: 3px; }
 
-.rubberband, .content-view.rubberband {
-  border: 1px solid #4a90d9;
-  background-color: rgba(74, 144, 217, 0.2); }
+.rubberband, GtkTreeView.view.rubberband, .content-view.rubberband {
+  border: 1px solid #2a76c6;
+  background-color: rgba(42, 118, 198, 0.2); }
 
-.label.separator, GtkPlacesSidebar.sidebar .view .label.separator {
+.label.separator {
   color: #2e3436; }
-  .label.separator:backdrop, GtkPlacesSidebar.sidebar .view .label.separator:backdrop {
+  .label.separator:backdrop {
     color: #8d9091; }
 .label:insensitive {
   color: #8d9091; }
   .label:insensitive:backdrop {
     color: #c7c7c7; }
 
-.dim-label, .label.separator, GtkPlacesSidebar.sidebar .view .label.separator, .titlebar .subtitle,
+.dim-label, .label.separator, .titlebar .subtitle,
 .header-bar .subtitle {
   opacity: 0.55;
   text-shadow: none; }
@@ -120,7 +120,7 @@
     outline-offset: -2px; }
 
 .popover.osd, .app-notification,
-.app-notification.frame, .osd {
+.app-notification.frame, .osd .scale-popup, .osd {
   color: #eeeeec;
   border: none;
   background-color: rgba(32, 37, 38, 0.7);
@@ -129,7 +129,7 @@
   box-shadow: none;
   text-shadow: 0 1px black;
   icon-shadow: 0 1px black; }
-  .popover.osd:backdrop, .app-notification:backdrop, .osd:backdrop {
+  .popover.osd:backdrop, .app-notification:backdrop, .osd .scale-popup:backdrop, .osd:backdrop {
     text-shadow: none; }
 
 /*********************
@@ -158,10 +158,10 @@
   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, #f7f7f7, #ffffff 90%);
+  background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
   color: black;
   border-color: #a1a1a1;
-  box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(74, 144, 217, 0), 0 1px white; }
+  box-shadow: inset 0 0 0 1px rgba(74, 144, 217, 0), 0 1px white; }
   .entry.image.left {
     padding-left: 0; }
   .entry.image.right {
@@ -169,38 +169,38 @@
   .entry.flat, .entry.flat:focus {
     padding: 2px;
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
+    background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
     color: black;
     border-color: #a1a1a1;
-    box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(74, 144, 217, 0);
+    box-shadow: inset 0 0 0 1px rgba(74, 144, 217, 0);
     border: none;
     border-radius: 0; }
   .entry:focus {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
-    box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(74, 144, 217, 0.15), 0 1px white;
+    background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
+    box-shadow: inset 0 0 0 1px #4a90d9, 0 1px white;
     border-color: #4a90d9; }
   .entry:insensitive {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
+    background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
     color: #8d9091;
     border-color: #a1a1a1;
     background-image: linear-gradient(to bottom, #f4f4f4);
-    box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px white; }
+    box-shadow: 0 1px white; }
   .entry:backdrop {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
+    background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
     color: #323232;
     border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, white);
-    box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(255, 255, 255, 0); }
+    box-shadow: 0 1px rgba(255, 255, 255, 0); }
   .entry:backdrop:insensitive {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
+    background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
     color: #c7c7c7;
     border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #f4f4f4);
-    box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(255, 255, 255, 0); }
+    box-shadow: 0 1px rgba(255, 255, 255, 0); }
   .entry.progressbar {
     margin: 1px;
     border-radius: 0;
@@ -212,26 +212,15 @@
     box-shadow: none; }
     .entry.progressbar:backdrop {
       background-color: transparent; }
-  .linked > .entry {
-    border-radius: 0; }
-    .linked > .entry:first-child {
-      border-top-left-radius: 3px;
-      border-bottom-left-radius: 3px; }
-      .linked > .entry:first-child:dir(rtl) {
-        border-right-style: none; }
-    .linked > .entry:last-child {
-      border-top-right-radius: 3px;
-      border-bottom-right-radius: 3px;
-      border-left-style: none; }
-      .linked > .entry:last-child:dir(rtl) {
-        border-left-style: solid; }
+  .linked:not(.vertical) > .entry:focus + .entry, .linked:not(.vertical) > .entry:focus + .button, .linked:not(.vertical) > .entry:focus + GtkComboBox > .the-button-in-the-combobox, .linked:not(.vertical) > .entry:focus + GtkComboBoxText > .the-button-in-the-combobox {
+    border-left-color: #4a90d9; }
   .entry.error {
     color: #cc0000;
     border-color: #cc0000; }
     .entry.error:focus {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
-      box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(204, 0, 0, 0.15), 0 1px white;
+      background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
+      box-shadow: inset 0 0 0 1px #cc0000, 0 1px white;
       border-color: #cc0000; }
     .entry.error:selected, .entry.error:selected:focus {
       background-color: #cc0000; }
@@ -240,8 +229,8 @@
     border-color: #f57900; }
     .entry.warning:focus {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
-      box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(245, 121, 0, 0.15), 0 1px white;
+      background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
+      box-shadow: inset 0 0 0 1px #f57900, 0 1px white;
       border-color: #f57900; }
     .entry.warning:selected, .entry.warning:selected:focus {
       background-color: #f57900; }
@@ -253,114 +242,9 @@
       color: #4a90d9; }
     .entry.image:backdrop {
       color: #a3a6a7; }
-  .linked.vertical > .entry {
-    background-color: transparent;
-    background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
-    color: black;
-    border-color: #a1a1a1;
-    box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(74, 144, 217, 0);
-    background-image: linear-gradient(to bottom, #ffffff);
-    border-bottom-color: #e2e2e2;
-    box-shadow: none; }
-    .linked.vertical > .entry:focus {
-      border-color: #4a90d9;
-      box-shadow: inset 0 0 0 1px rgba(74, 144, 217, 0.15), 0 -1px 0 0 #4a90d9; }
-    .linked.vertical > .entry:insensitive {
-      background-color: transparent;
-      background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
-      color: #8d9091;
-      border-color: #a1a1a1;
-      background-image: linear-gradient(to bottom, #f4f4f4);
-      box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent;
-      border-bottom-color: #e2e2e2; }
-      .linked.vertical > .entry:insensitive:backdrop {
-        background-color: transparent;
-        background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
-        color: #c7c7c7;
-        border-color: #a8a8a8;
-        background-image: linear-gradient(to bottom, #f4f4f4);
-        box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent;
-        border-bottom-color: #e4e4e4; }
-    .linked.vertical > .entry:backdrop {
-      background-color: transparent;
-      background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
-      color: #323232;
-      border-color: #a8a8a8;
-      background-image: linear-gradient(to bottom, white);
-      box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent;
-      border-bottom-color: #e4e4e4; }
-    .linked.vertical > .entry:first-child {
-      background-color: transparent;
-      background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
-      color: black;
-      border-color: #a1a1a1;
-      box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(74, 144, 217, 0);
-      border-bottom-color: #e2e2e2; }
-      .linked.vertical > .entry:first-child:focus {
-        background-color: transparent;
-        background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
-        box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(74, 144, 217, 0.15);
-        border-color: #4a90d9; }
-      .linked.vertical > .entry:first-child:insensitive {
-        background-color: transparent;
-        background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
-        color: #8d9091;
-        border-color: #a1a1a1;
-        background-image: linear-gradient(to bottom, #f4f4f4);
-        box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent;
-        border-bottom-color: #e4e4e4; }
-        .linked.vertical > .entry:first-child:insensitive:backdrop {
-          background-color: transparent;
-          background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
-          color: #c7c7c7;
-          border-color: #a8a8a8;
-          background-image: linear-gradient(to bottom, #f4f4f4);
-          box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent;
-          border-bottom-color: #e4e4e4;
-          border-top-style: solid; }
-      .linked.vertical > .entry:first-child:backdrop {
-        background-color: transparent;
-        background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
-        color: #323232;
-        border-color: #a8a8a8;
-        background-image: linear-gradient(to bottom, white);
-        box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent;
-        border-bottom-color: #e4e4e4; }
-    .linked.vertical > .entry:last-child {
-      background-color: transparent;
-      background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
-      color: black;
-      border-color: #a1a1a1;
-      box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(74, 144, 217, 0), 0 1px white;
-      background-image: linear-gradient(to bottom, #ffffff);
-      box-shadow: 0 1px white; }
-      .linked.vertical > .entry:last-child:focus {
-        border-color: #4a90d9;
-        box-shadow: inset 0 0 0 1px rgba(74, 144, 217, 0.15), 0 -1px 0 0 #4a90d9, 0 1px white; }
-      .linked.vertical > .entry:last-child:insensitive {
-        background-color: transparent;
-        background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
-        color: #8d9091;
-        border-color: #a1a1a1;
-        background-image: linear-gradient(to bottom, #f4f4f4);
-        box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px white; }
-        .linked.vertical > .entry:last-child:insensitive:backdrop {
-          background-color: transparent;
-          background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
-          color: #c7c7c7;
-          border-color: #a8a8a8;
-          background-image: linear-gradient(to bottom, #f4f4f4);
-          box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(255, 255, 255, 0); }
-      .linked.vertical > .entry:last-child:backdrop {
-        background-color: transparent;
-        background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
-        color: #323232;
-        border-color: #a8a8a8;
-        background-image: linear-gradient(to bottom, white);
-        box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(255, 255, 255, 0); }
   .osd .entry {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
+    background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
@@ -370,17 +254,17 @@
     icon-shadow: 0 1px black; }
     .osd .entry:focus {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
+      background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
       color: white;
       border-color: #4a90d9;
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
       background-clip: padding-box;
-      box-shadow: inset 0 0 0 1px rgba(74, 144, 217, 0.15);
+      box-shadow: inset 0 0 0 1px #4a90d9;
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black; }
     .osd .entry:backdrop {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
+      background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
@@ -390,7 +274,7 @@
       icon-shadow: none; }
     .osd .entry:insensitive {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
+      background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
       color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
@@ -399,6 +283,27 @@
       text-shadow: none;
       icon-shadow: none; }
 
+.linked.vertical > .entry:not(:last-child) {
+  box-shadow: none; }
+.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;
+  background-image: linear-gradient(to bottom, #ffffff); }
+  .linked.vertical > .entry:not(:insensitive) + .entry:not(:insensitive):backdrop {
+    border-top-color: #e4e4e4;
+    background-image: linear-gradient(to bottom, white); }
+.linked.vertical > .entry + .entry:focus:not(:last-child) {
+  border-top-color: #4a90d9;
+  box-shadow: inset 0 0 0 1px #4a90d9; }
+.linked.vertical > .entry + .entry:focus:last-child {
+  border-top-color: #4a90d9; }
+.linked.vertical > .entry:focus:not(:only-child) + .entry,
+.linked.vertical > .entry:focus:not(:only-child) + .button,
+.linked.vertical > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+.linked.vertical > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox {
+  border-top-color: #4a90d9; }
+
 /***********
  * Buttons *
  ***********/
@@ -420,7 +325,7 @@
   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; }
-  .button.flat, .header-bar .titlebutton.button,
+  .button.flat, .sidebar-button.button, .header-bar .titlebutton.button,
   .titlebar .titlebutton.button {
     border-color: transparent;
     background-color: transparent;
@@ -429,11 +334,11 @@
     text-shadow: none;
     icon-shadow: none;
     transition: none; }
-    .button.flat:hover, .header-bar .titlebutton.button:hover,
+    .button.flat:hover, .sidebar-button.button:hover, .header-bar .titlebutton.button:hover,
     .titlebar .titlebutton.button:hover {
       transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
       transition-duration: 500ms; }
-      .button.flat:hover:active, .header-bar .titlebutton.button:hover:active,
+      .button.flat:hover:active, .sidebar-button.button:hover:active, .header-bar .titlebutton.button:hover:active,
       .titlebar .titlebutton.button:hover:active {
         transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
   .button:hover, .header-bar .button.titlebutton:hover,
@@ -458,7 +363,7 @@
     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;
     transition-duration: 50ms; }
   .button:backdrop, .header-bar .button.titlebutton:backdrop,
-  .titlebar .button.titlebutton:backdrop, .button.flat:backdrop, .header-bar .titlebutton.button: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;
@@ -467,14 +372,14 @@
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
     -gtk-image-effect: none; }
-    .button:backdrop:active, .button:backdrop:checked, .button.flat:backdrop:active, .header-bar .titlebutton.button:backdrop:active,
-    .titlebar .titlebutton.button:backdrop:active, .button.flat:backdrop:checked, .header-bar .titlebutton.button:backdrop:checked,
+    .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);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-    .button:backdrop:insensitive, .button.flat:backdrop:insensitive, .header-bar .titlebutton.button:backdrop:insensitive,
+    .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;
@@ -483,11 +388,11 @@
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
       .button:backdrop:insensitive > .label, .header-bar .button.titlebutton:backdrop:insensitive > .label,
-      .titlebar .button.titlebutton:backdrop:insensitive > .label, .button.flat:backdrop:insensitive > .label, .header-bar .titlebutton.button: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, .header-bar .titlebutton.button:backdrop:insensitive:active,
-    .titlebar .titlebutton.button:backdrop:insensitive:active, .button.flat:backdrop:insensitive:checked, .header-bar .titlebutton.button:backdrop:insensitive:checked,
+    .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;
@@ -495,13 +400,13 @@
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
       .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, .header-bar .titlebutton.button:backdrop:insensitive:active > .label,
-      .titlebar .titlebutton.button:backdrop:insensitive:active > .label, .button.flat:backdrop:insensitive:checked > .label, .header-bar .titlebutton.button: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; }
-  .button.flat:backdrop, .header-bar .titlebutton.button:backdrop,
-  .titlebar .titlebutton.button:backdrop, .button.flat:insensitive, .header-bar .titlebutton.button:insensitive,
-  .titlebar .titlebutton.button:insensitive, .button.flat:backdrop:insensitive, .header-bar .titlebutton.button:backdrop:insensitive,
+  .button.flat:backdrop, .sidebar-button.button:backdrop, .header-bar .titlebutton.button:backdrop,
+  .titlebar .titlebutton.button:backdrop, .button.flat:insensitive, .sidebar-button.button:insensitive, .header-bar .titlebutton.button:insensitive,
+  .titlebar .titlebutton.button:insensitive, .button.flat:backdrop:insensitive, .sidebar-button.button:backdrop:insensitive, .header-bar .titlebutton.button:backdrop:insensitive,
   .titlebar .titlebutton.button:backdrop:insensitive {
     border-color: transparent;
     background-color: transparent;
@@ -544,7 +449,8 @@
     outline-color: rgba(238, 238, 236, 0.3);
     border: none;
     box-shadow: none; }
-    .button.osd.image-button, .header-bar .osd.titlebutton.button,
+    .button.osd.image-button, GtkScaleButton.button.osd,
+    GtkVolumeButton.button.osd, .header-bar .osd.titlebutton.button,
     .titlebar .osd.titlebutton.button {
       padding: 13px; }
     .button.osd:hover {
@@ -648,7 +554,7 @@
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none; }
-    .osd .button.flat, .osd .header-bar .titlebutton.button, .header-bar .osd .titlebutton.button,
+    .osd .button.flat, .osd .sidebar-button.button, .osd .header-bar .titlebutton.button, .header-bar .osd .titlebutton.button,
     .osd .titlebar .titlebutton.button,
     .titlebar .osd .titlebutton.button {
       border-color: transparent;
@@ -660,7 +566,7 @@
       box-shadow: none;
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black; }
-      .osd .button.flat:hover, .osd .header-bar .titlebutton.button:hover, .header-bar .osd .titlebutton.button:hover,
+      .osd .button.flat:hover, .osd .sidebar-button.button:hover, .osd .header-bar .titlebutton.button:hover, .header-bar .osd .titlebutton.button:hover,
       .osd .titlebar .titlebutton.button:hover,
       .titlebar .osd .titlebutton.button:hover {
         color: white;
@@ -674,7 +580,7 @@
         background-clip: padding-box;
         border-color: transparent;
         box-shadow: none; }
-      .osd .button.flat:insensitive, .osd .header-bar .titlebutton.button:insensitive, .header-bar .osd .titlebutton.button:insensitive,
+      .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;
@@ -687,7 +593,7 @@
         background-image: none;
         border-color: transparent;
         box-shadow: none; }
-      .osd .button.flat:backdrop, .osd .header-bar .titlebutton.button:backdrop, .header-bar .osd .titlebutton.button:backdrop,
+      .osd .button.flat:backdrop, .osd .sidebar-button.button:backdrop, .osd .header-bar .titlebutton.button:backdrop, .header-bar .osd .titlebutton.button:backdrop,
       .osd .titlebar .titlebutton.button:backdrop,
       .titlebar .osd .titlebutton.button:backdrop {
         border-color: transparent;
@@ -696,9 +602,9 @@
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
         text-shadow: none;
         icon-shadow: none; }
-      .osd .button.flat:active, .osd .header-bar .titlebutton.button:active, .header-bar .osd .titlebutton.button:active,
+      .osd .button.flat:active, .osd .sidebar-button.button:active, .osd .header-bar .titlebutton.button:active, .header-bar .osd .titlebutton.button:active,
       .osd .titlebar .titlebutton.button:active,
-      .titlebar .osd .titlebutton.button:active, .osd .button.flat:checked, .osd .header-bar .titlebutton.button:checked, .header-bar .osd .titlebutton.button:checked,
+      .titlebar .osd .titlebutton.button:active, .osd .button.flat:checked, .osd .sidebar-button.button:checked, .osd .header-bar .titlebutton.button:checked, .header-bar .osd .titlebutton.button:checked,
       .osd .titlebar .titlebutton.button:checked,
       .titlebar .osd .titlebutton.button:checked {
         color: white;
@@ -721,7 +627,7 @@
     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 white; }
-    .button.suggested-action.flat, .header-bar .suggested-action.titlebutton.button,
+    .button.suggested-action.flat, .suggested-action.sidebar-button.button, .header-bar .suggested-action.titlebutton.button,
     .titlebar .suggested-action.titlebutton.button {
       border-color: transparent;
       background-color: transparent;
@@ -746,7 +652,7 @@
       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 white; }
-    .button.suggested-action:backdrop, .button.suggested-action.flat:backdrop, .header-bar .suggested-action.titlebutton.button:backdrop,
+    .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;
       border-color: #4a90d9;
@@ -754,14 +660,14 @@
       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:active, .button.suggested-action:backdrop:checked, .button.suggested-action.flat:backdrop:active, .header-bar .suggested-action.titlebutton.button:backdrop:active,
-      .titlebar .suggested-action.titlebutton.button:backdrop:active, .button.suggested-action.flat:backdrop:checked, .header-bar .suggested-action.titlebutton.button:backdrop:checked,
+      .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;
         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, .header-bar .suggested-action.titlebutton.button:backdrop:insensitive,
+      .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;
@@ -770,11 +676,11 @@
         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, .header-bar .suggested-action.button.titlebutton:backdrop:insensitive > .label,
-        .titlebar .suggested-action.button.titlebutton:backdrop:insensitive > .label, .button.suggested-action.flat:backdrop:insensitive > .label, .header-bar .suggested-action.titlebutton.button: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, .header-bar .suggested-action.titlebutton.button:backdrop:insensitive:active,
-        .titlebar .suggested-action.titlebutton.button:backdrop:insensitive:active, .button.suggested-action.flat:backdrop:insensitive:checked, .header-bar .suggested-action.titlebutton.button:backdrop:insensitive:checked,
+        .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;
@@ -782,13 +688,13 @@
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
           .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, .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, .header-bar .suggested-action.titlebutton.button: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; }
-    .button.suggested-action.flat:backdrop, .header-bar .suggested-action.titlebutton.button:backdrop,
-    .titlebar .suggested-action.titlebutton.button:backdrop, .button.suggested-action.flat:insensitive, .header-bar .suggested-action.titlebutton.button:insensitive,
-    .titlebar .suggested-action.titlebutton.button:insensitive, .button.suggested-action.flat:backdrop:insensitive, .header-bar .suggested-action.titlebutton.button:backdrop:insensitive,
+    .button.suggested-action.flat:backdrop, .suggested-action.sidebar-button.button:backdrop, .header-bar .suggested-action.titlebutton.button:backdrop,
+    .titlebar .suggested-action.titlebutton.button:backdrop, .button.suggested-action.flat:insensitive, .suggested-action.sidebar-button.button:insensitive, .header-bar .suggested-action.titlebutton.button:insensitive,
+    .titlebar .suggested-action.titlebutton.button: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 {
       border-color: transparent;
       background-color: transparent;
@@ -868,7 +774,7 @@
     text-shadow: 0 -1px rgba(0, 0, 0, 0.56078);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.56078);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 1px white; }
-    .button.destructive-action.flat, .header-bar .destructive-action.titlebutton.button,
+    .button.destructive-action.flat, .destructive-action.sidebar-button.button, .header-bar .destructive-action.titlebutton.button,
     .titlebar .destructive-action.titlebutton.button {
       border-color: transparent;
       background-color: transparent;
@@ -893,7 +799,7 @@
       text-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
       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), 0 1px white; }
-    .button.destructive-action:backdrop, .button.destructive-action.flat:backdrop, .header-bar .destructive-action.titlebutton.button:backdrop,
+    .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;
       border-color: #ef2929;
@@ -901,14 +807,14 @@
       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:active, .button.destructive-action:backdrop:checked, .button.destructive-action.flat:backdrop:active, .header-bar .destructive-action.titlebutton.button:backdrop:active,
-      .titlebar .destructive-action.titlebutton.button:backdrop:active, .button.destructive-action.flat:backdrop:checked, .header-bar .destructive-action.titlebutton.button:backdrop:checked,
+      .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;
         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, .header-bar .destructive-action.titlebutton.button:backdrop:insensitive,
+      .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;
@@ -917,11 +823,11 @@
         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, .header-bar .destructive-action.button.titlebutton:backdrop:insensitive > .label,
-        .titlebar .destructive-action.button.titlebutton:backdrop:insensitive > .label, .button.destructive-action.flat:backdrop:insensitive > .label, .header-bar .destructive-action.titlebutton.button: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, .header-bar .destructive-action.titlebutton.button:backdrop:insensitive:active,
-        .titlebar .destructive-action.titlebutton.button:backdrop:insensitive:active, .button.destructive-action.flat:backdrop:insensitive:checked, .header-bar .destructive-action.titlebutton.button:backdrop:insensitive:checked,
+        .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;
           border-color: #ef3131;
@@ -929,13 +835,13 @@
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
           .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, .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, .header-bar .destructive-action.titlebutton.button: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; }
-    .button.destructive-action.flat:backdrop, .header-bar .destructive-action.titlebutton.button:backdrop,
-    .titlebar .destructive-action.titlebutton.button:backdrop, .button.destructive-action.flat:insensitive, .header-bar .destructive-action.titlebutton.button:insensitive,
-    .titlebar .destructive-action.titlebutton.button:insensitive, .button.destructive-action.flat:backdrop:insensitive, .header-bar .destructive-action.titlebutton.button:backdrop:insensitive,
+    .button.destructive-action.flat:backdrop, .destructive-action.sidebar-button.button:backdrop, .header-bar .destructive-action.titlebutton.button:backdrop,
+    .titlebar .destructive-action.titlebutton.button:backdrop, .button.destructive-action.flat:insensitive, .destructive-action.sidebar-button.button:insensitive, .header-bar .destructive-action.titlebutton.button:insensitive,
+    .titlebar .destructive-action.titlebutton.button: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 {
       border-color: transparent;
       background-color: transparent;
@@ -1006,20 +912,25 @@
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none; }
-  .button.image-button, .header-bar .titlebutton.button,
+  .button.image-button, GtkScaleButton.button,
+  GtkVolumeButton.button, .header-bar .titlebutton.button,
   .titlebar .titlebutton.button {
     padding: 8px; }
-  .button.text-button, .header-bar .text-button.button.titlebutton,
+  .button.text-button, GtkScaleButton.button.text-button,
+  GtkVolumeButton.button.text-button, .header-bar .text-button.button.titlebutton,
   .titlebar .text-button.button.titlebutton {
     padding-left: 16px;
     padding-right: 16px; }
-  .button.text-button.image-button, .header-bar .text-button.titlebutton.button,
+  .button.text-button.image-button, GtkScaleButton.button.text-button,
+  GtkVolumeButton.button.text-button, .header-bar .text-button.titlebutton.button,
   .titlebar .text-button.titlebutton.button {
     padding: 5px 8px 6px; }
-    .button.text-button.image-button .label:first-child, .header-bar .text-button.titlebutton.button .label:first-child,
+    .button.text-button.image-button .label:first-child, GtkScaleButton.button.text-button .label:first-child,
+    GtkVolumeButton.button.text-button .label:first-child, .header-bar .text-button.titlebutton.button .label:first-child,
     .titlebar .text-button.titlebutton.button .label:first-child {
       padding-left: 8px; }
-    .button.text-button.image-button .label:last-child, .header-bar .text-button.titlebutton.button .label:last-child,
+    .button.text-button.image-button .label:last-child, GtkScaleButton.button.text-button .label:last-child,
+    GtkVolumeButton.button.text-button .label:last-child, .header-bar .text-button.titlebutton.button .label:last-child,
     .titlebar .text-button.titlebutton.button .label:last-child {
       padding-right: 8px; }
   .stack-switcher > .button, .header-bar .stack-switcher > .button.titlebutton,
@@ -1037,7 +948,8 @@
     .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, .header-bar .stack-switcher > .titlebutton.button,
+    .stack-switcher > .button.image-button, .stack-switcher > GtkScaleButton.button,
+    .stack-switcher > GtkVolumeButton.button, .header-bar .stack-switcher > .titlebutton.button,
     .titlebar .stack-switcher > .titlebutton.button {
       padding: 5px 2px; }
     .stack-switcher > .button.needs-attention:active > .label, .stack-switcher > .button.needs-attention:active > GtkImage, .stack-switcher > .button.needs-attention:checked > .label, .stack-switcher > .button.needs-attention:checked > GtkImage {
@@ -1147,157 +1059,140 @@
     .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active > .label, .inline-toolbar GtkToolButton > .button:backdrop:insensitive:checked > .label {
       color: inherit; }
 
-.inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.search-bar GtkToolButton > .button.flat, .inline-toolbar.location-bar GtkToolButton > .button.flat, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton > .button.titlebutton,
+.inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.search-bar GtkToolButton > .button.flat, .inline-toolbar.location-bar GtkToolButton > .button.flat, .inline-toolbar.toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton > .sidebar-button.button, .inline-toolbar.location-bar GtkToolButton > .sidebar-button.button, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton > .button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton > .button.titlebutton,
 .titlebar .inline-toolbar GtkToolButton > .button.titlebutton,
 .inline-toolbar.toolbar GtkToolButton:backdrop > .button.flat,
 .inline-toolbar GtkToolButton:backdrop > .button.flat,
 .inline-toolbar.search-bar GtkToolButton:backdrop > .button.flat,
 .inline-toolbar.location-bar GtkToolButton:backdrop > .button.flat,
+.inline-toolbar.toolbar GtkToolButton:backdrop > .sidebar-button.button,
+.inline-toolbar GtkToolButton:backdrop > .sidebar-button.button,
+.inline-toolbar.search-bar GtkToolButton:backdrop > .sidebar-button.button,
+.inline-toolbar.location-bar GtkToolButton:backdrop > .sidebar-button.button,
 .inline-toolbar .header-bar GtkToolButton:backdrop > .button.titlebutton,
 .header-bar .inline-toolbar GtkToolButton:backdrop > .button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:backdrop > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:backdrop > .button.titlebutton, .osd .button:hover, .osd .button:active, .osd .button:checked, .osd .button:backdrop:active, .osd .button:backdrop:checked, .osd .button:insensitive, .osd .button:backdrop:insensitive, .osd .button:backdrop, .osd .button.suggested-action, .osd .button.suggested-action:hover, .osd .button.suggested-action:active, .osd .button.suggested-action:checked, .osd .button.suggested-action:backdrop:active, .osd .button.suggested-action:backdrop:checked, .osd .button.suggested-action:insensitive, .osd .button.suggested-action:backdrop:insensitive, .osd .button.suggested-action:backdrop, .osd .button.destructive-action, .osd .button.destructive-action:hover, .osd .button.destructive-action:active, .osd .button.destructive-action:checked, .osd .button.destructive-action:backdrop:active, .osd .button.destructive-action:backdrop:checked, .osd .button.destructive-action:insensitive, .osd .button.destructive-action:backdrop:insensitive, .osd .button.destructive-action:backdrop, .inline-toolbar .button, .inline-toolbar .header-bar .button.titlebutton, .header-bar .inline-toolbar .button.titlebutton,
+.titlebar .inline-toolbar GtkToolButton:backdrop > .button.titlebutton, .linked:not(.vertical) > .entry, .osd .button:hover, .osd .button:active, .osd .button:checked, .osd .button:backdrop:active, .osd .button:backdrop:checked, .osd .button:insensitive, .osd .button:backdrop:insensitive, .osd .button:backdrop, .osd .button.suggested-action, .osd .button.suggested-action:hover, .osd .button.suggested-action:active, .osd .button.suggested-action:checked, .osd .button.suggested-action:backdrop:active, .osd .button.suggested-action:backdrop:checked, .osd .button.suggested-action:insensitive, .osd .button.suggested-action:backdrop:insensitive, .osd .button.suggested-action:backdrop, .osd .button.destructive-action, .osd .button.destructive-action:hover, .osd .button.destructive-action:active, .osd .button.destructive-action:checked, .osd .button.destructive-action:backdrop:active, .osd .button.destructive-action:backdrop:checked, .osd .button.destructive-action:insensitive, .osd .button.destructive-action:backdrop:insensitive, .osd .button.destructive-action:backdrop, .inline-toolbar .button, .inline-toolbar .header-bar .button.titlebutton, .header-bar .inline-toolbar .button.titlebutton,
 .inline-toolbar .titlebar .button.titlebutton,
 .titlebar .inline-toolbar .button.titlebutton, .inline-toolbar .button:backdrop, .linked > .button, .header-bar .linked > .button.titlebutton,
-.titlebar .linked > .button.titlebutton, .linked > .button:hover, .linked > .button:active, .linked > .button:checked, .linked > .button:backdrop, GtkComboBox.combobox-entry .entry, GtkComboBox.combobox-entry .button, GtkComboBox.combobox-entry .header-bar .button.titlebutton, .header-bar GtkComboBox.combobox-entry .button.titlebutton,
-GtkComboBox.combobox-entry .titlebar .button.titlebutton,
-.titlebar GtkComboBox.combobox-entry .button.titlebutton, GtkComboBox.combobox-entry .button:backdrop, .linked > GtkComboBox > .button:dir(ltr) {
+.titlebar .linked > .button.titlebutton, .linked > .button:hover, .linked > .button:active, .linked > .button:checked, .linked > .button:backdrop, .linked > GtkComboBox > .the-button-in-the-combobox:dir(ltr), .linked > GtkComboBox > .the-button-in-the-combobox:dir(rtl),
+.linked > GtkComboBoxText > .the-button-in-the-combobox:dir(ltr),
+.linked > GtkComboBoxText > .the-button-in-the-combobox:dir(rtl) {
   border-radius: 0;
-  border-left-style: none; }
-  .inline-toolbar GtkToolButton > .button.flat:dir(rtl), .inline-toolbar .header-bar GtkToolButton > .button.titlebutton:dir(rtl), .header-bar .inline-toolbar GtkToolButton > .button.titlebutton:dir(rtl),
-  .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:dir(rtl),
-  .titlebar .inline-toolbar GtkToolButton > .button.titlebutton:dir(rtl),
-  .inline-toolbar GtkToolButton:backdrop > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar.search-bar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar.location-bar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar .header-bar GtkToolButton:dir(rtl) > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:dir(rtl) > .button.titlebutton,
-  .inline-toolbar .titlebar GtkToolButton:dir(rtl) > .button.titlebutton,
-  .titlebar .inline-toolbar GtkToolButton:dir(rtl) > .button.titlebutton,
-  .inline-toolbar.toolbar GtkToolButton:backdrop:dir(rtl) > .button.flat,
-  .inline-toolbar GtkToolButton:backdrop:dir(rtl) > .button.flat,
-  .inline-toolbar.search-bar GtkToolButton:backdrop:dir(rtl) > .button.flat,
-  .inline-toolbar.location-bar GtkToolButton:backdrop:dir(rtl) > .button.flat,
-  .inline-toolbar .header-bar GtkToolButton:backdrop:dir(rtl) > .button.titlebutton,
-  .header-bar .inline-toolbar GtkToolButton:backdrop:dir(rtl) > .button.titlebutton,
-  .inline-toolbar .titlebar GtkToolButton:backdrop:dir(rtl) > .button.titlebutton,
-  .titlebar .inline-toolbar GtkToolButton:backdrop:dir(rtl) > .button.titlebutton, .osd .button:dir(rtl):hover, .osd .button:dir(rtl):active, .osd .button:dir(rtl):checked, .osd .button:dir(rtl):insensitive, .osd .button:dir(rtl):backdrop, .osd .button.suggested-action:dir(rtl), .osd .button.destructive-action:dir(rtl), .inline-toolbar .button:dir(rtl), .linked > .button:dir(rtl), .header-bar .linked > .button.titlebutton:dir(rtl),
-  .titlebar .linked > .button.titlebutton:dir(rtl), GtkComboBox.combobox-entry .entry:dir(rtl), GtkComboBox.combobox-entry .button:dir(rtl), .linked > GtkComboBox > .button:dir(rtl) {
-    border-radius: 0;
-    border-right-style: none;
-    border-left-style: solid; }
+  border-right-style: none; }
 
-.osd .button:first-child:hover, .osd .button:first-child:active, .osd .button:first-child:checked, .osd .button:first-child:insensitive, .osd .button:first-child:backdrop, .osd .button.suggested-action:first-child, .osd .button.destructive-action: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 .header-bar GtkToolButton:first-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:first-child > .button.titlebutton,
+.linked:not(.vertical) > .entry:first-child, .osd .button:first-child:hover, .osd .button:first-child:active, .osd .button:first-child:checked, .osd .button:first-child:insensitive, .osd .button:first-child:backdrop, .osd .button.suggested-action:first-child, .osd .button.destructive-action: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,
 .inline-toolbar GtkToolButton:backdrop:first-child > .button.flat,
 .inline-toolbar.search-bar GtkToolButton:backdrop:first-child > .button.flat,
 .inline-toolbar.location-bar GtkToolButton:backdrop:first-child > .button.flat,
+.inline-toolbar.toolbar GtkToolButton:backdrop:first-child > .sidebar-button.button,
+.inline-toolbar GtkToolButton:backdrop:first-child > .sidebar-button.button,
+.inline-toolbar.search-bar GtkToolButton:backdrop:first-child > .sidebar-button.button,
+.inline-toolbar.location-bar GtkToolButton:backdrop:first-child > .sidebar-button.button,
 .inline-toolbar .header-bar GtkToolButton:backdrop:first-child > .button.titlebutton,
 .header-bar .inline-toolbar GtkToolButton:backdrop:first-child > .button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:backdrop:first-child > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:backdrop:first-child > .button.titlebutton, GtkComboBox.combobox-entry .entry:first-child, GtkComboBox.combobox-entry .button:first-child, .linked > GtkComboBox:first-child > .button {
-  border-radius: 3px 0 0 3px;
-  border-left-style: solid; }
-.osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .osd .button:last-child:backdrop, .osd .button.suggested-action:last-child, .osd .button.destructive-action: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 .header-bar GtkToolButton:last-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:last-child > .button.titlebutton,
+.titlebar .inline-toolbar GtkToolButton:backdrop:first-child > .button.titlebutton, .linked > GtkComboBox:first-child > .the-button-in-the-combobox,
+.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, .osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .osd .button:last-child:backdrop, .osd .button.suggested-action:last-child, .osd .button.destructive-action: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,
 .inline-toolbar GtkToolButton:backdrop:last-child > .button.flat,
 .inline-toolbar.search-bar GtkToolButton:backdrop:last-child > .button.flat,
 .inline-toolbar.location-bar GtkToolButton:backdrop:last-child > .button.flat,
+.inline-toolbar.toolbar GtkToolButton:backdrop:last-child > .sidebar-button.button,
+.inline-toolbar GtkToolButton:backdrop:last-child > .sidebar-button.button,
+.inline-toolbar.search-bar GtkToolButton:backdrop:last-child > .sidebar-button.button,
+.inline-toolbar.location-bar GtkToolButton:backdrop:last-child > .sidebar-button.button,
 .inline-toolbar .header-bar GtkToolButton:backdrop:last-child > .button.titlebutton,
 .header-bar .inline-toolbar GtkToolButton:backdrop:last-child > .button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:backdrop:last-child > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:backdrop:last-child > .button.titlebutton, GtkComboBox.combobox-entry .entry:last-child, GtkComboBox.combobox-entry .button:last-child, .linked > GtkComboBox:last-child > .button {
-  border-radius: 0 3px 3px 0; }
-  .osd .button:last-child:dir(rtl):hover, .osd .button:last-child:dir(rtl):active, .osd .button:last-child:dir(rtl):checked, .osd .button:last-child:dir(rtl):insensitive, .osd .button:last-child:dir(rtl):backdrop, .osd .button.suggested-action:last-child:dir(rtl), .osd .button.destructive-action:last-child:dir(rtl), .inline-toolbar .button:last-child:dir(rtl), .linked > .button:last-child:dir(rtl), .header-bar .linked > .button.titlebutton:last-child:dir(rtl),
-  .titlebar .linked > .button.titlebutton:last-child:dir(rtl), .inline-toolbar GtkToolButton:last-child > .button.flat:dir(rtl), .inline-toolbar .header-bar GtkToolButton:last-child > .button.titlebutton:dir(rtl), .header-bar .inline-toolbar GtkToolButton:last-child > .button.titlebutton:dir(rtl),
-  .inline-toolbar .titlebar GtkToolButton:last-child > .button.titlebutton:dir(rtl),
-  .titlebar .inline-toolbar GtkToolButton:last-child > .button.titlebutton:dir(rtl),
-  .inline-toolbar GtkToolButton:backdrop:last-child > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.search-bar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.location-bar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar .header-bar GtkToolButton:last-child:dir(rtl) > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.titlebutton,
-  .inline-toolbar .titlebar GtkToolButton:last-child:dir(rtl) > .button.titlebutton,
-  .titlebar .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.titlebutton,
-  .inline-toolbar.toolbar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat,
-  .inline-toolbar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat,
-  .inline-toolbar.search-bar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat,
-  .inline-toolbar.location-bar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat,
-  .inline-toolbar .header-bar GtkToolButton:backdrop:last-child:dir(rtl) > .button.titlebutton,
-  .header-bar .inline-toolbar GtkToolButton:backdrop:last-child:dir(rtl) > .button.titlebutton,
-  .inline-toolbar .titlebar GtkToolButton:backdrop:last-child:dir(rtl) > .button.titlebutton,
-  .titlebar .inline-toolbar GtkToolButton:backdrop:last-child:dir(rtl) > .button.titlebutton, GtkComboBox.combobox-entry .entry:last-child:dir(rtl), GtkComboBox.combobox-entry .button:last-child:dir(rtl), .linked > GtkComboBox:last-child > .button:dir(rtl) {
-    border-right-style: solid; }
-.osd .button:only-child:hover, .osd .button:only-child:active, .osd .button:only-child:checked, .osd .button:only-child:insensitive, .osd .button:only-child:backdrop, .osd .button.suggested-action:only-child, .osd .button.destructive-action: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 .header-bar GtkToolButton:only-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:only-child > .button.titlebutton,
+.titlebar .inline-toolbar GtkToolButton:backdrop:last-child > .button.titlebutton, .linked > GtkComboBox:last-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:last-child > .the-button-in-the-combobox {
+  border-top-right-radius: 3px;
+  border-bottom-right-radius: 3px;
+  border-right-style: solid; }
+.linked:not(.vertical) > .entry:only-child, .osd .button:only-child:hover, .osd .button:only-child:active, .osd .button:only-child:checked, .osd .button:only-child:insensitive, .osd .button:only-child:backdrop, .osd .button.suggested-action:only-child, .osd .button.destructive-action: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,
 .inline-toolbar GtkToolButton:backdrop:only-child > .button.flat,
 .inline-toolbar.search-bar GtkToolButton:backdrop:only-child > .button.flat,
 .inline-toolbar.location-bar GtkToolButton:backdrop:only-child > .button.flat,
+.inline-toolbar.toolbar GtkToolButton:backdrop:only-child > .sidebar-button.button,
+.inline-toolbar GtkToolButton:backdrop:only-child > .sidebar-button.button,
+.inline-toolbar.search-bar GtkToolButton:backdrop:only-child > .sidebar-button.button,
+.inline-toolbar.location-bar GtkToolButton:backdrop:only-child > .sidebar-button.button,
 .inline-toolbar .header-bar GtkToolButton:backdrop:only-child > .button.titlebutton,
 .header-bar .inline-toolbar GtkToolButton:backdrop:only-child > .button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:backdrop:only-child > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:backdrop:only-child > .button.titlebutton, GtkComboBox.combobox-entry .entry:only-child, GtkComboBox.combobox-entry .button:only-child, .linked > GtkComboBox:only-child > .button {
+.titlebar .inline-toolbar GtkToolButton:backdrop:only-child > .button.titlebutton, .linked > GtkComboBox:only-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:only-child > .the-button-in-the-combobox {
   border-radius: 3px;
   border-style: solid; }
 
-.linked.vertical > .entry, .linked.vertical > .entry:focus, .linked.vertical > .entry:insensitive, .linked.vertical > .entry:insensitive:backdrop, .linked.vertical > .entry:backdrop, .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 > .button,
-.linked.vertical > GtkComboBox > .button {
-  border-left-style: solid;
-  border-top-style: none;
+.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, .header-bar .linked.vertical > .button.titlebutton:first-child,
-.titlebar .linked.vertical > .button.titlebutton:first-child, .linked.vertical > GtkComboBoxText:first-child > .button,
-.linked.vertical > GtkComboBox:first-child > .button {
-  border-style: solid;
-  border-radius: 3px 3px 0 0; }
+.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, .header-bar .linked.vertical > .button.titlebutton:last-child,
-.titlebar .linked.vertical > .button.titlebutton:last-child, .linked.vertical > GtkComboBoxText:last-child > .button,
-.linked.vertical > GtkComboBox:last-child > .button {
-  border-radius: 0 0 3px 3px; }
+.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, .header-bar .linked.vertical > .button.titlebutton:only-child,
-.titlebar .linked.vertical > .button.titlebutton:only-child, .linked.vertical > GtkComboBoxText:only-child > .button,
-.linked.vertical > GtkComboBox:only-child > .button {
+.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; }
 
-.menuitem.button.flat, .header-bar .menuitem.titlebutton.button,
-.titlebar .menuitem.titlebutton.button, .menuitem.button.flat:backdrop, .menuitem.button.flat:backdrop:hover, .header-bar .menuitem.titlebutton.button:backdrop:hover,
+.menuitem.button.flat, .menuitem.sidebar-button.button, .header-bar .menuitem.titlebutton.button,
+.titlebar .menuitem.titlebutton.button, .menuitem.button.flat:backdrop, .menuitem.sidebar-button.button:backdrop, .menuitem.button.flat:backdrop:hover, .menuitem.sidebar-button.button:backdrop:hover, .header-bar .menuitem.titlebutton.button:backdrop:hover,
 .titlebar .menuitem.titlebutton.button:backdrop:hover, .button:link, .header-bar .button.titlebutton:link,
 .titlebar .button.titlebutton:link, .button:visited, .header-bar .button.titlebutton:visited,
 .titlebar .button.titlebutton:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .button:link:backdrop, .button:visited:backdrop, .menu.button, .header-bar .menu.button.titlebutton,
 .titlebar .menu.button.titlebutton, .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, .list-row.button, .header-bar .list-row.button.titlebutton,
-.titlebar .list-row.button.titlebutton,
-.list-row.button:backdrop,
-.list-row.button:backdrop:active,
-.list-row.button:backdrop:checked,
-.list-row.button:backdrop:insensitive,
-.list-row.button:backdrop:insensitive:active,
-.list-row.button:backdrop:insensitive:checked,
-.list-row.button:insensitive:active,
-.list-row.button:insensitive:checked, .app-notification .button.flat, .app-notification .header-bar .titlebutton.button, .header-bar .app-notification .titlebutton.button,
+.titlebar .notebook tab .button.titlebutton, .app-notification .button.flat, .app-notification .sidebar-button.button, .app-notification .header-bar .titlebutton.button, .header-bar .app-notification .titlebutton.button,
 .app-notification .titlebar .titlebutton.button,
 .titlebar .app-notification .titlebutton.button,
-.app-notification.frame .button.flat, .app-notification .button.flat:backdrop, .app-notification .button.flat:insensitive, .app-notification .button.flat:backdrop:insensitive, .app-notification .header-bar .titlebutton.button:backdrop:insensitive, .header-bar .app-notification .titlebutton.button:backdrop:insensitive,
+.app-notification.frame .button.flat,
+.app-notification.frame .sidebar-button.button, .app-notification .button.flat:backdrop, .app-notification .sidebar-button.button:backdrop, .app-notification .button.flat:insensitive, .app-notification .sidebar-button.button:insensitive, .app-notification .button.flat:backdrop:insensitive, .app-notification .sidebar-button.button:backdrop:insensitive, .app-notification .header-bar .titlebutton.button:backdrop:insensitive, .header-bar .app-notification .titlebutton.button:backdrop:insensitive,
 .app-notification .titlebar .titlebutton.button:backdrop:insensitive,
 .titlebar .app-notification .titlebutton.button:backdrop:insensitive,
 .app-notification.frame .button.flat:backdrop,
+.app-notification.frame .sidebar-button.button:backdrop,
 .app-notification.frame .header-bar .button.titlebutton:backdrop,
 .header-bar .app-notification.frame .button.titlebutton:backdrop,
 .app-notification.frame .titlebar .button.titlebutton:backdrop,
 .titlebar .app-notification.frame .button.titlebutton:backdrop,
 .app-notification.frame .button.flat:insensitive,
+.app-notification.frame .sidebar-button.button:insensitive,
 .app-notification.frame .header-bar .button.titlebutton:insensitive,
 .header-bar .app-notification.frame .button.titlebutton:insensitive,
 .app-notification.frame .titlebar .button.titlebutton:insensitive,
 .titlebar .app-notification.frame .button.titlebutton:insensitive,
-.app-notification.frame .button.flat:backdrop:insensitive, GtkCalendar.button, .header-bar GtkCalendar.button.titlebutton,
-.titlebar GtkCalendar.button.titlebutton, GtkCalendar.button:hover, GtkCalendar.button:backdrop, .scale-popup .button:hover, .scale-popup .button:backdrop, .scale-popup .button:backdrop:hover, .scale-popup .button:backdrop:insensitive {
+.app-notification.frame .button.flat:backdrop:insensitive,
+.app-notification.frame .sidebar-button.button:backdrop:insensitive, GtkCalendar.button, .header-bar GtkCalendar.button.titlebutton,
+.titlebar GtkCalendar.button.titlebutton, GtkCalendar.button:hover, GtkCalendar.button:backdrop, GtkCalendar.button:insensitive, .scale-popup .button:hover, .scale-popup .button:backdrop, .scale-popup .button:backdrop:hover, .scale-popup .button:backdrop:insensitive {
   border-color: transparent;
   background-color: transparent;
   background-image: none;
@@ -1306,10 +1201,10 @@
   icon-shadow: none; }
 
 /* menu buttons */
-.menuitem.button.flat, .header-bar .menuitem.titlebutton.button,
+.menuitem.button.flat, .menuitem.sidebar-button.button, .header-bar .menuitem.titlebutton.button,
 .titlebar .menuitem.titlebutton.button {
   outline-offset: -1px; }
-  .menuitem.button.flat:hover, .header-bar .menuitem.titlebutton.button:hover,
+  .menuitem.button.flat:hover, .menuitem.sidebar-button.button:hover, .header-bar .menuitem.titlebutton.button:hover,
   .titlebar .menuitem.titlebutton.button:hover {
     background-color: #d9dada; }
 
@@ -1355,6 +1250,10 @@
   text-shadow: none; }
   .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked {
     text-shadow: none; }
+  .button:link > .label, .header-bar .button.titlebutton:link > .label,
+  .titlebar .button.titlebutton:link > .label, .button:visited > .label, .header-bar .button.titlebutton:visited > .label,
+  .titlebar .button.titlebutton:visited > .label {
+    text-decoration-line: underline; }
 
 /*****************
  * GtkSpinButton *
@@ -1562,11 +1461,9 @@
 GtkComboBox {
   -GtkComboBox-arrow-scaling: 0.5;
   -GtkComboBox-shadow-type: none;
-  box-shadow: 0 1px white;
   text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); }
-  GtkComboBox > .button, .header-bar GtkComboBox > .button.titlebutton,
-  .titlebar GtkComboBox > .button.titlebutton {
+  GtkComboBox > .the-button-in-the-combobox {
     padding-top: 3px;
     padding-bottom: 4px; }
   GtkComboBox:insensitive {
@@ -1581,8 +1478,22 @@
     color: #c7c7c7; }
   GtkComboBox .menuitem {
     text-shadow: none; }
-  GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .view .vertical.separator, GtkPlacesSidebar.sidebar .view GtkComboBox .vertical.separator {
+  GtkComboBox .separator.vertical {
     -GtkWidget-wide-separators: true; }
+  GtkComboBox.combobox-entry .entry:dir(ltr) {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0; }
+  GtkComboBox.combobox-entry .entry:dir(rtl) {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0; }
+  GtkComboBox.combobox-entry .button:dir(ltr) {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+    border-left-style: none; }
+  GtkComboBox.combobox-entry .button:dir(rtl) {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+    border-right-style: none; }
 
 /************
  * Toolbars *
@@ -1646,10 +1557,8 @@
     padding-left: 12px;
     padding-right: 12px; }
   .titlebar .header-bar-separator, .titlebar > GtkBox > .separator.vertical,
-  GtkPlacesSidebar.sidebar .view .titlebar > GtkBox > .vertical.separator:backdrop,
   .header-bar .header-bar-separator,
-  .header-bar > GtkBox > .separator.vertical,
-  GtkPlacesSidebar.sidebar .view .header-bar > GtkBox > .vertical.separator:backdrop {
+  .header-bar > GtkBox > .separator.vertical {
     -GtkWidget-wide-separators: true;
     -GtkWidget-separator-width: 1px;
     border-width: 0 1px;
@@ -1678,9 +1587,10 @@
       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; }
-      .titlebar.selection-mode .button.flat,
+      .titlebar.selection-mode .button.flat, .titlebar.selection-mode .sidebar-button.button,
       .titlebar.selection-mode .titlebutton.button,
       .header-bar.selection-mode .button.flat,
+      .header-bar.selection-mode .sidebar-button.button,
       .header-bar.selection-mode .titlebutton.button {
         border-color: transparent;
         background-color: transparent;
@@ -1707,10 +1617,11 @@
         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; }
-      .titlebar.selection-mode .button:backdrop, .titlebar.selection-mode .button.flat:backdrop,
+      .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;
         border-color: #4a90d9;
@@ -1720,24 +1631,27 @@
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(164, 199, 236, 0);
         -gtk-image-effect: none;
         border-color: #184472; }
-        .titlebar.selection-mode .button:backdrop:active, .titlebar.selection-mode .button:backdrop:checked, .titlebar.selection-mode .button.flat:backdrop:active,
-        .titlebar.selection-mode .titlebutton.button:backdrop:active, .titlebar.selection-mode .button.flat:backdrop:checked,
+        .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,
+        .titlebar.selection-mode .titlebutton.button:backdrop:active, .titlebar.selection-mode .button.flat:backdrop:checked, .titlebar.selection-mode .sidebar-button.button:backdrop:checked,
         .titlebar.selection-mode .titlebutton.button:backdrop:checked,
         .header-bar.selection-mode .button:backdrop:active,
         .header-bar.selection-mode .button:backdrop:checked,
         .header-bar.selection-mode .button.flat:backdrop:active,
+        .header-bar.selection-mode .sidebar-button.button:backdrop:active,
         .header-bar.selection-mode .titlebutton.button:backdrop:active,
         .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;
           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);
           border-color: #184472; }
-        .titlebar.selection-mode .button:backdrop:insensitive, .titlebar.selection-mode .button.flat:backdrop:insensitive,
+        .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,
         .header-bar.selection-mode .button:backdrop:insensitive,
         .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;
@@ -1746,51 +1660,59 @@
           icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(164, 199, 236, 0);
           border-color: #184472; }
-          .titlebar.selection-mode .button:backdrop:insensitive > .label, .titlebar.selection-mode .header-bar .button.titlebutton:backdrop:insensitive > .label, .titlebar.selection-mode .button.flat:backdrop:insensitive > .label, .titlebar.selection-mode .header-bar .titlebutton.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 .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 .titlebutton.button:backdrop:insensitive:active, .titlebar.selection-mode .button.flat:backdrop:insensitive:checked,
+        .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,
         .titlebar.selection-mode .titlebutton.button:backdrop:insensitive:checked,
         .header-bar.selection-mode .button:backdrop:insensitive:active,
         .header-bar.selection-mode .button:backdrop:insensitive:checked,
         .header-bar.selection-mode .button.flat:backdrop:insensitive:active,
+        .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive:active,
         .header-bar.selection-mode .titlebutton.button:backdrop:insensitive:active,
         .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);
           border-color: #184472; }
-          .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 .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 .header-bar .titlebutton.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 .titlebar .titlebutton.button:backdrop:insensitive:checked > .label {
             color: inherit; }
-      .titlebar.selection-mode .button.flat:backdrop,
-      .titlebar.selection-mode .titlebutton.button:backdrop, .titlebar.selection-mode .button.flat:insensitive,
-      .titlebar.selection-mode .titlebutton.button:insensitive, .titlebar.selection-mode .button.flat:insensitive:backdrop,
+      .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,
+      .titlebar.selection-mode .titlebutton.button:insensitive, .titlebar.selection-mode .button.flat:insensitive:backdrop, .titlebar.selection-mode .sidebar-button.button:insensitive:backdrop,
       .titlebar.selection-mode .titlebutton.button:insensitive:backdrop,
       .header-bar.selection-mode .button.flat:backdrop,
+      .header-bar.selection-mode .sidebar-button.button:backdrop,
       .header-bar.selection-mode .titlebutton.button:backdrop,
       .header-bar.selection-mode .button.flat:insensitive,
+      .header-bar.selection-mode .sidebar-button.button:insensitive,
       .header-bar.selection-mode .titlebutton.button:insensitive,
       .header-bar.selection-mode .button.flat:insensitive:backdrop,
+      .header-bar.selection-mode .sidebar-button.button:insensitive:backdrop,
       .header-bar.selection-mode .titlebutton.button:insensitive:backdrop {
         border-color: transparent;
         background-color: transparent;
@@ -2103,6 +2025,8 @@
   border: 1px solid #a1a1a1; }
   .csd .menu {
     border: none; }
+  .menu:backdrop {
+    background-color: white; }
   .menu .menuitem {
     text-shadow: none;
     padding: 4px; }
@@ -2115,7 +2039,7 @@
         color: #c7c7c7; }
     .menu .menuitem:backdrop, .menu .menuitem:backdrop:hover {
       color: #8d9091;
-      background-color: white; }
+      background-color: transparent; }
     .menu .menuitem.arrow {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
     .menu .menuitem.arrow:dir(rtl) {
@@ -2157,10 +2081,11 @@
   .popover > .location-bar, .popover.osd > .toolbar, .popover.osd > .inline-toolbar, .popover.osd > .search-bar, .popover.osd > .location-bar {
     border-style: none;
     background-color: transparent; }
-  .popover .button.flat, .popover .header-bar .titlebutton.button, .header-bar .popover .titlebutton.button,
+  .popover .button.flat, .popover .sidebar-button.button, .popover .header-bar .titlebutton.button, .header-bar .popover .titlebutton.button,
   .popover .titlebar .titlebutton.button,
   .titlebar .popover .titlebutton.button,
   .popover .button.flat:hover,
+  .popover .sidebar-button.button:hover,
   .popover .header-bar .titlebutton.button:hover,
   .header-bar .popover .titlebutton.button:hover,
   .popover .titlebar .titlebutton.button:hover,
@@ -2168,19 +2093,6 @@
     text-shadow: none;
     transition: none; }
 
-.entry.cursor-handle,
-.cursor-handle {
-  background-color: transparent;
-  background-image: none;
-  box-shadow: none;
-  border-style: none; }
-  .entry.cursor-handle.top,
-  .cursor-handle.top {
-    -gtk-icon-source: -gtk-icontheme("selection-start-symbolic"); }
-  .entry.cursor-handle.bottom,
-  .cursor-handle.bottom {
-    -gtk-icon-source: -gtk-icontheme("selection-end-symbolic"); }
-
 /*****************
  * Notebooks and *
  * Tabs          *
@@ -2537,6 +2449,7 @@
  **********/
 GtkSwitch {
   -GtkSwitch-slider-width: 45px;
+  -GtkSwitch-slider-height: 27px;
   font-weight: bold;
   font-size: smaller;
   outline-offset: -4px;
@@ -2645,7 +2558,7 @@
 .check {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked.png"), url("assets/checkbox-unchecked@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .check.button.flat, .header-bar .check.titlebutton.button,
+  .check.button.flat, .check.sidebar-button.button, .header-bar .check.titlebutton.button,
   .titlebar .check.titlebutton.button {
     icon-shadow: none; }
 
@@ -2656,7 +2569,7 @@
 .check:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-hover.png"), url("assets/checkbox-unchecked-hover@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .check:hover.button.flat, .header-bar .check.titlebutton.button:hover,
+  .check:hover.button.flat, .check.sidebar-button.button:hover, .header-bar .check.titlebutton.button:hover,
   .titlebar .check.titlebutton.button:hover {
     icon-shadow: none; }
 
@@ -2667,7 +2580,7 @@
 .check:active {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-active.png"), url("assets/checkbox-unchecked-active@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .check:active.button.flat, .header-bar .check.titlebutton.button:active,
+  .check:active.button.flat, .check.sidebar-button.button:active, .header-bar .check.titlebutton.button:active,
   .titlebar .check.titlebutton.button:active {
     icon-shadow: none; }
 
@@ -2678,7 +2591,7 @@
 .check:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive.png"), url("assets/checkbox-unchecked-insensitive@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .check:insensitive.button.flat, .header-bar .check.titlebutton.button:insensitive,
+  .check:insensitive.button.flat, .check.sidebar-button.button:insensitive, .header-bar .check.titlebutton.button:insensitive,
   .titlebar .check.titlebutton.button:insensitive {
     icon-shadow: none; }
 
@@ -2689,7 +2602,7 @@
 .check:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-backdrop.png"), url("assets/checkbox-unchecked-backdrop@2.png"));
   icon-shadow: none; }
-  .check:backdrop.button.flat, .header-bar .check.titlebutton.button:backdrop,
+  .check:backdrop.button.flat, .check.sidebar-button.button:backdrop, .header-bar .check.titlebutton.button:backdrop,
   .titlebar .check.titlebutton.button:backdrop {
     icon-shadow: none; }
 
@@ -2700,7 +2613,7 @@
 .check:backdrop:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-backdrop-insensitive.png"), url("assets/checkbox-unchecked-backdrop-insensitive@2.png"));
   icon-shadow: none; }
-  .check:backdrop:insensitive.button.flat, .header-bar .check.titlebutton.button:backdrop:insensitive,
+  .check:backdrop:insensitive.button.flat, .check.sidebar-button.button:backdrop:insensitive, .header-bar .check.titlebutton.button:backdrop:insensitive,
   .titlebar .check.titlebutton.button:backdrop:insensitive {
     icon-shadow: none; }
 
@@ -2711,7 +2624,7 @@
 .check:inconsistent {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed.png"), url("assets/checkbox-mixed@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .check:inconsistent.button.flat, .header-bar .check.titlebutton.button:inconsistent,
+  .check:inconsistent.button.flat, .check.sidebar-button.button:inconsistent, .header-bar .check.titlebutton.button:inconsistent,
   .titlebar .check.titlebutton.button:inconsistent {
     icon-shadow: none; }
 
@@ -2722,7 +2635,7 @@
 .check:inconsistent:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-hover.png"), url("assets/checkbox-mixed-hover@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .check:inconsistent:hover.button.flat, .header-bar .check.titlebutton.button:inconsistent:hover,
+  .check:inconsistent:hover.button.flat, .check.sidebar-button.button:inconsistent:hover, .header-bar .check.titlebutton.button:inconsistent:hover,
   .titlebar .check.titlebutton.button:inconsistent:hover {
     icon-shadow: none; }
 
@@ -2733,7 +2646,7 @@
 .check:inconsistent:selected {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-active.png"), url("assets/checkbox-mixed-active@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .check:inconsistent:selected.button.flat, .header-bar .check.titlebutton.button:inconsistent:selected,
+  .check:inconsistent:selected.button.flat, .check.sidebar-button.button:inconsistent:selected, .header-bar .check.titlebutton.button:inconsistent:selected,
   .titlebar .check.titlebutton.button:inconsistent:selected {
     icon-shadow: none; }
 
@@ -2744,7 +2657,7 @@
 .check:inconsistent:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-backdrop.png"), url("assets/checkbox-mixed-backdrop@2.png"));
   icon-shadow: none; }
-  .check:inconsistent:backdrop.button.flat, .header-bar .check.titlebutton.button:inconsistent:backdrop,
+  .check:inconsistent:backdrop.button.flat, .check.sidebar-button.button:inconsistent:backdrop, .header-bar .check.titlebutton.button:inconsistent:backdrop,
   .titlebar .check.titlebutton.button:inconsistent:backdrop {
     icon-shadow: none; }
 
@@ -2755,7 +2668,7 @@
 .check:inconsistent:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive.png"), url("assets/checkbox-mixed-insensitive@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .check:inconsistent:insensitive.button.flat, .header-bar .check.titlebutton.button:inconsistent:insensitive,
+  .check:inconsistent:insensitive.button.flat, .check.sidebar-button.button:inconsistent:insensitive, .header-bar .check.titlebutton.button:inconsistent:insensitive,
   .titlebar .check.titlebutton.button:inconsistent:insensitive {
     icon-shadow: none; }
 
@@ -2766,7 +2679,7 @@
 .check:inconsistent:insensitive:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-backdrop-insensitive.png"), url("assets/checkbox-mixed-backdrop-insensitive@2.png"));
   icon-shadow: none; }
-  .check:inconsistent:insensitive:backdrop.button.flat, .header-bar .check.titlebutton.button:inconsistent:insensitive:backdrop,
+  .check:inconsistent:insensitive:backdrop.button.flat, .check.sidebar-button.button:inconsistent:insensitive:backdrop, .header-bar .check.titlebutton.button:inconsistent:insensitive:backdrop,
   .titlebar .check.titlebutton.button:inconsistent:insensitive:backdrop {
     icon-shadow: none; }
 
@@ -2777,7 +2690,7 @@
 .check:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked.png"), url("assets/checkbox-checked@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .check:checked.button.flat, .header-bar .check.titlebutton.button:checked,
+  .check:checked.button.flat, .check.sidebar-button.button:checked, .header-bar .check.titlebutton.button:checked,
   .titlebar .check.titlebutton.button:checked {
     icon-shadow: none; }
 
@@ -2788,7 +2701,7 @@
 .check:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive.png"), url("assets/checkbox-checked-insensitive@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .check:checked:insensitive.button.flat, .header-bar .check.titlebutton.button:checked:insensitive,
+  .check:checked:insensitive.button.flat, .check.sidebar-button.button:checked:insensitive, .header-bar .check.titlebutton.button:checked:insensitive,
   .titlebar .check.titlebutton.button:checked:insensitive {
     icon-shadow: none; }
 
@@ -2799,7 +2712,7 @@
 .check:checked:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-hover.png"), url("assets/checkbox-checked-hover@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .check:checked:hover.button.flat, .header-bar .check.titlebutton.button:checked:hover,
+  .check:checked:hover.button.flat, .check.sidebar-button.button:checked:hover, .header-bar .check.titlebutton.button:checked:hover,
   .titlebar .check.titlebutton.button:checked:hover {
     icon-shadow: none; }
 
@@ -2810,7 +2723,7 @@
 .check:checked:active {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-active.png"), url("assets/checkbox-checked-active@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .check:checked:active.button.flat, .header-bar .check.titlebutton.button:checked:active,
+  .check:checked:active.button.flat, .check.sidebar-button.button:checked:active, .header-bar .check.titlebutton.button:checked:active,
   .titlebar .check.titlebutton.button:checked:active {
     icon-shadow: none; }
 
@@ -2821,7 +2734,7 @@
 .check:backdrop:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop.png"), url("assets/checkbox-checked-backdrop@2.png"));
   icon-shadow: none; }
-  .check:backdrop:checked.button.flat, .header-bar .check.titlebutton.button:backdrop:checked,
+  .check:backdrop:checked.button.flat, .check.sidebar-button.button:backdrop:checked, .header-bar .check.titlebutton.button:backdrop:checked,
   .titlebar .check.titlebutton.button:backdrop:checked {
     icon-shadow: none; }
 
@@ -2832,7 +2745,7 @@
 .check:backdrop:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-insensitive.png"), url("assets/checkbox-checked-backdrop-insensitive@2.png"));
   icon-shadow: none; }
-  .check:backdrop:checked:insensitive.button.flat, .header-bar .check.titlebutton.button:backdrop:checked:insensitive,
+  .check:backdrop:checked:insensitive.button.flat, .check.sidebar-button.button:backdrop:checked:insensitive, .header-bar .check.titlebutton.button:backdrop:checked:insensitive,
   .titlebar .check.titlebutton.button:backdrop:checked:insensitive {
     icon-shadow: none; }
 
@@ -2856,7 +2769,7 @@
 .radio {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked.png"), url("assets/radio-unchecked@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .radio.button.flat, .header-bar .radio.titlebutton.button,
+  .radio.button.flat, .radio.sidebar-button.button, .header-bar .radio.titlebutton.button,
   .titlebar .radio.titlebutton.button {
     icon-shadow: none; }
 
@@ -2867,7 +2780,7 @@
 .radio:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-hover.png"), url("assets/radio-unchecked-hover@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .radio:hover.button.flat, .header-bar .radio.titlebutton.button:hover,
+  .radio:hover.button.flat, .radio.sidebar-button.button:hover, .header-bar .radio.titlebutton.button:hover,
   .titlebar .radio.titlebutton.button:hover {
     icon-shadow: none; }
 
@@ -2878,7 +2791,7 @@
 .radio:active {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-active.png"), url("assets/radio-unchecked-active@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .radio:active.button.flat, .header-bar .radio.titlebutton.button:active,
+  .radio:active.button.flat, .radio.sidebar-button.button:active, .header-bar .radio.titlebutton.button:active,
   .titlebar .radio.titlebutton.button:active {
     icon-shadow: none; }
 
@@ -2889,7 +2802,7 @@
 .radio:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive.png"), url("assets/radio-unchecked-insensitive@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .radio:insensitive.button.flat, .header-bar .radio.titlebutton.button:insensitive,
+  .radio:insensitive.button.flat, .radio.sidebar-button.button:insensitive, .header-bar .radio.titlebutton.button:insensitive,
   .titlebar .radio.titlebutton.button:insensitive {
     icon-shadow: none; }
 
@@ -2900,7 +2813,7 @@
 .radio:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-backdrop.png"), url("assets/radio-unchecked-backdrop@2.png"));
   icon-shadow: none; }
-  .radio:backdrop.button.flat, .header-bar .radio.titlebutton.button:backdrop,
+  .radio:backdrop.button.flat, .radio.sidebar-button.button:backdrop, .header-bar .radio.titlebutton.button:backdrop,
   .titlebar .radio.titlebutton.button:backdrop {
     icon-shadow: none; }
 
@@ -2911,7 +2824,7 @@
 .radio:backdrop:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-backdrop-insensitive.png"), url("assets/radio-unchecked-backdrop-insensitive@2.png"));
   icon-shadow: none; }
-  .radio:backdrop:insensitive.button.flat, .header-bar .radio.titlebutton.button:backdrop:insensitive,
+  .radio:backdrop:insensitive.button.flat, .radio.sidebar-button.button:backdrop:insensitive, .header-bar .radio.titlebutton.button:backdrop:insensitive,
   .titlebar .radio.titlebutton.button:backdrop:insensitive {
     icon-shadow: none; }
 
@@ -2922,7 +2835,7 @@
 .radio:inconsistent {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed.png"), url("assets/radio-mixed@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .radio:inconsistent.button.flat, .header-bar .radio.titlebutton.button:inconsistent,
+  .radio:inconsistent.button.flat, .radio.sidebar-button.button:inconsistent, .header-bar .radio.titlebutton.button:inconsistent,
   .titlebar .radio.titlebutton.button:inconsistent {
     icon-shadow: none; }
 
@@ -2933,7 +2846,7 @@
 .radio:inconsistent:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-hover.png"), url("assets/radio-mixed-hover@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .radio:inconsistent:hover.button.flat, .header-bar .radio.titlebutton.button:inconsistent:hover,
+  .radio:inconsistent:hover.button.flat, .radio.sidebar-button.button:inconsistent:hover, .header-bar .radio.titlebutton.button:inconsistent:hover,
   .titlebar .radio.titlebutton.button:inconsistent:hover {
     icon-shadow: none; }
 
@@ -2944,7 +2857,7 @@
 .radio:inconsistent:selected {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active.png"), url("assets/radio-mixed-active@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .radio:inconsistent:selected.button.flat, .header-bar .radio.titlebutton.button:inconsistent:selected,
+  .radio:inconsistent:selected.button.flat, .radio.sidebar-button.button:inconsistent:selected, .header-bar .radio.titlebutton.button:inconsistent:selected,
   .titlebar .radio.titlebutton.button:inconsistent:selected {
     icon-shadow: none; }
 
@@ -2955,7 +2868,7 @@
 .radio:inconsistent:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-backdrop.png"), url("assets/radio-mixed-backdrop@2.png"));
   icon-shadow: none; }
-  .radio:inconsistent:backdrop.button.flat, .header-bar .radio.titlebutton.button:inconsistent:backdrop,
+  .radio:inconsistent:backdrop.button.flat, .radio.sidebar-button.button:inconsistent:backdrop, .header-bar .radio.titlebutton.button:inconsistent:backdrop,
   .titlebar .radio.titlebutton.button:inconsistent:backdrop {
     icon-shadow: none; }
 
@@ -2966,7 +2879,7 @@
 .radio:inconsistent:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive.png"), url("assets/radio-mixed-insensitive@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .radio:inconsistent:insensitive.button.flat, .header-bar .radio.titlebutton.button:inconsistent:insensitive,
+  .radio:inconsistent:insensitive.button.flat, .radio.sidebar-button.button:inconsistent:insensitive, .header-bar .radio.titlebutton.button:inconsistent:insensitive,
   .titlebar .radio.titlebutton.button:inconsistent:insensitive {
     icon-shadow: none; }
 
@@ -2977,7 +2890,7 @@
 .radio:inconsistent:insensitive:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-backdrop-insensitive.png"), url("assets/radio-mixed-backdrop-insensitive@2.png"));
   icon-shadow: none; }
-  .radio:inconsistent:insensitive:backdrop.button.flat, .header-bar .radio.titlebutton.button:inconsistent:insensitive:backdrop,
+  .radio:inconsistent:insensitive:backdrop.button.flat, .radio.sidebar-button.button:inconsistent:insensitive:backdrop, .header-bar .radio.titlebutton.button:inconsistent:insensitive:backdrop,
   .titlebar .radio.titlebutton.button:inconsistent:insensitive:backdrop {
     icon-shadow: none; }
 
@@ -2988,7 +2901,7 @@
 .radio:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked.png"), url("assets/radio-checked@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .radio:checked.button.flat, .header-bar .radio.titlebutton.button:checked,
+  .radio:checked.button.flat, .radio.sidebar-button.button:checked, .header-bar .radio.titlebutton.button:checked,
   .titlebar .radio.titlebutton.button:checked {
     icon-shadow: none; }
 
@@ -2999,7 +2912,7 @@
 .radio:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive.png"), url("assets/radio-checked-insensitive@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .radio:checked:insensitive.button.flat, .header-bar .radio.titlebutton.button:checked:insensitive,
+  .radio:checked:insensitive.button.flat, .radio.sidebar-button.button:checked:insensitive, .header-bar .radio.titlebutton.button:checked:insensitive,
   .titlebar .radio.titlebutton.button:checked:insensitive {
     icon-shadow: none; }
 
@@ -3010,7 +2923,7 @@
 .radio:checked:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-hover.png"), url("assets/radio-checked-hover@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .radio:checked:hover.button.flat, .header-bar .radio.titlebutton.button:checked:hover,
+  .radio:checked:hover.button.flat, .radio.sidebar-button.button:checked:hover, .header-bar .radio.titlebutton.button:checked:hover,
   .titlebar .radio.titlebutton.button:checked:hover {
     icon-shadow: none; }
 
@@ -3021,7 +2934,7 @@
 .radio:checked:active {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-active.png"), url("assets/radio-checked-active@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .radio:checked:active.button.flat, .header-bar .radio.titlebutton.button:checked:active,
+  .radio:checked:active.button.flat, .radio.sidebar-button.button:checked:active, .header-bar .radio.titlebutton.button:checked:active,
   .titlebar .radio.titlebutton.button:checked:active {
     icon-shadow: none; }
 
@@ -3032,7 +2945,7 @@
 .radio:backdrop:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop.png"), url("assets/radio-checked-backdrop@2.png"));
   icon-shadow: none; }
-  .radio:backdrop:checked.button.flat, .header-bar .radio.titlebutton.button:backdrop:checked,
+  .radio:backdrop:checked.button.flat, .radio.sidebar-button.button:backdrop:checked, .header-bar .radio.titlebutton.button:backdrop:checked,
   .titlebar .radio.titlebutton.button:backdrop:checked {
     icon-shadow: none; }
 
@@ -3043,7 +2956,7 @@
 .radio:backdrop:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop-insensitive.png"), url("assets/radio-checked-backdrop-insensitive@2.png"));
   icon-shadow: none; }
-  .radio:backdrop:checked:insensitive.button.flat, .header-bar .radio.titlebutton.button:backdrop:checked:insensitive,
+  .radio:backdrop:checked:insensitive.button.flat, .radio.sidebar-button.button:backdrop:checked:insensitive, .header-bar .radio.titlebutton.button:backdrop:checked:insensitive,
   .titlebar .radio.titlebutton.button:backdrop:checked:insensitive {
     icon-shadow: none; }
 
@@ -3072,47 +2985,42 @@
   .list-row .check:hover, list-row .radio:selected, list-row .radio:hover {
     icon-shadow: none; }
 
-.content-view {
-  background-color: #dbdbdb; }
-  .content-view:backdrop {
-    background-color: #dbdbdb; }
-
-.view.content-view.check {
+.view.content-view.check:not(.list) {
   icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-selectionmode.png"), url("assets/checkbox-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:hover {
+.view.content-view.check:hover:not(.list) {
   icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-hover-selectionmode.png"), url("assets/checkbox-hover-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:active {
+.view.content-view.check:active:not(.list) {
   icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-active-selectionmode.png"), url("assets/checkbox-active-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:backdrop {
+.view.content-view.check:backdrop:not(.list) {
   icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-backdrop-selectionmode.png"), url("assets/checkbox-backdrop-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:checked {
+.view.content-view.check:checked:not(.list) {
   icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-selectionmode.png"), url("assets/checkbox-checked-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:checked:hover {
+.view.content-view.check:checked:hover:not(.list) {
   icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-hover-selectionmode.png"), url("assets/checkbox-checked-hover-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:checked:active {
+.view.content-view.check:checked:active:not(.list) {
   icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-active-selectionmode.png"), url("assets/checkbox-checked-active-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:backdrop:checked {
+.view.content-view.check:backdrop:checked:not(.list) {
   icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-selectionmode.png"), url("assets/checkbox-checked-backdrop-selectionmode@2.png"));
   background-color: transparent; }
@@ -3325,11 +3233,43 @@
       .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:backdrop {
         border-color: rgba(0, 0, 0, 0.7);
         background-image: none; }
+  .list-row:selected .scale, .list-row:selected
+  .scale.scale-has-marks-above.scale-has-marks-below, .list-row:selected
+  .scale.vertical.scale-has-marks-above.scale-has-marks-below {
+    border-color: #184472; }
+    .list-row:selected .scale.trough, .list-row:selected
+    .scale.scale-has-marks-above.scale-has-marks-below.trough, .list-row:selected
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough {
+      box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); }
+      .list-row:selected .scale.trough:backdrop, .list-row:selected
+      .scale.scale-has-marks-above.scale-has-marks-below.trough:backdrop, .list-row:selected
+      .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:backdrop {
+        box-shadow: none; }
+      .list-row:selected .scale.trough.highlight:backdrop, .list-row:selected
+      .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight:backdrop, .list-row:selected
+      .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight:backdrop {
+        border-color: #184472; }
+    .list-row:selected .scale:insensitive, .list-row:selected .scale.trough.highlight:insensitive, .list-row:selected
+    .scale.scale-has-marks-above.scale-has-marks-below:insensitive, .list-row:selected
+    .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight:insensitive, .list-row:selected
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below:insensitive, .list-row:selected
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight:insensitive {
+      border-color: #4a90d9;
+      box-shadow: none;
+      background-color: #a4c7ec;
+      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; }
 
 .scale.scale-has-marks-below {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
-  -GtkRange-trough-border: 2; }
+  -GtkRange-trough-border: 2;
+  color: alpha(currentColor,0.5); }
   .scale.scale-has-marks-below.slider {
     border-style: none;
     border-radius: 0;
@@ -3382,7 +3322,8 @@
 .scale.scale-has-marks-above {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
-  -GtkRange-trough-border: 2; }
+  -GtkRange-trough-border: 2;
+  color: alpha(currentColor,0.5); }
   .scale.scale-has-marks-above.slider {
     border-style: none;
     border-radius: 0;
@@ -3435,7 +3376,8 @@
 .scale.vertical.scale-has-marks-below {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
-  -GtkRange-trough-border: 2; }
+  -GtkRange-trough-border: 2;
+  color: alpha(currentColor,0.5); }
   .scale.vertical.scale-has-marks-below.slider {
     border-style: none;
     border-radius: 0;
@@ -3488,7 +3430,8 @@
 .scale.vertical.scale-has-marks-above {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
-  -GtkRange-trough-border: 2; }
+  -GtkRange-trough-border: 2;
+  color: alpha(currentColor,0.5); }
   .scale.vertical.scale-has-marks-above.slider {
     border-style: none;
     border-radius: 0;
@@ -3621,10 +3564,6 @@
 /*************
  * Level Bar *
  *************/
-.level-bar.vertical {
-  -GtkLevelBar-min-block-width: 3;
-  -GtkLevelBar-min-block-height: 34; }
-
 .level-bar {
   box-shadow: 0 1px white;
   -GtkLevelBar-min-block-width: 34;
@@ -3637,17 +3576,17 @@
     padding: 2px;
     border-radius: 3px;
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
+    background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
     color: black;
     border-color: #a1a1a1;
-    box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(74, 144, 217, 0), 0 1px white; }
+    box-shadow: inset 0 0 0 1px rgba(74, 144, 217, 0), 0 1px white; }
     .level-bar.trough:backdrop {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
+      background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
       color: #323232;
       border-color: #a8a8a8;
       background-image: linear-gradient(to bottom, white);
-      box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(255, 255, 255, 0); }
+      box-shadow: 0 1px rgba(255, 255, 255, 0); }
   .level-bar.fill-block {
     border: 1px solid #2a76c6;
     background-color: #4a90d9;
@@ -3694,19 +3633,18 @@
 GtkScrolledWindow GtkViewport.frame {
   border-style: none; }
 
-.separator, GtkPlacesSidebar.sidebar .view .separator,
-GtkPlacesSidebar.sidebar .view .separator:backdrop {
+.separator {
   color: rgba(0, 0, 0, 0.1); }
-  GtkFileChooserButton .separator.vertical, GtkFileChooserButton GtkPlacesSidebar.sidebar .view .vertical.separator, GtkPlacesSidebar.sidebar .view GtkFileChooserButton .vertical.separator, GtkFontButton .separator.vertical, GtkFontButton GtkPlacesSidebar.sidebar .view .vertical.separator, GtkPlacesSidebar.sidebar .view GtkFontButton .vertical.separator {
+  GtkFileChooserButton .separator.vertical, GtkFontButton .separator.vertical {
     -GtkWidget-wide-separators: true; }
 
 /*********
  * Lists *
  *********/
-.list, .list-row {
+.list {
   background-color: #ffffff;
   border-color: #a1a1a1; }
-  .list:backdrop, .list-row:backdrop {
+  .list:backdrop {
     background-color: white;
     border-color: #a8a8a8; }
 
@@ -3714,32 +3652,17 @@
 .grid-child {
   padding: 2px; }
 
-.list-row.button, .header-bar .list-row.button.titlebutton,
-.titlebar .list-row.button.titlebutton,
-.list-row.button:backdrop,
-.list-row.button:backdrop:active,
-.list-row.button:backdrop:checked,
-.list-row.button:backdrop:insensitive,
-.list-row.button:backdrop:insensitive:active,
-.list-row.button:backdrop:insensitive:checked,
-.list-row.button:insensitive:active,
-.list-row.button:insensitive:checked {
-  background-color: rgba(255, 255, 255, 0);
-  border-style: none;
-  border-radius: 0;
-  box-shadow: none; }
-
-.list-row.button:hover {
-  background-color: #f4f4f4; }
-.list-row.button:active {
+.list-row.activatable:hover, GtkPlacesSidebar.sidebar .has-open-popup {
+  background-color: rgba(46, 52, 54, 0.05); }
+.list-row.activatable:active {
   box-shadow: inset 0 2px 2px -2px rgba(0, 0, 0, 0.2); }
-.list-row.button:backdrop:hover {
+.list-row.activatable:backdrop:hover, GtkPlacesSidebar.sidebar .has-open-popup:backdrop {
   background-color: transparent; }
-.list-row.button:selected:active {
+.list-row.activatable:selected:active {
   box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); }
-.list-row.button:selected:hover {
+.list-row.activatable:selected:hover, GtkPlacesSidebar.sidebar .has-open-popup:selected {
   background-color: #4786c8; }
-.list-row.button:selected:backdrop {
+.list-row.activatable:selected:backdrop {
   background-color: #4a90d9; }
 
 .list-row:selected .button {
@@ -3751,7 +3674,7 @@
   icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   box-shadow: inset 0 1px white;
   border-color: #184472; }
-  .list-row:selected .button.flat, .list-row:selected .header-bar .titlebutton.button, .header-bar .list-row:selected .titlebutton.button,
+  .list-row:selected .button.flat, .list-row:selected .sidebar-button.button, .list-row:selected .header-bar .titlebutton.button, .header-bar .list-row:selected .titlebutton.button,
   .list-row:selected .titlebar .titlebutton.button,
   .titlebar .list-row:selected .titlebutton.button {
     border-color: transparent;
@@ -3779,7 +3702,7 @@
     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);
     border-color: #184472; }
-  .list-row:selected .button:backdrop, .list-row:selected .button.flat:backdrop, .list-row:selected .header-bar .titlebutton.button:backdrop, .header-bar .list-row:selected .titlebutton.button:backdrop,
+  .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;
@@ -3789,9 +3712,9 @@
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     border-color: #184472; }
-    .list-row:selected .button:backdrop:active, .list-row:selected .button:backdrop:checked, .list-row:selected .button.flat:backdrop:active, .list-row:selected .header-bar .titlebutton.button:backdrop:active, .header-bar .list-row:selected .titlebutton.button:backdrop:active,
+    .list-row:selected .button:backdrop:active, .list-row:selected .button:backdrop:checked, .list-row:selected .button.flat:backdrop:active, .list-row:selected .sidebar-button.button:backdrop:active, .list-row:selected .header-bar .titlebutton.button:backdrop:active, .header-bar .list-row:selected .titlebutton.button:backdrop:active,
     .list-row:selected .titlebar .titlebutton.button:backdrop:active,
-    .titlebar .list-row:selected .titlebutton.button:backdrop:active, .list-row:selected .button.flat:backdrop:checked, .list-row:selected .header-bar .titlebutton.button:backdrop:checked, .header-bar .list-row:selected .titlebutton.button:backdrop:checked,
+    .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;
@@ -3799,7 +3722,7 @@
       background-image: linear-gradient(to bottom, #d4d4d4);
       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 .header-bar .titlebutton.button:backdrop:insensitive, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive,
+    .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;
@@ -3810,13 +3733,13 @@
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       border-color: #184472; }
       .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 .header-bar .titlebutton.button:backdrop:insensitive > .label, .header-bar .list-row:selected .titlebutton.button: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; }
-      .list-row:selected .button:backdrop:insensitive:active, .list-row:selected .button:backdrop:insensitive:checked, .list-row:selected .button.flat:backdrop:insensitive:active, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive:active, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:active,
+      .list-row:selected .button:backdrop:insensitive:active, .list-row:selected .button:backdrop:insensitive:checked, .list-row:selected .button.flat:backdrop:insensitive:active, .list-row:selected .sidebar-button.button:backdrop:insensitive:active, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive:active, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:active,
       .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive:active,
-      .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:active, .list-row:selected .button.flat:backdrop:insensitive:checked, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive:checked, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:checked,
+      .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:active, .list-row:selected .button.flat:backdrop:insensitive:checked, .list-row:selected .sidebar-button.button:backdrop:insensitive:checked, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive:checked, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:checked,
       .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive:checked,
       .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:checked {
         color: #c7c7c7;
@@ -3826,13 +3749,13 @@
         border-color: #184472; }
         .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 .header-bar .titlebutton.button:backdrop:insensitive:active > .label, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:active > .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 .header-bar .titlebutton.button:backdrop:insensitive:checked > .label, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:checked > .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,
         .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:checked > .label {
           color: inherit; }
-  .list-row:selected .button.flat:backdrop, .list-row:selected .header-bar .titlebutton.button:backdrop, .header-bar .list-row:selected .titlebutton.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 {
     border-color: transparent;
@@ -3863,11 +3786,9 @@
       .list-row:selected .titlebar .button.titlebutton:insensitive:checked > .label {
         color: inherit; }
 
-.list-row, list-row.button, .header-bar list-row.button.titlebutton,
-.titlebar list-row.button.titlebutton {
-  transition: all 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
-  .list-row:hover, list-row.button:hover, .header-bar list-row.button.titlebutton:hover,
-  .titlebar list-row.button.titlebutton:hover {
+.list-row {
+  transition: all 150ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
+  .list-row:hover {
     transition: none; }
 
 /*********************
@@ -3896,10 +3817,11 @@
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
     outline-color: rgba(238, 238, 236, 0.3); }
-    .app-notification .button.flat, .app-notification .header-bar .titlebutton.button, .header-bar .app-notification .titlebutton.button,
+    .app-notification .button.flat, .app-notification .sidebar-button.button, .app-notification .header-bar .titlebutton.button, .header-bar .app-notification .titlebutton.button,
     .app-notification .titlebar .titlebutton.button,
     .titlebar .app-notification .titlebutton.button,
     .app-notification.frame .button.flat,
+    .app-notification.frame .sidebar-button.button,
     .app-notification.frame .header-bar .titlebutton.button,
     .header-bar .app-notification.frame .titlebutton.button,
     .app-notification.frame .titlebar .titlebutton.button,
@@ -3981,8 +3903,14 @@
     GtkCalendar.button:backdrop, .header-bar GtkCalendar.button.titlebutton:backdrop,
     .titlebar GtkCalendar.button.titlebutton:backdrop {
       color: rgba(141, 144, 145, 0.45); }
-  GtkCalendar:inconsistent, GtkCalendar:inconsistent:backdrop, GtkCalendar.highlight, GtkCalendar.highlight:backdrop {
+    GtkCalendar.button:insensitive, .header-bar GtkCalendar.button.titlebutton:insensitive,
+    .titlebar GtkCalendar.button.titlebutton:insensitive {
+      color: rgba(141, 144, 145, 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; }
@@ -3993,182 +3921,180 @@
 .message-dialog .dialog-action-area .button {
   padding: 8px; }
 
-.message-dialog {
-  -GtkDialog-button-spacing: 0; }
-  .message-dialog.background {
-    background-color: #ededed; }
-  .message-dialog .titlebar {
-    border-style: none;
+.message-dialog.background {
+  background-color: #ededed; }
+.message-dialog .titlebar {
+  border-style: none;
+  box-shadow: inset 0 1px white; }
+.message-dialog.csd.background {
+  border-bottom-left-radius: 9px;
+  border-bottom-right-radius: 9px; }
+.message-dialog.csd .dialog-action-area .button {
+  padding: 12px;
+  border-radius: 0;
+  color: #2e3436;
+  outline-color: rgba(46, 52, 54, 0.3);
+  border-color: #a1a1a1;
+  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; }
+  .message-dialog.csd .dialog-action-area .button:hover {
+    color: #2e3436;
+    outline-color: rgba(46, 52, 54, 0.3);
+    border-color: #a1a1a1;
+    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; }
-  .message-dialog.csd.background {
-    border-bottom-left-radius: 9px;
-    border-bottom-right-radius: 9px; }
-  .message-dialog.csd .dialog-action-area .button {
-    padding: 12px;
-    border-radius: 0;
+  .message-dialog.csd .dialog-action-area .button:active {
     color: #2e3436;
     outline-color: rgba(46, 52, 54, 0.3);
     border-color: #a1a1a1;
-    background-image: linear-gradient(to bottom, #fafafa, #ededed 40%, #e0e0e0);
+    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 white; }
-    .message-dialog.csd .dialog-action-area .button:hover {
-      color: #2e3436;
-      outline-color: rgba(46, 52, 54, 0.3);
-      border-color: #a1a1a1;
-      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; }
-    .message-dialog.csd .dialog-action-area .button:active {
-      color: #2e3436;
-      outline-color: rgba(46, 52, 54, 0.3);
-      border-color: #a1a1a1;
-      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); }
+  .message-dialog.csd .dialog-action-area .button:insensitive {
+    color: #8d9091;
+    border-color: #a1a1a1;
+    background-image: linear-gradient(to bottom, #f4f4f4);
+    text-shadow: none;
+    icon-shadow: none;
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+    .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;
+    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;
+    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 .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;
+    outline-color: rgba(255, 255, 255, 0.3);
+    border-color: #1c5187;
+    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); }
+    .message-dialog.csd .dialog-action-area .button.suggested-action:hover {
+      color: white;
+      outline-color: rgba(255, 255, 255, 0.3);
+      border-color: #1c5187;
+      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); }
+    .message-dialog.csd .dialog-action-area .button.suggested-action:active {
+      color: white;
+      outline-color: rgba(255, 255, 255, 0.3);
+      border-color: #1c5187;
+      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); }
-    .message-dialog.csd .dialog-action-area .button:insensitive {
+    .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop {
+      color: #dae8f7;
+      border-color: #4a90d9;
+      background-image: linear-gradient(to bottom, #4a90d9);
+      text-shadow: none;
+      icon-shadow: none;
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+      .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive {
+        color: #c7c7c7;
+        border-color: #a8a8a8;
+        background-image: linear-gradient(to bottom, #f4f4f4);
+        text-shadow: none;
+        icon-shadow: none;
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+        .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;
       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 .header-bar .button.titlebutton:insensitive > .label,
-      .message-dialog.csd .dialog-action-area .titlebar .button.titlebutton: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:backdrop {
-      color: #8d9091;
-      border-color: #a8a8a8;
-      background-image: linear-gradient(to bottom, #ededed);
+  .message-dialog.csd .dialog-action-area .button.destructive-action {
+    color: white;
+    outline-color: rgba(255, 255, 255, 0.3);
+    border-color: #8e0b0b;
+    background-image: linear-gradient(to bottom, #f14141, #ef2929 40%, #ed1212);
+    text-shadow: 0 -1px rgba(0, 0, 0, 0.56078);
+    icon-shadow: 0 -1px rgba(0, 0, 0, 0.56078);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.5); }
+    .message-dialog.csd .dialog-action-area .button.destructive-action:hover {
+      color: white;
+      outline-color: rgba(255, 255, 255, 0.3);
+      border-color: #8e0b0b;
+      background-image: linear-gradient(to bottom, #f46b6b, #f03c3c 40%, #ef2929);
+      text-shadow: 0 -1px rgba(0, 0, 0, 0.52878);
+      icon-shadow: 0 -1px rgba(0, 0, 0, 0.52878);
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.5); }
+    .message-dialog.csd .dialog-action-area .button.destructive-action:active {
+      color: white;
+      outline-color: rgba(255, 255, 255, 0.3);
+      border-color: #8e0b0b;
+      background-image: linear-gradient(to bottom, #da1010, #e51111 40%, #ed1212);
+      text-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
+      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;
+      border-color: #ef2929;
+      background-image: linear-gradient(to bottom, #ef2929);
       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;
+      .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive {
+        color: #c7c7c7;
+        border-color: #a8a8a8;
+        background-image: linear-gradient(to bottom, #f4f4f4);
+        text-shadow: none;
+        icon-shadow: none;
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+        .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;
+      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: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 {
+      .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.suggested-action {
-      color: white;
-      outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #1c5187;
-      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); }
-      .message-dialog.csd .dialog-action-area .button.suggested-action:hover {
-        color: white;
-        outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #1c5187;
-        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); }
-      .message-dialog.csd .dialog-action-area .button.suggested-action:active {
-        color: white;
-        outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #1c5187;
-        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); }
-      .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop {
-        color: #dae8f7;
-        border-color: #4a90d9;
-        background-image: linear-gradient(to bottom, #4a90d9);
-        text-shadow: none;
-        icon-shadow: none;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive {
-          color: #c7c7c7;
-          border-color: #a8a8a8;
-          background-image: linear-gradient(to bottom, #f4f4f4);
-          text-shadow: none;
-          icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-          .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;
-        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 .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;
-      outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #8e0b0b;
-      background-image: linear-gradient(to bottom, #f14141, #ef2929 40%, #ed1212);
-      text-shadow: 0 -1px rgba(0, 0, 0, 0.56078);
-      icon-shadow: 0 -1px rgba(0, 0, 0, 0.56078);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.5); }
-      .message-dialog.csd .dialog-action-area .button.destructive-action:hover {
-        color: white;
-        outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #8e0b0b;
-        background-image: linear-gradient(to bottom, #f46b6b, #f03c3c 40%, #ef2929);
-        text-shadow: 0 -1px rgba(0, 0, 0, 0.52878);
-        icon-shadow: 0 -1px rgba(0, 0, 0, 0.52878);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.5); }
-      .message-dialog.csd .dialog-action-area .button.destructive-action:active {
-        color: white;
-        outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #8e0b0b;
-        background-image: linear-gradient(to bottom, #da1010, #e51111 40%, #ed1212);
-        text-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
-        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;
-        border-color: #ef2929;
-        background-image: linear-gradient(to bottom, #ef2929);
-        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 {
-          color: #c7c7c7;
-          border-color: #a8a8a8;
-          background-image: linear-gradient(to bottom, #f4f4f4);
-          text-shadow: none;
-          icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-          .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;
-        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 .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;
-    border-right-style: none;
-    border-bottom-style: none; }
-  .message-dialog.csd .dialog-action-area .button:last-child {
-    border-bottom-right-radius: 7px;
-    outline-bottom-right-radius: 5px; }
-  .message-dialog.csd .dialog-action-area .button:first-child {
-    border-left-style: none;
-    border-bottom-left-radius: 7px;
-    outline-bottom-left-radius: 5px; }
+.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;
+  border-right-style: none;
+  border-bottom-style: none; }
+.message-dialog.csd .dialog-action-area .button:last-child {
+  border-bottom-right-radius: 7px;
+  outline-bottom-right-radius: 5px; }
+.message-dialog.csd .dialog-action-area .button:first-child {
+  border-left-style: none;
+  border-bottom-left-radius: 7px;
+  outline-bottom-left-radius: 5px; }
 
 GtkFileChooserDialog .search-bar {
   background-color: #ffffff;
@@ -4187,31 +4113,43 @@
  ***********/
 .sidebar {
   border: none;
-  background-color: #fafafa; }
+  background-color: #f6f6f6; }
   .sidebar:backdrop {
-    background-color: #fafafa; }
+    background-color: #f6f6f6; }
+
+GtkSidebarRow.list-row {
+  padding: 0px; }
+GtkSidebarRow .sidebar-revealer {
+  padding: 4px 14px 4px 12px; }
+GtkSidebarRow .sidebar-icon {
+  opacity: 0.7; }
+  GtkSidebarRow .sidebar-icon:dir(ltr) {
+    padding-right: 8px; }
+  GtkSidebarRow .sidebar-icon:dir(rtl) {
+    padding-left: 8px; }
+GtkSidebarRow .sidebar-label:dir(ltr) {
+  padding-right: 2px; }
+GtkSidebarRow .sidebar-label:dir(rtl) {
+  padding-left: 2px; }
 
-GtkPlacesSidebar.sidebar .view {
-  color: #2e3436;
-  background-color: transparent; }
-  GtkPlacesSidebar.sidebar .view .image {
-    color: #6b6f70; }
-    GtkPlacesSidebar.sidebar .view .image:selected {
-      color: #ecf3fb; }
-      GtkPlacesSidebar.sidebar .view .image:selected:backdrop {
-        color: #ecf3fb; }
-    GtkPlacesSidebar.sidebar .view .image:insensitive {
-      color: #adafb0; }
-    GtkPlacesSidebar.sidebar .view .image:backdrop {
-      color: #adafb0; }
-      GtkPlacesSidebar.sidebar .view .image:backdrop:insensitive {
-        color: #d6d6d6; }
-  GtkPlacesSidebar.sidebar .view:insensitive {
-    color: #8d9091; }
-  GtkPlacesSidebar.sidebar .view:backdrop {
-    color: #8d9091; }
-    GtkPlacesSidebar.sidebar .view:backdrop:insensitive {
-      color: #c7c7c7; }
+GtkPlacesSidebar.sidebar .list-row:selected:active {
+  box-shadow: none; }
+GtkPlacesSidebar.sidebar .sidebar-placeholder-row {
+  border: solid 1px #4a90d9; }
+GtkPlacesSidebar.sidebar .sidebar-new-bookmark-row {
+  color: #4a90d9; }
+.sidebar-button.button, .header-bar .sidebar-button.button.titlebutton,
+.titlebar .sidebar-button.button.titlebutton {
+  border-radius: 100%;
+  outline-radius: 100%; }
+  .sidebar-button.button.image-button, GtkScaleButton.sidebar-button.button,
+  GtkVolumeButton.sidebar-button.button, .header-bar .sidebar-button.titlebutton.button,
+  .titlebar .sidebar-button.titlebutton.button {
+    padding: 5px; }
+  .sidebar-button.button:not(:hover):not(:active) > GtkImage, .header-bar .sidebar-button.button.titlebutton:not(:hover):not(:active) > GtkImage,
+  .titlebar .sidebar-button.button.titlebutton:not(:hover):not(:active) > GtkImage, .sidebar-button.button:backdrop > GtkImage, .header-bar .sidebar-button.button.titlebutton:backdrop > GtkImage,
+  .titlebar .sidebar-button.button.titlebutton:backdrop > GtkImage {
+    opacity: 0.7; }
 
 .sidebar-item {
   padding: 10px 4px; }
@@ -4221,6 +4159,18 @@
   .sidebar-item.needs-attention > .label {
     background-size: 6px 6px, 0 0; }
 
+/****************
+ * File chooser *
+ ****************/
+GtkPlacesView .server-list-button > GtkImage {
+  transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+  -gtk-icon-transform: rotate(0turn); }
+GtkPlacesView .server-list-button:checked > GtkImage {
+  transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+  -gtk-icon-transform: rotate(-0.5turn); }
+GtkPlacesView .list-row.activatable:hover, GtkPlacesView GtkPlacesSidebar.sidebar .has-open-popup, GtkPlacesSidebar.sidebar GtkPlacesView .has-open-popup {
+  background-color: transparent; }
+
 /*********
  * Paned *
  *********/
@@ -4413,6 +4363,9 @@
       border-color: #ffffff; }
   GtkColorSwatch:selected {
     box-shadow: inset 0 1px rgba(0, 0, 0, 0.1), 0 1px white; }
+  GtkColorSwatch:insensitive {
+    box-shadow: none;
+    opacity: 0.5; }
   GtkColorSwatch.top {
     border-top-left-radius: 6px;
     border-top-right-radius: 6px; }
@@ -4459,12 +4412,12 @@
       box-shadow: none; }
   GtkColorSwatch.color-dark {
     color: white;
-    outline-color: rgba(0, 0, 0, 0.3); }
+    outline-color: rgba(255, 255, 255, 0.5); }
     GtkColorSwatch.color-dark:backdrop {
       color: rgba(255, 255, 255, 0.3); }
   GtkColorSwatch.color-light {
     color: black;
-    outline-color: rgba(255, 255, 255, 0.5); }
+    outline-color: rgba(0, 0, 0, 0.5); }
     GtkColorSwatch.color-light:backdrop {
       color: rgba(0, 0, 0, 0.3); }
   GtkColorSwatch.overlay, GtkColorSwatch.overlay:selected {
@@ -4507,6 +4460,19 @@
 /********
  * Misc *
  ********/
+.content-view {
+  background-color: #dbdbdb; }
+  .content-view:hover {
+    -gtk-image-effect: highlight; }
+  .content-view:backdrop {
+    background-color: #dbdbdb; }
+
+.osd .scale-popup .button.flat, .osd .scale-popup .sidebar-button.button, .osd .scale-popup .header-bar .titlebutton.button, .header-bar .osd .scale-popup .titlebutton.button,
+.osd .scale-popup .titlebar .titlebutton.button,
+.titlebar .osd .scale-popup .titlebutton.button {
+  padding: 6px;
+  border-style: none;
+  border-radius: 5px; }
 .scale-popup .button, .scale-popup .header-bar .button.titlebutton, .header-bar .scale-popup .button.titlebutton,
 .scale-popup .titlebar .button.titlebutton,
 .titlebar .scale-popup .button.titlebutton {
@@ -4515,10 +4481,6 @@
     background-color: rgba(46, 52, 54, 0.1);
     border-radius: 5px; }
 
-GtkVolumeButton.button, .header-bar GtkVolumeButton.button.titlebutton,
-.titlebar GtkVolumeButton.button.titlebutton {
-  padding: 8px; }
-
 /**********************
  * Window Decorations *
  *********************/
@@ -4536,7 +4498,7 @@
     box-shadow: none; }
   .window-frame.ssd {
     box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.23); }
-  .window-frame.csd .popup {
+  .window-frame.csd.popup {
     border-radius: 0;
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13); }
   .window-frame.csd.tooltip {
@@ -4568,23 +4530,215 @@
   .titlebar.selection-mode .titlebutton.button:backdrop {
     icon-shadow: none; }
 
-.view:selected, GtkCalendar:selected, .label:selected, .label:selected:focus, .label:selected:hover, .grid-child:selected, .entry:selected, .entry:selected:focus, .menuitem.button.flat:selected, .header-bar .menuitem.titlebutton.button:selected,
-.titlebar .menuitem.titlebutton.button:selected, .list-row:selected, .sidebar:selected, GtkPlacesSidebar.sidebar .view:selected, GtkPlacesSidebar.sidebar GtkCalendar:selected {
+.view:selected, GtkCalendar:selected, .label:selected, .label:selected:focus, .label:selected:hover, .grid-child:selected, .entry:selected, .entry:selected:focus, .menuitem.button.flat:selected, .menuitem.sidebar-button.button:selected, .header-bar .menuitem.titlebutton.button:selected,
+.titlebar .menuitem.titlebutton.button:selected, .list-row:selected, .sidebar:selected {
   background-color: #4a90d9;
   color: #ffffff;
   outline-color: rgba(255, 255, 255, 0.3); }
-  .view:backdrop:selected, GtkCalendar:backdrop:selected, .label:backdrop:selected, .grid-child:backdrop:selected, .entry:backdrop:selected, .menuitem.button.flat:backdrop:selected, .header-bar .menuitem.titlebutton.button:backdrop:selected,
-  .titlebar .menuitem.titlebutton.button:backdrop:selected, .list-row:backdrop:selected, .sidebar:backdrop:selected, GtkPlacesSidebar.sidebar .view:backdrop:selected, GtkPlacesSidebar.sidebar GtkCalendar:backdrop:selected {
-    color: #ffffff;
-    background-color: #929292; }
+  .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; }
+  .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: #80b1e4; }
+
+.monospace {
+  font: Monospace; }
+
+/**********************
+ * Touch Copy & Paste *
+ *********************/
+.entry.cursor-handle,
+.cursor-handle {
+  background-color: transparent;
+  background-image: none;
+  box-shadow: none;
+  border-style: none; }
+  .entry.cursor-handle.top:dir(ltr), .entry.cursor-handle.bottom:dir(rtl),
+  .cursor-handle.top:dir(ltr),
+  .cursor-handle.bottom:dir(rtl) {
+    -gtk-icon-source: -gtk-scaled(url("assets/text-select-start.png"), url("assets/text-select-start@2.png"));
+    padding-left: 10px; }
+  .entry.cursor-handle.bottom:dir(ltr), .entry.cursor-handle.top:dir(rtl),
+  .cursor-handle.bottom:dir(ltr),
+  .cursor-handle.top:dir(rtl) {
+    -gtk-icon-source: -gtk-scaled(url("assets/text-select-end.png"), url("assets/text-select-end@2.png"));
+    padding-right: 10px; }
+  .entry.cursor-handle.insertion-cursor:dir(ltr), .entry.cursor-handle.insertion-cursor:dir(rtl),
+  .cursor-handle.insertion-cursor:dir(ltr),
+  .cursor-handle.insertion-cursor:dir(rtl) {
+    -gtk-icon-source: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above.png"), url("assets/slider-horz-scale-has-marks-above@2.png")); }
+  .entry.cursor-handle.top:hover:dir(ltr), .entry.cursor-handle.bottom:hover:dir(rtl),
+  .cursor-handle.top:hover:dir(ltr),
+  .cursor-handle.bottom:hover:dir(rtl) {
+    -gtk-icon-source: -gtk-scaled(url("assets/text-select-start-hover.png"), url("assets/text-select-start-hover@2.png"));
+    padding-left: 10px; }
+  .entry.cursor-handle.bottom:hover:dir(ltr), .entry.cursor-handle.top:hover:dir(rtl),
+  .cursor-handle.bottom:hover:dir(ltr),
+  .cursor-handle.top:hover:dir(rtl) {
+    -gtk-icon-source: -gtk-scaled(url("assets/text-select-end-hover.png"), url("assets/text-select-end-hover@2.png"));
+    padding-right: 10px; }
+  .entry.cursor-handle.insertion-cursor:hover:dir(ltr), .entry.cursor-handle.insertion-cursor:hover:dir(rtl),
+  .cursor-handle.insertion-cursor:hover:dir(ltr),
+  .cursor-handle.insertion-cursor:hover:dir(rtl) {
+    -gtk-icon-source: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-hover.png"), url("assets/slider-horz-scale-has-marks-above-hover@2.png")); }
+  .entry.cursor-handle.top:active:dir(ltr), .entry.cursor-handle.bottom:active:dir(rtl),
+  .cursor-handle.top:active:dir(ltr),
+  .cursor-handle.bottom:active:dir(rtl) {
+    -gtk-icon-source: -gtk-scaled(url("assets/text-select-start-active.png"), url("assets/text-select-start-active@2.png"));
+    padding-left: 10px; }
+  .entry.cursor-handle.bottom:active:dir(ltr), .entry.cursor-handle.top:active:dir(rtl),
+  .cursor-handle.bottom:active:dir(ltr),
+  .cursor-handle.top:active:dir(rtl) {
+    -gtk-icon-source: -gtk-scaled(url("assets/text-select-end-active.png"), url("assets/text-select-end-active@2.png"));
+    padding-right: 10px; }
+  .entry.cursor-handle.insertion-cursor:active:dir(ltr), .entry.cursor-handle.insertion-cursor:active:dir(rtl),
+  .cursor-handle.insertion-cursor:active:dir(ltr),
+  .cursor-handle.insertion-cursor:active:dir(rtl) {
+    -gtk-icon-source: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-active.png"), url("assets/slider-horz-scale-has-marks-above-active@2.png")); }
 
 /* Decouple the font of context menus from their entry/textview */
-.touch-selection,
 .context-menu {
   font: initial; }
 
-.monospace {
-  font: Monospace; }
+.touch-selection {
+  font: initial;
+  color: #eeeeec;
+  border: none;
+  background-color: rgba(32, 37, 38, 0.9);
+  background-clip: padding-box;
+  outline-color: rgba(238, 238, 236, 0.3);
+  box-shadow: none;
+  text-shadow: 0 1px black;
+  icon-shadow: 0 1px black; }
+  .touch-selection:backdrop {
+    text-shadow: none; }
+  .touch-selection .button, .touch-selection .header-bar .button.titlebutton, .header-bar .touch-selection .button.titlebutton,
+  .touch-selection .titlebar .button.titlebutton,
+  .titlebar .touch-selection .button.titlebutton {
+    color: #eeeeec;
+    border-color: rgba(0, 0, 0, 0.7);
+    background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
+    background-clip: padding-box;
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
+    text-shadow: 0 1px black;
+    icon-shadow: 0 1px black;
+    outline-color: rgba(238, 238, 236, 0.3); }
+    .touch-selection .button:hover {
+      color: white;
+      border-color: rgba(0, 0, 0, 0.7);
+      background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.7));
+      background-clip: padding-box;
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
+      text-shadow: 0 1px black;
+      icon-shadow: 0 1px black;
+      outline-color: rgba(238, 238, 236, 0.3); }
+    .touch-selection .button:active, .touch-selection .button:checked {
+      color: white;
+      border-color: rgba(0, 0, 0, 0.7);
+      background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
+      background-clip: padding-box;
+      box-shadow: none;
+      text-shadow: none;
+      icon-shadow: none;
+      outline-color: rgba(238, 238, 236, 0.3); }
+    .touch-selection .button:insensitive, .touch-selection .button:backdrop:insensitive {
+      color: #878989;
+      border-color: rgba(0, 0, 0, 0.7);
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+      background-clip: padding-box;
+      box-shadow: none;
+      text-shadow: none;
+      icon-shadow: none; }
+    .touch-selection .button:backdrop {
+      color: #eeeeec;
+      border-color: rgba(0, 0, 0, 0.7);
+      background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
+      background-clip: padding-box;
+      box-shadow: none;
+      text-shadow: none;
+      icon-shadow: none; }
+  .touch-selection .check {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); }
+  .touch-selection .check:hover {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-hover-dark.png"), url("assets/checkbox-unchecked-hover-dark@2.png")); }
+  .touch-selection .check:active {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-active-dark.png"), url("assets/checkbox-unchecked-active-dark@2.png")); }
+  .touch-selection .check:insensitive {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); }
+  .touch-selection .check:inconsistent {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); }
+  .touch-selection .check:inconsistent:hover {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-hover-dark.png"), url("assets/checkbox-mixed-hover-dark@2.png")); }
+  .touch-selection .check:inconsistent:selected {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-active-dark.png"), url("assets/checkbox-mixed-active-dark@2.png")); }
+  .touch-selection .check:inconsistent:insensitive {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); }
+  .touch-selection .check:checked {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); }
+  .touch-selection .check:checked:insensitive {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); }
+  .touch-selection .check:checked:hover {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-hover-dark.png"), url("assets/checkbox-checked-hover-dark@2.png")); }
+  .touch-selection .check:checked:active {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-active-dark.png"), url("assets/checkbox-checked-active-dark@2.png")); }
+  .touch-selection .check:backdrop:checked {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-dark.png"), url("assets/checkbox-checked-backdrop-dark@2.png")); }
+  .touch-selection .radio {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); }
+  .touch-selection .radio:hover {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-hover-dark.png"), url("assets/radio-unchecked-hover-dark@2.png")); }
+  .touch-selection .radio:active {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-active-dark.png"), url("assets/radio-unchecked-active-dark@2.png")); }
+  .touch-selection .radio:insensitive {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); }
+  .touch-selection .radio:inconsistent {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); }
+  .touch-selection .radio:inconsistent:hover {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-hover-dark.png"), url("assets/radio-mixed-hover-dark@2.png")); }
+  .touch-selection .radio:inconsistent:selected {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active-dark.png"), url("assets/radio-mixed-active-dark@2.png")); }
+  .touch-selection .radio:inconsistent:insensitive {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); }
+  .touch-selection .radio:checked {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); }
+  .touch-selection .radio:checked:insensitive {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); }
+  .touch-selection .radio:checked:hover {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-hover-dark.png"), url("assets/radio-checked-hover-dark@2.png")); }
+  .touch-selection .radio:checked:active {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-active-dark.png"), url("assets/radio-checked-active-dark@2.png")); }
+  .touch-selection .radio:backdrop:checked {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop-dark.png"), url("assets/radio-checked-backdrop-dark@2.png")); }
 
 .overshoot.top {
   background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#878787), to(rgba(135, 135, 135, 0))), -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(46, 52, 54, 0.07)), to(rgba(46, 52, 54, 0)));
--- a/gtk-3.0/gtk-dark.css	Sat Jul 09 11:48:31 2016 +0100
+++ b/gtk-3.0/gtk-dark.css	Sat Jul 09 15:25:37 2016 +0100
@@ -17,7 +17,7 @@
   -GtkWidget-focus-padding: 2;
   -GtkWidget-focus-line-width: 1;
   -GtkWidget-text-handle-width: 20;
-  -GtkWidget-text-handle-height: 20;
+  -GtkWidget-text-handle-height: 24;
   -GtkDialog-button-spacing: 4;
   -GtkDialog-action-area-border: 0;
   -GtkStatusbar-shadow-type: none;
@@ -73,20 +73,20 @@
   .view:selected, GtkCalendar:selected {
     border-radius: 3px; }
 
-.rubberband, .content-view.rubberband {
-  border: 1px solid #5E7F3E;
-  background-color: rgba(94, 127, 62, 0.2); }
+.rubberband, GtkTreeView.view.rubberband, .content-view.rubberband {
+  border: 1px solid #455d2d;
+  background-color: rgba(69, 93, 45, 0.2); }
 
-.label.separator, GtkPlacesSidebar.sidebar .view .label.separator {
+.label.separator {
   color: #eeeeec; }
-  .label.separator:backdrop, GtkPlacesSidebar.sidebar .view .label.separator:backdrop {
+  .label.separator:backdrop {
     color: #949796; }
 .label:insensitive {
   color: #949796; }
   .label:insensitive:backdrop {
     color: #5d6767; }
 
-.dim-label, .label.separator, GtkPlacesSidebar.sidebar .view .label.separator, .titlebar .subtitle,
+.dim-label, .label.separator, .titlebar .subtitle,
 .header-bar .subtitle {
   opacity: 0.55;
   text-shadow: none; }
@@ -120,7 +120,7 @@
     outline-offset: -2px; }
 
 .popover.osd, .app-notification,
-.app-notification.frame, .osd {
+.app-notification.frame, .osd .scale-popup, .osd {
   color: #eeeeec;
   border: none;
   background-color: rgba(32, 37, 38, 0.7);
@@ -129,7 +129,7 @@
   box-shadow: none;
   text-shadow: 0 1px black;
   icon-shadow: 0 1px black; }
-  .popover.osd:backdrop, .app-notification:backdrop, .osd:backdrop {
+  .popover.osd:backdrop, .app-notification:backdrop, .osd .scale-popup:backdrop, .osd:backdrop {
     text-shadow: none; }
 
 /*********************
@@ -158,10 +158,10 @@
   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, #212121, #292929 90%);
+  background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
   color: white;
   border-color: #1c1f1f;
-  box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(94, 127, 62, 0), 0 1px rgba(238, 238, 236, 0.1); }
+  box-shadow: inset 0 0 0 1px rgba(94, 127, 62, 0), 0 1px rgba(238, 238, 236, 0.1); }
   .entry.image.left {
     padding-left: 0; }
   .entry.image.right {
@@ -169,38 +169,38 @@
   .entry.flat, .entry.flat:focus {
     padding: 2px;
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #212121, #292929 90%);
+    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
     color: white;
     border-color: #1c1f1f;
-    box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(94, 127, 62, 0);
+    box-shadow: inset 0 0 0 1px rgba(94, 127, 62, 0);
     border: none;
     border-radius: 0; }
   .entry:focus {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #212121, #292929 90%);
-    box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(94, 127, 62, 0.7), 0 1px rgba(238, 238, 236, 0.1);
+    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+    box-shadow: inset 0 0 0 1px #5E7F3E, 0 1px rgba(238, 238, 236, 0.1);
     border-color: #12180c; }
   .entry:insensitive {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #212121, #292929 90%);
+    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
     color: #949796;
     border-color: #1c1f1f;
     background-image: linear-gradient(to bottom, #333636);
-    box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(238, 238, 236, 0.1); }
+    box-shadow: 0 1px rgba(238, 238, 236, 0.1); }
   .entry:backdrop {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #212121, #292929 90%);
+    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: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(238, 238, 236, 0); }
+    box-shadow: 0 1px rgba(238, 238, 236, 0); }
   .entry:backdrop:insensitive {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #212121, #292929 90%);
+    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
     color: #5d6767;
     border-color: #1f2222;
     background-image: linear-gradient(to bottom, #333636);
-    box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(238, 238, 236, 0); }
+    box-shadow: 0 1px rgba(238, 238, 236, 0); }
   .entry.progressbar {
     margin: 1px;
     border-radius: 0;
@@ -212,36 +212,25 @@
     box-shadow: none; }
     .entry.progressbar:backdrop {
       background-color: transparent; }
-  .linked > .entry {
-    border-radius: 0; }
-    .linked > .entry:first-child {
-      border-top-left-radius: 3px;
-      border-bottom-left-radius: 3px; }
-      .linked > .entry:first-child:dir(rtl) {
-        border-right-style: none; }
-    .linked > .entry:last-child {
-      border-top-right-radius: 3px;
-      border-bottom-right-radius: 3px;
-      border-left-style: none; }
-      .linked > .entry:last-child:dir(rtl) {
-        border-left-style: solid; }
+  .linked:not(.vertical) > .entry:focus + .entry, .linked:not(.vertical) > .entry:focus + .button, .linked:not(.vertical) > .entry:focus + GtkComboBox > .the-button-in-the-combobox, .linked:not(.vertical) > .entry:focus + GtkComboBoxText > .the-button-in-the-combobox {
+    border-left-color: #12180c; }
   .entry.error {
     color: #cc0000;
-    border-color: #cc0000; }
+    border-color: #1a0000; }
     .entry.error:focus {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #212121, #292929 90%);
-      box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(204, 0, 0, 0.7), 0 1px rgba(238, 238, 236, 0.1);
+      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 {
       background-color: #cc0000; }
   .entry.warning {
     color: #f57900;
-    border-color: #f57900; }
+    border-color: #432100; }
     .entry.warning:focus {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #212121, #292929 90%);
-      box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(245, 121, 0, 0.7), 0 1px rgba(238, 238, 236, 0.1);
+      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; }
@@ -253,114 +242,9 @@
       color: #5E7F3E; }
     .entry.image:backdrop {
       color: #7f8281; }
-  .linked.vertical > .entry {
-    background-color: transparent;
-    background-image: linear-gradient(to bottom, #212121, #292929 90%);
-    color: white;
-    border-color: #1c1f1f;
-    box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(94, 127, 62, 0);
-    background-image: linear-gradient(to bottom, #292929);
-    border-bottom-color: #252626;
-    box-shadow: none; }
-    .linked.vertical > .entry:focus {
-      border-color: #12180c;
-      box-shadow: inset 0 0 0 1px rgba(94, 127, 62, 0.7), 0 -1px 0 0 #12180c; }
-    .linked.vertical > .entry:insensitive {
-      background-color: transparent;
-      background-image: linear-gradient(to bottom, #212121, #292929 90%);
-      color: #949796;
-      border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #333636);
-      box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent;
-      border-bottom-color: #252626; }
-      .linked.vertical > .entry:insensitive:backdrop {
-        background-color: transparent;
-        background-image: linear-gradient(to bottom, #212121, #292929 90%);
-        color: #5d6767;
-        border-color: #1f2222;
-        background-image: linear-gradient(to bottom, #333636);
-        box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent;
-        border-bottom-color: #282929; }
-    .linked.vertical > .entry:backdrop {
-      background-color: transparent;
-      background-image: linear-gradient(to bottom, #212121, #292929 90%);
-      color: #d5d5d5;
-      border-color: #1f2222;
-      background-image: linear-gradient(to bottom, #2c2c2c);
-      box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent;
-      border-bottom-color: #282929; }
-    .linked.vertical > .entry:first-child {
-      background-color: transparent;
-      background-image: linear-gradient(to bottom, #212121, #292929 90%);
-      color: white;
-      border-color: #1c1f1f;
-      box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(94, 127, 62, 0);
-      border-bottom-color: #252626; }
-      .linked.vertical > .entry:first-child:focus {
-        background-color: transparent;
-        background-image: linear-gradient(to bottom, #212121, #292929 90%);
-        box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(94, 127, 62, 0.7);
-        border-color: #12180c; }
-      .linked.vertical > .entry:first-child:insensitive {
-        background-color: transparent;
-        background-image: linear-gradient(to bottom, #212121, #292929 90%);
-        color: #949796;
-        border-color: #1c1f1f;
-        background-image: linear-gradient(to bottom, #333636);
-        box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent;
-        border-bottom-color: #282929; }
-        .linked.vertical > .entry:first-child:insensitive:backdrop {
-          background-color: transparent;
-          background-image: linear-gradient(to bottom, #212121, #292929 90%);
-          color: #5d6767;
-          border-color: #1f2222;
-          background-image: linear-gradient(to bottom, #333636);
-          box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent;
-          border-bottom-color: #282929;
-          border-top-style: solid; }
-      .linked.vertical > .entry:first-child:backdrop {
-        background-color: transparent;
-        background-image: linear-gradient(to bottom, #212121, #292929 90%);
-        color: #d5d5d5;
-        border-color: #1f2222;
-        background-image: linear-gradient(to bottom, #2c2c2c);
-        box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent;
-        border-bottom-color: #282929; }
-    .linked.vertical > .entry:last-child {
-      background-color: transparent;
-      background-image: linear-gradient(to bottom, #212121, #292929 90%);
-      color: white;
-      border-color: #1c1f1f;
-      box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(94, 127, 62, 0), 0 1px rgba(238, 238, 236, 0.1);
-      background-image: linear-gradient(to bottom, #292929);
-      box-shadow: 0 1px rgba(238, 238, 236, 0.1); }
-      .linked.vertical > .entry:last-child:focus {
-        border-color: #12180c;
-        box-shadow: inset 0 0 0 1px rgba(94, 127, 62, 0.7), 0 -1px 0 0 #12180c, 0 1px rgba(238, 238, 236, 0.1); }
-      .linked.vertical > .entry:last-child:insensitive {
-        background-color: transparent;
-        background-image: linear-gradient(to bottom, #212121, #292929 90%);
-        color: #949796;
-        border-color: #1c1f1f;
-        background-image: linear-gradient(to bottom, #333636);
-        box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(238, 238, 236, 0.1); }
-        .linked.vertical > .entry:last-child:insensitive:backdrop {
-          background-color: transparent;
-          background-image: linear-gradient(to bottom, #212121, #292929 90%);
-          color: #5d6767;
-          border-color: #1f2222;
-          background-image: linear-gradient(to bottom, #333636);
-          box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(238, 238, 236, 0); }
-      .linked.vertical > .entry:last-child:backdrop {
-        background-color: transparent;
-        background-image: linear-gradient(to bottom, #212121, #292929 90%);
-        color: #d5d5d5;
-        border-color: #1f2222;
-        background-image: linear-gradient(to bottom, #2c2c2c);
-        box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(238, 238, 236, 0); }
   .osd .entry {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #212121, #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));
@@ -370,17 +254,17 @@
     icon-shadow: 0 1px black; }
     .osd .entry:focus {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #212121, #292929 90%);
+      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
       color: white;
       border-color: #5E7F3E;
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
       background-clip: padding-box;
-      box-shadow: inset 0 0 0 1px rgba(94, 127, 62, 0.7);
+      box-shadow: inset 0 0 0 1px #5E7F3E;
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black; }
     .osd .entry:backdrop {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #212121, #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));
@@ -390,7 +274,7 @@
       icon-shadow: none; }
     .osd .entry:insensitive {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #212121, #292929 90%);
+      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(53, 57, 58, 0.5));
@@ -399,6 +283,27 @@
       text-shadow: none;
       icon-shadow: none; }
 
+.linked.vertical > .entry:not(:last-child) {
+  box-shadow: none; }
+.linked.vertical > .entry:focus:not(:last-child) {
+  box-shadow: inset 0 0 0 1px #5E7F3E; }
+.linked.vertical > .entry:not(:insensitive) + .entry:not(:insensitive) {
+  border-top-color: #252626;
+  background-image: linear-gradient(to bottom, #292929); }
+  .linked.vertical > .entry:not(:insensitive) + .entry:not(:insensitive):backdrop {
+    border-top-color: #282929;
+    background-image: linear-gradient(to bottom, #2c2c2c); }
+.linked.vertical > .entry + .entry:focus:not(:last-child) {
+  border-top-color: #12180c;
+  box-shadow: inset 0 0 0 1px #5E7F3E; }
+.linked.vertical > .entry + .entry:focus:last-child {
+  border-top-color: #12180c; }
+.linked.vertical > .entry:focus:not(:only-child) + .entry,
+.linked.vertical > .entry:focus:not(:only-child) + .button,
+.linked.vertical > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+.linked.vertical > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox {
+  border-top-color: #12180c; }
+
 /***********
  * Buttons *
  ***********/
@@ -420,7 +325,7 @@
   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); }
-  .button.flat, .header-bar .titlebutton.button,
+  .button.flat, .sidebar-button.button, .header-bar .titlebutton.button,
   .titlebar .titlebutton.button {
     border-color: transparent;
     background-color: transparent;
@@ -429,11 +334,11 @@
     text-shadow: none;
     icon-shadow: none;
     transition: none; }
-    .button.flat:hover, .header-bar .titlebutton.button:hover,
+    .button.flat:hover, .sidebar-button.button:hover, .header-bar .titlebutton.button:hover,
     .titlebar .titlebutton.button:hover {
       transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
       transition-duration: 500ms; }
-      .button.flat:hover:active, .header-bar .titlebutton.button:hover:active,
+      .button.flat:hover:active, .sidebar-button.button:hover:active, .header-bar .titlebutton.button:hover:active,
       .titlebar .titlebutton.button:hover:active {
         transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
   .button:hover, .header-bar .button.titlebutton:hover,
@@ -458,7 +363,7 @@
     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);
     transition-duration: 50ms; }
   .button:backdrop, .header-bar .button.titlebutton:backdrop,
-  .titlebar .button.titlebutton:backdrop, .button.flat:backdrop, .header-bar .titlebutton.button:backdrop,
+  .titlebar .button.titlebutton:backdrop, .button.flat:backdrop, .sidebar-button.button:backdrop, .header-bar .titlebutton.button:backdrop,
   .titlebar .titlebutton.button:backdrop {
     color: #949796;
     border-color: #1f2222;
@@ -467,14 +372,14 @@
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
     -gtk-image-effect: none; }
-    .button:backdrop:active, .button:backdrop:checked, .button.flat:backdrop:active, .header-bar .titlebutton.button:backdrop:active,
-    .titlebar .titlebutton.button:backdrop:active, .button.flat:backdrop:checked, .header-bar .titlebutton.button:backdrop:checked,
+    .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: #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, .header-bar .titlebutton.button:backdrop:insensitive,
+    .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: #1f2222;
@@ -483,11 +388,11 @@
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
       .button:backdrop:insensitive > .label, .header-bar .button.titlebutton:backdrop:insensitive > .label,
-      .titlebar .button.titlebutton:backdrop:insensitive > .label, .button.flat:backdrop:insensitive > .label, .header-bar .titlebutton.button: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, .header-bar .titlebutton.button:backdrop:insensitive:active,
-    .titlebar .titlebutton.button:backdrop:insensitive:active, .button.flat:backdrop:insensitive:checked, .header-bar .titlebutton.button:backdrop:insensitive:checked,
+    .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: #1f2222;
@@ -495,13 +400,13 @@
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
       .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, .header-bar .titlebutton.button:backdrop:insensitive:active > .label,
-      .titlebar .titlebutton.button:backdrop:insensitive:active > .label, .button.flat:backdrop:insensitive:checked > .label, .header-bar .titlebutton.button: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; }
-  .button.flat:backdrop, .header-bar .titlebutton.button:backdrop,
-  .titlebar .titlebutton.button:backdrop, .button.flat:insensitive, .header-bar .titlebutton.button:insensitive,
-  .titlebar .titlebutton.button:insensitive, .button.flat:backdrop:insensitive, .header-bar .titlebutton.button:backdrop:insensitive,
+  .button.flat:backdrop, .sidebar-button.button:backdrop, .header-bar .titlebutton.button:backdrop,
+  .titlebar .titlebutton.button:backdrop, .button.flat:insensitive, .sidebar-button.button:insensitive, .header-bar .titlebutton.button:insensitive,
+  .titlebar .titlebutton.button:insensitive, .button.flat:backdrop:insensitive, .sidebar-button.button:backdrop:insensitive, .header-bar .titlebutton.button:backdrop:insensitive,
   .titlebar .titlebutton.button:backdrop:insensitive {
     border-color: transparent;
     background-color: transparent;
@@ -544,7 +449,8 @@
     outline-color: rgba(238, 238, 236, 0.3);
     border: none;
     box-shadow: none; }
-    .button.osd.image-button, .header-bar .osd.titlebutton.button,
+    .button.osd.image-button, GtkScaleButton.button.osd,
+    GtkVolumeButton.button.osd, .header-bar .osd.titlebutton.button,
     .titlebar .osd.titlebutton.button {
       padding: 13px; }
     .button.osd:hover {
@@ -648,7 +554,7 @@
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none; }
-    .osd .button.flat, .osd .header-bar .titlebutton.button, .header-bar .osd .titlebutton.button,
+    .osd .button.flat, .osd .sidebar-button.button, .osd .header-bar .titlebutton.button, .header-bar .osd .titlebutton.button,
     .osd .titlebar .titlebutton.button,
     .titlebar .osd .titlebutton.button {
       border-color: transparent;
@@ -660,7 +566,7 @@
       box-shadow: none;
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black; }
-      .osd .button.flat:hover, .osd .header-bar .titlebutton.button:hover, .header-bar .osd .titlebutton.button:hover,
+      .osd .button.flat:hover, .osd .sidebar-button.button:hover, .osd .header-bar .titlebutton.button:hover, .header-bar .osd .titlebutton.button:hover,
       .osd .titlebar .titlebutton.button:hover,
       .titlebar .osd .titlebutton.button:hover {
         color: white;
@@ -674,7 +580,7 @@
         background-clip: padding-box;
         border-color: transparent;
         box-shadow: none; }
-      .osd .button.flat:insensitive, .osd .header-bar .titlebutton.button:insensitive, .header-bar .osd .titlebutton.button:insensitive,
+      .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: #878a89;
@@ -687,7 +593,7 @@
         background-image: none;
         border-color: transparent;
         box-shadow: none; }
-      .osd .button.flat:backdrop, .osd .header-bar .titlebutton.button:backdrop, .header-bar .osd .titlebutton.button:backdrop,
+      .osd .button.flat:backdrop, .osd .sidebar-button.button:backdrop, .osd .header-bar .titlebutton.button:backdrop, .header-bar .osd .titlebutton.button:backdrop,
       .osd .titlebar .titlebutton.button:backdrop,
       .titlebar .osd .titlebutton.button:backdrop {
         border-color: transparent;
@@ -696,9 +602,9 @@
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
         text-shadow: none;
         icon-shadow: none; }
-      .osd .button.flat:active, .osd .header-bar .titlebutton.button:active, .header-bar .osd .titlebutton.button:active,
+      .osd .button.flat:active, .osd .sidebar-button.button:active, .osd .header-bar .titlebutton.button:active, .header-bar .osd .titlebutton.button:active,
       .osd .titlebar .titlebutton.button:active,
-      .titlebar .osd .titlebutton.button:active, .osd .button.flat:checked, .osd .header-bar .titlebutton.button:checked, .header-bar .osd .titlebutton.button:checked,
+      .titlebar .osd .titlebutton.button:active, .osd .button.flat:checked, .osd .sidebar-button.button:checked, .osd .header-bar .titlebutton.button:checked, .header-bar .osd .titlebutton.button:checked,
       .osd .titlebar .titlebutton.button:checked,
       .titlebar .osd .titlebutton.button:checked {
         color: white;
@@ -721,7 +627,7 @@
     text-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
-    .button.suggested-action.flat, .header-bar .suggested-action.titlebutton.button,
+    .button.suggested-action.flat, .suggested-action.sidebar-button.button, .header-bar .suggested-action.titlebutton.button,
     .titlebar .suggested-action.titlebutton.button {
       border-color: transparent;
       background-color: transparent;
@@ -746,7 +652,7 @@
       text-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
       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), 0 1px rgba(238, 238, 236, 0.1); }
-    .button.suggested-action:backdrop, .button.suggested-action.flat:backdrop, .header-bar .suggested-action.titlebutton.button:backdrop,
+    .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: #dfe5d8;
       border-color: #1f2914;
@@ -754,14 +660,14 @@
       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:active, .button.suggested-action:backdrop:checked, .button.suggested-action.flat:backdrop:active, .header-bar .suggested-action.titlebutton.button:backdrop:active,
-      .titlebar .suggested-action.titlebutton.button:backdrop:active, .button.suggested-action.flat:backdrop:checked, .header-bar .suggested-action.titlebutton.button:backdrop:checked,
+      .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: #dadfd5;
         border-color: #1f2914;
         background-image: linear-gradient(to bottom, #455d2d);
         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, .header-bar .suggested-action.titlebutton.button:backdrop:insensitive,
+      .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: #1f2222;
@@ -770,11 +676,11 @@
         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, .header-bar .suggested-action.button.titlebutton:backdrop:insensitive > .label,
-        .titlebar .suggested-action.button.titlebutton:backdrop:insensitive > .label, .button.suggested-action.flat:backdrop:insensitive > .label, .header-bar .suggested-action.titlebutton.button: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, .header-bar .suggested-action.titlebutton.button:backdrop:insensitive:active,
-        .titlebar .suggested-action.titlebutton.button:backdrop:insensitive:active, .button.suggested-action.flat:backdrop:insensitive:checked, .header-bar .suggested-action.titlebutton.button:backdrop:insensitive:checked,
+        .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: #89987a;
           border-color: #1f2914;
@@ -782,13 +688,13 @@
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
           .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, .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, .header-bar .suggested-action.titlebutton.button: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; }
-    .button.suggested-action.flat:backdrop, .header-bar .suggested-action.titlebutton.button:backdrop,
-    .titlebar .suggested-action.titlebutton.button:backdrop, .button.suggested-action.flat:insensitive, .header-bar .suggested-action.titlebutton.button:insensitive,
-    .titlebar .suggested-action.titlebutton.button:insensitive, .button.suggested-action.flat:backdrop:insensitive, .header-bar .suggested-action.titlebutton.button:backdrop:insensitive,
+    .button.suggested-action.flat:backdrop, .suggested-action.sidebar-button.button:backdrop, .header-bar .suggested-action.titlebutton.button:backdrop,
+    .titlebar .suggested-action.titlebutton.button:backdrop, .button.suggested-action.flat:insensitive, .suggested-action.sidebar-button.button:insensitive, .header-bar .suggested-action.titlebutton.button:insensitive,
+    .titlebar .suggested-action.titlebutton.button: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 {
       border-color: transparent;
       background-color: transparent;
@@ -868,7 +774,7 @@
     text-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.3), 0 1px rgba(238, 238, 236, 0.1); }
-    .button.destructive-action.flat, .header-bar .destructive-action.titlebutton.button,
+    .button.destructive-action.flat, .destructive-action.sidebar-button.button, .header-bar .destructive-action.titlebutton.button,
     .titlebar .destructive-action.titlebutton.button {
       border-color: transparent;
       background-color: transparent;
@@ -893,7 +799,7 @@
       text-shadow: 0 -1px rgba(0, 0, 0, 0.72078);
       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), 0 1px rgba(238, 238, 236, 0.1); }
-    .button.destructive-action:backdrop, .button.destructive-action.flat:backdrop, .header-bar .destructive-action.titlebutton.button:backdrop,
+    .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: #f7cfcf;
       border-color: #5e0707;
@@ -901,14 +807,14 @@
       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:active, .button.destructive-action:backdrop:checked, .button.destructive-action.flat:backdrop:active, .header-bar .destructive-action.titlebutton.button:backdrop:active,
-      .titlebar .destructive-action.titlebutton.button:backdrop:active, .button.destructive-action.flat:backdrop:checked, .header-bar .destructive-action.titlebutton.button:backdrop:checked,
+      .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: #edcece;
         border-color: #5e0707;
         background-image: linear-gradient(to bottom, #a60c0c);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-      .button.destructive-action:backdrop:insensitive, .button.destructive-action.flat:backdrop:insensitive, .header-bar .destructive-action.titlebutton.button:backdrop:insensitive,
+      .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: #1f2222;
@@ -917,11 +823,11 @@
         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, .header-bar .destructive-action.button.titlebutton:backdrop:insensitive > .label,
-        .titlebar .destructive-action.button.titlebutton:backdrop:insensitive > .label, .button.destructive-action.flat:backdrop:insensitive > .label, .header-bar .destructive-action.titlebutton.button: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, .header-bar .destructive-action.titlebutton.button:backdrop:insensitive:active,
-        .titlebar .destructive-action.titlebutton.button:backdrop:insensitive:active, .button.destructive-action.flat:backdrop:insensitive:checked, .header-bar .destructive-action.titlebutton.button:backdrop:insensitive:checked,
+        .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: #c46565;
           border-color: #5e0707;
@@ -929,13 +835,13 @@
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
           .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, .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, .header-bar .destructive-action.titlebutton.button: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; }
-    .button.destructive-action.flat:backdrop, .header-bar .destructive-action.titlebutton.button:backdrop,
-    .titlebar .destructive-action.titlebutton.button:backdrop, .button.destructive-action.flat:insensitive, .header-bar .destructive-action.titlebutton.button:insensitive,
-    .titlebar .destructive-action.titlebutton.button:insensitive, .button.destructive-action.flat:backdrop:insensitive, .header-bar .destructive-action.titlebutton.button:backdrop:insensitive,
+    .button.destructive-action.flat:backdrop, .destructive-action.sidebar-button.button:backdrop, .header-bar .destructive-action.titlebutton.button:backdrop,
+    .titlebar .destructive-action.titlebutton.button:backdrop, .button.destructive-action.flat:insensitive, .destructive-action.sidebar-button.button:insensitive, .header-bar .destructive-action.titlebutton.button:insensitive,
+    .titlebar .destructive-action.titlebutton.button: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 {
       border-color: transparent;
       background-color: transparent;
@@ -1006,20 +912,25 @@
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none; }
-  .button.image-button, .header-bar .titlebutton.button,
+  .button.image-button, GtkScaleButton.button,
+  GtkVolumeButton.button, .header-bar .titlebutton.button,
   .titlebar .titlebutton.button {
     padding: 8px; }
-  .button.text-button, .header-bar .text-button.button.titlebutton,
+  .button.text-button, GtkScaleButton.button.text-button,
+  GtkVolumeButton.button.text-button, .header-bar .text-button.button.titlebutton,
   .titlebar .text-button.button.titlebutton {
     padding-left: 16px;
     padding-right: 16px; }
-  .button.text-button.image-button, .header-bar .text-button.titlebutton.button,
+  .button.text-button.image-button, GtkScaleButton.button.text-button,
+  GtkVolumeButton.button.text-button, .header-bar .text-button.titlebutton.button,
   .titlebar .text-button.titlebutton.button {
     padding: 5px 8px 6px; }
-    .button.text-button.image-button .label:first-child, .header-bar .text-button.titlebutton.button .label:first-child,
+    .button.text-button.image-button .label:first-child, GtkScaleButton.button.text-button .label:first-child,
+    GtkVolumeButton.button.text-button .label:first-child, .header-bar .text-button.titlebutton.button .label:first-child,
     .titlebar .text-button.titlebutton.button .label:first-child {
       padding-left: 8px; }
-    .button.text-button.image-button .label:last-child, .header-bar .text-button.titlebutton.button .label:last-child,
+    .button.text-button.image-button .label:last-child, GtkScaleButton.button.text-button .label:last-child,
+    GtkVolumeButton.button.text-button .label:last-child, .header-bar .text-button.titlebutton.button .label:last-child,
     .titlebar .text-button.titlebutton.button .label:last-child {
       padding-right: 8px; }
   .stack-switcher > .button, .header-bar .stack-switcher > .button.titlebutton,
@@ -1037,7 +948,8 @@
     .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, .header-bar .stack-switcher > .titlebutton.button,
+    .stack-switcher > .button.image-button, .stack-switcher > GtkScaleButton.button,
+    .stack-switcher > GtkVolumeButton.button, .header-bar .stack-switcher > .titlebutton.button,
     .titlebar .stack-switcher > .titlebutton.button {
       padding: 5px 2px; }
     .stack-switcher > .button.needs-attention:active > .label, .stack-switcher > .button.needs-attention:active > GtkImage, .stack-switcher > .button.needs-attention:checked > .label, .stack-switcher > .button.needs-attention:checked > GtkImage {
@@ -1147,157 +1059,140 @@
     .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active > .label, .inline-toolbar GtkToolButton > .button:backdrop:insensitive:checked > .label {
       color: inherit; }
 
-.inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.search-bar GtkToolButton > .button.flat, .inline-toolbar.location-bar GtkToolButton > .button.flat, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton > .button.titlebutton,
+.inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.search-bar GtkToolButton > .button.flat, .inline-toolbar.location-bar GtkToolButton > .button.flat, .inline-toolbar.toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton > .sidebar-button.button, .inline-toolbar.location-bar GtkToolButton > .sidebar-button.button, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton > .button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton > .button.titlebutton,
 .titlebar .inline-toolbar GtkToolButton > .button.titlebutton,
 .inline-toolbar.toolbar GtkToolButton:backdrop > .button.flat,
 .inline-toolbar GtkToolButton:backdrop > .button.flat,
 .inline-toolbar.search-bar GtkToolButton:backdrop > .button.flat,
 .inline-toolbar.location-bar GtkToolButton:backdrop > .button.flat,
+.inline-toolbar.toolbar GtkToolButton:backdrop > .sidebar-button.button,
+.inline-toolbar GtkToolButton:backdrop > .sidebar-button.button,
+.inline-toolbar.search-bar GtkToolButton:backdrop > .sidebar-button.button,
+.inline-toolbar.location-bar GtkToolButton:backdrop > .sidebar-button.button,
 .inline-toolbar .header-bar GtkToolButton:backdrop > .button.titlebutton,
 .header-bar .inline-toolbar GtkToolButton:backdrop > .button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:backdrop > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:backdrop > .button.titlebutton, .osd .button:hover, .osd .button:active, .osd .button:checked, .osd .button:backdrop:active, .osd .button:backdrop:checked, .osd .button:insensitive, .osd .button:backdrop:insensitive, .osd .button:backdrop, .osd .button.suggested-action, .osd .button.suggested-action:hover, .osd .button.suggested-action:active, .osd .button.suggested-action:checked, .osd .button.suggested-action:backdrop:active, .osd .button.suggested-action:backdrop:checked, .osd .button.suggested-action:insensitive, .osd .button.suggested-action:backdrop:insensitive, .osd .button.suggested-action:backdrop, .osd .button.destructive-action, .osd .button.destructive-action:hover, .osd .button.destructive-action:active, .osd .button.destructive-action:checked, .osd .button.destructive-action:backdrop:active, .osd .button.destructive-action:backdrop:checked, .osd .button.destructive-action:insensitive, .osd .button.destructive-action:backdrop:insensitive, .osd .button.destructive-action:backdrop, .inline-toolbar .button, .inline-toolbar .header-bar .button.titlebutton, .header-bar .inline-toolbar .button.titlebutton,
+.titlebar .inline-toolbar GtkToolButton:backdrop > .button.titlebutton, .linked:not(.vertical) > .entry, .osd .button:hover, .osd .button:active, .osd .button:checked, .osd .button:backdrop:active, .osd .button:backdrop:checked, .osd .button:insensitive, .osd .button:backdrop:insensitive, .osd .button:backdrop, .osd .button.suggested-action, .osd .button.suggested-action:hover, .osd .button.suggested-action:active, .osd .button.suggested-action:checked, .osd .button.suggested-action:backdrop:active, .osd .button.suggested-action:backdrop:checked, .osd .button.suggested-action:insensitive, .osd .button.suggested-action:backdrop:insensitive, .osd .button.suggested-action:backdrop, .osd .button.destructive-action, .osd .button.destructive-action:hover, .osd .button.destructive-action:active, .osd .button.destructive-action:checked, .osd .button.destructive-action:backdrop:active, .osd .button.destructive-action:backdrop:checked, .osd .button.destructive-action:insensitive, .osd .button.destructive-action:backdrop:insensitive, .osd .button.destructive-action:backdrop, .inline-toolbar .button, .inline-toolbar .header-bar .button.titlebutton, .header-bar .inline-toolbar .button.titlebutton,
 .inline-toolbar .titlebar .button.titlebutton,
 .titlebar .inline-toolbar .button.titlebutton, .inline-toolbar .button:backdrop, .linked > .button, .header-bar .linked > .button.titlebutton,
-.titlebar .linked > .button.titlebutton, .linked > .button:hover, .linked > .button:active, .linked > .button:checked, .linked > .button:backdrop, GtkComboBox.combobox-entry .entry, GtkComboBox.combobox-entry .button, GtkComboBox.combobox-entry .header-bar .button.titlebutton, .header-bar GtkComboBox.combobox-entry .button.titlebutton,
-GtkComboBox.combobox-entry .titlebar .button.titlebutton,
-.titlebar GtkComboBox.combobox-entry .button.titlebutton, GtkComboBox.combobox-entry .button:backdrop, .linked > GtkComboBox > .button:dir(ltr) {
+.titlebar .linked > .button.titlebutton, .linked > .button:hover, .linked > .button:active, .linked > .button:checked, .linked > .button:backdrop, .linked > GtkComboBox > .the-button-in-the-combobox:dir(ltr), .linked > GtkComboBox > .the-button-in-the-combobox:dir(rtl),
+.linked > GtkComboBoxText > .the-button-in-the-combobox:dir(ltr),
+.linked > GtkComboBoxText > .the-button-in-the-combobox:dir(rtl) {
   border-radius: 0;
-  border-left-style: none; }
-  .inline-toolbar GtkToolButton > .button.flat:dir(rtl), .inline-toolbar .header-bar GtkToolButton > .button.titlebutton:dir(rtl), .header-bar .inline-toolbar GtkToolButton > .button.titlebutton:dir(rtl),
-  .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:dir(rtl),
-  .titlebar .inline-toolbar GtkToolButton > .button.titlebutton:dir(rtl),
-  .inline-toolbar GtkToolButton:backdrop > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar.search-bar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar.location-bar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar .header-bar GtkToolButton:dir(rtl) > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:dir(rtl) > .button.titlebutton,
-  .inline-toolbar .titlebar GtkToolButton:dir(rtl) > .button.titlebutton,
-  .titlebar .inline-toolbar GtkToolButton:dir(rtl) > .button.titlebutton,
-  .inline-toolbar.toolbar GtkToolButton:backdrop:dir(rtl) > .button.flat,
-  .inline-toolbar GtkToolButton:backdrop:dir(rtl) > .button.flat,
-  .inline-toolbar.search-bar GtkToolButton:backdrop:dir(rtl) > .button.flat,
-  .inline-toolbar.location-bar GtkToolButton:backdrop:dir(rtl) > .button.flat,
-  .inline-toolbar .header-bar GtkToolButton:backdrop:dir(rtl) > .button.titlebutton,
-  .header-bar .inline-toolbar GtkToolButton:backdrop:dir(rtl) > .button.titlebutton,
-  .inline-toolbar .titlebar GtkToolButton:backdrop:dir(rtl) > .button.titlebutton,
-  .titlebar .inline-toolbar GtkToolButton:backdrop:dir(rtl) > .button.titlebutton, .osd .button:dir(rtl):hover, .osd .button:dir(rtl):active, .osd .button:dir(rtl):checked, .osd .button:dir(rtl):insensitive, .osd .button:dir(rtl):backdrop, .osd .button.suggested-action:dir(rtl), .osd .button.destructive-action:dir(rtl), .inline-toolbar .button:dir(rtl), .linked > .button:dir(rtl), .header-bar .linked > .button.titlebutton:dir(rtl),
-  .titlebar .linked > .button.titlebutton:dir(rtl), GtkComboBox.combobox-entry .entry:dir(rtl), GtkComboBox.combobox-entry .button:dir(rtl), .linked > GtkComboBox > .button:dir(rtl) {
-    border-radius: 0;
-    border-right-style: none;
-    border-left-style: solid; }
+  border-right-style: none; }
 
-.osd .button:first-child:hover, .osd .button:first-child:active, .osd .button:first-child:checked, .osd .button:first-child:insensitive, .osd .button:first-child:backdrop, .osd .button.suggested-action:first-child, .osd .button.destructive-action: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 .header-bar GtkToolButton:first-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:first-child > .button.titlebutton,
+.linked:not(.vertical) > .entry:first-child, .osd .button:first-child:hover, .osd .button:first-child:active, .osd .button:first-child:checked, .osd .button:first-child:insensitive, .osd .button:first-child:backdrop, .osd .button.suggested-action:first-child, .osd .button.destructive-action: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,
 .inline-toolbar GtkToolButton:backdrop:first-child > .button.flat,
 .inline-toolbar.search-bar GtkToolButton:backdrop:first-child > .button.flat,
 .inline-toolbar.location-bar GtkToolButton:backdrop:first-child > .button.flat,
+.inline-toolbar.toolbar GtkToolButton:backdrop:first-child > .sidebar-button.button,
+.inline-toolbar GtkToolButton:backdrop:first-child > .sidebar-button.button,
+.inline-toolbar.search-bar GtkToolButton:backdrop:first-child > .sidebar-button.button,
+.inline-toolbar.location-bar GtkToolButton:backdrop:first-child > .sidebar-button.button,
 .inline-toolbar .header-bar GtkToolButton:backdrop:first-child > .button.titlebutton,
 .header-bar .inline-toolbar GtkToolButton:backdrop:first-child > .button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:backdrop:first-child > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:backdrop:first-child > .button.titlebutton, GtkComboBox.combobox-entry .entry:first-child, GtkComboBox.combobox-entry .button:first-child, .linked > GtkComboBox:first-child > .button {
-  border-radius: 3px 0 0 3px;
-  border-left-style: solid; }
-.osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .osd .button:last-child:backdrop, .osd .button.suggested-action:last-child, .osd .button.destructive-action: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 .header-bar GtkToolButton:last-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:last-child > .button.titlebutton,
+.titlebar .inline-toolbar GtkToolButton:backdrop:first-child > .button.titlebutton, .linked > GtkComboBox:first-child > .the-button-in-the-combobox,
+.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, .osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .osd .button:last-child:backdrop, .osd .button.suggested-action:last-child, .osd .button.destructive-action: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,
 .inline-toolbar GtkToolButton:backdrop:last-child > .button.flat,
 .inline-toolbar.search-bar GtkToolButton:backdrop:last-child > .button.flat,
 .inline-toolbar.location-bar GtkToolButton:backdrop:last-child > .button.flat,
+.inline-toolbar.toolbar GtkToolButton:backdrop:last-child > .sidebar-button.button,
+.inline-toolbar GtkToolButton:backdrop:last-child > .sidebar-button.button,
+.inline-toolbar.search-bar GtkToolButton:backdrop:last-child > .sidebar-button.button,
+.inline-toolbar.location-bar GtkToolButton:backdrop:last-child > .sidebar-button.button,
 .inline-toolbar .header-bar GtkToolButton:backdrop:last-child > .button.titlebutton,
 .header-bar .inline-toolbar GtkToolButton:backdrop:last-child > .button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:backdrop:last-child > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:backdrop:last-child > .button.titlebutton, GtkComboBox.combobox-entry .entry:last-child, GtkComboBox.combobox-entry .button:last-child, .linked > GtkComboBox:last-child > .button {
-  border-radius: 0 3px 3px 0; }
-  .osd .button:last-child:dir(rtl):hover, .osd .button:last-child:dir(rtl):active, .osd .button:last-child:dir(rtl):checked, .osd .button:last-child:dir(rtl):insensitive, .osd .button:last-child:dir(rtl):backdrop, .osd .button.suggested-action:last-child:dir(rtl), .osd .button.destructive-action:last-child:dir(rtl), .inline-toolbar .button:last-child:dir(rtl), .linked > .button:last-child:dir(rtl), .header-bar .linked > .button.titlebutton:last-child:dir(rtl),
-  .titlebar .linked > .button.titlebutton:last-child:dir(rtl), .inline-toolbar GtkToolButton:last-child > .button.flat:dir(rtl), .inline-toolbar .header-bar GtkToolButton:last-child > .button.titlebutton:dir(rtl), .header-bar .inline-toolbar GtkToolButton:last-child > .button.titlebutton:dir(rtl),
-  .inline-toolbar .titlebar GtkToolButton:last-child > .button.titlebutton:dir(rtl),
-  .titlebar .inline-toolbar GtkToolButton:last-child > .button.titlebutton:dir(rtl),
-  .inline-toolbar GtkToolButton:backdrop:last-child > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.search-bar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.location-bar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar .header-bar GtkToolButton:last-child:dir(rtl) > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.titlebutton,
-  .inline-toolbar .titlebar GtkToolButton:last-child:dir(rtl) > .button.titlebutton,
-  .titlebar .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.titlebutton,
-  .inline-toolbar.toolbar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat,
-  .inline-toolbar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat,
-  .inline-toolbar.search-bar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat,
-  .inline-toolbar.location-bar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat,
-  .inline-toolbar .header-bar GtkToolButton:backdrop:last-child:dir(rtl) > .button.titlebutton,
-  .header-bar .inline-toolbar GtkToolButton:backdrop:last-child:dir(rtl) > .button.titlebutton,
-  .inline-toolbar .titlebar GtkToolButton:backdrop:last-child:dir(rtl) > .button.titlebutton,
-  .titlebar .inline-toolbar GtkToolButton:backdrop:last-child:dir(rtl) > .button.titlebutton, GtkComboBox.combobox-entry .entry:last-child:dir(rtl), GtkComboBox.combobox-entry .button:last-child:dir(rtl), .linked > GtkComboBox:last-child > .button:dir(rtl) {
-    border-right-style: solid; }
-.osd .button:only-child:hover, .osd .button:only-child:active, .osd .button:only-child:checked, .osd .button:only-child:insensitive, .osd .button:only-child:backdrop, .osd .button.suggested-action:only-child, .osd .button.destructive-action: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 .header-bar GtkToolButton:only-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:only-child > .button.titlebutton,
+.titlebar .inline-toolbar GtkToolButton:backdrop:last-child > .button.titlebutton, .linked > GtkComboBox:last-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:last-child > .the-button-in-the-combobox {
+  border-top-right-radius: 3px;
+  border-bottom-right-radius: 3px;
+  border-right-style: solid; }
+.linked:not(.vertical) > .entry:only-child, .osd .button:only-child:hover, .osd .button:only-child:active, .osd .button:only-child:checked, .osd .button:only-child:insensitive, .osd .button:only-child:backdrop, .osd .button.suggested-action:only-child, .osd .button.destructive-action: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,
 .inline-toolbar GtkToolButton:backdrop:only-child > .button.flat,
 .inline-toolbar.search-bar GtkToolButton:backdrop:only-child > .button.flat,
 .inline-toolbar.location-bar GtkToolButton:backdrop:only-child > .button.flat,
+.inline-toolbar.toolbar GtkToolButton:backdrop:only-child > .sidebar-button.button,
+.inline-toolbar GtkToolButton:backdrop:only-child > .sidebar-button.button,
+.inline-toolbar.search-bar GtkToolButton:backdrop:only-child > .sidebar-button.button,
+.inline-toolbar.location-bar GtkToolButton:backdrop:only-child > .sidebar-button.button,
 .inline-toolbar .header-bar GtkToolButton:backdrop:only-child > .button.titlebutton,
 .header-bar .inline-toolbar GtkToolButton:backdrop:only-child > .button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:backdrop:only-child > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:backdrop:only-child > .button.titlebutton, GtkComboBox.combobox-entry .entry:only-child, GtkComboBox.combobox-entry .button:only-child, .linked > GtkComboBox:only-child > .button {
+.titlebar .inline-toolbar GtkToolButton:backdrop:only-child > .button.titlebutton, .linked > GtkComboBox:only-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:only-child > .the-button-in-the-combobox {
   border-radius: 3px;
   border-style: solid; }
 
-.linked.vertical > .entry, .linked.vertical > .entry:focus, .linked.vertical > .entry:insensitive, .linked.vertical > .entry:insensitive:backdrop, .linked.vertical > .entry:backdrop, .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 > .button,
-.linked.vertical > GtkComboBox > .button {
-  border-left-style: solid;
-  border-top-style: none;
+.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, .header-bar .linked.vertical > .button.titlebutton:first-child,
-.titlebar .linked.vertical > .button.titlebutton:first-child, .linked.vertical > GtkComboBoxText:first-child > .button,
-.linked.vertical > GtkComboBox:first-child > .button {
-  border-style: solid;
-  border-radius: 3px 3px 0 0; }
+.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, .header-bar .linked.vertical > .button.titlebutton:last-child,
-.titlebar .linked.vertical > .button.titlebutton:last-child, .linked.vertical > GtkComboBoxText:last-child > .button,
-.linked.vertical > GtkComboBox:last-child > .button {
-  border-radius: 0 0 3px 3px; }
+.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, .header-bar .linked.vertical > .button.titlebutton:only-child,
-.titlebar .linked.vertical > .button.titlebutton:only-child, .linked.vertical > GtkComboBoxText:only-child > .button,
-.linked.vertical > GtkComboBox:only-child > .button {
+.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; }
 
-.menuitem.button.flat, .header-bar .menuitem.titlebutton.button,
-.titlebar .menuitem.titlebutton.button, .menuitem.button.flat:backdrop, .menuitem.button.flat:backdrop:hover, .header-bar .menuitem.titlebutton.button:backdrop:hover,
+.menuitem.button.flat, .menuitem.sidebar-button.button, .header-bar .menuitem.titlebutton.button,
+.titlebar .menuitem.titlebutton.button, .menuitem.button.flat:backdrop, .menuitem.sidebar-button.button:backdrop, .menuitem.button.flat:backdrop:hover, .menuitem.sidebar-button.button:backdrop:hover, .header-bar .menuitem.titlebutton.button:backdrop:hover,
 .titlebar .menuitem.titlebutton.button:backdrop:hover, .button:link, .header-bar .button.titlebutton:link,
 .titlebar .button.titlebutton:link, .button:visited, .header-bar .button.titlebutton:visited,
 .titlebar .button.titlebutton:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .button:link:backdrop, .button:visited:backdrop, .menu.button, .header-bar .menu.button.titlebutton,
 .titlebar .menu.button.titlebutton, .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, .list-row.button, .header-bar .list-row.button.titlebutton,
-.titlebar .list-row.button.titlebutton,
-.list-row.button:backdrop,
-.list-row.button:backdrop:active,
-.list-row.button:backdrop:checked,
-.list-row.button:backdrop:insensitive,
-.list-row.button:backdrop:insensitive:active,
-.list-row.button:backdrop:insensitive:checked,
-.list-row.button:insensitive:active,
-.list-row.button:insensitive:checked, .app-notification .button.flat, .app-notification .header-bar .titlebutton.button, .header-bar .app-notification .titlebutton.button,
+.titlebar .notebook tab .button.titlebutton, .app-notification .button.flat, .app-notification .sidebar-button.button, .app-notification .header-bar .titlebutton.button, .header-bar .app-notification .titlebutton.button,
 .app-notification .titlebar .titlebutton.button,
 .titlebar .app-notification .titlebutton.button,
-.app-notification.frame .button.flat, .app-notification .button.flat:backdrop, .app-notification .button.flat:insensitive, .app-notification .button.flat:backdrop:insensitive, .app-notification .header-bar .titlebutton.button:backdrop:insensitive, .header-bar .app-notification .titlebutton.button:backdrop:insensitive,
+.app-notification.frame .button.flat,
+.app-notification.frame .sidebar-button.button, .app-notification .button.flat:backdrop, .app-notification .sidebar-button.button:backdrop, .app-notification .button.flat:insensitive, .app-notification .sidebar-button.button:insensitive, .app-notification .button.flat:backdrop:insensitive, .app-notification .sidebar-button.button:backdrop:insensitive, .app-notification .header-bar .titlebutton.button:backdrop:insensitive, .header-bar .app-notification .titlebutton.button:backdrop:insensitive,
 .app-notification .titlebar .titlebutton.button:backdrop:insensitive,
 .titlebar .app-notification .titlebutton.button:backdrop:insensitive,
 .app-notification.frame .button.flat:backdrop,
+.app-notification.frame .sidebar-button.button:backdrop,
 .app-notification.frame .header-bar .button.titlebutton:backdrop,
 .header-bar .app-notification.frame .button.titlebutton:backdrop,
 .app-notification.frame .titlebar .button.titlebutton:backdrop,
 .titlebar .app-notification.frame .button.titlebutton:backdrop,
 .app-notification.frame .button.flat:insensitive,
+.app-notification.frame .sidebar-button.button:insensitive,
 .app-notification.frame .header-bar .button.titlebutton:insensitive,
 .header-bar .app-notification.frame .button.titlebutton:insensitive,
 .app-notification.frame .titlebar .button.titlebutton:insensitive,
 .titlebar .app-notification.frame .button.titlebutton:insensitive,
-.app-notification.frame .button.flat:backdrop:insensitive, GtkCalendar.button, .header-bar GtkCalendar.button.titlebutton,
-.titlebar GtkCalendar.button.titlebutton, GtkCalendar.button:hover, GtkCalendar.button:backdrop, .scale-popup .button:hover, .scale-popup .button:backdrop, .scale-popup .button:backdrop:hover, .scale-popup .button:backdrop:insensitive {
+.app-notification.frame .button.flat:backdrop:insensitive,
+.app-notification.frame .sidebar-button.button:backdrop:insensitive, GtkCalendar.button, .header-bar GtkCalendar.button.titlebutton,
+.titlebar GtkCalendar.button.titlebutton, GtkCalendar.button:hover, GtkCalendar.button:backdrop, GtkCalendar.button:insensitive, .scale-popup .button:hover, .scale-popup .button:backdrop, .scale-popup .button:backdrop:hover, .scale-popup .button:backdrop:insensitive {
   border-color: transparent;
   background-color: transparent;
   background-image: none;
@@ -1306,10 +1201,10 @@
   icon-shadow: none; }
 
 /* menu buttons */
-.menuitem.button.flat, .header-bar .menuitem.titlebutton.button,
+.menuitem.button.flat, .menuitem.sidebar-button.button, .header-bar .menuitem.titlebutton.button,
 .titlebar .menuitem.titlebutton.button {
   outline-offset: -1px; }
-  .menuitem.button.flat:hover, .header-bar .menuitem.titlebutton.button:hover,
+  .menuitem.button.flat:hover, .menuitem.sidebar-button.button:hover, .header-bar .menuitem.titlebutton.button:hover,
   .titlebar .menuitem.titlebutton.button:hover {
     background-color: #4b5150; }
 
@@ -1355,6 +1250,10 @@
   text-shadow: none; }
   .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked {
     text-shadow: none; }
+  .button:link > .label, .header-bar .button.titlebutton:link > .label,
+  .titlebar .button.titlebutton:link > .label, .button:visited > .label, .header-bar .button.titlebutton:visited > .label,
+  .titlebar .button.titlebutton:visited > .label {
+    text-decoration-line: underline; }
 
 /*****************
  * GtkSpinButton *
@@ -1562,11 +1461,9 @@
 GtkComboBox {
   -GtkComboBox-arrow-scaling: 0.5;
   -GtkComboBox-shadow-type: none;
-  box-shadow: 0 1px rgba(238, 238, 236, 0.1);
   text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
   icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176); }
-  GtkComboBox > .button, .header-bar GtkComboBox > .button.titlebutton,
-  .titlebar GtkComboBox > .button.titlebutton {
+  GtkComboBox > .the-button-in-the-combobox {
     padding-top: 3px;
     padding-bottom: 4px; }
   GtkComboBox:insensitive {
@@ -1581,8 +1478,22 @@
     color: #5d6767; }
   GtkComboBox .menuitem {
     text-shadow: none; }
-  GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .view .vertical.separator, GtkPlacesSidebar.sidebar .view GtkComboBox .vertical.separator {
+  GtkComboBox .separator.vertical {
     -GtkWidget-wide-separators: true; }
+  GtkComboBox.combobox-entry .entry:dir(ltr) {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0; }
+  GtkComboBox.combobox-entry .entry:dir(rtl) {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0; }
+  GtkComboBox.combobox-entry .button:dir(ltr) {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+    border-left-style: none; }
+  GtkComboBox.combobox-entry .button:dir(rtl) {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+    border-right-style: none; }
 
 /************
  * Toolbars *
@@ -1646,10 +1557,8 @@
     padding-left: 12px;
     padding-right: 12px; }
   .titlebar .header-bar-separator, .titlebar > GtkBox > .separator.vertical,
-  GtkPlacesSidebar.sidebar .view .titlebar > GtkBox > .vertical.separator:backdrop,
   .header-bar .header-bar-separator,
-  .header-bar > GtkBox > .separator.vertical,
-  GtkPlacesSidebar.sidebar .view .header-bar > GtkBox > .vertical.separator:backdrop {
+  .header-bar > GtkBox > .separator.vertical {
     -GtkWidget-wide-separators: true;
     -GtkWidget-separator-width: 1px;
     border-width: 0 1px;
@@ -1678,9 +1587,10 @@
       text-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(101, 133, 71, 0.55); }
-      .titlebar.selection-mode .button.flat,
+      .titlebar.selection-mode .button.flat, .titlebar.selection-mode .sidebar-button.button,
       .titlebar.selection-mode .titlebutton.button,
       .header-bar.selection-mode .button.flat,
+      .header-bar.selection-mode .sidebar-button.button,
       .header-bar.selection-mode .titlebutton.button {
         border-color: transparent;
         background-color: transparent;
@@ -1707,10 +1617,11 @@
         text-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
         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), 0 1px rgba(101, 133, 71, 0.55); }
-      .titlebar.selection-mode .button:backdrop, .titlebar.selection-mode .button.flat:backdrop,
+      .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: #dfe5d8;
         border-color: #1f2914;
@@ -1720,24 +1631,27 @@
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(101, 133, 71, 0);
         -gtk-image-effect: none;
         border-color: #12180c; }
-        .titlebar.selection-mode .button:backdrop:active, .titlebar.selection-mode .button:backdrop:checked, .titlebar.selection-mode .button.flat:backdrop:active,
-        .titlebar.selection-mode .titlebutton.button:backdrop:active, .titlebar.selection-mode .button.flat:backdrop:checked,
+        .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,
+        .titlebar.selection-mode .titlebutton.button:backdrop:active, .titlebar.selection-mode .button.flat:backdrop:checked, .titlebar.selection-mode .sidebar-button.button:backdrop:checked,
         .titlebar.selection-mode .titlebutton.button:backdrop:checked,
         .header-bar.selection-mode .button:backdrop:active,
         .header-bar.selection-mode .button:backdrop:checked,
         .header-bar.selection-mode .button.flat:backdrop:active,
+        .header-bar.selection-mode .sidebar-button.button:backdrop:active,
         .header-bar.selection-mode .titlebutton.button:backdrop:active,
         .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: #dadfd5;
           border-color: #1f2914;
           background-image: linear-gradient(to bottom, #455d2d);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(101, 133, 71, 0);
           border-color: #12180c; }
-        .titlebar.selection-mode .button:backdrop:insensitive, .titlebar.selection-mode .button.flat:backdrop:insensitive,
+        .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,
         .header-bar.selection-mode .button:backdrop:insensitive,
         .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: #91a380;
           border-color: #1f2914;
@@ -1746,51 +1660,59 @@
           icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(101, 133, 71, 0);
           border-color: #12180c; }
-          .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 .header-bar .titlebutton.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 .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 .titlebutton.button:backdrop:insensitive:active, .titlebar.selection-mode .button.flat:backdrop:insensitive:checked,
+        .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,
         .titlebar.selection-mode .titlebutton.button:backdrop:insensitive:checked,
         .header-bar.selection-mode .button:backdrop:insensitive:active,
         .header-bar.selection-mode .button:backdrop:insensitive:checked,
         .header-bar.selection-mode .button.flat:backdrop:insensitive:active,
+        .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive:active,
         .header-bar.selection-mode .titlebutton.button:backdrop:insensitive:active,
         .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: #89987a;
           border-color: #1f2914;
           background-image: linear-gradient(to bottom, #496132);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(101, 133, 71, 0);
           border-color: #12180c; }
-          .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 .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 .header-bar .titlebutton.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 .titlebar .titlebutton.button:backdrop:insensitive:checked > .label {
             color: inherit; }
-      .titlebar.selection-mode .button.flat:backdrop,
-      .titlebar.selection-mode .titlebutton.button:backdrop, .titlebar.selection-mode .button.flat:insensitive,
-      .titlebar.selection-mode .titlebutton.button:insensitive, .titlebar.selection-mode .button.flat:insensitive:backdrop,
+      .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,
+      .titlebar.selection-mode .titlebutton.button:insensitive, .titlebar.selection-mode .button.flat:insensitive:backdrop, .titlebar.selection-mode .sidebar-button.button:insensitive:backdrop,
       .titlebar.selection-mode .titlebutton.button:insensitive:backdrop,
       .header-bar.selection-mode .button.flat:backdrop,
+      .header-bar.selection-mode .sidebar-button.button:backdrop,
       .header-bar.selection-mode .titlebutton.button:backdrop,
       .header-bar.selection-mode .button.flat:insensitive,
+      .header-bar.selection-mode .sidebar-button.button:insensitive,
       .header-bar.selection-mode .titlebutton.button:insensitive,
       .header-bar.selection-mode .button.flat:insensitive:backdrop,
+      .header-bar.selection-mode .sidebar-button.button:insensitive:backdrop,
       .header-bar.selection-mode .titlebutton.button:insensitive:backdrop {
         border-color: transparent;
         background-color: transparent;
@@ -2093,10 +2015,12 @@
 .menu {
   margin: 4px;
   padding: 0px;
-  background-color: #292929;
+  background-color: #2c2d2d;
   border: 1px solid #1c1f1f; }
   .csd .menu {
     border: none; }
+  .menu:backdrop {
+    background-color: #2f3030; }
   .menu .menuitem {
     text-shadow: none;
     padding: 4px; }
@@ -2109,7 +2033,7 @@
         color: #5d6767; }
     .menu .menuitem:backdrop, .menu .menuitem:backdrop:hover {
       color: #949796;
-      background-color: #2c2c2c; }
+      background-color: transparent; }
     .menu .menuitem.arrow {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
     .menu .menuitem.arrow:dir(rtl) {
@@ -2151,10 +2075,11 @@
   .popover > .location-bar, .popover.osd > .toolbar, .popover.osd > .inline-toolbar, .popover.osd > .search-bar, .popover.osd > .location-bar {
     border-style: none;
     background-color: transparent; }
-  .popover .button.flat, .popover .header-bar .titlebutton.button, .header-bar .popover .titlebutton.button,
+  .popover .button.flat, .popover .sidebar-button.button, .popover .header-bar .titlebutton.button, .header-bar .popover .titlebutton.button,
   .popover .titlebar .titlebutton.button,
   .titlebar .popover .titlebutton.button,
   .popover .button.flat:hover,
+  .popover .sidebar-button.button:hover,
   .popover .header-bar .titlebutton.button:hover,
   .header-bar .popover .titlebutton.button:hover,
   .popover .titlebar .titlebutton.button:hover,
@@ -2162,19 +2087,6 @@
     text-shadow: none;
     transition: none; }
 
-.entry.cursor-handle,
-.cursor-handle {
-  background-color: transparent;
-  background-image: none;
-  box-shadow: none;
-  border-style: none; }
-  .entry.cursor-handle.top,
-  .cursor-handle.top {
-    -gtk-icon-source: -gtk-icontheme("selection-start-symbolic"); }
-  .entry.cursor-handle.bottom,
-  .cursor-handle.bottom {
-    -gtk-icon-source: -gtk-icontheme("selection-end-symbolic"); }
-
 /*****************
  * Notebooks and *
  * Tabs          *
@@ -2531,6 +2443,7 @@
  **********/
 GtkSwitch {
   -GtkSwitch-slider-width: 45px;
+  -GtkSwitch-slider-height: 27px;
   font-weight: bold;
   font-size: smaller;
   outline-offset: -4px;
@@ -2627,126 +2540,126 @@
 .check {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .check.button.flat, .header-bar .check.titlebutton.button,
+  .check.button.flat, .check.sidebar-button.button, .header-bar .check.titlebutton.button,
   .titlebar .check.titlebutton.button {
     icon-shadow: none; }
 
 .check:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-hover-dark.png"), url("assets/checkbox-unchecked-hover-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .check:hover.button.flat, .header-bar .check.titlebutton.button:hover,
+  .check:hover.button.flat, .check.sidebar-button.button:hover, .header-bar .check.titlebutton.button:hover,
   .titlebar .check.titlebutton.button:hover {
     icon-shadow: none; }
 
 .check:active {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-active-dark.png"), url("assets/checkbox-unchecked-active-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .check:active.button.flat, .header-bar .check.titlebutton.button:active,
+  .check:active.button.flat, .check.sidebar-button.button:active, .header-bar .check.titlebutton.button:active,
   .titlebar .check.titlebutton.button:active {
     icon-shadow: none; }
 
 .check:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .check:insensitive.button.flat, .header-bar .check.titlebutton.button:insensitive,
+  .check:insensitive.button.flat, .check.sidebar-button.button:insensitive, .header-bar .check.titlebutton.button:insensitive,
   .titlebar .check.titlebutton.button:insensitive {
     icon-shadow: none; }
 
 .check:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-backdrop-dark.png"), url("assets/checkbox-unchecked-backdrop-dark@2.png"));
   icon-shadow: none; }
-  .check:backdrop.button.flat, .header-bar .check.titlebutton.button:backdrop,
+  .check:backdrop.button.flat, .check.sidebar-button.button:backdrop, .header-bar .check.titlebutton.button:backdrop,
   .titlebar .check.titlebutton.button:backdrop {
     icon-shadow: none; }
 
 .check:backdrop:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-backdrop-insensitive-dark.png"), url("assets/checkbox-unchecked-backdrop-insensitive-dark@2.png"));
   icon-shadow: none; }
-  .check:backdrop:insensitive.button.flat, .header-bar .check.titlebutton.button:backdrop:insensitive,
+  .check:backdrop:insensitive.button.flat, .check.sidebar-button.button:backdrop:insensitive, .header-bar .check.titlebutton.button:backdrop:insensitive,
   .titlebar .check.titlebutton.button:backdrop:insensitive {
     icon-shadow: none; }
 
 .check:inconsistent {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .check:inconsistent.button.flat, .header-bar .check.titlebutton.button:inconsistent,
+  .check:inconsistent.button.flat, .check.sidebar-button.button:inconsistent, .header-bar .check.titlebutton.button:inconsistent,
   .titlebar .check.titlebutton.button:inconsistent {
     icon-shadow: none; }
 
 .check:inconsistent:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-hover-dark.png"), url("assets/checkbox-mixed-hover-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .check:inconsistent:hover.button.flat, .header-bar .check.titlebutton.button:inconsistent:hover,
+  .check:inconsistent:hover.button.flat, .check.sidebar-button.button:inconsistent:hover, .header-bar .check.titlebutton.button:inconsistent:hover,
   .titlebar .check.titlebutton.button:inconsistent:hover {
     icon-shadow: none; }
 
 .check:inconsistent:selected {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-active-dark.png"), url("assets/checkbox-mixed-active-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .check:inconsistent:selected.button.flat, .header-bar .check.titlebutton.button:inconsistent:selected,
+  .check:inconsistent:selected.button.flat, .check.sidebar-button.button:inconsistent:selected, .header-bar .check.titlebutton.button:inconsistent:selected,
   .titlebar .check.titlebutton.button:inconsistent:selected {
     icon-shadow: none; }
 
 .check:inconsistent:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-backdrop-dark.png"), url("assets/checkbox-mixed-backdrop-dark@2.png"));
   icon-shadow: none; }
-  .check:inconsistent:backdrop.button.flat, .header-bar .check.titlebutton.button:inconsistent:backdrop,
+  .check:inconsistent:backdrop.button.flat, .check.sidebar-button.button:inconsistent:backdrop, .header-bar .check.titlebutton.button:inconsistent:backdrop,
   .titlebar .check.titlebutton.button:inconsistent:backdrop {
     icon-shadow: none; }
 
 .check:inconsistent:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .check:inconsistent:insensitive.button.flat, .header-bar .check.titlebutton.button:inconsistent:insensitive,
+  .check:inconsistent:insensitive.button.flat, .check.sidebar-button.button:inconsistent:insensitive, .header-bar .check.titlebutton.button:inconsistent:insensitive,
   .titlebar .check.titlebutton.button:inconsistent:insensitive {
     icon-shadow: none; }
 
 .check:inconsistent:insensitive:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-backdrop-insensitive-dark.png"), url("assets/checkbox-mixed-backdrop-insensitive-dark@2.png"));
   icon-shadow: none; }
-  .check:inconsistent:insensitive:backdrop.button.flat, .header-bar .check.titlebutton.button:inconsistent:insensitive:backdrop,
+  .check:inconsistent:insensitive:backdrop.button.flat, .check.sidebar-button.button:inconsistent:insensitive:backdrop, .header-bar .check.titlebutton.button:inconsistent:insensitive:backdrop,
   .titlebar .check.titlebutton.button:inconsistent:insensitive:backdrop {
     icon-shadow: none; }
 
 .check:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .check:checked.button.flat, .header-bar .check.titlebutton.button:checked,
+  .check:checked.button.flat, .check.sidebar-button.button:checked, .header-bar .check.titlebutton.button:checked,
   .titlebar .check.titlebutton.button:checked {
     icon-shadow: none; }
 
 .check:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .check:checked:insensitive.button.flat, .header-bar .check.titlebutton.button:checked:insensitive,
+  .check:checked:insensitive.button.flat, .check.sidebar-button.button:checked:insensitive, .header-bar .check.titlebutton.button:checked:insensitive,
   .titlebar .check.titlebutton.button:checked:insensitive {
     icon-shadow: none; }
 
 .check:checked:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-hover-dark.png"), url("assets/checkbox-checked-hover-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .check:checked:hover.button.flat, .header-bar .check.titlebutton.button:checked:hover,
+  .check:checked:hover.button.flat, .check.sidebar-button.button:checked:hover, .header-bar .check.titlebutton.button:checked:hover,
   .titlebar .check.titlebutton.button:checked:hover {
     icon-shadow: none; }
 
 .check:checked:active {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-active-dark.png"), url("assets/checkbox-checked-active-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .check:checked:active.button.flat, .header-bar .check.titlebutton.button:checked:active,
+  .check:checked:active.button.flat, .check.sidebar-button.button:checked:active, .header-bar .check.titlebutton.button:checked:active,
   .titlebar .check.titlebutton.button:checked:active {
     icon-shadow: none; }
 
 .check:backdrop:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-dark.png"), url("assets/checkbox-checked-backdrop-dark@2.png"));
   icon-shadow: none; }
-  .check:backdrop:checked.button.flat, .header-bar .check.titlebutton.button:backdrop:checked,
+  .check:backdrop:checked.button.flat, .check.sidebar-button.button:backdrop:checked, .header-bar .check.titlebutton.button:backdrop:checked,
   .titlebar .check.titlebutton.button:backdrop:checked {
     icon-shadow: none; }
 
 .check:backdrop:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-insensitive-dark.png"), url("assets/checkbox-checked-backdrop-insensitive-dark@2.png"));
   icon-shadow: none; }
-  .check:backdrop:checked:insensitive.button.flat, .header-bar .check.titlebutton.button:backdrop:checked:insensitive,
+  .check:backdrop:checked:insensitive.button.flat, .check.sidebar-button.button:backdrop:checked:insensitive, .header-bar .check.titlebutton.button:backdrop:checked:insensitive,
   .titlebar .check.titlebutton.button:backdrop:checked:insensitive {
     icon-shadow: none; }
 
@@ -2766,126 +2679,126 @@
 .radio {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .radio.button.flat, .header-bar .radio.titlebutton.button,
+  .radio.button.flat, .radio.sidebar-button.button, .header-bar .radio.titlebutton.button,
   .titlebar .radio.titlebutton.button {
     icon-shadow: none; }
 
 .radio:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-hover-dark.png"), url("assets/radio-unchecked-hover-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .radio:hover.button.flat, .header-bar .radio.titlebutton.button:hover,
+  .radio:hover.button.flat, .radio.sidebar-button.button:hover, .header-bar .radio.titlebutton.button:hover,
   .titlebar .radio.titlebutton.button:hover {
     icon-shadow: none; }
 
 .radio:active {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-active-dark.png"), url("assets/radio-unchecked-active-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .radio:active.button.flat, .header-bar .radio.titlebutton.button:active,
+  .radio:active.button.flat, .radio.sidebar-button.button:active, .header-bar .radio.titlebutton.button:active,
   .titlebar .radio.titlebutton.button:active {
     icon-shadow: none; }
 
 .radio:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .radio:insensitive.button.flat, .header-bar .radio.titlebutton.button:insensitive,
+  .radio:insensitive.button.flat, .radio.sidebar-button.button:insensitive, .header-bar .radio.titlebutton.button:insensitive,
   .titlebar .radio.titlebutton.button:insensitive {
     icon-shadow: none; }
 
 .radio:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-backdrop-dark.png"), url("assets/radio-unchecked-backdrop-dark@2.png"));
   icon-shadow: none; }
-  .radio:backdrop.button.flat, .header-bar .radio.titlebutton.button:backdrop,
+  .radio:backdrop.button.flat, .radio.sidebar-button.button:backdrop, .header-bar .radio.titlebutton.button:backdrop,
   .titlebar .radio.titlebutton.button:backdrop {
     icon-shadow: none; }
 
 .radio:backdrop:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-backdrop-insensitive-dark.png"), url("assets/radio-unchecked-backdrop-insensitive-dark@2.png"));
   icon-shadow: none; }
-  .radio:backdrop:insensitive.button.flat, .header-bar .radio.titlebutton.button:backdrop:insensitive,
+  .radio:backdrop:insensitive.button.flat, .radio.sidebar-button.button:backdrop:insensitive, .header-bar .radio.titlebutton.button:backdrop:insensitive,
   .titlebar .radio.titlebutton.button:backdrop:insensitive {
     icon-shadow: none; }
 
 .radio:inconsistent {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .radio:inconsistent.button.flat, .header-bar .radio.titlebutton.button:inconsistent,
+  .radio:inconsistent.button.flat, .radio.sidebar-button.button:inconsistent, .header-bar .radio.titlebutton.button:inconsistent,
   .titlebar .radio.titlebutton.button:inconsistent {
     icon-shadow: none; }
 
 .radio:inconsistent:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-hover-dark.png"), url("assets/radio-mixed-hover-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .radio:inconsistent:hover.button.flat, .header-bar .radio.titlebutton.button:inconsistent:hover,
+  .radio:inconsistent:hover.button.flat, .radio.sidebar-button.button:inconsistent:hover, .header-bar .radio.titlebutton.button:inconsistent:hover,
   .titlebar .radio.titlebutton.button:inconsistent:hover {
     icon-shadow: none; }
 
 .radio:inconsistent:selected {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active-dark.png"), url("assets/radio-mixed-active-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .radio:inconsistent:selected.button.flat, .header-bar .radio.titlebutton.button:inconsistent:selected,
+  .radio:inconsistent:selected.button.flat, .radio.sidebar-button.button:inconsistent:selected, .header-bar .radio.titlebutton.button:inconsistent:selected,
   .titlebar .radio.titlebutton.button:inconsistent:selected {
     icon-shadow: none; }
 
 .radio:inconsistent:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-backdrop-dark.png"), url("assets/radio-mixed-backdrop-dark@2.png"));
   icon-shadow: none; }
-  .radio:inconsistent:backdrop.button.flat, .header-bar .radio.titlebutton.button:inconsistent:backdrop,
+  .radio:inconsistent:backdrop.button.flat, .radio.sidebar-button.button:inconsistent:backdrop, .header-bar .radio.titlebutton.button:inconsistent:backdrop,
   .titlebar .radio.titlebutton.button:inconsistent:backdrop {
     icon-shadow: none; }
 
 .radio:inconsistent:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .radio:inconsistent:insensitive.button.flat, .header-bar .radio.titlebutton.button:inconsistent:insensitive,
+  .radio:inconsistent:insensitive.button.flat, .radio.sidebar-button.button:inconsistent:insensitive, .header-bar .radio.titlebutton.button:inconsistent:insensitive,
   .titlebar .radio.titlebutton.button:inconsistent:insensitive {
     icon-shadow: none; }
 
 .radio:inconsistent:insensitive:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-backdrop-insensitive-dark.png"), url("assets/radio-mixed-backdrop-insensitive-dark@2.png"));
   icon-shadow: none; }
-  .radio:inconsistent:insensitive:backdrop.button.flat, .header-bar .radio.titlebutton.button:inconsistent:insensitive:backdrop,
+  .radio:inconsistent:insensitive:backdrop.button.flat, .radio.sidebar-button.button:inconsistent:insensitive:backdrop, .header-bar .radio.titlebutton.button:inconsistent:insensitive:backdrop,
   .titlebar .radio.titlebutton.button:inconsistent:insensitive:backdrop {
     icon-shadow: none; }
 
 .radio:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .radio:checked.button.flat, .header-bar .radio.titlebutton.button:checked,
+  .radio:checked.button.flat, .radio.sidebar-button.button:checked, .header-bar .radio.titlebutton.button:checked,
   .titlebar .radio.titlebutton.button:checked {
     icon-shadow: none; }
 
 .radio:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .radio:checked:insensitive.button.flat, .header-bar .radio.titlebutton.button:checked:insensitive,
+  .radio:checked:insensitive.button.flat, .radio.sidebar-button.button:checked:insensitive, .header-bar .radio.titlebutton.button:checked:insensitive,
   .titlebar .radio.titlebutton.button:checked:insensitive {
     icon-shadow: none; }
 
 .radio:checked:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-hover-dark.png"), url("assets/radio-checked-hover-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .radio:checked:hover.button.flat, .header-bar .radio.titlebutton.button:checked:hover,
+  .radio:checked:hover.button.flat, .radio.sidebar-button.button:checked:hover, .header-bar .radio.titlebutton.button:checked:hover,
   .titlebar .radio.titlebutton.button:checked:hover {
     icon-shadow: none; }
 
 .radio:checked:active {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-active-dark.png"), url("assets/radio-checked-active-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .radio:checked:active.button.flat, .header-bar .radio.titlebutton.button:checked:active,
+  .radio:checked:active.button.flat, .radio.sidebar-button.button:checked:active, .header-bar .radio.titlebutton.button:checked:active,
   .titlebar .radio.titlebutton.button:checked:active {
     icon-shadow: none; }
 
 .radio:backdrop:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop-dark.png"), url("assets/radio-checked-backdrop-dark@2.png"));
   icon-shadow: none; }
-  .radio:backdrop:checked.button.flat, .header-bar .radio.titlebutton.button:backdrop:checked,
+  .radio:backdrop:checked.button.flat, .radio.sidebar-button.button:backdrop:checked, .header-bar .radio.titlebutton.button:backdrop:checked,
   .titlebar .radio.titlebutton.button:backdrop:checked {
     icon-shadow: none; }
 
 .radio:backdrop:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop-insensitive-dark.png"), url("assets/radio-checked-backdrop-insensitive-dark@2.png"));
   icon-shadow: none; }
-  .radio:backdrop:checked:insensitive.button.flat, .header-bar .radio.titlebutton.button:backdrop:checked:insensitive,
+  .radio:backdrop:checked:insensitive.button.flat, .radio.sidebar-button.button:backdrop:checked:insensitive, .header-bar .radio.titlebutton.button:backdrop:checked:insensitive,
   .titlebar .radio.titlebutton.button:backdrop:checked:insensitive {
     icon-shadow: none; }
 
@@ -2910,47 +2823,42 @@
   .list-row .check:hover, list-row .radio:selected, list-row .radio:hover {
     icon-shadow: none; }
 
-.content-view {
-  background-color: #282c2c; }
-  .content-view:backdrop {
-    background-color: #282c2c; }
-
-.view.content-view.check {
+.view.content-view.check:not(.list) {
   icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-selectionmode.png"), url("assets/checkbox-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:hover {
+.view.content-view.check:hover:not(.list) {
   icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-hover-selectionmode.png"), url("assets/checkbox-hover-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:active {
+.view.content-view.check:active:not(.list) {
   icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-active-selectionmode.png"), url("assets/checkbox-active-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:backdrop {
+.view.content-view.check:backdrop:not(.list) {
   icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-backdrop-selectionmode.png"), url("assets/checkbox-backdrop-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:checked {
+.view.content-view.check:checked:not(.list) {
   icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-selectionmode.png"), url("assets/checkbox-checked-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:checked:hover {
+.view.content-view.check:checked:hover:not(.list) {
   icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-hover-selectionmode.png"), url("assets/checkbox-checked-hover-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:checked:active {
+.view.content-view.check:checked:active:not(.list) {
   icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-active-selectionmode.png"), url("assets/checkbox-checked-active-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:backdrop:checked {
+.view.content-view.check:backdrop:checked:not(.list) {
   icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-selectionmode.png"), url("assets/checkbox-checked-backdrop-selectionmode@2.png"));
   background-color: transparent; }
@@ -3163,11 +3071,43 @@
       .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:backdrop {
         border-color: rgba(0, 0, 0, 0.7);
         background-image: none; }
+  .list-row:selected .scale, .list-row:selected
+  .scale.scale-has-marks-above.scale-has-marks-below, .list-row:selected
+  .scale.vertical.scale-has-marks-above.scale-has-marks-below {
+    border-color: #12180c; }
+    .list-row:selected .scale.trough, .list-row:selected
+    .scale.scale-has-marks-above.scale-has-marks-below.trough, .list-row:selected
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough {
+      box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); }
+      .list-row:selected .scale.trough:backdrop, .list-row:selected
+      .scale.scale-has-marks-above.scale-has-marks-below.trough:backdrop, .list-row:selected
+      .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:backdrop {
+        box-shadow: none; }
+      .list-row:selected .scale.trough.highlight:backdrop, .list-row:selected
+      .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight:backdrop, .list-row:selected
+      .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight:backdrop {
+        border-color: #12180c; }
+    .list-row:selected .scale:insensitive, .list-row:selected .scale.trough.highlight:insensitive, .list-row:selected
+    .scale.scale-has-marks-above.scale-has-marks-below:insensitive, .list-row:selected
+    .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight:insensitive, .list-row:selected
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below:insensitive, .list-row:selected
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight:insensitive {
+      border-color: #5E7F3E;
+      box-shadow: none;
+      background-color: #afbf9f;
+      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: #afbf9f; }
 
 .scale.scale-has-marks-below {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
-  -GtkRange-trough-border: 2; }
+  -GtkRange-trough-border: 2;
+  color: alpha(currentColor,0.5); }
   .scale.scale-has-marks-below.slider {
     border-style: none;
     border-radius: 0;
@@ -3220,7 +3160,8 @@
 .scale.scale-has-marks-above {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
-  -GtkRange-trough-border: 2; }
+  -GtkRange-trough-border: 2;
+  color: alpha(currentColor,0.5); }
   .scale.scale-has-marks-above.slider {
     border-style: none;
     border-radius: 0;
@@ -3273,7 +3214,8 @@
 .scale.vertical.scale-has-marks-below {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
-  -GtkRange-trough-border: 2; }
+  -GtkRange-trough-border: 2;
+  color: alpha(currentColor,0.5); }
   .scale.vertical.scale-has-marks-below.slider {
     border-style: none;
     border-radius: 0;
@@ -3326,7 +3268,8 @@
 .scale.vertical.scale-has-marks-above {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
-  -GtkRange-trough-border: 2; }
+  -GtkRange-trough-border: 2;
+  color: alpha(currentColor,0.5); }
   .scale.vertical.scale-has-marks-above.slider {
     border-style: none;
     border-radius: 0;
@@ -3459,10 +3402,6 @@
 /*************
  * Level Bar *
  *************/
-.level-bar.vertical {
-  -GtkLevelBar-min-block-width: 3;
-  -GtkLevelBar-min-block-height: 34; }
-
 .level-bar {
   box-shadow: 0 1px rgba(238, 238, 236, 0.1);
   -GtkLevelBar-min-block-width: 34;
@@ -3475,17 +3414,17 @@
     padding: 2px;
     border-radius: 3px;
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #212121, #292929 90%);
+    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
     color: white;
     border-color: #1c1f1f;
-    box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(94, 127, 62, 0), 0 1px rgba(238, 238, 236, 0.1); }
+    box-shadow: inset 0 0 0 1px rgba(94, 127, 62, 0), 0 1px rgba(238, 238, 236, 0.1); }
     .level-bar.trough:backdrop {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #212121, #292929 90%);
+      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: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(238, 238, 236, 0); }
+      box-shadow: 0 1px rgba(238, 238, 236, 0); }
   .level-bar.fill-block {
     border: 1px solid #516e36;
     background-color: #5E7F3E;
@@ -3532,19 +3471,18 @@
 GtkScrolledWindow GtkViewport.frame {
   border-style: none; }
 
-.separator, GtkPlacesSidebar.sidebar .view .separator,
-GtkPlacesSidebar.sidebar .view .separator:backdrop {
+.separator {
   color: rgba(0, 0, 0, 0.1); }
-  GtkFileChooserButton .separator.vertical, GtkFileChooserButton GtkPlacesSidebar.sidebar .view .vertical.separator, GtkPlacesSidebar.sidebar .view GtkFileChooserButton .vertical.separator, GtkFontButton .separator.vertical, GtkFontButton GtkPlacesSidebar.sidebar .view .vertical.separator, GtkPlacesSidebar.sidebar .view GtkFontButton .vertical.separator {
+  GtkFileChooserButton .separator.vertical, GtkFontButton .separator.vertical {
     -GtkWidget-wide-separators: true; }
 
 /*********
  * Lists *
  *********/
-.list, .list-row {
+.list {
   background-color: #292929;
   border-color: #1c1f1f; }
-  .list:backdrop, .list-row:backdrop {
+  .list:backdrop {
     background-color: #2c2c2c;
     border-color: #1f2222; }
 
@@ -3552,32 +3490,17 @@
 .grid-child {
   padding: 2px; }
 
-.list-row.button, .header-bar .list-row.button.titlebutton,
-.titlebar .list-row.button.titlebutton,
-.list-row.button:backdrop,
-.list-row.button:backdrop:active,
-.list-row.button:backdrop:checked,
-.list-row.button:backdrop:insensitive,
-.list-row.button:backdrop:insensitive:active,
-.list-row.button:backdrop:insensitive:checked,
-.list-row.button:insensitive:active,
-.list-row.button:insensitive:checked {
-  background-color: rgba(41, 41, 41, 0);
-  border-style: none;
-  border-radius: 0;
-  box-shadow: none; }
-
-.list-row.button:hover {
-  background-color: #333333; }
-.list-row.button:active {
+.list-row.activatable:hover, GtkPlacesSidebar.sidebar .has-open-popup {
+  background-color: rgba(238, 238, 236, 0.05); }
+.list-row.activatable:active {
   box-shadow: inset 0 2px 2px -2px rgba(0, 0, 0, 0.2); }
-.list-row.button:backdrop:hover {
+.list-row.activatable:backdrop:hover, GtkPlacesSidebar.sidebar .has-open-popup:backdrop {
   background-color: transparent; }
-.list-row.button:selected:active {
+.list-row.activatable:selected:active {
   box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); }
-.list-row.button:selected:hover {
+.list-row.activatable:selected:hover, GtkPlacesSidebar.sidebar .has-open-popup:selected {
   background-color: #6c8a4f; }
-.list-row.button:selected:backdrop {
+.list-row.activatable:selected:backdrop {
   background-color: #5E7F3E; }
 
 .list-row:selected .button {
@@ -3588,7 +3511,7 @@
   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); }
-  .list-row:selected .button.flat, .list-row:selected .header-bar .titlebutton.button, .header-bar .list-row:selected .titlebutton.button,
+  .list-row:selected .button.flat, .list-row:selected .sidebar-button.button, .list-row:selected .header-bar .titlebutton.button, .header-bar .list-row:selected .titlebutton.button,
   .list-row:selected .titlebar .titlebutton.button,
   .titlebar .list-row:selected .titlebutton.button {
     border-color: transparent;
@@ -3614,7 +3537,7 @@
     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); }
-  .list-row:selected .button:backdrop, .list-row:selected .button.flat:backdrop, .list-row:selected .header-bar .titlebutton.button:backdrop, .header-bar .list-row:selected .titlebutton.button:backdrop,
+  .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: #949796;
@@ -3623,16 +3546,16 @@
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    .list-row:selected .button:backdrop:active, .list-row:selected .button:backdrop:checked, .list-row:selected .button.flat:backdrop:active, .list-row:selected .header-bar .titlebutton.button:backdrop:active, .header-bar .list-row:selected .titlebutton.button:backdrop:active,
+    .list-row:selected .button:backdrop:active, .list-row:selected .button:backdrop:checked, .list-row:selected .button.flat:backdrop:active, .list-row:selected .sidebar-button.button:backdrop:active, .list-row:selected .header-bar .titlebutton.button:backdrop:active, .header-bar .list-row:selected .titlebutton.button:backdrop:active,
     .list-row:selected .titlebar .titlebutton.button:backdrop:active,
-    .titlebar .list-row:selected .titlebutton.button:backdrop:active, .list-row:selected .button.flat:backdrop:checked, .list-row:selected .header-bar .titlebutton.button:backdrop:checked, .header-bar .list-row:selected .titlebutton.button:backdrop:checked,
+    .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: #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 .header-bar .titlebutton.button:backdrop:insensitive, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive,
+    .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;
@@ -3642,13 +3565,13 @@
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       .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 .header-bar .titlebutton.button:backdrop:insensitive > .label, .header-bar .list-row:selected .titlebutton.button: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; }
-      .list-row:selected .button:backdrop:insensitive:active, .list-row:selected .button:backdrop:insensitive:checked, .list-row:selected .button.flat:backdrop:insensitive:active, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive:active, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:active,
+      .list-row:selected .button:backdrop:insensitive:active, .list-row:selected .button:backdrop:insensitive:checked, .list-row:selected .button.flat:backdrop:insensitive:active, .list-row:selected .sidebar-button.button:backdrop:insensitive:active, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive:active, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:active,
       .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive:active,
-      .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:active, .list-row:selected .button.flat:backdrop:insensitive:checked, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive:checked, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:checked,
+      .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:active, .list-row:selected .button.flat:backdrop:insensitive:checked, .list-row:selected .sidebar-button.button:backdrop:insensitive:checked, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive:checked, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:checked,
       .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive:checked,
       .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:checked {
         color: #5d6767;
@@ -3657,13 +3580,13 @@
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
         .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 .header-bar .titlebutton.button:backdrop:insensitive:active > .label, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:active > .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 .header-bar .titlebutton.button:backdrop:insensitive:checked > .label, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:checked > .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,
         .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:checked > .label {
           color: inherit; }
-  .list-row:selected .button.flat:backdrop, .list-row:selected .header-bar .titlebutton.button:backdrop, .header-bar .list-row:selected .titlebutton.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 {
     border-color: transparent;
@@ -3693,11 +3616,9 @@
       .list-row:selected .titlebar .button.titlebutton:insensitive:checked > .label {
         color: inherit; }
 
-.list-row, list-row.button, .header-bar list-row.button.titlebutton,
-.titlebar list-row.button.titlebutton {
-  transition: all 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
-  .list-row:hover, list-row.button:hover, .header-bar list-row.button.titlebutton:hover,
-  .titlebar list-row.button.titlebutton:hover {
+.list-row {
+  transition: all 150ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
+  .list-row:hover {
     transition: none; }
 
 /*********************
@@ -3726,10 +3647,11 @@
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
     outline-color: rgba(238, 238, 236, 0.3); }
-    .app-notification .button.flat, .app-notification .header-bar .titlebutton.button, .header-bar .app-notification .titlebutton.button,
+    .app-notification .button.flat, .app-notification .sidebar-button.button, .app-notification .header-bar .titlebutton.button, .header-bar .app-notification .titlebutton.button,
     .app-notification .titlebar .titlebutton.button,
     .titlebar .app-notification .titlebutton.button,
     .app-notification.frame .button.flat,
+    .app-notification.frame .sidebar-button.button,
     .app-notification.frame .header-bar .titlebutton.button,
     .header-bar .app-notification.frame .titlebutton.button,
     .app-notification.frame .titlebar .titlebutton.button,
@@ -3811,8 +3733,14 @@
     GtkCalendar.button:backdrop, .header-bar GtkCalendar.button.titlebutton:backdrop,
     .titlebar GtkCalendar.button.titlebutton:backdrop {
       color: rgba(148, 151, 150, 0.45); }
-  GtkCalendar:inconsistent, GtkCalendar:inconsistent:backdrop, GtkCalendar.highlight, GtkCalendar.highlight:backdrop {
+    GtkCalendar.button:insensitive, .header-bar GtkCalendar.button.titlebutton:insensitive,
+    .titlebar GtkCalendar.button.titlebutton:insensitive {
+      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: #d5d5d5;
     border-color: #1f2222; }
@@ -3823,180 +3751,178 @@
 .message-dialog .dialog-action-area .button {
   padding: 8px; }
 
-.message-dialog {
-  -GtkDialog-button-spacing: 0; }
-  .message-dialog .titlebar {
-    border-style: none;
-    box-shadow: inset 0 1px rgba(238, 238, 236, 0.1); }
-  .message-dialog.csd.background {
-    border-bottom-left-radius: 9px;
-    border-bottom-right-radius: 9px; }
-  .message-dialog.csd .dialog-action-area .button {
-    padding: 12px;
-    border-radius: 0;
+.message-dialog .titlebar {
+  border-style: none;
+  box-shadow: inset 0 1px rgba(238, 238, 236, 0.1); }
+.message-dialog.csd.background {
+  border-bottom-left-radius: 9px;
+  border-bottom-right-radius: 9px; }
+.message-dialog.csd .dialog-action-area .button {
+  padding: 12px;
+  border-radius: 0;
+  color: #eeeeec;
+  outline-color: rgba(238, 238, 236, 0.3);
+  border-color: #1c1f1f;
+  background-image: linear-gradient(to bottom, #454c4c, #393f3f 40%, #2d3232);
+  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); }
+  .message-dialog.csd .dialog-action-area .button:hover {
+    color: #eeeeec;
+    outline-color: rgba(238, 238, 236, 0.3);
+    border-color: #1c1f1f;
+    background-image: linear-gradient(to bottom, #5b6464, #434a4a 40%, #393f3f);
+    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); }
+  .message-dialog.csd .dialog-action-area .button:active {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #454c4c, #393f3f 40%, #2d3232);
-    text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
-    icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
+    background-image: linear-gradient(to bottom, #232727, #292d2d 40%, #2d3232);
+    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); }
+  .message-dialog.csd .dialog-action-area .button:insensitive {
+    color: #949796;
+    border-color: #1c1f1f;
+    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 .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: #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: #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 .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;
+    outline-color: rgba(255, 255, 255, 0.3);
+    border-color: #1f2914;
+    background-image: linear-gradient(to bottom, #6b9046, #5E7F3E 40%, #516e36);
+    text-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
+    icon-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
-    .message-dialog.csd .dialog-action-area .button:hover {
-      color: #eeeeec;
-      outline-color: rgba(238, 238, 236, 0.3);
-      border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #5b6464, #434a4a 40%, #393f3f);
-      text-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
-      icon-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
+    .message-dialog.csd .dialog-action-area .button.suggested-action:hover {
+      color: white;
+      outline-color: rgba(255, 255, 255, 0.3);
+      border-color: #1f2914;
+      background-image: linear-gradient(to bottom, #82ad57, #688d45 40%, #5E7F3E);
+      text-shadow: 0 -1px rgba(0, 0, 0, 0.67153);
+      icon-shadow: 0 -1px rgba(0, 0, 0, 0.67153);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
-    .message-dialog.csd .dialog-action-area .button:active {
-      color: #eeeeec;
-      outline-color: rgba(238, 238, 236, 0.3);
-      border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #232727, #292d2d 40%, #2d3232);
-      text-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
-      icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
+    .message-dialog.csd .dialog-action-area .button.suggested-action:active {
+      color: white;
+      outline-color: rgba(255, 255, 255, 0.3);
+      border-color: #1f2914;
+      background-image: linear-gradient(to bottom, #47602f, #4d6833 40%, #516e36);
+      text-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
+      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:insensitive {
+    .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop {
+      color: #dfe5d8;
+      border-color: #1f2914;
+      background-image: linear-gradient(to bottom, #5E7F3E);
+      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 {
+        color: #5d6767;
+        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 .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: #949796;
       border-color: #1c1f1f;
       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 .header-bar .button.titlebutton:insensitive > .label,
-      .message-dialog.csd .dialog-action-area .titlebar .button.titlebutton: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:backdrop {
-      color: #949796;
-      border-color: #1f2222;
-      background-image: linear-gradient(to bottom, #393f3f);
+  .message-dialog.csd .dialog-action-area .button.destructive-action {
+    color: white;
+    outline-color: rgba(255, 255, 255, 0.3);
+    border-color: #5e0707;
+    background-image: linear-gradient(to bottom, #ed1212, #d51010 40%, #bd0e0e);
+    text-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
+    icon-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.3); }
+    .message-dialog.csd .dialog-action-area .button.destructive-action:hover {
+      color: white;
+      outline-color: rgba(255, 255, 255, 0.3);
+      border-color: #5e0707;
+      background-image: linear-gradient(to bottom, #f03c3c, #e81111 40%, #d51010);
+      text-shadow: 0 -1px rgba(0, 0, 0, 0.60878);
+      icon-shadow: 0 -1px rgba(0, 0, 0, 0.60878);
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.3); }
+    .message-dialog.csd .dialog-action-area .button.destructive-action:active {
+      color: white;
+      outline-color: rgba(255, 255, 255, 0.3);
+      border-color: #5e0707;
+      background-image: linear-gradient(to bottom, #aa0d0d, #b60e0e 40%, #bd0e0e);
+      text-shadow: 0 -1px rgba(0, 0, 0, 0.72078);
+      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: #f7cfcf;
+      border-color: #5e0707;
+      background-image: linear-gradient(to bottom, #d51010);
       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: #1f2222;
+      .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive {
+        color: #5d6767;
+        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 .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: #949796;
+      border-color: #1c1f1f;
       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 .header-bar .button.titlebutton:backdrop:insensitive > .label,
-      .message-dialog.csd .dialog-action-area .titlebar .button.titlebutton:backdrop: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.suggested-action {
-      color: white;
-      outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #1f2914;
-      background-image: linear-gradient(to bottom, #6b9046, #5E7F3E 40%, #516e36);
-      text-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
-      icon-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
-      .message-dialog.csd .dialog-action-area .button.suggested-action:hover {
-        color: white;
-        outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #1f2914;
-        background-image: linear-gradient(to bottom, #82ad57, #688d45 40%, #5E7F3E);
-        text-shadow: 0 -1px rgba(0, 0, 0, 0.67153);
-        icon-shadow: 0 -1px rgba(0, 0, 0, 0.67153);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
-      .message-dialog.csd .dialog-action-area .button.suggested-action:active {
-        color: white;
-        outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #1f2914;
-        background-image: linear-gradient(to bottom, #47602f, #4d6833 40%, #516e36);
-        text-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
-        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: #dfe5d8;
-        border-color: #1f2914;
-        background-image: linear-gradient(to bottom, #5E7F3E);
-        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 {
-          color: #5d6767;
-          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 .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: #949796;
-        border-color: #1c1f1f;
-        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 .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;
-      outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #5e0707;
-      background-image: linear-gradient(to bottom, #ed1212, #d51010 40%, #bd0e0e);
-      text-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
-      icon-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.3); }
-      .message-dialog.csd .dialog-action-area .button.destructive-action:hover {
-        color: white;
-        outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #5e0707;
-        background-image: linear-gradient(to bottom, #f03c3c, #e81111 40%, #d51010);
-        text-shadow: 0 -1px rgba(0, 0, 0, 0.60878);
-        icon-shadow: 0 -1px rgba(0, 0, 0, 0.60878);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.3); }
-      .message-dialog.csd .dialog-action-area .button.destructive-action:active {
-        color: white;
-        outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #5e0707;
-        background-image: linear-gradient(to bottom, #aa0d0d, #b60e0e 40%, #bd0e0e);
-        text-shadow: 0 -1px rgba(0, 0, 0, 0.72078);
-        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: #f7cfcf;
-        border-color: #5e0707;
-        background-image: linear-gradient(to bottom, #d51010);
-        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 {
-          color: #5d6767;
-          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 .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: #949796;
-        border-color: #1c1f1f;
-        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 .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;
-    border-right-style: none;
-    border-bottom-style: none; }
-  .message-dialog.csd .dialog-action-area .button:last-child {
-    border-bottom-right-radius: 7px;
-    outline-bottom-right-radius: 5px; }
-  .message-dialog.csd .dialog-action-area .button:first-child {
-    border-left-style: none;
-    border-bottom-left-radius: 7px;
-    outline-bottom-left-radius: 5px; }
+.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;
+  border-right-style: none;
+  border-bottom-style: none; }
+.message-dialog.csd .dialog-action-area .button:last-child {
+  border-bottom-right-radius: 7px;
+  outline-bottom-right-radius: 5px; }
+.message-dialog.csd .dialog-action-area .button:first-child {
+  border-left-style: none;
+  border-bottom-left-radius: 7px;
+  outline-bottom-left-radius: 5px; }
 
 GtkFileChooserDialog .search-bar {
   background-color: #292929;
@@ -4015,31 +3941,43 @@
  ***********/
 .sidebar {
   border: none;
-  background-color: #454c4c; }
+  background-color: #313434; }
   .sidebar:backdrop {
-    background-color: #454c4c; }
+    background-color: #333636; }
+
+GtkSidebarRow.list-row {
+  padding: 0px; }
+GtkSidebarRow .sidebar-revealer {
+  padding: 4px 14px 4px 12px; }
+GtkSidebarRow .sidebar-icon {
+  opacity: 0.7; }
+  GtkSidebarRow .sidebar-icon:dir(ltr) {
+    padding-right: 8px; }
+  GtkSidebarRow .sidebar-icon:dir(rtl) {
+    padding-left: 8px; }
+GtkSidebarRow .sidebar-label:dir(ltr) {
+  padding-right: 2px; }
+GtkSidebarRow .sidebar-label:dir(rtl) {
+  padding-left: 2px; }
 
-GtkPlacesSidebar.sidebar .view {
-  color: #eeeeec;
-  background-color: transparent; }
-  GtkPlacesSidebar.sidebar .view .image {
-    color: #bbbdbc; }
-    GtkPlacesSidebar.sidebar .view .image:selected {
-      color: #eff2ec; }
-      GtkPlacesSidebar.sidebar .view .image:selected:backdrop {
-        color: #eff2ec; }
-    GtkPlacesSidebar.sidebar .view .image:insensitive {
-      color: #7c8180; }
-    GtkPlacesSidebar.sidebar .view .image:backdrop {
-      color: #7c8180; }
-      GtkPlacesSidebar.sidebar .view .image:backdrop:insensitive {
-        color: #565f5f; }
-  GtkPlacesSidebar.sidebar .view:insensitive {
-    color: #949796; }
-  GtkPlacesSidebar.sidebar .view:backdrop {
-    color: #949796; }
-    GtkPlacesSidebar.sidebar .view:backdrop:insensitive {
-      color: #5d6767; }
+GtkPlacesSidebar.sidebar .list-row:selected:active {
+  box-shadow: none; }
+GtkPlacesSidebar.sidebar .sidebar-placeholder-row {
+  border: solid 1px #5E7F3E; }
+GtkPlacesSidebar.sidebar .sidebar-new-bookmark-row {
+  color: #5E7F3E; }
+.sidebar-button.button, .header-bar .sidebar-button.button.titlebutton,
+.titlebar .sidebar-button.button.titlebutton {
+  border-radius: 100%;
+  outline-radius: 100%; }
+  .sidebar-button.button.image-button, GtkScaleButton.sidebar-button.button,
+  GtkVolumeButton.sidebar-button.button, .header-bar .sidebar-button.titlebutton.button,
+  .titlebar .sidebar-button.titlebutton.button {
+    padding: 5px; }
+  .sidebar-button.button:not(:hover):not(:active) > GtkImage, .header-bar .sidebar-button.button.titlebutton:not(:hover):not(:active) > GtkImage,
+  .titlebar .sidebar-button.button.titlebutton:not(:hover):not(:active) > GtkImage, .sidebar-button.button:backdrop > GtkImage, .header-bar .sidebar-button.button.titlebutton:backdrop > GtkImage,
+  .titlebar .sidebar-button.button.titlebutton:backdrop > GtkImage {
+    opacity: 0.7; }
 
 .sidebar-item {
   padding: 10px 4px; }
@@ -4049,6 +3987,18 @@
   .sidebar-item.needs-attention > .label {
     background-size: 6px 6px, 0 0; }
 
+/****************
+ * File chooser *
+ ****************/
+GtkPlacesView .server-list-button > GtkImage {
+  transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+  -gtk-icon-transform: rotate(0turn); }
+GtkPlacesView .server-list-button:checked > GtkImage {
+  transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+  -gtk-icon-transform: rotate(-0.5turn); }
+GtkPlacesView .list-row.activatable:hover, GtkPlacesView GtkPlacesSidebar.sidebar .has-open-popup, GtkPlacesSidebar.sidebar GtkPlacesView .has-open-popup {
+  background-color: transparent; }
+
 /*********
  * Paned *
  *********/
@@ -4241,6 +4191,9 @@
       border-color: #ffffff; }
   GtkColorSwatch:selected {
     box-shadow: inset 0 1px rgba(0, 0, 0, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
+  GtkColorSwatch:insensitive {
+    box-shadow: none;
+    opacity: 0.5; }
   GtkColorSwatch.top {
     border-top-left-radius: 6px;
     border-top-right-radius: 6px; }
@@ -4287,12 +4240,12 @@
       box-shadow: none; }
   GtkColorSwatch.color-dark {
     color: white;
-    outline-color: rgba(0, 0, 0, 0.3); }
+    outline-color: rgba(255, 255, 255, 0.5); }
     GtkColorSwatch.color-dark:backdrop {
       color: rgba(255, 255, 255, 0.3); }
   GtkColorSwatch.color-light {
     color: black;
-    outline-color: rgba(255, 255, 255, 0.5); }
+    outline-color: rgba(0, 0, 0, 0.5); }
     GtkColorSwatch.color-light:backdrop {
       color: rgba(0, 0, 0, 0.3); }
   GtkColorSwatch.overlay, GtkColorSwatch.overlay:selected {
@@ -4335,6 +4288,19 @@
 /********
  * Misc *
  ********/
+.content-view {
+  background-color: #282c2c; }
+  .content-view:hover {
+    -gtk-image-effect: highlight; }
+  .content-view:backdrop {
+    background-color: #282c2c; }
+
+.osd .scale-popup .button.flat, .osd .scale-popup .sidebar-button.button, .osd .scale-popup .header-bar .titlebutton.button, .header-bar .osd .scale-popup .titlebutton.button,
+.osd .scale-popup .titlebar .titlebutton.button,
+.titlebar .osd .scale-popup .titlebutton.button {
+  padding: 6px;
+  border-style: none;
+  border-radius: 5px; }
 .scale-popup .button, .scale-popup .header-bar .button.titlebutton, .header-bar .scale-popup .button.titlebutton,
 .scale-popup .titlebar .button.titlebutton,
 .titlebar .scale-popup .button.titlebutton {
@@ -4343,10 +4309,6 @@
     background-color: rgba(238, 238, 236, 0.1);
     border-radius: 5px; }
 
-GtkVolumeButton.button, .header-bar GtkVolumeButton.button.titlebutton,
-.titlebar GtkVolumeButton.button.titlebutton {
-  padding: 8px; }
-
 /**********************
  * Window Decorations *
  *********************/
@@ -4364,7 +4326,7 @@
     box-shadow: none; }
   .window-frame.ssd {
     box-shadow: 0 0 0 1px rgba(28, 31, 31, 0.9); }
-  .window-frame.csd .popup {
+  .window-frame.csd.popup {
     border-radius: 0;
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(28, 31, 31, 0.8); }
   .window-frame.csd.tooltip {
@@ -4396,22 +4358,214 @@
   .titlebar.selection-mode .titlebutton.button:backdrop {
     icon-shadow: none; }
 
-.view:selected, GtkCalendar:selected, .label:selected, .label:selected:focus, .label:selected:hover, .grid-child:selected, .entry:selected, .entry:selected:focus, .menuitem.button.flat:selected, .header-bar .menuitem.titlebutton.button:selected,
-.titlebar .menuitem.titlebutton.button:selected, .list-row:selected, .sidebar:selected, GtkPlacesSidebar.sidebar .view:selected, GtkPlacesSidebar.sidebar GtkCalendar:selected {
+.view:selected, GtkCalendar:selected, .label:selected, .label:selected:focus, .label:selected:hover, .grid-child:selected, .entry:selected, .entry:selected:focus, .menuitem.button.flat:selected, .menuitem.sidebar-button.button:selected, .header-bar .menuitem.titlebutton.button:selected,
+.titlebar .menuitem.titlebutton.button:selected, .list-row:selected, .sidebar:selected {
   background-color: #5E7F3E;
   color: #ffffff; }
-  .view:backdrop:selected, GtkCalendar:backdrop:selected, .label:backdrop:selected, .grid-child:backdrop:selected, .entry:backdrop:selected, .menuitem.button.flat:backdrop:selected, .header-bar .menuitem.titlebutton.button:backdrop:selected,
-  .titlebar .menuitem.titlebutton.button:backdrop:selected, .list-row:backdrop:selected, .sidebar:backdrop:selected, GtkPlacesSidebar.sidebar .view:backdrop:selected, GtkPlacesSidebar.sidebar GtkCalendar:backdrop:selected {
-    color: #ffffff;
-    background-color: #5f5f5f; }
+  .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: #afbf9f; }
+  .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: #8ea578; }
+
+.monospace {
+  font: Monospace; }
+
+/**********************
+ * Touch Copy & Paste *
+ *********************/
+.entry.cursor-handle,
+.cursor-handle {
+  background-color: transparent;
+  background-image: none;
+  box-shadow: none;
+  border-style: none; }
+  .entry.cursor-handle.top:dir(ltr), .entry.cursor-handle.bottom:dir(rtl),
+  .cursor-handle.top:dir(ltr),
+  .cursor-handle.bottom:dir(rtl) {
+    -gtk-icon-source: -gtk-scaled(url("assets/text-select-start-dark.png"), url("assets/text-select-start-dark@2.png"));
+    padding-left: 10px; }
+  .entry.cursor-handle.bottom:dir(ltr), .entry.cursor-handle.top:dir(rtl),
+  .cursor-handle.bottom:dir(ltr),
+  .cursor-handle.top:dir(rtl) {
+    -gtk-icon-source: -gtk-scaled(url("assets/text-select-end-dark.png"), url("assets/text-select-end-dark@2.png"));
+    padding-right: 10px; }
+  .entry.cursor-handle.insertion-cursor:dir(ltr), .entry.cursor-handle.insertion-cursor:dir(rtl),
+  .cursor-handle.insertion-cursor:dir(ltr),
+  .cursor-handle.insertion-cursor:dir(rtl) {
+    -gtk-icon-source: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-dark.png"), url("assets/slider-horz-scale-has-marks-above-dark@2.png")); }
+  .entry.cursor-handle.top:hover:dir(ltr), .entry.cursor-handle.bottom:hover:dir(rtl),
+  .cursor-handle.top:hover:dir(ltr),
+  .cursor-handle.bottom:hover:dir(rtl) {
+    -gtk-icon-source: -gtk-scaled(url("assets/text-select-start-hover-dark.png"), url("assets/text-select-start-hover-dark@2.png"));
+    padding-left: 10px; }
+  .entry.cursor-handle.bottom:hover:dir(ltr), .entry.cursor-handle.top:hover:dir(rtl),
+  .cursor-handle.bottom:hover:dir(ltr),
+  .cursor-handle.top:hover:dir(rtl) {
+    -gtk-icon-source: -gtk-scaled(url("assets/text-select-end-hover-dark.png"), url("assets/text-select-end-hover-dark@2.png"));
+    padding-right: 10px; }
+  .entry.cursor-handle.insertion-cursor:hover:dir(ltr), .entry.cursor-handle.insertion-cursor:hover:dir(rtl),
+  .cursor-handle.insertion-cursor:hover:dir(ltr),
+  .cursor-handle.insertion-cursor:hover:dir(rtl) {
+    -gtk-icon-source: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-hover-dark.png"), url("assets/slider-horz-scale-has-marks-above-hover-dark@2.png")); }
+  .entry.cursor-handle.top:active:dir(ltr), .entry.cursor-handle.bottom:active:dir(rtl),
+  .cursor-handle.top:active:dir(ltr),
+  .cursor-handle.bottom:active:dir(rtl) {
+    -gtk-icon-source: -gtk-scaled(url("assets/text-select-start-active-dark.png"), url("assets/text-select-start-active-dark@2.png"));
+    padding-left: 10px; }
+  .entry.cursor-handle.bottom:active:dir(ltr), .entry.cursor-handle.top:active:dir(rtl),
+  .cursor-handle.bottom:active:dir(ltr),
+  .cursor-handle.top:active:dir(rtl) {
+    -gtk-icon-source: -gtk-scaled(url("assets/text-select-end-active-dark.png"), url("assets/text-select-end-active-dark@2.png"));
+    padding-right: 10px; }
+  .entry.cursor-handle.insertion-cursor:active:dir(ltr), .entry.cursor-handle.insertion-cursor:active:dir(rtl),
+  .cursor-handle.insertion-cursor:active:dir(ltr),
+  .cursor-handle.insertion-cursor:active:dir(rtl) {
+    -gtk-icon-source: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-active-dark.png"), url("assets/slider-horz-scale-has-marks-above-active-dark@2.png")); }
 
 /* Decouple the font of context menus from their entry/textview */
-.touch-selection,
 .context-menu {
   font: initial; }
 
-.monospace {
-  font: Monospace; }
+.touch-selection {
+  font: initial;
+  color: #eeeeec;
+  border: none;
+  background-color: rgba(32, 37, 38, 0.9);
+  background-clip: padding-box;
+  outline-color: rgba(238, 238, 236, 0.3);
+  box-shadow: none;
+  text-shadow: 0 1px black;
+  icon-shadow: 0 1px black; }
+  .touch-selection:backdrop {
+    text-shadow: none; }
+  .touch-selection .button, .touch-selection .header-bar .button.titlebutton, .header-bar .touch-selection .button.titlebutton,
+  .touch-selection .titlebar .button.titlebutton,
+  .titlebar .touch-selection .button.titlebutton {
+    color: #eeeeec;
+    border-color: rgba(0, 0, 0, 0.7);
+    background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
+    background-clip: padding-box;
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
+    text-shadow: 0 1px black;
+    icon-shadow: 0 1px black;
+    outline-color: rgba(238, 238, 236, 0.3); }
+    .touch-selection .button:hover {
+      color: white;
+      border-color: rgba(0, 0, 0, 0.7);
+      background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.7));
+      background-clip: padding-box;
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
+      text-shadow: 0 1px black;
+      icon-shadow: 0 1px black;
+      outline-color: rgba(238, 238, 236, 0.3); }
+    .touch-selection .button:active, .touch-selection .button:checked {
+      color: white;
+      border-color: rgba(0, 0, 0, 0.7);
+      background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
+      background-clip: padding-box;
+      box-shadow: none;
+      text-shadow: none;
+      icon-shadow: none;
+      outline-color: rgba(238, 238, 236, 0.3); }
+    .touch-selection .button:insensitive, .touch-selection .button:backdrop:insensitive {
+      color: #878a89;
+      border-color: rgba(0, 0, 0, 0.7);
+      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+      background-clip: padding-box;
+      box-shadow: none;
+      text-shadow: none;
+      icon-shadow: none; }
+    .touch-selection .button:backdrop {
+      color: #eeeeec;
+      border-color: rgba(0, 0, 0, 0.7);
+      background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
+      background-clip: padding-box;
+      box-shadow: none;
+      text-shadow: none;
+      icon-shadow: none; }
+  .touch-selection .check {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); }
+  .touch-selection .check:hover {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-hover-dark.png"), url("assets/checkbox-unchecked-hover-dark@2.png")); }
+  .touch-selection .check:active {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-active-dark.png"), url("assets/checkbox-unchecked-active-dark@2.png")); }
+  .touch-selection .check:insensitive {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); }
+  .touch-selection .check:inconsistent {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); }
+  .touch-selection .check:inconsistent:hover {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-hover-dark.png"), url("assets/checkbox-mixed-hover-dark@2.png")); }
+  .touch-selection .check:inconsistent:selected {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-active-dark.png"), url("assets/checkbox-mixed-active-dark@2.png")); }
+  .touch-selection .check:inconsistent:insensitive {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); }
+  .touch-selection .check:checked {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); }
+  .touch-selection .check:checked:insensitive {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); }
+  .touch-selection .check:checked:hover {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-hover-dark.png"), url("assets/checkbox-checked-hover-dark@2.png")); }
+  .touch-selection .check:checked:active {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-active-dark.png"), url("assets/checkbox-checked-active-dark@2.png")); }
+  .touch-selection .check:backdrop:checked {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-dark.png"), url("assets/checkbox-checked-backdrop-dark@2.png")); }
+  .touch-selection .radio {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); }
+  .touch-selection .radio:hover {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-hover-dark.png"), url("assets/radio-unchecked-hover-dark@2.png")); }
+  .touch-selection .radio:active {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-active-dark.png"), url("assets/radio-unchecked-active-dark@2.png")); }
+  .touch-selection .radio:insensitive {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); }
+  .touch-selection .radio:inconsistent {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); }
+  .touch-selection .radio:inconsistent:hover {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-hover-dark.png"), url("assets/radio-mixed-hover-dark@2.png")); }
+  .touch-selection .radio:inconsistent:selected {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active-dark.png"), url("assets/radio-mixed-active-dark@2.png")); }
+  .touch-selection .radio:inconsistent:insensitive {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); }
+  .touch-selection .radio:checked {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); }
+  .touch-selection .radio:checked:insensitive {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); }
+  .touch-selection .radio:checked:hover {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-hover-dark.png"), url("assets/radio-checked-hover-dark@2.png")); }
+  .touch-selection .radio:checked:active {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-active-dark.png"), url("assets/radio-checked-active-dark@2.png")); }
+  .touch-selection .radio:backdrop:checked {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop-dark.png"), url("assets/radio-checked-backdrop-dark@2.png")); }
 
 .overshoot.top {
   background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#040404), to(rgba(4, 4, 4, 0))), -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(238, 238, 236, 0.07)), to(rgba(238, 238, 236, 0)));
--- a/gtk-3.0/gtk.css	Sat Jul 09 11:48:31 2016 +0100
+++ b/gtk-3.0/gtk.css	Sat Jul 09 15:25:37 2016 +0100
@@ -17,7 +17,7 @@
   -GtkWidget-focus-padding: 2;
   -GtkWidget-focus-line-width: 1;
   -GtkWidget-text-handle-width: 20;
-  -GtkWidget-text-handle-height: 20;
+  -GtkWidget-text-handle-height: 24;
   -GtkDialog-button-spacing: 4;
   -GtkDialog-action-area-border: 0;
   -GtkStatusbar-shadow-type: none;
@@ -73,20 +73,20 @@
   .view:selected, GtkCalendar:selected {
     border-radius: 3px; }
 
-.rubberband, .content-view.rubberband {
-  border: 1px solid #5E7F3E;
-  background-color: rgba(94, 127, 62, 0.2); }
-
-.label.separator, GtkPlacesSidebar.sidebar .view .label.separator {
+.rubberband, GtkTreeView.view.rubberband, .content-view.rubberband {
+  border: 1px solid #455d2d;
+  background-color: rgba(69, 93, 45, 0.2); }
+
+.label.separator {
   color: #161616; }
-  .label.separator:backdrop, GtkPlacesSidebar.sidebar .view .label.separator:backdrop {
+  .label.separator:backdrop {
     color: #6e6e6e; }
 .label:insensitive {
   color: #6e6e6e; }
   .label:insensitive:backdrop {
     color: #a0a0a0; }
 
-.dim-label, .label.separator, GtkPlacesSidebar.sidebar .view .label.separator, .titlebar .subtitle,
+.dim-label, .label.separator, .titlebar .subtitle,
 .header-bar .subtitle {
   opacity: 0.55;
   text-shadow: none; }
@@ -120,7 +120,7 @@
     outline-offset: -2px; }
 
 .popover.osd, .app-notification,
-.app-notification.frame, .osd {
+.app-notification.frame, .osd .scale-popup, .osd {
   color: #eeeeec;
   border: none;
   background-color: rgba(32, 37, 38, 0.7);
@@ -129,7 +129,7 @@
   box-shadow: none;
   text-shadow: 0 1px black;
   icon-shadow: 0 1px black; }
-  .popover.osd:backdrop, .app-notification:backdrop, .osd:backdrop {
+  .popover.osd:backdrop, .app-notification:backdrop, .osd .scale-popup:backdrop, .osd:backdrop {
     text-shadow: none; }
 
 /*********************
@@ -158,10 +158,10 @@
   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, #bebebe, #C6C6C6 90%);
+  background-image: linear-gradient(to bottom, #ababab, #c1c1c1 3px, #C6C6C6 90%);
   color: black;
   border-color: #7a7a7a;
-  box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(94, 127, 62, 0), 0 1px rgba(255, 255, 255, 0.1); }
+  box-shadow: inset 0 0 0 1px rgba(94, 127, 62, 0), 0 1px rgba(255, 255, 255, 0.1); }
   .entry.image.left {
     padding-left: 0; }
   .entry.image.right {
@@ -169,38 +169,38 @@
   .entry.flat, .entry.flat:focus {
     padding: 2px;
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #bebebe, #C6C6C6 90%);
+    background-image: linear-gradient(to bottom, #ababab, #c1c1c1 3px, #C6C6C6 90%);
     color: black;
     border-color: #7a7a7a;
-    box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(94, 127, 62, 0);
+    box-shadow: inset 0 0 0 1px rgba(94, 127, 62, 0);
     border: none;
     border-radius: 0; }
   .entry:focus {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #bebebe, #C6C6C6 90%);
-    box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(94, 127, 62, 0.15), 0 1px rgba(255, 255, 255, 0.1);
+    background-image: linear-gradient(to bottom, #ababab, #c1c1c1 3px, #C6C6C6 90%);
+    box-shadow: inset 0 0 0 1px #5E7F3E, 0 1px rgba(255, 255, 255, 0.1);
     border-color: #5E7F3E; }
   .entry:insensitive {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #bebebe, #C6C6C6 90%);
+    background-image: linear-gradient(to bottom, #ababab, #c1c1c1 3px, #C6C6C6 90%);
     color: #6e6e6e;
     border-color: #7a7a7a;
     background-image: linear-gradient(to bottom, #c6c6c6);
-    box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(255, 255, 255, 0.1); }
+    box-shadow: 0 1px rgba(255, 255, 255, 0.1); }
   .entry:backdrop {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #bebebe, #C6C6C6 90%);
+    background-image: linear-gradient(to bottom, #ababab, #c1c1c1 3px, #C6C6C6 90%);
     color: #272727;
     border-color: #828282;
     background-image: linear-gradient(to bottom, #c3c3c3);
-    box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(255, 255, 255, 0); }
+    box-shadow: 0 1px rgba(255, 255, 255, 0); }
   .entry:backdrop:insensitive {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #bebebe, #C6C6C6 90%);
+    background-image: linear-gradient(to bottom, #ababab, #c1c1c1 3px, #C6C6C6 90%);
     color: #a0a0a0;
     border-color: #828282;
     background-image: linear-gradient(to bottom, #c6c6c6);
-    box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(255, 255, 255, 0); }
+    box-shadow: 0 1px rgba(255, 255, 255, 0); }
   .entry.progressbar {
     margin: 1px;
     border-radius: 0;
@@ -212,26 +212,15 @@
     box-shadow: none; }
     .entry.progressbar:backdrop {
       background-color: transparent; }
-  .linked > .entry {
-    border-radius: 0; }
-    .linked > .entry:first-child {
-      border-top-left-radius: 3px;
-      border-bottom-left-radius: 3px; }
-      .linked > .entry:first-child:dir(rtl) {
-        border-right-style: none; }
-    .linked > .entry:last-child {
-      border-top-right-radius: 3px;
-      border-bottom-right-radius: 3px;
-      border-left-style: none; }
-      .linked > .entry:last-child:dir(rtl) {
-        border-left-style: solid; }
+  .linked:not(.vertical) > .entry:focus + .entry, .linked:not(.vertical) > .entry:focus + .button, .linked:not(.vertical) > .entry:focus + GtkComboBox > .the-button-in-the-combobox, .linked:not(.vertical) > .entry:focus + GtkComboBoxText > .the-button-in-the-combobox {
+    border-left-color: #5E7F3E; }
   .entry.error {
     color: #cc0000;
     border-color: #cc0000; }
     .entry.error:focus {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #bebebe, #C6C6C6 90%);
-      box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(204, 0, 0, 0.15), 0 1px rgba(255, 255, 255, 0.1);
+      background-image: linear-gradient(to bottom, #ababab, #c1c1c1 3px, #C6C6C6 90%);
+      box-shadow: inset 0 0 0 1px #cc0000, 0 1px rgba(255, 255, 255, 0.1);
       border-color: #cc0000; }
     .entry.error:selected, .entry.error:selected:focus {
       background-color: #cc0000; }
@@ -240,8 +229,8 @@
     border-color: #f57900; }
     .entry.warning:focus {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #bebebe, #C6C6C6 90%);
-      box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(245, 121, 0, 0.15), 0 1px rgba(255, 255, 255, 0.1);
+      background-image: linear-gradient(to bottom, #ababab, #c1c1c1 3px, #C6C6C6 90%);
+      box-shadow: inset 0 0 0 1px #f57900, 0 1px rgba(255, 255, 255, 0.1);
       border-color: #f57900; }
     .entry.warning:selected, .entry.warning:selected:focus {
       background-color: #f57900; }
@@ -253,114 +242,9 @@
       color: #5E7F3E; }
     .entry.image:backdrop {
       color: #7f7f7f; }
-  .linked.vertical > .entry {
-    background-color: transparent;
-    background-image: linear-gradient(to bottom, #bebebe, #C6C6C6 90%);
-    color: black;
-    border-color: #7a7a7a;
-    box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(94, 127, 62, 0);
-    background-image: linear-gradient(to bottom, #C6C6C6);
-    border-bottom-color: #afafaf;
-    box-shadow: none; }
-    .linked.vertical > .entry:focus {
-      border-color: #5E7F3E;
-      box-shadow: inset 0 0 0 1px rgba(94, 127, 62, 0.15), 0 -1px 0 0 #5E7F3E; }
-    .linked.vertical > .entry:insensitive {
-      background-color: transparent;
-      background-image: linear-gradient(to bottom, #bebebe, #C6C6C6 90%);
-      color: #6e6e6e;
-      border-color: #7a7a7a;
-      background-image: linear-gradient(to bottom, #c6c6c6);
-      box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent;
-      border-bottom-color: #afafaf; }
-      .linked.vertical > .entry:insensitive:backdrop {
-        background-color: transparent;
-        background-image: linear-gradient(to bottom, #bebebe, #C6C6C6 90%);
-        color: #a0a0a0;
-        border-color: #828282;
-        background-image: linear-gradient(to bottom, #c6c6c6);
-        box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent;
-        border-bottom-color: #b0b0b0; }
-    .linked.vertical > .entry:backdrop {
-      background-color: transparent;
-      background-image: linear-gradient(to bottom, #bebebe, #C6C6C6 90%);
-      color: #272727;
-      border-color: #828282;
-      background-image: linear-gradient(to bottom, #c3c3c3);
-      box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent;
-      border-bottom-color: #b0b0b0; }
-    .linked.vertical > .entry:first-child {
-      background-color: transparent;
-      background-image: linear-gradient(to bottom, #bebebe, #C6C6C6 90%);
-      color: black;
-      border-color: #7a7a7a;
-      box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(94, 127, 62, 0);
-      border-bottom-color: #afafaf; }
-      .linked.vertical > .entry:first-child:focus {
-        background-color: transparent;
-        background-image: linear-gradient(to bottom, #bebebe, #C6C6C6 90%);
-        box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(94, 127, 62, 0.15);
-        border-color: #5E7F3E; }
-      .linked.vertical > .entry:first-child:insensitive {
-        background-color: transparent;
-        background-image: linear-gradient(to bottom, #bebebe, #C6C6C6 90%);
-        color: #6e6e6e;
-        border-color: #7a7a7a;
-        background-image: linear-gradient(to bottom, #c6c6c6);
-        box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent;
-        border-bottom-color: #b0b0b0; }
-        .linked.vertical > .entry:first-child:insensitive:backdrop {
-          background-color: transparent;
-          background-image: linear-gradient(to bottom, #bebebe, #C6C6C6 90%);
-          color: #a0a0a0;
-          border-color: #828282;
-          background-image: linear-gradient(to bottom, #c6c6c6);
-          box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent;
-          border-bottom-color: #b0b0b0;
-          border-top-style: solid; }
-      .linked.vertical > .entry:first-child:backdrop {
-        background-color: transparent;
-        background-image: linear-gradient(to bottom, #bebebe, #C6C6C6 90%);
-        color: #272727;
-        border-color: #828282;
-        background-image: linear-gradient(to bottom, #c3c3c3);
-        box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent;
-        border-bottom-color: #b0b0b0; }
-    .linked.vertical > .entry:last-child {
-      background-color: transparent;
-      background-image: linear-gradient(to bottom, #bebebe, #C6C6C6 90%);
-      color: black;
-      border-color: #7a7a7a;
-      box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(94, 127, 62, 0), 0 1px rgba(255, 255, 255, 0.1);
-      background-image: linear-gradient(to bottom, #C6C6C6);
-      box-shadow: 0 1px rgba(255, 255, 255, 0.1); }
-      .linked.vertical > .entry:last-child:focus {
-        border-color: #5E7F3E;
-        box-shadow: inset 0 0 0 1px rgba(94, 127, 62, 0.15), 0 -1px 0 0 #5E7F3E, 0 1px rgba(255, 255, 255, 0.1); }
-      .linked.vertical > .entry:last-child:insensitive {
-        background-color: transparent;
-        background-image: linear-gradient(to bottom, #bebebe, #C6C6C6 90%);
-        color: #6e6e6e;
-        border-color: #7a7a7a;
-        background-image: linear-gradient(to bottom, #c6c6c6);
-        box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(255, 255, 255, 0.1); }
-        .linked.vertical > .entry:last-child:insensitive:backdrop {
-          background-color: transparent;
-          background-image: linear-gradient(to bottom, #bebebe, #C6C6C6 90%);
-          color: #a0a0a0;
-          border-color: #828282;
-          background-image: linear-gradient(to bottom, #c6c6c6);
-          box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(255, 255, 255, 0); }
-      .linked.vertical > .entry:last-child:backdrop {
-        background-color: transparent;
-        background-image: linear-gradient(to bottom, #bebebe, #C6C6C6 90%);
-        color: #272727;
-        border-color: #828282;
-        background-image: linear-gradient(to bottom, #c3c3c3);
-        box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(255, 255, 255, 0); }
   .osd .entry {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #bebebe, #C6C6C6 90%);
+    background-image: linear-gradient(to bottom, #ababab, #c1c1c1 3px, #C6C6C6 90%);
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
@@ -370,17 +254,17 @@
     icon-shadow: 0 1px black; }
     .osd .entry:focus {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #bebebe, #C6C6C6 90%);
+      background-image: linear-gradient(to bottom, #ababab, #c1c1c1 3px, #C6C6C6 90%);
       color: white;
       border-color: #5E7F3E;
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
       background-clip: padding-box;
-      box-shadow: inset 0 0 0 1px rgba(94, 127, 62, 0.15);
+      box-shadow: inset 0 0 0 1px #5E7F3E;
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black; }
     .osd .entry:backdrop {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #bebebe, #C6C6C6 90%);
+      background-image: linear-gradient(to bottom, #ababab, #c1c1c1 3px, #C6C6C6 90%);
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
@@ -390,7 +274,7 @@
       icon-shadow: none; }
     .osd .entry:insensitive {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #bebebe, #C6C6C6 90%);
+      background-image: linear-gradient(to bottom, #ababab, #c1c1c1 3px, #C6C6C6 90%);
       color: #878a89;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
@@ -399,6 +283,27 @@
       text-shadow: none;
       icon-shadow: none; }
 
+.linked.vertical > .entry:not(:last-child) {
+  box-shadow: none; }
+.linked.vertical > .entry:focus:not(:last-child) {
+  box-shadow: inset 0 0 0 1px #5E7F3E; }
+.linked.vertical > .entry:not(:insensitive) + .entry:not(:insensitive) {
+  border-top-color: #afafaf;
+  background-image: linear-gradient(to bottom, #C6C6C6); }
+  .linked.vertical > .entry:not(:insensitive) + .entry:not(:insensitive):backdrop {
+    border-top-color: #b0b0b0;
+    background-image: linear-gradient(to bottom, #c3c3c3); }
+.linked.vertical > .entry + .entry:focus:not(:last-child) {
+  border-top-color: #5E7F3E;
+  box-shadow: inset 0 0 0 1px #5E7F3E; }
+.linked.vertical > .entry + .entry:focus:last-child {
+  border-top-color: #5E7F3E; }
+.linked.vertical > .entry:focus:not(:only-child) + .entry,
+.linked.vertical > .entry:focus:not(:only-child) + .button,
+.linked.vertical > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+.linked.vertical > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox {
+  border-top-color: #5E7F3E; }
+
 /***********
  * Buttons *
  ***********/
@@ -420,7 +325,7 @@
   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(255, 255, 255, 0.5), 0 1px rgba(255, 255, 255, 0.1); }
-  .button.flat, .header-bar .titlebutton.button,
+  .button.flat, .sidebar-button.button, .header-bar .titlebutton.button,
   .titlebar .titlebutton.button {
     border-color: transparent;
     background-color: transparent;
@@ -429,11 +334,11 @@
     text-shadow: none;
     icon-shadow: none;
     transition: none; }
-    .button.flat:hover, .header-bar .titlebutton.button:hover,
+    .button.flat:hover, .sidebar-button.button:hover, .header-bar .titlebutton.button:hover,
     .titlebar .titlebutton.button:hover {
       transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
       transition-duration: 500ms; }
-      .button.flat:hover:active, .header-bar .titlebutton.button:hover:active,
+      .button.flat:hover:active, .sidebar-button.button:hover:active, .header-bar .titlebutton.button:hover:active,
       .titlebar .titlebutton.button:hover:active {
         transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
   .button:hover, .header-bar .button.titlebutton:hover,
@@ -458,7 +363,7 @@
     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(255, 255, 255, 0.1);
     transition-duration: 50ms; }
   .button:backdrop, .header-bar .button.titlebutton:backdrop,
-  .titlebar .button.titlebutton:backdrop, .button.flat:backdrop, .header-bar .titlebutton.button:backdrop,
+  .titlebar .button.titlebutton:backdrop, .button.flat:backdrop, .sidebar-button.button:backdrop, .header-bar .titlebutton.button:backdrop,
   .titlebar .titlebutton.button:backdrop {
     color: #6e6e6e;
     border-color: #828282;
@@ -467,14 +372,14 @@
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
     -gtk-image-effect: none; }
-    .button:backdrop:active, .button:backdrop:checked, .button.flat:backdrop:active, .header-bar .titlebutton.button:backdrop:active,
-    .titlebar .titlebutton.button:backdrop:active, .button.flat:backdrop:checked, .header-bar .titlebutton.button:backdrop:checked,
+    .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: #6e6e6e;
       border-color: #828282;
       background-image: linear-gradient(to bottom, #aeaeae);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-    .button:backdrop:insensitive, .button.flat:backdrop:insensitive, .header-bar .titlebutton.button:backdrop:insensitive,
+    .button:backdrop:insensitive, .button.flat:backdrop:insensitive, .sidebar-button.button:backdrop:insensitive, .header-bar .titlebutton.button:backdrop:insensitive,
     .titlebar .titlebutton.button:backdrop:insensitive {
       color: #a0a0a0;
       border-color: #828282;
@@ -483,11 +388,11 @@
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
       .button:backdrop:insensitive > .label, .header-bar .button.titlebutton:backdrop:insensitive > .label,
-      .titlebar .button.titlebutton:backdrop:insensitive > .label, .button.flat:backdrop:insensitive > .label, .header-bar .titlebutton.button: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, .header-bar .titlebutton.button:backdrop:insensitive:active,
-    .titlebar .titlebutton.button:backdrop:insensitive:active, .button.flat:backdrop:insensitive:checked, .header-bar .titlebutton.button:backdrop:insensitive:checked,
+    .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: #a0a0a0;
       border-color: #828282;
@@ -495,13 +400,13 @@
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
       .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, .header-bar .titlebutton.button:backdrop:insensitive:active > .label,
-      .titlebar .titlebutton.button:backdrop:insensitive:active > .label, .button.flat:backdrop:insensitive:checked > .label, .header-bar .titlebutton.button: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; }
-  .button.flat:backdrop, .header-bar .titlebutton.button:backdrop,
-  .titlebar .titlebutton.button:backdrop, .button.flat:insensitive, .header-bar .titlebutton.button:insensitive,
-  .titlebar .titlebutton.button:insensitive, .button.flat:backdrop:insensitive, .header-bar .titlebutton.button:backdrop:insensitive,
+  .button.flat:backdrop, .sidebar-button.button:backdrop, .header-bar .titlebutton.button:backdrop,
+  .titlebar .titlebutton.button:backdrop, .button.flat:insensitive, .sidebar-button.button:insensitive, .header-bar .titlebutton.button:insensitive,
+  .titlebar .titlebutton.button:insensitive, .button.flat:backdrop:insensitive, .sidebar-button.button:backdrop:insensitive, .header-bar .titlebutton.button:backdrop:insensitive,
   .titlebar .titlebutton.button:backdrop:insensitive {
     border-color: transparent;
     background-color: transparent;
@@ -544,7 +449,8 @@
     outline-color: rgba(238, 238, 236, 0.3);
     border: none;
     box-shadow: none; }
-    .button.osd.image-button, .header-bar .osd.titlebutton.button,
+    .button.osd.image-button, GtkScaleButton.button.osd,
+    GtkVolumeButton.button.osd, .header-bar .osd.titlebutton.button,
     .titlebar .osd.titlebutton.button {
       padding: 13px; }
     .button.osd:hover {
@@ -648,7 +554,7 @@
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none; }
-    .osd .button.flat, .osd .header-bar .titlebutton.button, .header-bar .osd .titlebutton.button,
+    .osd .button.flat, .osd .sidebar-button.button, .osd .header-bar .titlebutton.button, .header-bar .osd .titlebutton.button,
     .osd .titlebar .titlebutton.button,
     .titlebar .osd .titlebutton.button {
       border-color: transparent;
@@ -660,7 +566,7 @@
       box-shadow: none;
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black; }
-      .osd .button.flat:hover, .osd .header-bar .titlebutton.button:hover, .header-bar .osd .titlebutton.button:hover,
+      .osd .button.flat:hover, .osd .sidebar-button.button:hover, .osd .header-bar .titlebutton.button:hover, .header-bar .osd .titlebutton.button:hover,
       .osd .titlebar .titlebutton.button:hover,
       .titlebar .osd .titlebutton.button:hover {
         color: white;
@@ -674,7 +580,7 @@
         background-clip: padding-box;
         border-color: transparent;
         box-shadow: none; }
-      .osd .button.flat:insensitive, .osd .header-bar .titlebutton.button:insensitive, .header-bar .osd .titlebutton.button:insensitive,
+      .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: #878a89;
@@ -687,7 +593,7 @@
         background-image: none;
         border-color: transparent;
         box-shadow: none; }
-      .osd .button.flat:backdrop, .osd .header-bar .titlebutton.button:backdrop, .header-bar .osd .titlebutton.button:backdrop,
+      .osd .button.flat:backdrop, .osd .sidebar-button.button:backdrop, .osd .header-bar .titlebutton.button:backdrop, .header-bar .osd .titlebutton.button:backdrop,
       .osd .titlebar .titlebutton.button:backdrop,
       .titlebar .osd .titlebutton.button:backdrop {
         border-color: transparent;
@@ -696,9 +602,9 @@
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
         text-shadow: none;
         icon-shadow: none; }
-      .osd .button.flat:active, .osd .header-bar .titlebutton.button:active, .header-bar .osd .titlebutton.button:active,
+      .osd .button.flat:active, .osd .sidebar-button.button:active, .osd .header-bar .titlebutton.button:active, .header-bar .osd .titlebutton.button:active,
       .osd .titlebar .titlebutton.button:active,
-      .titlebar .osd .titlebutton.button:active, .osd .button.flat:checked, .osd .header-bar .titlebutton.button:checked, .header-bar .osd .titlebutton.button:checked,
+      .titlebar .osd .titlebutton.button:active, .osd .button.flat:checked, .osd .sidebar-button.button:checked, .osd .header-bar .titlebutton.button:checked, .header-bar .osd .titlebutton.button:checked,
       .osd .titlebar .titlebutton.button:checked,
       .titlebar .osd .titlebutton.button:checked {
         color: white;
@@ -721,7 +627,7 @@
     text-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(255, 255, 255, 0.1); }
-    .button.suggested-action.flat, .header-bar .suggested-action.titlebutton.button,
+    .button.suggested-action.flat, .suggested-action.sidebar-button.button, .header-bar .suggested-action.titlebutton.button,
     .titlebar .suggested-action.titlebutton.button {
       border-color: transparent;
       background-color: transparent;
@@ -746,7 +652,7 @@
       text-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
       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), 0 1px rgba(255, 255, 255, 0.1); }
-    .button.suggested-action:backdrop, .button.suggested-action.flat:backdrop, .header-bar .suggested-action.titlebutton.button:backdrop,
+    .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: #dfe5d8;
       border-color: #5E7F3E;
@@ -754,14 +660,14 @@
       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:active, .button.suggested-action:backdrop:checked, .button.suggested-action.flat:backdrop:active, .header-bar .suggested-action.titlebutton.button:backdrop:active,
-      .titlebar .suggested-action.titlebutton.button:backdrop:active, .button.suggested-action.flat:backdrop:checked, .header-bar .suggested-action.titlebutton.button:backdrop:checked,
+      .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: #dadfd5;
         border-color: #455d2d;
         background-image: linear-gradient(to bottom, #455d2d);
         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, .header-bar .suggested-action.titlebutton.button:backdrop:insensitive,
+      .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: #a0a0a0;
         border-color: #828282;
@@ -770,11 +676,11 @@
         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, .header-bar .suggested-action.button.titlebutton:backdrop:insensitive > .label,
-        .titlebar .suggested-action.button.titlebutton:backdrop:insensitive > .label, .button.suggested-action.flat:backdrop:insensitive > .label, .header-bar .suggested-action.titlebutton.button: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, .header-bar .suggested-action.titlebutton.button:backdrop:insensitive:active,
-        .titlebar .suggested-action.titlebutton.button:backdrop:insensitive:active, .button.suggested-action.flat:backdrop:insensitive:checked, .header-bar .suggested-action.titlebutton.button:backdrop:insensitive:checked,
+        .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: #98a988;
           border-color: #617a48;
@@ -782,13 +688,13 @@
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
           .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, .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, .header-bar .suggested-action.titlebutton.button: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; }
-    .button.suggested-action.flat:backdrop, .header-bar .suggested-action.titlebutton.button:backdrop,
-    .titlebar .suggested-action.titlebutton.button:backdrop, .button.suggested-action.flat:insensitive, .header-bar .suggested-action.titlebutton.button:insensitive,
-    .titlebar .suggested-action.titlebutton.button:insensitive, .button.suggested-action.flat:backdrop:insensitive, .header-bar .suggested-action.titlebutton.button:backdrop:insensitive,
+    .button.suggested-action.flat:backdrop, .suggested-action.sidebar-button.button:backdrop, .header-bar .suggested-action.titlebutton.button:backdrop,
+    .titlebar .suggested-action.titlebutton.button:backdrop, .button.suggested-action.flat:insensitive, .suggested-action.sidebar-button.button:insensitive, .header-bar .suggested-action.titlebutton.button:insensitive,
+    .titlebar .suggested-action.titlebutton.button: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 {
       border-color: transparent;
       background-color: transparent;
@@ -868,7 +774,7 @@
     text-shadow: 0 -1px rgba(0, 0, 0, 0.56078);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.56078);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 1px rgba(255, 255, 255, 0.1); }
-    .button.destructive-action.flat, .header-bar .destructive-action.titlebutton.button,
+    .button.destructive-action.flat, .destructive-action.sidebar-button.button, .header-bar .destructive-action.titlebutton.button,
     .titlebar .destructive-action.titlebutton.button {
       border-color: transparent;
       background-color: transparent;
@@ -893,7 +799,7 @@
       text-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
       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), 0 1px rgba(255, 255, 255, 0.1); }
-    .button.destructive-action:backdrop, .button.destructive-action.flat:backdrop, .header-bar .destructive-action.titlebutton.button:backdrop,
+    .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: #fcd4d4;
       border-color: #ef2929;
@@ -901,14 +807,14 @@
       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:active, .button.destructive-action:backdrop:checked, .button.destructive-action.flat:backdrop:active, .header-bar .destructive-action.titlebutton.button:backdrop:active,
-      .titlebar .destructive-action.titlebutton.button:backdrop:active, .button.destructive-action.flat:backdrop:checked, .header-bar .destructive-action.titlebutton.button:backdrop:checked,
+      .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: #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, .header-bar .destructive-action.titlebutton.button:backdrop:insensitive,
+      .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: #a0a0a0;
         border-color: #828282;
@@ -917,11 +823,11 @@
         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, .header-bar .destructive-action.button.titlebutton:backdrop:insensitive > .label,
-        .titlebar .destructive-action.button.titlebutton:backdrop:insensitive > .label, .button.destructive-action.flat:backdrop:insensitive > .label, .header-bar .destructive-action.titlebutton.button: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, .header-bar .destructive-action.titlebutton.button:backdrop:insensitive:active,
-        .titlebar .destructive-action.titlebutton.button:backdrop:insensitive:active, .button.destructive-action.flat:backdrop:insensitive:checked, .header-bar .destructive-action.titlebutton.button:backdrop:insensitive:checked,
+        .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: #ef7575;
           border-color: #e62a2a;
@@ -929,13 +835,13 @@
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
           .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, .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, .header-bar .destructive-action.titlebutton.button: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; }
-    .button.destructive-action.flat:backdrop, .header-bar .destructive-action.titlebutton.button:backdrop,
-    .titlebar .destructive-action.titlebutton.button:backdrop, .button.destructive-action.flat:insensitive, .header-bar .destructive-action.titlebutton.button:insensitive,
-    .titlebar .destructive-action.titlebutton.button:insensitive, .button.destructive-action.flat:backdrop:insensitive, .header-bar .destructive-action.titlebutton.button:backdrop:insensitive,
+    .button.destructive-action.flat:backdrop, .destructive-action.sidebar-button.button:backdrop, .header-bar .destructive-action.titlebutton.button:backdrop,
+    .titlebar .destructive-action.titlebutton.button:backdrop, .button.destructive-action.flat:insensitive, .destructive-action.sidebar-button.button:insensitive, .header-bar .destructive-action.titlebutton.button:insensitive,
+    .titlebar .destructive-action.titlebutton.button: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 {
       border-color: transparent;
       background-color: transparent;
@@ -1006,20 +912,25 @@
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none; }
-  .button.image-button, .header-bar .titlebutton.button,
+  .button.image-button, GtkScaleButton.button,
+  GtkVolumeButton.button, .header-bar .titlebutton.button,
   .titlebar .titlebutton.button {
     padding: 8px; }
-  .button.text-button, .header-bar .text-button.button.titlebutton,
+  .button.text-button, GtkScaleButton.button.text-button,
+  GtkVolumeButton.button.text-button, .header-bar .text-button.button.titlebutton,
   .titlebar .text-button.button.titlebutton {
     padding-left: 16px;
     padding-right: 16px; }
-  .button.text-button.image-button, .header-bar .text-button.titlebutton.button,
+  .button.text-button.image-button, GtkScaleButton.button.text-button,
+  GtkVolumeButton.button.text-button, .header-bar .text-button.titlebutton.button,
   .titlebar .text-button.titlebutton.button {
     padding: 5px 8px 6px; }
-    .button.text-button.image-button .label:first-child, .header-bar .text-button.titlebutton.button .label:first-child,
+    .button.text-button.image-button .label:first-child, GtkScaleButton.button.text-button .label:first-child,
+    GtkVolumeButton.button.text-button .label:first-child, .header-bar .text-button.titlebutton.button .label:first-child,
     .titlebar .text-button.titlebutton.button .label:first-child {
       padding-left: 8px; }
-    .button.text-button.image-button .label:last-child, .header-bar .text-button.titlebutton.button .label:last-child,
+    .button.text-button.image-button .label:last-child, GtkScaleButton.button.text-button .label:last-child,
+    GtkVolumeButton.button.text-button .label:last-child, .header-bar .text-button.titlebutton.button .label:last-child,
     .titlebar .text-button.titlebutton.button .label:last-child {
       padding-right: 8px; }
   .stack-switcher > .button, .header-bar .stack-switcher > .button.titlebutton,
@@ -1037,7 +948,8 @@
     .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, .header-bar .stack-switcher > .titlebutton.button,
+    .stack-switcher > .button.image-button, .stack-switcher > GtkScaleButton.button,
+    .stack-switcher > GtkVolumeButton.button, .header-bar .stack-switcher > .titlebutton.button,
     .titlebar .stack-switcher > .titlebutton.button {
       padding: 5px 2px; }
     .stack-switcher > .button.needs-attention:active > .label, .stack-switcher > .button.needs-attention:active > GtkImage, .stack-switcher > .button.needs-attention:checked > .label, .stack-switcher > .button.needs-attention:checked > GtkImage {
@@ -1147,131 +1059,156 @@
     .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active > .label, .inline-toolbar GtkToolButton > .button:backdrop:insensitive:checked > .label {
       color: inherit; }
 
-.inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.search-bar GtkToolButton > .button.flat, .inline-toolbar.location-bar GtkToolButton > .button.flat, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton > .button.titlebutton,
+.inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.search-bar GtkToolButton > .button.flat, .inline-toolbar.location-bar GtkToolButton > .button.flat, .inline-toolbar.toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton > .sidebar-button.button, .inline-toolbar.location-bar GtkToolButton > .sidebar-button.button, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton > .button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton > .button.titlebutton,
 .titlebar .inline-toolbar GtkToolButton > .button.titlebutton,
 .inline-toolbar.toolbar GtkToolButton:backdrop > .button.flat,
 .inline-toolbar GtkToolButton:backdrop > .button.flat,
 .inline-toolbar.search-bar GtkToolButton:backdrop > .button.flat,
 .inline-toolbar.location-bar GtkToolButton:backdrop > .button.flat,
+.inline-toolbar.toolbar GtkToolButton:backdrop > .sidebar-button.button,
+.inline-toolbar GtkToolButton:backdrop > .sidebar-button.button,
+.inline-toolbar.search-bar GtkToolButton:backdrop > .sidebar-button.button,
+.inline-toolbar.location-bar GtkToolButton:backdrop > .sidebar-button.button,
 .inline-toolbar .header-bar GtkToolButton:backdrop > .button.titlebutton,
 .header-bar .inline-toolbar GtkToolButton:backdrop > .button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:backdrop > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:backdrop > .button.titlebutton, .osd .button:hover, .osd .button:active, .osd .button:checked, .osd .button:backdrop:active, .osd .button:backdrop:checked, .osd .button:insensitive, .osd .button:backdrop:insensitive, .osd .button:backdrop, .osd .button.suggested-action, .osd .button.suggested-action:hover, .osd .button.suggested-action:active, .osd .button.suggested-action:checked, .osd .button.suggested-action:backdrop:active, .osd .button.suggested-action:backdrop:checked, .osd .button.suggested-action:insensitive, .osd .button.suggested-action:backdrop:insensitive, .osd .button.suggested-action:backdrop, .osd .button.destructive-action, .osd .button.destructive-action:hover, .osd .button.destructive-action:active, .osd .button.destructive-action:checked, .osd .button.destructive-action:backdrop:active, .osd .button.destructive-action:backdrop:checked, .osd .button.destructive-action:insensitive, .osd .button.destructive-action:backdrop:insensitive, .osd .button.destructive-action:backdrop, .inline-toolbar .button, .inline-toolbar .header-bar .button.titlebutton, .header-bar .inline-toolbar .button.titlebutton,
+.titlebar .inline-toolbar GtkToolButton:backdrop > .button.titlebutton, .linked:not(.vertical) > .entry, .osd .button:hover, .osd .button:active, .osd .button:checked, .osd .button:backdrop:active, .osd .button:backdrop:checked, .osd .button:insensitive, .osd .button:backdrop:insensitive, .osd .button:backdrop, .osd .button.suggested-action, .osd .button.suggested-action:hover, .osd .button.suggested-action:active, .osd .button.suggested-action:checked, .osd .button.suggested-action:backdrop:active, .osd .button.suggested-action:backdrop:checked, .osd .button.suggested-action:insensitive, .osd .button.suggested-action:backdrop:insensitive, .osd .button.suggested-action:backdrop, .osd .button.destructive-action, .osd .button.destructive-action:hover, .osd .button.destructive-action:active, .osd .button.destructive-action:checked, .osd .button.destructive-action:backdrop:active, .osd .button.destructive-action:backdrop:checked, .osd .button.destructive-action:insensitive, .osd .button.destructive-action:backdrop:insensitive, .osd .button.destructive-action:backdrop, .inline-toolbar .button, .inline-toolbar .header-bar .button.titlebutton, .header-bar .inline-toolbar .button.titlebutton,
 .inline-toolbar .titlebar .button.titlebutton,
 .titlebar .inline-toolbar .button.titlebutton, .inline-toolbar .button:backdrop, .linked > .button, .header-bar .linked > .button.titlebutton,
-.titlebar .linked > .button.titlebutton, .linked > .button:hover, .linked > .button:active, .linked > .button:checked, .linked > .button:backdrop, GtkComboBox.combobox-entry .entry, GtkComboBox.combobox-entry .button, GtkComboBox.combobox-entry .header-bar .button.titlebutton, .header-bar GtkComboBox.combobox-entry .button.titlebutton,
-GtkComboBox.combobox-entry .titlebar .button.titlebutton,
-.titlebar GtkComboBox.combobox-entry .button.titlebutton, GtkComboBox.combobox-entry .button:backdrop, .linked > GtkComboBox > .button:dir(ltr) {
+.titlebar .linked > .button.titlebutton, .linked > .button:hover, .linked > .button:active, .linked > .button:checked, .linked > .button:backdrop, .linked > GtkComboBox > .the-button-in-the-combobox:dir(ltr), .linked > GtkComboBox > .the-button-in-the-combobox:dir(rtl),
+.linked > GtkComboBoxText > .the-button-in-the-combobox:dir(ltr),
+.linked > GtkComboBoxText > .the-button-in-the-combobox:dir(rtl) {
   border-radius: 0;
-  border-left-style: none; }
-  .inline-toolbar GtkToolButton > .button.flat:dir(rtl), .inline-toolbar .header-bar GtkToolButton > .button.titlebutton:dir(rtl), .header-bar .inline-toolbar GtkToolButton > .button.titlebutton:dir(rtl),
-  .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:dir(rtl),
-  .titlebar .inline-toolbar GtkToolButton > .button.titlebutton:dir(rtl),
-  .inline-toolbar GtkToolButton:backdrop > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar.search-bar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar.location-bar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar .header-bar GtkToolButton:dir(rtl) > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:dir(rtl) > .button.titlebutton,
-  .inline-toolbar .titlebar GtkToolButton:dir(rtl) > .button.titlebutton,
-  .titlebar .inline-toolbar GtkToolButton:dir(rtl) > .button.titlebutton,
-  .inline-toolbar.toolbar GtkToolButton:backdrop:dir(rtl) > .button.flat,
-  .inline-toolbar GtkToolButton:backdrop:dir(rtl) > .button.flat,
-  .inline-toolbar.search-bar GtkToolButton:backdrop:dir(rtl) > .button.flat,
-  .inline-toolbar.location-bar GtkToolButton:backdrop:dir(rtl) > .button.flat,
-  .inline-toolbar .header-bar GtkToolButton:backdrop:dir(rtl) > .button.titlebutton,
-  .header-bar .inline-toolbar GtkToolButton:backdrop:dir(rtl) > .button.titlebutton,
-  .inline-toolbar .titlebar GtkToolButton:backdrop:dir(rtl) > .button.titlebutton,
-  .titlebar .inline-toolbar GtkToolButton:backdrop:dir(rtl) > .button.titlebutton, .osd .button:dir(rtl):hover, .osd .button:dir(rtl):active, .osd .button:dir(rtl):checked, .osd .button:dir(rtl):insensitive, .osd .button:dir(rtl):backdrop, .osd .button.suggested-action:dir(rtl), .osd .button.destructive-action:dir(rtl), .inline-toolbar .button:dir(rtl), .linked > .button:dir(rtl), .header-bar .linked > .button.titlebutton:dir(rtl),
-  .titlebar .linked > .button.titlebutton:dir(rtl), GtkComboBox.combobox-entry .entry:dir(rtl), GtkComboBox.combobox-entry .button:dir(rtl), .linked > GtkComboBox > .button:dir(rtl) {
-    border-radius: 0;
-    border-right-style: none;
-    border-left-style: solid; }
-
-.osd .button:first-child:hover, .osd .button:first-child:active, .osd .button:first-child:checked, .osd .button:first-child:insensitive, .osd .button:first-child:backdrop, .osd .button.suggested-action:first-child, .osd .button.destructive-action: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 .header-bar GtkToolButton:first-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:first-child > .button.titlebutton,
+  border-right-style: none; }
+
+.linked:not(.vertical) > .entry:first-child, .osd .button:first-child:hover, .osd .button:first-child:active, .osd .button:first-child:checked, .osd .button:first-child:insensitive, .osd .button:first-child:backdrop, .osd .button.suggested-action:first-child, .osd .button.destructive-action: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,
 .inline-toolbar GtkToolButton:backdrop:first-child > .button.flat,
 .inline-toolbar.search-bar GtkToolButton:backdrop:first-child > .button.flat,
 .inline-toolbar.location-bar GtkToolButton:backdrop:first-child > .button.flat,
+.inline-toolbar.toolbar GtkToolButton:backdrop:first-child > .sidebar-button.button,
+.inline-toolbar GtkToolButton:backdrop:first-child > .sidebar-button.button,
+.inline-toolbar.search-bar GtkToolButton:backdrop:first-child > .sidebar-button.button,
+.inline-toolbar.location-bar GtkToolButton:backdrop:first-child > .sidebar-button.button,
 .inline-toolbar .header-bar GtkToolButton:backdrop:first-child > .button.titlebutton,
 .header-bar .inline-toolbar GtkToolButton:backdrop:first-child > .button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:backdrop:first-child > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:backdrop:first-child > .button.titlebutton, GtkComboBox.combobox-entry .entry:first-child, GtkComboBox.combobox-entry .button:first-child, .linked > GtkComboBox:first-child > .button {
-  border-radius: 3px 0 0 3px;
-  border-left-style: solid; }
-.osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .osd .button:last-child:backdrop, .osd .button.suggested-action:last-child, .osd .button.destructive-action: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 .header-bar GtkToolButton:last-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:last-child > .button.titlebutton,
+.titlebar .inline-toolbar GtkToolButton:backdrop:first-child > .button.titlebutton, .linked > GtkComboBox:first-child > .the-button-in-the-combobox,
+.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, .osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .osd .button:last-child:backdrop, .osd .button.suggested-action:last-child, .osd .button.destructive-action: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,
 .inline-toolbar GtkToolButton:backdrop:last-child > .button.flat,
 .inline-toolbar.search-bar GtkToolButton:backdrop:last-child > .button.flat,
 .inline-toolbar.location-bar GtkToolButton:backdrop:last-child > .button.flat,
+.inline-toolbar.toolbar GtkToolButton:backdrop:last-child > .sidebar-button.button,
+.inline-toolbar GtkToolButton:backdrop:last-child > .sidebar-button.button,
+.inline-toolbar.search-bar GtkToolButton:backdrop:last-child > .sidebar-button.button,
+.inline-toolbar.location-bar GtkToolButton:backdrop:last-child > .sidebar-button.button,
 .inline-toolbar .header-bar GtkToolButton:backdrop:last-child > .button.titlebutton,
 .header-bar .inline-toolbar GtkToolButton:backdrop:last-child > .button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:backdrop:last-child > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:backdrop:last-child > .button.titlebutton, GtkComboBox.combobox-entry .entry:last-child, GtkComboBox.combobox-entry .button:last-child, .linked > GtkComboBox:last-child > .button {
-  border-radius: 0 3px 3px 0; }
-  .osd .button:last-child:dir(rtl):hover, .osd .button:last-child:dir(rtl):active, .osd .button:last-child:dir(rtl):checked, .osd .button:last-child:dir(rtl):insensitive, .osd .button:last-child:dir(rtl):backdrop, .osd .button.suggested-action:last-child:dir(rtl), .osd .button.destructive-action:last-child:dir(rtl), .inline-toolbar .button:last-child:dir(rtl), .linked > .button:last-child:dir(rtl), .header-bar .linked > .button.titlebutton:last-child:dir(rtl),
-  .titlebar .linked > .button.titlebutton:last-child:dir(rtl), .inline-toolbar GtkToolButton:last-child > .button.flat:dir(rtl), .inline-toolbar .header-bar GtkToolButton:last-child > .button.titlebutton:dir(rtl), .header-bar .inline-toolbar GtkToolButton:last-child > .button.titlebutton:dir(rtl),
-  .inline-toolbar .titlebar GtkToolButton:last-child > .button.titlebutton:dir(rtl),
-  .titlebar .inline-toolbar GtkToolButton:last-child > .button.titlebutton:dir(rtl),
-  .inline-toolbar GtkToolButton:backdrop:last-child > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.search-bar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.location-bar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar .header-bar GtkToolButton:last-child:dir(rtl) > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.titlebutton,
-  .inline-toolbar .titlebar GtkToolButton:last-child:dir(rtl) > .button.titlebutton,
-  .titlebar .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.titlebutton,
-  .inline-toolbar.toolbar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat,
-  .inline-toolbar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat,
-  .inline-toolbar.search-bar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat,
-  .inline-toolbar.location-bar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat,
-  .inline-toolbar .header-bar GtkToolButton:backdrop:last-child:dir(rtl) > .button.titlebutton,
-  .header-bar .inline-toolbar GtkToolButton:backdrop:last-child:dir(rtl) > .button.titlebutton,
-  .inline-toolbar .titlebar GtkToolButton:backdrop:last-child:dir(rtl) > .button.titlebutton,
-  .titlebar .inline-toolbar GtkToolButton:backdrop:last-child:dir(rtl) > .button.titlebutton, GtkComboBox.combobox-entry .entry:last-child:dir(rtl), GtkComboBox.combobox-entry .button:last-child:dir(rtl), .linked > GtkComboBox:last-child > .button:dir(rtl) {
-    border-right-style: solid; }
-.osd .button:only-child:hover, .osd .button:only-child:active, .osd .button:only-child:checked, .osd .button:only-child:insensitive, .osd .button:only-child:backdrop, .osd .button.suggested-action:only-child, .osd .button.destructive-action: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 .header-bar GtkToolButton:only-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:only-child > .button.titlebutton,
+.titlebar .inline-toolbar GtkToolButton:backdrop:last-child > .button.titlebutton, .linked > GtkComboBox:last-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:last-child > .the-button-in-the-combobox {
+  border-top-right-radius: 3px;
+  border-bottom-right-radius: 3px;
+  border-right-style: solid; }
+.linked:not(.vertical) > .entry:only-child, .osd .button:only-child:hover, .osd .button:only-child:active, .osd .button:only-child:checked, .osd .button:only-child:insensitive, .osd .button:only-child:backdrop, .osd .button.suggested-action:only-child, .osd .button.destructive-action: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,
 .inline-toolbar GtkToolButton:backdrop:only-child > .button.flat,
 .inline-toolbar.search-bar GtkToolButton:backdrop:only-child > .button.flat,
 .inline-toolbar.location-bar GtkToolButton:backdrop:only-child > .button.flat,
+.inline-toolbar.toolbar GtkToolButton:backdrop:only-child > .sidebar-button.button,
+.inline-toolbar GtkToolButton:backdrop:only-child > .sidebar-button.button,
+.inline-toolbar.search-bar GtkToolButton:backdrop:only-child > .sidebar-button.button,
+.inline-toolbar.location-bar GtkToolButton:backdrop:only-child > .sidebar-button.button,
 .inline-toolbar .header-bar GtkToolButton:backdrop:only-child > .button.titlebutton,
 .header-bar .inline-toolbar GtkToolButton:backdrop:only-child > .button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:backdrop:only-child > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:backdrop:only-child > .button.titlebutton, GtkComboBox.combobox-entry .entry:only-child, GtkComboBox.combobox-entry .button:only-child, .linked > GtkComboBox:only-child > .button {
+.titlebar .inline-toolbar GtkToolButton:backdrop:only-child > .button.titlebutton, .linked > GtkComboBox:only-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:only-child > .the-button-in-the-combobox {
   border-radius: 3px;
   border-style: solid; }
 
-.linked.vertical > .entry, .linked.vertical > .entry:focus, .linked.vertical > .entry:insensitive, .linked.vertical > .entry:insensitive:backdrop, .linked.vertical > .entry:backdrop, .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 > .button,
-.linked.vertical > GtkComboBox > .button {
-  border-left-style: solid;
-  border-top-style: none;
+.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, .header-bar .linked.vertical > .button.titlebutton:first-child,
-.titlebar .linked.vertical > .button.titlebutton:first-child, .linked.vertical > GtkComboBoxText:first-child > .button,
-.linked.vertical > GtkComboBox:first-child > .button {
-  border-style: solid;
-  border-radius: 3px 3px 0 0; }
+.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, .header-bar .linked.vertical > .button.titlebutton:last-child,
-.titlebar .linked.vertical > .button.titlebutton:last-child, .linked.vertical > GtkComboBoxText:last-child > .button,
-.linked.vertical > GtkComboBox:last-child > .button {
-  border-radius: 0 0 3px 3px; }
+.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, .header-bar .linked.vertical > .button.titlebutton:only-child,
-.titlebar .linked.vertical > .button.titlebutton:only-child, .linked.vertical > GtkComboBoxText:only-child > .button,
-.linked.vertical > GtkComboBox:only-child > .button {
+.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; }
 
-.menuitem.button.flat, .header-bar .menuitem.titlebutton.button,
-.titlebar .menuitem.titlebutton.button, .menuitem.button.flat:backdrop, .menuitem.button.flat:backdrop:hover, .header-bar .menuitem.titlebutton.button:backdrop:hover,
+.menuitem.button.flat, .menuitem.sidebar-button.button, .header-bar .menuitem.titlebutton.button,
+.titlebar .menuitem.titlebutton.button, .menuitem.button.flat:backdrop, .menuitem.sidebar-button.button:backdrop, .header-bar .menuitem.titlebutton.button:backdrop,
+.titlebar .menuitem.titlebutton.button:backdrop, .menuitem.button.flat:backdrop:hover, .menuitem.sidebar-button.button:backdrop:hover, .header-bar .menuitem.titlebutton.button:backdrop:hover,
 .titlebar .menuitem.titlebutton.button:backdrop:hover, .button:link, .header-bar .button.titlebutton:link,
 .titlebar .button.titlebutton:link, .button:visited, .header-bar .button.titlebutton:visited,
 .titlebar .button.titlebutton:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .button:link:backdrop, .button:visited:backdrop, .menu.button, .header-bar .menu.button.titlebutton,
 .titlebar .menu.button.titlebutton, .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, .list-row.button, .header-bar .list-row.button.titlebutton,
+.titlebar .notebook tab .button.titlebutton, .app-notification .button.flat, .app-notification .sidebar-button.button, .app-notification .header-bar .titlebutton.button, .header-bar .app-notification .titlebutton.button,
+.app-notification .titlebar .titlebutton.button,
+.titlebar .app-notification .titlebutton.button,
+.app-notification.frame .button.flat,
+.app-notification.frame .sidebar-button.button,
+.app-notification.frame .header-bar .button.titlebutton,
+.header-bar .app-notification.frame .button.titlebutton,
+.app-notification.frame .titlebar .button.titlebutton,
+.titlebar .app-notification.frame .button.titlebutton, .app-notification .button.flat:backdrop, .app-notification .sidebar-button.button:backdrop, .app-notification .header-bar .titlebutton.button:backdrop, .header-bar .app-notification .titlebutton.button:backdrop,
+.app-notification .titlebar .titlebutton.button:backdrop,
+.titlebar .app-notification .titlebutton.button:backdrop, .app-notification .button.flat:insensitive, .app-notification .sidebar-button.button:insensitive, .app-notification .header-bar .titlebutton.button:insensitive, .header-bar .app-notification .titlebutton.button:insensitive,
+.app-notification .titlebar .titlebutton.button:insensitive,
+.titlebar .app-notification .titlebutton.button:insensitive, .app-notification .button.flat:backdrop:insensitive, .app-notification .sidebar-button.button:backdrop:insensitive, .app-notification .header-bar .titlebutton.button:backdrop:insensitive, .header-bar .app-notification .titlebutton.button:backdrop:insensitive,
+.app-notification .titlebar .titlebutton.button:backdrop:insensitive,
+.titlebar .app-notification .titlebutton.button:backdrop:insensitive,
+.app-notification.frame .button.flat:backdrop,
+.app-notification.frame .sidebar-button.button:backdrop,
+.app-notification.frame .header-bar .button.titlebutton:backdrop,
+.header-bar .app-notification.frame .button.titlebutton:backdrop,
+.app-notification.frame .titlebar .button.titlebutton:backdrop,
+.titlebar .app-notification.frame .button.titlebutton:backdrop,
+.app-notification.frame .button.flat:insensitive,
+.app-notification.frame .sidebar-button.button:insensitive,
+.app-notification.frame .header-bar .button.titlebutton:insensitive,
+.header-bar .app-notification.frame .button.titlebutton:insensitive,
+.app-notification.frame .titlebar .button.titlebutton:insensitive,
+.titlebar .app-notification.frame .button.titlebutton:insensitive,
+.app-notification.frame .button.flat:backdrop:insensitive,
+.app-notification.frame .sidebar-button.button:backdrop:insensitive,
+.app-notification.frame .header-bar .button.titlebutton:backdrop:insensitive,
+.header-bar .app-notification.frame .button.titlebutton:backdrop:insensitive,
+.app-notification.frame .titlebar .button.titlebutton:backdrop:insensitive,
+.titlebar .app-notification.frame .button.titlebutton:backdrop:insensitive, GtkCalendar.button, .header-bar GtkCalendar.button.titlebutton,
+.titlebar GtkCalendar.button.titlebutton, GtkCalendar.button:hover, .header-bar GtkCalendar.button.titlebutton:hover,
+.titlebar GtkCalendar.button.titlebutton:hover, GtkCalendar.button:backdrop, .header-bar GtkCalendar.button.titlebutton:backdrop,
+.titlebar GtkCalendar.button.titlebutton:backdrop, GtkCalendar.button:insensitive, .header-bar GtkCalendar.button.titlebutton:insensitive,
+.titlebar GtkCalendar.button.titlebutton:insensitive, .scale-popup .button:hover, .scale-popup .button:backdrop, .scale-popup .button:backdrop:hover, .scale-popup .button:backdrop:insensitive, .list-row.button, .header-bar .list-row.button.titlebutton,
 .titlebar .list-row.button.titlebutton,
 .list-row.button:backdrop,
 .list-row.button:backdrop:active,
@@ -1280,24 +1217,7 @@
 .list-row.button:backdrop:insensitive:active,
 .list-row.button:backdrop:insensitive:checked,
 .list-row.button:insensitive:active,
-.list-row.button:insensitive:checked, .app-notification .button.flat, .app-notification .header-bar .titlebutton.button, .header-bar .app-notification .titlebutton.button,
-.app-notification .titlebar .titlebutton.button,
-.titlebar .app-notification .titlebutton.button,
-.app-notification.frame .button.flat, .app-notification .button.flat:backdrop, .app-notification .button.flat:insensitive, .app-notification .button.flat:backdrop:insensitive, .app-notification .header-bar .titlebutton.button:backdrop:insensitive, .header-bar .app-notification .titlebutton.button:backdrop:insensitive,
-.app-notification .titlebar .titlebutton.button:backdrop:insensitive,
-.titlebar .app-notification .titlebutton.button:backdrop:insensitive,
-.app-notification.frame .button.flat:backdrop,
-.app-notification.frame .header-bar .button.titlebutton:backdrop,
-.header-bar .app-notification.frame .button.titlebutton:backdrop,
-.app-notification.frame .titlebar .button.titlebutton:backdrop,
-.titlebar .app-notification.frame .button.titlebutton:backdrop,
-.app-notification.frame .button.flat:insensitive,
-.app-notification.frame .header-bar .button.titlebutton:insensitive,
-.header-bar .app-notification.frame .button.titlebutton:insensitive,
-.app-notification.frame .titlebar .button.titlebutton:insensitive,
-.titlebar .app-notification.frame .button.titlebutton:insensitive,
-.app-notification.frame .button.flat:backdrop:insensitive, GtkCalendar.button, .header-bar GtkCalendar.button.titlebutton,
-.titlebar GtkCalendar.button.titlebutton, GtkCalendar.button:hover, GtkCalendar.button:backdrop, .scale-popup .button:hover, .scale-popup .button:backdrop, .scale-popup .button:backdrop:hover, .scale-popup .button:backdrop:insensitive {
+.list-row.button:insensitive:checked {
   border-color: transparent;
   background-color: transparent;
   background-image: none;
@@ -1306,10 +1226,10 @@
   icon-shadow: none; }
 
 /* menu buttons */
-.menuitem.button.flat, .header-bar .menuitem.titlebutton.button,
+.menuitem.button.flat, .menuitem.sidebar-button.button, .header-bar .menuitem.titlebutton.button,
 .titlebar .menuitem.titlebutton.button {
   outline-offset: -1px; }
-  .menuitem.button.flat:hover, .header-bar .menuitem.titlebutton.button:hover,
+  .menuitem.button.flat:hover, .menuitem.sidebar-button.button:hover, .header-bar .menuitem.titlebutton.button:hover,
   .titlebar .menuitem.titlebutton.button:hover {
     background-color: #b4b4b4; }
 
@@ -1355,6 +1275,10 @@
   text-shadow: none; }
   .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked {
     text-shadow: none; }
+  .button:link > .label, .header-bar .button.titlebutton:link > .label,
+  .titlebar .button.titlebutton:link > .label, .button:visited > .label, .header-bar .button.titlebutton:visited > .label,
+  .titlebar .button.titlebutton:visited > .label {
+    text-decoration-line: underline; }
 
 /*****************
  * GtkSpinButton *
@@ -1562,11 +1486,9 @@
 GtkComboBox {
   -GtkComboBox-arrow-scaling: 0.5;
   -GtkComboBox-shadow-type: none;
-  box-shadow: 0 1px rgba(255, 255, 255, 0.1);
   text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); }
-  GtkComboBox > .button, .header-bar GtkComboBox > .button.titlebutton,
-  .titlebar GtkComboBox > .button.titlebutton {
+  GtkComboBox > .the-button-in-the-combobox {
     padding-top: 3px;
     padding-bottom: 4px; }
   GtkComboBox:insensitive {
@@ -1581,8 +1503,22 @@
     color: #a0a0a0; }
   GtkComboBox .menuitem {
     text-shadow: none; }
-  GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .view .vertical.separator, GtkPlacesSidebar.sidebar .view GtkComboBox .vertical.separator {
+  GtkComboBox .separator.vertical {
     -GtkWidget-wide-separators: true; }
+  GtkComboBox.combobox-entry .entry:dir(ltr) {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0; }
+  GtkComboBox.combobox-entry .entry:dir(rtl) {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0; }
+  GtkComboBox.combobox-entry .button:dir(ltr) {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+    border-left-style: none; }
+  GtkComboBox.combobox-entry .button:dir(rtl) {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+    border-right-style: none; }
 
 /************
  * Toolbars *
@@ -1646,10 +1582,8 @@
     padding-left: 12px;
     padding-right: 12px; }
   .titlebar .header-bar-separator, .titlebar > GtkBox > .separator.vertical,
-  GtkPlacesSidebar.sidebar .view .titlebar > GtkBox > .vertical.separator:backdrop,
   .header-bar .header-bar-separator,
-  .header-bar > GtkBox > .separator.vertical,
-  GtkPlacesSidebar.sidebar .view .header-bar > GtkBox > .vertical.separator:backdrop {
+  .header-bar > GtkBox > .separator.vertical {
     -GtkWidget-wide-separators: true;
     -GtkWidget-separator-width: 1px;
     border-width: 0 1px;
@@ -1678,9 +1612,10 @@
       text-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(102, 133, 72, 0.55); }
-      .titlebar.selection-mode .button.flat,
+      .titlebar.selection-mode .button.flat, .titlebar.selection-mode .sidebar-button.button,
       .titlebar.selection-mode .titlebutton.button,
       .header-bar.selection-mode .button.flat,
+      .header-bar.selection-mode .sidebar-button.button,
       .header-bar.selection-mode .titlebutton.button {
         border-color: transparent;
         background-color: transparent;
@@ -1707,10 +1642,11 @@
         text-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
         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), 0 1px rgba(102, 133, 72, 0.55); }
-      .titlebar.selection-mode .button:backdrop, .titlebar.selection-mode .button.flat:backdrop,
+      .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: #dfe5d8;
         border-color: #5E7F3E;
@@ -1720,24 +1656,27 @@
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(102, 133, 72, 0);
         -gtk-image-effect: none;
         border-color: #12180c; }
-        .titlebar.selection-mode .button:backdrop:active, .titlebar.selection-mode .button:backdrop:checked, .titlebar.selection-mode .button.flat:backdrop:active,
-        .titlebar.selection-mode .titlebutton.button:backdrop:active, .titlebar.selection-mode .button.flat:backdrop:checked,
+        .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,
+        .titlebar.selection-mode .titlebutton.button:backdrop:active, .titlebar.selection-mode .button.flat:backdrop:checked, .titlebar.selection-mode .sidebar-button.button:backdrop:checked,
         .titlebar.selection-mode .titlebutton.button:backdrop:checked,
         .header-bar.selection-mode .button:backdrop:active,
         .header-bar.selection-mode .button:backdrop:checked,
         .header-bar.selection-mode .button.flat:backdrop:active,
+        .header-bar.selection-mode .sidebar-button.button:backdrop:active,
         .header-bar.selection-mode .titlebutton.button:backdrop:active,
         .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: #dadfd5;
           border-color: #455d2d;
           background-image: linear-gradient(to bottom, #455d2d);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(102, 133, 72, 0);
           border-color: #12180c; }
-        .titlebar.selection-mode .button:backdrop:insensitive, .titlebar.selection-mode .button.flat:backdrop:insensitive,
+        .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,
         .header-bar.selection-mode .button:backdrop:insensitive,
         .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: #a1b38f;
           border-color: #6e8a52;
@@ -1746,51 +1685,59 @@
           icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(102, 133, 72, 0);
           border-color: #12180c; }
-          .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 .header-bar .titlebutton.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 .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 .titlebutton.button:backdrop:insensitive:active, .titlebar.selection-mode .button.flat:backdrop:insensitive:checked,
+        .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,
         .titlebar.selection-mode .titlebutton.button:backdrop:insensitive:checked,
         .header-bar.selection-mode .button:backdrop:insensitive:active,
         .header-bar.selection-mode .button:backdrop:insensitive:checked,
         .header-bar.selection-mode .button.flat:backdrop:insensitive:active,
+        .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive:active,
         .header-bar.selection-mode .titlebutton.button:backdrop:insensitive:active,
         .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: #98a988;
           border-color: #617a48;
           background-image: linear-gradient(to bottom, #617a48);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(102, 133, 72, 0);
           border-color: #12180c; }
-          .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 .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 .header-bar .titlebutton.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 .titlebar .titlebutton.button:backdrop:insensitive:checked > .label {
             color: inherit; }
-      .titlebar.selection-mode .button.flat:backdrop,
-      .titlebar.selection-mode .titlebutton.button:backdrop, .titlebar.selection-mode .button.flat:insensitive,
-      .titlebar.selection-mode .titlebutton.button:insensitive, .titlebar.selection-mode .button.flat:insensitive:backdrop,
+      .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,
+      .titlebar.selection-mode .titlebutton.button:insensitive, .titlebar.selection-mode .button.flat:insensitive:backdrop, .titlebar.selection-mode .sidebar-button.button:insensitive:backdrop,
       .titlebar.selection-mode .titlebutton.button:insensitive:backdrop,
       .header-bar.selection-mode .button.flat:backdrop,
+      .header-bar.selection-mode .sidebar-button.button:backdrop,
       .header-bar.selection-mode .titlebutton.button:backdrop,
       .header-bar.selection-mode .button.flat:insensitive,
+      .header-bar.selection-mode .sidebar-button.button:insensitive,
       .header-bar.selection-mode .titlebutton.button:insensitive,
       .header-bar.selection-mode .button.flat:insensitive:backdrop,
+      .header-bar.selection-mode .sidebar-button.button:insensitive:backdrop,
       .header-bar.selection-mode .titlebutton.button:insensitive:backdrop {
         border-color: transparent;
         background-color: transparent;
@@ -2099,10 +2046,12 @@
 .menu {
   margin: 4px;
   padding: 0px;
-  background-color: #C6C6C6;
+  background-color: #ffffff;
   border: 1px solid #7a7a7a; }
   .csd .menu {
     border: none; }
+  .menu:backdrop {
+    background-color: white; }
   .menu .menuitem {
     text-shadow: none;
     padding: 4px; }
@@ -2115,7 +2064,7 @@
         color: #a0a0a0; }
     .menu .menuitem:backdrop, .menu .menuitem:backdrop:hover {
       color: #6e6e6e;
-      background-color: #c3c3c3; }
+      background-color: transparent; }
     .menu .menuitem.arrow {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
     .menu .menuitem.arrow:dir(rtl) {
@@ -2157,10 +2106,11 @@
   .popover > .location-bar, .popover.osd > .toolbar, .popover.osd > .inline-toolbar, .popover.osd > .search-bar, .popover.osd > .location-bar {
     border-style: none;
     background-color: transparent; }
-  .popover .button.flat, .popover .header-bar .titlebutton.button, .header-bar .popover .titlebutton.button,
+  .popover .button.flat, .popover .sidebar-button.button, .popover .header-bar .titlebutton.button, .header-bar .popover .titlebutton.button,
   .popover .titlebar .titlebutton.button,
   .titlebar .popover .titlebutton.button,
   .popover .button.flat:hover,
+  .popover .sidebar-button.button:hover,
   .popover .header-bar .titlebutton.button:hover,
   .header-bar .popover .titlebutton.button:hover,
   .popover .titlebar .titlebutton.button:hover,
@@ -2168,19 +2118,6 @@
     text-shadow: none;
     transition: none; }
 
-.entry.cursor-handle,
-.cursor-handle {
-  background-color: transparent;
-  background-image: none;
-  box-shadow: none;
-  border-style: none; }
-  .entry.cursor-handle.top,
-  .cursor-handle.top {
-    -gtk-icon-source: -gtk-icontheme("selection-start-symbolic"); }
-  .entry.cursor-handle.bottom,
-  .cursor-handle.bottom {
-    -gtk-icon-source: -gtk-icontheme("selection-end-symbolic"); }
-
 /*****************
  * Notebooks and *
  * Tabs          *
@@ -2537,6 +2474,7 @@
  **********/
 GtkSwitch {
   -GtkSwitch-slider-width: 45px;
+  -GtkSwitch-slider-height: 27px;
   font-weight: bold;
   font-size: smaller;
   outline-offset: -4px;
@@ -2645,7 +2583,7 @@
 .check {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked.png"), url("assets/checkbox-unchecked@2.png"));
   icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.1); }
-  .check.button.flat, .header-bar .check.titlebutton.button,
+  .check.button.flat, .check.sidebar-button.button, .header-bar .check.titlebutton.button,
   .titlebar .check.titlebutton.button {
     icon-shadow: none; }
 
@@ -2656,7 +2594,7 @@
 .check:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-hover.png"), url("assets/checkbox-unchecked-hover@2.png"));
   icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.1); }
-  .check:hover.button.flat, .header-bar .check.titlebutton.button:hover,
+  .check:hover.button.flat, .check.sidebar-button.button:hover, .header-bar .check.titlebutton.button:hover,
   .titlebar .check.titlebutton.button:hover {
     icon-shadow: none; }
 
@@ -2667,7 +2605,7 @@
 .check:active {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-active.png"), url("assets/checkbox-unchecked-active@2.png"));
   icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.1); }
-  .check:active.button.flat, .header-bar .check.titlebutton.button:active,
+  .check:active.button.flat, .check.sidebar-button.button:active, .header-bar .check.titlebutton.button:active,
   .titlebar .check.titlebutton.button:active {
     icon-shadow: none; }
 
@@ -2678,7 +2616,7 @@
 .check:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive.png"), url("assets/checkbox-unchecked-insensitive@2.png"));
   icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.1); }
-  .check:insensitive.button.flat, .header-bar .check.titlebutton.button:insensitive,
+  .check:insensitive.button.flat, .check.sidebar-button.button:insensitive, .header-bar .check.titlebutton.button:insensitive,
   .titlebar .check.titlebutton.button:insensitive {
     icon-shadow: none; }
 
@@ -2689,7 +2627,7 @@
 .check:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-backdrop.png"), url("assets/checkbox-unchecked-backdrop@2.png"));
   icon-shadow: none; }
-  .check:backdrop.button.flat, .header-bar .check.titlebutton.button:backdrop,
+  .check:backdrop.button.flat, .check.sidebar-button.button:backdrop, .header-bar .check.titlebutton.button:backdrop,
   .titlebar .check.titlebutton.button:backdrop {
     icon-shadow: none; }
 
@@ -2700,7 +2638,7 @@
 .check:backdrop:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-backdrop-insensitive.png"), url("assets/checkbox-unchecked-backdrop-insensitive@2.png"));
   icon-shadow: none; }
-  .check:backdrop:insensitive.button.flat, .header-bar .check.titlebutton.button:backdrop:insensitive,
+  .check:backdrop:insensitive.button.flat, .check.sidebar-button.button:backdrop:insensitive, .header-bar .check.titlebutton.button:backdrop:insensitive,
   .titlebar .check.titlebutton.button:backdrop:insensitive {
     icon-shadow: none; }
 
@@ -2711,7 +2649,7 @@
 .check:inconsistent {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed.png"), url("assets/checkbox-mixed@2.png"));
   icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.1); }
-  .check:inconsistent.button.flat, .header-bar .check.titlebutton.button:inconsistent,
+  .check:inconsistent.button.flat, .check.sidebar-button.button:inconsistent, .header-bar .check.titlebutton.button:inconsistent,
   .titlebar .check.titlebutton.button:inconsistent {
     icon-shadow: none; }
 
@@ -2722,7 +2660,7 @@
 .check:inconsistent:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-hover.png"), url("assets/checkbox-mixed-hover@2.png"));
   icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.1); }
-  .check:inconsistent:hover.button.flat, .header-bar .check.titlebutton.button:inconsistent:hover,
+  .check:inconsistent:hover.button.flat, .check.sidebar-button.button:inconsistent:hover, .header-bar .check.titlebutton.button:inconsistent:hover,
   .titlebar .check.titlebutton.button:inconsistent:hover {
     icon-shadow: none; }
 
@@ -2733,7 +2671,7 @@
 .check:inconsistent:selected {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-active.png"), url("assets/checkbox-mixed-active@2.png"));
   icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.1); }
-  .check:inconsistent:selected.button.flat, .header-bar .check.titlebutton.button:inconsistent:selected,
+  .check:inconsistent:selected.button.flat, .check.sidebar-button.button:inconsistent:selected, .header-bar .check.titlebutton.button:inconsistent:selected,
   .titlebar .check.titlebutton.button:inconsistent:selected {
     icon-shadow: none; }
 
@@ -2744,7 +2682,7 @@
 .check:inconsistent:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-backdrop.png"), url("assets/checkbox-mixed-backdrop@2.png"));
   icon-shadow: none; }
-  .check:inconsistent:backdrop.button.flat, .header-bar .check.titlebutton.button:inconsistent:backdrop,
+  .check:inconsistent:backdrop.button.flat, .check.sidebar-button.button:inconsistent:backdrop, .header-bar .check.titlebutton.button:inconsistent:backdrop,
   .titlebar .check.titlebutton.button:inconsistent:backdrop {
     icon-shadow: none; }
 
@@ -2755,7 +2693,7 @@
 .check:inconsistent:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive.png"), url("assets/checkbox-mixed-insensitive@2.png"));
   icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.1); }
-  .check:inconsistent:insensitive.button.flat, .header-bar .check.titlebutton.button:inconsistent:insensitive,
+  .check:inconsistent:insensitive.button.flat, .check.sidebar-button.button:inconsistent:insensitive, .header-bar .check.titlebutton.button:inconsistent:insensitive,
   .titlebar .check.titlebutton.button:inconsistent:insensitive {
     icon-shadow: none; }
 
@@ -2766,7 +2704,7 @@
 .check:inconsistent:insensitive:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-backdrop-insensitive.png"), url("assets/checkbox-mixed-backdrop-insensitive@2.png"));
   icon-shadow: none; }
-  .check:inconsistent:insensitive:backdrop.button.flat, .header-bar .check.titlebutton.button:inconsistent:insensitive:backdrop,
+  .check:inconsistent:insensitive:backdrop.button.flat, .check.sidebar-button.button:inconsistent:insensitive:backdrop, .header-bar .check.titlebutton.button:inconsistent:insensitive:backdrop,
   .titlebar .check.titlebutton.button:inconsistent:insensitive:backdrop {
     icon-shadow: none; }
 
@@ -2777,7 +2715,7 @@
 .check:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked.png"), url("assets/checkbox-checked@2.png"));
   icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.1); }
-  .check:checked.button.flat, .header-bar .check.titlebutton.button:checked,
+  .check:checked.button.flat, .check.sidebar-button.button:checked, .header-bar .check.titlebutton.button:checked,
   .titlebar .check.titlebutton.button:checked {
     icon-shadow: none; }
 
@@ -2788,7 +2726,7 @@
 .check:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive.png"), url("assets/checkbox-checked-insensitive@2.png"));
   icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.1); }
-  .check:checked:insensitive.button.flat, .header-bar .check.titlebutton.button:checked:insensitive,
+  .check:checked:insensitive.button.flat, .check.sidebar-button.button:checked:insensitive, .header-bar .check.titlebutton.button:checked:insensitive,
   .titlebar .check.titlebutton.button:checked:insensitive {
     icon-shadow: none; }
 
@@ -2799,7 +2737,7 @@
 .check:checked:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-hover.png"), url("assets/checkbox-checked-hover@2.png"));
   icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.1); }
-  .check:checked:hover.button.flat, .header-bar .check.titlebutton.button:checked:hover,
+  .check:checked:hover.button.flat, .check.sidebar-button.button:checked:hover, .header-bar .check.titlebutton.button:checked:hover,
   .titlebar .check.titlebutton.button:checked:hover {
     icon-shadow: none; }
 
@@ -2810,7 +2748,7 @@
 .check:checked:active {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-active.png"), url("assets/checkbox-checked-active@2.png"));
   icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.1); }
-  .check:checked:active.button.flat, .header-bar .check.titlebutton.button:checked:active,
+  .check:checked:active.button.flat, .check.sidebar-button.button:checked:active, .header-bar .check.titlebutton.button:checked:active,
   .titlebar .check.titlebutton.button:checked:active {
     icon-shadow: none; }
 
@@ -2821,7 +2759,7 @@
 .check:backdrop:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop.png"), url("assets/checkbox-checked-backdrop@2.png"));
   icon-shadow: none; }
-  .check:backdrop:checked.button.flat, .header-bar .check.titlebutton.button:backdrop:checked,
+  .check:backdrop:checked.button.flat, .check.sidebar-button.button:backdrop:checked, .header-bar .check.titlebutton.button:backdrop:checked,
   .titlebar .check.titlebutton.button:backdrop:checked {
     icon-shadow: none; }
 
@@ -2832,7 +2770,7 @@
 .check:backdrop:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-insensitive.png"), url("assets/checkbox-checked-backdrop-insensitive@2.png"));
   icon-shadow: none; }
-  .check:backdrop:checked:insensitive.button.flat, .header-bar .check.titlebutton.button:backdrop:checked:insensitive,
+  .check:backdrop:checked:insensitive.button.flat, .check.sidebar-button.button:backdrop:checked:insensitive, .header-bar .check.titlebutton.button:backdrop:checked:insensitive,
   .titlebar .check.titlebutton.button:backdrop:checked:insensitive {
     icon-shadow: none; }
 
@@ -2856,7 +2794,7 @@
 .radio {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked.png"), url("assets/radio-unchecked@2.png"));
   icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.1); }
-  .radio.button.flat, .header-bar .radio.titlebutton.button,
+  .radio.button.flat, .radio.sidebar-button.button, .header-bar .radio.titlebutton.button,
   .titlebar .radio.titlebutton.button {
     icon-shadow: none; }
 
@@ -2867,7 +2805,7 @@
 .radio:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-hover.png"), url("assets/radio-unchecked-hover@2.png"));
   icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.1); }
-  .radio:hover.button.flat, .header-bar .radio.titlebutton.button:hover,
+  .radio:hover.button.flat, .radio.sidebar-button.button:hover, .header-bar .radio.titlebutton.button:hover,
   .titlebar .radio.titlebutton.button:hover {
     icon-shadow: none; }
 
@@ -2878,7 +2816,7 @@
 .radio:active {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-active.png"), url("assets/radio-unchecked-active@2.png"));
   icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.1); }
-  .radio:active.button.flat, .header-bar .radio.titlebutton.button:active,
+  .radio:active.button.flat, .radio.sidebar-button.button:active, .header-bar .radio.titlebutton.button:active,
   .titlebar .radio.titlebutton.button:active {
     icon-shadow: none; }
 
@@ -2889,7 +2827,7 @@
 .radio:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive.png"), url("assets/radio-unchecked-insensitive@2.png"));
   icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.1); }
-  .radio:insensitive.button.flat, .header-bar .radio.titlebutton.button:insensitive,
+  .radio:insensitive.button.flat, .radio.sidebar-button.button:insensitive, .header-bar .radio.titlebutton.button:insensitive,
   .titlebar .radio.titlebutton.button:insensitive {
     icon-shadow: none; }
 
@@ -2900,7 +2838,7 @@
 .radio:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-backdrop.png"), url("assets/radio-unchecked-backdrop@2.png"));
   icon-shadow: none; }
-  .radio:backdrop.button.flat, .header-bar .radio.titlebutton.button:backdrop,
+  .radio:backdrop.button.flat, .radio.sidebar-button.button:backdrop, .header-bar .radio.titlebutton.button:backdrop,
   .titlebar .radio.titlebutton.button:backdrop {
     icon-shadow: none; }
 
@@ -2911,7 +2849,7 @@
 .radio:backdrop:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-backdrop-insensitive.png"), url("assets/radio-unchecked-backdrop-insensitive@2.png"));
   icon-shadow: none; }
-  .radio:backdrop:insensitive.button.flat, .header-bar .radio.titlebutton.button:backdrop:insensitive,
+  .radio:backdrop:insensitive.button.flat, .radio.sidebar-button.button:backdrop:insensitive, .header-bar .radio.titlebutton.button:backdrop:insensitive,
   .titlebar .radio.titlebutton.button:backdrop:insensitive {
     icon-shadow: none; }
 
@@ -2922,7 +2860,7 @@
 .radio:inconsistent {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed.png"), url("assets/radio-mixed@2.png"));
   icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.1); }
-  .radio:inconsistent.button.flat, .header-bar .radio.titlebutton.button:inconsistent,
+  .radio:inconsistent.button.flat, .radio.sidebar-button.button:inconsistent, .header-bar .radio.titlebutton.button:inconsistent,
   .titlebar .radio.titlebutton.button:inconsistent {
     icon-shadow: none; }
 
@@ -2933,7 +2871,7 @@
 .radio:inconsistent:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-hover.png"), url("assets/radio-mixed-hover@2.png"));
   icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.1); }
-  .radio:inconsistent:hover.button.flat, .header-bar .radio.titlebutton.button:inconsistent:hover,
+  .radio:inconsistent:hover.button.flat, .radio.sidebar-button.button:inconsistent:hover, .header-bar .radio.titlebutton.button:inconsistent:hover,
   .titlebar .radio.titlebutton.button:inconsistent:hover {
     icon-shadow: none; }
 
@@ -2944,7 +2882,7 @@
 .radio:inconsistent:selected {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active.png"), url("assets/radio-mixed-active@2.png"));
   icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.1); }
-  .radio:inconsistent:selected.button.flat, .header-bar .radio.titlebutton.button:inconsistent:selected,
+  .radio:inconsistent:selected.button.flat, .radio.sidebar-button.button:inconsistent:selected, .header-bar .radio.titlebutton.button:inconsistent:selected,
   .titlebar .radio.titlebutton.button:inconsistent:selected {
     icon-shadow: none; }
 
@@ -2955,7 +2893,7 @@
 .radio:inconsistent:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-backdrop.png"), url("assets/radio-mixed-backdrop@2.png"));
   icon-shadow: none; }
-  .radio:inconsistent:backdrop.button.flat, .header-bar .radio.titlebutton.button:inconsistent:backdrop,
+  .radio:inconsistent:backdrop.button.flat, .radio.sidebar-button.button:inconsistent:backdrop, .header-bar .radio.titlebutton.button:inconsistent:backdrop,
   .titlebar .radio.titlebutton.button:inconsistent:backdrop {
     icon-shadow: none; }
 
@@ -2966,7 +2904,7 @@
 .radio:inconsistent:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive.png"), url("assets/radio-mixed-insensitive@2.png"));
   icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.1); }
-  .radio:inconsistent:insensitive.button.flat, .header-bar .radio.titlebutton.button:inconsistent:insensitive,
+  .radio:inconsistent:insensitive.button.flat, .radio.sidebar-button.button:inconsistent:insensitive, .header-bar .radio.titlebutton.button:inconsistent:insensitive,
   .titlebar .radio.titlebutton.button:inconsistent:insensitive {
     icon-shadow: none; }
 
@@ -2977,7 +2915,7 @@
 .radio:inconsistent:insensitive:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-backdrop-insensitive.png"), url("assets/radio-mixed-backdrop-insensitive@2.png"));
   icon-shadow: none; }
-  .radio:inconsistent:insensitive:backdrop.button.flat, .header-bar .radio.titlebutton.button:inconsistent:insensitive:backdrop,
+  .radio:inconsistent:insensitive:backdrop.button.flat, .radio.sidebar-button.button:inconsistent:insensitive:backdrop, .header-bar .radio.titlebutton.button:inconsistent:insensitive:backdrop,
   .titlebar .radio.titlebutton.button:inconsistent:insensitive:backdrop {
     icon-shadow: none; }
 
@@ -2988,7 +2926,7 @@
 .radio:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked.png"), url("assets/radio-checked@2.png"));
   icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.1); }
-  .radio:checked.button.flat, .header-bar .radio.titlebutton.button:checked,
+  .radio:checked.button.flat, .radio.sidebar-button.button:checked, .header-bar .radio.titlebutton.button:checked,
   .titlebar .radio.titlebutton.button:checked {
     icon-shadow: none; }
 
@@ -2999,7 +2937,7 @@
 .radio:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive.png"), url("assets/radio-checked-insensitive@2.png"));
   icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.1); }
-  .radio:checked:insensitive.button.flat, .header-bar .radio.titlebutton.button:checked:insensitive,
+  .radio:checked:insensitive.button.flat, .radio.sidebar-button.button:checked:insensitive, .header-bar .radio.titlebutton.button:checked:insensitive,
   .titlebar .radio.titlebutton.button:checked:insensitive {
     icon-shadow: none; }
 
@@ -3010,7 +2948,7 @@
 .radio:checked:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-hover.png"), url("assets/radio-checked-hover@2.png"));
   icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.1); }
-  .radio:checked:hover.button.flat, .header-bar .radio.titlebutton.button:checked:hover,
+  .radio:checked:hover.button.flat, .radio.sidebar-button.button:checked:hover, .header-bar .radio.titlebutton.button:checked:hover,
   .titlebar .radio.titlebutton.button:checked:hover {
     icon-shadow: none; }
 
@@ -3021,7 +2959,7 @@
 .radio:checked:active {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-active.png"), url("assets/radio-checked-active@2.png"));
   icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.1); }
-  .radio:checked:active.button.flat, .header-bar .radio.titlebutton.button:checked:active,
+  .radio:checked:active.button.flat, .radio.sidebar-button.button:checked:active, .header-bar .radio.titlebutton.button:checked:active,
   .titlebar .radio.titlebutton.button:checked:active {
     icon-shadow: none; }
 
@@ -3032,7 +2970,7 @@
 .radio:backdrop:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop.png"), url("assets/radio-checked-backdrop@2.png"));
   icon-shadow: none; }
-  .radio:backdrop:checked.button.flat, .header-bar .radio.titlebutton.button:backdrop:checked,
+  .radio:backdrop:checked.button.flat, .radio.sidebar-button.button:backdrop:checked, .header-bar .radio.titlebutton.button:backdrop:checked,
   .titlebar .radio.titlebutton.button:backdrop:checked {
     icon-shadow: none; }
 
@@ -3043,7 +2981,7 @@
 .radio:backdrop:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop-insensitive.png"), url("assets/radio-checked-backdrop-insensitive@2.png"));
   icon-shadow: none; }
-  .radio:backdrop:checked:insensitive.button.flat, .header-bar .radio.titlebutton.button:backdrop:checked:insensitive,
+  .radio:backdrop:checked:insensitive.button.flat, .radio.sidebar-button.button:backdrop:checked:insensitive, .header-bar .radio.titlebutton.button:backdrop:checked:insensitive,
   .titlebar .radio.titlebutton.button:backdrop:checked:insensitive {
     icon-shadow: none; }
 
@@ -3072,47 +3010,42 @@
   .list-row .check:hover, list-row .radio:selected, list-row .radio:hover {
     icon-shadow: none; }
 
-.content-view {
-  background-color: #b4b4b4; }
-  .content-view:backdrop {
-    background-color: #b4b4b4; }
-
-.view.content-view.check {
+.view.content-view.check:not(.list) {
   icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-selectionmode.png"), url("assets/checkbox-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:hover {
+.view.content-view.check:hover:not(.list) {
   icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-hover-selectionmode.png"), url("assets/checkbox-hover-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:active {
+.view.content-view.check:active:not(.list) {
   icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-active-selectionmode.png"), url("assets/checkbox-active-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:backdrop {
+.view.content-view.check:backdrop:not(.list) {
   icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-backdrop-selectionmode.png"), url("assets/checkbox-backdrop-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:checked {
+.view.content-view.check:checked:not(.list) {
   icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-selectionmode.png"), url("assets/checkbox-checked-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:checked:hover {
+.view.content-view.check:checked:hover:not(.list) {
   icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-hover-selectionmode.png"), url("assets/checkbox-checked-hover-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:checked:active {
+.view.content-view.check:checked:active:not(.list) {
   icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-active-selectionmode.png"), url("assets/checkbox-checked-active-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:backdrop:checked {
+.view.content-view.check:backdrop:checked:not(.list) {
   icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-selectionmode.png"), url("assets/checkbox-checked-backdrop-selectionmode@2.png"));
   background-color: transparent; }
@@ -3325,11 +3258,43 @@
       .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:backdrop {
         border-color: rgba(0, 0, 0, 0.7);
         background-image: none; }
+  .list-row:selected .scale, .list-row:selected
+  .scale.scale-has-marks-above.scale-has-marks-below, .list-row:selected
+  .scale.vertical.scale-has-marks-above.scale-has-marks-below {
+    border-color: #12180c; }
+    .list-row:selected .scale.trough, .list-row:selected
+    .scale.scale-has-marks-above.scale-has-marks-below.trough, .list-row:selected
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough {
+      box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); }
+      .list-row:selected .scale.trough:backdrop, .list-row:selected
+      .scale.scale-has-marks-above.scale-has-marks-below.trough:backdrop, .list-row:selected
+      .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:backdrop {
+        box-shadow: none; }
+      .list-row:selected .scale.trough.highlight:backdrop, .list-row:selected
+      .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight:backdrop, .list-row:selected
+      .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight:backdrop {
+        border-color: #12180c; }
+    .list-row:selected .scale:insensitive, .list-row:selected .scale.trough.highlight:insensitive, .list-row:selected
+    .scale.scale-has-marks-above.scale-has-marks-below:insensitive, .list-row:selected
+    .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight:insensitive, .list-row:selected
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below:insensitive, .list-row:selected
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight:insensitive {
+      border-color: #5E7F3E;
+      box-shadow: none;
+      background-color: #afbf9f;
+      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: #afbf9f; }
 
 .scale.scale-has-marks-below {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
-  -GtkRange-trough-border: 2; }
+  -GtkRange-trough-border: 2;
+  color: alpha(currentColor,0.5); }
   .scale.scale-has-marks-below.slider {
     border-style: none;
     border-radius: 0;
@@ -3382,7 +3347,8 @@
 .scale.scale-has-marks-above {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
-  -GtkRange-trough-border: 2; }
+  -GtkRange-trough-border: 2;
+  color: alpha(currentColor,0.5); }
   .scale.scale-has-marks-above.slider {
     border-style: none;
     border-radius: 0;
@@ -3435,7 +3401,8 @@
 .scale.vertical.scale-has-marks-below {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
-  -GtkRange-trough-border: 2; }
+  -GtkRange-trough-border: 2;
+  color: alpha(currentColor,0.5); }
   .scale.vertical.scale-has-marks-below.slider {
     border-style: none;
     border-radius: 0;
@@ -3488,7 +3455,8 @@
 .scale.vertical.scale-has-marks-above {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
-  -GtkRange-trough-border: 2; }
+  -GtkRange-trough-border: 2;
+  color: alpha(currentColor,0.5); }
   .scale.vertical.scale-has-marks-above.slider {
     border-style: none;
     border-radius: 0;
@@ -3621,10 +3589,6 @@
 /*************
  * Level Bar *
  *************/
-.level-bar.vertical {
-  -GtkLevelBar-min-block-width: 3;
-  -GtkLevelBar-min-block-height: 34; }
-
 .level-bar {
   box-shadow: 0 1px rgba(255, 255, 255, 0.1);
   -GtkLevelBar-min-block-width: 34;
@@ -3637,17 +3601,17 @@
     padding: 2px;
     border-radius: 3px;
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #bebebe, #C6C6C6 90%);
+    background-image: linear-gradient(to bottom, #ababab, #c1c1c1 3px, #C6C6C6 90%);
     color: black;
     border-color: #7a7a7a;
-    box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(94, 127, 62, 0), 0 1px rgba(255, 255, 255, 0.1); }
+    box-shadow: inset 0 0 0 1px rgba(94, 127, 62, 0), 0 1px rgba(255, 255, 255, 0.1); }
     .level-bar.trough:backdrop {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #bebebe, #C6C6C6 90%);
+      background-image: linear-gradient(to bottom, #ababab, #c1c1c1 3px, #C6C6C6 90%);
       color: #272727;
       border-color: #828282;
       background-image: linear-gradient(to bottom, #c3c3c3);
-      box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(255, 255, 255, 0); }
+      box-shadow: 0 1px rgba(255, 255, 255, 0); }
   .level-bar.fill-block {
     border: 1px solid #455d2d;
     background-color: #5E7F3E;
@@ -3694,19 +3658,18 @@
 GtkScrolledWindow GtkViewport.frame {
   border-style: none; }
 
-.separator, GtkPlacesSidebar.sidebar .view .separator,
-GtkPlacesSidebar.sidebar .view .separator:backdrop {
+.separator {
   color: rgba(0, 0, 0, 0.1); }
-  GtkFileChooserButton .separator.vertical, GtkFileChooserButton GtkPlacesSidebar.sidebar .view .vertical.separator, GtkPlacesSidebar.sidebar .view GtkFileChooserButton .vertical.separator, GtkFontButton .separator.vertical, GtkFontButton GtkPlacesSidebar.sidebar .view .vertical.separator, GtkPlacesSidebar.sidebar .view GtkFontButton .vertical.separator {
+  GtkFileChooserButton .separator.vertical, GtkFontButton .separator.vertical {
     -GtkWidget-wide-separators: true; }
 
 /*********
  * Lists *
  *********/
-.list, .list-row {
+.list {
   background-color: #C6C6C6;
   border-color: #7a7a7a; }
-  .list:backdrop, .list-row:backdrop {
+  .list:backdrop {
     background-color: #c3c3c3;
     border-color: #828282; }
 
@@ -3714,32 +3677,17 @@
 .grid-child {
   padding: 2px; }
 
-.list-row.button, .header-bar .list-row.button.titlebutton,
-.titlebar .list-row.button.titlebutton,
-.list-row.button:backdrop,
-.list-row.button:backdrop:active,
-.list-row.button:backdrop:checked,
-.list-row.button:backdrop:insensitive,
-.list-row.button:backdrop:insensitive:active,
-.list-row.button:backdrop:insensitive:checked,
-.list-row.button:insensitive:active,
-.list-row.button:insensitive:checked {
-  background-color: rgba(198, 198, 198, 0);
-  border-style: none;
-  border-radius: 0;
-  box-shadow: none; }
-
-.list-row.button:hover {
-  background-color: #bdbdbd; }
-.list-row.button:active {
+.list-row.activatable:hover, GtkPlacesSidebar.sidebar .has-open-popup {
+  background-color: rgba(22, 22, 22, 0.05); }
+.list-row.activatable:active {
   box-shadow: inset 0 2px 2px -2px rgba(0, 0, 0, 0.2); }
-.list-row.button:backdrop:hover {
+.list-row.activatable:backdrop:hover, GtkPlacesSidebar.sidebar .has-open-popup:backdrop {
   background-color: transparent; }
-.list-row.button:selected:active {
+.list-row.activatable:selected:active {
   box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); }
-.list-row.button:selected:hover {
+.list-row.activatable:selected:hover, GtkPlacesSidebar.sidebar .has-open-popup:selected {
   background-color: #57753a; }
-.list-row.button:selected:backdrop {
+.list-row.activatable:selected:backdrop {
   background-color: #5E7F3E; }
 
 .list-row:selected .button {
@@ -3751,7 +3699,7 @@
   icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.5);
   border-color: #12180c; }
-  .list-row:selected .button.flat, .list-row:selected .header-bar .titlebutton.button, .header-bar .list-row:selected .titlebutton.button,
+  .list-row:selected .button.flat, .list-row:selected .sidebar-button.button, .list-row:selected .header-bar .titlebutton.button, .header-bar .list-row:selected .titlebutton.button,
   .list-row:selected .titlebar .titlebutton.button,
   .titlebar .list-row:selected .titlebutton.button {
     border-color: transparent;
@@ -3779,7 +3727,7 @@
     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);
     border-color: #12180c; }
-  .list-row:selected .button:backdrop, .list-row:selected .button.flat:backdrop, .list-row:selected .header-bar .titlebutton.button:backdrop, .header-bar .list-row:selected .titlebutton.button:backdrop,
+  .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: #6e6e6e;
@@ -3789,9 +3737,9 @@
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     border-color: #12180c; }
-    .list-row:selected .button:backdrop:active, .list-row:selected .button:backdrop:checked, .list-row:selected .button.flat:backdrop:active, .list-row:selected .header-bar .titlebutton.button:backdrop:active, .header-bar .list-row:selected .titlebutton.button:backdrop:active,
+    .list-row:selected .button:backdrop:active, .list-row:selected .button:backdrop:checked, .list-row:selected .button.flat:backdrop:active, .list-row:selected .sidebar-button.button:backdrop:active, .list-row:selected .header-bar .titlebutton.button:backdrop:active, .header-bar .list-row:selected .titlebutton.button:backdrop:active,
     .list-row:selected .titlebar .titlebutton.button:backdrop:active,
-    .titlebar .list-row:selected .titlebutton.button:backdrop:active, .list-row:selected .button.flat:backdrop:checked, .list-row:selected .header-bar .titlebutton.button:backdrop:checked, .header-bar .list-row:selected .titlebutton.button:backdrop:checked,
+    .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: #6e6e6e;
@@ -3799,7 +3747,7 @@
       background-image: linear-gradient(to bottom, #aeaeae);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       border-color: #12180c; }
-    .list-row:selected .button:backdrop:insensitive, .list-row:selected .button.flat:backdrop:insensitive, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive,
+    .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: #a0a0a0;
@@ -3810,13 +3758,13 @@
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       border-color: #12180c; }
       .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 .header-bar .titlebutton.button:backdrop:insensitive > .label, .header-bar .list-row:selected .titlebutton.button: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; }
-      .list-row:selected .button:backdrop:insensitive:active, .list-row:selected .button:backdrop:insensitive:checked, .list-row:selected .button.flat:backdrop:insensitive:active, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive:active, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:active,
+      .list-row:selected .button:backdrop:insensitive:active, .list-row:selected .button:backdrop:insensitive:checked, .list-row:selected .button.flat:backdrop:insensitive:active, .list-row:selected .sidebar-button.button:backdrop:insensitive:active, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive:active, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:active,
       .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive:active,
-      .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:active, .list-row:selected .button.flat:backdrop:insensitive:checked, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive:checked, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:checked,
+      .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:active, .list-row:selected .button.flat:backdrop:insensitive:checked, .list-row:selected .sidebar-button.button:backdrop:insensitive:checked, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive:checked, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:checked,
       .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive:checked,
       .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:checked {
         color: #a0a0a0;
@@ -3826,13 +3774,13 @@
         border-color: #12180c; }
         .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 .header-bar .titlebutton.button:backdrop:insensitive:active > .label, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:active > .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 .header-bar .titlebutton.button:backdrop:insensitive:checked > .label, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:checked > .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,
         .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:checked > .label {
           color: inherit; }
-  .list-row:selected .button.flat:backdrop, .list-row:selected .header-bar .titlebutton.button:backdrop, .header-bar .list-row:selected .titlebutton.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 {
     border-color: transparent;
@@ -3863,11 +3811,9 @@
       .list-row:selected .titlebar .button.titlebutton:insensitive:checked > .label {
         color: inherit; }
 
-.list-row, list-row.button, .header-bar list-row.button.titlebutton,
-.titlebar list-row.button.titlebutton {
-  transition: all 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
-  .list-row:hover, list-row.button:hover, .header-bar list-row.button.titlebutton:hover,
-  .titlebar list-row.button.titlebutton:hover {
+.list-row {
+  transition: all 150ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
+  .list-row:hover {
     transition: none; }
 
 /*********************
@@ -3896,10 +3842,11 @@
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
     outline-color: rgba(238, 238, 236, 0.3); }
-    .app-notification .button.flat, .app-notification .header-bar .titlebutton.button, .header-bar .app-notification .titlebutton.button,
+    .app-notification .button.flat, .app-notification .sidebar-button.button, .app-notification .header-bar .titlebutton.button, .header-bar .app-notification .titlebutton.button,
     .app-notification .titlebar .titlebutton.button,
     .titlebar .app-notification .titlebutton.button,
     .app-notification.frame .button.flat,
+    .app-notification.frame .sidebar-button.button,
     .app-notification.frame .header-bar .titlebutton.button,
     .header-bar .app-notification.frame .titlebutton.button,
     .app-notification.frame .titlebar .titlebutton.button,
@@ -3981,8 +3928,14 @@
     GtkCalendar.button:backdrop, .header-bar GtkCalendar.button.titlebutton:backdrop,
     .titlebar GtkCalendar.button.titlebutton:backdrop {
       color: rgba(110, 110, 110, 0.45); }
-  GtkCalendar:inconsistent, GtkCalendar:inconsistent:backdrop, GtkCalendar.highlight, GtkCalendar.highlight:backdrop {
+    GtkCalendar.button:insensitive, .header-bar GtkCalendar.button.titlebutton:insensitive,
+    .titlebar GtkCalendar.button.titlebutton:insensitive {
+      color: rgba(110, 110, 110, 0.45); }
+  GtkCalendar:inconsistent, GtkCalendar:inconsistent:backdrop {
     color: alpha(currentColor,0.55); }
+  GtkCalendar.highlight, GtkCalendar.highlight:backdrop {
+    font-size: smaller;
+    color: #161616; }
   GtkCalendar:backdrop {
     color: #272727;
     border-color: #828282; }
@@ -3993,182 +3946,180 @@
 .message-dialog .dialog-action-area .button {
   padding: 8px; }
 
-.message-dialog {
-  -GtkDialog-button-spacing: 0; }
-  .message-dialog.background {
-    background-color: #C6C6C6; }
-  .message-dialog .titlebar {
-    border-style: none;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
-  .message-dialog.csd.background {
-    border-bottom-left-radius: 9px;
-    border-bottom-right-radius: 9px; }
-  .message-dialog.csd .dialog-action-area .button {
-    padding: 12px;
-    border-radius: 0;
+.message-dialog.background {
+  background-color: #C6C6C6; }
+.message-dialog .titlebar {
+  border-style: none;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
+.message-dialog.csd.background {
+  border-bottom-left-radius: 9px;
+  border-bottom-right-radius: 9px; }
+.message-dialog.csd .dialog-action-area .button {
+  padding: 12px;
+  border-radius: 0;
+  color: #161616;
+  outline-color: rgba(22, 22, 22, 0.3);
+  border-color: #7a7a7a;
+  background-image: linear-gradient(to bottom, lightgray, #C6C6C6 40%, #b9b9b9);
+  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(255, 255, 255, 0.5); }
+  .message-dialog.csd .dialog-action-area .button:hover {
+    color: #161616;
+    outline-color: rgba(22, 22, 22, 0.3);
+    border-color: #7a7a7a;
+    background-image: linear-gradient(to bottom, #eaeaea, #d0d0d0 40%, #C6C6C6);
+    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(255, 255, 255, 0.5); }
+  .message-dialog.csd .dialog-action-area .button:active {
     color: #161616;
     outline-color: rgba(22, 22, 22, 0.3);
     border-color: #7a7a7a;
-    background-image: linear-gradient(to bottom, lightgray, #C6C6C6 40%, #b9b9b9);
+    background-image: linear-gradient(to bottom, #afafaf, #b5b5b5 40%, #b9b9b9);
     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(255, 255, 255, 0.5); }
-    .message-dialog.csd .dialog-action-area .button:hover {
-      color: #161616;
-      outline-color: rgba(22, 22, 22, 0.3);
-      border-color: #7a7a7a;
-      background-image: linear-gradient(to bottom, #eaeaea, #d0d0d0 40%, #C6C6C6);
-      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(255, 255, 255, 0.5); }
-    .message-dialog.csd .dialog-action-area .button:active {
-      color: #161616;
-      outline-color: rgba(22, 22, 22, 0.3);
-      border-color: #7a7a7a;
-      background-image: linear-gradient(to bottom, #afafaf, #b5b5b5 40%, #b9b9b9);
-      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); }
+  .message-dialog.csd .dialog-action-area .button:insensitive {
+    color: #6e6e6e;
+    border-color: #7a7a7a;
+    background-image: linear-gradient(to bottom, #c6c6c6);
+    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 .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: #6e6e6e;
+    border-color: #828282;
+    background-image: linear-gradient(to bottom, #C6C6C6);
+    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: #a0a0a0;
+    border-color: #828282;
+    background-image: linear-gradient(to bottom, #c6c6c6);
+    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 .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;
+    outline-color: rgba(255, 255, 255, 0.3);
+    border-color: #1f2914;
+    background-image: linear-gradient(to bottom, #6b9046, #5E7F3E 40%, #516e36);
+    text-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
+    icon-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
+    .message-dialog.csd .dialog-action-area .button.suggested-action:hover {
+      color: white;
+      outline-color: rgba(255, 255, 255, 0.3);
+      border-color: #1f2914;
+      background-image: linear-gradient(to bottom, #82ad57, #688d45 40%, #5E7F3E);
+      text-shadow: 0 -1px rgba(0, 0, 0, 0.67153);
+      icon-shadow: 0 -1px rgba(0, 0, 0, 0.67153);
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
+    .message-dialog.csd .dialog-action-area .button.suggested-action:active {
+      color: white;
+      outline-color: rgba(255, 255, 255, 0.3);
+      border-color: #1f2914;
+      background-image: linear-gradient(to bottom, #47602f, #4d6833 40%, #516e36);
+      text-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
+      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:insensitive {
+    .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop {
+      color: #dfe5d8;
+      border-color: #5E7F3E;
+      background-image: linear-gradient(to bottom, #5E7F3E);
+      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 {
+        color: #a0a0a0;
+        border-color: #828282;
+        background-image: linear-gradient(to bottom, #c6c6c6);
+        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 .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: #6e6e6e;
       border-color: #7a7a7a;
       background-image: linear-gradient(to bottom, #c6c6c6);
       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 .header-bar .button.titlebutton:insensitive > .label,
-      .message-dialog.csd .dialog-action-area .titlebar .button.titlebutton: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:backdrop {
-      color: #6e6e6e;
-      border-color: #828282;
-      background-image: linear-gradient(to bottom, #C6C6C6);
+  .message-dialog.csd .dialog-action-area .button.destructive-action {
+    color: white;
+    outline-color: rgba(255, 255, 255, 0.3);
+    border-color: #8e0b0b;
+    background-image: linear-gradient(to bottom, #f14141, #ef2929 40%, #ed1212);
+    text-shadow: 0 -1px rgba(0, 0, 0, 0.56078);
+    icon-shadow: 0 -1px rgba(0, 0, 0, 0.56078);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.5); }
+    .message-dialog.csd .dialog-action-area .button.destructive-action:hover {
+      color: white;
+      outline-color: rgba(255, 255, 255, 0.3);
+      border-color: #8e0b0b;
+      background-image: linear-gradient(to bottom, #f46b6b, #f03c3c 40%, #ef2929);
+      text-shadow: 0 -1px rgba(0, 0, 0, 0.52878);
+      icon-shadow: 0 -1px rgba(0, 0, 0, 0.52878);
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.5); }
+    .message-dialog.csd .dialog-action-area .button.destructive-action:active {
+      color: white;
+      outline-color: rgba(255, 255, 255, 0.3);
+      border-color: #8e0b0b;
+      background-image: linear-gradient(to bottom, #da1010, #e51111 40%, #ed1212);
+      text-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
+      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: #fcd4d4;
+      border-color: #ef2929;
+      background-image: linear-gradient(to bottom, #ef2929);
       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: #a0a0a0;
-      border-color: #828282;
+      .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive {
+        color: #a0a0a0;
+        border-color: #828282;
+        background-image: linear-gradient(to bottom, #c6c6c6);
+        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 .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: #6e6e6e;
+      border-color: #7a7a7a;
       background-image: linear-gradient(to bottom, #c6c6c6);
       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 .header-bar .button.titlebutton:backdrop:insensitive > .label,
-      .message-dialog.csd .dialog-action-area .titlebar .button.titlebutton:backdrop: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.suggested-action {
-      color: white;
-      outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #1f2914;
-      background-image: linear-gradient(to bottom, #6b9046, #5E7F3E 40%, #516e36);
-      text-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
-      icon-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
-      .message-dialog.csd .dialog-action-area .button.suggested-action:hover {
-        color: white;
-        outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #1f2914;
-        background-image: linear-gradient(to bottom, #82ad57, #688d45 40%, #5E7F3E);
-        text-shadow: 0 -1px rgba(0, 0, 0, 0.67153);
-        icon-shadow: 0 -1px rgba(0, 0, 0, 0.67153);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
-      .message-dialog.csd .dialog-action-area .button.suggested-action:active {
-        color: white;
-        outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #1f2914;
-        background-image: linear-gradient(to bottom, #47602f, #4d6833 40%, #516e36);
-        text-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
-        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: #dfe5d8;
-        border-color: #5E7F3E;
-        background-image: linear-gradient(to bottom, #5E7F3E);
-        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 {
-          color: #a0a0a0;
-          border-color: #828282;
-          background-image: linear-gradient(to bottom, #c6c6c6);
-          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 .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: #6e6e6e;
-        border-color: #7a7a7a;
-        background-image: linear-gradient(to bottom, #c6c6c6);
-        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 .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;
-      outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #8e0b0b;
-      background-image: linear-gradient(to bottom, #f14141, #ef2929 40%, #ed1212);
-      text-shadow: 0 -1px rgba(0, 0, 0, 0.56078);
-      icon-shadow: 0 -1px rgba(0, 0, 0, 0.56078);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.5); }
-      .message-dialog.csd .dialog-action-area .button.destructive-action:hover {
-        color: white;
-        outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #8e0b0b;
-        background-image: linear-gradient(to bottom, #f46b6b, #f03c3c 40%, #ef2929);
-        text-shadow: 0 -1px rgba(0, 0, 0, 0.52878);
-        icon-shadow: 0 -1px rgba(0, 0, 0, 0.52878);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.5); }
-      .message-dialog.csd .dialog-action-area .button.destructive-action:active {
-        color: white;
-        outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #8e0b0b;
-        background-image: linear-gradient(to bottom, #da1010, #e51111 40%, #ed1212);
-        text-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
-        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: #fcd4d4;
-        border-color: #ef2929;
-        background-image: linear-gradient(to bottom, #ef2929);
-        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 {
-          color: #a0a0a0;
-          border-color: #828282;
-          background-image: linear-gradient(to bottom, #c6c6c6);
-          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 .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: #6e6e6e;
-        border-color: #7a7a7a;
-        background-image: linear-gradient(to bottom, #c6c6c6);
-        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 .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;
-    border-right-style: none;
-    border-bottom-style: none; }
-  .message-dialog.csd .dialog-action-area .button:last-child {
-    border-bottom-right-radius: 7px;
-    outline-bottom-right-radius: 5px; }
-  .message-dialog.csd .dialog-action-area .button:first-child {
-    border-left-style: none;
-    border-bottom-left-radius: 7px;
-    outline-bottom-left-radius: 5px; }
+.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;
+  border-right-style: none;
+  border-bottom-style: none; }
+.message-dialog.csd .dialog-action-area .button:last-child {
+  border-bottom-right-radius: 7px;
+  outline-bottom-right-radius: 5px; }
+.message-dialog.csd .dialog-action-area .button:first-child {
+  border-left-style: none;
+  border-bottom-left-radius: 7px;
+  outline-bottom-left-radius: 5px; }
 
 GtkFileChooserDialog .search-bar {
   background-color: #C6C6C6;
@@ -4187,31 +4138,43 @@
  ***********/
 .sidebar {
   border: none;
-  background-color: #b9b9b9; }
+  background-color: #c6c6c6; }
   .sidebar:backdrop {
     background-color: #b9b9b9; }
 
-GtkPlacesSidebar.sidebar .view {
-  color: #161616;
-  background-color: transparent; }
-  GtkPlacesSidebar.sidebar .view .image {
-    color: #474747; }
-    GtkPlacesSidebar.sidebar .view .image:selected {
-      color: #eff2ec; }
-      GtkPlacesSidebar.sidebar .view .image:selected:backdrop {
-        color: #eff2ec; }
-    GtkPlacesSidebar.sidebar .view .image:insensitive {
-      color: #858585; }
-    GtkPlacesSidebar.sidebar .view .image:backdrop {
-      color: #858585; }
-      GtkPlacesSidebar.sidebar .view .image:backdrop:insensitive {
-        color: #a8a8a8; }
-  GtkPlacesSidebar.sidebar .view:insensitive {
-    color: #6e6e6e; }
-  GtkPlacesSidebar.sidebar .view:backdrop {
-    color: #6e6e6e; }
-    GtkPlacesSidebar.sidebar .view:backdrop:insensitive {
-      color: #a0a0a0; }
+GtkSidebarRow.list-row {
+  padding: 0px; }
+GtkSidebarRow .sidebar-revealer {
+  padding: 4px 14px 4px 12px; }
+GtkSidebarRow .sidebar-icon {
+  opacity: 0.7; }
+  GtkSidebarRow .sidebar-icon:dir(ltr) {
+    padding-right: 8px; }
+  GtkSidebarRow .sidebar-icon:dir(rtl) {
+    padding-left: 8px; }
+GtkSidebarRow .sidebar-label:dir(ltr) {
+  padding-right: 2px; }
+GtkSidebarRow .sidebar-label:dir(rtl) {
+  padding-left: 2px; }
+
+GtkPlacesSidebar.sidebar .list-row:selected:active {
+  box-shadow: none; }
+GtkPlacesSidebar.sidebar .sidebar-placeholder-row {
+  border: solid 1px #5E7F3E; }
+GtkPlacesSidebar.sidebar .sidebar-new-bookmark-row {
+  color: #5E7F3E; }
+.sidebar-button.button, .header-bar .sidebar-button.button.titlebutton,
+.titlebar .sidebar-button.button.titlebutton {
+  border-radius: 100%;
+  outline-radius: 100%; }
+  .sidebar-button.button.image-button, GtkScaleButton.sidebar-button.button,
+  GtkVolumeButton.sidebar-button.button, .header-bar .sidebar-button.titlebutton.button,
+  .titlebar .sidebar-button.titlebutton.button {
+    padding: 5px; }
+  .sidebar-button.button:not(:hover):not(:active) > GtkImage, .header-bar .sidebar-button.button.titlebutton:not(:hover):not(:active) > GtkImage,
+  .titlebar .sidebar-button.button.titlebutton:not(:hover):not(:active) > GtkImage, .sidebar-button.button:backdrop > GtkImage, .header-bar .sidebar-button.button.titlebutton:backdrop > GtkImage,
+  .titlebar .sidebar-button.button.titlebutton:backdrop > GtkImage {
+    opacity: 0.7; }
 
 .sidebar-item {
   padding: 10px 4px; }
@@ -4221,6 +4184,18 @@
   .sidebar-item.needs-attention > .label {
     background-size: 6px 6px, 0 0; }
 
+/****************
+ * File chooser *
+ ****************/
+GtkPlacesView .server-list-button > GtkImage {
+  transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+  -gtk-icon-transform: rotate(0turn); }
+GtkPlacesView .server-list-button:checked > GtkImage {
+  transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+  -gtk-icon-transform: rotate(-0.5turn); }
+GtkPlacesView .list-row.activatable:hover, GtkPlacesView GtkPlacesSidebar.sidebar .has-open-popup, GtkPlacesSidebar.sidebar GtkPlacesView .has-open-popup {
+  background-color: transparent; }
+
 /*********
  * Paned *
  *********/
@@ -4413,6 +4388,9 @@
       border-color: #ffffff; }
   GtkColorSwatch:selected {
     box-shadow: inset 0 1px rgba(0, 0, 0, 0.1), 0 1px rgba(255, 255, 255, 0.1); }
+  GtkColorSwatch:insensitive {
+    box-shadow: none;
+    opacity: 0.5; }
   GtkColorSwatch.top {
     border-top-left-radius: 6px;
     border-top-right-radius: 6px; }
@@ -4459,12 +4437,12 @@
       box-shadow: none; }
   GtkColorSwatch.color-dark {
     color: white;
-    outline-color: rgba(0, 0, 0, 0.3); }
+    outline-color: rgba(255, 255, 255, 0.5); }
     GtkColorSwatch.color-dark:backdrop {
       color: rgba(255, 255, 255, 0.3); }
   GtkColorSwatch.color-light {
     color: black;
-    outline-color: rgba(255, 255, 255, 0.5); }
+    outline-color: rgba(0, 0, 0, 0.5); }
     GtkColorSwatch.color-light:backdrop {
       color: rgba(0, 0, 0, 0.3); }
   GtkColorSwatch.overlay, GtkColorSwatch.overlay:selected {
@@ -4507,6 +4485,19 @@
 /********
  * Misc *
  ********/
+.content-view {
+  background-color: #b4b4b4; }
+  .content-view:hover {
+    -gtk-image-effect: highlight; }
+  .content-view:backdrop {
+    background-color: #b4b4b4; }
+
+.osd .scale-popup .button.flat, .osd .scale-popup .sidebar-button.button, .osd .scale-popup .header-bar .titlebutton.button, .header-bar .osd .scale-popup .titlebutton.button,
+.osd .scale-popup .titlebar .titlebutton.button,
+.titlebar .osd .scale-popup .titlebutton.button {
+  padding: 6px;
+  border-style: none;
+  border-radius: 5px; }
 .scale-popup .button, .scale-popup .header-bar .button.titlebutton, .header-bar .scale-popup .button.titlebutton,
 .scale-popup .titlebar .button.titlebutton,
 .titlebar .scale-popup .button.titlebutton {
@@ -4515,10 +4506,6 @@
     background-color: rgba(22, 22, 22, 0.1);
     border-radius: 5px; }
 
-GtkVolumeButton.button, .header-bar GtkVolumeButton.button.titlebutton,
-.titlebar GtkVolumeButton.button.titlebutton {
-  padding: 8px; }
-
 /**********************
  * Window Decorations *
  *********************/
@@ -4536,7 +4523,7 @@
     box-shadow: none; }
   .window-frame.ssd {
     box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.23); }
-  .window-frame.csd .popup {
+  .window-frame.csd.popup {
     border-radius: 0;
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13); }
   .window-frame.csd.tooltip {
@@ -4568,24 +4555,216 @@
   .titlebar.selection-mode .titlebutton.button:backdrop {
     icon-shadow: none; }
 
-.view:selected, GtkCalendar:selected, .label:selected, .label:selected:focus, .label:selected:hover, .grid-child:selected, .entry:selected, .entry:selected:focus, .menuitem.button.flat:selected, .header-bar .menuitem.titlebutton.button:selected,
-.titlebar .menuitem.titlebutton.button:selected, .list-row:selected, .sidebar:selected, GtkPlacesSidebar.sidebar .view:selected, GtkPlacesSidebar.sidebar GtkCalendar:selected {
+.view:selected, GtkCalendar:selected, .label:selected, .label:selected:focus, .label:selected:hover, .grid-child:selected, .entry:selected, .entry:selected:focus, .menuitem.button.flat:selected, .menuitem.sidebar-button.button:selected, .header-bar .menuitem.titlebutton.button:selected,
+.titlebar .menuitem.titlebutton.button:selected, .list-row:selected, .sidebar:selected {
   background-color: #5E7F3E;
   color: #ffffff;
   outline-color: rgba(255, 255, 255, 0.3); }
-  .view:backdrop:selected, GtkCalendar:backdrop:selected, .label:backdrop:selected, .grid-child:backdrop:selected, .entry:backdrop:selected, .menuitem.button.flat:backdrop:selected, .header-bar .menuitem.titlebutton.button:backdrop:selected,
-  .titlebar .menuitem.titlebutton.button:backdrop:selected, .list-row:backdrop:selected, .sidebar:backdrop:selected, GtkPlacesSidebar.sidebar .view:backdrop:selected, GtkPlacesSidebar.sidebar GtkCalendar:backdrop:selected {
-    color: #ffffff;
-    background-color: #5f5f5f; }
-
-/* Decouple the font of context menus from their entry/textview */
-.touch-selection,
-.context-menu {
-  font: initial; }
+  .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: #afbf9f; }
+  .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: #8ea578; }
 
 .monospace {
   font: Monospace; }
 
+/**********************
+ * Touch Copy & Paste *
+ *********************/
+.entry.cursor-handle,
+.cursor-handle {
+  background-color: transparent;
+  background-image: none;
+  box-shadow: none;
+  border-style: none; }
+  .entry.cursor-handle.top:dir(ltr), .entry.cursor-handle.bottom:dir(rtl),
+  .cursor-handle.top:dir(ltr),
+  .cursor-handle.bottom:dir(rtl) {
+    -gtk-icon-source: -gtk-scaled(url("assets/text-select-start.png"), url("assets/text-select-start@2.png"));
+    padding-left: 10px; }
+  .entry.cursor-handle.bottom:dir(ltr), .entry.cursor-handle.top:dir(rtl),
+  .cursor-handle.bottom:dir(ltr),
+  .cursor-handle.top:dir(rtl) {
+    -gtk-icon-source: -gtk-scaled(url("assets/text-select-end.png"), url("assets/text-select-end@2.png"));
+    padding-right: 10px; }
+  .entry.cursor-handle.insertion-cursor:dir(ltr), .entry.cursor-handle.insertion-cursor:dir(rtl),
+  .cursor-handle.insertion-cursor:dir(ltr),
+  .cursor-handle.insertion-cursor:dir(rtl) {
+    -gtk-icon-source: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above.png"), url("assets/slider-horz-scale-has-marks-above@2.png")); }
+  .entry.cursor-handle.top:hover:dir(ltr), .entry.cursor-handle.bottom:hover:dir(rtl),
+  .cursor-handle.top:hover:dir(ltr),
+  .cursor-handle.bottom:hover:dir(rtl) {
+    -gtk-icon-source: -gtk-scaled(url("assets/text-select-start-hover.png"), url("assets/text-select-start-hover@2.png"));
+    padding-left: 10px; }
+  .entry.cursor-handle.bottom:hover:dir(ltr), .entry.cursor-handle.top:hover:dir(rtl),
+  .cursor-handle.bottom:hover:dir(ltr),
+  .cursor-handle.top:hover:dir(rtl) {
+    -gtk-icon-source: -gtk-scaled(url("assets/text-select-end-hover.png"), url("assets/text-select-end-hover@2.png"));
+    padding-right: 10px; }
+  .entry.cursor-handle.insertion-cursor:hover:dir(ltr), .entry.cursor-handle.insertion-cursor:hover:dir(rtl),
+  .cursor-handle.insertion-cursor:hover:dir(ltr),
+  .cursor-handle.insertion-cursor:hover:dir(rtl) {
+    -gtk-icon-source: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-hover.png"), url("assets/slider-horz-scale-has-marks-above-hover@2.png")); }
+  .entry.cursor-handle.top:active:dir(ltr), .entry.cursor-handle.bottom:active:dir(rtl),
+  .cursor-handle.top:active:dir(ltr),
+  .cursor-handle.bottom:active:dir(rtl) {
+    -gtk-icon-source: -gtk-scaled(url("assets/text-select-start-active.png"), url("assets/text-select-start-active@2.png"));
+    padding-left: 10px; }
+  .entry.cursor-handle.bottom:active:dir(ltr), .entry.cursor-handle.top:active:dir(rtl),
+  .cursor-handle.bottom:active:dir(ltr),
+  .cursor-handle.top:active:dir(rtl) {
+    -gtk-icon-source: -gtk-scaled(url("assets/text-select-end-active.png"), url("assets/text-select-end-active@2.png"));
+    padding-right: 10px; }
+  .entry.cursor-handle.insertion-cursor:active:dir(ltr), .entry.cursor-handle.insertion-cursor:active:dir(rtl),
+  .cursor-handle.insertion-cursor:active:dir(ltr),
+  .cursor-handle.insertion-cursor:active:dir(rtl) {
+    -gtk-icon-source: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-active.png"), url("assets/slider-horz-scale-has-marks-above-active@2.png")); }
+
+/* Decouple the font of context menus from their entry/textview */
+.context-menu {
+  font: initial; }
+
+.touch-selection {
+  font: initial;
+  color: #eeeeec;
+  border: none;
+  background-color: rgba(32, 37, 38, 0.9);
+  background-clip: padding-box;
+  outline-color: rgba(238, 238, 236, 0.3);
+  box-shadow: none;
+  text-shadow: 0 1px black;
+  icon-shadow: 0 1px black; }
+  .touch-selection:backdrop {
+    text-shadow: none; }
+  .touch-selection .button, .touch-selection .header-bar .button.titlebutton, .header-bar .touch-selection .button.titlebutton,
+  .touch-selection .titlebar .button.titlebutton,
+  .titlebar .touch-selection .button.titlebutton {
+    color: #eeeeec;
+    border-color: rgba(0, 0, 0, 0.7);
+    background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
+    background-clip: padding-box;
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
+    text-shadow: 0 1px black;
+    icon-shadow: 0 1px black;
+    outline-color: rgba(238, 238, 236, 0.3); }
+    .touch-selection .button:hover {
+      color: white;
+      border-color: rgba(0, 0, 0, 0.7);
+      background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.7));
+      background-clip: padding-box;
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
+      text-shadow: 0 1px black;
+      icon-shadow: 0 1px black;
+      outline-color: rgba(238, 238, 236, 0.3); }
+    .touch-selection .button:active, .touch-selection .button:checked {
+      color: white;
+      border-color: rgba(0, 0, 0, 0.7);
+      background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
+      background-clip: padding-box;
+      box-shadow: none;
+      text-shadow: none;
+      icon-shadow: none;
+      outline-color: rgba(238, 238, 236, 0.3); }
+    .touch-selection .button:insensitive, .touch-selection .button:backdrop:insensitive {
+      color: #878a89;
+      border-color: rgba(0, 0, 0, 0.7);
+      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+      background-clip: padding-box;
+      box-shadow: none;
+      text-shadow: none;
+      icon-shadow: none; }
+    .touch-selection .button:backdrop {
+      color: #eeeeec;
+      border-color: rgba(0, 0, 0, 0.7);
+      background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
+      background-clip: padding-box;
+      box-shadow: none;
+      text-shadow: none;
+      icon-shadow: none; }
+  .touch-selection .check {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); }
+  .touch-selection .check:hover {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-hover-dark.png"), url("assets/checkbox-unchecked-hover-dark@2.png")); }
+  .touch-selection .check:active {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-active-dark.png"), url("assets/checkbox-unchecked-active-dark@2.png")); }
+  .touch-selection .check:insensitive {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); }
+  .touch-selection .check:inconsistent {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); }
+  .touch-selection .check:inconsistent:hover {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-hover-dark.png"), url("assets/checkbox-mixed-hover-dark@2.png")); }
+  .touch-selection .check:inconsistent:selected {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-active-dark.png"), url("assets/checkbox-mixed-active-dark@2.png")); }
+  .touch-selection .check:inconsistent:insensitive {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); }
+  .touch-selection .check:checked {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); }
+  .touch-selection .check:checked:insensitive {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); }
+  .touch-selection .check:checked:hover {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-hover-dark.png"), url("assets/checkbox-checked-hover-dark@2.png")); }
+  .touch-selection .check:checked:active {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-active-dark.png"), url("assets/checkbox-checked-active-dark@2.png")); }
+  .touch-selection .check:backdrop:checked {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-dark.png"), url("assets/checkbox-checked-backdrop-dark@2.png")); }
+  .touch-selection .radio {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); }
+  .touch-selection .radio:hover {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-hover-dark.png"), url("assets/radio-unchecked-hover-dark@2.png")); }
+  .touch-selection .radio:active {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-active-dark.png"), url("assets/radio-unchecked-active-dark@2.png")); }
+  .touch-selection .radio:insensitive {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); }
+  .touch-selection .radio:inconsistent {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); }
+  .touch-selection .radio:inconsistent:hover {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-hover-dark.png"), url("assets/radio-mixed-hover-dark@2.png")); }
+  .touch-selection .radio:inconsistent:selected {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active-dark.png"), url("assets/radio-mixed-active-dark@2.png")); }
+  .touch-selection .radio:inconsistent:insensitive {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); }
+  .touch-selection .radio:checked {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); }
+  .touch-selection .radio:checked:insensitive {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); }
+  .touch-selection .radio:checked:hover {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-hover-dark.png"), url("assets/radio-checked-hover-dark@2.png")); }
+  .touch-selection .radio:checked:active {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-active-dark.png"), url("assets/radio-checked-active-dark@2.png")); }
+  .touch-selection .radio:backdrop:checked {
+    icon-shadow: none;
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop-dark.png"), url("assets/radio-checked-backdrop-dark@2.png")); }
+
 .overshoot.top {
   background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#606060), to(rgba(96, 96, 96, 0))), -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(22, 22, 22, 0.07)), to(rgba(22, 22, 22, 0)));
   background-size: 100% 5%, 100% 100%;
@@ -4799,10 +4978,8 @@
  * when client-side decorations are in use and the application
  * did not set a custom titlebar.
  */
-.header-bar .separator, .header-bar GtkPlacesSidebar.sidebar .view .separator, GtkPlacesSidebar.sidebar .view .header-bar .separator,
-.titlebar .separator,
-.titlebar GtkPlacesSidebar.sidebar .view .separator,
-GtkPlacesSidebar.sidebar .view .titlebar .separator {
+.header-bar .separator,
+.titlebar .separator {
   border-width: 1px;
   border-style: solid;
   border-image: none;
@@ -4976,10 +5153,8 @@
 
 .titlebar .header-bar-separator, .titlebar > GtkBox > .separator.vertical,
 GtkPlacesSidebar.sidebar .view .titlebar > GtkBox > .vertical.separator:backdrop,
-GtkPlacesSidebar.sidebar .view .titlebar > GtkBox > .vertical.separator:backdrop,
 .header-bar .header-bar-separator,
 .header-bar > GtkBox > .separator.vertical,
-GtkPlacesSidebar.sidebar .view .header-bar > GtkBox > .vertical.separator:backdrop,
 GtkPlacesSidebar.sidebar .view .header-bar > GtkBox > .vertical.separator:backdrop {
   border-image: linear-gradient(to bottom, #575757, #575757 30%, #575757 70%, #575757 100%) 0 1/0 1px stretch; }
 
@@ -5035,10 +5210,10 @@
   background-color: #C6C6C6; }
 
 .entry, .linked.vertical > .entry, .linked.vertical > .entry:first-child, .linked.vertical > .entry:last-child {
-  background-image: linear-gradient(to bottom, #e8e8e8, #F0F0F0 90%);
+  background-image: linear-gradient(to bottom, #c7c7c7, #e8e8e8 3px, #F0F0F0 90%);
   background-color: #F0F0F0; }
   .entry:focus, .linked.vertical > .entry:focus, .linked.vertical > .entry:first-child:focus, .linked.vertical > .entry:last-child:focus {
-    background-image: linear-gradient(to bottom, #e8e8e8, #F0F0F0 90%); }
+    background-image: linear-gradient(to bottom, #c7c7c7, #e8e8e8 3px, #F0F0F0 90%); }
   .entry:insensitive, .linked.vertical > .entry:insensitive, .linked.vertical > .entry:first-child:insensitive, .linked.vertical > .entry:last-child:insensitive {
     background-image: linear-gradient(to bottom, #c6c6c6); }
   .entry:backdrop, .linked.vertical > .entry:backdrop, .linked.vertical > .entry:first-child:backdrop, .linked.vertical > .entry:last-child:backdrop {
@@ -5107,7 +5282,7 @@
   }
 }*/
 /*GtkPlacesSidebar .separator { color: $insensitive_fg_color; }*/
-.view.rubberband {
+.view.rubberband, GtkTreeView.view.rubberband {
   background-color: rgba(94, 127, 62, 0.2); }
 
 .menubar {
@@ -5209,3 +5384,21 @@
  */
 GtkTextView {
   background-color: #eee; }
+
+/*
+ * Fix GTK3.18 change that makes .list-row.button items look like buttons
+ */
+.list-row.button, .header-bar .list-row.button.titlebutton,
+.titlebar .list-row.button.titlebutton,
+.list-row.button:backdrop,
+.list-row.button:backdrop:active,
+.list-row.button:backdrop:checked,
+.list-row.button:backdrop:insensitive,
+.list-row.button:backdrop:insensitive:active,
+.list-row.button:backdrop:insensitive:checked,
+.list-row.button:insensitive:active,
+.list-row.button:insensitive:checked {
+  background-color: rgba(198, 198, 198, 0);
+  border-style: none;
+  border-radius: 0;
+  box-shadow: none; }
--- a/gtk-3.0/gtk.scss	Sat Jul 09 11:48:31 2016 +0100
+++ b/gtk-3.0/gtk.scss	Sat Jul 09 15:25:37 2016 +0100
@@ -527,6 +527,7 @@
 
 
 /* Fix Meld dialog buttons and try not to break anything else */
+/* FIXME GTK3.18 theme update broke this when used with GTK3.16 */
 .message-dialog.csd .dialog-action-area .button {
   border-bottom-style: solid;
   &:last-child {
@@ -578,4 +579,25 @@
  */
 GtkTextView {
     background-color: #eee
+}
+
+/*
+ * Fix GTK3.18 change that makes .list-row.button items look like buttons
+ */
+.list-row.button,
+.list-row.button:backdrop,
+.list-row.button:backdrop:active,
+.list-row.button:backdrop:checked,
+.list-row.button:backdrop:insensitive,
+.list-row.button:backdrop:insensitive:active,
+.list-row.button:backdrop:insensitive:checked,
+.list-row.button:insensitive:active,
+.list-row.button:insensitive:checked {
+  // reset button inherited stuff
+  @extend %undecorated_button;
+  background-color: transparentize($base_color,1); // for the transition
+  border-style: none; // I need no borders here
+  border-radius: 0;   // and no rounded corners
+  box-shadow: none;   // and no box-shadow
+
 }
\ No newline at end of file