diff gtk-3.0/gtk.css @ 22:cb3e1a45b770

Restore gtk-3.0 to v3.16 (openSUSE 42.1) and add gtk-3.18 dir
author IBBoard <dev@ibboard.co.uk>
date Sun, 02 Oct 2016 20:29:24 +0100
parents 14918ee8ecd1
children 279a2801a81b
line wrap: on
line diff
--- a/gtk-3.0/gtk.css	Sun Oct 02 19:35:20 2016 +0100
+++ b/gtk-3.0/gtk.css	Sun Oct 02 20:29:24 2016 +0100
@@ -17,7 +17,7 @@
   -GtkWidget-focus-padding: 2;
   -GtkWidget-focus-line-width: 1;
   -GtkWidget-text-handle-width: 20;
-  -GtkWidget-text-handle-height: 24;
+  -GtkWidget-text-handle-height: 20;
   -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, GtkTreeView.view.rubberband, .content-view.rubberband {
-  border: 1px solid #455d2d;
-  background-color: rgba(69, 93, 45, 0.2); }
-
-.label.separator {
+.rubberband, .content-view.rubberband {
+  border: 1px solid #5E7F3E;
+  background-color: rgba(94, 127, 62, 0.2); }
+
+.label.separator, GtkPlacesSidebar.sidebar .view .label.separator {
   color: #161616; }
-  .label.separator:backdrop {
+  .label.separator:backdrop, GtkPlacesSidebar.sidebar .view .label.separator:backdrop {
     color: #6e6e6e; }
 .label:insensitive {
   color: #6e6e6e; }
   .label:insensitive:backdrop {
     color: #a0a0a0; }
 
-.dim-label, .label.separator, .titlebar .subtitle,
+.dim-label, .label.separator, GtkPlacesSidebar.sidebar .view .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 .scale-popup, .osd {
+.app-notification.frame, .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 .scale-popup:backdrop, .osd:backdrop {
+  .popover.osd:backdrop, .app-notification: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, #ababab, #c1c1c1 3px, #C6C6C6 90%);
+  background-image: linear-gradient(to bottom, #bebebe, #C6C6C6 90%);
   color: black;
   border-color: #7a7a7a;
-  box-shadow: inset 0 0 0 1px rgba(94, 127, 62, 0), 0 1px rgba(255, 255, 255, 0.1); }
+  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); }
   .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, #ababab, #c1c1c1 3px, #C6C6C6 90%);
+    background-image: linear-gradient(to bottom, #bebebe, #C6C6C6 90%);
     color: black;
     border-color: #7a7a7a;
-    box-shadow: inset 0 0 0 1px rgba(94, 127, 62, 0);
+    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: none;
     border-radius: 0; }
   .entry:focus {
     background-color: transparent;
-    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);
+    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);
     border-color: #5E7F3E; }
   .entry:insensitive {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #ababab, #c1c1c1 3px, #C6C6C6 90%);
+    background-image: linear-gradient(to bottom, #bebebe, #C6C6C6 90%);
     color: #6e6e6e;
     border-color: #7a7a7a;
     background-image: linear-gradient(to bottom, #c6c6c6);
-    box-shadow: 0 1px rgba(255, 255, 255, 0.1); }
+    box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(255, 255, 255, 0.1); }
   .entry:backdrop {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #ababab, #c1c1c1 3px, #C6C6C6 90%);
+    background-image: linear-gradient(to bottom, #bebebe, #C6C6C6 90%);
     color: #272727;
     border-color: #828282;
     background-image: linear-gradient(to bottom, #c3c3c3);
-    box-shadow: 0 1px rgba(255, 255, 255, 0); }
+    box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(255, 255, 255, 0); }
   .entry:backdrop:insensitive {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #ababab, #c1c1c1 3px, #C6C6C6 90%);
+    background-image: linear-gradient(to bottom, #bebebe, #C6C6C6 90%);
     color: #a0a0a0;
     border-color: #828282;
     background-image: linear-gradient(to bottom, #c6c6c6);
-    box-shadow: 0 1px rgba(255, 255, 255, 0); }
+    box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(255, 255, 255, 0); }
   .entry.progressbar {
     margin: 1px;
     border-radius: 0;
@@ -212,15 +212,26 @@
     box-shadow: none; }
     .entry.progressbar:backdrop {
       background-color: transparent; }
-  .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; }
+  .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; }
   .entry.error {
     color: #cc0000;
     border-color: #cc0000; }
     .entry.error:focus {
       background-color: transparent;
-      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);
+      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);
       border-color: #cc0000; }
     .entry.error:selected, .entry.error:selected:focus {
       background-color: #cc0000; }
@@ -229,8 +240,8 @@
     border-color: #f57900; }
     .entry.warning:focus {
       background-color: transparent;
-      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);
+      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);
       border-color: #f57900; }
     .entry.warning:selected, .entry.warning:selected:focus {
       background-color: #f57900; }
@@ -242,9 +253,114 @@
       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, #ababab, #c1c1c1 3px, #C6C6C6 90%);
+    background-image: linear-gradient(to bottom, #bebebe, #C6C6C6 90%);
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
@@ -254,17 +370,17 @@
     icon-shadow: 0 1px black; }
     .osd .entry:focus {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #ababab, #c1c1c1 3px, #C6C6C6 90%);
+      background-image: linear-gradient(to bottom, #bebebe, #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 #5E7F3E;
+      box-shadow: inset 0 0 0 1px rgba(94, 127, 62, 0.15);
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black; }
     .osd .entry:backdrop {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #ababab, #c1c1c1 3px, #C6C6C6 90%);
+      background-image: linear-gradient(to bottom, #bebebe, #C6C6C6 90%);
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
@@ -274,7 +390,7 @@
       icon-shadow: none; }
     .osd .entry:insensitive {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #ababab, #c1c1c1 3px, #C6C6C6 90%);
+      background-image: linear-gradient(to bottom, #bebebe, #C6C6C6 90%);
       color: #878a89;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
@@ -283,27 +399,6 @@
       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 *
  ***********/
@@ -325,7 +420,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, .sidebar-button.button, .header-bar .titlebutton.button,
+  .button.flat, .header-bar .titlebutton.button,
   .titlebar .titlebutton.button {
     border-color: transparent;
     background-color: transparent;
@@ -334,11 +429,11 @@
     text-shadow: none;
     icon-shadow: none;
     transition: none; }
-    .button.flat:hover, .sidebar-button.button:hover, .header-bar .titlebutton.button:hover,
+    .button.flat: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, .sidebar-button.button:hover:active, .header-bar .titlebutton.button:hover:active,
+      .button.flat: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,
@@ -363,7 +458,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, .sidebar-button.button:backdrop, .header-bar .titlebutton.button:backdrop,
+  .titlebar .button.titlebutton:backdrop, .button.flat:backdrop, .header-bar .titlebutton.button:backdrop,
   .titlebar .titlebutton.button:backdrop {
     color: #6e6e6e;
     border-color: #828282;
@@ -372,14 +467,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, .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,
+    .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,
     .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, .sidebar-button.button:backdrop:insensitive, .header-bar .titlebutton.button:backdrop:insensitive,
+    .button:backdrop:insensitive, .button.flat:backdrop:insensitive, .header-bar .titlebutton.button:backdrop:insensitive,
     .titlebar .titlebutton.button:backdrop:insensitive {
       color: #a0a0a0;
       border-color: #828282;
@@ -388,11 +483,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, .sidebar-button.button:backdrop:insensitive > .label, .header-bar .titlebutton.button:backdrop:insensitive > .label,
+      .titlebar .button.titlebutton:backdrop:insensitive > .label, .button.flat:backdrop:insensitive > .label, .header-bar .titlebutton.button:backdrop:insensitive > .label,
       .titlebar .titlebutton.button:backdrop:insensitive > .label {
         color: inherit; }
-    .button:backdrop:insensitive:active, .button:backdrop:insensitive:checked, .button.flat:backdrop:insensitive:active, .sidebar-button.button:backdrop:insensitive:active, .header-bar .titlebutton.button:backdrop:insensitive:active,
-    .titlebar .titlebutton.button:backdrop:insensitive:active, .button.flat:backdrop:insensitive:checked, .sidebar-button.button:backdrop:insensitive:checked, .header-bar .titlebutton.button:backdrop:insensitive:checked,
+    .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,
     .titlebar .titlebutton.button:backdrop:insensitive:checked {
       color: #a0a0a0;
       border-color: #828282;
@@ -400,13 +495,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, .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 .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 .titlebutton.button:backdrop:insensitive:checked > .label {
         color: inherit; }
-  .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,
+  .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,
   .titlebar .titlebutton.button:backdrop:insensitive {
     border-color: transparent;
     background-color: transparent;
@@ -449,8 +544,7 @@
     outline-color: rgba(238, 238, 236, 0.3);
     border: none;
     box-shadow: none; }
-    .button.osd.image-button, GtkScaleButton.button.osd,
-    GtkVolumeButton.button.osd, .header-bar .osd.titlebutton.button,
+    .button.osd.image-button, .header-bar .osd.titlebutton.button,
     .titlebar .osd.titlebutton.button {
       padding: 13px; }
     .button.osd:hover {
@@ -554,7 +648,7 @@
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none; }
-    .osd .button.flat, .osd .sidebar-button.button, .osd .header-bar .titlebutton.button, .header-bar .osd .titlebutton.button,
+    .osd .button.flat, .osd .header-bar .titlebutton.button, .header-bar .osd .titlebutton.button,
     .osd .titlebar .titlebutton.button,
     .titlebar .osd .titlebutton.button {
       border-color: transparent;
@@ -566,7 +660,7 @@
       box-shadow: none;
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black; }
-      .osd .button.flat:hover, .osd .sidebar-button.button:hover, .osd .header-bar .titlebutton.button:hover, .header-bar .osd .titlebutton.button:hover,
+      .osd .button.flat: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;
@@ -580,7 +674,7 @@
         background-clip: padding-box;
         border-color: transparent;
         box-shadow: none; }
-      .osd .button.flat:insensitive, .osd .sidebar-button.button:insensitive, .osd .header-bar .titlebutton.button:insensitive, .header-bar .osd .titlebutton.button:insensitive,
+      .osd .button.flat: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;
@@ -593,7 +687,7 @@
         background-image: none;
         border-color: transparent;
         box-shadow: none; }
-      .osd .button.flat:backdrop, .osd .sidebar-button.button:backdrop, .osd .header-bar .titlebutton.button:backdrop, .header-bar .osd .titlebutton.button:backdrop,
+      .osd .button.flat: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;
@@ -602,9 +696,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 .sidebar-button.button:active, .osd .header-bar .titlebutton.button:active, .header-bar .osd .titlebutton.button:active,
+      .osd .button.flat: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 .sidebar-button.button:checked, .osd .header-bar .titlebutton.button:checked, .header-bar .osd .titlebutton.button:checked,
+      .titlebar .osd .titlebutton.button:active, .osd .button.flat: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;
@@ -627,7 +721,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, .suggested-action.sidebar-button.button, .header-bar .suggested-action.titlebutton.button,
+    .button.suggested-action.flat, .header-bar .suggested-action.titlebutton.button,
     .titlebar .suggested-action.titlebutton.button {
       border-color: transparent;
       background-color: transparent;
@@ -652,7 +746,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, .suggested-action.sidebar-button.button:backdrop, .header-bar .suggested-action.titlebutton.button:backdrop,
+    .button.suggested-action:backdrop, .button.suggested-action.flat:backdrop, .header-bar .suggested-action.titlebutton.button:backdrop,
     .titlebar .suggested-action.titlebutton.button:backdrop {
       color: #dfe5d8;
       border-color: #5E7F3E;
@@ -660,14 +754,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, .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,
+      .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,
       .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, .suggested-action.sidebar-button.button:backdrop:insensitive, .header-bar .suggested-action.titlebutton.button:backdrop:insensitive,
+      .button.suggested-action:backdrop:insensitive, .button.suggested-action.flat:backdrop:insensitive, .header-bar .suggested-action.titlebutton.button:backdrop:insensitive,
       .titlebar .suggested-action.titlebutton.button:backdrop:insensitive {
         color: #a0a0a0;
         border-color: #828282;
@@ -676,11 +770,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, .suggested-action.sidebar-button.button: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, .header-bar .suggested-action.titlebutton.button:backdrop:insensitive > .label,
         .titlebar .suggested-action.titlebutton.button:backdrop:insensitive > .label {
           color: inherit; }
-        .button.suggested-action:backdrop:insensitive:active, .button.suggested-action:backdrop:insensitive:checked, .button.suggested-action.flat:backdrop:insensitive:active, .suggested-action.sidebar-button.button:backdrop:insensitive:active, .header-bar .suggested-action.titlebutton.button:backdrop:insensitive:active,
-        .titlebar .suggested-action.titlebutton.button:backdrop:insensitive:active, .button.suggested-action.flat:backdrop:insensitive:checked, .suggested-action.sidebar-button.button:backdrop:insensitive:checked, .header-bar .suggested-action.titlebutton.button:backdrop:insensitive:checked,
+        .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,
         .titlebar .suggested-action.titlebutton.button:backdrop:insensitive:checked {
           color: #98a988;
           border-color: #617a48;
@@ -688,13 +782,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, .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.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.titlebutton.button:backdrop:insensitive:checked > .label {
             color: inherit; }
-    .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,
+    .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,
     .titlebar .suggested-action.titlebutton.button:backdrop:insensitive {
       border-color: transparent;
       background-color: transparent;
@@ -774,7 +868,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, .destructive-action.sidebar-button.button, .header-bar .destructive-action.titlebutton.button,
+    .button.destructive-action.flat, .header-bar .destructive-action.titlebutton.button,
     .titlebar .destructive-action.titlebutton.button {
       border-color: transparent;
       background-color: transparent;
@@ -799,7 +893,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, .destructive-action.sidebar-button.button:backdrop, .header-bar .destructive-action.titlebutton.button:backdrop,
+    .button.destructive-action:backdrop, .button.destructive-action.flat:backdrop, .header-bar .destructive-action.titlebutton.button:backdrop,
     .titlebar .destructive-action.titlebutton.button:backdrop {
       color: #fcd4d4;
       border-color: #ef2929;
@@ -807,14 +901,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, .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,
+      .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,
       .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, .destructive-action.sidebar-button.button:backdrop:insensitive, .header-bar .destructive-action.titlebutton.button:backdrop:insensitive,
+      .button.destructive-action:backdrop:insensitive, .button.destructive-action.flat:backdrop:insensitive, .header-bar .destructive-action.titlebutton.button:backdrop:insensitive,
       .titlebar .destructive-action.titlebutton.button:backdrop:insensitive {
         color: #a0a0a0;
         border-color: #828282;
@@ -823,11 +917,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, .destructive-action.sidebar-button.button: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, .header-bar .destructive-action.titlebutton.button:backdrop:insensitive > .label,
         .titlebar .destructive-action.titlebutton.button:backdrop:insensitive > .label {
           color: inherit; }
-        .button.destructive-action:backdrop:insensitive:active, .button.destructive-action:backdrop:insensitive:checked, .button.destructive-action.flat:backdrop:insensitive:active, .destructive-action.sidebar-button.button:backdrop:insensitive:active, .header-bar .destructive-action.titlebutton.button:backdrop:insensitive:active,
-        .titlebar .destructive-action.titlebutton.button:backdrop:insensitive:active, .button.destructive-action.flat:backdrop:insensitive:checked, .destructive-action.sidebar-button.button:backdrop:insensitive:checked, .header-bar .destructive-action.titlebutton.button:backdrop:insensitive:checked,
+        .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,
         .titlebar .destructive-action.titlebutton.button:backdrop:insensitive:checked {
           color: #ef7575;
           border-color: #e62a2a;
@@ -835,13 +929,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, .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.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.titlebutton.button:backdrop:insensitive:checked > .label {
             color: inherit; }
-    .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,
+    .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,
     .titlebar .destructive-action.titlebutton.button:backdrop:insensitive {
       border-color: transparent;
       background-color: transparent;
@@ -912,25 +1006,20 @@
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none; }
-  .button.image-button, GtkScaleButton.button,
-  GtkVolumeButton.button, .header-bar .titlebutton.button,
+  .button.image-button, .header-bar .titlebutton.button,
   .titlebar .titlebutton.button {
     padding: 8px; }
-  .button.text-button, GtkScaleButton.button.text-button,
-  GtkVolumeButton.button.text-button, .header-bar .text-button.button.titlebutton,
+  .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, GtkScaleButton.button.text-button,
-  GtkVolumeButton.button.text-button, .header-bar .text-button.titlebutton.button,
+  .button.text-button.image-button, .header-bar .text-button.titlebutton.button,
   .titlebar .text-button.titlebutton.button {
     padding: 5px 8px 6px; }
-    .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,
+    .button.text-button.image-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, GtkScaleButton.button.text-button .label:last-child,
-    GtkVolumeButton.button.text-button .label:last-child, .header-bar .text-button.titlebutton.button .label:last-child,
+    .button.text-button.image-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,
@@ -948,8 +1037,7 @@
     .stack-switcher > .button.text-button, .header-bar .stack-switcher > .text-button.button.titlebutton,
     .titlebar .stack-switcher > .text-button.button.titlebutton {
       padding: 5px 10px 6px; }
-    .stack-switcher > .button.image-button, .stack-switcher > GtkScaleButton.button,
-    .stack-switcher > GtkVolumeButton.button, .header-bar .stack-switcher > .titlebutton.button,
+    .stack-switcher > .button.image-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 {
@@ -1059,156 +1147,131 @@
     .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.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.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 .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, .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,
+.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,
 .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, .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) {
+.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) {
   border-radius: 0;
-  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,
+  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,
 .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, .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,
+.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,
 .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, .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,
+.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,
 .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, .linked > GtkComboBox:only-child > .the-button-in-the-combobox,
-.linked > GtkComboBoxText:only-child > .the-button-in-the-combobox {
+.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 {
   border-radius: 3px;
   border-style: solid; }
 
-.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;
+.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;
   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 > .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; }
+.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; }
 .linked.vertical > .entry:last-child, .linked.vertical > .button:last-child, .header-bar .linked.vertical > .button.titlebutton:last-child,
-.titlebar .linked.vertical > .button.titlebutton:last-child, .linked.vertical > GtkComboBoxText:last-child > .the-button-in-the-combobox,
-.linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox {
-  border-bottom-left-radius: 3px;
-  border-bottom-right-radius: 3px;
-  border-style: solid; }
+.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; }
 .linked.vertical > .entry:only-child, .linked.vertical > .button:only-child, .header-bar .linked.vertical > .button.titlebutton:only-child,
-.titlebar .linked.vertical > .button.titlebutton:only-child, .linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox,
-.linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox {
+.titlebar .linked.vertical > .button.titlebutton:only-child, .linked.vertical > GtkComboBoxText:only-child > .button,
+.linked.vertical > GtkComboBox:only-child > .button {
   border-radius: 3px;
   border-style: solid; }
 
-.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,
+.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,
 .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, .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 .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,
@@ -1217,7 +1280,24 @@
 .list-row.button:backdrop:insensitive:active,
 .list-row.button:backdrop:insensitive:checked,
 .list-row.button:insensitive:active,
-.list-row.button:insensitive:checked {
+.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 {
   border-color: transparent;
   background-color: transparent;
   background-image: none;
@@ -1226,10 +1306,10 @@
   icon-shadow: none; }
 
 /* menu buttons */
-.menuitem.button.flat, .menuitem.sidebar-button.button, .header-bar .menuitem.titlebutton.button,
+.menuitem.button.flat, .header-bar .menuitem.titlebutton.button,
 .titlebar .menuitem.titlebutton.button {
   outline-offset: -1px; }
-  .menuitem.button.flat:hover, .menuitem.sidebar-button.button:hover, .header-bar .menuitem.titlebutton.button:hover,
+  .menuitem.button.flat:hover, .header-bar .menuitem.titlebutton.button:hover,
   .titlebar .menuitem.titlebutton.button:hover {
     background-color: #b4b4b4; }
 
@@ -1275,10 +1355,6 @@
   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 *
@@ -1486,9 +1562,11 @@
 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 > .the-button-in-the-combobox {
+  GtkComboBox > .button, .header-bar GtkComboBox > .button.titlebutton,
+  .titlebar GtkComboBox > .button.titlebutton {
     padding-top: 3px;
     padding-bottom: 4px; }
   GtkComboBox:insensitive {
@@ -1503,22 +1581,8 @@
     color: #a0a0a0; }
   GtkComboBox .menuitem {
     text-shadow: none; }
-  GtkComboBox .separator.vertical {
+  GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .view .vertical.separator, GtkPlacesSidebar.sidebar .view GtkComboBox .vertical.separator {
     -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 *
@@ -1582,8 +1646,10 @@
     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 {
+  .header-bar > GtkBox > .separator.vertical,
+  GtkPlacesSidebar.sidebar .view .header-bar > GtkBox > .vertical.separator:backdrop {
     -GtkWidget-wide-separators: true;
     -GtkWidget-separator-width: 1px;
     border-width: 0 1px;
@@ -1612,10 +1678,9 @@
       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 .sidebar-button.button,
+      .titlebar.selection-mode .button.flat,
       .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;
@@ -1642,11 +1707,10 @@
         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 .sidebar-button.button:backdrop,
+      .titlebar.selection-mode .button:backdrop, .titlebar.selection-mode .button.flat: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;
@@ -1656,27 +1720,24 @@
         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 .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 .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 .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 .sidebar-button.button:backdrop:insensitive,
+        .titlebar.selection-mode .button:backdrop:insensitive, .titlebar.selection-mode .button.flat: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;
@@ -1685,59 +1746,51 @@
           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 .sidebar-button.button: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 .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 .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 .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 .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 .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 .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 .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 .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 .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 .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;
@@ -2046,12 +2099,10 @@
 .menu {
   margin: 4px;
   padding: 0px;
-  background-color: #ffffff;
+  background-color: #C6C6C6;
   border: 1px solid #7a7a7a; }
   .csd .menu {
     border: none; }
-  .menu:backdrop {
-    background-color: white; }
   .menu .menuitem {
     text-shadow: none;
     padding: 4px; }
@@ -2064,7 +2115,7 @@
         color: #a0a0a0; }
     .menu .menuitem:backdrop, .menu .menuitem:backdrop:hover {
       color: #6e6e6e;
-      background-color: transparent; }
+      background-color: #c3c3c3; }
     .menu .menuitem.arrow {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
     .menu .menuitem.arrow:dir(rtl) {
@@ -2106,11 +2157,10 @@
   .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 .sidebar-button.button, .popover .header-bar .titlebutton.button, .header-bar .popover .titlebutton.button,
+  .popover .button.flat, .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,
@@ -2118,6 +2168,19 @@
     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          *
@@ -2474,7 +2537,6 @@
  **********/
 GtkSwitch {
   -GtkSwitch-slider-width: 45px;
-  -GtkSwitch-slider-height: 27px;
   font-weight: bold;
   font-size: smaller;
   outline-offset: -4px;
@@ -2583,7 +2645,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, .check.sidebar-button.button, .header-bar .check.titlebutton.button,
+  .check.button.flat, .header-bar .check.titlebutton.button,
   .titlebar .check.titlebutton.button {
     icon-shadow: none; }
 
@@ -2594,7 +2656,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, .check.sidebar-button.button:hover, .header-bar .check.titlebutton.button:hover,
+  .check:hover.button.flat, .header-bar .check.titlebutton.button:hover,
   .titlebar .check.titlebutton.button:hover {
     icon-shadow: none; }
 
@@ -2605,7 +2667,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, .check.sidebar-button.button:active, .header-bar .check.titlebutton.button:active,
+  .check:active.button.flat, .header-bar .check.titlebutton.button:active,
   .titlebar .check.titlebutton.button:active {
     icon-shadow: none; }
 
@@ -2616,7 +2678,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, .check.sidebar-button.button:insensitive, .header-bar .check.titlebutton.button:insensitive,
+  .check:insensitive.button.flat, .header-bar .check.titlebutton.button:insensitive,
   .titlebar .check.titlebutton.button:insensitive {
     icon-shadow: none; }
 
@@ -2627,7 +2689,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, .check.sidebar-button.button:backdrop, .header-bar .check.titlebutton.button:backdrop,
+  .check:backdrop.button.flat, .header-bar .check.titlebutton.button:backdrop,
   .titlebar .check.titlebutton.button:backdrop {
     icon-shadow: none; }
 
@@ -2638,7 +2700,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, .check.sidebar-button.button:backdrop:insensitive, .header-bar .check.titlebutton.button:backdrop:insensitive,
+  .check:backdrop:insensitive.button.flat, .header-bar .check.titlebutton.button:backdrop:insensitive,
   .titlebar .check.titlebutton.button:backdrop:insensitive {
     icon-shadow: none; }
 
@@ -2649,7 +2711,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, .check.sidebar-button.button:inconsistent, .header-bar .check.titlebutton.button:inconsistent,
+  .check:inconsistent.button.flat, .header-bar .check.titlebutton.button:inconsistent,
   .titlebar .check.titlebutton.button:inconsistent {
     icon-shadow: none; }
 
@@ -2660,7 +2722,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, .check.sidebar-button.button:inconsistent:hover, .header-bar .check.titlebutton.button:inconsistent:hover,
+  .check:inconsistent:hover.button.flat, .header-bar .check.titlebutton.button:inconsistent:hover,
   .titlebar .check.titlebutton.button:inconsistent:hover {
     icon-shadow: none; }
 
@@ -2671,7 +2733,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, .check.sidebar-button.button:inconsistent:selected, .header-bar .check.titlebutton.button:inconsistent:selected,
+  .check:inconsistent:selected.button.flat, .header-bar .check.titlebutton.button:inconsistent:selected,
   .titlebar .check.titlebutton.button:inconsistent:selected {
     icon-shadow: none; }
 
@@ -2682,7 +2744,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, .check.sidebar-button.button:inconsistent:backdrop, .header-bar .check.titlebutton.button:inconsistent:backdrop,
+  .check:inconsistent:backdrop.button.flat, .header-bar .check.titlebutton.button:inconsistent:backdrop,
   .titlebar .check.titlebutton.button:inconsistent:backdrop {
     icon-shadow: none; }
 
@@ -2693,7 +2755,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, .check.sidebar-button.button:inconsistent:insensitive, .header-bar .check.titlebutton.button:inconsistent:insensitive,
+  .check:inconsistent:insensitive.button.flat, .header-bar .check.titlebutton.button:inconsistent:insensitive,
   .titlebar .check.titlebutton.button:inconsistent:insensitive {
     icon-shadow: none; }
 
@@ -2704,7 +2766,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, .check.sidebar-button.button:inconsistent:insensitive:backdrop, .header-bar .check.titlebutton.button:inconsistent:insensitive:backdrop,
+  .check:inconsistent:insensitive:backdrop.button.flat, .header-bar .check.titlebutton.button:inconsistent:insensitive:backdrop,
   .titlebar .check.titlebutton.button:inconsistent:insensitive:backdrop {
     icon-shadow: none; }
 
@@ -2715,7 +2777,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, .check.sidebar-button.button:checked, .header-bar .check.titlebutton.button:checked,
+  .check:checked.button.flat, .header-bar .check.titlebutton.button:checked,
   .titlebar .check.titlebutton.button:checked {
     icon-shadow: none; }
 
@@ -2726,7 +2788,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, .check.sidebar-button.button:checked:insensitive, .header-bar .check.titlebutton.button:checked:insensitive,
+  .check:checked:insensitive.button.flat, .header-bar .check.titlebutton.button:checked:insensitive,
   .titlebar .check.titlebutton.button:checked:insensitive {
     icon-shadow: none; }
 
@@ -2737,7 +2799,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, .check.sidebar-button.button:checked:hover, .header-bar .check.titlebutton.button:checked:hover,
+  .check:checked:hover.button.flat, .header-bar .check.titlebutton.button:checked:hover,
   .titlebar .check.titlebutton.button:checked:hover {
     icon-shadow: none; }
 
@@ -2748,7 +2810,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, .check.sidebar-button.button:checked:active, .header-bar .check.titlebutton.button:checked:active,
+  .check:checked:active.button.flat, .header-bar .check.titlebutton.button:checked:active,
   .titlebar .check.titlebutton.button:checked:active {
     icon-shadow: none; }
 
@@ -2759,7 +2821,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, .check.sidebar-button.button:backdrop:checked, .header-bar .check.titlebutton.button:backdrop:checked,
+  .check:backdrop:checked.button.flat, .header-bar .check.titlebutton.button:backdrop:checked,
   .titlebar .check.titlebutton.button:backdrop:checked {
     icon-shadow: none; }
 
@@ -2770,7 +2832,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, .check.sidebar-button.button:backdrop:checked:insensitive, .header-bar .check.titlebutton.button:backdrop:checked:insensitive,
+  .check:backdrop:checked:insensitive.button.flat, .header-bar .check.titlebutton.button:backdrop:checked:insensitive,
   .titlebar .check.titlebutton.button:backdrop:checked:insensitive {
     icon-shadow: none; }
 
@@ -2794,7 +2856,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, .radio.sidebar-button.button, .header-bar .radio.titlebutton.button,
+  .radio.button.flat, .header-bar .radio.titlebutton.button,
   .titlebar .radio.titlebutton.button {
     icon-shadow: none; }
 
@@ -2805,7 +2867,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, .radio.sidebar-button.button:hover, .header-bar .radio.titlebutton.button:hover,
+  .radio:hover.button.flat, .header-bar .radio.titlebutton.button:hover,
   .titlebar .radio.titlebutton.button:hover {
     icon-shadow: none; }
 
@@ -2816,7 +2878,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, .radio.sidebar-button.button:active, .header-bar .radio.titlebutton.button:active,
+  .radio:active.button.flat, .header-bar .radio.titlebutton.button:active,
   .titlebar .radio.titlebutton.button:active {
     icon-shadow: none; }
 
@@ -2827,7 +2889,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, .radio.sidebar-button.button:insensitive, .header-bar .radio.titlebutton.button:insensitive,
+  .radio:insensitive.button.flat, .header-bar .radio.titlebutton.button:insensitive,
   .titlebar .radio.titlebutton.button:insensitive {
     icon-shadow: none; }
 
@@ -2838,7 +2900,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, .radio.sidebar-button.button:backdrop, .header-bar .radio.titlebutton.button:backdrop,
+  .radio:backdrop.button.flat, .header-bar .radio.titlebutton.button:backdrop,
   .titlebar .radio.titlebutton.button:backdrop {
     icon-shadow: none; }
 
@@ -2849,7 +2911,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, .radio.sidebar-button.button:backdrop:insensitive, .header-bar .radio.titlebutton.button:backdrop:insensitive,
+  .radio:backdrop:insensitive.button.flat, .header-bar .radio.titlebutton.button:backdrop:insensitive,
   .titlebar .radio.titlebutton.button:backdrop:insensitive {
     icon-shadow: none; }
 
@@ -2860,7 +2922,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, .radio.sidebar-button.button:inconsistent, .header-bar .radio.titlebutton.button:inconsistent,
+  .radio:inconsistent.button.flat, .header-bar .radio.titlebutton.button:inconsistent,
   .titlebar .radio.titlebutton.button:inconsistent {
     icon-shadow: none; }
 
@@ -2871,7 +2933,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, .radio.sidebar-button.button:inconsistent:hover, .header-bar .radio.titlebutton.button:inconsistent:hover,
+  .radio:inconsistent:hover.button.flat, .header-bar .radio.titlebutton.button:inconsistent:hover,
   .titlebar .radio.titlebutton.button:inconsistent:hover {
     icon-shadow: none; }
 
@@ -2882,7 +2944,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, .radio.sidebar-button.button:inconsistent:selected, .header-bar .radio.titlebutton.button:inconsistent:selected,
+  .radio:inconsistent:selected.button.flat, .header-bar .radio.titlebutton.button:inconsistent:selected,
   .titlebar .radio.titlebutton.button:inconsistent:selected {
     icon-shadow: none; }
 
@@ -2893,7 +2955,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, .radio.sidebar-button.button:inconsistent:backdrop, .header-bar .radio.titlebutton.button:inconsistent:backdrop,
+  .radio:inconsistent:backdrop.button.flat, .header-bar .radio.titlebutton.button:inconsistent:backdrop,
   .titlebar .radio.titlebutton.button:inconsistent:backdrop {
     icon-shadow: none; }
 
@@ -2904,7 +2966,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, .radio.sidebar-button.button:inconsistent:insensitive, .header-bar .radio.titlebutton.button:inconsistent:insensitive,
+  .radio:inconsistent:insensitive.button.flat, .header-bar .radio.titlebutton.button:inconsistent:insensitive,
   .titlebar .radio.titlebutton.button:inconsistent:insensitive {
     icon-shadow: none; }
 
@@ -2915,7 +2977,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, .radio.sidebar-button.button:inconsistent:insensitive:backdrop, .header-bar .radio.titlebutton.button:inconsistent:insensitive:backdrop,
+  .radio:inconsistent:insensitive:backdrop.button.flat, .header-bar .radio.titlebutton.button:inconsistent:insensitive:backdrop,
   .titlebar .radio.titlebutton.button:inconsistent:insensitive:backdrop {
     icon-shadow: none; }
 
@@ -2926,7 +2988,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, .radio.sidebar-button.button:checked, .header-bar .radio.titlebutton.button:checked,
+  .radio:checked.button.flat, .header-bar .radio.titlebutton.button:checked,
   .titlebar .radio.titlebutton.button:checked {
     icon-shadow: none; }
 
@@ -2937,7 +2999,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, .radio.sidebar-button.button:checked:insensitive, .header-bar .radio.titlebutton.button:checked:insensitive,
+  .radio:checked:insensitive.button.flat, .header-bar .radio.titlebutton.button:checked:insensitive,
   .titlebar .radio.titlebutton.button:checked:insensitive {
     icon-shadow: none; }
 
@@ -2948,7 +3010,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, .radio.sidebar-button.button:checked:hover, .header-bar .radio.titlebutton.button:checked:hover,
+  .radio:checked:hover.button.flat, .header-bar .radio.titlebutton.button:checked:hover,
   .titlebar .radio.titlebutton.button:checked:hover {
     icon-shadow: none; }
 
@@ -2959,7 +3021,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, .radio.sidebar-button.button:checked:active, .header-bar .radio.titlebutton.button:checked:active,
+  .radio:checked:active.button.flat, .header-bar .radio.titlebutton.button:checked:active,
   .titlebar .radio.titlebutton.button:checked:active {
     icon-shadow: none; }
 
@@ -2970,7 +3032,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, .radio.sidebar-button.button:backdrop:checked, .header-bar .radio.titlebutton.button:backdrop:checked,
+  .radio:backdrop:checked.button.flat, .header-bar .radio.titlebutton.button:backdrop:checked,
   .titlebar .radio.titlebutton.button:backdrop:checked {
     icon-shadow: none; }
 
@@ -2981,7 +3043,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, .radio.sidebar-button.button:backdrop:checked:insensitive, .header-bar .radio.titlebutton.button:backdrop:checked:insensitive,
+  .radio:backdrop:checked:insensitive.button.flat, .header-bar .radio.titlebutton.button:backdrop:checked:insensitive,
   .titlebar .radio.titlebutton.button:backdrop:checked:insensitive {
     icon-shadow: none; }
 
@@ -3010,42 +3072,47 @@
   .list-row .check:hover, list-row .radio:selected, list-row .radio:hover {
     icon-shadow: none; }
 
-.view.content-view.check:not(.list) {
+.content-view {
+  background-color: #b4b4b4; }
+  .content-view:backdrop {
+    background-color: #b4b4b4; }
+
+.view.content-view.check {
   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:not(.list) {
+.view.content-view.check:hover {
   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:not(.list) {
+.view.content-view.check:active {
   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:not(.list) {
+.view.content-view.check:backdrop {
   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:not(.list) {
+.view.content-view.check:checked {
   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:not(.list) {
+.view.content-view.check:checked:hover {
   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:not(.list) {
+.view.content-view.check:checked:active {
   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:not(.list) {
+.view.content-view.check:backdrop:checked {
   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; }
@@ -3258,43 +3325,11 @@
       .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;
-  color: alpha(currentColor,0.5); }
+  -GtkRange-trough-border: 2; }
   .scale.scale-has-marks-below.slider {
     border-style: none;
     border-radius: 0;
@@ -3347,8 +3382,7 @@
 .scale.scale-has-marks-above {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
-  -GtkRange-trough-border: 2;
-  color: alpha(currentColor,0.5); }
+  -GtkRange-trough-border: 2; }
   .scale.scale-has-marks-above.slider {
     border-style: none;
     border-radius: 0;
@@ -3401,8 +3435,7 @@
 .scale.vertical.scale-has-marks-below {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
-  -GtkRange-trough-border: 2;
-  color: alpha(currentColor,0.5); }
+  -GtkRange-trough-border: 2; }
   .scale.vertical.scale-has-marks-below.slider {
     border-style: none;
     border-radius: 0;
@@ -3455,8 +3488,7 @@
 .scale.vertical.scale-has-marks-above {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
-  -GtkRange-trough-border: 2;
-  color: alpha(currentColor,0.5); }
+  -GtkRange-trough-border: 2; }
   .scale.vertical.scale-has-marks-above.slider {
     border-style: none;
     border-radius: 0;
@@ -3589,6 +3621,10 @@
 /*************
  * 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;
@@ -3601,17 +3637,17 @@
     padding: 2px;
     border-radius: 3px;
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #ababab, #c1c1c1 3px, #C6C6C6 90%);
+    background-image: linear-gradient(to bottom, #bebebe, #C6C6C6 90%);
     color: black;
     border-color: #7a7a7a;
-    box-shadow: inset 0 0 0 1px rgba(94, 127, 62, 0), 0 1px rgba(255, 255, 255, 0.1); }
+    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); }
     .level-bar.trough:backdrop {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #ababab, #c1c1c1 3px, #C6C6C6 90%);
+      background-image: linear-gradient(to bottom, #bebebe, #C6C6C6 90%);
       color: #272727;
       border-color: #828282;
       background-image: linear-gradient(to bottom, #c3c3c3);
-      box-shadow: 0 1px rgba(255, 255, 255, 0); }
+      box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(255, 255, 255, 0); }
   .level-bar.fill-block {
     border: 1px solid #455d2d;
     background-color: #5E7F3E;
@@ -3658,18 +3694,19 @@
 GtkScrolledWindow GtkViewport.frame {
   border-style: none; }
 
-.separator {
+.separator, GtkPlacesSidebar.sidebar .view .separator,
+GtkPlacesSidebar.sidebar .view .separator:backdrop {
   color: rgba(0, 0, 0, 0.1); }
-  GtkFileChooserButton .separator.vertical, GtkFontButton .separator.vertical {
+  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 {
     -GtkWidget-wide-separators: true; }
 
 /*********
  * Lists *
  *********/
-.list {
+.list, .list-row {
   background-color: #C6C6C6;
   border-color: #7a7a7a; }
-  .list:backdrop {
+  .list:backdrop, .list-row:backdrop {
     background-color: #c3c3c3;
     border-color: #828282; }
 
@@ -3677,17 +3714,32 @@
 .grid-child {
   padding: 2px; }
 
-.list-row.activatable:hover, GtkPlacesSidebar.sidebar .has-open-popup {
-  background-color: rgba(22, 22, 22, 0.05); }
-.list-row.activatable:active {
+.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 {
   box-shadow: inset 0 2px 2px -2px rgba(0, 0, 0, 0.2); }
-.list-row.activatable:backdrop:hover, GtkPlacesSidebar.sidebar .has-open-popup:backdrop {
+.list-row.button:backdrop:hover {
   background-color: transparent; }
-.list-row.activatable:selected:active {
+.list-row.button:selected:active {
   box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); }
-.list-row.activatable:selected:hover, GtkPlacesSidebar.sidebar .has-open-popup:selected {
+.list-row.button:selected:hover {
   background-color: #57753a; }
-.list-row.activatable:selected:backdrop {
+.list-row.button:selected:backdrop {
   background-color: #5E7F3E; }
 
 .list-row:selected .button {
@@ -3699,7 +3751,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 .sidebar-button.button, .list-row:selected .header-bar .titlebutton.button, .header-bar .list-row:selected .titlebutton.button,
+  .list-row:selected .button.flat, .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;
@@ -3727,7 +3779,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 .sidebar-button.button: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 .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;
@@ -3737,9 +3789,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 .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 .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 .titlebar .titlebutton.button:backdrop:active,
-    .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,
+    .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,
     .list-row:selected .titlebar .titlebutton.button:backdrop:checked,
     .titlebar .list-row:selected .titlebutton.button:backdrop:checked {
       color: #6e6e6e;
@@ -3747,7 +3799,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 .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 .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 .titlebar .titlebutton.button:backdrop:insensitive,
     .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive {
       color: #a0a0a0;
@@ -3758,13 +3810,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 .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 .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 .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 .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 .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 .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 .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,
+      .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,
       .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive:checked,
       .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:checked {
         color: #a0a0a0;
@@ -3774,13 +3826,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 .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 .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 .titlebutton.button:backdrop:insensitive:active > .label,
-        .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:active > .label, .list-row:selected .button.flat:backdrop:insensitive:checked > .label, .list-row:selected .sidebar-button.button:backdrop:insensitive:checked > .label, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive:checked > .label, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:checked > .label,
+        .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,
         .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 .sidebar-button.button: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 .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;
@@ -3811,9 +3863,11 @@
       .list-row:selected .titlebar .button.titlebutton:insensitive:checked > .label {
         color: inherit; }
 
-.list-row {
-  transition: all 150ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
-  .list-row:hover {
+.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 {
     transition: none; }
 
 /*********************
@@ -3842,11 +3896,10 @@
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
     outline-color: rgba(238, 238, 236, 0.3); }
-    .app-notification .button.flat, .app-notification .sidebar-button.button, .app-notification .header-bar .titlebutton.button, .header-bar .app-notification .titlebutton.button,
+    .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.frame .sidebar-button.button,
     .app-notification.frame .header-bar .titlebutton.button,
     .header-bar .app-notification.frame .titlebutton.button,
     .app-notification.frame .titlebar .titlebutton.button,
@@ -3928,14 +3981,8 @@
     GtkCalendar.button:backdrop, .header-bar GtkCalendar.button.titlebutton:backdrop,
     .titlebar GtkCalendar.button.titlebutton:backdrop {
       color: rgba(110, 110, 110, 0.45); }
-    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 {
+  GtkCalendar:inconsistent, GtkCalendar:inconsistent:backdrop, GtkCalendar.highlight, GtkCalendar.highlight:backdrop {
     color: alpha(currentColor,0.55); }
-  GtkCalendar.highlight, GtkCalendar.highlight:backdrop {
-    font-size: smaller;
-    color: #161616; }
   GtkCalendar:backdrop {
     color: #272727;
     border-color: #828282; }
@@ -3946,180 +3993,182 @@
 .message-dialog .dialog-action-area .button {
   padding: 8px; }
 
-.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 {
+.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;
     color: #161616;
     outline-color: rgba(22, 22, 22, 0.3);
     border-color: #7a7a7a;
-    background-image: linear-gradient(to bottom, #afafaf, #b5b5b5 40%, #b9b9b9);
+    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(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(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.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 {
+    .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.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 {
+      .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.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);
+    .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.destructive-action:backdrop:insensitive {
-        color: #a0a0a0;
-        border-color: #828282;
+      .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.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.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 {
+        .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: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.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; }
 
 GtkFileChooserDialog .search-bar {
   background-color: #C6C6C6;
@@ -4138,43 +4187,31 @@
  ***********/
 .sidebar {
   border: none;
-  background-color: #c6c6c6; }
+  background-color: #b9b9b9; }
   .sidebar:backdrop {
     background-color: #b9b9b9; }
 
-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; }
+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; }
 
 .sidebar-item {
   padding: 10px 4px; }
@@ -4184,18 +4221,6 @@
   .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 *
  *********/
@@ -4388,9 +4413,6 @@
       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; }
@@ -4437,12 +4459,12 @@
       box-shadow: none; }
   GtkColorSwatch.color-dark {
     color: white;
-    outline-color: rgba(255, 255, 255, 0.5); }
+    outline-color: rgba(0, 0, 0, 0.3); }
     GtkColorSwatch.color-dark:backdrop {
       color: rgba(255, 255, 255, 0.3); }
   GtkColorSwatch.color-light {
     color: black;
-    outline-color: rgba(0, 0, 0, 0.5); }
+    outline-color: rgba(255, 255, 255, 0.5); }
     GtkColorSwatch.color-light:backdrop {
       color: rgba(0, 0, 0, 0.3); }
   GtkColorSwatch.overlay, GtkColorSwatch.overlay:selected {
@@ -4485,19 +4507,6 @@
 /********
  * 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 {
@@ -4506,6 +4515,10 @@
     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 *
  *********************/
@@ -4523,7 +4536,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 {
@@ -4555,216 +4568,24 @@
   .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, .menuitem.sidebar-button.button:selected, .header-bar .menuitem.titlebutton.button:selected,
-.titlebar .menuitem.titlebutton.button:selected, .list-row:selected, .sidebar: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, .header-bar .menuitem.titlebutton.button:selected,
+.titlebar .menuitem.titlebutton.button:selected, .list-row:selected, .sidebar:selected, GtkPlacesSidebar.sidebar .view:selected, GtkPlacesSidebar.sidebar GtkCalendar:selected {
   background-color: #5E7F3E;
   color: #ffffff;
   outline-color: rgba(255, 255, 255, 0.3); }
-  .view:insensitive:selected, GtkCalendar:insensitive:selected, .label:insensitive:selected, .grid-child:insensitive:selected, .entry:insensitive:selected, .menuitem.button.flat:insensitive:selected, .menuitem.sidebar-button.button:insensitive:selected, .header-bar .menuitem.titlebutton.button:insensitive:selected,
-  .titlebar .menuitem.titlebutton.button:insensitive:selected, .list-row:insensitive:selected, .sidebar:insensitive:selected, GtkPlacesSidebar.sidebar .list-row:selected:insensitive .label {
-    color: #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; }
+  .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; }
 
 .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%;
@@ -4978,8 +4799,10 @@
  * when client-side decorations are in use and the application
  * did not set a custom titlebar.
  */
-.header-bar .separator,
-.titlebar .separator {
+.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 {
   border-width: 1px;
   border-style: solid;
   border-image: none;
@@ -5100,12 +4923,6 @@
   text-shadow: none;
   icon-shadow: none; }
 
-.header-bar .titlebutton.button:backdrop:active,
-.titlebar .titlebutton.button:backdrop:active,
-.header-bar .titlebutton.button:backdrop:checked,
-.titlebar .titlebutton.button:backdrop:checked {
-  border-color: #303030; }
-
 .header-bar .suggested-action.button,
 .header-bar .suggested-action.titlebutton.button,
 .titlebar .suggested-action.titlebutton.button {
@@ -5159,8 +4976,10 @@
 
 .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; }
 
@@ -5216,10 +5035,10 @@
   background-color: #C6C6C6; }
 
 .entry, .linked.vertical > .entry, .linked.vertical > .entry:first-child, .linked.vertical > .entry:last-child {
-  background-image: linear-gradient(to bottom, #c7c7c7, #e8e8e8 3px, #F0F0F0 90%);
+  background-image: linear-gradient(to bottom, #e8e8e8, #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, #c7c7c7, #e8e8e8 3px, #F0F0F0 90%); }
+    background-image: linear-gradient(to bottom, #e8e8e8, #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 {
@@ -5288,7 +5107,7 @@
   }
 }*/
 /*GtkPlacesSidebar .separator { color: $insensitive_fg_color; }*/
-.view.rubberband, GtkTreeView.view.rubberband {
+.view.rubberband {
   background-color: rgba(94, 127, 62, 0.2); }
 
 .menubar {
@@ -5348,23 +5167,20 @@
   color: #dddddd; }
 
 /* Fix Meld dialog buttons and try not to break anything else */
-/* FIXME: These should really be joined, but as of v3.18 they're spaced
-.message-dialog.csd .dialog-action-area .button, .message-dialog.csd .dialog-action-area .button:backdrop, .message-dialog.csd .dialog-action-area .button:hover {
-  border-bottom-style: solid;
-  border-right-style: solid;
-  &:last-child {
+.message-dialog.csd .dialog-action-area .button {
+  border-bottom-style: solid; }
+  .message-dialog.csd .dialog-action-area .button:last-child {
     border-right-style: solid;
     border-top-right-radius: 7px; }
-  &:first-child {
+  .message-dialog.csd .dialog-action-area .button:first-child {
     border-left-style: solid;
     border-top-left-radius: 7px; }
-  &:hover, &:backdrop { border-bottom-style: solid; }
-}
+  .message-dialog.csd .dialog-action-area .button:hover, .message-dialog.csd .dialog-action-area .button:backdrop {
+    border-bottom-style: solid; }
 
 /* And put "linked" buttons back to Adwaita style */
 .message-dialog.csd .dialog-action-area.linked .button {
-  border-bottom-style: none;
-  border-right-style: solid; }
+  border-bottom-style: none; }
   .message-dialog.csd .dialog-action-area.linked .button:last-child {
     border-right-style: none;
     border-top-right-radius: 0; }
@@ -5393,21 +5209,3 @@
  */
 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; }