[gtk/gtk-3-24: 1/2] Adwaita: Stop using $button_fill




commit 6da446c1be43257ab006e5ac07e514c7e5e64bc2
Author: nana-4 <hnmaigo gmail com>
Date:   Sat Nov 14 11:49:28 2020 +0900

    Adwaita: Stop using $button_fill
    
    The $button_fill hack for button.circular is pretty awkward and is
    currently broken. Instead of relying on it, allow the button() mixin to
    have an additional background-image optionally.
    
    Fixes https://gitlab.gnome.org/GNOME/gtk/-/issues/3354

 gtk/theme/Adwaita/_colors.scss                   |   3 -
 gtk/theme/Adwaita/_common.scss                   |   6 +-
 gtk/theme/Adwaita/_drawing.scss                  |  63 +++++------
 gtk/theme/Adwaita/gtk-contained-dark.css         |  26 ++---
 gtk/theme/Adwaita/gtk-contained.css              |  26 ++---
 gtk/theme/HighContrast/gtk-contained-inverse.css | 128 +++++++++++------------
 gtk/theme/HighContrast/gtk-contained.css         | 128 +++++++++++------------
 7 files changed, 181 insertions(+), 199 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_colors.scss b/gtk/theme/Adwaita/_colors.scss
index c4f708e293..32dd7625d5 100644
--- a/gtk/theme/Adwaita/_colors.scss
+++ b/gtk/theme/Adwaita/_colors.scss
@@ -1,9 +1,6 @@
 // When color definition differs for dark and light variant
 // it gets @if ed depending on $variant
 
-//global variables no longer in scss
-$button_fill: null;
-
 $base_color: if($variant == 'light', #ffffff, lighten(desaturate(#241f31, 100%), 2%));
 $text_color: if($variant == 'light', black, white);
 $bg_color: if($variant == 'light', #f6f5f4, darken(desaturate(#3d3846, 100%), 4%));
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 3355266a09..fd993fc088 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -916,16 +916,14 @@ button {
     $_border_bg: linear-gradient(to top, $alt-borders-color 25%, $borders-color 50%);
 
     &:not(.flat):not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) {
-      @include button(normal);
+      @include button(normal, $backimage: $_border_bg);
 
-      background-image: $button_fill, $_border_bg;
       border-color: transparent;
     }
 
     &:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) {
-      @include button(hover);
+      @include button(hover, $backimage: $_border_bg);
 
-      background-image: $button_fill, $_border_bg;
       border-color: transparent;
     }
 
diff --git a/gtk/theme/Adwaita/_drawing.scss b/gtk/theme/Adwaita/_drawing.scss
index 6e173dd548..19eedc358a 100644
--- a/gtk/theme/Adwaita/_drawing.scss
+++ b/gtk/theme/Adwaita/_drawing.scss
@@ -166,7 +166,7 @@
   }
 }
 
-@mixin button($t, $c:$bg_color, $tc:$fg_color, $edge: none) {
+@mixin button($t, $c:$bg_color, $tc:$fg_color, $edge: none, $backimage: null) {
 //
 // Button drawing function
 //
@@ -175,13 +175,13 @@
 // $tc:   optional text color for colored* types
 // $edge: set to none to not draw the bottom edge or specify a color to not
 //        use the default one
+// $backimage: additional background-image behind the default one
+//             (for the button.circular hack)
 //
 // possible $t values:
 // normal, hover, active, insensitive, insensitive-active,
 // backdrop, backdrop-active, backdrop-insensitive, backdrop-insensitive-active,
 // osd, osd-hover, osd-active, osd-insensitive, osd-backdrop, undecorated
-//
-// This mixin sets the $button_fill global variable which containts the button background-image
 //
   $_hilight_color: _button_hilight_color($c);
   $_button_edge: if($edge == none, none, _widget_edge($edge));
@@ -196,9 +196,9 @@
     outline-color: transparentize($tc, 0.7);
     border-color: if($c != $bg_color, _border_color($c), $borders_color);
     border-bottom-color: if($c != $bg_color, _border_color($c, true), $alt_borders_color);
-    $button_fill: if($variant == 'light', linear-gradient(to top, darken($c, 4%) 2px, $c),
-                                          linear-gradient(to top, darken($c,1%) 2px, $c));
-    background-image: $button_fill;
+    background-image: if($variant == 'light', linear-gradient(to top, darken($c, 4%) 2px, $c),
+                                              linear-gradient(to top, darken($c,1%) 2px, $c)),
+                      $backimage;
     @include _button_text_shadow($tc, $c);
     @include _shadows(inset 0 1px $_hilight_color, $_button_edge, $_button_shadow);
   }
@@ -212,16 +212,17 @@
     border-color: if($c != $bg_color, _border_color($c), $borders_color);
     border-bottom-color: if($c != $bg_color, _border_color($c, true), $alt_borders_color);
     @if $variant == 'light' {
-      $button_fill: linear-gradient(to top, $c, lighten($c, 1%) 1px);
+      background-image: linear-gradient(to top, $c, lighten($c, 1%) 1px),
+                        $backimage;
       @include _button_text_shadow($tc, lighten($c, 6%));
       @include _shadows(inset 0 1px _button_hilight_color(lighten($c, 6%)), $_button_edge, $_button_shadow);
     }
     @else {
-      $button_fill: linear-gradient(to top, darken($c,1%), lighten($c, 1%) 1px);
+      background-image: linear-gradient(to top, darken($c,1%), lighten($c, 1%) 1px),
+                        $backimage;
       @include _button_text_shadow($tc,lighten($c, 6%));
       @include _shadows(inset 0 1px _button_hilight_color(darken($c, 2%)), $_button_edge, $_button_shadow);
     }
-    background-image: $button_fill;
   }
 
   @if $t==normal-alt {
@@ -252,16 +253,15 @@
     outline-color: transparentize($tc, 0.7);
     border-color: if($c != $bg_color, _border_color($c, true), $alt_borders_color);
     @if $variant == 'light' {
-      $button_fill: linear-gradient(to bottom, lighten($c, 9%) 10%, lighten($c, 4%) 90%);
+      background-image: linear-gradient(to bottom, lighten($c, 9%) 10%, lighten($c, 4%) 90%);
       @include _shadows(inset 0 1px _button_hilight_color(lighten($c, 6%)),
                         $_button_edge, $_button_shadow);
     }
     @else {
-      $button_fill: linear-gradient(to bottom, $c 20%, darken($c, 4%) 90%);
+      background-image: linear-gradient(to bottom, $c 20%, darken($c, 4%) 90%);
       @include _shadows(inset 0 1px $_hilight_color,
                         $_button_edge, $_button_shadow);
     }
-    background-image: $button_fill;
   }
 
   @else if $t==active {
@@ -271,8 +271,7 @@
     color: $tc;
     outline-color: transparentize($tc, 0.7);
     border-color: if($c != $bg_color, _border_color($c), $borders_color);
-    $button_fill: if($variant == 'light', image(darken($c, 14%)), image(darken($c, 9%)));
-    background-image: $button_fill;
+    background-image: if($variant == 'light', image(darken($c, 14%)), image(darken($c, 9%)));
     @include _shadows(inset 0 1px transparentize($_hilight_color, 1), $_button_edge);
 
     text-shadow: none;
@@ -287,8 +286,7 @@
 
     color: if($tc != $fg_color, mix($tc, $_bg, 50%), $insensitive_fg_color);
     border-color: if($c != $bg_color, _border_color($c), $insensitive_borders_color);
-    $button_fill: image($_bg);
-    background-image: $button_fill;
+    background-image: image($_bg);
     text-shadow: none;
     -gtk-icon-shadow: none;
     // white with 0 alpha to avoid an ugly transition, since no color means
@@ -305,8 +303,7 @@
 
     color: if($c != $bg_color, mix($tc, $_bg, 60%), $insensitive_fg_color);
     border-color: $_bc;
-    $button_fill: image($_bg);
-    background-image: $button_fill;
+    background-image: image($_bg);
     // white with 0 alpha to avoid an ugly transition, since no color means
     // black with 0 alpha
     @include _shadows(inset 0 1px transparentize(white, 1), $_button_edge);
@@ -321,8 +318,7 @@
 
     color: if($tc != $fg_color, mix($tc, $_bg, 80%), $backdrop_fg_color);
     border-color: if($c != $bg_color, $_bc, $backdrop_borders_color);
-    $button_fill: image($_bg);
-    background-image: $button_fill;
+    background-image: image($_bg);
     text-shadow: none;
     -gtk-icon-shadow: none;
     @include _shadows(inset 0 1px transparentize(white, 1), $_blank_edge);
@@ -337,8 +333,7 @@
 
     color: if($tc != $fg_color, mix($tc, $_bg, 80%), $backdrop_fg_color);
     border-color: if($c != $bg_color, $_bc, $backdrop_borders_color);
-    $button_fill: image($_bg);
-    background-image: $button_fill;
+    background-image: image($_bg);
     @include _shadows(inset 0 1px transparentize(white, 1), $_blank_edge);
   }
 
@@ -352,8 +347,7 @@
 
     color: if($c != $bg_color, mix($tc, $_bg, 35%), $backdrop_insensitive_color);
     border-color: if($c != $bg_color, $_bc, $backdrop_borders_color);
-    $button_fill: image($_bg);
-    background-image: $button_fill;
+    background-image: image($_bg);
     text-shadow: none;
     -gtk-icon-shadow: none;
     // white with 0 alpha to avoid an ugly transition, since no color means
@@ -371,8 +365,7 @@
 
     color: if($c != $bg_color, mix($tc, $_bg, 35%), $backdrop_insensitive_color);
     border-color: if($c != $bg_color, $_bc, $backdrop_borders_color);
-    $button_fill: image($_bg);
-    background-image: $button_fill;
+    background-image: image($_bg);
     @include _shadows(inset 0 1px transparentize(white, 1), $_blank_edge);
   }
 
@@ -385,8 +378,7 @@
     color: $osd_fg_color;
     border-color: $osd_borders_color;
     background-color: transparent;
-    $button_fill: image($_bg);
-    background-image: $button_fill;
+    background-image: image($_bg);
     background-clip: padding-box;
     box-shadow: inset 0 1px transparentize(white, 0.9);
     text-shadow: 0 1px black;
@@ -403,8 +395,7 @@
     color: white;
     border-color: $osd_borders_color;
     background-color: transparent;
-    $button_fill: image($_bg);
-    background-image: $button_fill;
+    background-image: image($_bg);
     background-clip: padding-box;
     box-shadow: inset 0 1px transparentize(white, 0.9);
     text-shadow: 0 1px black;
@@ -421,8 +412,7 @@
     color: white;
     border-color: $osd_borders_color;
     background-color: transparent;
-    $button_fill: image($_bg);
-    background-image: $button_fill;
+    background-image: image($_bg);
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -437,8 +427,7 @@
     color: $osd_insensitive_fg_color;
     border-color: $osd_borders_color;
     background-color: transparent;
-    $button_fill: image($osd_insensitive_bg_color);
-    background-image: $button_fill;
+    background-image: image($osd_insensitive_bg_color);
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -454,8 +443,7 @@
     color: $osd_fg_color;
     border-color: $osd_borders_color;
     background-color: transparent;
-    $button_fill: image($_bg);
-    background-image: $button_fill;
+    background-image: image($_bg);
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -468,8 +456,7 @@
   //
     border-color: transparent;
     background-color: transparent;
-    $button_fill: none;
-    background-image: $button_fill;
+    background-image: none;
 
     @include _shadows(inset 0 1px transparentize(white, 1), $_blank_edge);
 
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index c2c86c405d..00b0f57dbe 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -220,7 +220,7 @@ button.titlebutton:hover, button.sidebar-button:hover, notebook > header > tabs
 
 button.titlebutton:hover:active, button.sidebar-button:hover:active, notebook > header > tabs > 
arrow:hover:active, button.flat:hover:active { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
 
-notebook > header > tabs > arrow:hover, button:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 
0.3); border-color: #1b1b1b; border-bottom-color: #070707; text-shadow: 0 -1px rgba(0, 0, 0, 0.786353); 
-gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.786353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 
2px rgba(0, 0, 0, 0.07); -gtk-icon-effect: highlight; }
+notebook > header > tabs > arrow:hover, button:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 
0.3); border-color: #1b1b1b; border-bottom-color: #070707; background-image: linear-gradient(to top, #323232, 
#373737 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.786353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.786353); 
box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); -gtk-icon-effect: 
highlight; }
 
 notebook > header > tabs > arrow:active, notebook > header > tabs > arrow:checked, button:active, 
button:checked { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; 
background-image: image(#1e1e1e); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; 
-gtk-icon-shadow: none; transition-duration: 50ms; }
 
@@ -288,7 +288,7 @@ button.suggested-action { color: white; outline-color: rgba(255, 255, 255, 0.3);
 
 button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: 
none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: 
#15539e; }
 
-button.suggested-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: 
#0f3b71; border-bottom-color: #092444; text-shadow: 0 -1px rgba(0, 0, 0, 0.671216); -gtk-icon-shadow: 0 -1px 
rgba(0, 0, 0, 0.671216); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }
+button.suggested-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: 
#0f3b71; border-bottom-color: #092444; background-image: linear-gradient(to top, #155099, #1655a2 1px); 
text-shadow: 0 -1px rgba(0, 0, 0, 0.671216); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.671216); box-shadow: 
inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }
 
 button.suggested-action:active, button.suggested-action:checked { color: white; outline-color: rgba(255, 
255, 255, 0.3); border-color: #0f3b71; background-image: image(#103e75); box-shadow: inset 0 1px rgba(255, 
255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
 
@@ -320,7 +320,7 @@ button.destructive-action { color: white; outline-color: rgba(255, 255, 255, 0.3
 
 button.destructive-action.flat { border-color: transparent; background-color: transparent; background-image: 
none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: 
#b2161d; }
 
-button.destructive-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: 
#851015; border-bottom-color: #570b0e; text-shadow: 0 -1px rgba(0, 0, 0, 0.638275); -gtk-icon-shadow: 0 -1px 
rgba(0, 0, 0, 0.638275); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }
+button.destructive-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: 
#851015; border-bottom-color: #570b0e; background-image: linear-gradient(to top, #ae151c, #b7161d 1px); 
text-shadow: 0 -1px rgba(0, 0, 0, 0.638275); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.638275); box-shadow: 
inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }
 
 button.destructive-action:active, button.destructive-action:checked { color: white; outline-color: rgba(255, 
255, 255, 0.3); border-color: #851015; background-image: image(#8a1116); box-shadow: inset 0 1px rgba(255, 
255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
 
@@ -370,9 +370,9 @@ button.circular { border-radius: 9999px; -gtk-outline-radius: 9999px; padding: 4
 
 button.circular label { padding: 0; }
 
-button.circular:not(.flat):not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: 
#eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; border-bottom-color: #070707; 
background-image: linear-gradient(to top, #323232 2px, #353535); text-shadow: 0 -1px rgba(0, 0, 0, 0.834353); 
-gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.834353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 
2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #070707 25%, #1b1b1b 50%); border-color: 
transparent; }
+button.circular:not(.flat):not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: 
#eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; border-bottom-color: #070707; 
background-image: linear-gradient(to top, #323232 2px, #353535), linear-gradient(to top, #070707 25%, #1b1b1b 
50%); text-shadow: 0 -1px rgba(0, 0, 0, 0.834353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.834353); 
box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); border-color: transparent; }
 
-button.circular:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #eeeeec; 
outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; border-bottom-color: #070707; text-shadow: 0 
-1px rgba(0, 0, 0, 0.786353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.786353); box-shadow: inset 0 1px 
rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #070707 
25%, #1b1b1b 50%); border-color: transparent; }
+button.circular:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #eeeeec; 
outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; border-bottom-color: #070707; 
background-image: linear-gradient(to top, #323232, #373737 1px), linear-gradient(to top, #070707 25%, #1b1b1b 
50%); text-shadow: 0 -1px rgba(0, 0, 0, 0.786353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.786353); 
box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); border-color: transparent; }
 
 stacksidebar row.needs-attention > label, .stack-switcher > button.needs-attention > label, .stack-switcher 
