From b46f7223acfb5476f21089965a20e6f644742213 Mon Sep 17 00:00:00 2001
From: Lapo Calamandrei <calamandrei@gmail.com>
Date: Sat, 12 Mar 2016 15:03:07 +0100
Subject: [PATCH] Adwaita: scss cosmetic fixed

---
 gtk/theme/Adwaita/_common.scss           | 396 ++++++++++++++---------
 gtk/theme/Adwaita/gtk-contained-dark.css | 338 ++++++++++---------
 gtk/theme/Adwaita/gtk-contained.css      | 340 ++++++++++---------
 3 files changed, 583 insertions(+), 491 deletions(-)

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 417ea1e1fe..1226463733 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -48,10 +48,10 @@ $asset_suffix: if($variant=='dark', '-dark', '');
   background-color: $bg_color;
 
   &:backdrop {
-    text-shadow: none;
-    -gtk-icon-shadow: none;
     color: $backdrop_fg_color;
     background-color: $backdrop_bg_color;
+    text-shadow: none;
+    -gtk-icon-shadow: none;
   }
 }
 
@@ -62,28 +62,30 @@ $asset_suffix: if($variant=='dark', '-dark', '');
    Everytime a wildcard is used a kitten dies, painfully.
 */
 
-*:disabled {
-  -gtk-icon-effect: dim;
-}
+*:disabled { -gtk-icon-effect: dim; }
 
 .gtkstyle-fallback {
-  background-color: $bg_color;
   color: $fg_color;
+  background-color: $bg_color;
+
   &:hover {
+    color: $fg_color;
     background-color: lighten($bg_color, 10%);
-    color: $fg_color;
   }
+
   &:active {
-    background-color: darken($bg_color, 10%);
     color: $fg_color;
+    background-color: darken($bg_color, 10%);
   }
+
   &:disabled {
-    background-color: $insensitive_bg_color;
     color: $insensitive_fg_color;
+    background-color: $insensitive_bg_color;
   }
+
   &:selected {
-    background-color: $selected_bg_color;
     color: $selected_fg_color;
+    background-color: $selected_bg_color;
   }
 }
 
@@ -97,10 +99,12 @@ $asset_suffix: if($variant=='dark', '-dark', '');
     background-color: $backdrop_base_color;
   }
 
-  &:selected,
-  &:selected:focus {
-    @extend %selected_items;
-    border-radius: 3px;
+  &:selected {
+    &:focus, & {
+      @extend %selected_items;
+
+      border-radius: 3px;
+    }
   }
 }
 
@@ -109,8 +113,7 @@ textview {
   text {
     @extend %view;
 
-    selection,
-    selection:focus { @extend %selected_items; }
+    selection { &:focus, & { @extend %selected_items; }}
   }
 }
 