button.needs-attention > image { animation: needs_attention 150ms ease-in; background-image: 
-gtk-gradient(radial, center center, 0, center center, 0.5, to(#1f76e1), to(transparent)), 
-gtk-gradient(radial, center center, 0, center center, 0.45, to(rgba(0, 0, 0, 0.834353)), to(transparent)); 
background-size: 6px 6px, 6px 6px; background-repeat: no-repeat; background-position: right 3px, right 2px; }
 
@@ -382,7 +382,7 @@ stacksidebar row.needs-attention > label:dir(rtl), .stack-switcher > button.need
 
 .inline-toolbar toolbutton > button { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: 
#1b1b1b; border-bottom-color: #070707; background-image: linear-gradient(to top, #323232 2px, #353535); 
text-shadow: 0 -1px rgba(0, 0, 0, 0.834353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.834353); box-shadow: 
inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }
 
-.inline-toolbar toolbutton > button:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); 
border-color: #1b1b1b; border-bottom-color: #070707; text-shadow: 0 -1px rgba(0, 0, 0, 0.786353); 
-gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.786353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 
2px rgba(0, 0, 0, 0.07); }
+.inline-toolbar toolbutton > button:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); 
border-color: #1b1b1b; border-bottom-color: #070707; background-image: linear-gradient(to top, #323232, 
#373737 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.786353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.786353); 
box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked { color: #eeeeec; 
outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; background-image: image(#1e1e1e); box-shadow: 
inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
 
@@ -437,7 +437,7 @@ button.color colorswatch:only-child, button.color colorswatch:only-child overlay
 /* tone down as per new designs, see issue #1473, #1748 */
 list row button.image-button:not(.flat) { border: 1px solid rgba(27, 27, 27, 0.5); }
 
-list row button.image-button:not(.flat):hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); 
border-color: #1b1b1b; border-bottom-color: #070707; text-shadow: 0 -1px rgba(0, 0, 0, 0.786353); 
-gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.786353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 
2px rgba(0, 0, 0, 0.07); }
+list row button.image-button:not(.flat):hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); 
border-color: #1b1b1b; border-bottom-color: #070707; background-image: linear-gradient(to top, #323232, 
#373737 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.786353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.786353); 
box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }
 
 list row button.image-button:not(.flat):active, list row button.image-button:not(.flat):checked { color: 
#eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; background-image: image(#1e1e1e); 
box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
 
@@ -594,7 +594,7 @@ searchbar > revealer > box { margin: -6px; padding: 6px; }
 
 .selection-mode button.titlebutton, .selection-mode .titlebar:not(headerbar) button.flat, 
.selection-mode.titlebar:not(headerbar) button.flat, .selection-mode headerbar button.flat, 
headerbar.selection-mode button.flat { border-color: transparent; background-color: transparent; 
background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: 
none; }
 
-.selection-mode .titlebar:not(headerbar) button:hover, .selection-mode.titlebar:not(headerbar) button:hover, 
.selection-mode headerbar button:hover, headerbar.selection-mode button:hover { color: #ffffff; 
outline-color: rgba(255, 255, 255, 0.3); border-color: #0f3b71; border-bottom-color: #092444; text-shadow: 0 
-1px rgba(0, 0, 0, 0.671216); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.671216); box-shadow: inset 0 1px 
rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }
+.selection-mode .titlebar:not(headerbar) button:hover, .selection-mode.titlebar:not(headerbar) button:hover, 
.selection-mode headerbar button:hover, headerbar.selection-mode button:hover { color: #ffffff; 
outline-color: rgba(255, 255, 255, 0.3); border-color: #0f3b71; border-bottom-color: #092444; 
background-image: linear-gradient(to top, #155099, #1655a2 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.671216); 
-gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.671216); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 
2px rgba(0, 0, 0, 0.07); }
 
 .selection-mode .titlebar:not(headerbar) button:active, .selection-mode .titlebar:not(headerbar) 
button:checked, .selection-mode.titlebar:not(headerbar) button:active, 
.selection-mode.titlebar:not(headerbar) button:checked, .selection-mode headerbar button:active, 
.selection-mode headerbar button:checked, .selection-mode headerbar button.toggle:checked, .selection-mode 
headerbar button.toggle:active, headerbar.selection-mode button:active, headerbar.selection-mode 
button:checked, headerbar.selection-mode button.toggle:checked, headerbar.selection-mode button.toggle:active 
{ color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #0f3b71; background-image: 
image(#103e75); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
 
@@ -614,7 +614,7 @@ searchbar > revealer > box { margin: -6px; padding: 6px; }
 
 .selection-mode .titlebar:not(headerbar) button.suggested-action, .selection-mode.titlebar:not(headerbar) 
button.suggested-action, .selection-mode headerbar button.suggested-action, headerbar.selection-mode 
button.suggested-action { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; 
border-bottom-color: #070707; background-image: linear-gradient(to top, #323232 2px, #353535); text-shadow: 0 
-1px rgba(0, 0, 0, 0.834353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.834353); box-shadow: inset 0 1px 
rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); border-color: #030c17; }
 
-.selection-mode .titlebar:not(headerbar) button.suggested-action:hover, 
.selection-mode.titlebar:not(headerbar) button.suggested-action:hover, .selection-mode headerbar 
button.suggested-action:hover, headerbar.selection-mode button.suggested-action:hover { color: #eeeeec; 
outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; border-bottom-color: #070707; text-shadow: 0 
-1px rgba(0, 0, 0, 0.786353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.786353); box-shadow: inset 0 1px 
rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); border-color: #030c17; }
+.selection-mode .titlebar:not(headerbar) button.suggested-action:hover, 
.selection-mode.titlebar:not(headerbar) button.suggested-action:hover, .selection-mode headerbar 
button.suggested-action:hover, headerbar.selection-mode button.suggested-action:hover { color: #eeeeec; 
outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; border-bottom-color: #070707; 
background-image: linear-gradient(to top, #323232, #373737 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.786353); 
-gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.786353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 
2px rgba(0, 0, 0, 0.07); border-color: #030c17; }
 
 .selection-mode .titlebar:not(headerbar) button.suggested-action:active, 
.selection-mode.titlebar:not(headerbar) button.suggested-action:active, .selection-mode headerbar 
button.suggested-action:active, headerbar.selection-mode button.suggested-action:active { color: #eeeeec; 
outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; background-image: image(#1e1e1e); box-shadow: 
inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; border-color: #030c17; }
 
@@ -1059,7 +1059,7 @@ switch slider { margin: -1px; min-width: 24px; min-height: 24px; border: 1px sol
 
 switch image { color: transparent; }
 
-switch:hover slider { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #111111; 
box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); }
+switch:hover slider { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #111111; 
background-image: linear-gradient(to bottom, #444444 20%, #3a3a3a 90%); box-shadow: inset 0 1px rgba(255, 
255, 255, 0.02), 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); }
 
 switch:checked > slider { border: 1px solid #030c17; }
 
@@ -1233,7 +1233,7 @@ scale fill:disabled:backdrop, scale fill:disabled { border-color: transparent; b
 
 scale slider { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #070707; text-shadow: 
0 -1px rgba(0, 0, 0, 0.834353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.834353); background-image: 
linear-gradient(to bottom, #2d2d2d 20%, #262626 90%); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 
1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); border: 1px solid black; border-radius: 100%; 
transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); transition-property: background, border, 
box-shadow; }
 
-scale slider:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #070707; 
box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); }
+scale slider:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #070707; 
background-image: linear-gradient(to bottom, #353535 20%, #2b2b2b 90%); box-shadow: inset 0 1px rgba(255, 
255, 255, 0.02), 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); }
 
 scale slider:active { border-color: #030c17; }
 
@@ -1728,7 +1728,7 @@ infobar.info:backdrop, infobar.question:backdrop, infobar.warning:backdrop, info
 
 infobar.info button, infobar.question button, infobar.warning button, infobar.error button { color: #eeeeec; 
outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; border-bottom-color: #070707; 
background-image: linear-gradient(to top, #323232 2px, #353535); text-shadow: 0 -1px rgba(0, 0, 0, 0.834353); 
-gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.834353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 
2px rgba(0, 0, 0, 0.07); }
 
-infobar.info button:hover, infobar.question button:hover, infobar.warning button:hover, infobar.error 
button:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; 
border-bottom-color: #070707; text-shadow: 0 -1px rgba(0, 0, 0, 0.786353); -gtk-icon-shadow: 0 -1px rgba(0, 
0, 0, 0.786353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }
+infobar.info button:hover, infobar.question button:hover, infobar.warning button:hover, infobar.error 
button:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1b1b; 
border-bottom-color: #070707; background-image: linear-gradient(to top, #323232, #373737 1px); text-shadow: 0 
-1px rgba(0, 0, 0, 0.786353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.786353); box-shadow: inset 0 1px 
rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }
 
 infobar.info button:active, infobar.info button:checked, infobar.question button:active, infobar.question 
button:checked, infobar.warning button:active, infobar.warning button:checked, infobar.error button:active, 
infobar.error button:checked { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: 
#1b1b1b; background-image: image(#1e1e1e); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; 
-gtk-icon-shadow: none; }
 
@@ -1806,7 +1806,7 @@ colorswatch#add-color-button:only-child { border-radius: 5px; }
 
 colorswatch#add-color-button overlay { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); 
border-color: #1b1b1b; border-bottom-color: #070707; background-image: linear-gradient(to top, #323232 2px, 
#353535); text-shadow: 0 -1px rgba(0, 0, 0, 0.834353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.834353); 
box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }
 
-colorswatch#add-color-button overlay:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); 
border-color: #1b1b1b; border-bottom-color: #070707; text-shadow: 0 -1px rgba(0, 0, 0, 0.786353); 
-gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.786353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 
2px rgba(0, 0, 0, 0.07); }
+colorswatch#add-color-button overlay:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); 
border-color: #1b1b1b; border-bottom-color: #070707; background-image: linear-gradient(to top, #323232, 
#373737 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.786353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.786353); 
box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }
 
 colorswatch#add-color-button overlay:backdrop { color: #919190; border-color: #202020; background-image: 
image(#353535); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
 
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index c8b525290c..e7098f5bcb 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -220,7 +220,7 @@ button.titlebutton:hover, button.sidebar-button:hover, notebook > header > tabs
 
 button.titlebutton:hover:active, button.sidebar-button:hover:active, notebook > header > tabs > 
arrow:hover:active, button.flat:hover:active { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
 
-notebook > header > tabs > arrow:hover, button:hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); 
border-color: #cdc7c2; border-bottom-color: #bfb8b1; text-shadow: 0 1px rgba(255, 255, 255, 0.769231); 
-gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 
0.07); -gtk-icon-effect: highlight; }
+notebook > header > tabs > arrow:hover, button:hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); 
border-color: #cdc7c2; border-bottom-color: #bfb8b1; background-image: linear-gradient(to top, #f6f5f4, 
#f8f8f7 1px); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 
0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); -gtk-icon-effect: highlight; }
 
 notebook > header > tabs > arrow:active, notebook > header > tabs > arrow:checked, button:active, 
button:checked { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; 
background-image: image(#d6d1cd); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; 
-gtk-icon-shadow: none; transition-duration: 50ms; }
 
@@ -290,7 +290,7 @@ button.suggested-action { color: white; outline-color: rgba(255, 255, 255, 0.3);
 
 button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: 
none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: 
#3584e4; }
 
-button.suggested-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: 
#1b6acb; border-bottom-color: #15539e; text-shadow: 0 -1px rgba(0, 0, 0, 0.511216); -gtk-icon-shadow: 0 -1px 
rgba(0, 0, 0, 0.511216); box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.07); }
+button.suggested-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: 
#1b6acb; border-bottom-color: #15539e; background-image: linear-gradient(to top, #3584e4, #3987e5 1px); 
text-shadow: 0 -1px rgba(0, 0, 0, 0.511216); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.511216); box-shadow: 
inset 0 1px rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.07); }
 
 button.suggested-action:active, button.suggested-action:checked { color: white; outline-color: rgba(255, 
255, 255, 0.3); border-color: #1b6acb; background-image: image(#1961b9); box-shadow: inset 0 1px rgba(255, 
255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
 
@@ -322,7 +322,7 @@ button.destructive-action { color: white; outline-color: rgba(255, 255, 255, 0.3
 
 button.destructive-action.flat { border-color: transparent; background-color: transparent; background-image: 
none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: 
#e01b24; }
 
-button.destructive-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: 
#b2161d; border-bottom-color: #851015; text-shadow: 0 -1px rgba(0, 0, 0, 0.558275); -gtk-icon-shadow: 0 -1px 
rgba(0, 0, 0, 0.558275); box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.07); }
+button.destructive-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: 
#b2161d; border-bottom-color: #851015; background-image: linear-gradient(to top, #e01b24, #e41c26 1px); 
text-shadow: 0 -1px rgba(0, 0, 0, 0.558275); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.558275); box-shadow: 
inset 0 1px rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.07); }
 
 button.destructive-action:active, button.destructive-action:checked { color: white; outline-color: rgba(255, 
255, 255, 0.3); border-color: #b2161d; background-image: image(#a0131a); box-shadow: inset 0 1px rgba(255, 
255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
 
@@ -372,9 +372,9 @@ button.circular { border-radius: 9999px; -gtk-outline-radius: 9999px; padding: 4
 
 button.circular label { padding: 0; }
 
-button.circular:not(.flat):not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: 
#2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; border-bottom-color: #bfb8b1; 
background-image: linear-gradient(to top, #edebe9 2px, #f6f5f4); text-shadow: 0 1px rgba(255, 255, 255, 
0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px 
rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #bfb8b1 25%, #cdc7c2 50%); border-color: 
transparent; }
+button.circular:not(.flat):not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: 
#2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; border-bottom-color: #bfb8b1; 
background-image: linear-gradient(to top, #edebe9 2px, #f6f5f4), linear-gradient(to top, #bfb8b1 25%, #cdc7c2 
50%); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 
0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); border-color: transparent; }
 
-button.circular:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #2e3436; 
outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; border-bottom-color: #bfb8b1; text-shadow: 0 1px 
rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px 
white, 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #bfb8b1 25%, #cdc7c2 50%); 
border-color: transparent; }
+button.circular:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #2e3436; 
outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; border-bottom-color: #bfb8b1; background-image: 
linear-gradient(to top, #f6f5f4, #f8f8f7 1px), linear-gradient(to top, #bfb8b1 25%, #cdc7c2 50%); 
text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); 
box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); border-color: transparent; }
 
 stacksidebar row.needs-attention > label, .stack-switcher > button.needs-attention > label, .stack-switcher 
button.needs-attention > image { animation: needs_attention 150ms ease-in; background-image: 
-gtk-gradient(radial, center center, 0, center center, 0.5, to(#3584e4), to(transparent)), 
-gtk-gradient(radial, center center, 0, center center, 0.5, to(rgba(255, 255, 255, 0.769231)), 
to(transparent)); background-size: 6px 6px, 6px 6px; background-repeat: no-repeat; background-position: right 
3px, right 4px; }
 
@@ -384,7 +384,7 @@ stacksidebar row.needs-attention > label:dir(rtl), .stack-switcher > button.need
 
 .inline-toolbar toolbutton > button { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: 
#cdc7c2; border-bottom-color: #bfb8b1; background-image: linear-gradient(to top, #edebe9 2px, #f6f5f4); 
text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); 
box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); }
 
-.inline-toolbar toolbutton > button:hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); 
border-color: #cdc7c2; border-bottom-color: #bfb8b1; text-shadow: 0 1px rgba(255, 255, 255, 0.769231); 
-gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 
0.07); }
+.inline-toolbar toolbutton > button:hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); 
border-color: #cdc7c2; border-bottom-color: #bfb8b1; background-image: linear-gradient(to top, #f6f5f4, 
#f8f8f7 1px); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 
0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked { color: #2e3436; 
outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; background-image: image(#d6d1cd); box-shadow: 
inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
 
@@ -445,7 +445,7 @@ button.color colorswatch:only-child, button.color colorswatch:only-child overlay
 /* tone down as per new designs, see issue #1473, #1748 */
 list row button.image-button:not(.flat) { border: 1px solid rgba(205, 199, 194, 0.5); }
 
-list row button.image-button:not(.flat):hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); 
border-color: #cdc7c2; border-bottom-color: #bfb8b1; text-shadow: 0 1px rgba(255, 255, 255, 0.769231); 
-gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 
0.07); }
+list row button.image-button:not(.flat):hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); 
border-color: #cdc7c2; border-bottom-color: #bfb8b1; background-image: linear-gradient(to top, #f6f5f4, 
#f8f8f7 1px); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 
0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); }
 
 list row button.image-button:not(.flat):active, list row button.image-button:not(.flat):checked { color: 
#2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; background-image: image(#d6d1cd); 
box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
 
@@ -602,7 +602,7 @@ searchbar > revealer > box { margin: -6px; padding: 6px; }
 
 .selection-mode button.titlebutton, .selection-mode .titlebar:not(headerbar) button.flat, 
.selection-mode.titlebar:not(headerbar) button.flat, .selection-mode headerbar button.flat, 
headerbar.selection-mode button.flat { border-color: transparent; background-color: transparent; 
background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: 
none; }
 
-.selection-mode .titlebar:not(headerbar) button:hover, .selection-mode.titlebar:not(headerbar) button:hover, 
.selection-mode headerbar button:hover, headerbar.selection-mode button:hover { color: #ffffff; 
outline-color: rgba(255, 255, 255, 0.3); border-color: #1b6acb; border-bottom-color: #15539e; text-shadow: 0 
-1px rgba(0, 0, 0, 0.511216); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.511216); box-shadow: inset 0 1px 
rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.07); }
+.selection-mode .titlebar:not(headerbar) button:hover, .selection-mode.titlebar:not(headerbar) button:hover, 
.selection-mode headerbar button:hover, headerbar.selection-mode button:hover { color: #ffffff; 
outline-color: rgba(255, 255, 255, 0.3); border-color: #1b6acb; border-bottom-color: #15539e; 
background-image: linear-gradient(to top, #3584e4, #3987e5 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.511216); 
-gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.511216); box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), 0 1px 2px 
rgba(0, 0, 0, 0.07); }
 
 .selection-mode .titlebar:not(headerbar) button:active, .selection-mode .titlebar:not(headerbar) 
button:checked, .selection-mode.titlebar:not(headerbar) button:active, 
.selection-mode.titlebar:not(headerbar) button:checked, .selection-mode headerbar button:active, 
.selection-mode headerbar button:checked, .selection-mode headerbar button.toggle:checked, .selection-mode 
headerbar button.toggle:active, headerbar.selection-mode button:active, headerbar.selection-mode 
button:checked, headerbar.selection-mode button.toggle:checked, headerbar.selection-mode button.toggle:active 
{ color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #1b6acb; background-image: 
image(#1961b9); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
 
@@ -622,7 +622,7 @@ searchbar > revealer > box { margin: -6px; padding: 6px; }
 
 .selection-mode .titlebar:not(headerbar) button.suggested-action, .selection-mode.titlebar:not(headerbar) 
button.suggested-action, .selection-mode headerbar button.suggested-action, headerbar.selection-mode 
button.suggested-action { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; 
border-bottom-color: #bfb8b1; background-image: linear-gradient(to top, #edebe9 2px, #f6f5f4); text-shadow: 0 
1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 
1px white, 0 1px 2px rgba(0, 0, 0, 0.07); border-color: #185fb4; }
 
-.selection-mode .titlebar:not(headerbar) button.suggested-action:hover, 
.selection-mode.titlebar:not(headerbar) button.suggested-action:hover, .selection-mode headerbar 
button.suggested-action:hover, headerbar.selection-mode button.suggested-action:hover { color: #2e3436; 
outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; border-bottom-color: #bfb8b1; text-shadow: 0 1px 
rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px 
white, 0 1px 2px rgba(0, 0, 0, 0.07); border-color: #185fb4; }
+.selection-mode .titlebar:not(headerbar) button.suggested-action:hover, 
.selection-mode.titlebar:not(headerbar) button.suggested-action:hover, .selection-mode headerbar 
button.suggested-action:hover, headerbar.selection-mode button.suggested-action:hover { color: #2e3436; 
outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; border-bottom-color: #bfb8b1; background-image: 
linear-gradient(to top, #f6f5f4, #f8f8f7 1px); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); 
-gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 
0.07); border-color: #185fb4; }
 
 .selection-mode .titlebar:not(headerbar) button.suggested-action:active, 
.selection-mode.titlebar:not(headerbar) button.suggested-action:active, .selection-mode headerbar 
button.suggested-action:active, headerbar.selection-mode button.suggested-action:active { color: #2e3436; 
outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; background-image: image(#d6d1cd); box-shadow: 
inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; border-color: #185fb4; }
 
@@ -1067,7 +1067,7 @@ switch slider { margin: -1px; min-width: 24px; min-height: 24px; border: 1px sol
 
 switch image { color: transparent; }
 
-switch:hover slider { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #bfb8b1; 
box-shadow: inset 0 1px white, 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); }
+switch:hover slider { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #bfb8b1; 
background-image: linear-gradient(to bottom, white 10%, white 90%); box-shadow: inset 0 1px white, 0 1px 
rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); }
 
 switch:checked > slider { border: 1px solid #15539e; }
 
@@ -1249,7 +1249,7 @@ scale fill:disabled:backdrop, scale fill:disabled { border-color: transparent; b
 
 scale slider { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #bfb8b1; text-shadow: 0 
1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); background-image: 
linear-gradient(to bottom, white 20%, #f6f5f4 90%); box-shadow: inset 0 1px white, 0 1px rgba(0, 0, 0, 0.1), 
0 1px 2px rgba(0, 0, 0, 0.07); border: 1px solid #b8b0a8; border-radius: 100%; transition: all 200ms 
cubic-bezier(0.25, 0.46, 0.45, 0.94); transition-property: background, border, box-shadow; }
 
-scale slider:hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #bfb8b1; 
box-shadow: inset 0 1px white, 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); }
+scale slider:hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #bfb8b1; 
background-image: linear-gradient(to bottom, white 10%, white 90%); box-shadow: inset 0 1px white, 0 1px 
rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); }
 
 scale slider:active { border-color: #185fb4; }
 
@@ -1744,7 +1744,7 @@ infobar.info:backdrop, infobar.question:backdrop, infobar.warning:backdrop, info
 
 infobar.info button, infobar.question button, infobar.warning button, infobar.error button { color: #2e3436; 
outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; border-bottom-color: #bfb8b1; background-image: 
linear-gradient(to top, #edebe9 2px, #f6f5f4); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); 
-gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 
0.07); }
 
-infobar.info button:hover, infobar.question button:hover, infobar.warning button:hover, infobar.error 
button:hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; 
border-bottom-color: #bfb8b1; text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px 
rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); }
+infobar.info button:hover, infobar.question button:hover, infobar.warning button:hover, infobar.error 
button:hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; 
border-bottom-color: #bfb8b1; background-image: linear-gradient(to top, #f6f5f4, #f8f8f7 1px); text-shadow: 0 
1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 
1px white, 0 1px 2px rgba(0, 0, 0, 0.07); }
 
 infobar.info button:active, infobar.info button:checked, infobar.question button:active, infobar.question 
button:checked, infobar.warning button:active, infobar.warning button:checked, infobar.error button:active, 
infobar.error button:checked { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; 
background-image: image(#d6d1cd); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; 
-gtk-icon-shadow: none; }
 
@@ -1822,7 +1822,7 @@ colorswatch#add-color-button:only-child { border-radius: 5px; }
 
 colorswatch#add-color-button overlay { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: 
#cdc7c2; border-bottom-color: #bfb8b1; background-image: linear-gradient(to top, #edebe9 2px, #f6f5f4); 
text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); 
box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); }
 
-colorswatch#add-color-button overlay:hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); 
border-color: #cdc7c2; border-bottom-color: #bfb8b1; text-shadow: 0 1px rgba(255, 255, 255, 0.769231); 
-gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 
0.07); }
+colorswatch#add-color-button overlay:hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); 
border-color: #cdc7c2; border-bottom-color: #bfb8b1; background-image: linear-gradient(to top, #f6f5f4, 
#f8f8f7 1px); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 
0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); }
 
 colorswatch#add-color-button overlay:backdrop { color: #929595; border-color: #d5d0cc; background-image: 