@@ -128,8 +131,10 @@ flowbox {
   flowboxchild {
     padding: 3px;
     border-radius: 3px;
+
     &:selected {
       @extend %selected_items;
+
       outline-offset: -2px;
     }
   }
@@ -137,20 +142,21 @@ flowbox {
 
 label {
   &.separator {
-    color: $fg_color;
     @extend .dim-label;
+
+    color: $fg_color;
+
     &:backdrop { color: $backdrop_fg_color; }
   }
 
   &:selected,
   selection,
   selection:focus,
-  selection:hover {
-    @extend %selected_items;
-  }
+  selection:hover { @extend %selected_items; }
 
   &:disabled {
     color: $insensitive_fg_color;
+
     &:backdrop { color: $backdrop_insensitive_color; }
   }
 }
@@ -226,9 +232,9 @@ spinner {
  ****************/
 entry {
   min-height: 32px;
-  border: 1px solid;
   padding-left: 8px;
   padding-right: 8px;
+  border: 1px solid;
 
   image { // icons inside the entry
     &.left { padding-left: 0; padding-right: 6px; }
@@ -242,15 +248,17 @@ entry {
 
   border-radius: 3px;
   transition: all 200ms $ease-out-quad;
+
   @include entry(normal);
 
-  &.flat,
-  &.flat:focus {
-    min-height: 0;
-    padding: 2px;
-    background-image: none;
-    border-color: transparent;
-    border-radius: 0;
+  &.flat {
+    &:focus, & {
+      min-height: 0;
+      padding: 2px;
+      background-image: none;
+      border-color: transparent;
+      border-radius: 0;
+    }
   }
 
   &:focus { @include entry(focus); }
@@ -261,17 +269,16 @@ entry {
 
   &:backdrop:disabled { @include entry(backdrop-insensitive); }
 
-  selection,
-  selection:focus { @extend %selected_items; }
+  selection { &:focus, & { @extend %selected_items; }}
 
   progress {
     margin: 2px -6px;
+    background-color: transparent;
+    background-image: none;
     border-radius: 0;
     border-width: 0 0 2px;
     border-color: $selected_bg_color;
     border-style: solid;
-    background-image: none;
-    background-color: transparent;
     box-shadow: none;
 
     &:backdrop { background-color: transparent; }
@@ -295,7 +302,7 @@ entry {
 
       &:focus { @include entry(focus, $e_color); }
 
-      &:selected, &:selected:focus { background-color: $e_color; }
+      &:selected { &:focus, & { background-color: $e_color; }}
     }
   }
 
@@ -401,7 +408,9 @@ button {
     border: 1px solid;
     border-radius: 3px;
     transition: $_button_transition;
+
     @include button(normal);
+
     &.flat {
       @include button(undecorated);
       // to avoid adiacent buttons borders clashing when transitioning, the transition on the normal state is set
@@ -423,26 +432,32 @@ button {
       -gtk-icon-effect: highlight;
     }
 
-    &:active, &:checked {
+    &:active,
+    &:checked {
       @include button(active);
+
       transition-duration: 50ms;
     }
 
-    &:backdrop, &.flat:backdrop {
-      @include button(backdrop);
-      -gtk-icon-effect: none;
+    &:backdrop {
+      &.flat, & {
+        @include button(backdrop);
 
-      &:active, &:checked { @include button(backdrop-active); }
+        -gtk-icon-effect: none;
 
-      &:disabled { @include button(backdrop-insensitive); }
+        &:active,
+        &:checked { @include button(backdrop-active); }
 
-      &:disabled:active,
-      &:disabled:checked { @include button(backdrop-insensitive-active); }
+        &:disabled {
+          @include button(backdrop-insensitive);
+
+          &:active,
+          &:checked { @include button(backdrop-insensitive-active); }
+        }
+      }
     }
 
-    &.flat:backdrop,
-    &.flat:disabled,
-    &.flat:backdrop:disabled { @include button(undecorated); }
+    &.flat { &:backdrop, &:disabled, &:backdrop:disabled { @include button(undecorated); }}
 
     &:disabled {
       @include button(insensitive);
@@ -488,12 +503,15 @@ button {
     color: $osd_fg_color;
     border-radius: 5px;
     outline-color: transparentize($osd_fg_color, 0.7);  //FIXME: define a color var?
+
     @include button(osd);
+
     border: none;
     box-shadow: none;
 
     &:hover {
       @include button(osd-hover);
+
       border: none;
       box-shadow: none;
     }
@@ -501,18 +519,22 @@ button {
     &:active,
     &:checked {
       @include button(osd-active);
+
       border: none;
       box-shadow: none;
     }
 
-    &:disabled,
-    &:backdrop:disabled {
-      @include button(osd-insensitive);
-      border: none;
+    &:disabled {
+      &:backdrop, & {
+        @include button(osd-insensitive);
+
+        border: none;
+      }
     }
 
     &:backdrop {
       @include button(osd-backdrop);
+
       border: none;
     }
   }
@@ -521,20 +543,19 @@ button {
   @at-root %osd_button,
   .osd & {
     @include button(osd);
+
     &:hover { @include button(osd-hover); }
 
     &:active,
-    &:checked,
-    &:backdrop:active,
-    &:backdrop:checked { @include button(osd-active); }
+    &:checked { &:backdrop, & { @include button(osd-active); }}
 
-    &:disabled,
-    &:backdrop:disabled { @include button(osd-insensitive); }
+    &:disabled { &:backdrop, & { @include button(osd-insensitive); }}
 
     &:backdrop { @include button(osd-backdrop); }
 
     &.flat {
       @include button(undecorated);
+
       box-shadow: none; //FIXME respect no edge on the button mixin
       text-shadow: 0 1px black;
       -gtk-icon-shadow: 0 1px black;
@@ -563,6 +584,7 @@ button {
 
       &.flat {
         @include button(undecorated);
+
         color: $b_color; //FIXME: does it work on the dark variant?
       }
 
@@ -581,15 +603,17 @@ button {
         &:disabled {
           @include button(backdrop-insensitive);
 
-          &:active, &:checked { @include button(backdrop-insensitive-active, $b_color, white); }
+          &:active,
+          &:checked { @include button(backdrop-insensitive-active, $b_color, white); }
         }
       }
 
-      &.flat:backdrop,
-      &.flat:disabled,
-      &.flat:backdrop:disabled {
-        @include button(undecorated);
-        color: transparentize($b_color, 0.2);
+      &.flat {
+        &:backdrop, &:disabled, &:backdrop:disabled {
+          @include button(undecorated);
+
+          color: transparentize($b_color, 0.2);
+        }
       }
 
       &:disabled {
@@ -605,12 +629,9 @@ button {
         &:hover { @include button(osd-hover, $b_color); }
 
         &:active,
-        &:checked,
-        &:backdrop:active,
-        &:backdrop:checked { @include button(osd-active, $b_color); }
+        &:checked { &:backdrop, & { @include button(osd-active, $b_color); }}
 
-        &:disabled,
-        &:backdrop:disabled { @include button(osd-insensitive, $b_color); }
+        &:disabled { &:backdrop, & { @include button(osd-insensitive, $b_color); }}
 
         &:backdrop { @include button(osd-backdrop, $b_color); }
       }
@@ -698,11 +719,16 @@ button {
                                   to(transparent));
   background-size: 6px 6px, 6px 6px;
   background-repeat: no-repeat;
+
   @if $variant == 'light' { background-position: right 3px, right 4px; }
+
   @else { background-position: right 3px, right 2px; }
+
   &:backdrop { background-size: 6px 6px, 0 0;}
+
   &:dir(rtl) {
     @if $variant == 'light' { background-position: left 3px, left 4px; }
+
     @else { background-position: left 3px, left 2px; }
   }
 }
@@ -719,20 +745,26 @@ button {
   &:active,
   &:checked{ @include button(active); }
 
-  &:disabled { @include button(insensitive); }
+  &:disabled {
+    @include button(insensitive);
 
-  &:disabled:active,
-  &:disabled:checked { @include button(insensitive-active); }
+    &:active,
+    &:checked { @include button(insensitive-active); }
+  }
 
-  &:backdrop { @include button(backdrop); };
+  &:backdrop {
+    @include button(backdrop);
 
-  &:backdrop:active,
-  &:backdrop:checked { @include button(backdrop-active); }
+    &:active,
+    &:checked { @include button(backdrop-active); }
 
-  &:backdrop:disabled { @include button(backdrop-insensitive); }
+    &:disabled {
+      @include button(backdrop-insensitive);
 
-  &:backdrop:disabled:active,
-  &:backdrop:disabled:checked { @include button(backdrop-insensitive-active); }
+      &:active,
+      &:checked { @include button(backdrop-insensitive-active); }
+    }
+  }
 }
 
 // More inline toolbar buttons
@@ -798,9 +830,9 @@ toolbar.inline-toolbar toolbutton:backdrop {
 }
 
 %undecorated_button {
-  border-color: transparent;
   background-color: transparent;
   background-image: none;
+  border-color: transparent;
   box-shadow: inset 0 1px transparentize(white,1),
               0 1px transparentize(white, 1);
   text-shadow: none;
@@ -817,6 +849,7 @@ modelbutton.flat,
   outline-offset: -2px;
 
   @extend %undecorated_button;
+
   &:hover { background-color: $popover_hover_color; }
 
   &:selected { @extend %selected_items; }
@@ -844,6 +877,7 @@ modelbutton.flat arrow {
 
 button.color {
   padding: 4px;
+
   colorswatch:only-child {
     &, overlay { border-radius: 0; }
 
@@ -862,43 +896,46 @@ button.color {
  *********/
 *:link {
   color: $link_color;
+
   &:visited {
     color: $link_visited_color;
+
     *:selected & { color: mix($selected_fg_color, $selected_bg_color, 60%); }
   }
 
   &:hover {
     color: lighten($link_color,10%);
+
     *:selected & { color: mix($selected_fg_color, $selected_bg_color, 90%); }
   }
 
   &:active {
     color: $link_color;
+
     *:selected & { color: mix($selected_fg_color, $selected_bg_color, 80%); }
   }
 
-  &:backdrop, &:backdrop:hover, &:backdrop:hover:selected {
-    color: $selected_bg_color;
-  }
+  &:backdrop { &:backdrop:hover, &:backdrop:hover:selected, & { color: $selected_bg_color; }}
 
   @at-root %link_selected,
   &:selected,
-  *:selected & {
-    color: mix($selected_fg_color, $selected_bg_color, 80%);
-  }
+  *:selected & { color: mix($selected_fg_color, $selected_bg_color, 80%); }
 }
 
 button:link,
 button:visited {
   // FIXME: aggregate with buttons
   @extend %undecorated_button;
+
   @extend *:link;
+
   text-shadow: none;
 
   &:hover,
   &:active,
   &:checked {
     @extend %undecorated_button;
+
     text-shadow: none;
   }
 
@@ -921,6 +958,7 @@ spinbutton {
     // behaves as the entry, so we extend the entry styling
     // and nuke the style on the internal entry
     @extend entry;
+
     padding: 0;
 
     entry {
@@ -932,16 +970,16 @@ spinbutton {
     }
 
     button {
+      min-height: 16px;
       margin: 0;
+      padding-bottom: 0;
+      padding-top: 0;
+      color: mix($fg_color, $base_color, 90%);
       background-image: none;
       border-style: none none none solid;
       border-color: transparentize($borders_color, 0.7);
-      color: mix($fg_color, $base_color, 90%);
       border-radius: 0;
       box-shadow: none;
-      min-height: 16px;
-      padding-top: 0;
-      padding-bottom: 0;
 
       &:dir(rtl) { border-style: none solid none none; }
 
@@ -953,19 +991,19 @@ spinbutton {
       &:disabled { color: transparentize($insensitive_fg_color, 0.7); }
 
       &:active {
-        box-shadow: inset 0 2px 3px -1px transparentize(black, 0.8);
         background-color: transparentize(black, 0.9);
+        box-shadow: inset 0 2px 3px -1px transparentize(black, 0.8);
       }
 
       &:backdrop {
         color: mix($backdrop_fg_color, $backdrop_base_color, 90%);
-        border-color: transparentize($backdrop_borders_color, 0.7);
         background-color: transparent;
+        border-color: transparentize($backdrop_borders_color, 0.7);
       }
 
       &:backdrop:disabled {
-        background-image: none;
         color: transparentize($backdrop_insensitive_color,0.7);
+        background-image: none;
         border-style: none none none solid; // It is needed or it gets overridden
 
         &:dir(rtl) { border-style: none solid none none; }
@@ -977,6 +1015,7 @@ spinbutton {
   .osd &:not(.vertical) {
     button {
       @include button(undecorated);
+
       color: $osd_fg_color;
       border-style: none none none solid;
       border-color: transparentize($osd_borders_color, 0.3);
@@ -988,6 +1027,7 @@ spinbutton {
 
       &:hover {
         @include button(undecorated);
+
         color: $osd_fg_color;
         border-color: transparentize(opacify($osd_borders_color, 1), 0.5);
         background-color: transparentize($osd_fg_color, 0.9);
@@ -997,6 +1037,7 @@ spinbutton {
 
       &:backdrop {
         @include button(undecorated);
+
         color: $osd_fg_color;
         border-color: transparentize(opacify($osd_borders_color, 1), 0.5);
         -gtk-icon-shadow: none;
@@ -1005,6 +1046,7 @@ spinbutton {
 
       &:disabled {
         @include button(undecorated);
+
         color: $osd_insensitive_fg_color;
         border-color: transparentize(opacify($osd_borders_color, 1), 0.5);
         -gtk-icon-shadow: none;
@@ -1054,6 +1096,7 @@ spinbutton {
       border-radius: 3px 3px 0 0;
       border-style: solid solid none solid;
     }
+
     %bottom_button {
       border-radius: 0 0 3px 3px;
       border-style: none solid solid solid;
@@ -1141,7 +1184,9 @@ combobox {
 
 toolbar {
   @extend %toolbar;
+
   padding: 4px 3px 3px 4px;
+
   // on OSD
   .osd & { background-color: transparent; }
 
@@ -1151,12 +1196,12 @@ toolbar {
     border: none;
     border-radius: 5px;
     background-color: $osd_bg_color;
-  }
 
-  &.osd.left,
-  &.osd.right,
-  &.osd.top,
-  &.osd.bottom { border-radius: 0; } // positional classes for `attached` osd toolbars
+    &.left,
+    &.right,
+    &.top,
+    &.bottom { border-radius: 0; } // positional classes for `attached` osd toolbars
+  }
 
   // toolbar separators
   &.horizontal separator { margin: 0 7px 1px 6px; }
@@ -1176,9 +1221,11 @@ toolbar {
 //searchbar, location-bar & inline-toolbar
 .inline-toolbar {
   @extend %toolbar;
+
   @extend %darkbar;
-  border-width: 0 1px 1px;
+
   padding: 3px;
+  border-width: 0 1px 1px;
   border-radius: 0  0 5px 5px;
 }
 
@@ -1266,35 +1313,38 @@ headerbar {
 
       &:hover { @include button(hover, $selected_bg_color, $selected_fg_color); }
 
-      &:active, &:checked { @include button(active, $selected_bg_color, $selected_fg_color); }
+      &:active,
+      &:checked { @include button(active, $selected_bg_color, $selected_fg_color); }
 
-      &:backdrop,
-      &.flat:backdrop {
-        @include button(backdrop, $selected_bg_color, $selected_fg_color);
-        -gtk-icon-effect: none;
-        border-color: $selected_borders_color;
+      &:backdrop {
+        &.flat, & {
+          @include button(backdrop, $selected_bg_color, $selected_fg_color);
 
-        &:active,
-        &:checked {
-          @include button(backdrop-active, $selected_bg_color, $selected_fg_color);
+          -gtk-icon-effect: none;
           border-color: $selected_borders_color;
-        }
 
-        &:disabled {
-          @include button(backdrop-insensitive, $selected_bg_color, $selected_fg_color);
-          border-color: $selected_borders_color;
-        }
+          &:active,
+          &:checked {
+            @include button(backdrop-active, $selected_bg_color, $selected_fg_color);
 
-        &:disabled:active,
-        &:disabled:checked {
-          @include button(backdrop-insensitive-active, $selected_bg_color, $selected_fg_color);
-          border-color: $selected_borders_color;
+            border-color: $selected_borders_color;
+          }
+
+          &:disabled {
+            @include button(backdrop-insensitive, $selected_bg_color, $selected_fg_color);
+
+            border-color: $selected_borders_color;
+
+            &:active, &:checked {
+              @include button(backdrop-insensitive-active, $selected_bg_color, $selected_fg_color);
+
+              border-color: $selected_borders_color;
+            }
+          }
         }
       }
 
-      &.flat:backdrop,
-      &.flat:disabled,
-      &.flat:disabled:backdrop { @include button(undecorated); }
+      &.flat { &:backdrop, &:disabled, &:backdrop:disabled { @include button(undecorated); }}
 
       &:disabled {
         @include button(insensitive, $selected_bg_color, $selected_fg_color);
@@ -1305,30 +1355,36 @@ headerbar {
 
       &.suggested-action {
         @include button(normal);
+
         border-color: $selected_borders_color;
 
         &:hover {
           @include button(hover);
+
           border-color: $selected_borders_color;
         }
 
         &:active {
           @include button(active);
+
           border-color: $selected_borders_color;
         }
 
         &:disabled {
           @include button(insensitive);
+
           border-color: $selected_borders_color;
         }
 
         &:backdrop {
           @include button(backdrop);
+
           border-color: $selected_borders_color;
         }
 
         &:backdrop:disabled {
           @include button(backdrop-insensitive);
+
           border-color: $selected_borders_color;
         }
       }
@@ -1420,7 +1476,10 @@ headerbar {
     padding-right: 4px;
   }
 
-  &.text-button.image-button label { padding-left: 0; padding-right: 0; }
+  &.text-button.image-button label {
+    padding-left: 0;
+    padding-right: 0;
+  }
 
   &.text-button.image-button, & {
     label:last-child { padding-right: 8px; }
@@ -1448,16 +1507,17 @@ treeview.view {
 
   & rubberband { @extend rubberband; } // to avoid borders being overridden by the previously set props
 
-  &:selected,
-  &:selected:focus {
-    border-radius: 0;
-    @extend %selected_items;
-  }
+  &:selected {
+    &:focus, & {
+      border-radius: 0;
 
-  &:selected,
-  &:backdrop:selected {
-    border-left-color: mix($selected_fg_color, $selected_bg_color, 50%);
-    border-top-color: transparentize($fg_color, 0.9); // doesn't work unfortunatelly
+      @extend %selected_items;
+    }
+ 
+    &:backdrop, & {
+      border-left-color: mix($selected_fg_color, $selected_bg_color, 50%);
+      border-top-color: transparentize($fg_color, 0.9); // doesn't work unfortunatelly
+    } 
   }
 
   &:disabled {
@@ -1550,6 +1610,7 @@ treeview.view {
 
     &:backdrop {
       @if $variant == 'light' { color: $backdrop_base_color; }
+
       @else { border-color: $backdrop_base_color; }
 
       background-image: none;
@@ -1576,8 +1637,10 @@ treeview.view {
 
   header {
     button {
-      @extend %column_header_button;
       $_column_header_color: mix($fg_color, $base_color, 50%);
+
+      @extend %column_header_button;
+
       color: $_column_header_color;
       background-color: $base_color;
       font-weight: bold;
@@ -1586,6 +1649,7 @@ treeview.view {
 
       &:hover {
         @extend %column_header_button;
+
         color: mix($_column_header_color, $fg_color, 50%);
         box-shadow: none;
         transition: none; //I shouldn't need this
@@ -1593,14 +1657,13 @@ treeview.view {
 
       &:active {
         @extend %column_header_button;
+
         color: $fg_color;
         transition: none; //I shouldn't need this
       }
-
     }
 
-    button:last-child,
-    button:last-child:backdrop { border-right-style: none; }
+    button:last-child { &:backdrop, & { border-right-style: none; }}
   }
 
   button.dnd,
@@ -1726,6 +1789,7 @@ menu,
 
   arrow { // overlow buttons
     @extend %undecorated_button;
+
     border-style: none;
     border-radius: 0;
     min-height: 16px;
@@ -1758,6 +1822,7 @@ menuitem {
   radio {
     min-height: 16px;
     min-width: 16px;
+
     &:dir(ltr) { margin-right: 7px; }
     &:dir(rtl) { margin-left: 7px; }
   }
@@ -1792,7 +1857,9 @@ popover.background {
     &.touch-selection,
     &.magnifier {
       @extend %osd;
+
       border: 1px solid transparentize(white, 0.9);
+
       button { @extend %osd_button };
     }
 
@@ -1815,6 +1882,7 @@ notebook {
     border-color: $borders_color;
     border-width: 1px;
     background-color: $dark_fill;
+
     &:backdrop {
       border-color: $backdrop_borders_color;
       background-color: $backdrop_dark_fill;
@@ -1826,7 +1894,9 @@ notebook {
         margin-bottom: -1px;
         > tab {
           &:hover { box-shadow: inset 0 -3px $borders_color; }
+
           &:backdrop { box-shadow: none; }
+
           &:checked { box-shadow: inset 0 -3px $selected_bg_color; }
         }
       }
@@ -1838,7 +1908,9 @@ notebook {
         margin-top: -1px;
         > tab {
           &:hover { box-shadow: inset 0 3px $borders_color; }
+
           &:backdrop { box-shadow: none; }
+
           &:checked { box-shadow: inset 0 3px $selected_bg_color; }
         }
       }
@@ -1850,7 +1922,9 @@ notebook {
         margin-right: -1px;
         > tab {
           &:hover { box-shadow: inset -3px 0 $borders_color; }
+
           &:backdrop { box-shadow: none; }
+
           &:checked { box-shadow: inset -3px 0 $selected_bg_color; }
         }
       }
@@ -1862,7 +1936,9 @@ notebook {
         margin-left: -1px;
         > tab {
           &:hover { box-shadow: inset 3px 0 $borders_color; }
+
           &:backdrop { box-shadow: none; }
+
           &:checked { box-shadow: inset 3px 0 $selected_bg_color; }
         }
       }
@@ -1870,11 +1946,13 @@ notebook {
 
     &.top > tabs > arrow {
       @extend %notebook_vert_arrows;
+
       border-top-style: none;
     }
 
     &.bottom > tabs > arrow {
       @extend %notebook_vert_arrows;
+
       border-bottom-style: none;
     }
 
@@ -1891,11 +1969,13 @@ notebook {
 
     &.left > tabs > arrow {
       @extend %notebook_horz_arrows;
+
       border-left-style: none;
     }
 
     &.right > tabs > arrow {
       @extend %notebook_horz_arrows;
+
       border-right-style: none;
     }
 
@@ -1912,6 +1992,7 @@ notebook {
 
     > tabs > arrow {
       @extend %button_basic;
+
       @extend button.flat;
 
       min-height: 16px;
@@ -2172,26 +2253,32 @@ scrollbar {
     transition-property: min-height, min-width, color;
 
     @include button(undecorated);
+
     color: $scrollbar_slider_color;
 
     &:hover {
       @include button(undecorated);
+
       color: $scrollbar_slider_hover_color;
     }
     &:active, &:checked {
       @include button(undecorated);
+
       color: $scrollbar_slider_active_color;
     }
     &:disabled {
       @include button(undecorated);
+
       color: transparentize($scrollbar_slider_color, 0.8);
     }
     &:backdrop {
       @include button(undecorated);
+
       color: $backdrop_scrollbar_slider_color;
 
       &:disabled {
         @include button(undecorated);
+
         color: transparentize($backdrop_scrollbar_slider_color, 0.8);
       }
     }
@@ -2201,6 +2288,7 @@ scrollbar {
   &.vertical {
     button {
       &.down { -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); }
+
       &.up { -gtk-icon-source: -gtk-icontheme('pan-up-symbolic'); }
     }
   }
@@ -2208,6 +2296,7 @@ scrollbar {
   &.horizontal {
     button {
       &.down { -gtk-icon-source: -gtk-icontheme('pan-right-symbolic'); }
+
       &.up { -gtk-icon-source: -gtk-icontheme('pan-left-symbolic'); }
     }
   }
@@ -2310,8 +2399,7 @@ switch {
       &.slider:dir(rtl) { border-left-color: $borders_color; }
       &.slider:dir(ltr) { border-right-color: $borders_color; }
 
-      &.slider,
-      &.slider:active { border-color: $selected_borders_color; }
+      &.slider { &:active, & { border-color: $selected_borders_color; } }
     }
   }
 }
@@ -2336,7 +2424,7 @@ switch {
   .view.content-view.check#{$s}:not(list) {
     -gtk-icon-shadow: none;
     -gtk-icon-source: -gtk-scaled(url("assets/checkbox#{$as}.png"),
-                                    url("assets/checkbox#{$as}@2.png"));
+                                  url("assets/checkbox#{$as}@2.png"));
     background-color: transparent;
   }
 }
@@ -2351,12 +2439,13 @@ checkbutton.text-button, radiobutton.text-button {
     &:last-child { margin-right: 4px; }
   }
 
-  &:disabled,
-  &:disabled:active,
-  &:disabled:indeterminate {
-    // set insensitive color, which is overriden otherwise
-    color: $insensitive_fg_color;
-    &:backdrop { color: $backdrop_insensitive_color; }
+  &:disabled {
+    &:active, &:indeterminate, & {
+      // set insensitive color, which is overriden otherwise
+      color: $insensitive_fg_color;
+
+      &:backdrop { color: $backdrop_insensitive_color; }
+    }
   }
 }
 
@@ -2417,8 +2506,10 @@ radio {
 %check,
 check {
   border-radius: 3px;
+
   &:checked { -gtk-icon-source: image(-gtk-recolor(url("assets/check-symbolic.svg")),
                                       -gtk-recolor(url("assets/check-symbolic.symbolic.png"))); }
+
   &:indeterminate { -gtk-icon-source: image(-gtk-recolor(url("assets/dash-symbolic.svg")),
                                             -gtk-recolor(url("assets/dash-symbolic.symbolic.png"))); }
 }
@@ -2426,8 +2517,10 @@ check {
 %radio,
 radio {
   border-radius: 100%;
+
   &:checked { -gtk-icon-source: image(-gtk-recolor(url("assets/bullet-symbolic.svg")),
                                       -gtk-recolor(url("assets/bullet-symbolic.symbolic.png"))); }
+
   &:indeterminate { -gtk-icon-source: image(-gtk-recolor(url("assets/dash-symbolic.svg")),
                                             -gtk-recolor(url("assets/dash-symbolic.symbolic.png"))); }
 }
@@ -2468,6 +2561,7 @@ treeview.view check:selected {
   &:focus, &:backdrop, & {
     &:disabled, & {
       @extend %check;
+
       @if $variant == 'light' { border-color: $selected_borders_color; }
     }
   }
@@ -2477,6 +2571,7 @@ treeview.view radio:selected {
   &:focus, &:backdrop, & {
     &:disabled, & {
       @extend %radio;
+
       @if $variant == 'light' { border-color: $selected_borders_color; }
     }
   }
@@ -2518,6 +2613,7 @@ treeview.view radio {
     background-color: $backdrop_dark_fill;
     border-color: $backdrop_borders_color;
     box-shadow: none;
+
     &:disabled { background-color: $insensitive_bg_color; }
   }
 
@@ -2642,6 +2738,7 @@ scale {
     // OSD
     .osd & {
       background-color: mix($osd_fg_color, $osd_borders_color, 25%);
+
       &:disabled {
         &, &:backdrop {
           border-color: transparent;
@@ -2653,6 +2750,7 @@ scale {
 
   slider {
     @include button(normal-alt, $edge: $shadow_color);
+
     border: 1px solid darken($borders_color, 3%);
     border-radius: 100%;
 
@@ -2722,6 +2820,7 @@ scale {
       min-height: $_marks_lenght;
       min-width: 1px;
     }
+
     &.fine-tune indicator { min-height: ($_marks_lenght - 3px); }
   }
   &.vertical {
@@ -2729,6 +2828,7 @@ scale {
       min-height: 1px;
       min-width: $_marks_lenght;
     }
+
     &.fine-tune indicator { min-width: ($_marks_lenght - 3px); }
   }
   // *WARNING* scale with marks madness following
@@ -2767,6 +2867,7 @@ scale {
 
                   $_scale_slider_bg_pos: top;
                 }
+
                 @else { margin-bottom: -14px; }
               }
 
@@ -2799,11 +2900,13 @@ scale {
 
             @if $dir_class == 'horizontal' {
               @if $marks_infix == 'scale-has-marks-above' { margin-top: -11px; }
+
               @else { margin-bottom: -11px; }
             }
 
             @else {
               @if $marks_infix == 'scale-has-marks-above' { margin-left: -11px; }
+
               @else { margin-right: -11px; }
             }
           }
@@ -3032,9 +3135,8 @@ levelbar {
     padding: 2px;
     border-radius: 3px;
     @include entry(normal);
-    &:backdrop {
-      @include entry(backdrop);
-    }
+
+    &:backdrop { @include entry(backdrop); }
   }
 
   &.horizontal.discrete block { margin: 0 1px; }
@@ -3101,14 +3203,13 @@ printdialog {
     background: white;
     padding: 0;
 
-    &:backdrop { color: $backdrop_fg_color;
-                 border-color: $backdrop_borders_color;
+    &:backdrop {
+      color: $backdrop_fg_color;
+      border-color: $backdrop_borders_color;
     }
   }
 
-  .dialog-action-box {
-    margin: 12px;
-  }
+  .dialog-action-box { margin: 12px; }
 }
 
 
@@ -3572,7 +3673,10 @@ paned {
       background-image: linear-gradient(to top, $borders_color), linear-gradient(to top, $borders_color);
       background-size: 1px 1px, 1px 1px;
 
-      &:backdrop { background-image: linear-gradient(to top, $backdrop_borders_color), linear-gradient(to top, $backdrop_borders_color); }
+      &:backdrop {
+        background-image: linear-gradient(to top, $backdrop_borders_color), 
+                          linear-gradient(to top, $backdrop_borders_color);
+      }
     }
   }
 
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 50083e0596..a8cac8361f 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -23,10 +23,10 @@
   color: #eeeeec;
   background-color: #393f3f; }
   .background:backdrop {
-    text-shadow: none;
-    -gtk-icon-shadow: none;
     color: #949796;
-    background-color: #393f3f; }
+    background-color: #393f3f;
+    text-shadow: none;
+    -gtk-icon-shadow: none; }
 
 /*
    These wildcard seems unavoidable, need to investigate.
@@ -38,20 +38,20 @@
   -gtk-icon-effect: dim; }
 
 .gtkstyle-fallback {
-  background-color: #393f3f;
-  color: #eeeeec; }
+  color: #eeeeec;
+  background-color: #393f3f; }
   .gtkstyle-fallback:hover {
-    background-color: #515a5a;
-    color: #eeeeec; }
+    color: #eeeeec;
+    background-color: #515a5a; }
   .gtkstyle-fallback:active {
-    background-color: #212424;
-    color: #eeeeec; }
+    color: #eeeeec;
+    background-color: #212424; }
   .gtkstyle-fallback:disabled {
-    background-color: #333636;
-    color: #949796; }
+    color: #949796;
+    background-color: #333636; }
   .gtkstyle-fallback:selected {
-    background-color: #215d9c;
-    color: #ffffff; }
+    color: #ffffff;
+    background-color: #215d9c; }
 
 .view, iconview,
 .view text,
@@ -65,13 +65,13 @@ textview text {
   textview text:backdrop {
     color: #d5d5d5;
     background-color: #2c2c2c; }
-  .view:selected, iconview:selected, .view:selected:focus, iconview:selected:focus,
-  .view text:selected,
-  iconview text:selected,
-  textview text:selected,
+  .view:selected:focus, iconview:selected:focus, .view:selected, iconview:selected,
   .view text:selected:focus,
   iconview text:selected:focus,
-  textview text:selected:focus {
+  textview text:selected:focus,
+  .view text:selected,
+  iconview text:selected,
+  textview text:selected {
     border-radius: 3px; }
 
 .rubberband,
@@ -154,9 +154,9 @@ spinner {
  ****************/
 entry, spinbutton:not(.vertical) {
   min-height: 32px;
-  border: 1px solid;
   padding-left: 8px;
   padding-right: 8px;
+  border: 1px solid;
   border-radius: 3px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   background-color: #292929;
@@ -190,7 +190,7 @@ entry, spinbutton:not(.vertical) {
     background-position: right center;
     border: none;
     box-shadow: none; }
-  entry.flat, spinbutton.flat:not(.vertical), entry.flat:focus, spinbutton.flat:focus:not(.vertical) {
+  entry.flat:focus, spinbutton.flat:focus:not(.vertical), entry.flat, spinbutton.flat:not(.vertical) {
     min-height: 0;
     padding: 2px;
     background-image: none;
@@ -224,12 +224,12 @@ entry, spinbutton:not(.vertical) {
     box-shadow: none; }
   entry progress, spinbutton:not(.vertical) progress {
     margin: 2px -6px;
+    background-color: transparent;
+    background-image: none;
     border-radius: 0;
     border-width: 0 0 2px;
     border-color: #215d9c;
     border-style: solid;
-    background-image: none;
-    background-color: transparent;
     box-shadow: none; }
     entry progress:backdrop, spinbutton:not(.vertical) progress:backdrop {
       background-color: transparent; }
@@ -245,7 +245,7 @@ entry, spinbutton:not(.vertical) {
       background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
       box-shadow: inset 0 0 0 1px #cc0000;
       border-color: #1a0000; }
-    entry.error:selected, spinbutton.error:selected:not(.vertical), entry.error:selected:focus, spinbutton.error:selected:focus:not(.vertical) {
+    entry.error:selected:focus, spinbutton.error:selected:focus:not(.vertical), entry.error:selected, spinbutton.error:selected:not(.vertical) {
       background-color: #cc0000; }
   entry.warning, spinbutton.warning:not(.vertical) {
     color: #f57900;
@@ -255,7 +255,7 @@ entry, spinbutton:not(.vertical) {
       background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
       box-shadow: inset 0 0 0 1px #f57900;
       border-color: #432100; }
-    entry.warning:selected, spinbutton.warning:selected:not(.vertical), entry.warning:selected:focus, spinbutton.warning:selected:focus:not(.vertical) {
+    entry.warning:selected:focus, spinbutton.warning:selected:focus:not(.vertical), entry.warning:selected, spinbutton.warning:selected:not(.vertical) {
       background-color: #f57900; }
   entry image, spinbutton:not(.vertical) image {
     color: #c7c7c5; }
@@ -400,11 +400,11 @@ notebook > header > tabs > arrow, headerbar button.titlebutton,
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
     box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6);
     transition-duration: 50ms; }
-  notebook > header > tabs > arrow:backdrop, headerbar button.titlebutton:backdrop,
-  .titlebar button.titlebutton:backdrop, notebook > header > tabs > arrow.flat:backdrop, headerbar notebook > header > tabs > arrow.titlebutton:backdrop, headerbar button.titlebutton:backdrop,
+  notebook > header > tabs > arrow:backdrop.flat, headerbar notebook > header > tabs > arrow.titlebutton:backdrop, headerbar button.titlebutton:backdrop,
   .titlebar notebook > header > tabs > arrow.titlebutton:backdrop,
-  .titlebar button.titlebutton:backdrop, button:backdrop, button.flat:backdrop, notebook > header > tabs > arrow:backdrop, button.sidebar-button:backdrop, headerbar button.titlebutton:backdrop,
-  .titlebar button.titlebutton:backdrop {
+  .titlebar button.titlebutton:backdrop, notebook > header > tabs > arrow:backdrop, headerbar button.titlebutton:backdrop,
+  .titlebar button.titlebutton:backdrop, button:backdrop.flat, notebook > header > tabs > arrow:backdrop, button.sidebar-button:backdrop, headerbar button.titlebutton:backdrop,
+  .titlebar button.titlebutton:backdrop, button:backdrop {
     color: #949796;
     border-color: #1f2222;
     background-image: linear-gradient(to bottom, #393f3f);
@@ -412,43 +412,43 @@ notebook > header > tabs > arrow, headerbar button.titlebutton,
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     -gtk-icon-effect: none; }
-    notebook > header > tabs > arrow:backdrop:active, headerbar button.titlebutton:backdrop:active,
-    .titlebar button.titlebutton:backdrop:active, notebook > header > tabs > arrow:backdrop:checked, headerbar button.titlebutton:backdrop:checked,
-    .titlebar button.titlebutton:backdrop:checked, notebook > header > tabs > arrow.flat:backdrop:active, headerbar notebook > header > tabs > arrow.titlebutton:backdrop:active, headerbar button.titlebutton:backdrop:active,
+    notebook > header > tabs > arrow:backdrop.flat:active, headerbar notebook > header > tabs > arrow.titlebutton:backdrop:active, headerbar button.titlebutton:backdrop:active,
     .titlebar notebook > header > tabs > arrow.titlebutton:backdrop:active,
-    .titlebar button.titlebutton:backdrop:active, notebook > header > tabs > arrow.flat:backdrop:checked, headerbar notebook > header > tabs > arrow.titlebutton:backdrop:checked, headerbar button.titlebutton:backdrop:checked,
+    .titlebar button.titlebutton:backdrop:active, notebook > header > tabs > arrow:backdrop.flat:checked, headerbar notebook > header > tabs > arrow.titlebutton:backdrop:checked, headerbar button.titlebutton:backdrop:checked,
     .titlebar notebook > header > tabs > arrow.titlebutton:backdrop:checked,
-    .titlebar button.titlebutton:backdrop:checked, button:backdrop:active, button:backdrop:checked, button.flat:backdrop:active, notebook > header > tabs > arrow:backdrop:active, button.sidebar-button:backdrop:active, headerbar button.titlebutton:backdrop:active,
-    .titlebar button.titlebutton:backdrop:active, button.flat:backdrop:checked, notebook > header > tabs > arrow:backdrop:checked, button.sidebar-button:backdrop:checked, headerbar button.titlebutton:backdrop:checked,
-    .titlebar button.titlebutton:backdrop:checked {
+    .titlebar button.titlebutton:backdrop:checked, notebook > header > tabs > arrow:backdrop:active, headerbar button.titlebutton:backdrop:active,
+    .titlebar button.titlebutton:backdrop:active, notebook > header > tabs > arrow:backdrop:checked, headerbar button.titlebutton:backdrop:checked,
+    .titlebar button.titlebutton:backdrop:checked, button:backdrop.flat:active, notebook > header > tabs > arrow:backdrop:active, button.sidebar-button:backdrop:active, headerbar button.titlebutton:backdrop:active,
+    .titlebar button.titlebutton:backdrop:active, button:backdrop.flat:checked, notebook > header > tabs > arrow:backdrop:checked, button.sidebar-button:backdrop:checked, headerbar button.titlebutton:backdrop:checked,
+    .titlebar button.titlebutton:backdrop:checked, button:backdrop:active, button:backdrop:checked {
       color: #949796;
       border-color: #1f2222;
       background-image: linear-gradient(to bottom, #303535);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    notebook > header > tabs > arrow:backdrop:disabled, headerbar button.titlebutton:backdrop:disabled,
-    .titlebar button.titlebutton:backdrop:disabled, notebook > header > tabs > arrow.flat:backdrop:disabled, headerbar notebook > header > tabs > arrow.titlebutton:backdrop:disabled, headerbar button.titlebutton:backdrop:disabled,
+    notebook > header > tabs > arrow:backdrop.flat:disabled, headerbar notebook > header > tabs > arrow.titlebutton:backdrop:disabled, headerbar button.titlebutton:backdrop:disabled,
     .titlebar notebook > header > tabs > arrow.titlebutton:backdrop:disabled,
-    .titlebar button.titlebutton:backdrop:disabled, button:backdrop:disabled, button.flat:backdrop:disabled, notebook > header > tabs > arrow:backdrop:disabled, button.sidebar-button:backdrop:disabled, headerbar button.titlebutton:backdrop:disabled,
-    .titlebar button.titlebutton:backdrop:disabled {
+    .titlebar button.titlebutton:backdrop:disabled, notebook > header > tabs > arrow:backdrop:disabled, headerbar button.titlebutton:backdrop:disabled,
+    .titlebar button.titlebutton:backdrop:disabled, button:backdrop.flat:disabled, notebook > header > tabs > arrow:backdrop:disabled, button.sidebar-button:backdrop:disabled, headerbar button.titlebutton:backdrop:disabled,
+    .titlebar button.titlebutton:backdrop:disabled, button:backdrop:disabled {
       color: #5d6767;
       border-color: #1f2222;
       background-image: linear-gradient(to bottom, #333636);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    notebook > header > tabs > arrow:backdrop:disabled:active, headerbar button.titlebutton:backdrop:disabled:active,
-    .titlebar button.titlebutton:backdrop:disabled:active, notebook > header > tabs > arrow:backdrop:disabled:checked, headerbar button.titlebutton:backdrop:disabled:checked,
-    .titlebar button.titlebutton:backdrop:disabled:checked, notebook > header > tabs > arrow.flat:backdrop:disabled:active, headerbar notebook > header > tabs > arrow.titlebutton:backdrop:disabled:active, headerbar button.titlebutton:backdrop:disabled:active,
-    .titlebar notebook > header > tabs > arrow.titlebutton:backdrop:disabled:active,
-    .titlebar button.titlebutton:backdrop:disabled:active, notebook > header > tabs > arrow.flat:backdrop:disabled:checked, headerbar notebook > header > tabs > arrow.titlebutton:backdrop:disabled:checked, headerbar button.titlebutton:backdrop:disabled:checked,
-    .titlebar notebook > header > tabs > arrow.titlebutton:backdrop:disabled:checked,
-    .titlebar button.titlebutton:backdrop:disabled:checked, button:backdrop:disabled:active, button:backdrop:disabled:checked, button.flat:backdrop:disabled:active, notebook > header > tabs > arrow:backdrop:disabled:active, button.sidebar-button:backdrop:disabled:active, headerbar button.titlebutton:backdrop:disabled:active,
-    .titlebar button.titlebutton:backdrop:disabled:active, button.flat:backdrop:disabled:checked, notebook > header > tabs > arrow:backdrop:disabled:checked, button.sidebar-button:backdrop:disabled:checked, headerbar button.titlebutton:backdrop:disabled:checked,
-    .titlebar button.titlebutton:backdrop:disabled:checked {
-      color: #5d6767;
-      border-color: #1f2222;
-      background-image: linear-gradient(to bottom, #272929);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+      notebook > header > tabs > arrow:backdrop.flat:disabled:active, headerbar notebook > header > tabs > arrow.titlebutton:backdrop:disabled:active, headerbar button.titlebutton:backdrop:disabled:active,
+      .titlebar notebook > header > tabs > arrow.titlebutton:backdrop:disabled:active,
+      .titlebar button.titlebutton:backdrop:disabled:active, notebook > header > tabs > arrow:backdrop.flat:disabled:checked, headerbar notebook > header > tabs > arrow.titlebutton:backdrop:disabled:checked, headerbar button.titlebutton:backdrop:disabled:checked,
+      .titlebar notebook > header > tabs > arrow.titlebutton:backdrop:disabled:checked,
+      .titlebar button.titlebutton:backdrop:disabled:checked, notebook > header > tabs > arrow:backdrop:disabled:active, headerbar button.titlebutton:backdrop:disabled:active,
+      .titlebar button.titlebutton:backdrop:disabled:active, notebook > header > tabs > arrow:backdrop:disabled:checked, headerbar button.titlebutton:backdrop:disabled:checked,
+      .titlebar button.titlebutton:backdrop:disabled:checked, button:backdrop.flat:disabled:active, notebook > header > tabs > arrow:backdrop:disabled:active, button.sidebar-button:backdrop:disabled:active, headerbar button.titlebutton:backdrop:disabled:active,
+      .titlebar button.titlebutton:backdrop:disabled:active, button:backdrop.flat:disabled:checked, notebook > header > tabs > arrow:backdrop:disabled:checked, button.sidebar-button:backdrop:disabled:checked, headerbar button.titlebutton:backdrop:disabled:checked,
+      .titlebar button.titlebutton:backdrop:disabled:checked, button:backdrop:disabled:active, button:backdrop:disabled:checked {
+        color: #5d6767;
+        border-color: #1f2222;
+        background-image: linear-gradient(to bottom, #272929);
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   notebook > header > tabs > arrow.flat:backdrop, headerbar notebook > header > tabs > arrow.titlebutton:backdrop, headerbar button.titlebutton:backdrop,
   .titlebar notebook > header > tabs > arrow.titlebutton:backdrop,
   .titlebar button.titlebutton:backdrop, notebook > header > tabs > arrow.flat:disabled, headerbar notebook > header > tabs > arrow.titlebutton:disabled, headerbar button.titlebutton:disabled,
@@ -542,7 +542,7 @@ button.osd {
     outline-color: rgba(238, 238, 236, 0.3);
     border: none;
     box-shadow: none; }
-  button.osd:disabled, button.osd:backdrop:disabled {
+  button.osd:disabled:backdrop, button.osd:disabled {
     color: #878a89;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
@@ -579,7 +579,7 @@ popover.background.touch-selection button, popover.background.magnifier button,
     text-shadow: 0 1px black;
     -gtk-icon-shadow: 0 1px black;
     outline-color: rgba(238, 238, 236, 0.3); }
-  popover.background.touch-selection button:active, popover.background.magnifier button:active, .app-notification button:active, popover.background.touch-selection button:checked, popover.background.magnifier button:checked, .app-notification button:checked, popover.background.touch-selection button:backdrop:active, popover.background.magnifier button:backdrop:active, .app-notification button:backdrop:active, popover.background.touch-selection button:backdrop:checked, popover.background.magnifier button:backdrop:checked, .app-notification button:backdrop:checked, .osd button:active, .osd button:checked, .osd button:backdrop:active, .osd button:backdrop:checked {
+  popover.background.touch-selection button:active:backdrop, popover.background.magnifier button:active:backdrop, .app-notification button:active:backdrop, popover.background.touch-selection button:active, popover.background.magnifier button:active, .app-notification button:active, popover.background.touch-selection button:checked:backdrop, popover.background.magnifier button:checked:backdrop, .app-notification button:checked:backdrop, popover.background.touch-selection button:checked, popover.background.magnifier button:checked, .app-notification button:checked, .osd button:active:backdrop, .osd button:active, .osd button:checked:backdrop, .osd button:checked {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
@@ -588,7 +588,7 @@ popover.background.touch-selection button, popover.background.magnifier button,
     text-shadow: none;
     -gtk-icon-shadow: none;
     outline-color: rgba(238, 238, 236, 0.3); }
-  popover.background.touch-selection button:disabled, popover.background.magnifier button:disabled, .app-notification button:disabled, popover.background.touch-selection button:backdrop:disabled, popover.background.magnifier button:backdrop:disabled, .app-notification button:backdrop:disabled, .osd button:disabled, .osd button:backdrop:disabled {
+  popover.background.touch-selection button:disabled:backdrop, popover.background.magnifier button:disabled:backdrop, .app-notification button:disabled:backdrop, popover.background.touch-selection button:disabled, popover.background.magnifier button:disabled, .app-notification button:disabled, .osd button:disabled:backdrop, .osd button:disabled {
     color: #878a89;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
@@ -803,7 +803,7 @@ button.suggested-action {
       text-shadow: 0 1px black;
       -gtk-icon-shadow: 0 1px black;
       outline-color: rgba(238, 238, 236, 0.3); }
-    .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:active:backdrop, .osd button.suggested-action:active, .osd button.suggested-action:checked:backdrop, .osd button.suggested-action:checked {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, #215d9c);
@@ -812,7 +812,7 @@ button.suggested-action {
       text-shadow: none;
       -gtk-icon-shadow: none;
       outline-color: rgba(238, 238, 236, 0.3); }
-    .osd button.suggested-action:disabled, .osd button.suggested-action:backdrop:disabled {
+    .osd button.suggested-action:disabled:backdrop, .osd button.suggested-action:disabled {
       color: #878a89;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
@@ -932,7 +932,7 @@ button.destructive-action {
       text-shadow: 0 1px black;
       -gtk-icon-shadow: 0 1px black;
       outline-color: rgba(238, 238, 236, 0.3); }
-    .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:active:backdrop, .osd button.destructive-action:active, .osd button.destructive-action:checked:backdrop, .osd button.destructive-action:checked {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, #d51010);
@@ -941,7 +941,7 @@ button.destructive-action {
       text-shadow: none;
       -gtk-icon-shadow: none;
       outline-color: rgba(238, 238, 236, 0.3); }
-    .osd button.destructive-action:disabled, .osd button.destructive-action:backdrop:disabled {
+    .osd button.destructive-action:disabled:backdrop, .osd button.destructive-action:disabled {
       color: #878a89;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
@@ -1024,11 +1024,11 @@ button.destructive-action {
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-  .inline-toolbar toolbutton > button:disabled:active, .inline-toolbar toolbutton > button:disabled:checked {
-    color: #949796;
-    border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #313434, #333636);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+    .inline-toolbar toolbutton > button:disabled:active, .inline-toolbar toolbutton > button:disabled:checked {
+      color: #949796;
+      border-color: #1c1f1f;
+      background-image: linear-gradient(to bottom, #313434, #333636);
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   .inline-toolbar toolbutton > button:backdrop {
     color: #949796;
     border-color: #1f2222;
@@ -1036,23 +1036,23 @@ button.destructive-action {
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-  .inline-toolbar toolbutton > button:backdrop:active, .inline-toolbar toolbutton > button:backdrop:checked {
-    color: #949796;
-    border-color: #1f2222;
-    background-image: linear-gradient(to bottom, #303535);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-  .inline-toolbar toolbutton > button:backdrop:disabled {
-    color: #5d6767;
-    border-color: #1f2222;
-    background-image: linear-gradient(to bottom, #333636);
-    text-shadow: none;
-    -gtk-icon-shadow: none;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-  .inline-toolbar toolbutton > button:backdrop:disabled:active, .inline-toolbar toolbutton > button:backdrop:disabled:checked {
-    color: #5d6767;
-    border-color: #1f2222;
-    background-image: linear-gradient(to bottom, #272929);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+    .inline-toolbar toolbutton > button:backdrop:active, .inline-toolbar toolbutton > button:backdrop:checked {
+      color: #949796;
+      border-color: #1f2222;
+      background-image: linear-gradient(to bottom, #303535);
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+    .inline-toolbar toolbutton > button:backdrop:disabled {
+      color: #5d6767;
+      border-color: #1f2222;
+      background-image: linear-gradient(to bottom, #333636);
+      text-shadow: none;
+      -gtk-icon-shadow: none;
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+      .inline-toolbar toolbutton > button:backdrop:disabled:active, .inline-toolbar toolbutton > button:backdrop:disabled:checked {
+        color: #5d6767;
+        border-color: #1f2222;
+        background-image: linear-gradient(to bottom, #272929);
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
 
 toolbar.inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton > button.sidebar-button, toolbar.inline-toolbar headerbar toolbutton > button.titlebutton, headerbar toolbar.inline-toolbar toolbutton > button.titlebutton,
 toolbar.inline-toolbar .titlebar toolbutton > button.titlebutton,
@@ -1121,9 +1121,9 @@ button:visited:active,
 button:visited:checked, button:link:backdrop,
 button:visited:backdrop, menu arrow,
 .menu arrow, calendar.button, calendar.button:hover, calendar.button:backdrop, calendar.button:disabled, .scale-popup button:hover, .scale-popup button:backdrop, .scale-popup button:backdrop:hover, .scale-popup button:backdrop:disabled {
-  border-color: transparent;
   background-color: transparent;
   background-image: none;
+  border-color: transparent;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
   text-shadow: none;
   -gtk-icon-shadow: none; }
@@ -1200,11 +1200,11 @@ button:visited {
     *:selected *:link:active, *:selected button:active:link,
     *:selected button:active:visited {
       color: #d3dfeb; }
-  *:link:backdrop, button:backdrop:link,
-  button:backdrop:visited, *:link:backdrop:hover, button:backdrop:hover:link,
-  button:backdrop:hover:visited, *:link:backdrop:hover:selected, button:backdrop:hover:selected:link,
-  button:backdrop:hover:selected:visited, .selection-mode.titlebar:not(headerbar) .subtitle:backdrop:hover:link,
-  headerbar.selection-mode .subtitle:backdrop:hover:link {
+  *:link:backdrop:backdrop:hover, button:backdrop:backdrop:hover:link,
+  button:backdrop:backdrop:hover:visited, *:link:backdrop:backdrop:hover:selected, button:backdrop:backdrop:hover:selected:link,
+  button:backdrop:backdrop:hover:selected:visited, .selection-mode.titlebar:not(headerbar) .subtitle:backdrop:backdrop:hover:link,
+  headerbar.selection-mode .subtitle:backdrop:backdrop:hover:link, *:link:backdrop, button:backdrop:link,
+  button:backdrop:visited {
     color: #215d9c; }
   .info *:link, .info button:link,
   .info button:visited,
@@ -1246,16 +1246,16 @@ spinbutton:not(.vertical) {
     border: none;
     box-shadow: none; }
   spinbutton:not(.vertical) button {
+    min-height: 16px;
     margin: 0;
+    padding-bottom: 0;
+    padding-top: 0;
+    color: #dadad9;
     background-image: none;
     border-style: none none none solid;
     border-color: rgba(28, 31, 31, 0.3);
-    color: #dadad9;
     border-radius: 0;
-    box-shadow: none;
-    min-height: 16px;
-    padding-top: 0;
-    padding-bottom: 0; }
+    box-shadow: none; }
     spinbutton:not(.vertical) button:dir(rtl) {
       border-style: none solid none none; }
     spinbutton:not(.vertical) button:hover {
@@ -1264,15 +1264,15 @@ spinbutton:not(.vertical) {
     spinbutton:not(.vertical) button:disabled {
       color: rgba(148, 151, 150, 0.3); }
     spinbutton:not(.vertical) button:active {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2);
-      background-color: rgba(0, 0, 0, 0.1); }
+      background-color: rgba(0, 0, 0, 0.1);
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2); }
     spinbutton:not(.vertical) button:backdrop {
       color: #8a8c8b;
-      border-color: rgba(31, 34, 34, 0.3);
-      background-color: transparent; }
+      background-color: transparent;
+      border-color: rgba(31, 34, 34, 0.3); }
     spinbutton:not(.vertical) button:backdrop:disabled {
-      background-image: none;
       color: rgba(93, 103, 103, 0.3);
+      background-image: none;
       border-style: none none none solid; }
       spinbutton:not(.vertical) button:backdrop:disabled:dir(rtl) {
         border-style: none solid none none; }
@@ -1431,8 +1431,8 @@ toolbar {
     border: none;
     border-radius: 5px;
     background-color: rgba(32, 37, 38, 0.8); }
-  toolbar.osd.left, toolbar.osd.right, toolbar.osd.top, toolbar.osd.bottom {
-    border-radius: 0; }
+    toolbar.osd.left, toolbar.osd.right, toolbar.osd.top, toolbar.osd.bottom {
+      border-radius: 0; }
   toolbar.horizontal separator {
     margin: 0 7px 1px 6px; }
   toolbar.vertical separator {
@@ -1446,8 +1446,8 @@ toolbar {
     margin-bottom: 1px; }
 
 .inline-toolbar {
-  border-width: 0 1px 1px;
   padding: 3px;
+  border-width: 0 1px 1px;
   border-radius: 0  0 5px 5px; }
 
 searchbar,
@@ -1547,13 +1547,13 @@ headerbar {
         text-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
         -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
         box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
-      .selection-mode.titlebar:not(headerbar) button:backdrop, .selection-mode.titlebar:not(headerbar) button.flat:backdrop, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop,
-      .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop,
-      headerbar.selection-mode button:backdrop,
-      headerbar.selection-mode button.flat:backdrop,
+      .selection-mode.titlebar:not(headerbar) button:backdrop.flat, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop,
+      .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop, .selection-mode.titlebar:not(headerbar) button:backdrop,
+      headerbar.selection-mode button:backdrop.flat,
       headerbar.selection-mode notebook > header > tabs > arrow:backdrop,
       headerbar.selection-mode button.sidebar-button:backdrop,
-      headerbar.selection-mode button.titlebutton:backdrop {
+      headerbar.selection-mode button.titlebutton:backdrop,
+      headerbar.selection-mode button:backdrop {
         color: #d3dfeb;
         border-color: #0b1e33;
         background-image: linear-gradient(to bottom, #215d9c);
@@ -1562,31 +1562,31 @@ headerbar {
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         -gtk-icon-effect: none;
         border-color: #0f2b48; }
-        .selection-mode.titlebar:not(headerbar) button:backdrop:active, .selection-mode.titlebar:not(headerbar) button:backdrop:checked, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:active, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop:active, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:active,
-        .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:active, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:checked, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop:checked, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:checked,
-        .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:checked,
-        headerbar.selection-mode button:backdrop:active,
-        headerbar.selection-mode button:backdrop:checked,
-        headerbar.selection-mode button.flat:backdrop:active,
+        .selection-mode.titlebar:not(headerbar) button:backdrop.flat:active, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop:active, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:active,
+        .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:active, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:checked, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop:checked, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:checked,
+        .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:checked, .selection-mode.titlebar:not(headerbar) button:backdrop:active, .selection-mode.titlebar:not(headerbar) button:backdrop:checked,
+        headerbar.selection-mode button:backdrop.flat:active,
         headerbar.selection-mode notebook > header > tabs > arrow:backdrop:active,
         headerbar.selection-mode button.sidebar-button:backdrop:active,
         headerbar.selection-mode button.titlebutton:backdrop:active,
-        headerbar.selection-mode button.flat:backdrop:checked,
+        headerbar.selection-mode button:backdrop.flat:checked,
         headerbar.selection-mode notebook > header > tabs > arrow:backdrop:checked,
         headerbar.selection-mode button.sidebar-button:backdrop:checked,
-        headerbar.selection-mode button.titlebutton:backdrop:checked {
+        headerbar.selection-mode button.titlebutton:backdrop:checked,
+        headerbar.selection-mode button:backdrop:active,
+        headerbar.selection-mode button:backdrop:checked {
           color: #d1dae3;
           border-color: #0b1e33;
           background-image: linear-gradient(to bottom, #184472);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0);
           border-color: #0f2b48; }
-        .selection-mode.titlebar:not(headerbar) button:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled,
-        .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled,
-        headerbar.selection-mode button:backdrop:disabled,
-        headerbar.selection-mode button.flat:backdrop:disabled,
+        .selection-mode.titlebar:not(headerbar) button:backdrop.flat:disabled, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled,
+        .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled,
+        headerbar.selection-mode button:backdrop.flat:disabled,
         headerbar.selection-mode notebook > header > tabs > arrow:backdrop:disabled,
         headerbar.selection-mode button.sidebar-button:backdrop:disabled,
-        headerbar.selection-mode button.titlebutton:backdrop:disabled {
+        headerbar.selection-mode button.titlebutton:backdrop:disabled,
+        headerbar.selection-mode button:backdrop:disabled {
           color: #6f91b4;
           border-color: #0b1e33;
           background-image: linear-gradient(to bottom, #22558b);
@@ -1594,28 +1594,28 @@ headerbar {
           -gtk-icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0);
           border-color: #0f2b48; }
-        .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:checked, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled:active,
-        .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled:checked, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop:disabled:checked, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled:checked,
-        .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled:checked,
-        headerbar.selection-mode button:backdrop:disabled:active,
-        headerbar.selection-mode button:backdrop:disabled:checked,
-        headerbar.selection-mode button.flat:backdrop:disabled:active,
-        headerbar.selection-mode notebook > header > tabs > arrow:backdrop:disabled:active,
-        headerbar.selection-mode button.sidebar-button:backdrop:disabled:active,
-        headerbar.selection-mode button.titlebutton:backdrop:disabled:active,
-        headerbar.selection-mode button.flat:backdrop:disabled:checked,
-        headerbar.selection-mode notebook > header > tabs > arrow:backdrop:disabled:checked,
-        headerbar.selection-mode button.sidebar-button:backdrop:disabled:checked,
-        headerbar.selection-mode button.titlebutton:backdrop:disabled:checked {
-          color: #6c88a7;
-          border-color: #0b1e33;
-          background-image: linear-gradient(to bottom, #1d4877);
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0);
-          border-color: #0f2b48; }
+          .selection-mode.titlebar:not(headerbar) button:backdrop.flat:disabled:active, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled:active,
+          .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:disabled:checked, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop:disabled:checked, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled:checked,
+          .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled:checked, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:checked,
+          headerbar.selection-mode button:backdrop.flat:disabled:active,
+          headerbar.selection-mode notebook > header > tabs > arrow:backdrop:disabled:active,
+          headerbar.selection-mode button.sidebar-button:backdrop:disabled:active,
+          headerbar.selection-mode button.titlebutton:backdrop:disabled:active,
+          headerbar.selection-mode button:backdrop.flat:disabled:checked,
+          headerbar.selection-mode notebook > header > tabs > arrow:backdrop:disabled:checked,
+          headerbar.selection-mode button.sidebar-button:backdrop:disabled:checked,
+          headerbar.selection-mode button.titlebutton:backdrop:disabled:checked,
+          headerbar.selection-mode button:backdrop:disabled:active,
+          headerbar.selection-mode button:backdrop:disabled:checked {
+            color: #6c88a7;
+            border-color: #0b1e33;
+            background-image: linear-gradient(to bottom, #1d4877);
+            box-shadow: inset 0 1px rgba(255, 255, 255, 0);
+            border-color: #0f2b48; }
       .selection-mode.titlebar:not(headerbar) button.flat:backdrop, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop,
       .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop, .selection-mode.titlebar:not(headerbar) button.flat:disabled, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:disabled, .selection-mode.titlebar:not(headerbar) button.sidebar-button:disabled,
-      .selection-mode.titlebar:not(headerbar) button.titlebutton:disabled, .selection-mode.titlebar:not(headerbar) button.flat:disabled:backdrop, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:disabled:backdrop, .selection-mode.titlebar:not(headerbar) button.sidebar-button:disabled:backdrop,
-      .selection-mode.titlebar:not(headerbar) button.titlebutton:disabled:backdrop,
+      .selection-mode.titlebar:not(headerbar) button.titlebutton:disabled, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled,
+      .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled,
       headerbar.selection-mode button.flat:backdrop,
       headerbar.selection-mode notebook > header > tabs > arrow:backdrop,
       headerbar.selection-mode button.sidebar-button:backdrop,
@@ -1624,10 +1624,10 @@ headerbar {
       headerbar.selection-mode notebook > header > tabs > arrow:disabled,
       headerbar.selection-mode button.sidebar-button:disabled,
       headerbar.selection-mode button.titlebutton:disabled,
-      headerbar.selection-mode button.flat:disabled:backdrop,
-      headerbar.selection-mode notebook > header > tabs > arrow:disabled:backdrop,
-      headerbar.selection-mode button.sidebar-button:disabled:backdrop,
-      headerbar.selection-mode button.titlebutton:disabled:backdrop {
+      headerbar.selection-mode button.flat:backdrop:disabled,
+      headerbar.selection-mode notebook > header > tabs > arrow:backdrop:disabled,
+      headerbar.selection-mode button.sidebar-button:backdrop:disabled,
+      headerbar.selection-mode button.titlebutton:backdrop:disabled {
         border-color: transparent;
         background-color: transparent;
         background-image: none;
@@ -1798,9 +1798,9 @@ treeview.view {
   -GtkTreeView-expander-size: 16;
   border-left-color: #8c8c8b;
   border-top-color: #393f3f; }
-  treeview.view:selected, treeview.view:selected:focus {
+  treeview.view:selected:focus, treeview.view:selected {
     border-radius: 0; }
-  treeview.view:selected, treeview.view:backdrop:selected {
+  treeview.view:selected:backdrop, treeview.view:selected {
     border-left-color: #90aece;
     border-top-color: rgba(238, 238, 236, 0.1); }
   treeview.view:disabled {
@@ -1873,8 +1873,7 @@ treeview.view {
     treeview.view header button:active {
       color: #eeeeec;
       transition: none; }
-  treeview.view header button:last-child,
-  treeview.view header button:last-child:backdrop {
+  treeview.view header button:last-child:backdrop, treeview.view header button:last-child {
     border-right-style: none; }
   treeview.view button.dnd:active, treeview.view button.dnd:selected, treeview.view button.dnd:hover, treeview.view button.dnd,
   treeview.view header.button.dnd:active,
@@ -2499,9 +2498,9 @@ checkbutton.text-button, radiobutton.text-button {
     margin-left: 4px; }
   checkbutton.text-button label:not(:only-child):last-child, radiobutton.text-button label:not(:only-child):last-child {
     margin-right: 4px; }
-  checkbutton.text-button:disabled, checkbutton.text-button:disabled:active, checkbutton.text-button:disabled:indeterminate, radiobutton.text-button:disabled, radiobutton.text-button:disabled:active, radiobutton.text-button:disabled:indeterminate {
+  checkbutton.text-button:disabled:active, checkbutton.text-button:disabled:indeterminate, checkbutton.text-button:disabled, radiobutton.text-button:disabled:active, radiobutton.text-button:disabled:indeterminate, radiobutton.text-button:disabled {
     color: #949796; }
-    checkbutton.text-button:disabled:backdrop, checkbutton.text-button:disabled:active:backdrop, checkbutton.text-button:disabled:indeterminate:backdrop, radiobutton.text-button:disabled:backdrop, radiobutton.text-button:disabled:active:backdrop, radiobutton.text-button:disabled:indeterminate:backdrop {
+    checkbutton.text-button:disabled:active:backdrop, checkbutton.text-button:disabled:indeterminate:backdrop, checkbutton.text-button:disabled:backdrop, radiobutton.text-button:disabled:active:backdrop, radiobutton.text-button:disabled:indeterminate:backdrop, radiobutton.text-button:disabled:backdrop {
       color: #5d6767; }
 
 check,
@@ -4156,48 +4155,43 @@ headerbar.selection-mode button.titlebutton,
   .titlebar.selection-mode button.titlebutton:backdrop {
     -gtk-icon-shadow: none; }
 
-.view:selected, iconview:selected, .view:selected:focus, iconview:selected:focus,
-.view text:selected,
-iconview text:selected,
-textview text:selected,
+.view:selected:focus, iconview:selected:focus, .view:selected, iconview:selected,
 .view text:selected:focus,
 iconview text:selected:focus,
-textview text:selected:focus, .view text selection, iconview text selection,
-.view text selection:focus,
-iconview text selection:focus,
-textview text selection,
-textview text selection:focus, flowbox flowboxchild:selected, label:selected,
+textview text:selected:focus,
+.view text:selected,
+iconview text:selected,
+textview text:selected, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection,
+textview text selection:focus,
+textview text selection, flowbox flowboxchild:selected, label:selected,
 label selection,
 label selection:focus,
-label selection:hover, entry selection, spinbutton:not(.vertical) selection,
-entry selection:focus, modelbutton.flat:selected, popover.background checkbutton:selected,
+label selection:hover, entry selection:focus, entry selection, spinbutton:not(.vertical) selection, modelbutton.flat:selected, popover.background checkbutton:selected,
 popover.background radiobutton:selected,
-.menuitem.button.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, calendar:selected, .sidebar :selected {
+.menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected, .sidebar :selected {
   background-color: #215d9c;
   color: #ffffff; }
-  .view:disabled:selected, iconview:disabled:selected, iconview:disabled:selected:focus,
+  iconview:disabled:selected:focus, .view:disabled:selected, iconview:disabled:selected,
+  iconview text:disabled:selected:focus,
+  textview text:disabled:selected:focus,
   .view text:disabled:selected,
   iconview text:disabled:selected,
-  textview text:disabled:selected,
-  iconview text:disabled:selected:focus,
-  textview text:disabled:selected:focus, .view text selection:disabled, iconview text selection:disabled,
-  iconview text selection:disabled:focus,
+  textview text:disabled:selected, iconview text selection:disabled:focus, .view text selection:disabled, iconview text selection:disabled,
   textview text selection:disabled, flowbox flowboxchild:disabled:selected, label:disabled:selected,
   label selection:disabled, entry selection:disabled, spinbutton:not(.vertical) selection:disabled, modelbutton.flat:disabled:selected, popover.background checkbutton:disabled:selected,
   popover.background radiobutton:disabled:selected,
-  .menuitem.button.flat:disabled:selected, treeview.view:disabled:selected:focus, row:disabled:selected, calendar:disabled:selected, .sidebar :disabled:selected, placessidebar row:selected:disabled label {
+  .menuitem.button.flat:disabled:selected, row:disabled:selected, calendar:disabled:selected, .sidebar :disabled:selected, placessidebar row:selected:disabled label {
     color: #90aece; }
-  .view:backdrop:selected, iconview:backdrop:selected, iconview:backdrop:selected:focus,
+  iconview:backdrop:selected:focus, .view:backdrop:selected, iconview:backdrop:selected,
+  iconview text:backdrop:selected:focus,
+  textview text:backdrop:selected:focus,
   .view text:backdrop:selected,
   iconview text:backdrop:selected,
-  textview text:backdrop:selected,
-  iconview text:backdrop:selected:focus,
-  textview text:backdrop:selected:focus, .view text selection:backdrop, iconview text selection:backdrop,
-  iconview text selection:backdrop:focus,
+  textview text:backdrop:selected, iconview text selection:backdrop:focus, .view text selection:backdrop, iconview text selection:backdrop,
   textview text selection:backdrop, flowbox flowboxchild:backdrop:selected, label:backdrop:selected,
   label selection:backdrop, entry selection:backdrop, spinbutton:not(.vertical) selection:backdrop, modelbutton.flat:backdrop:selected, popover.background checkbutton:backdrop:selected,
   popover.background radiobutton:backdrop:selected,
-  .menuitem.button.flat:backdrop:selected, treeview.view:backdrop:selected:focus, row:backdrop:selected, calendar:backdrop:selected, .sidebar :backdrop:selected {
+  .menuitem.button.flat:backdrop:selected, row:backdrop:selected, calendar:backdrop:selected, .sidebar :backdrop:selected {
     color: #ffffff; }
     .view:backdrop:disabled:selected, iconview:backdrop:disabled:selected,
     .view text:backdrop:disabled:selected,
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 3cf0ecf381..15866d1a56 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -23,10 +23,10 @@
   color: #2e3436;
   background-color: #e8e8e7; }
   .background:backdrop {
-    text-shadow: none;
-    -gtk-icon-shadow: none;
     color: #8b8e8f;
-    background-color: #e8e8e7; }
+    background-color: #e8e8e7;
+    text-shadow: none;
+    -gtk-icon-shadow: none; }
 
 /*
    These wildcard seems unavoidable, need to investigate.
@@ -38,20 +38,20 @@
   -gtk-icon-effect: dim; }
 
 .gtkstyle-fallback {
-  background-color: #e8e8e7;
-  color: #2e3436; }
+  color: #2e3436;
+  background-color: #e8e8e7; }
   .gtkstyle-fallback:hover {
-    background-color: white;
-    color: #2e3436; }
+    color: #2e3436;
+    background-color: white; }
   .gtkstyle-fallback:active {
-    background-color: #cfcfcd;
-    color: #2e3436; }
+    color: #2e3436;
+    background-color: #cfcfcd; }
   .gtkstyle-fallback:disabled {
-    background-color: #f1f1f1;
-    color: #8b8e8f; }
+    color: #8b8e8f;
+    background-color: #f1f1f1; }
   .gtkstyle-fallback:selected {
-    background-color: #4a90d9;
-    color: #ffffff; }
+    color: #ffffff;
+    background-color: #4a90d9; }
 
 .view, iconview,
 .view text,
@@ -65,13 +65,13 @@ textview text {
   textview text:backdrop {
     color: #333333;
     background-color: white; }
-  .view:selected, iconview:selected, .view:selected:focus, iconview:selected:focus,
-  .view text:selected,
-  iconview text:selected,
-  textview text:selected,
+  .view:selected:focus, iconview:selected:focus, .view:selected, iconview:selected,
   .view text:selected:focus,
   iconview text:selected:focus,
-  textview text:selected:focus {
+  textview text:selected:focus,
+  .view text:selected,
+  iconview text:selected,
+  textview text:selected {
     border-radius: 3px; }
 
 .rubberband,
@@ -154,9 +154,9 @@ spinner {
  ****************/
 entry, spinbutton:not(.vertical) {
   min-height: 32px;
-  border: 1px solid;
   padding-left: 8px;
   padding-right: 8px;
+  border: 1px solid;
   border-radius: 3px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   background-color: #ffffff;
@@ -190,7 +190,7 @@ entry, spinbutton:not(.vertical) {
     background-position: right center;
     border: none;
     box-shadow: none; }
-  entry.flat, spinbutton.flat:not(.vertical), entry.flat:focus, spinbutton.flat:focus:not(.vertical) {
+  entry.flat:focus, spinbutton.flat:focus:not(.vertical), entry.flat, spinbutton.flat:not(.vertical) {
     min-height: 0;
     padding: 2px;
     background-image: none;
@@ -224,12 +224,12 @@ entry, spinbutton:not(.vertical) {
     box-shadow: none; }
   entry progress, spinbutton:not(.vertical) progress {
     margin: 2px -6px;
+    background-color: transparent;
+    background-image: none;
     border-radius: 0;
     border-width: 0 0 2px;
     border-color: #4a90d9;
     border-style: solid;
-    background-image: none;
-    background-color: transparent;
     box-shadow: none; }
     entry progress:backdrop, spinbutton:not(.vertical) progress:backdrop {
       background-color: transparent; }
@@ -245,7 +245,7 @@ entry, spinbutton:not(.vertical) {
       background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
       box-shadow: inset 0 0 0 1px #cc0000;
       border-color: #cc0000; }
-    entry.error:selected, spinbutton.error:selected:not(.vertical), entry.error:selected:focus, spinbutton.error:selected:focus:not(.vertical) {
+    entry.error:selected:focus, spinbutton.error:selected:focus:not(.vertical), entry.error:selected, spinbutton.error:selected:not(.vertical) {
       background-color: #cc0000; }
   entry.warning, spinbutton.warning:not(.vertical) {
     color: #f57900;
@@ -255,7 +255,7 @@ entry, spinbutton:not(.vertical) {
       background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
       box-shadow: inset 0 0 0 1px #f57900;
       border-color: #f57900; }
-    entry.warning:selected, spinbutton.warning:selected:not(.vertical), entry.warning:selected:focus, spinbutton.warning:selected:focus:not(.vertical) {
+    entry.warning:selected:focus, spinbutton.warning:selected:focus:not(.vertical), entry.warning:selected, spinbutton.warning:selected:not(.vertical) {
       background-color: #f57900; }
   entry image, spinbutton:not(.vertical) image {
     color: #585d5e; }
@@ -400,11 +400,11 @@ notebook > header > tabs > arrow, headerbar button.titlebutton,
     -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6);
     transition-duration: 50ms; }
-  notebook > header > tabs > arrow:backdrop, headerbar button.titlebutton:backdrop,
-  .titlebar button.titlebutton:backdrop, notebook > header > tabs > arrow.flat:backdrop, headerbar notebook > header > tabs > arrow.titlebutton:backdrop, headerbar button.titlebutton:backdrop,
+  notebook > header > tabs > arrow:backdrop.flat, headerbar notebook > header > tabs > arrow.titlebutton:backdrop, headerbar button.titlebutton:backdrop,
   .titlebar notebook > header > tabs > arrow.titlebutton:backdrop,
-  .titlebar button.titlebutton:backdrop, button:backdrop, button.flat:backdrop, notebook > header > tabs > arrow:backdrop, button.sidebar-button:backdrop, headerbar button.titlebutton:backdrop,
-  .titlebar button.titlebutton:backdrop {
+  .titlebar button.titlebutton:backdrop, notebook > header > tabs > arrow:backdrop, headerbar button.titlebutton:backdrop,
+  .titlebar button.titlebutton:backdrop, button:backdrop.flat, notebook > header > tabs > arrow:backdrop, button.sidebar-button:backdrop, headerbar button.titlebutton:backdrop,
+  .titlebar button.titlebutton:backdrop, button:backdrop {
     color: #8b8e8f;
     border-color: #a5a5a1;
     background-image: linear-gradient(to bottom, #e8e8e7);
@@ -412,43 +412,43 @@ notebook > header > tabs > arrow, headerbar button.titlebutton,
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     -gtk-icon-effect: none; }
-    notebook > header > tabs > arrow:backdrop:active, headerbar button.titlebutton:backdrop:active,
-    .titlebar button.titlebutton:backdrop:active, notebook > header > tabs > arrow:backdrop:checked, headerbar button.titlebutton:backdrop:checked,
-    .titlebar button.titlebutton:backdrop:checked, notebook > header > tabs > arrow.flat:backdrop:active, headerbar notebook > header > tabs > arrow.titlebutton:backdrop:active, headerbar button.titlebutton:backdrop:active,
+    notebook > header > tabs > arrow:backdrop.flat:active, headerbar notebook > header > tabs > arrow.titlebutton:backdrop:active, headerbar button.titlebutton:backdrop:active,
     .titlebar notebook > header > tabs > arrow.titlebutton:backdrop:active,
-    .titlebar button.titlebutton:backdrop:active, notebook > header > tabs > arrow.flat:backdrop:checked, headerbar notebook > header > tabs > arrow.titlebutton:backdrop:checked, headerbar button.titlebutton:backdrop:checked,
+    .titlebar button.titlebutton:backdrop:active, notebook > header > tabs > arrow:backdrop.flat:checked, headerbar notebook > header > tabs > arrow.titlebutton:backdrop:checked, headerbar button.titlebutton:backdrop:checked,
     .titlebar notebook > header > tabs > arrow.titlebutton:backdrop:checked,
-    .titlebar button.titlebutton:backdrop:checked, button:backdrop:active, button:backdrop:checked, button.flat:backdrop:active, notebook > header > tabs > arrow:backdrop:active, button.sidebar-button:backdrop:active, headerbar button.titlebutton:backdrop:active,
-    .titlebar button.titlebutton:backdrop:active, button.flat:backdrop:checked, notebook > header > tabs > arrow:backdrop:checked, button.sidebar-button:backdrop:checked, headerbar button.titlebutton:backdrop:checked,
-    .titlebar button.titlebutton:backdrop:checked {
+    .titlebar button.titlebutton:backdrop:checked, notebook > header > tabs > arrow:backdrop:active, headerbar button.titlebutton:backdrop:active,
+    .titlebar button.titlebutton:backdrop:active, notebook > header > tabs > arrow:backdrop:checked, headerbar button.titlebutton:backdrop:checked,
+    .titlebar button.titlebutton:backdrop:checked, button:backdrop.flat:active, notebook > header > tabs > arrow:backdrop:active, button.sidebar-button:backdrop:active, headerbar button.titlebutton:backdrop:active,
+    .titlebar button.titlebutton:backdrop:active, button:backdrop.flat:checked, notebook > header > tabs > arrow:backdrop:checked, button.sidebar-button:backdrop:checked, headerbar button.titlebutton:backdrop:checked,
+    .titlebar button.titlebutton:backdrop:checked, button:backdrop:active, button:backdrop:checked {
       color: #8b8e8f;
       border-color: #a5a5a1;
       background-image: linear-gradient(to bottom, #d1d1cf);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    notebook > header > tabs > arrow:backdrop:disabled, headerbar button.titlebutton:backdrop:disabled,
-    .titlebar button.titlebutton:backdrop:disabled, notebook > header > tabs > arrow.flat:backdrop:disabled, headerbar notebook > header > tabs > arrow.titlebutton:backdrop:disabled, headerbar button.titlebutton:backdrop:disabled,
+    notebook > header > tabs > arrow:backdrop.flat:disabled, headerbar notebook > header > tabs > arrow.titlebutton:backdrop:disabled, headerbar button.titlebutton:backdrop:disabled,
     .titlebar notebook > header > tabs > arrow.titlebutton:backdrop:disabled,
-    .titlebar button.titlebutton:backdrop:disabled, button:backdrop:disabled, button.flat:backdrop:disabled, notebook > header > tabs > arrow:backdrop:disabled, button.sidebar-button:backdrop:disabled, headerbar button.titlebutton:backdrop:disabled,
-    .titlebar button.titlebutton:backdrop:disabled {
+    .titlebar button.titlebutton:backdrop:disabled, notebook > header > tabs > arrow:backdrop:disabled, headerbar button.titlebutton:backdrop:disabled,
+    .titlebar button.titlebutton:backdrop:disabled, button:backdrop.flat:disabled, notebook > header > tabs > arrow:backdrop:disabled, button.sidebar-button:backdrop:disabled, headerbar button.titlebutton:backdrop:disabled,
+    .titlebar button.titlebutton:backdrop:disabled, button:backdrop:disabled {
       color: #c3c3c0;
       border-color: #a5a5a1;
       background-image: linear-gradient(to bottom, #f1f1f1);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    notebook > header > tabs > arrow:backdrop:disabled:active, headerbar button.titlebutton:backdrop:disabled:active,
-    .titlebar button.titlebutton:backdrop:disabled:active, notebook > header > tabs > arrow:backdrop:disabled:checked, headerbar button.titlebutton:backdrop:disabled:checked,
-    .titlebar button.titlebutton:backdrop:disabled:checked, notebook > header > tabs > arrow.flat:backdrop:disabled:active, headerbar notebook > header > tabs > arrow.titlebutton:backdrop:disabled:active, headerbar button.titlebutton:backdrop:disabled:active,
-    .titlebar notebook > header > tabs > arrow.titlebutton:backdrop:disabled:active,
-    .titlebar button.titlebutton:backdrop:disabled:active, notebook > header > tabs > arrow.flat:backdrop:disabled:checked, headerbar notebook > header > tabs > arrow.titlebutton:backdrop:disabled:checked, headerbar button.titlebutton:backdrop:disabled:checked,
-    .titlebar notebook > header > tabs > arrow.titlebutton:backdrop:disabled:checked,
-    .titlebar button.titlebutton:backdrop:disabled:checked, button:backdrop:disabled:active, button:backdrop:disabled:checked, button.flat:backdrop:disabled:active, notebook > header > tabs > arrow:backdrop:disabled:active, button.sidebar-button:backdrop:disabled:active, headerbar button.titlebutton:backdrop:disabled:active,
-    .titlebar button.titlebutton:backdrop:disabled:active, button.flat:backdrop:disabled:checked, notebook > header > tabs > arrow:backdrop:disabled:checked, button.sidebar-button:backdrop:disabled:checked, headerbar button.titlebutton:backdrop:disabled:checked,
-    .titlebar button.titlebutton:backdrop:disabled:checked {
-      color: #c3c3c0;
-      border-color: #a5a5a1;
-      background-image: linear-gradient(to bottom, #e4e4e4);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+      notebook > header > tabs > arrow:backdrop.flat:disabled:active, headerbar notebook > header > tabs > arrow.titlebutton:backdrop:disabled:active, headerbar button.titlebutton:backdrop:disabled:active,
+      .titlebar notebook > header > tabs > arrow.titlebutton:backdrop:disabled:active,
+      .titlebar button.titlebutton:backdrop:disabled:active, notebook > header > tabs > arrow:backdrop.flat:disabled:checked, headerbar notebook > header > tabs > arrow.titlebutton:backdrop:disabled:checked, headerbar button.titlebutton:backdrop:disabled:checked,
+      .titlebar notebook > header > tabs > arrow.titlebutton:backdrop:disabled:checked,
+      .titlebar button.titlebutton:backdrop:disabled:checked, notebook > header > tabs > arrow:backdrop:disabled:active, headerbar button.titlebutton:backdrop:disabled:active,
+      .titlebar button.titlebutton:backdrop:disabled:active, notebook > header > tabs > arrow:backdrop:disabled:checked, headerbar button.titlebutton:backdrop:disabled:checked,
+      .titlebar button.titlebutton:backdrop:disabled:checked, button:backdrop.flat:disabled:active, notebook > header > tabs > arrow:backdrop:disabled:active, button.sidebar-button:backdrop:disabled:active, headerbar button.titlebutton:backdrop:disabled:active,
+      .titlebar button.titlebutton:backdrop:disabled:active, button:backdrop.flat:disabled:checked, notebook > header > tabs > arrow:backdrop:disabled:checked, button.sidebar-button:backdrop:disabled:checked, headerbar button.titlebutton:backdrop:disabled:checked,
+      .titlebar button.titlebutton:backdrop:disabled:checked, button:backdrop:disabled:active, button:backdrop:disabled:checked {
+        color: #c3c3c0;
+        border-color: #a5a5a1;
+        background-image: linear-gradient(to bottom, #e4e4e4);
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   notebook > header > tabs > arrow.flat:backdrop, headerbar notebook > header > tabs > arrow.titlebutton:backdrop, headerbar button.titlebutton:backdrop,
   .titlebar notebook > header > tabs > arrow.titlebutton:backdrop,
   .titlebar button.titlebutton:backdrop, notebook > header > tabs > arrow.flat:disabled, headerbar notebook > header > tabs > arrow.titlebutton:disabled, headerbar button.titlebutton:disabled,
@@ -542,7 +542,7 @@ button.osd {
     outline-color: rgba(238, 238, 236, 0.3);
     border: none;
     box-shadow: none; }
-  button.osd:disabled, button.osd:backdrop:disabled {
+  button.osd:disabled:backdrop, button.osd:disabled {
     color: #878a89;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
@@ -579,7 +579,7 @@ popover.background.touch-selection button, popover.background.magnifier button,
     text-shadow: 0 1px black;
     -gtk-icon-shadow: 0 1px black;
     outline-color: rgba(238, 238, 236, 0.3); }
-  popover.background.touch-selection button:active, popover.background.magnifier button:active, .app-notification button:active, popover.background.touch-selection button:checked, popover.background.magnifier button:checked, .app-notification button:checked, popover.background.touch-selection button:backdrop:active, popover.background.magnifier button:backdrop:active, .app-notification button:backdrop:active, popover.background.touch-selection button:backdrop:checked, popover.background.magnifier button:backdrop:checked, .app-notification button:backdrop:checked, .osd button:active, .osd button:checked, .osd button:backdrop:active, .osd button:backdrop:checked {
+  popover.background.touch-selection button:active:backdrop, popover.background.magnifier button:active:backdrop, .app-notification button:active:backdrop, popover.background.touch-selection button:active, popover.background.magnifier button:active, .app-notification button:active, popover.background.touch-selection button:checked:backdrop, popover.background.magnifier button:checked:backdrop, .app-notification button:checked:backdrop, popover.background.touch-selection button:checked, popover.background.magnifier button:checked, .app-notification button:checked, .osd button:active:backdrop, .osd button:active, .osd button:checked:backdrop, .osd button:checked {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
@@ -588,7 +588,7 @@ popover.background.touch-selection button, popover.background.magnifier button,
     text-shadow: none;
     -gtk-icon-shadow: none;
     outline-color: rgba(238, 238, 236, 0.3); }
-  popover.background.touch-selection button:disabled, popover.background.magnifier button:disabled, .app-notification button:disabled, popover.background.touch-selection button:backdrop:disabled, popover.background.magnifier button:backdrop:disabled, .app-notification button:backdrop:disabled, .osd button:disabled, .osd button:backdrop:disabled {
+  popover.background.touch-selection button:disabled:backdrop, popover.background.magnifier button:disabled:backdrop, .app-notification button:disabled:backdrop, popover.background.touch-selection button:disabled, popover.background.magnifier button:disabled, .app-notification button:disabled, .osd button:disabled:backdrop, .osd button:disabled {
     color: #878a89;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
@@ -803,7 +803,7 @@ button.suggested-action {
       text-shadow: 0 1px black;
       -gtk-icon-shadow: 0 1px black;
       outline-color: rgba(238, 238, 236, 0.3); }
-    .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:active:backdrop, .osd button.suggested-action:active, .osd button.suggested-action:checked:backdrop, .osd button.suggested-action:checked {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, #4a90d9);
@@ -812,7 +812,7 @@ button.suggested-action {
       text-shadow: none;
       -gtk-icon-shadow: none;
       outline-color: rgba(238, 238, 236, 0.3); }
-    .osd button.suggested-action:disabled, .osd button.suggested-action:backdrop:disabled {
+    .osd button.suggested-action:disabled:backdrop, .osd button.suggested-action:disabled {
       color: #878a89;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
@@ -932,7 +932,7 @@ button.destructive-action {
       text-shadow: 0 1px black;
       -gtk-icon-shadow: 0 1px black;
       outline-color: rgba(238, 238, 236, 0.3); }
-    .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:active:backdrop, .osd button.destructive-action:active, .osd button.destructive-action:checked:backdrop, .osd button.destructive-action:checked {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, #ef2929);
@@ -941,7 +941,7 @@ button.destructive-action {
       text-shadow: none;
       -gtk-icon-shadow: none;
       outline-color: rgba(238, 238, 236, 0.3); }
-    .osd button.destructive-action:disabled, .osd button.destructive-action:backdrop:disabled {
+    .osd button.destructive-action:disabled:backdrop, .osd button.destructive-action:disabled {
       color: #878a89;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
@@ -1024,11 +1024,11 @@ button.destructive-action {
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-  .inline-toolbar toolbutton > button:disabled:active, .inline-toolbar toolbutton > button:disabled:checked {
-    color: #8b8e8f;
-    border-color: #9d9d99;
-    background-image: linear-gradient(to bottom, #e9e9e8, #f1f1f1);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+    .inline-toolbar toolbutton > button:disabled:active, .inline-toolbar toolbutton > button:disabled:checked {
+      color: #8b8e8f;
+      border-color: #9d9d99;
+      background-image: linear-gradient(to bottom, #e9e9e8, #f1f1f1);
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   .inline-toolbar toolbutton > button:backdrop {
     color: #8b8e8f;
     border-color: #a5a5a1;
@@ -1036,23 +1036,23 @@ button.destructive-action {
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-  .inline-toolbar toolbutton > button:backdrop:active, .inline-toolbar toolbutton > button:backdrop:checked {
-    color: #8b8e8f;
-    border-color: #a5a5a1;
-    background-image: linear-gradient(to bottom, #d1d1cf);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-  .inline-toolbar toolbutton > button:backdrop:disabled {
-    color: #c3c3c0;
-    border-color: #a5a5a1;
-    background-image: linear-gradient(to bottom, #f1f1f1);
-    text-shadow: none;
-    -gtk-icon-shadow: none;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-  .inline-toolbar toolbutton > button:backdrop:disabled:active, .inline-toolbar toolbutton > button:backdrop:disabled:checked {
-    color: #c3c3c0;
-    border-color: #a5a5a1;
-    background-image: linear-gradient(to bottom, #e4e4e4);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+    .inline-toolbar toolbutton > button:backdrop:active, .inline-toolbar toolbutton > button:backdrop:checked {
+      color: #8b8e8f;
+      border-color: #a5a5a1;
+      background-image: linear-gradient(to bottom, #d1d1cf);
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+    .inline-toolbar toolbutton > button:backdrop:disabled {
+      color: #c3c3c0;
+      border-color: #a5a5a1;
+      background-image: linear-gradient(to bottom, #f1f1f1);
+      text-shadow: none;
+      -gtk-icon-shadow: none;
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+      .inline-toolbar toolbutton > button:backdrop:disabled:active, .inline-toolbar toolbutton > button:backdrop:disabled:checked {
+        color: #c3c3c0;
+        border-color: #a5a5a1;
+        background-image: linear-gradient(to bottom, #e4e4e4);
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
 
 toolbar.inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton > button.sidebar-button, toolbar.inline-toolbar headerbar toolbutton > button.titlebutton, headerbar toolbar.inline-toolbar toolbutton > button.titlebutton,
 toolbar.inline-toolbar .titlebar toolbutton > button.titlebutton,
@@ -1121,9 +1121,9 @@ button:visited:active,
 button:visited:checked, button:link:backdrop,
 button:visited:backdrop, menu arrow,
 .menu arrow, calendar.button, calendar.button:hover, calendar.button:backdrop, calendar.button:disabled, .scale-popup button:hover, .scale-popup button:backdrop, .scale-popup button:backdrop:hover, .scale-popup button:backdrop:disabled {
-  border-color: transparent;
   background-color: transparent;
   background-image: none;
+  border-color: transparent;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
   text-shadow: none;
   -gtk-icon-shadow: none; }
@@ -1204,11 +1204,11 @@ button:visited {
     *:selected *:link:active, *:selected button:active:link,
     *:selected button:active:visited {
       color: #dbe9f7; }
-  *:link:backdrop, button:backdrop:link,
-  button:backdrop:visited, *:link:backdrop:hover, button:backdrop:hover:link,
-  button:backdrop:hover:visited, *:link:backdrop:hover:selected, button:backdrop:hover:selected:link,
-  button:backdrop:hover:selected:visited, .selection-mode.titlebar:not(headerbar) .subtitle:backdrop:hover:link,
-  headerbar.selection-mode .subtitle:backdrop:hover:link {
+  *:link:backdrop:backdrop:hover, button:backdrop:backdrop:hover:link,
+  button:backdrop:backdrop:hover:visited, *:link:backdrop:backdrop:hover:selected, button:backdrop:backdrop:hover:selected:link,
+  button:backdrop:backdrop:hover:selected:visited, .selection-mode.titlebar:not(headerbar) .subtitle:backdrop:backdrop:hover:link,
+  headerbar.selection-mode .subtitle:backdrop:backdrop:hover:link, *:link:backdrop, button:backdrop:link,
+  button:backdrop:visited {
     color: #4a90d9; }
   .info *:link, .info button:link,
   .info button:visited,
@@ -1250,16 +1250,16 @@ spinbutton:not(.vertical) {
     border: none;
     box-shadow: none; }
   spinbutton:not(.vertical) button {
+    min-height: 16px;
     margin: 0;
+    padding-bottom: 0;
+    padding-top: 0;
+    color: #43484a;
     background-image: none;
     border-style: none none none solid;
     border-color: rgba(157, 157, 153, 0.3);
-    color: #43484a;
     border-radius: 0;
-    box-shadow: none;
-    min-height: 16px;
-    padding-top: 0;
-    padding-bottom: 0; }
+    box-shadow: none; }
     spinbutton:not(.vertical) button:dir(rtl) {
       border-style: none solid none none; }
     spinbutton:not(.vertical) button:hover {
@@ -1268,15 +1268,15 @@ spinbutton:not(.vertical) {
     spinbutton:not(.vertical) button:disabled {
       color: rgba(139, 142, 143, 0.3); }
     spinbutton:not(.vertical) button:active {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2);
-      background-color: rgba(0, 0, 0, 0.1); }
+      background-color: rgba(0, 0, 0, 0.1);
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2); }
     spinbutton:not(.vertical) button:backdrop {
       color: #97999a;
-      border-color: rgba(165, 165, 161, 0.3);
-      background-color: transparent; }
+      background-color: transparent;
+      border-color: rgba(165, 165, 161, 0.3); }
     spinbutton:not(.vertical) button:backdrop:disabled {
-      background-image: none;
       color: rgba(195, 195, 192, 0.3);
+      background-image: none;
       border-style: none none none solid; }
       spinbutton:not(.vertical) button:backdrop:disabled:dir(rtl) {
         border-style: none solid none none; }
@@ -1435,8 +1435,8 @@ toolbar {
     border: none;
     border-radius: 5px;
     background-color: rgba(32, 37, 38, 0.8); }
-  toolbar.osd.left, toolbar.osd.right, toolbar.osd.top, toolbar.osd.bottom {
-    border-radius: 0; }
+    toolbar.osd.left, toolbar.osd.right, toolbar.osd.top, toolbar.osd.bottom {
+      border-radius: 0; }
   toolbar.horizontal separator {
     margin: 0 7px 1px 6px; }
   toolbar.vertical separator {
@@ -1450,8 +1450,8 @@ toolbar {
     margin-bottom: 1px; }
 
 .inline-toolbar {
-  border-width: 0 1px 1px;
   padding: 3px;
+  border-width: 0 1px 1px;
   border-radius: 0  0 5px 5px; }
 
 searchbar,
@@ -1551,13 +1551,13 @@ headerbar {
         text-shadow: 0 -1px rgba(0, 0, 0, 0.62353);
         -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.62353);
         box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
-      .selection-mode.titlebar:not(headerbar) button:backdrop, .selection-mode.titlebar:not(headerbar) button.flat:backdrop, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop,
-      .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop,
-      headerbar.selection-mode button:backdrop,
-      headerbar.selection-mode button.flat:backdrop,
+      .selection-mode.titlebar:not(headerbar) button:backdrop.flat, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop,
+      .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop, .selection-mode.titlebar:not(headerbar) button:backdrop,
+      headerbar.selection-mode button:backdrop.flat,
       headerbar.selection-mode notebook > header > tabs > arrow:backdrop,
       headerbar.selection-mode button.sidebar-button:backdrop,
-      headerbar.selection-mode button.titlebutton:backdrop {
+      headerbar.selection-mode button.titlebutton:backdrop,
+      headerbar.selection-mode button:backdrop {
         color: #dbe9f7;
         border-color: #4a90d9;
         background-image: linear-gradient(to bottom, #4a90d9);
@@ -1566,31 +1566,31 @@ headerbar {
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         -gtk-icon-effect: none;
         border-color: #184472; }
-        .selection-mode.titlebar:not(headerbar) button:backdrop:active, .selection-mode.titlebar:not(headerbar) button:backdrop:checked, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:active, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop:active, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:active,
-        .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:active, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:checked, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop:checked, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:checked,
-        .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:checked,
-        headerbar.selection-mode button:backdrop:active,
-        headerbar.selection-mode button:backdrop:checked,
-        headerbar.selection-mode button.flat:backdrop:active,
+        .selection-mode.titlebar:not(headerbar) button:backdrop.flat:active, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop:active, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:active,
+        .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:active, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:checked, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop:checked, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:checked,
+        .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:checked, .selection-mode.titlebar:not(headerbar) button:backdrop:active, .selection-mode.titlebar:not(headerbar) button:backdrop:checked,
+        headerbar.selection-mode button:backdrop.flat:active,
         headerbar.selection-mode notebook > header > tabs > arrow:backdrop:active,
         headerbar.selection-mode button.sidebar-button:backdrop:active,
         headerbar.selection-mode button.titlebutton:backdrop:active,
-        headerbar.selection-mode button.flat:backdrop:checked,
+        headerbar.selection-mode button:backdrop.flat:checked,
         headerbar.selection-mode notebook > header > tabs > arrow:backdrop:checked,
         headerbar.selection-mode button.sidebar-button:backdrop:checked,
-        headerbar.selection-mode button.titlebutton:backdrop:checked {
+        headerbar.selection-mode button.titlebutton:backdrop:checked,
+        headerbar.selection-mode button:backdrop:active,
+        headerbar.selection-mode button:backdrop:checked {
           color: #d4e4f4;
           border-color: #2a76c6;
           background-image: linear-gradient(to bottom, #2a76c6);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0);
           border-color: #184472; }
-        .selection-mode.titlebar:not(headerbar) button:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled,
-        .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled,
-        headerbar.selection-mode button:backdrop:disabled,
-        headerbar.selection-mode button.flat:backdrop:disabled,
+        .selection-mode.titlebar:not(headerbar) button:backdrop.flat:disabled, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled,
+        .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled,
+        headerbar.selection-mode button:backdrop.flat:disabled,
         headerbar.selection-mode notebook > header > tabs > arrow:backdrop:disabled,
         headerbar.selection-mode button.sidebar-button:backdrop:disabled,
-        headerbar.selection-mode button.titlebutton:backdrop:disabled {
+        headerbar.selection-mode button.titlebutton:backdrop:disabled,
+        headerbar.selection-mode button:backdrop:disabled {
           color: #9bc2ea;
           border-color: #65a1df;
           background-image: linear-gradient(to bottom, #65a1df);
@@ -1598,28 +1598,28 @@ headerbar {
           -gtk-icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0);
           border-color: #184472; }
-        .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:checked, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled:active,
-        .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled:checked, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop:disabled:checked, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled:checked,
-        .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled:checked,
-        headerbar.selection-mode button:backdrop:disabled:active,
-        headerbar.selection-mode button:backdrop:disabled:checked,
-        headerbar.selection-mode button.flat:backdrop:disabled:active,
-        headerbar.selection-mode notebook > header > tabs > arrow:backdrop:disabled:active,
-        headerbar.selection-mode button.sidebar-button:backdrop:disabled:active,
-        headerbar.selection-mode button.titlebutton:backdrop:disabled:active,
-        headerbar.selection-mode button.flat:backdrop:disabled:checked,
-        headerbar.selection-mode notebook > header > tabs > arrow:backdrop:disabled:checked,
-        headerbar.selection-mode button.sidebar-button:backdrop:disabled:checked,
-        headerbar.selection-mode button.titlebutton:backdrop:disabled:checked {
-          color: #8db9e8;
-          border-color: #5094db;
-          background-image: linear-gradient(to bottom, #5094db);
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0);
-          border-color: #184472; }
+          .selection-mode.titlebar:not(headerbar) button:backdrop.flat:disabled:active, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled:active,
+          .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:disabled:checked, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop:disabled:checked, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled:checked,
+          .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled:checked, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:checked,
+          headerbar.selection-mode button:backdrop.flat:disabled:active,
+          headerbar.selection-mode notebook > header > tabs > arrow:backdrop:disabled:active,
+          headerbar.selection-mode button.sidebar-button:backdrop:disabled:active,
+          headerbar.selection-mode button.titlebutton:backdrop:disabled:active,
+          headerbar.selection-mode button:backdrop.flat:disabled:checked,
+          headerbar.selection-mode notebook > header > tabs > arrow:backdrop:disabled:checked,
+          headerbar.selection-mode button.sidebar-button:backdrop:disabled:checked,
+          headerbar.selection-mode button.titlebutton:backdrop:disabled:checked,
+          headerbar.selection-mode button:backdrop:disabled:active,
+          headerbar.selection-mode button:backdrop:disabled:checked {
+            color: #8db9e8;
+            border-color: #5094db;
+            background-image: linear-gradient(to bottom, #5094db);
+            box-shadow: inset 0 1px rgba(255, 255, 255, 0);
+            border-color: #184472; }
       .selection-mode.titlebar:not(headerbar) button.flat:backdrop, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop,
       .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop, .selection-mode.titlebar:not(headerbar) button.flat:disabled, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:disabled, .selection-mode.titlebar:not(headerbar) button.sidebar-button:disabled,
-      .selection-mode.titlebar:not(headerbar) button.titlebutton:disabled, .selection-mode.titlebar:not(headerbar) button.flat:disabled:backdrop, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:disabled:backdrop, .selection-mode.titlebar:not(headerbar) button.sidebar-button:disabled:backdrop,
-      .selection-mode.titlebar:not(headerbar) button.titlebutton:disabled:backdrop,
+      .selection-mode.titlebar:not(headerbar) button.titlebutton:disabled, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled, .selection-mode.titlebar:not(headerbar) notebook > header > tabs > arrow:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled,
+      .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled,
       headerbar.selection-mode button.flat:backdrop,
       headerbar.selection-mode notebook > header > tabs > arrow:backdrop,
       headerbar.selection-mode button.sidebar-button:backdrop,
@@ -1628,10 +1628,10 @@ headerbar {
       headerbar.selection-mode notebook > header > tabs > arrow:disabled,
       headerbar.selection-mode button.sidebar-button:disabled,
       headerbar.selection-mode button.titlebutton:disabled,
-      headerbar.selection-mode button.flat:disabled:backdrop,
-      headerbar.selection-mode notebook > header > tabs > arrow:disabled:backdrop,
-      headerbar.selection-mode button.sidebar-button:disabled:backdrop,
-      headerbar.selection-mode button.titlebutton:disabled:backdrop {
+      headerbar.selection-mode button.flat:backdrop:disabled,
+      headerbar.selection-mode notebook > header > tabs > arrow:backdrop:disabled,
+      headerbar.selection-mode button.sidebar-button:backdrop:disabled,
+      headerbar.selection-mode button.titlebutton:backdrop:disabled {
         border-color: transparent;
         background-color: transparent;
         background-image: none;
@@ -1802,9 +1802,9 @@ treeview.view {
   -GtkTreeView-expander-size: 16;
   border-left-color: #979a9b;
   border-top-color: #e8e8e7; }
-  treeview.view:selected, treeview.view:selected:focus {
+  treeview.view:selected:focus, treeview.view:selected {
     border-radius: 0; }
-  treeview.view:selected, treeview.view:backdrop:selected {
+  treeview.view:selected:backdrop, treeview.view:selected {
     border-left-color: #a5c8ec;
     border-top-color: rgba(46, 52, 54, 0.1); }
   treeview.view:disabled {
@@ -1883,8 +1883,7 @@ treeview.view {
     treeview.view header button:active {
       color: #2e3436;
       transition: none; }
-  treeview.view header button:last-child,
-  treeview.view header button:last-child:backdrop {
+  treeview.view header button:last-child:backdrop, treeview.view header button:last-child {
     border-right-style: none; }
   treeview.view button.dnd:active, treeview.view button.dnd:selected, treeview.view button.dnd:hover, treeview.view button.dnd,
   treeview.view header.button.dnd:active,
@@ -2468,7 +2467,7 @@ switch {
       border-left-color: #9d9d99; }
     row:selected switch.slider:dir(ltr) {
       border-right-color: #9d9d99; }
-    row:selected switch.slider, row:selected switch.slider:active {
+    row:selected switch.slider:active, row:selected switch.slider {
       border-color: #184472; }
 
 /*************************
@@ -2521,9 +2520,9 @@ checkbutton.text-button, radiobutton.text-button {
     margin-left: 4px; }
   checkbutton.text-button label:not(:only-child):last-child, radiobutton.text-button label:not(:only-child):last-child {
     margin-right: 4px; }
-  checkbutton.text-button:disabled, checkbutton.text-button:disabled:active, checkbutton.text-button:disabled:indeterminate, radiobutton.text-button:disabled, radiobutton.text-button:disabled:active, radiobutton.text-button:disabled:indeterminate {
+  checkbutton.text-button:disabled:active, checkbutton.text-button:disabled:indeterminate, checkbutton.text-button:disabled, radiobutton.text-button:disabled:active, radiobutton.text-button:disabled:indeterminate, radiobutton.text-button:disabled {
     color: #8b8e8f; }
-    checkbutton.text-button:disabled:backdrop, checkbutton.text-button:disabled:active:backdrop, checkbutton.text-button:disabled:indeterminate:backdrop, radiobutton.text-button:disabled:backdrop, radiobutton.text-button:disabled:active:backdrop, radiobutton.text-button:disabled:indeterminate:backdrop {
+    checkbutton.text-button:disabled:active:backdrop, checkbutton.text-button:disabled:indeterminate:backdrop, checkbutton.text-button:disabled:backdrop, radiobutton.text-button:disabled:active:backdrop, radiobutton.text-button:disabled:indeterminate:backdrop, radiobutton.text-button:disabled:backdrop {
       color: #c3c3c0; }
 
 check,
@@ -4189,49 +4188,44 @@ headerbar.selection-mode button.titlebutton,
   .titlebar.selection-mode button.titlebutton:backdrop {
     -gtk-icon-shadow: none; }
 
-.view:selected, iconview:selected, .view:selected:focus, iconview:selected:focus,
-.view text:selected,
-iconview text:selected,
-textview text:selected,
+.view:selected:focus, iconview:selected:focus, .view:selected, iconview:selected,
 .view text:selected:focus,
 iconview text:selected:focus,
-textview text:selected:focus, .view text selection, iconview text selection,
-.view text selection:focus,
-iconview text selection:focus,
-textview text selection,
-textview text selection:focus, flowbox flowboxchild:selected, label:selected,
+textview text:selected:focus,
+.view text:selected,
+iconview text:selected,
+textview text:selected, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection,
+textview text selection:focus,
+textview text selection, flowbox flowboxchild:selected, label:selected,
 label selection,
 label selection:focus,
-label selection:hover, entry selection, spinbutton:not(.vertical) selection,
-entry selection:focus, modelbutton.flat:selected, popover.background checkbutton:selected,
+label selection:hover, entry selection:focus, entry selection, spinbutton:not(.vertical) selection, modelbutton.flat:selected, popover.background checkbutton:selected,
 popover.background radiobutton:selected,
-.menuitem.button.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, calendar:selected, .sidebar :selected {
+.menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected, .sidebar :selected {
   background-color: #4a90d9;
   color: #ffffff;
   outline-color: rgba(255, 255, 255, 0.3); }
-  .view:disabled:selected, iconview:disabled:selected, iconview:disabled:selected:focus,
+  iconview:disabled:selected:focus, .view:disabled:selected, iconview:disabled:selected,
+  iconview text:disabled:selected:focus,
+  textview text:disabled:selected:focus,
   .view text:disabled:selected,
   iconview text:disabled:selected,
-  textview text:disabled:selected,
-  iconview text:disabled:selected:focus,
-  textview text:disabled:selected:focus, .view text selection:disabled, iconview text selection:disabled,
-  iconview text selection:disabled:focus,
+  textview text:disabled:selected, iconview text selection:disabled:focus, .view text selection:disabled, iconview text selection:disabled,
   textview text selection:disabled, flowbox flowboxchild:disabled:selected, label:disabled:selected,
   label selection:disabled, entry selection:disabled, spinbutton:not(.vertical) selection:disabled, modelbutton.flat:disabled:selected, popover.background checkbutton:disabled:selected,
   popover.background radiobutton:disabled:selected,
-  .menuitem.button.flat:disabled:selected, treeview.view:disabled:selected:focus, row:disabled:selected, calendar:disabled:selected, .sidebar :disabled:selected, placessidebar row:selected:disabled label {
+  .menuitem.button.flat:disabled:selected, row:disabled:selected, calendar:disabled:selected, .sidebar :disabled:selected, placessidebar row:selected:disabled label {
     color: #a5c8ec; }
-  .view:backdrop:selected, iconview:backdrop:selected, iconview:backdrop:selected:focus,
+  iconview:backdrop:selected:focus, .view:backdrop:selected, iconview:backdrop:selected,
+  iconview text:backdrop:selected:focus,
+  textview text:backdrop:selected:focus,
   .view text:backdrop:selected,
   iconview text:backdrop:selected,
-  textview text:backdrop:selected,
-  iconview text:backdrop:selected:focus,
-  textview text:backdrop:selected:focus, .view text selection:backdrop, iconview text selection:backdrop,
-  iconview text selection:backdrop:focus,
+  textview text:backdrop:selected, iconview text selection:backdrop:focus, .view text selection:backdrop, iconview text selection:backdrop,
   textview text selection:backdrop, flowbox flowboxchild:backdrop:selected, label:backdrop:selected,
   label selection:backdrop, entry selection:backdrop, spinbutton:not(.vertical) selection:backdrop, modelbutton.flat:backdrop:selected, popover.background checkbutton:backdrop:selected,
   popover.background radiobutton:backdrop:selected,
-  .menuitem.button.flat:backdrop:selected, treeview.view:backdrop:selected:focus, row:backdrop:selected, calendar:backdrop:selected, .sidebar :backdrop:selected {
+  .menuitem.button.flat:backdrop:selected, row:backdrop:selected, calendar:backdrop:selected, .sidebar :backdrop:selected {
     color: #ffffff; }
     .view:backdrop:disabled:selected, iconview:backdrop:disabled:selected,
     .view text:backdrop:disabled:selected,