image(#f6f5f4); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
 
diff --git a/gtk/theme/HighContrast/gtk-contained-inverse.css 
b/gtk/theme/HighContrast/gtk-contained-inverse.css
index 6d96237466..10115a8a08 100644
--- a/gtk/theme/HighContrast/gtk-contained-inverse.css
+++ b/gtk/theme/HighContrast/gtk-contained-inverse.css
@@ -242,7 +242,7 @@ spinbutton:not(.vertical) progress:backdrop, entry progress:backdrop { backgroun
 
 .linked:not(.vertical) > spinbutton:focus:not(.vertical) + spinbutton:not(.vertical), .linked:not(.vertical) 
spinbutton:focus:not(.vertical) + button, .linked:not(.vertical) > spinbutton:focus:not(.vertical) + 
combobox > box > button.combo, .linked:not(.vertical) > spinbutton:focus:not(.vertical) + entry, 
.linked:not(.vertical) > entry:focus + button, .linked:not(.vertical) > entry:focus + combobox > box > 
button.combo, .linked:not(.vertical) > entry:focus + spinbutton:not(.vertical), .linked:not(.vertical) > 
entry:focus + entry { border-left-color: black; }
 
-.linked:not(.vertical) > spinbutton:focus.error:not(.vertical) + spinbutton:not(.vertical), 
.linked:not(.vertical) > spinbutton:focus.error:not(.vertical) + button, .linked:not(.vertical) > 
spinbutton:focus.error:not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) > 
spinbutton:focus.error:not(.vertical) + entry, .linked:not(.vertical) > entry:focus.error + button, 
.linked:not(.vertical) > entry:focus.error + combobox > box > button.combo, .linked:not(.vertical) > 
entry:focus.error + spinbutton:not(.vertical), .linked:not(.vertical) > entry:focus.error + entry { 
border-left-color: #1a0000; }
+.linked:not(.vertical) > spinbutton.error:focus:not(.vertical) + spinbutton:not(.vertical), 
.linked:not(.vertical) > spinbutton.error:focus:not(.vertical) + button, .linked:not(.vertical) > 
spinbutton.error:focus:not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) > 
spinbutton.error:focus:not(.vertical) + entry, .linked:not(.vertical) > entry.error:focus + button, 
.linked:not(.vertical) > entry.error:focus + combobox > box > button.combo, .linked:not(.vertical) > 
entry.error:focus + spinbutton:not(.vertical), .linked:not(.vertical) > entry.error:focus + entry { 
border-left-color: #1a0000; }
 
 .linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + spinbutton:not(.vertical), 
.linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + button, .linked:not(.vertical) > 
spinbutton:drop(active):not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) > 
spinbutton:drop(active):not(.vertical) + entry, .linked:not(.vertical) > entry:drop(active) + button, 
.linked:not(.vertical) > entry:drop(active) + combobox > box > button.combo, .linked:not(.vertical) > 
entry:drop(active) + spinbutton:not(.vertical), .linked:not(.vertical) > entry:drop(active) + entry { 
border-left-color: #4e9a06; }
 
@@ -254,13 +254,13 @@ spinbutton:not(.vertical) progress:backdrop, entry progress:backdrop { backgroun
 
 .linked.vertical > spinbutton:not(.vertical) + spinbutton:focus:not(:only-child):not(.vertical), 
.linked.vertical > spinbutton:not(.vertical) + entry:focus:not(:only-child), .linked.vertical > entry + 
spinbutton:focus:not(:only-child):not(.vertical), .linked.vertical > entry + entry:focus:not(:only-child) { 
border-top-color: black; }
 
-.linked.vertical > spinbutton:not(.vertical) + spinbutton:focus.error:not(:only-child):not(.vertical), 
.linked.vertical > spinbutton:not(.vertical) + entry:focus.error:not(:only-child), .linked.vertical > entry + 
spinbutton:focus.error:not(:only-child):not(.vertical), .linked.vertical > entry + 
entry:focus.error:not(:only-child) { border-top-color: #1a0000; }
+.linked.vertical > spinbutton:not(.vertical) + spinbutton.error:focus:not(:only-child):not(.vertical), 
.linked.vertical > spinbutton:not(.vertical) + entry.error:focus:not(:only-child), .linked.vertical > entry + 
spinbutton.error:focus:not(:only-child):not(.vertical), .linked.vertical > entry + 
entry.error:focus:not(:only-child) { border-top-color: #1a0000; }
 
 .linked.vertical > spinbutton:not(.vertical) + spinbutton:drop(active):not(:only-child):not(.vertical), 
.linked.vertical > spinbutton:not(.vertical) + entry:drop(active):not(:only-child), .linked.vertical > entry 
+ spinbutton:drop(active):not(:only-child):not(.vertical), .linked.vertical > entry + 
entry:drop(active):not(:only-child) { border-top-color: #4e9a06; }
 
 .linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + spinbutton:not(.vertical), 
.linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + entry, .linked.vertical > 
spinbutton:focus:not(:only-child):not(.vertical) + button, .linked.vertical > 
spinbutton:focus:not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > 
entry:focus:not(:only-child) + spinbutton:not(.vertical), .linked.vertical > entry:focus:not(:only-child) + 
entry, .linked.vertical > entry:focus:not(:only-child) + button, .linked.vertical > 
entry:focus:not(:only-child) + combobox > box > button.combo { border-top-color: black; }
 
-.linked.vertical > spinbutton:focus.error:not(:only-child):not(.vertical) + spinbutton:not(.vertical), 
.linked.vertical > spinbutton:focus.error:not(:only-child):not(.vertical) + entry, .linked.vertical > 
spinbutton:focus.error:not(:only-child):not(.vertical) + button, .linked.vertical > 
spinbutton:focus.error:not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > 
entry:focus.error:not(:only-child) + spinbutton:not(.vertical), .linked.vertical > 
entry:focus.error:not(:only-child) + entry, .linked.vertical > entry:focus.error:not(:only-child) + button, 
.linked.vertical > entry:focus.error:not(:only-child) + combobox > box > button.combo { border-top-color: 
#1a0000; }
+.linked.vertical > spinbutton.error:focus:not(:only-child):not(.vertical) + spinbutton:not(.vertical), 
.linked.vertical > spinbutton.error:focus:not(:only-child):not(.vertical) + entry, .linked.vertical > 
spinbutton.error:focus:not(:only-child):not(.vertical) + button, .linked.vertical > 
spinbutton.error:focus:not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > 
entry.error:focus:not(:only-child) + spinbutton:not(.vertical), .linked.vertical > 
entry.error:focus:not(:only-child) + entry, .linked.vertical > entry.error:focus:not(:only-child) + button, 
.linked.vertical > entry.error:focus:not(:only-child) + combobox > box > button.combo { border-top-color: 
#1a0000; }
 
 .linked.vertical > spinbutton:drop(active):not(:only-child):not(.vertical) + spinbutton:not(.vertical), 
.linked.vertical > spinbutton:drop(active):not(:only-child):not(.vertical) + entry, .linked.vertical > 
spinbutton:drop(active):not(:only-child):not(.vertical) + button, .linked.vertical > 
spinbutton:drop(active):not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > 
entry:drop(active):not(:only-child) + spinbutton:not(.vertical), .linked.vertical > 
entry:drop(active):not(:only-child) + entry, .linked.vertical > entry:drop(active):not(:only-child) + button, 
.linked.vertical > entry:drop(active):not(:only-child) + combobox > box > button.combo { border-top-color: 
#4e9a06; }
 
@@ -300,17 +300,17 @@ button.titlebutton:hover, button.sidebar-button:hover, notebook > header > tabs
 
 button.titlebutton:hover:active, button.sidebar-button:hover:active, notebook > header > tabs > 
arrow:hover:active, button.flat:hover:active { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
 
-notebook > header > tabs > arrow:hover, button:hover { color: #f3f3f1; outline-color: rgba(243, 243, 241, 
0.3); border-color: #686868; border-bottom-color: #4e4e4e; text-shadow: 0 -1px rgba(0, 0, 0, 0.802353); 
-gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.802353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 
2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #2d2d2d, #323232 1px); -gtk-icon-effect: 
highlight; }
+notebook > header > tabs > arrow:hover, button:hover { color: #f3f3f1; outline-color: rgba(243, 243, 241, 
0.3); border-color: #686868; border-bottom-color: #4e4e4e; background-image: linear-gradient(to top, #2d2d2d, 
#323232 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.802353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.802353); 
box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); -gtk-icon-effect: 
highlight; }
 
 notebook > header > tabs > arrow:active, notebook > header > tabs > arrow:checked, button:active, 
button:checked { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; 
background-image: image(#191919); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; 
-gtk-icon-shadow: none; transition-duration: 50ms; }
 
-notebook > header > tabs > arrow:backdrop, button:backdrop.flat, button:backdrop { color: #919190; 
border-color: #202020; background-image: image(#353535); text-shadow: none; -gtk-icon-shadow: none; 
box-shadow: inset 0 1px rgba(255, 255, 255, 0); transition: 200ms ease-out; -gtk-icon-effect: none; }
+notebook > header > tabs > arrow:backdrop, button.flat:backdrop, button:backdrop { color: #919190; 
border-color: #202020; background-image: image(#353535); text-shadow: none; -gtk-icon-shadow: none; 
box-shadow: inset 0 1px rgba(255, 255, 255, 0); transition: 200ms ease-out; -gtk-icon-effect: none; }
 
-notebook > header > tabs > arrow:backdrop:active, notebook > header > tabs > arrow:backdrop:checked, 
button:backdrop.flat:active, button:backdrop.flat:checked, button:backdrop:active, button:backdrop:checked { 
color: #919190; border-color: #202020; background-image: image(#252525); box-shadow: inset 0 1px rgba(255, 
255, 255, 0); }
+notebook > header > tabs > arrow:backdrop:active, notebook > header > tabs > arrow:backdrop:checked, 
button.flat:backdrop:active, button.flat:backdrop:checked, button:backdrop:active, button:backdrop:checked { 
color: #919190; border-color: #202020; background-image: image(#252525); box-shadow: inset 0 1px rgba(255, 
255, 255, 0); }
 
-notebook > header > tabs > arrow:backdrop:disabled, button:backdrop.flat:disabled, button:backdrop:disabled 
{ color: #5b5b5b; border-color: #202020; background-image: image(#2f2f2f); text-shadow: none; 
-gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+notebook > header > tabs > arrow:backdrop:disabled, button.flat:backdrop:disabled, button:backdrop:disabled 
{ color: #5b5b5b; border-color: #202020; background-image: image(#2f2f2f); text-shadow: none; 
-gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
 
-notebook > header > tabs > arrow:backdrop:disabled:active, notebook > header > tabs > 
arrow:backdrop:disabled:checked, button:backdrop.flat:disabled:active, button:backdrop.flat:disabled:checked, 
button:backdrop:disabled:active, button:backdrop:disabled:checked { color: #5b5b5b; border-color: #202020; 
background-image: image(#252525); box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+notebook > header > tabs > arrow:backdrop:disabled:active, notebook > header > tabs > 
arrow:backdrop:disabled:checked, button.flat:backdrop:disabled:active, button.flat:backdrop:disabled:checked, 
button:backdrop:disabled:active, button:backdrop:disabled:checked { color: #5b5b5b; border-color: #202020; 
background-image: image(#252525); box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
 
 button.titlebutton:backdrop, button.sidebar-button:backdrop, notebook > header > tabs > arrow:backdrop, 
button.titlebutton:disabled, button.sidebar-button:disabled, notebook > header > tabs > arrow:disabled, 
button.flat:backdrop, button.flat:disabled, button.flat:backdrop:disabled { border-color: transparent; 
background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); 
text-shadow: none; -gtk-icon-shadow: none; }
 
@@ -368,7 +368,7 @@ button.suggested-action { color: white; outline-color: rgba(255, 255, 255, 0.3);
 
 button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: 
none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: 
#15539e; }
 
-button.suggested-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: 
#0f3b71; border-bottom-color: #092444; text-shadow: 0 -1px rgba(0, 0, 0, 0.671216); -gtk-icon-shadow: 0 -1px 
rgba(0, 0, 0, 0.671216); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); 
background-image: linear-gradient(to top, #155099, #1655a2 1px); }
+button.suggested-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: 
#0f3b71; border-bottom-color: #092444; background-image: linear-gradient(to top, #155099, #1655a2 1px); 
text-shadow: 0 -1px rgba(0, 0, 0, 0.671216); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.671216); box-shadow: 
inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }
 
 button.suggested-action:active, button.suggested-action:checked { color: white; outline-color: rgba(255, 
255, 255, 0.3); border-color: #0f3b71; background-image: image(#103e75); box-shadow: inset 0 1px rgba(255, 
255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
 
@@ -400,7 +400,7 @@ button.destructive-action { color: white; outline-color: rgba(255, 255, 255, 0.3
 
 button.destructive-action.flat { border-color: transparent; background-color: transparent; background-image: 
none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: 
#b2161d; }
 
-button.destructive-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: 
#851015; border-bottom-color: #570b0e; text-shadow: 0 -1px rgba(0, 0, 0, 0.638275); -gtk-icon-shadow: 0 -1px 
rgba(0, 0, 0, 0.638275); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); 
background-image: linear-gradient(to top, #ae151c, #b7161d 1px); }
+button.destructive-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: 
#851015; border-bottom-color: #570b0e; background-image: linear-gradient(to top, #ae151c, #b7161d 1px); 
text-shadow: 0 -1px rgba(0, 0, 0, 0.638275); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.638275); box-shadow: 
inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }
 
 button.destructive-action:active, button.destructive-action:checked { color: white; outline-color: rgba(255, 
255, 255, 0.3); border-color: #851015; background-image: image(#8a1116); box-shadow: inset 0 1px rgba(255, 
255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
 
@@ -450,9 +450,9 @@ button.circular { border-radius: 9999px; -gtk-outline-radius: 9999px; padding: 4
 
 button.circular label { padding: 0; }
 
-button.circular:not(.flat):not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: 
#f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; border-bottom-color: #4e4e4e; 
background-image: linear-gradient(to top, #2d2d2d 2px, #303030); text-shadow: 0 -1px rgba(0, 0, 0, 0.850353); 
-gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.850353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 
2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #2d2d2d 2px, #303030), linear-gradient(to 
top, #4e4e4e 25%, #686868 50%); border-color: transparent; }
+button.circular:not(.flat):not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: 
#f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; border-bottom-color: #4e4e4e; 
background-image: linear-gradient(to top, #2d2d2d 2px, #303030), linear-gradient(to top, #4e4e4e 25%, #686868 
50%); text-shadow: 0 -1px rgba(0, 0, 0, 0.850353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.850353); 
box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); border-color: transparent; }
 
-button.circular:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #f3f3f1; 
outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; border-bottom-color: #4e4e4e; text-shadow: 0 
-1px rgba(0, 0, 0, 0.802353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.802353); box-shadow: inset 0 1px 
rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #2d2d2d, 
#323232 1px); background-image: linear-gradient(to top, #2d2d2d, #323232 1px), linear-gradient(to top, 
#4e4e4e 25%, #686868 50%); border-color: transparent; }
+button.circular:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #f3f3f1; 
outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; border-bottom-color: #4e4e4e; 
background-image: linear-gradient(to top, #2d2d2d, #323232 1px), linear-gradient(to top, #4e4e4e 25%, #686868 
50%); text-shadow: 0 -1px rgba(0, 0, 0, 0.802353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.802353); 
box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); border-color: transparent; }
 
 stacksidebar row.needs-attention > label, .stack-switcher > button.needs-attention > label, .stack-switcher 
button.needs-attention > image { animation: needs_attention 150ms ease-in; background-image: 
-gtk-gradient(radial, center center, 0, center center, 0.5, to(#185fb4), to(transparent)), 
-gtk-gradient(radial, center center, 0, center center, 0.45, to(rgba(0, 0, 0, 0.850353)), to(transparent)); 
background-size: 6px 6px, 6px 6px; background-repeat: no-repeat; background-position: right 3px, right 2px; }
 
@@ -462,7 +462,7 @@ stacksidebar row.needs-attention > label:dir(rtl), .stack-switcher > button.need
 
 .inline-toolbar toolbutton > button { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: 
#686868; border-bottom-color: #4e4e4e; background-image: linear-gradient(to top, #2d2d2d 2px, #303030); 
text-shadow: 0 -1px rgba(0, 0, 0, 0.850353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.850353); box-shadow: 
inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }
 
-.inline-toolbar toolbutton > button:hover { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); 
border-color: #686868; border-bottom-color: #4e4e4e; text-shadow: 0 -1px rgba(0, 0, 0, 0.802353); 
-gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.802353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 
2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #2d2d2d, #323232 1px); }
+.inline-toolbar toolbutton > button:hover { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); 
border-color: #686868; border-bottom-color: #4e4e4e; background-image: linear-gradient(to top, #2d2d2d, 
#323232 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.802353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.802353); 
box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked { color: #f3f3f1; 
outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; background-image: image(#191919); box-shadow: 
inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
 
@@ -517,7 +517,7 @@ button.color colorswatch:only-child, button.color colorswatch:only-child overlay
 /* tone down as per new designs, see issue #1473, #1748 */
 list row button.image-button:not(.flat) { border: 1px solid rgba(104, 104, 104, 0.5); }
 
-list row button.image-button:not(.flat):hover { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); 
border-color: #686868; border-bottom-color: #4e4e4e; text-shadow: 0 -1px rgba(0, 0, 0, 0.802353); 
-gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.802353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 
2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #2d2d2d, #323232 1px); }
+list row button.image-button:not(.flat):hover { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); 
border-color: #686868; border-bottom-color: #4e4e4e; background-image: linear-gradient(to top, #2d2d2d, 
#323232 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.802353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.802353); 
box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }
 
 list row button.image-button:not(.flat):active, list row button.image-button:not(.flat):checked { color: 
#f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; background-image: image(#191919); 
box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
 
@@ -674,15 +674,15 @@ searchbar > revealer > box { margin: -6px; padding: 6px; }
 
 .selection-mode button.titlebutton, .selection-mode .titlebar:not(headerbar) button.flat, 
.selection-mode.titlebar:not(headerbar) button.flat, .selection-mode headerbar button.flat, 
headerbar.selection-mode button.flat { border-color: transparent; background-color: transparent; 
background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: 
none; }
 
-.selection-mode .titlebar:not(headerbar) button:hover, .selection-mode.titlebar:not(headerbar) button:hover, 
.selection-mode headerbar button:hover, headerbar.selection-mode button:hover { color: #ffffff; 
outline-color: rgba(255, 255, 255, 0.3); border-color: #0f3b71; border-bottom-color: #092444; text-shadow: 0 
-1px rgba(0, 0, 0, 0.671216); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.671216); box-shadow: inset 0 1px 
rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #155099, 
#1655a2 1px); }
+.selection-mode .titlebar:not(headerbar) button:hover, .selection-mode.titlebar:not(headerbar) button:hover, 
.selection-mode headerbar button:hover, headerbar.selection-mode button:hover { color: #ffffff; 
outline-color: rgba(255, 255, 255, 0.3); border-color: #0f3b71; border-bottom-color: #092444; 
background-image: linear-gradient(to top, #155099, #1655a2 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.671216); 
-gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.671216); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 
2px rgba(0, 0, 0, 0.07); }
 
 .selection-mode .titlebar:not(headerbar) button:active, .selection-mode .titlebar:not(headerbar) 
button:checked, .selection-mode.titlebar:not(headerbar) button:active, 
.selection-mode.titlebar:not(headerbar) button:checked, .selection-mode headerbar button:active, 
.selection-mode headerbar button:checked, .selection-mode headerbar button.toggle:checked, .selection-mode 
headerbar button.toggle:active, headerbar.selection-mode button:active, headerbar.selection-mode 
button:checked, headerbar.selection-mode button.toggle:checked, headerbar.selection-mode button.toggle:active 
{ color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #0f3b71; background-image: 
image(#103e75); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
 
-.selection-mode .titlebar:not(headerbar) button:backdrop, .selection-mode.titlebar:not(headerbar) 
button:backdrop, .selection-mode headerbar button:backdrop.flat, .selection-mode headerbar button:backdrop, 
headerbar.selection-mode button:backdrop.flat, headerbar.selection-mode button:backdrop { color: #d0ddec; 
border-color: #0f3b71; background-image: image(#15539e); text-shadow: none; -gtk-icon-shadow: none; 
box-shadow: inset 0 1px rgba(255, 255, 255, 0); -gtk-icon-effect: none; border-color: #030c17; }
+.selection-mode .titlebar:not(headerbar) button:backdrop, .selection-mode.titlebar:not(headerbar) 
button:backdrop, .selection-mode headerbar button.flat:backdrop, .selection-mode headerbar button:backdrop, 
headerbar.selection-mode button.flat:backdrop, headerbar.selection-mode button:backdrop { color: #d0ddec; 
border-color: #0f3b71; background-image: image(#15539e); text-shadow: none; -gtk-icon-shadow: none; 
box-shadow: inset 0 1px rgba(255, 255, 255, 0); -gtk-icon-effect: none; border-color: #030c17; }
 
-.selection-mode .titlebar:not(headerbar) button:backdrop:active, .selection-mode .titlebar:not(headerbar) 
button:backdrop:checked, .selection-mode.titlebar:not(headerbar) button:backdrop:active, 
.selection-mode.titlebar:not(headerbar) button:backdrop:checked, .selection-mode headerbar 
button:backdrop.flat:active, .selection-mode headerbar button:backdrop.flat:checked, .selection-mode 
headerbar button:backdrop:active, .selection-mode headerbar button:backdrop:checked, headerbar.selection-mode 
button:backdrop.flat:active, headerbar.selection-mode button:backdrop.flat:checked, headerbar.selection-mode 
button:backdrop:active, headerbar.selection-mode button:backdrop:checked { color: #d0dae5; border-color: 
#0f3b71; background-image: image(#16447c); box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: 
#030c17; }
+.selection-mode .titlebar:not(headerbar) button:backdrop:active, .selection-mode .titlebar:not(headerbar) 
button:backdrop:checked, .selection-mode.titlebar:not(headerbar) button:backdrop:active, 
.selection-mode.titlebar:not(headerbar) button:backdrop:checked, .selection-mode headerbar 
button.flat:backdrop:active, .selection-mode headerbar button.flat:backdrop:checked, .selection-mode 
headerbar button:backdrop:active, .selection-mode headerbar button:backdrop:checked, headerbar.selection-mode 
button.flat:backdrop:active, headerbar.selection-mode button.flat:backdrop:checked, headerbar.selection-mode 
button:backdrop:active, headerbar.selection-mode button:backdrop:checked { color: #d0dae5; border-color: 
#0f3b71; background-image: image(#16447c); box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: 
#030c17; }
 
-.selection-mode .titlebar:not(headerbar) button:backdrop:disabled, .selection-mode.titlebar:not(headerbar) 
button:backdrop:disabled, .selection-mode headerbar button:backdrop.flat:disabled, .selection-mode headerbar 
button:backdrop:disabled, headerbar.selection-mode button:backdrop.flat:disabled, headerbar.selection-mode 
button:backdrop:disabled { color: #6a8bb5; border-color: #0f3b71; background-image: image(#194d8d); 
text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: 
#030c17; }
+.selection-mode .titlebar:not(headerbar) button:backdrop:disabled, .selection-mode.titlebar:not(headerbar) 
button:backdrop:disabled, .selection-mode headerbar button.flat:backdrop:disabled, .selection-mode headerbar 
button:backdrop:disabled, headerbar.selection-mode button.flat:backdrop:disabled, headerbar.selection-mode 
button:backdrop:disabled { color: #6a8bb5; border-color: #0f3b71; background-image: image(#194d8d); 
text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: 
#030c17; }
 
 .selection-mode .titlebar:not(headerbar) button:backdrop:disabled:active, .selection-mode 
.titlebar:not(headerbar) button:backdrop:disabled:checked, .selection-mode.titlebar:not(headerbar) 
button:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:checked, 
.selection-mode headerbar button:backdrop:disabled:active, .selection-mode headerbar 
button:backdrop:disabled:checked, headerbar.selection-mode button:backdrop:disabled:active, 
headerbar.selection-mode button:backdrop:disabled:checked { color: #6885aa; border-color: #0f3b71; 
background-image: image(#16447c); box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #030c17; }
 
@@ -694,7 +694,7 @@ searchbar > revealer > box { margin: -6px; padding: 6px; }
 
 .selection-mode .titlebar:not(headerbar) button.suggested-action, .selection-mode.titlebar:not(headerbar) 
button.suggested-action, .selection-mode headerbar button.suggested-action, headerbar.selection-mode 
button.suggested-action { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; 
border-bottom-color: #4e4e4e; background-image: linear-gradient(to top, #2d2d2d 2px, #303030); text-shadow: 0 
-1px rgba(0, 0, 0, 0.850353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.850353); box-shadow: inset 0 1px 
rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); border-color: #030c17; }
 
-.selection-mode .titlebar:not(headerbar) button.suggested-action:hover, 
.selection-mode.titlebar:not(headerbar) button.suggested-action:hover, .selection-mode headerbar 
button.suggested-action:hover, headerbar.selection-mode button.suggested-action:hover { color: #f3f3f1; 
outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; border-bottom-color: #4e4e4e; text-shadow: 0 
-1px rgba(0, 0, 0, 0.802353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.802353); box-shadow: inset 0 1px 
rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #2d2d2d, 
#323232 1px); border-color: #030c17; }
+.selection-mode .titlebar:not(headerbar) button.suggested-action:hover, 
.selection-mode.titlebar:not(headerbar) button.suggested-action:hover, .selection-mode headerbar 
button.suggested-action:hover, headerbar.selection-mode button.suggested-action:hover { color: #f3f3f1; 
outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; border-bottom-color: #4e4e4e; 
background-image: linear-gradient(to top, #2d2d2d, #323232 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.802353); 
-gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.802353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 
2px rgba(0, 0, 0, 0.07); border-color: #030c17; }
 
 .selection-mode .titlebar:not(headerbar) button.suggested-action:active, 
.selection-mode.titlebar:not(headerbar) button.suggested-action:active, .selection-mode headerbar 
button.suggested-action:active, headerbar.selection-mode button.suggested-action:active { color: #f3f3f1; 
outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; background-image: image(#191919); box-shadow: 
inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; border-color: #030c17; }
 
@@ -784,9 +784,9 @@ treeview.view:backdrop { border-left-color: #636362; border-top: #353535; }
 
 treeview.view:drop(active) { border-style: solid none; border-width: 1px; border-color: black; }
 
-treeview.view:drop(active).after { border-top-style: none; }
+treeview.view.after:drop(active) { border-top-style: none; }
 
-treeview.view:drop(active).before { border-bottom-style: none; }
+treeview.view.before:drop(active) { border-bottom-style: none; }
 
 treeview.view.expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); color: silver; }
 
@@ -826,7 +826,7 @@ treeview.view button.dnd:active, treeview.view button.dnd:selected, treeview.vie
 
 treeview.view acceleditor > label { background-color: #0f3b71; }
 
-treeview.view header button, treeview.view header button:hover, treeview.view header button:active { 
padding: 0 6px; background-image: none; border-style: none solid solid none; border-color: #303030; 
border-radius: 0; text-shadow: none; }
+treeview.view header button, treeview.view header button:hover, treeview.view header button:active { 
padding: 0 6px; background-image: none; border-style: none solid solid none; border-color: #555554; 
border-radius: 0; text-shadow: none; }
 
 treeview.view header button:disabled { border-color: #303030; background-image: none; }
 
@@ -991,21 +991,21 @@ notebook > header tab { min-height: 30px; min-width: 30px; padding: 3px 12px; ou
 
 notebook > header tab:hover { color: #f3f3f1; background-color: #262626; }
 
-notebook > header tab:hover.reorderable-page { border-color: rgba(104, 104, 104, 0.3); background-color: 
rgba(48, 48, 48, 0.2); }
+notebook > header tab.reorderable-page:hover { border-color: rgba(104, 104, 104, 0.3); background-color: 
rgba(48, 48, 48, 0.2); }
 
 notebook > header tab:backdrop { color: #6c6c6c; }
 
-notebook > header tab:backdrop.reorderable-page { border-color: transparent; background-color: transparent; }
+notebook > header tab.reorderable-page:backdrop { border-color: transparent; background-color: transparent; }
 
 notebook > header tab:checked { color: #f3f3f1; }
 
-notebook > header tab:checked.reorderable-page { border-color: rgba(104, 104, 104, 0.5); background-color: 
rgba(48, 48, 48, 0.5); }
+notebook > header tab.reorderable-page:checked { border-color: rgba(104, 104, 104, 0.5); background-color: 
rgba(48, 48, 48, 0.5); }
 
-notebook > header tab:checked.reorderable-page:hover { background-color: rgba(48, 48, 48, 0.7); }
+notebook > header tab.reorderable-page:checked:hover { background-color: rgba(48, 48, 48, 0.7); }
 
 notebook > header tab:backdrop:checked { color: #919190; }
 
-notebook > header tab:backdrop:checked.reorderable-page { border-color: #202020; background-color: #353535; }
+notebook > header tab.reorderable-page:backdrop:checked { border-color: #202020; background-color: #353535; }
 
 notebook > header tab button.flat { padding: 0; margin-top: 4px; margin-bottom: 4px; min-width: 20px; 
min-height: 20px; }
 
@@ -1086,13 +1086,13 @@ scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { margin: 0; mi
 
 scrollbar.overlay-indicator:not(.dragging):not(.hovering) button { min-width: 5px; min-height: 5px; 
background-color: #f3f3f1; background-clip: padding-box; border-radius: 100%; border: 1px solid black; 
-gtk-icon-source: none; }
 
-scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider { margin: 0 2px; min-width: 
40px; }
+scrollbar.overlay-indicator.horizontal:not(.dragging):not(.hovering) slider { margin: 0 2px; min-width: 
40px; }
 
-scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal button { margin: 1px 2px; min-width: 
5px; }
+scrollbar.overlay-indicator.horizontal:not(.dragging):not(.hovering) button { margin: 1px 2px; min-width: 
5px; }
 
-scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider { margin: 2px 0; min-height: 40px; 
}
+scrollbar.overlay-indicator.vertical:not(.dragging):not(.hovering) slider { margin: 2px 0; min-height: 40px; 
}
 
-scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical button { margin: 2px 1px; min-height: 
5px; }
+scrollbar.overlay-indicator.vertical:not(.dragging):not(.hovering) button { margin: 2px 1px; min-height: 
5px; }
 
 scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering { opacity: 0.8; }
 
@@ -1139,7 +1139,7 @@ switch slider { margin: -1px; min-width: 24px; min-height: 24px; border: 1px sol
 
 switch image { color: transparent; }
 
-switch:hover slider { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #0c0c0c; 
box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); 
background-image: linear-gradient(to bottom, #3f3f3f 20%, #353535 90%); }
+switch:hover slider { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #0c0c0c; 
background-image: linear-gradient(to bottom, #3f3f3f 20%, #353535 90%); box-shadow: inset 0 1px rgba(255, 
255, 255, 0.02), 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); }
 
 switch:checked > slider { border: 1px solid #030c17; }
 
@@ -1313,7 +1313,7 @@ scale fill:disabled:backdrop, scale fill:disabled { border-color: transparent; b
 
 scale slider { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #4e4e4e; text-shadow: 
0 -1px rgba(0, 0, 0, 0.850353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.850353); background-image: 
linear-gradient(to bottom, #282828 20%, #202020 90%); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 
1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); border: 1px solid #474747; border-radius: 100%; 
transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); transition-property: background, border, 
box-shadow; }
 
-scale slider:hover { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #4e4e4e; 
box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); 
background-image: linear-gradient(to bottom, #303030 20%, #262626 90%); }
+scale slider:hover { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #4e4e4e; 
background-image: linear-gradient(to bottom, #303030 20%, #262626 90%); box-shadow: inset 0 1px rgba(255, 
255, 255, 0.02), 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); }
 
 scale slider:active { border-color: #030c17; }
 
@@ -1365,99 +1365,99 @@ scale.vertical.fine-tune indicator { min-width: 3px; }
 
 scale.horizontal.marks-before:not(.marks-after) slider { margin: -10px; border-style: none; border-radius: 
0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-horz-scale-has-marks-above-dark.png"), 
url("assets/slider-horz-scale-has-marks-above-dark 2 png")); min-height: 26px; min-width: 22px; margin-top: 
-14px; background-position: top; background-repeat: no-repeat; box-shadow: none; }
 
-scale.horizontal.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-top: -11px; }
+scale.horizontal.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-top: -11px; }
 
 scale.horizontal.marks-before:not(.marks-after) slider:hover { margin: -10px; border-style: none; 
border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-horz-scale-has-marks-above-hover-dark.png"), 
url("assets/slider-horz-scale-has-marks-above-hover-dark 2 png")); min-height: 26px; min-width: 22px; 
margin-top: -14px; background-position: top; background-repeat: no-repeat; box-shadow: none; }
 
-scale.horizontal.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-top: -11px; }
+scale.horizontal.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-top: -11px; }
 
 scale.horizontal.marks-before:not(.marks-after) slider:active { margin: -10px; border-style: none; 
border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-horz-scale-has-marks-above-active-dark.png"), 
url("assets/slider-horz-scale-has-marks-above-active-dark 2 png")); min-height: 26px; min-width: 22px; 
margin-top: -14px; background-position: top; background-repeat: no-repeat; box-shadow: none; }
 
-scale.horizontal.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-top: -11px; }
+scale.horizontal.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-top: -11px; }
 
 scale.horizontal.marks-before:not(.marks-after) slider:disabled { margin: -10px; border-style: none; 
border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-horz-scale-has-marks-above-insensitive-dark.png"), 
url("assets/slider-horz-scale-has-marks-above-insensitive-dark 2 png")); min-height: 26px; min-width: 22px; 
margin-top: -14px; background-position: top; background-repeat: no-repeat; box-shadow: none; }
 
-scale.horizontal.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-top: -11px; }
+scale.horizontal.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-top: -11px; }
 
 scale.horizontal.marks-before:not(.marks-after) slider:backdrop { margin: -10px; border-style: none; 
border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-dark.png"), 
url("assets/slider-horz-scale-has-marks-above-backdrop-dark 2 png")); min-height: 26px; min-width: 22px; 
margin-top: -14px; background-position: top; background-repeat: no-repeat; box-shadow: none; }
 
-scale.horizontal.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-top: -11px; }
+scale.horizontal.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-top: -11px; }
 
 scale.horizontal.marks-before:not(.marks-after) slider:backdrop:disabled { margin: -10px; border-style: 
none; border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark.png"), 
url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark 2 png")); min-height: 26px; 
min-width: 22px; margin-top: -14px; background-position: top; background-repeat: no-repeat; box-shadow: none; 
}
 
-scale.horizontal.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-top: -11px; }
+scale.horizontal.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-top: -11px; }
 
 scale.horizontal.marks-after:not(.marks-before) slider { margin: -10px; border-style: none; border-radius: 
0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-horz-scale-has-marks-below-dark.png"), 
url("assets/slider-horz-scale-has-marks-below-dark 2 png")); min-height: 26px; min-width: 22px; 
margin-bottom: -14px; background-position: bottom; background-repeat: no-repeat; box-shadow: none; }
 
-scale.horizontal.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-bottom: -11px; }
+scale.horizontal.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-bottom: -11px; }
 
 scale.horizontal.marks-after:not(.marks-before) slider:hover { margin: -10px; border-style: none; 
border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-horz-scale-has-marks-below-hover-dark.png"), 
url("assets/slider-horz-scale-has-marks-below-hover-dark 2 png")); min-height: 26px; min-width: 22px; 
margin-bottom: -14px; background-position: bottom; background-repeat: no-repeat; box-shadow: none; }
 
-scale.horizontal.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-bottom: -11px; }
+scale.horizontal.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-bottom: -11px; }
 
 scale.horizontal.marks-after:not(.marks-before) slider:active { margin: -10px; border-style: none; 
border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-horz-scale-has-marks-below-active-dark.png"), 
url("assets/slider-horz-scale-has-marks-below-active-dark 2 png")); min-height: 26px; min-width: 22px; 
margin-bottom: -14px; background-position: bottom; background-repeat: no-repeat; box-shadow: none; }
 
-scale.horizontal.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-bottom: -11px; }
+scale.horizontal.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-bottom: -11px; }
 
 scale.horizontal.marks-after:not(.marks-before) slider:disabled { margin: -10px; border-style: none; 
border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-horz-scale-has-marks-below-insensitive-dark.png"), 
url("assets/slider-horz-scale-has-marks-below-insensitive-dark 2 png")); min-height: 26px; min-width: 22px; 
margin-bottom: -14px; background-position: bottom; background-repeat: no-repeat; box-shadow: none; }
 
-scale.horizontal.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-bottom: -11px; }
+scale.horizontal.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-bottom: -11px; }
 
 scale.horizontal.marks-after:not(.marks-before) slider:backdrop { margin: -10px; border-style: none; 
border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-dark.png"), 
url("assets/slider-horz-scale-has-marks-below-backdrop-dark 2 png")); min-height: 26px; min-width: 22px; 
margin-bottom: -14px; background-position: bottom; background-repeat: no-repeat; box-shadow: none; }
 
-scale.horizontal.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-bottom: -11px; }
+scale.horizontal.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-bottom: -11px; }
 
 scale.horizontal.marks-after:not(.marks-before) slider:backdrop:disabled { margin: -10px; border-style: 
none; border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark.png"), 
url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark 2 png")); min-height: 26px; 
min-width: 22px; margin-bottom: -14px; background-position: bottom; background-repeat: no-repeat; box-shadow: 
none; }
 
-scale.horizontal.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-bottom: -11px; }
+scale.horizontal.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-bottom: -11px; }
 
 scale.vertical.marks-before:not(.marks-after) slider { margin: -10px; border-style: none; border-radius: 0; 
background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-vert-scale-has-marks-above-dark.png"), 
url("assets/slider-vert-scale-has-marks-above-dark 2 png")); min-height: 22px; min-width: 26px; margin-left: 
-14px; background-position: left bottom; background-repeat: no-repeat; box-shadow: none; }
 
-scale.vertical.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-left: -11px; }
+scale.vertical.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-left: -11px; }
 
 scale.vertical.marks-before:not(.marks-after) slider:hover { margin: -10px; border-style: none; 
border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-vert-scale-has-marks-above-hover-dark.png"), 
url("assets/slider-vert-scale-has-marks-above-hover-dark 2 png")); min-height: 22px; min-width: 26px; 
margin-left: -14px; background-position: left bottom; background-repeat: no-repeat; box-shadow: none; }
 
-scale.vertical.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-left: -11px; }
+scale.vertical.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-left: -11px; }
 
 scale.vertical.marks-before:not(.marks-after) slider:active { margin: -10px; border-style: none; 
border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-vert-scale-has-marks-above-active-dark.png"), 
url("assets/slider-vert-scale-has-marks-above-active-dark 2 png")); min-height: 22px; min-width: 26px; 
margin-left: -14px; background-position: left bottom; background-repeat: no-repeat; box-shadow: none; }
 
-scale.vertical.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-left: -11px; }
+scale.vertical.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-left: -11px; }
 
 scale.vertical.marks-before:not(.marks-after) slider:disabled { margin: -10px; border-style: none; 
border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-vert-scale-has-marks-above-insensitive-dark.png"), 
url("assets/slider-vert-scale-has-marks-above-insensitive-dark 2 png")); min-height: 22px; min-width: 26px; 
margin-left: -14px; background-position: left bottom; background-repeat: no-repeat; box-shadow: none; }
 
-scale.vertical.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-left: -11px; }
+scale.vertical.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-left: -11px; }
 
 scale.vertical.marks-before:not(.marks-after) slider:backdrop { margin: -10px; border-style: none; 
border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-dark.png"), 
url("assets/slider-vert-scale-has-marks-above-backdrop-dark 2 png")); min-height: 22px; min-width: 26px; 
margin-left: -14px; background-position: left bottom; background-repeat: no-repeat; box-shadow: none; }
 
-scale.vertical.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-left: -11px; }
+scale.vertical.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-left: -11px; }
 
 scale.vertical.marks-before:not(.marks-after) slider:backdrop:disabled { margin: -10px; border-style: none; 
border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark.png"), 
url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark 2 png")); min-height: 22px; 
min-width: 26px; margin-left: -14px; background-position: left bottom; background-repeat: no-repeat; 
box-shadow: none; }
 
-scale.vertical.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-left: -11px; }
+scale.vertical.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-left: -11px; }
 
 scale.vertical.marks-after:not(.marks-before) slider { margin: -10px; border-style: none; border-radius: 0; 
background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-vert-scale-has-marks-below-dark.png"), 
url("assets/slider-vert-scale-has-marks-below-dark 2 png")); min-height: 22px; min-width: 26px; margin-right: 
-14px; background-position: right bottom; background-repeat: no-repeat; box-shadow: none; }
 
-scale.vertical.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-right: -11px; }
+scale.vertical.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-right: -11px; }
 
 scale.vertical.marks-after:not(.marks-before) slider:hover { margin: -10px; border-style: none; 
border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-vert-scale-has-marks-below-hover-dark.png"), 
url("assets/slider-vert-scale-has-marks-below-hover-dark 2 png")); min-height: 22px; min-width: 26px; 
margin-right: -14px; background-position: right bottom; background-repeat: no-repeat; box-shadow: none; }
 
-scale.vertical.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-right: -11px; }
+scale.vertical.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-right: -11px; }
 
 scale.vertical.marks-after:not(.marks-before) slider:active { margin: -10px; border-style: none; 
border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-vert-scale-has-marks-below-active-dark.png"), 
url("assets/slider-vert-scale-has-marks-below-active-dark 2 png")); min-height: 22px; min-width: 26px; 
margin-right: -14px; background-position: right bottom; background-repeat: no-repeat; box-shadow: none; }
 
-scale.vertical.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-right: -11px; }
+scale.vertical.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-right: -11px; }
 
 scale.vertical.marks-after:not(.marks-before) slider:disabled { margin: -10px; border-style: none; 
border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-vert-scale-has-marks-below-insensitive-dark.png"), 
url("assets/slider-vert-scale-has-marks-below-insensitive-dark 2 png")); min-height: 22px; min-width: 26px; 
margin-right: -14px; background-position: right bottom; background-repeat: no-repeat; box-shadow: none; }
 
-scale.vertical.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-right: -11px; }
+scale.vertical.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-right: -11px; }
 
 scale.vertical.marks-after:not(.marks-before) slider:backdrop { margin: -10px; border-style: none; 
border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-dark.png"), 
url("assets/slider-vert-scale-has-marks-below-backdrop-dark 2 png")); min-height: 22px; min-width: 26px; 
margin-right: -14px; background-position: right bottom; background-repeat: no-repeat; box-shadow: none; }
 
-scale.vertical.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-right: -11px; }
+scale.vertical.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-right: -11px; }
 
 scale.vertical.marks-after:not(.marks-before) slider:backdrop:disabled { margin: -10px; border-style: none; 
border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark.png"), 
url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark 2 png")); min-height: 22px; 
min-width: 26px; margin-right: -14px; background-position: right bottom; background-repeat: no-repeat; 
box-shadow: none; }
 
-scale.vertical.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-right: -11px; }
+scale.vertical.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-right: -11px; }
 
 scale.color { min-height: 0; min-width: 0; }
 
@@ -1628,7 +1628,7 @@ row.activatable:backdrop:hover { background-color: transparent; }
 
 row.activatable:selected:active { box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); }
 
-row.activatable:selected.has-open-popup, row.activatable:selected:hover { background-color: #264e7e; }
+row.activatable.has-open-popup:selected, row.activatable:selected:hover { background-color: #264e7e; }
 
 row.activatable:selected:backdrop { background-color: #0f3b71; }
 
@@ -1699,9 +1699,9 @@ filechooserbutton:drop(active) { box-shadow: none; border-color: transparent; }
 /*********** Sidebar * */
 .sidebar { border-style: none; background-color: #2e2e2e; }
 
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, 
.sidebar:not(separator):dir(ltr), .sidebar:not(separator).left { border-right: 1px solid #686868; 
border-left-style: none; }
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, 
.sidebar:not(separator):dir(ltr), .sidebar.left:not(separator) { border-right: 1px solid #686868; 
border-left-style: none; }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:not(separator):dir(rtl), 
.sidebar:not(separator).right { border-left: 1px solid #686868; border-right-style: none; }
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:not(separator):dir(rtl), 
.sidebar.right:not(separator) { border-left: 1px solid #686868; border-right-style: none; }
 
 .sidebar:backdrop { background-color: #323232; border-color: #202020; transition: 200ms ease-out; }
 
@@ -1808,7 +1808,7 @@ infobar.info:backdrop, infobar.question:backdrop, infobar.warning:backdrop, info
 
 infobar.info button, infobar.question button, infobar.warning button, infobar.error button { color: #f3f3f1; 
outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; border-bottom-color: #4e4e4e; 
background-image: linear-gradient(to top, #2d2d2d 2px, #303030); text-shadow: 0 -1px rgba(0, 0, 0, 0.850353); 
-gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.850353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 
2px rgba(0, 0, 0, 0.07); }
 
-infobar.info button:hover, infobar.question button:hover, infobar.warning button:hover, infobar.error 
button:hover { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; 
border-bottom-color: #4e4e4e; text-shadow: 0 -1px rgba(0, 0, 0, 0.802353); -gtk-icon-shadow: 0 -1px rgba(0, 
0, 0, 0.802353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); 
background-image: linear-gradient(to top, #2d2d2d, #323232 1px); }
+infobar.info button:hover, infobar.question button:hover, infobar.warning button:hover, infobar.error 
button:hover { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: #686868; 
border-bottom-color: #4e4e4e; background-image: linear-gradient(to top, #2d2d2d, #323232 1px); text-shadow: 0 
-1px rgba(0, 0, 0, 0.802353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.802353); box-shadow: inset 0 1px 
rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }
 
 infobar.info button:active, infobar.info button:checked, infobar.question button:active, infobar.question 
button:checked, infobar.warning button:active, infobar.warning button:checked, infobar.error button:active, 
infobar.error button:checked { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); border-color: 
#686868; background-image: image(#191919); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; 
-gtk-icon-shadow: none; }
 
@@ -1870,9 +1870,9 @@ colorswatch.light overlay:backdrop { color: rgba(0, 0, 0, 0.5); }
 
 colorswatch:drop(active) { box-shadow: none; }
 
-colorswatch:drop(active).light overlay { border-color: #4e9a06; box-shadow: inset 0 0 0 2px #686868, inset 0 
0 0 1px #4e9a06; }
+colorswatch.light:drop(active) overlay { border-color: #4e9a06; box-shadow: inset 0 0 0 2px #686868, inset 0 
0 0 1px #4e9a06; }
 
-colorswatch:drop(active).dark overlay { border-color: #4e9a06; box-shadow: inset 0 0 0 2px #686868, inset 0 
0 0 1px #4e9a06; }
+colorswatch.dark:drop(active) overlay { border-color: #4e9a06; box-shadow: inset 0 0 0 2px #686868, inset 0 
0 0 1px #4e9a06; }
 
 colorswatch overlay { border: 1px solid #686868; }
 
@@ -1886,7 +1886,7 @@ colorswatch#add-color-button:only-child { border-radius: 5px; }
 
 colorswatch#add-color-button overlay { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); 
border-color: #686868; border-bottom-color: #4e4e4e; background-image: linear-gradient(to top, #2d2d2d 2px, 
#303030); text-shadow: 0 -1px rgba(0, 0, 0, 0.850353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.850353); 
box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }
 
-colorswatch#add-color-button overlay:hover { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); 
border-color: #686868; border-bottom-color: #4e4e4e; text-shadow: 0 -1px rgba(0, 0, 0, 0.802353); 
-gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.802353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 
2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #2d2d2d, #323232 1px); }
+colorswatch#add-color-button overlay:hover { color: #f3f3f1; outline-color: rgba(243, 243, 241, 0.3); 
border-color: #686868; border-bottom-color: #4e4e4e; background-image: linear-gradient(to top, #2d2d2d, 
#323232 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.802353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.802353); 
box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }
 
 colorswatch#add-color-button overlay:backdrop { color: #919190; border-color: #202020; background-image: 
image(#353535); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
 
diff --git a/gtk/theme/HighContrast/gtk-contained.css b/gtk/theme/HighContrast/gtk-contained.css
index 2fd5a716a6..5d95105101 100644
--- a/gtk/theme/HighContrast/gtk-contained.css
+++ b/gtk/theme/HighContrast/gtk-contained.css
@@ -242,7 +242,7 @@ spinbutton:not(.vertical) progress:backdrop, entry progress:backdrop { backgroun
 
 .linked:not(.vertical) > spinbutton:focus:not(.vertical) + spinbutton:not(.vertical), .linked:not(.vertical) 
spinbutton:focus:not(.vertical) + button, .linked:not(.vertical) > spinbutton:focus:not(.vertical) + 
combobox > box > button.combo, .linked:not(.vertical) > spinbutton:focus:not(.vertical) + entry, 
.linked:not(.vertical) > entry:focus + button, .linked:not(.vertical) > entry:focus + combobox > box > 
button.combo, .linked:not(.vertical) > entry:focus + spinbutton:not(.vertical), .linked:not(.vertical) > 
entry:focus + entry { border-left-color: #1b6acb; }
 
-.linked:not(.vertical) > spinbutton:focus.error:not(.vertical) + spinbutton:not(.vertical), 
.linked:not(.vertical) > spinbutton:focus.error:not(.vertical) + button, .linked:not(.vertical) > 
spinbutton:focus.error:not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) > 
spinbutton:focus.error:not(.vertical) + entry, .linked:not(.vertical) > entry:focus.error + button, 
.linked:not(.vertical) > entry:focus.error + combobox > box > button.combo, .linked:not(.vertical) > 
entry:focus.error + spinbutton:not(.vertical), .linked:not(.vertical) > entry:focus.error + entry { 
border-left-color: #cc0000; }
+.linked:not(.vertical) > spinbutton.error:focus:not(.vertical) + spinbutton:not(.vertical), 
.linked:not(.vertical) > spinbutton.error:focus:not(.vertical) + button, .linked:not(.vertical) > 
spinbutton.error:focus:not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) > 
spinbutton.error:focus:not(.vertical) + entry, .linked:not(.vertical) > entry.error:focus + button, 
.linked:not(.vertical) > entry.error:focus + combobox > box > button.combo, .linked:not(.vertical) > 
entry.error:focus + spinbutton:not(.vertical), .linked:not(.vertical) > entry.error:focus + entry { 
border-left-color: #cc0000; }
 
 .linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + spinbutton:not(.vertical), 
.linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + button, .linked:not(.vertical) > 
spinbutton:drop(active):not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) > 
spinbutton:drop(active):not(.vertical) + entry, .linked:not(.vertical) > entry:drop(active) + button, 
.linked:not(.vertical) > entry:drop(active) + combobox > box > button.combo, .linked:not(.vertical) > 
entry:drop(active) + spinbutton:not(.vertical), .linked:not(.vertical) > entry:drop(active) + entry { 
border-left-color: #4e9a06; }
 
@@ -254,13 +254,13 @@ spinbutton:not(.vertical) progress:backdrop, entry progress:backdrop { backgroun
 
 .linked.vertical > spinbutton:not(.vertical) + spinbutton:focus:not(:only-child):not(.vertical), 
.linked.vertical > spinbutton:not(.vertical) + entry:focus:not(:only-child), .linked.vertical > entry + 
spinbutton:focus:not(:only-child):not(.vertical), .linked.vertical > entry + entry:focus:not(:only-child) { 
border-top-color: #1b6acb; }
 
-.linked.vertical > spinbutton:not(.vertical) + spinbutton:focus.error:not(:only-child):not(.vertical), 
.linked.vertical > spinbutton:not(.vertical) + entry:focus.error:not(:only-child), .linked.vertical > entry + 
spinbutton:focus.error:not(:only-child):not(.vertical), .linked.vertical > entry + 
entry:focus.error:not(:only-child) { border-top-color: #cc0000; }
+.linked.vertical > spinbutton:not(.vertical) + spinbutton.error:focus:not(:only-child):not(.vertical), 
.linked.vertical > spinbutton:not(.vertical) + entry.error:focus:not(:only-child), .linked.vertical > entry + 
spinbutton.error:focus:not(:only-child):not(.vertical), .linked.vertical > entry + 
entry.error:focus:not(:only-child) { border-top-color: #cc0000; }
 
 .linked.vertical > spinbutton:not(.vertical) + spinbutton:drop(active):not(:only-child):not(.vertical), 
.linked.vertical > spinbutton:not(.vertical) + entry:drop(active):not(:only-child), .linked.vertical > entry 
+ spinbutton:drop(active):not(:only-child):not(.vertical), .linked.vertical > entry + 
entry:drop(active):not(:only-child) { border-top-color: #4e9a06; }
 
 .linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + spinbutton:not(.vertical), 
.linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + entry, .linked.vertical > 
spinbutton:focus:not(:only-child):not(.vertical) + button, .linked.vertical > 
spinbutton:focus:not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > 
entry:focus:not(:only-child) + spinbutton:not(.vertical), .linked.vertical > entry:focus:not(:only-child) + 
entry, .linked.vertical > entry:focus:not(:only-child) + button, .linked.vertical > 
entry:focus:not(:only-child) + combobox > box > button.combo { border-top-color: #1b6acb; }
 
-.linked.vertical > spinbutton:focus.error:not(:only-child):not(.vertical) + spinbutton:not(.vertical), 
.linked.vertical > spinbutton:focus.error:not(:only-child):not(.vertical) + entry, .linked.vertical > 
spinbutton:focus.error:not(:only-child):not(.vertical) + button, .linked.vertical > 
spinbutton:focus.error:not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > 
entry:focus.error:not(:only-child) + spinbutton:not(.vertical), .linked.vertical > 
entry:focus.error:not(:only-child) + entry, .linked.vertical > entry:focus.error:not(:only-child) + button, 
.linked.vertical > entry:focus.error:not(:only-child) + combobox > box > button.combo { border-top-color: 
#cc0000; }
+.linked.vertical > spinbutton.error:focus:not(:only-child):not(.vertical) + spinbutton:not(.vertical), 
.linked.vertical > spinbutton.error:focus:not(:only-child):not(.vertical) + entry, .linked.vertical > 
spinbutton.error:focus:not(:only-child):not(.vertical) + button, .linked.vertical > 
spinbutton.error:focus:not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > 
entry.error:focus:not(:only-child) + spinbutton:not(.vertical), .linked.vertical > 
entry.error:focus:not(:only-child) + entry, .linked.vertical > entry.error:focus:not(:only-child) + button, 
.linked.vertical > entry.error:focus:not(:only-child) + combobox > box > button.combo { border-top-color: 
#cc0000; }
 
 .linked.vertical > spinbutton:drop(active):not(:only-child):not(.vertical) + spinbutton:not(.vertical), 
.linked.vertical > spinbutton:drop(active):not(:only-child):not(.vertical) + entry, .linked.vertical > 
spinbutton:drop(active):not(:only-child):not(.vertical) + button, .linked.vertical > 
spinbutton:drop(active):not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > 
entry:drop(active):not(:only-child) + spinbutton:not(.vertical), .linked.vertical > 
entry:drop(active):not(:only-child) + entry, .linked.vertical > entry:drop(active):not(:only-child) + button, 
.linked.vertical > entry:drop(active):not(:only-child) + combobox > box > button.combo { border-top-color: 
#4e9a06; }
 
@@ -300,17 +300,17 @@ button.titlebutton:hover, button.sidebar-button:hover, notebook > header > tabs
 
 button.titlebutton:hover:active, button.sidebar-button:hover:active, notebook > header > tabs > 
arrow:hover:active, button.flat:hover:active { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
 
-notebook > header > tabs > arrow:hover, button:hover { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); 
border-color: #877b6e; border-bottom-color: #6e645a; text-shadow: 0 1px rgba(255, 255, 255, 0.769231); 
-gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 
0.07); background-image: linear-gradient(to top, #fdfdfc, white 1px); -gtk-icon-effect: highlight; }
+notebook > header > tabs > arrow:hover, button:hover { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); 
border-color: #877b6e; border-bottom-color: #6e645a; background-image: linear-gradient(to top, #fdfdfc, white 
1px); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 
0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); -gtk-icon-effect: highlight; }
 
 notebook > header > tabs > arrow:active, notebook > header > tabs > arrow:checked, button:active, 
button:checked { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; 
background-image: image(#ddd9d5); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; 
-gtk-icon-shadow: none; transition-duration: 50ms; }
 
-notebook > header > tabs > arrow:backdrop, button:backdrop.flat, button:backdrop { color: #929595; 
border-color: #d5d0cc; background-image: image(#f6f5f4); text-shadow: none; -gtk-icon-shadow: none; 
box-shadow: inset 0 1px rgba(255, 255, 255, 0); transition: 200ms ease-out; -gtk-icon-effect: none; }
+notebook > header > tabs > arrow:backdrop, button.flat:backdrop, button:backdrop { color: #929595; 
border-color: #d5d0cc; background-image: image(#f6f5f4); text-shadow: none; -gtk-icon-shadow: none; 
box-shadow: inset 0 1px rgba(255, 255, 255, 0); transition: 200ms ease-out; -gtk-icon-effect: none; }
 
-notebook > header > tabs > arrow:backdrop:active, notebook > header > tabs > arrow:backdrop:checked, 
button:backdrop.flat:active, button:backdrop.flat:checked, button:backdrop:active, button:backdrop:checked { 
color: #929595; border-color: #d5d0cc; background-image: image(#e9e9e9); box-shadow: inset 0 1px rgba(255, 
255, 255, 0); }
+notebook > header > tabs > arrow:backdrop:active, notebook > header > tabs > arrow:backdrop:checked, 
button.flat:backdrop:active, button.flat:backdrop:checked, button:backdrop:active, button:backdrop:checked { 
color: #929595; border-color: #d5d0cc; background-image: image(#e9e9e9); box-shadow: inset 0 1px rgba(255, 
255, 255, 0); }
 
-notebook > header > tabs > arrow:backdrop:disabled, button:backdrop.flat:disabled, button:backdrop:disabled 
{ color: #d4cfca; border-color: #d5d0cc; background-image: image(#fefefd); text-shadow: none; 
-gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+notebook > header > tabs > arrow:backdrop:disabled, button.flat:backdrop:disabled, button:backdrop:disabled 
{ color: #d4cfca; border-color: #d5d0cc; background-image: image(#fefefd); text-shadow: none; 
-gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
 
-notebook > header > tabs > arrow:backdrop:disabled:active, notebook > header > tabs > 
arrow:backdrop:disabled:checked, button:backdrop.flat:disabled:active, button:backdrop.flat:disabled:checked, 
button:backdrop:disabled:active, button:backdrop:disabled:checked { color: #d4cfca; border-color: #d5d0cc; 
background-image: image(#e9e9e9); box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+notebook > header > tabs > arrow:backdrop:disabled:active, notebook > header > tabs > 
arrow:backdrop:disabled:checked, button.flat:backdrop:disabled:active, button.flat:backdrop:disabled:checked, 
button:backdrop:disabled:active, button:backdrop:disabled:checked { color: #d4cfca; border-color: #d5d0cc; 
background-image: image(#e9e9e9); box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
 
 button.titlebutton:backdrop, button.sidebar-button:backdrop, notebook > header > tabs > arrow:backdrop, 
button.titlebutton:disabled, button.sidebar-button:disabled, notebook > header > tabs > arrow:disabled, 
button.flat:backdrop, button.flat:disabled, button.flat:backdrop:disabled { border-color: transparent; 
background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); 
text-shadow: none; -gtk-icon-shadow: none; }
 
@@ -370,7 +370,7 @@ button.suggested-action { color: white; outline-color: rgba(255, 255, 255, 0.3);
 
 button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: 
none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: 
#3584e4; }
 
-button.suggested-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: 
#1b6acb; border-bottom-color: #15539e; text-shadow: 0 -1px rgba(0, 0, 0, 0.511216); -gtk-icon-shadow: 0 -1px 
rgba(0, 0, 0, 0.511216); box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.07); 
background-image: linear-gradient(to top, #3584e4, #3987e5 1px); }
+button.suggested-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: 
#1b6acb; border-bottom-color: #15539e; background-image: linear-gradient(to top, #3584e4, #3987e5 1px); 
text-shadow: 0 -1px rgba(0, 0, 0, 0.511216); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.511216); box-shadow: 
inset 0 1px rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.07); }
 
 button.suggested-action:active, button.suggested-action:checked { color: white; outline-color: rgba(255, 
255, 255, 0.3); border-color: #1b6acb; background-image: image(#1961b9); box-shadow: inset 0 1px rgba(255, 
255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
 
@@ -402,7 +402,7 @@ button.destructive-action { color: white; outline-color: rgba(255, 255, 255, 0.3
 
 button.destructive-action.flat { border-color: transparent; background-color: transparent; background-image: 
none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: 
#e01b24; }
 
-button.destructive-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: 
#b2161d; border-bottom-color: #851015; text-shadow: 0 -1px rgba(0, 0, 0, 0.558275); -gtk-icon-shadow: 0 -1px 
rgba(0, 0, 0, 0.558275); box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.07); 
background-image: linear-gradient(to top, #e01b24, #e41c26 1px); }
+button.destructive-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: 
#b2161d; border-bottom-color: #851015; background-image: linear-gradient(to top, #e01b24, #e41c26 1px); 
text-shadow: 0 -1px rgba(0, 0, 0, 0.558275); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.558275); box-shadow: 
inset 0 1px rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.07); }
 
 button.destructive-action:active, button.destructive-action:checked { color: white; outline-color: rgba(255, 
255, 255, 0.3); border-color: #b2161d; background-image: image(#a0131a); box-shadow: inset 0 1px rgba(255, 
255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
 
@@ -452,9 +452,9 @@ button.circular { border-radius: 9999px; -gtk-outline-radius: 9999px; padding: 4
 
 button.circular label { padding: 0; }
 
-button.circular:not(.flat):not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: 
#272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; border-bottom-color: #6e645a; 
background-image: linear-gradient(to top, #f4f2f1 2px, #fdfdfc); text-shadow: 0 1px rgba(255, 255, 255, 
0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px 
rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #f4f2f1 2px, #fdfdfc), linear-gradient(to top, 
#6e645a 25%, #877b6e 50%); border-color: transparent; }
+button.circular:not(.flat):not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: 
#272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; border-bottom-color: #6e645a; 
background-image: linear-gradient(to top, #f4f2f1 2px, #fdfdfc), linear-gradient(to top, #6e645a 25%, #877b6e 
50%); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 
0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); border-color: transparent; }
 
-button.circular:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #272c2e; 
outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; border-bottom-color: #6e645a; text-shadow: 0 1px 
rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px 
white, 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #fdfdfc, white 1px); 
background-image: linear-gradient(to top, #fdfdfc, white 1px), linear-gradient(to top, #6e645a 25%, #877b6e 
50%); border-color: transparent; }
+button.circular:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #272c2e; 
outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; border-bottom-color: #6e645a; background-image: 
linear-gradient(to top, #fdfdfc, white 1px), linear-gradient(to top, #6e645a 25%, #877b6e 50%); text-shadow: 
0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 
0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); border-color: transparent; }
 
 stacksidebar row.needs-attention > label, .stack-switcher > button.needs-attention > label, .stack-switcher 
button.needs-attention > image { animation: needs_attention 150ms ease-in; background-image: 
-gtk-gradient(radial, center center, 0, center center, 0.5, to(#1b6acb), to(transparent)), 
-gtk-gradient(radial, center center, 0, center center, 0.5, to(rgba(255, 255, 255, 0.769231)), 
to(transparent)); background-size: 6px 6px, 6px 6px; background-repeat: no-repeat; background-position: right 
3px, right 4px; }
 
@@ -464,7 +464,7 @@ stacksidebar row.needs-attention > label:dir(rtl), .stack-switcher > button.need
 
 .inline-toolbar toolbutton > button { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: 
#877b6e; border-bottom-color: #6e645a; background-image: linear-gradient(to top, #f4f2f1 2px, #fdfdfc); 
text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); 
box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); }
 
-.inline-toolbar toolbutton > button:hover { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); 
border-color: #877b6e; border-bottom-color: #6e645a; text-shadow: 0 1px rgba(255, 255, 255, 0.769231); 
-gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 
0.07); background-image: linear-gradient(to top, #fdfdfc, white 1px); }
+.inline-toolbar toolbutton > button:hover { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); 
border-color: #877b6e; border-bottom-color: #6e645a; background-image: linear-gradient(to top, #fdfdfc, white 
1px); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 
0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); }
 
 .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked { color: #272c2e; 
outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; background-image: image(#ddd9d5); box-shadow: 
inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
 
@@ -525,7 +525,7 @@ button.color colorswatch:only-child, button.color colorswatch:only-child overlay
 /* tone down as per new designs, see issue #1473, #1748 */
 list row button.image-button:not(.flat) { border: 1px solid rgba(135, 123, 110, 0.5); }
 
-list row button.image-button:not(.flat):hover { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); 
border-color: #877b6e; border-bottom-color: #6e645a; text-shadow: 0 1px rgba(255, 255, 255, 0.769231); 
-gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 
0.07); background-image: linear-gradient(to top, #fdfdfc, white 1px); }
+list row button.image-button:not(.flat):hover { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); 
border-color: #877b6e; border-bottom-color: #6e645a; background-image: linear-gradient(to top, #fdfdfc, white 
1px); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 
0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); }
 
 list row button.image-button:not(.flat):active, list row button.image-button:not(.flat):checked { color: 
#272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; background-image: image(#ddd9d5); 
box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
 
@@ -682,15 +682,15 @@ searchbar > revealer > box { margin: -6px; padding: 6px; }
 
 .selection-mode button.titlebutton, .selection-mode .titlebar:not(headerbar) button.flat, 
.selection-mode.titlebar:not(headerbar) button.flat, .selection-mode headerbar button.flat, 
headerbar.selection-mode button.flat { border-color: transparent; background-color: transparent; 
background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: 
none; }
 
-.selection-mode .titlebar:not(headerbar) button:hover, .selection-mode.titlebar:not(headerbar) button:hover, 
.selection-mode headerbar button:hover, headerbar.selection-mode button:hover { color: #ffffff; 
outline-color: rgba(255, 255, 255, 0.3); border-color: #1b6acb; border-bottom-color: #15539e; text-shadow: 0 
-1px rgba(0, 0, 0, 0.511216); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.511216); box-shadow: inset 0 1px 
rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #3584e4, 
#3987e5 1px); }
+.selection-mode .titlebar:not(headerbar) button:hover, .selection-mode.titlebar:not(headerbar) button:hover, 
.selection-mode headerbar button:hover, headerbar.selection-mode button:hover { color: #ffffff; 
outline-color: rgba(255, 255, 255, 0.3); border-color: #1b6acb; border-bottom-color: #15539e; 
background-image: linear-gradient(to top, #3584e4, #3987e5 1px); text-shadow: 0 -1px rgba(0, 0, 0, 0.511216); 
-gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.511216); box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), 0 1px 2px 
rgba(0, 0, 0, 0.07); }
 
 .selection-mode .titlebar:not(headerbar) button:active, .selection-mode .titlebar:not(headerbar) 
button:checked, .selection-mode.titlebar:not(headerbar) button:active, 
.selection-mode.titlebar:not(headerbar) button:checked, .selection-mode headerbar button:active, 
.selection-mode headerbar button:checked, .selection-mode headerbar button.toggle:checked, .selection-mode 
headerbar button.toggle:active, headerbar.selection-mode button:active, headerbar.selection-mode 
button:checked, headerbar.selection-mode button.toggle:checked, headerbar.selection-mode button.toggle:active 
{ color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #1b6acb; background-image: 
image(#1961b9); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
 
-.selection-mode .titlebar:not(headerbar) button:backdrop, .selection-mode.titlebar:not(headerbar) 
button:backdrop, .selection-mode headerbar button:backdrop.flat, .selection-mode headerbar button:backdrop, 
headerbar.selection-mode button:backdrop.flat, headerbar.selection-mode button:backdrop { color: #d7e6fa; 
border-color: #3584e4; background-image: image(#3584e4); text-shadow: none; -gtk-icon-shadow: none; 
box-shadow: inset 0 1px rgba(255, 255, 255, 0); -gtk-icon-effect: none; border-color: #185fb4; }
+.selection-mode .titlebar:not(headerbar) button:backdrop, .selection-mode.titlebar:not(headerbar) 
button:backdrop, .selection-mode headerbar button.flat:backdrop, .selection-mode headerbar button:backdrop, 
headerbar.selection-mode button.flat:backdrop, headerbar.selection-mode button:backdrop { color: #d7e6fa; 
border-color: #3584e4; background-image: image(#3584e4); text-shadow: none; -gtk-icon-shadow: none; 
box-shadow: inset 0 1px rgba(255, 255, 255, 0); -gtk-icon-effect: none; border-color: #185fb4; }
 
-.selection-mode .titlebar:not(headerbar) button:backdrop:active, .selection-mode .titlebar:not(headerbar) 
button:backdrop:checked, .selection-mode.titlebar:not(headerbar) button:backdrop:active, 
.selection-mode.titlebar:not(headerbar) button:backdrop:checked, .selection-mode headerbar 
button:backdrop.flat:active, .selection-mode headerbar button:backdrop.flat:checked, .selection-mode 
headerbar button:backdrop:active, .selection-mode headerbar button:backdrop:checked, headerbar.selection-mode 
button:backdrop.flat:active, headerbar.selection-mode button:backdrop.flat:checked, headerbar.selection-mode 
button:backdrop:active, headerbar.selection-mode button:backdrop:checked { color: #d5e6f9; border-color: 
#2f80e3; background-image: image(#2f80e3); box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: 
#185fb4; }
+.selection-mode .titlebar:not(headerbar) button:backdrop:active, .selection-mode .titlebar:not(headerbar) 
button:backdrop:checked, .selection-mode.titlebar:not(headerbar) button:backdrop:active, 
.selection-mode.titlebar:not(headerbar) button:backdrop:checked, .selection-mode headerbar 
button.flat:backdrop:active, .selection-mode headerbar button.flat:backdrop:checked, .selection-mode 
headerbar button:backdrop:active, .selection-mode headerbar button:backdrop:checked, headerbar.selection-mode 
button.flat:backdrop:active, headerbar.selection-mode button.flat:backdrop:checked, headerbar.selection-mode 
button:backdrop:active, headerbar.selection-mode button:backdrop:checked { color: #d5e6f9; border-color: 
#2f80e3; background-image: image(#2f80e3); box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: 
#185fb4; }
 
-.selection-mode .titlebar:not(headerbar) button:backdrop:disabled, .selection-mode.titlebar:not(headerbar) 
button:backdrop:disabled, .selection-mode headerbar button:backdrop.flat:disabled, .selection-mode headerbar 
button:backdrop:disabled, headerbar.selection-mode button:backdrop.flat:disabled, headerbar.selection-mode 
button:backdrop:disabled { color: #8fbbf0; border-color: #5396e8; background-image: image(#5396e8); 
text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: 
#185fb4; }
+.selection-mode .titlebar:not(headerbar) button:backdrop:disabled, .selection-mode.titlebar:not(headerbar) 
button:backdrop:disabled, .selection-mode headerbar button.flat:backdrop:disabled, .selection-mode headerbar 
button:backdrop:disabled, headerbar.selection-mode button.flat:backdrop:disabled, headerbar.selection-mode 
button:backdrop:disabled { color: #8fbbf0; border-color: #5396e8; background-image: image(#5396e8); 
text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: 
#185fb4; }
 
 .selection-mode .titlebar:not(headerbar) button:backdrop:disabled:active, .selection-mode 
.titlebar:not(headerbar) button:backdrop:disabled:checked, .selection-mode.titlebar:not(headerbar) 
button:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:checked, 
.selection-mode headerbar button:backdrop:disabled:active, .selection-mode headerbar 
button:backdrop:disabled:checked, headerbar.selection-mode button:backdrop:disabled:active, 
headerbar.selection-mode button:backdrop:disabled:checked { color: #78aced; border-color: #2f80e3; 
background-image: image(#2f80e3); box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #185fb4; }
 
@@ -702,7 +702,7 @@ searchbar > revealer > box { margin: -6px; padding: 6px; }
 
 .selection-mode .titlebar:not(headerbar) button.suggested-action, .selection-mode.titlebar:not(headerbar) 
button.suggested-action, .selection-mode headerbar button.suggested-action, headerbar.selection-mode 
button.suggested-action { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; 
border-bottom-color: #6e645a; background-image: linear-gradient(to top, #f4f2f1 2px, #fdfdfc); text-shadow: 0 
1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 
1px white, 0 1px 2px rgba(0, 0, 0, 0.07); border-color: #185fb4; }
 
-.selection-mode .titlebar:not(headerbar) button.suggested-action:hover, 
.selection-mode.titlebar:not(headerbar) button.suggested-action:hover, .selection-mode headerbar 
button.suggested-action:hover, headerbar.selection-mode button.suggested-action:hover { color: #272c2e; 
outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; border-bottom-color: #6e645a; text-shadow: 0 1px 
rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px 
white, 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #fdfdfc, white 1px); 
border-color: #185fb4; }
+.selection-mode .titlebar:not(headerbar) button.suggested-action:hover, 
.selection-mode.titlebar:not(headerbar) button.suggested-action:hover, .selection-mode headerbar 
button.suggested-action:hover, headerbar.selection-mode button.suggested-action:hover { color: #272c2e; 
outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; border-bottom-color: #6e645a; background-image: 
linear-gradient(to top, #fdfdfc, white 1px); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); 
-gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 
0.07); border-color: #185fb4; }
 
 .selection-mode .titlebar:not(headerbar) button.suggested-action:active, 
.selection-mode.titlebar:not(headerbar) button.suggested-action:active, .selection-mode headerbar 
button.suggested-action:active, headerbar.selection-mode button.suggested-action:active { color: #272c2e; 
outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; background-image: image(#ddd9d5); box-shadow: 
inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; border-color: #185fb4; }
 
@@ -792,9 +792,9 @@ treeview.view:backdrop { border-left-color: #c4c5c5; border-top: #f6f5f4; }
 
 treeview.view:drop(active) { border-style: solid none; border-width: 1px; border-color: #124787; }
 
-treeview.view:drop(active).after { border-top-style: none; }
+treeview.view.after:drop(active) { border-top-style: none; }
 
-treeview.view:drop(active).before { border-bottom-style: none; }
+treeview.view.before:drop(active) { border-bottom-style: none; }
 
 treeview.view.expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); color: #4d4d4d; }
 
@@ -834,7 +834,7 @@ treeview.view button.dnd:active, treeview.view button.dnd:selected, treeview.vie
 
 treeview.view acceleditor > label { background-color: #1b6acb; }
 
-treeview.view header button, treeview.view header button:hover, treeview.view header button:active { 
padding: 0 6px; background-image: none; border-style: none solid solid none; border-color: #fdfdfc; 
border-radius: 0; text-shadow: none; }
+treeview.view header button, treeview.view header button:hover, treeview.view header button:active { 
padding: 0 6px; background-image: none; border-style: none solid solid none; border-color: #9f958b; 
border-radius: 0; text-shadow: none; }
 
 treeview.view header button:disabled { border-color: #fdfdfc; background-image: none; }
 
@@ -999,21 +999,21 @@ notebook > header tab { min-height: 30px; min-width: 30px; padding: 3px 12px; ou
 
 notebook > header tab:hover { color: #272c2e; background-color: #f4f2f1; }
 
-notebook > header tab:hover.reorderable-page { border-color: rgba(135, 123, 110, 0.3); background-color: 
rgba(253, 253, 252, 0.2); }
+notebook > header tab.reorderable-page:hover { border-color: rgba(135, 123, 110, 0.3); background-color: 
rgba(253, 253, 252, 0.2); }
 
 notebook > header tab:backdrop { color: #babbbb; }
 
-notebook > header tab:backdrop.reorderable-page { border-color: transparent; background-color: transparent; }
+notebook > header tab.reorderable-page:backdrop { border-color: transparent; background-color: transparent; }
 
 notebook > header tab:checked { color: #272c2e; }
 
-notebook > header tab:checked.reorderable-page { border-color: rgba(135, 123, 110, 0.5); background-color: 
rgba(253, 253, 252, 0.5); }
+notebook > header tab.reorderable-page:checked { border-color: rgba(135, 123, 110, 0.5); background-color: 
rgba(253, 253, 252, 0.5); }
 
-notebook > header tab:checked.reorderable-page:hover { background-color: rgba(253, 253, 252, 0.7); }
+notebook > header tab.reorderable-page:checked:hover { background-color: rgba(253, 253, 252, 0.7); }
 
 notebook > header tab:backdrop:checked { color: #929595; }
 
-notebook > header tab:backdrop:checked.reorderable-page { border-color: #d5d0cc; background-color: #f6f5f4; }
+notebook > header tab.reorderable-page:backdrop:checked { border-color: #d5d0cc; background-color: #f6f5f4; }
 
 notebook > header tab button.flat { padding: 0; margin-top: 4px; margin-bottom: 4px; min-width: 20px; 
min-height: 20px; }
 
@@ -1094,13 +1094,13 @@ scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { margin: 0; mi
 
 scrollbar.overlay-indicator:not(.dragging):not(.hovering) button { min-width: 5px; min-height: 5px; 
background-color: #272c2e; background-clip: padding-box; border-radius: 100%; border: 1px solid white; 
-gtk-icon-source: none; }
 
-scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider { margin: 0 2px; min-width: 
40px; }
+scrollbar.overlay-indicator.horizontal:not(.dragging):not(.hovering) slider { margin: 0 2px; min-width: 
40px; }
 
-scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal button { margin: 1px 2px; min-width: 
5px; }
+scrollbar.overlay-indicator.horizontal:not(.dragging):not(.hovering) button { margin: 1px 2px; min-width: 
5px; }
 
-scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider { margin: 2px 0; min-height: 40px; 
}
+scrollbar.overlay-indicator.vertical:not(.dragging):not(.hovering) slider { margin: 2px 0; min-height: 40px; 
}
 
-scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical button { margin: 2px 1px; min-height: 
5px; }
+scrollbar.overlay-indicator.vertical:not(.dragging):not(.hovering) button { margin: 2px 1px; min-height: 
5px; }
 
 scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering { opacity: 0.8; }
 
@@ -1147,7 +1147,7 @@ switch slider { margin: -1px; min-width: 24px; min-height: 24px; border: 1px sol
 
 switch image { color: transparent; }
 
-switch:hover slider { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #6e645a; 
box-shadow: inset 0 1px white, 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: 
linear-gradient(to bottom, white 10%, white 90%); }
+switch:hover slider { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #6e645a; 
background-image: linear-gradient(to bottom, white 10%, white 90%); box-shadow: inset 0 1px white, 0 1px 
rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); }
 
 switch:checked > slider { border: 1px solid #15539e; }
 
@@ -1329,7 +1329,7 @@ scale fill:disabled:backdrop, scale fill:disabled { border-color: transparent; b
 
 scale slider { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #6e645a; text-shadow: 0 
1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); background-image: 
linear-gradient(to bottom, white 20%, #fdfdfc 90%); box-shadow: inset 0 1px white, 0 1px rgba(0, 0, 0, 0.1), 
0 1px 2px rgba(0, 0, 0, 0.07); border: 1px solid #655c53; border-radius: 100%; transition: all 200ms 
cubic-bezier(0.25, 0.46, 0.45, 0.94); transition-property: background, border, box-shadow; }
 
-scale slider:hover { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #6e645a; 
box-shadow: inset 0 1px white, 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: 
linear-gradient(to bottom, white 10%, white 90%); }
+scale slider:hover { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #6e645a; 
background-image: linear-gradient(to bottom, white 10%, white 90%); box-shadow: inset 0 1px white, 0 1px 
rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); }
 
 scale slider:active { border-color: #185fb4; }
 
@@ -1381,99 +1381,99 @@ scale.vertical.fine-tune indicator { min-width: 3px; }
 
 scale.horizontal.marks-before:not(.marks-after) slider { margin: -10px; border-style: none; border-radius: 
0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-horz-scale-has-marks-above.png"), 
url("assets/slider-horz-scale-has-marks-above 2 png")); min-height: 26px; min-width: 22px; margin-top: -14px; 
background-position: top; background-repeat: no-repeat; box-shadow: none; }
 
-scale.horizontal.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-top: -11px; }
+scale.horizontal.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-top: -11px; }
 
 scale.horizontal.marks-before:not(.marks-after) slider:hover { margin: -10px; border-style: none; 
border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-horz-scale-has-marks-above-hover.png"), 
url("assets/slider-horz-scale-has-marks-above-hover 2 png")); min-height: 26px; min-width: 22px; margin-top: 
-14px; background-position: top; background-repeat: no-repeat; box-shadow: none; }
 
-scale.horizontal.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-top: -11px; }
+scale.horizontal.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-top: -11px; }
 
 scale.horizontal.marks-before:not(.marks-after) slider:active { margin: -10px; border-style: none; 
border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-horz-scale-has-marks-above-active.png"), 
url("assets/slider-horz-scale-has-marks-above-active 2 png")); min-height: 26px; min-width: 22px; margin-top: 
-14px; background-position: top; background-repeat: no-repeat; box-shadow: none; }
 
-scale.horizontal.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-top: -11px; }
+scale.horizontal.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-top: -11px; }
 
 scale.horizontal.marks-before:not(.marks-after) slider:disabled { margin: -10px; border-style: none; 
border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-horz-scale-has-marks-above-insensitive.png"), 
url("assets/slider-horz-scale-has-marks-above-insensitive 2 png")); min-height: 26px; min-width: 22px; 
margin-top: -14px; background-position: top; background-repeat: no-repeat; box-shadow: none; }
 
-scale.horizontal.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-top: -11px; }
+scale.horizontal.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-top: -11px; }
 
 scale.horizontal.marks-before:not(.marks-after) slider:backdrop { margin: -10px; border-style: none; 
border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop.png"), 
url("assets/slider-horz-scale-has-marks-above-backdrop 2 png")); min-height: 26px; min-width: 22px; 
margin-top: -14px; background-position: top; background-repeat: no-repeat; box-shadow: none; }
 
-scale.horizontal.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-top: -11px; }
+scale.horizontal.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-top: -11px; }
 
 scale.horizontal.marks-before:not(.marks-after) slider:backdrop:disabled { margin: -10px; border-style: 
none; border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive.png"), 
url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive 2 png")); min-height: 26px; min-width: 
22px; margin-top: -14px; background-position: top; background-repeat: no-repeat; box-shadow: none; }
 
-scale.horizontal.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-top: -11px; }
+scale.horizontal.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-top: -11px; }
 
 scale.horizontal.marks-after:not(.marks-before) slider { margin: -10px; border-style: none; border-radius: 
0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-horz-scale-has-marks-below.png"), 
url("assets/slider-horz-scale-has-marks-below 2 png")); min-height: 26px; min-width: 22px; margin-bottom: 
-14px; background-position: bottom; background-repeat: no-repeat; box-shadow: none; }
 
-scale.horizontal.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-bottom: -11px; }
+scale.horizontal.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-bottom: -11px; }
 
 scale.horizontal.marks-after:not(.marks-before) slider:hover { margin: -10px; border-style: none; 
border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-horz-scale-has-marks-below-hover.png"), 
url("assets/slider-horz-scale-has-marks-below-hover 2 png")); min-height: 26px; min-width: 22px; 
margin-bottom: -14px; background-position: bottom; background-repeat: no-repeat; box-shadow: none; }
 
-scale.horizontal.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-bottom: -11px; }
+scale.horizontal.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-bottom: -11px; }
 
 scale.horizontal.marks-after:not(.marks-before) slider:active { margin: -10px; border-style: none; 
border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-horz-scale-has-marks-below-active.png"), 
url("assets/slider-horz-scale-has-marks-below-active 2 png")); min-height: 26px; min-width: 22px; 
margin-bottom: -14px; background-position: bottom; background-repeat: no-repeat; box-shadow: none; }
 
-scale.horizontal.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-bottom: -11px; }
+scale.horizontal.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-bottom: -11px; }
 
 scale.horizontal.marks-after:not(.marks-before) slider:disabled { margin: -10px; border-style: none; 
border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-horz-scale-has-marks-below-insensitive.png"), 
url("assets/slider-horz-scale-has-marks-below-insensitive 2 png")); min-height: 26px; min-width: 22px; 
margin-bottom: -14px; background-position: bottom; background-repeat: no-repeat; box-shadow: none; }
 
-scale.horizontal.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-bottom: -11px; }
+scale.horizontal.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-bottom: -11px; }
 
 scale.horizontal.marks-after:not(.marks-before) slider:backdrop { margin: -10px; border-style: none; 
border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop.png"), 
url("assets/slider-horz-scale-has-marks-below-backdrop 2 png")); min-height: 26px; min-width: 22px; 
margin-bottom: -14px; background-position: bottom; background-repeat: no-repeat; box-shadow: none; }
 
-scale.horizontal.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-bottom: -11px; }
+scale.horizontal.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-bottom: -11px; }
 
 scale.horizontal.marks-after:not(.marks-before) slider:backdrop:disabled { margin: -10px; border-style: 
none; border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive.png"), 
url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive 2 png")); min-height: 26px; min-width: 
22px; margin-bottom: -14px; background-position: bottom; background-repeat: no-repeat; box-shadow: none; }
 
-scale.horizontal.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-bottom: -11px; }
+scale.horizontal.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-bottom: -11px; }
 
 scale.vertical.marks-before:not(.marks-after) slider { margin: -10px; border-style: none; border-radius: 0; 
background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-vert-scale-has-marks-above.png"), 
url("assets/slider-vert-scale-has-marks-above 2 png")); min-height: 22px; min-width: 26px; margin-left: 
-14px; background-position: left bottom; background-repeat: no-repeat; box-shadow: none; }
 
-scale.vertical.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-left: -11px; }
+scale.vertical.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-left: -11px; }
 
 scale.vertical.marks-before:not(.marks-after) slider:hover { margin: -10px; border-style: none; 
border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-vert-scale-has-marks-above-hover.png"), 
url("assets/slider-vert-scale-has-marks-above-hover 2 png")); min-height: 22px; min-width: 26px; margin-left: 
-14px; background-position: left bottom; background-repeat: no-repeat; box-shadow: none; }
 
-scale.vertical.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-left: -11px; }
+scale.vertical.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-left: -11px; }
 
 scale.vertical.marks-before:not(.marks-after) slider:active { margin: -10px; border-style: none; 
border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-vert-scale-has-marks-above-active.png"), 
url("assets/slider-vert-scale-has-marks-above-active 2 png")); min-height: 22px; min-width: 26px; 
margin-left: -14px; background-position: left bottom; background-repeat: no-repeat; box-shadow: none; }
 
-scale.vertical.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-left: -11px; }
+scale.vertical.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-left: -11px; }
 
 scale.vertical.marks-before:not(.marks-after) slider:disabled { margin: -10px; border-style: none; 
border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-vert-scale-has-marks-above-insensitive.png"), 
url("assets/slider-vert-scale-has-marks-above-insensitive 2 png")); min-height: 22px; min-width: 26px; 
margin-left: -14px; background-position: left bottom; background-repeat: no-repeat; box-shadow: none; }
 
-scale.vertical.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-left: -11px; }
+scale.vertical.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-left: -11px; }
 
 scale.vertical.marks-before:not(.marks-after) slider:backdrop { margin: -10px; border-style: none; 
border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop.png"), 
url("assets/slider-vert-scale-has-marks-above-backdrop 2 png")); min-height: 22px; min-width: 26px; 
margin-left: -14px; background-position: left bottom; background-repeat: no-repeat; box-shadow: none; }
 
-scale.vertical.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-left: -11px; }
+scale.vertical.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-left: -11px; }
 
 scale.vertical.marks-before:not(.marks-after) slider:backdrop:disabled { margin: -10px; border-style: none; 
border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive.png"), 
url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive 2 png")); min-height: 22px; min-width: 
26px; margin-left: -14px; background-position: left bottom; background-repeat: no-repeat; box-shadow: none; }
 
-scale.vertical.marks-before:not(.marks-after).fine-tune slider { margin: -7px; margin-left: -11px; }
+scale.vertical.marks-before.fine-tune:not(.marks-after) slider { margin: -7px; margin-left: -11px; }
 
 scale.vertical.marks-after:not(.marks-before) slider { margin: -10px; border-style: none; border-radius: 0; 
background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-vert-scale-has-marks-below.png"), 
url("assets/slider-vert-scale-has-marks-below 2 png")); min-height: 22px; min-width: 26px; margin-right: 
-14px; background-position: right bottom; background-repeat: no-repeat; box-shadow: none; }
 
-scale.vertical.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-right: -11px; }
+scale.vertical.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-right: -11px; }
 
 scale.vertical.marks-after:not(.marks-before) slider:hover { margin: -10px; border-style: none; 
border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-vert-scale-has-marks-below-hover.png"), 
url("assets/slider-vert-scale-has-marks-below-hover 2 png")); min-height: 22px; min-width: 26px; 
margin-right: -14px; background-position: right bottom; background-repeat: no-repeat; box-shadow: none; }
 
-scale.vertical.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-right: -11px; }
+scale.vertical.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-right: -11px; }
 
 scale.vertical.marks-after:not(.marks-before) slider:active { margin: -10px; border-style: none; 
border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-vert-scale-has-marks-below-active.png"), 
url("assets/slider-vert-scale-has-marks-below-active 2 png")); min-height: 22px; min-width: 26px; 
margin-right: -14px; background-position: right bottom; background-repeat: no-repeat; box-shadow: none; }
 
-scale.vertical.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-right: -11px; }
+scale.vertical.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-right: -11px; }
 
 scale.vertical.marks-after:not(.marks-before) slider:disabled { margin: -10px; border-style: none; 
border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-vert-scale-has-marks-below-insensitive.png"), 
url("assets/slider-vert-scale-has-marks-below-insensitive 2 png")); min-height: 22px; min-width: 26px; 
margin-right: -14px; background-position: right bottom; background-repeat: no-repeat; box-shadow: none; }
 
-scale.vertical.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-right: -11px; }
+scale.vertical.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-right: -11px; }
 
 scale.vertical.marks-after:not(.marks-before) slider:backdrop { margin: -10px; border-style: none; 
border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop.png"), 
url("assets/slider-vert-scale-has-marks-below-backdrop 2 png")); min-height: 22px; min-width: 26px; 
margin-right: -14px; background-position: right bottom; background-repeat: no-repeat; box-shadow: none; }
 
-scale.vertical.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-right: -11px; }
+scale.vertical.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-right: -11px; }
 
 scale.vertical.marks-after:not(.marks-before) slider:backdrop:disabled { margin: -10px; border-style: none; 
border-radius: 0; background-color: transparent; background-image: 
-gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive.png"), 
url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive 2 png")); min-height: 22px; min-width: 
26px; margin-right: -14px; background-position: right bottom; background-repeat: no-repeat; box-shadow: none; 
}
 
-scale.vertical.marks-after:not(.marks-before).fine-tune slider { margin: -7px; margin-right: -11px; }
+scale.vertical.marks-after.fine-tune:not(.marks-before) slider { margin: -7px; margin-right: -11px; }
 
 scale.color { min-height: 0; min-width: 0; }
 
@@ -1644,7 +1644,7 @@ row.activatable:backdrop:hover { background-color: transparent; }
 
 row.activatable:selected:active { box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); }
 
-row.activatable:selected.has-open-popup, row.activatable:selected:hover { background-color: #1c64bb; }
+row.activatable.has-open-popup:selected, row.activatable:selected:hover { background-color: #1c64bb; }
 
 row.activatable:selected:backdrop { background-color: #1b6acb; }
 
@@ -1715,9 +1715,9 @@ filechooserbutton:drop(active) { box-shadow: none; border-color: transparent; }
 /*********** Sidebar * */
 .sidebar { border-style: none; background-color: #fefefe; }
 
-stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, 
.sidebar:not(separator):dir(ltr), .sidebar:not(separator).left { border-right: 1px solid #877b6e; 
border-left-style: none; }
+stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, 
.sidebar:not(separator):dir(ltr), .sidebar.left:not(separator) { border-right: 1px solid #877b6e; 
border-left-style: none; }
 
-stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:not(separator):dir(rtl), 
.sidebar:not(separator).right { border-left: 1px solid #877b6e; border-right-style: none; }
+stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:not(separator):dir(rtl), 
.sidebar.right:not(separator) { border-left: 1px solid #877b6e; border-right-style: none; }
 
 .sidebar:backdrop { background-color: #f9f9f8; border-color: #d5d0cc; transition: 200ms ease-out; }
 
@@ -1824,7 +1824,7 @@ infobar.info:backdrop, infobar.question:backdrop, infobar.warning:backdrop, info
 
 infobar.info button, infobar.question button, infobar.warning button, infobar.error button { color: #272c2e; 
outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; border-bottom-color: #6e645a; background-image: 
linear-gradient(to top, #f4f2f1 2px, #fdfdfc); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); 
-gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 
0.07); }
 
-infobar.info button:hover, infobar.question button:hover, infobar.warning button:hover, infobar.error 
button:hover { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; 
border-bottom-color: #6e645a; text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px 
rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); 
background-image: linear-gradient(to top, #fdfdfc, white 1px); }
+infobar.info button:hover, infobar.question button:hover, infobar.warning button:hover, infobar.error 
button:hover { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; 
border-bottom-color: #6e645a; background-image: linear-gradient(to top, #fdfdfc, white 1px); text-shadow: 0 
1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 
1px white, 0 1px 2px rgba(0, 0, 0, 0.07); }
 
 infobar.info button:active, infobar.info button:checked, infobar.question button:active, infobar.question 
button:checked, infobar.warning button:active, infobar.warning button:checked, infobar.error button:active, 
infobar.error button:checked { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: #877b6e; 
background-image: image(#ddd9d5); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; 
-gtk-icon-shadow: none; }
 
@@ -1886,9 +1886,9 @@ colorswatch.light overlay:backdrop { color: rgba(0, 0, 0, 0.5); }
 
 colorswatch:drop(active) { box-shadow: none; }
 
-colorswatch:drop(active).light overlay { border-color: #4e9a06; box-shadow: inset 0 0 0 2px #3d7805, inset 0 
0 0 1px #4e9a06; }
+colorswatch.light:drop(active) overlay { border-color: #4e9a06; box-shadow: inset 0 0 0 2px #3d7805, inset 0 
0 0 1px #4e9a06; }
 
-colorswatch:drop(active).dark overlay { border-color: #4e9a06; box-shadow: inset 0 0 0 2px rgba(0, 0, 0, 
0.3), inset 0 0 0 1px #4e9a06; }
+colorswatch.dark:drop(active) overlay { border-color: #4e9a06; box-shadow: inset 0 0 0 2px rgba(0, 0, 0, 
0.3), inset 0 0 0 1px #4e9a06; }
 
 colorswatch overlay { border: 1px solid rgba(0, 0, 0, 0.3); }
 
@@ -1902,7 +1902,7 @@ colorswatch#add-color-button:only-child { border-radius: 5px; }
 
 colorswatch#add-color-button overlay { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); border-color: 
#877b6e; border-bottom-color: #6e645a; background-image: linear-gradient(to top, #f4f2f1 2px, #fdfdfc); 
text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); 
box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); }
 
-colorswatch#add-color-button overlay:hover { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); 
border-color: #877b6e; border-bottom-color: #6e645a; text-shadow: 0 1px rgba(255, 255, 255, 0.769231); 
-gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 
0.07); background-image: linear-gradient(to top, #fdfdfc, white 1px); }
+colorswatch#add-color-button overlay:hover { color: #272c2e; outline-color: rgba(39, 44, 46, 0.3); 
border-color: #877b6e; border-bottom-color: #6e645a; background-image: linear-gradient(to top, #fdfdfc, white 
1px); text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 
0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07); }
 
 colorswatch#add-color-button overlay:backdrop { color: #929595; border-color: #d5d0cc; background-image: 
image(#f6f5f4); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
 


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