[gtk/gtk-3-24: 1/2] themes: remove various @extend with compound selectors



commit 6f6070b5108455b346d8b1f3713050c933519f62
Author: Christoph Reiter <reiter christoph gmail com>
Date:   Sun Nov 10 23:11:35 2019 +0100

    themes: remove various @extend with compound selectors
    
    They are no longer supported by sass and broken with libsass 3.6.3
    (https://github.com/sass/libsass/issues/3033)
    
    This removes some of them by replacing them with a placeholder selector.
    This at least brings the resulting CSS size down a bit so gtk can be build
    again.
    
    The remaining cases I don't know how to convert because I haven't found a way to
    reproduce the old output.
    
    The CSS was generated with libsass 3.5.5.
    
    See #2237

 gtk/theme/Adwaita/_common.scss                   | 90 ++++++++++++----------
 gtk/theme/Adwaita/gtk-contained-dark.css         | 60 +++++++--------
 gtk/theme/Adwaita/gtk-contained.css              | 60 +++++++--------
 gtk/theme/HighContrast/_common.scss              | 96 ++++++++++++++----------
 gtk/theme/HighContrast/gtk-contained-inverse.css | 38 +++++-----
 gtk/theme/HighContrast/gtk-contained.css         | 38 +++++-----
 6 files changed, 201 insertions(+), 181 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 59b6ec8455..c07c1a4454 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -196,7 +196,7 @@ label {
   &:disabled {
     color: $insensitive_fg_color;
 
-    selection { @extend %selected_items:disabled; }
+    selection { @extend %selected_items_disabled; }
 
     &:backdrop { color: $backdrop_insensitive_color; }
   }
@@ -204,7 +204,7 @@ label {
   &:backdrop {
     color: $backdrop_fg_color;
 
-    selection { @extend %selected_items:backdrop; }
+    selection { @extend %selected_items_backdrop; }
   }
 }
 
@@ -543,6 +543,7 @@ button {
 
     @include button(normal);
 
+    @at-root %button_basic_flat,
     &.flat {
       @include button(undecorated);
       // to avoid adiacent buttons borders clashing when transitioning, the transition on the normal state 
is set
@@ -620,6 +621,7 @@ button {
       }
     }
 
+    @at-root %button_basic_drop_active,
     &:drop(active) {
       color: $drop_target_color;
       border-color: $drop_target_color;
@@ -961,11 +963,11 @@ toolbar.inline-toolbar toolbutton,
 toolbar.inline-toolbar toolbutton:backdrop {
   > button.flat { @extend %linked_middle; }
 
-  &:first-child > button.flat { @extend %linked:first-child; }
+  &:first-child > button.flat { @extend %linked_left; }
 
-  &:last-child > button.flat { @extend %linked:last-child; }
+  &:last-child > button.flat { @extend %linked_right; }
 
-  &:only-child > button.flat { @extend %linked:only-child; }
+  &:only-child > button.flat { @extend %linked_only_child; }
 }
 
 %linked_middle {
@@ -989,6 +991,11 @@ toolbar.inline-toolbar toolbutton:backdrop {
     border-right-style: solid;
 }
 
+%linked_only_child {
+    border-radius: $button_radius;
+    border-style: solid;
+}
+
 // .linked assumes Box, which reverses nodes in RTL, so 1st child is always left
 %linked {
   @extend %linked_middle;
@@ -996,10 +1003,7 @@ toolbar.inline-toolbar toolbutton:backdrop {
   &:first-child { @extend %linked_left; }
   &:last-child { @extend %linked_right; }
 
-  &:only-child {
-    border-radius: $button_radius;
-    border-style: solid;
-  }
+  &:only-child { @extend %linked_only_child; }
 }
 
 // Other widgets use widget child order, so 1st/last child are at text start/end
@@ -1016,10 +1020,7 @@ toolbar.inline-toolbar toolbutton:backdrop {
     &:last-child { @extend %linked_left; }
   }
 
-  &:only-child {
-    border-radius: $button_radius;
-    border-style: solid;
-  }
+  &:only-child { @extend %linked_only_child; }
 }
 
 %linked_vertical_middle {
@@ -1027,24 +1028,30 @@ toolbar.inline-toolbar toolbutton:backdrop {
   border-radius: 0;
 }
 
+%linked_vertical_top {
+  border-top-left-radius: $button_radius;
+  border-top-right-radius: $button_radius;
+}
+
+%linked_vertical_bottom {
+  border-bottom-left-radius: $button_radius;
+  border-bottom-right-radius: $button_radius;
+  border-style: solid;
+}
+
+%linked_vertical_only_child {
+  border-radius: $button_radius;
+  border-style: solid;
+}
+
 %linked_vertical{
   @extend %linked_vertical_middle;
 
-  &:first-child {
-    border-top-left-radius: $button_radius;
-    border-top-right-radius: $button_radius;
-  }
+  &:first-child { @extend %linked_vertical_top; }
 
-  &:last-child {
-    border-bottom-left-radius: $button_radius;
-    border-bottom-right-radius: $button_radius;
-    border-style: solid;
-  }
+  &:last-child { @extend %linked_vertical_bottom; }
 
-  &:only-child {
-    border-radius: $button_radius;
-    border-style: solid;
-  }
+  &:only-child { @extend %linked_vertical_only_child; }
 }
 
 %undecorated_button {
@@ -1158,7 +1165,7 @@ button:link,
 button:visited {
   @extend %undecorated_button;
 
-  @extend *:link;
+  @extend %link;
 
   text-shadow: none;
 
@@ -1395,15 +1402,15 @@ combobox {
 
   &.linked {
     button:nth-child(2) {
-      &:dir(ltr) { @extend %linked:last-child; }
-      &:dir(rtl) { @extend %linked:first-child; }
+      &:dir(ltr) { @extend %linked_right; }
+      &:dir(rtl) { @extend %linked_left; }
     }
   }
 
   &:drop(active) { // FIXME: untested
     box-shadow: none;
 
-    button.combo { @extend %button_basic:drop(active); }
+    button.combo { @extend %button_basic_drop_active; }
   }
 }
 
@@ -1416,14 +1423,14 @@ combobox {
   &:dir(rtl) { @extend %linked_middle; } // specificity bump
 }
 
-.linked:not(.vertical) > combobox:first-child > box > button.combo { @extend %linked:first-child; }
-.linked:not(.vertical) > combobox:last-child > box > button.combo { @extend %linked:last-child; }
-.linked:not(.vertical) > combobox:only-child > box > button.combo { @extend %linked:only-child; }
+.linked:not(.vertical) > combobox:first-child > box > button.combo { @extend %linked_left; }
+.linked:not(.vertical) > combobox:last-child > box > button.combo { @extend %linked_right; }
+.linked:not(.vertical) > combobox:only-child > box > button.combo { @extend %linked_only_child; }
 
 .linked.vertical > combobox > box > button.combo { @extend %linked_vertical_middle; }
-.linked.vertical > combobox:first-child > box > button.combo { @extend %linked_vertical:first-child;}
-.linked.vertical > combobox:last-child > box > button.combo { @extend %linked_vertical:last-child; }
-.linked.vertical > combobox:only-child > box > button.combo { @extend %linked_vertical:only-child; }
+.linked.vertical > combobox:first-child > box > button.combo { @extend %linked_vertical_top;}
+.linked.vertical > combobox:last-child > box > button.combo { @extend %linked_vertical_bottom; }
+.linked.vertical > combobox:only-child > box > button.combo { @extend %linked_vertical_only_child; }
 
 
 /************
@@ -1583,7 +1590,7 @@ headerbar {
       }
     }
 
-    .subtitle:link { @extend *:link:selected;  }
+    .subtitle:link { @extend %link_selected; }
 
     button {
       @include button(normal, $suggested_bg_color, $selected_fg_color);
@@ -2429,7 +2436,7 @@ notebook {
     > tabs > arrow {
       @extend %button_basic;
 
-      @extend %button_basic.flat;
+      @extend %button_basic_flat;
 
       min-height: 16px;
       min-width: 16px;
@@ -4074,7 +4081,7 @@ placessidebar {
     }
 
     @at-root button.sidebar-button {
-      @extend %button_basic.flat;
+      @extend %button_basic_flat;
 
       @extend %button_selected.flat;
 
@@ -4551,7 +4558,7 @@ decoration {
 button.titlebutton {
   @extend %button_basic;
 
-  @extend %button_basic.flat;
+  @extend %button_basic_flat;
 
   @include _button_text_shadow;
 
@@ -4581,7 +4588,6 @@ headerbar.selection-mode button.titlebutton,
   &:backdrop { -gtk-icon-shadow: none; }
 }
 
-
 // catch all extend :)
 
 %selected_items {
@@ -4590,8 +4596,10 @@ headerbar.selection-mode button.titlebutton,
   @at-root %nobg_selected_items, & {
     color: $selected_fg_color;
 
+    @at-root %selected_items_disabled,
     &:disabled { color: mix($selected_fg_color, $selected_bg_color, 50%); }
 
+    @at-root %selected_items_backdrop,
     &:backdrop {
       color: $backdrop_selected_fg_color;
 
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 50eff12866..870dfa0d15 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -189,33 +189,33 @@ treeview entry.flat:focus, treeview entry:focus { border-color: #15539e; }
 
 notebook > header > tabs > arrow, button.titlebutton, button { min-height: 24px; min-width: 16px; padding: 
4px 9px; border: 1px solid; border-radius: 5px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); 
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); }
 
-notebook > header > tabs > arrow, button.sidebar-button, button.titlebutton, 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; transition: none; }
+notebook > header > tabs > arrow, button.sidebar-button, button.titlebutton, notebook > header > tabs > 
arrow.flat, button.flat.titlebutton, 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; transition: none; }
 
-notebook > header > tabs > arrow:hover, button.sidebar-button:hover, button.titlebutton:hover, 
button.flat:hover { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); transition-duration: 500ms; }
+notebook > header > tabs > arrow:hover, button.sidebar-button:hover, button.titlebutton:hover, notebook > 
header > tabs > arrow.flat:hover, button.flat.titlebutton:hover, button.flat:hover { transition: all 200ms 
cubic-bezier(0.25, 0.46, 0.45, 0.94); transition-duration: 500ms; }
 
-notebook > header > tabs > arrow:hover:active, button.sidebar-button:hover:active, 
button.titlebutton:hover:active, button.flat:hover:active { transition: all 200ms cubic-bezier(0.25, 0.46, 
0.45, 0.94); }
+notebook > header > tabs > arrow:hover:active, button.sidebar-button:hover:active, 
button.titlebutton:hover:active, notebook > header > tabs > arrow.flat:hover:active, 
button.flat.titlebutton: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.titlebutton: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); background-image: linear-gradient(to top, #323232, 
#373737 1px); -gtk-icon-effect: highlight; }
 
 notebook > header > tabs > arrow:active, button.titlebutton:active, notebook > header > tabs > 
arrow:checked, button.titlebutton: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; }
 
-notebook > header > tabs > arrow:backdrop, button.sidebar-button:backdrop, button.titlebutton:backdrop, 
notebook > header > tabs > arrow:backdrop, button.titlebutton:backdrop, button:backdrop.flat, button:backdrop 
{ 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.flat, button.titlebutton:backdrop.flat, notebook > header > tabs > 
arrow:backdrop, button.titlebutton:backdrop, button:backdrop.flat, button:backdrop { 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 label, button.sidebar-button:backdrop label, 
button.titlebutton:backdrop label, notebook > header > tabs > arrow:backdrop, button.sidebar-button:backdrop, 
button.titlebutton:backdrop, notebook > header > tabs > arrow:backdrop label, button.titlebutton:backdrop 
label, notebook > header > tabs > arrow:backdrop, button.titlebutton:backdrop, button:backdrop.flat label, 
button:backdrop.flat, button:backdrop label, button:backdrop { color: #919190; }
+notebook > header > tabs > arrow:backdrop.flat label, button.titlebutton:backdrop.flat label, notebook > 
header > tabs > arrow:backdrop.flat, button.titlebutton:backdrop.flat, notebook > header > tabs > 
arrow:backdrop label, button.titlebutton:backdrop label, notebook > header > tabs > arrow:backdrop, 
button.titlebutton:backdrop, button:backdrop.flat label, button:backdrop.flat, button:backdrop label, 
button:backdrop { color: #919190; }
 
-notebook > header > tabs > arrow:backdrop:active, button.sidebar-button:backdrop:active, 
button.titlebutton:backdrop:active, notebook > header > tabs > arrow:backdrop:checked, 
button.sidebar-button:backdrop:checked, button.titlebutton:backdrop:checked, notebook > header > tabs > 
arrow:backdrop:active, button.titlebutton:backdrop:active, notebook > header > tabs > arrow:backdrop:checked, 
button.titlebutton:backdrop:checked, button:backdrop.flat:active, button:backdrop.flat:checked, 
button:backdrop:active, button:backdrop:checked { border-color: #202020; background-image: image(#2a2a2a); 
box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+notebook > header > tabs > arrow:backdrop.flat:active, button.titlebutton:backdrop.flat:active, notebook > 
header > tabs > arrow:backdrop.flat:checked, button.titlebutton:backdrop.flat:checked, notebook > header > 
tabs > arrow:backdrop:active, button.titlebutton:backdrop:active, notebook > header > tabs > 
arrow:backdrop:checked, button.titlebutton:backdrop:checked, button:backdrop.flat:active, 
button:backdrop.flat:checked, button:backdrop:active, button:backdrop:checked { border-color: #202020; 
background-image: image(#2a2a2a); box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
 
-notebook > header > tabs > arrow:backdrop:active label, button.sidebar-button:backdrop:active label, 
button.titlebutton:backdrop:active label, notebook > header > tabs > arrow:backdrop:active, 
button.sidebar-button:backdrop:active, button.titlebutton:backdrop:active, notebook > header > tabs > 
arrow:backdrop:checked label, button.sidebar-button:backdrop:checked label, 
button.titlebutton:backdrop:checked label, notebook > header > tabs > arrow:backdrop:checked, 
button.sidebar-button:backdrop:checked, button.titlebutton:backdrop:checked, notebook > header > tabs > 
arrow:backdrop:active label, button.titlebutton:backdrop:active label, notebook > header > tabs > 
arrow:backdrop:active, button.titlebutton:backdrop:active, notebook > header > tabs > arrow:backdrop:checked 
label, button.titlebutton:backdrop:checked label, notebook > header > tabs > arrow:backdrop:checked, 
button.titlebutton:backdrop:checked, button:backdrop.flat:active label, button:backdrop.flat:active, 
button:back
 drop.fla
 t:checked label, button:backdrop.flat:checked, button:backdrop:active label, button:backdrop:active, 
button:backdrop:checked label, button:backdrop:checked { color: #919190; }
+notebook > header > tabs > arrow:backdrop.flat:active label, button.titlebutton:backdrop.flat:active label, 
notebook > header > tabs > arrow:backdrop.flat:active, button.titlebutton:backdrop.flat:active, notebook > 
header > tabs > arrow:backdrop.flat:checked label, button.titlebutton:backdrop.flat:checked label, notebook > 
header > tabs > arrow:backdrop.flat:checked, button.titlebutton:backdrop.flat:checked, notebook > header > 
tabs > arrow:backdrop:active label, button.titlebutton:backdrop:active label, notebook > header > tabs > 
arrow:backdrop:active, button.titlebutton:backdrop:active, notebook > header > tabs > arrow:backdrop:checked 
label, button.titlebutton:backdrop:checked label, notebook > header > tabs > arrow:backdrop:checked, 
button.titlebutton:backdrop:checked, button:backdrop.flat:active label, button:backdrop.flat:active, 
button:backdrop.flat:checked label, button:backdrop.flat:checked, button:backdrop:active label, 
button:backdrop:active, button:backdrop:check
 ed label
 , button:backdrop:checked { color: #919190; }
 
-notebook > header > tabs > arrow:backdrop:disabled, button.sidebar-button:backdrop:disabled, 
button.titlebutton:backdrop:disabled, notebook > header > tabs > arrow:backdrop:disabled, 
button.titlebutton:backdrop:disabled, button:backdrop.flat:disabled, button:backdrop:disabled { border-color: 
#202020; background-image: image(#323232); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px 
rgba(255, 255, 255, 0); }
+notebook > header > tabs > arrow:backdrop.flat:disabled, button.titlebutton:backdrop.flat:disabled, notebook 
header > tabs > arrow:backdrop:disabled, button.titlebutton:backdrop:disabled, 
button:backdrop.flat:disabled, button:backdrop:disabled { border-color: #202020; background-image: 
image(#323232); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
 
-notebook > header > tabs > arrow:backdrop:disabled label, button.sidebar-button:backdrop:disabled label, 
button.titlebutton:backdrop:disabled label, notebook > header > tabs > arrow:backdrop:disabled, 
button.sidebar-button:backdrop:disabled, button.titlebutton:backdrop:disabled, notebook > header > tabs > 
arrow:backdrop:disabled label, button.titlebutton:backdrop:disabled label, notebook > header > tabs > 
arrow:backdrop:disabled, button.titlebutton:backdrop:disabled, button:backdrop.flat:disabled label, 
button:backdrop.flat:disabled, button:backdrop:disabled label, button:backdrop:disabled { color: #5b5b5b; }
+notebook > header > tabs > arrow:backdrop.flat:disabled label, button.titlebutton:backdrop.flat:disabled 
label, notebook > header > tabs > arrow:backdrop.flat:disabled, button.titlebutton:backdrop.flat:disabled, 
notebook > header > tabs > arrow:backdrop:disabled label, button.titlebutton:backdrop:disabled label, 
notebook > header > tabs > arrow:backdrop:disabled, button.titlebutton:backdrop:disabled, 
button:backdrop.flat:disabled label, button:backdrop.flat:disabled, button:backdrop:disabled label, 
button:backdrop:disabled { color: #5b5b5b; }
 
-notebook > header > tabs > arrow:backdrop:disabled:active, button.sidebar-button:backdrop:disabled:active, 
button.titlebutton:backdrop:disabled:active, notebook > header > tabs > arrow:backdrop:disabled:checked, 
button.sidebar-button:backdrop:disabled:checked, button.titlebutton:backdrop:disabled:checked, notebook > 
header > tabs > arrow:backdrop:disabled:active, button.titlebutton:backdrop:disabled:active, notebook > 
header > tabs > arrow:backdrop:disabled:checked, button.titlebutton:backdrop:disabled:checked, 
button:backdrop.flat:disabled:active, button:backdrop.flat:disabled:checked, button:backdrop:disabled:active, 
button:backdrop:disabled:checked { border-color: #202020; background-image: image(#2a2a2a); box-shadow: inset 
0 1px rgba(255, 255, 255, 0); }
+notebook > header > tabs > arrow:backdrop.flat:disabled:active, 
button.titlebutton:backdrop.flat:disabled:active, notebook > header > tabs > 
arrow:backdrop.flat:disabled:checked, button.titlebutton:backdrop.flat:disabled:checked, notebook > header > 
tabs > arrow:backdrop:disabled:active, button.titlebutton:backdrop:disabled:active, notebook > header > tabs 
arrow:backdrop:disabled:checked, button.titlebutton:backdrop:disabled:checked, 
button:backdrop.flat:disabled:active, button:backdrop.flat:disabled:checked, button:backdrop:disabled:active, 
button:backdrop:disabled:checked { border-color: #202020; background-image: image(#2a2a2a); box-shadow: inset 
0 1px rgba(255, 255, 255, 0); }
 
-notebook > header > tabs > arrow:backdrop:disabled:active label, 
button.sidebar-button:backdrop:disabled:active label, button.titlebutton:backdrop:disabled:active label, 
notebook > header > tabs > arrow:backdrop:disabled:checked label, 
button.sidebar-button:backdrop:disabled:checked label, button.titlebutton:backdrop:disabled:checked label, 
notebook > header > tabs > arrow:backdrop:disabled:active label, button.titlebutton:backdrop:disabled:active 
label, notebook > header > tabs > arrow:backdrop:disabled:checked label, 
button.titlebutton:backdrop:disabled:checked label, button:backdrop.flat:disabled:active label, 
button:backdrop.flat:disabled:checked label, button:backdrop:disabled:active label, 
button:backdrop:disabled:checked label { color: #5b5b5b; }
+notebook > header > tabs > arrow:backdrop.flat:disabled:active label, 
button.titlebutton:backdrop.flat:disabled:active label, notebook > header > tabs > 
arrow:backdrop.flat:disabled:checked label, button.titlebutton:backdrop.flat:disabled:checked label, notebook 
header > tabs > arrow:backdrop:disabled:active label, button.titlebutton:backdrop:disabled:active label, 
notebook > header > tabs > arrow:backdrop:disabled:checked label, 
button.titlebutton:backdrop:disabled:checked label, button:backdrop.flat:disabled:active label, 
button:backdrop.flat:disabled:checked label, button:backdrop:disabled:active label, 
button:backdrop:disabled:checked label { color: #5b5b5b; }
 
-notebook > header > tabs > arrow:backdrop, button.sidebar-button:backdrop, button.titlebutton:backdrop, 
notebook > header > tabs > arrow:disabled, button.sidebar-button:disabled, button.titlebutton:disabled, 
notebook > header > tabs > arrow:backdrop:disabled, button.sidebar-button:backdrop:disabled, 
button.titlebutton:backdrop: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; }
+notebook > header > tabs > arrow.flat:backdrop, button.flat.titlebutton:backdrop, notebook > header > tabs > 
arrow.flat:disabled, button.flat.titlebutton:disabled, notebook > header > tabs > 
arrow.flat:backdrop:disabled, button.flat.titlebutton:backdrop: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; }
 
 notebook > header > tabs > arrow:disabled, button.titlebutton:disabled, button:disabled { border-color: 
#1b1b1b; background-image: image(#323232); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px 
rgba(255, 255, 255, 0); }
 
@@ -425,13 +425,11 @@ button.circular:hover:not(:checked):not(:active):not(:disabled):not(:backdrop) {
 
 toolbar.inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton:backdrop > button.flat, 
.linked:not(.vertical) > spinbutton:not(.vertical), .linked:not(.vertical) > entry, .inline-toolbar button, 
.inline-toolbar button:backdrop, .linked > button, .linked > button:hover, .linked > button:active, .linked > 
button:checked, .linked > button:backdrop, filechooser .path-bar.linked > button, .linked > combobox > box > 
button.combo:dir(ltr), .linked > combobox > box > button.combo:dir(rtl) { border-radius: 0; 
border-right-style: none; }
 
-.linked:not(.vertical) > spinbutton:first-child:not(.vertical), .linked:not(.vertical) > entry:first-child, 
.inline-toolbar button:first-child, .linked > button:first-child, toolbar.inline-toolbar 
toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:first-child > button.flat, 
combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > box > 
button.combo, filechooser .path-bar.linked > button:dir(ltr):first-child, filechooser .path-bar.linked > 
button:dir(rtl):last-child { border-top-left-radius: 5px; border-bottom-left-radius: 5px; 
border-top-right-radius: 0; border-bottom-right-radius: 0; border-right-style: none; }
+toolbar.inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar 
toolbutton:backdrop:first-child > button.flat, .linked:not(.vertical) > 
spinbutton:first-child:not(.vertical), .linked:not(.vertical) > entry:first-child, .inline-toolbar 
button:first-child, .linked > button:first-child, filechooser .path-bar.linked > button:dir(ltr):first-child, 
filechooser .path-bar.linked > button:dir(rtl):last-child, combobox.linked button:nth-child(2):dir(rtl), 
.linked:not(.vertical) > combobox:first-child > box > button.combo { border-top-left-radius: 5px; 
border-bottom-left-radius: 5px; border-top-right-radius: 0; border-bottom-right-radius: 0; 
border-right-style: none; }
 
-.linked:not(.vertical) > spinbutton:last-child:not(.vertical), .linked:not(.vertical) > entry:last-child, 
.inline-toolbar button:last-child, .linked > button:last-child, toolbar.inline-toolbar toolbutton:last-child 
button.flat, toolbar.inline-toolbar toolbutton:backdrop:last-child > button.flat, combobox.linked 
button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > box > button.combo, filechooser 
.path-bar.linked > button:dir(ltr):last-child, filechooser .path-bar.linked > button:dir(rtl):first-child { 
border-top-left-radius: 0; border-bottom-left-radius: 0; border-top-right-radius: 5px; 
border-bottom-right-radius: 5px; border-right-style: solid; }
+toolbar.inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar 
toolbutton:backdrop:last-child > button.flat, .linked:not(.vertical) > spinbutton:last-child:not(.vertical), 
.linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked > button:last-child, 
filechooser .path-bar.linked > button:dir(ltr):last-child, filechooser .path-bar.linked > 
button:dir(rtl):first-child, combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > 
combobox:last-child > box > button.combo { border-top-left-radius: 0; border-bottom-left-radius: 0; 
border-top-right-radius: 5px; border-bottom-right-radius: 5px; border-right-style: solid; }
 
-.linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child, 
.inline-toolbar button:only-child, .linked > button:only-child, toolbar.inline-toolbar toolbutton:only-child 
button.flat, toolbar.inline-toolbar toolbutton:backdrop:only-child > button.flat, .linked:not(.vertical) > 
combobox:only-child > box > button.combo { border-radius: 5px; border-style: solid; }
-
-filechooser .path-bar.linked > button:only-child { border-radius: 5px; border-style: solid; }
+toolbar.inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar 
toolbutton:backdrop:only-child > button.flat, .linked:not(.vertical) > spinbutton:only-child:not(.vertical), 
.linked:not(.vertical) > entry:only-child, .inline-toolbar button:only-child, .linked > button:only-child, 
filechooser .path-bar.linked > button:only-child, .linked:not(.vertical) > combobox:only-child > box > 
button.combo { border-radius: 5px; border-style: solid; }
 
 .linked.vertical > spinbutton:not(.vertical), .linked.vertical > entry, .linked.vertical > button, 
.linked.vertical > button:hover, .linked.vertical > button:active, .linked.vertical > button:checked, 
.linked.vertical > button:backdrop, .linked.vertical > combobox > box > button.combo { border-style: solid 
solid none solid; border-radius: 0; }
 
@@ -469,25 +467,25 @@ list row button.image-button:not(.flat):hover { color: #eeeeec; outline-color: r
 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; }
 
 /********* Links * */
-button:link > label, button:visited > label, *:link, button:link, button:visited { color: #3584e4; }
+button:link, button:visited, button:link > label, button:visited > label, *:link { color: #3584e4; }
 
-button:link > label:visited, button:visited > label:visited, *:link:visited, button:visited { color: 
#1b6acb; }
+button:visited, button:link > label:visited, button:visited > label:visited, *:link:visited { color: 
#1b6acb; }
 
-*:selected button:link > label:visited, *:selected button:visited > label:visited, *:selected 
*:link:visited, *:selected button:visited:link, *:selected button:visited { color: #a1bad8; }
+*:selected button:visited, *:selected button:link > label:visited, *:selected button:visited > 
label:visited, *:selected *:link:visited { color: #a1bad8; }
 
-button:link > label:hover, button:visited > label:hover, *:link:hover, button:hover:link, 
button:hover:visited { color: #629fea; }
+button:hover:link, button:hover:visited, button:link > label:hover, button:visited > label:hover, 
*:link:hover { color: #629fea; }
 
-*:selected button:link > label:hover, *:selected button:visited > label:hover, *:selected *:link:hover, 
*:selected button:hover:link, *:selected button:hover:visited { color: #e8eef5; }
+*:selected button:hover:link, *:selected button:hover:visited, *:selected button:link > label:hover, 
*:selected button:visited > label:hover, *:selected *:link:hover { color: #e8eef5; }
 
-button:link > label:active, button:visited > label:active, *:link:active, button:active:link, 
button:active:visited { color: #3584e4; }
+button:active:link, button:active:visited, button:link > label:active, button:visited > label:active, 
*:link:active { color: #3584e4; }
 
-*:selected button:link > label:active, *:selected button:visited > label:active, *:selected *:link:active, 
*:selected button:active:link, *:selected button:active:visited { color: #d0ddec; }
+*:selected button:active:link, *:selected button:active:visited, *:selected button:link > label:active, 
*:selected button:visited > label:active, *:selected *:link:active { color: #d0ddec; }
 
-button:link > label:disabled, button:visited > label:disabled, button:link > label:disabled:backdrop, 
button:visited > label:disabled:backdrop, *:link:disabled, button:disabled:link, button:disabled:visited, 
*:link:disabled:backdrop, button:disabled:backdrop:link, button:disabled:backdrop:visited { color: rgba(141, 
141, 141, 0.8); }
+button:disabled:link, button:disabled:visited, button:link > label:disabled, button:visited > 
label:disabled, button:disabled:backdrop:link, button:disabled:backdrop:visited, button:link > 
label:disabled:backdrop, button:visited > label:disabled:backdrop, *:link:disabled, *:link:disabled:backdrop 
{ color: rgba(141, 141, 141, 0.8); }
 
-button:link > label:backdrop:backdrop:hover, button:visited > label:backdrop:backdrop:hover, button:link > 
label:backdrop:backdrop:hover:selected, button:visited > label:backdrop:backdrop:hover:selected, button:link 
label:backdrop, button:visited > label:backdrop, *:link:backdrop:backdrop:hover, 
button:backdrop:backdrop:hover:link, button:backdrop:backdrop:hover:visited, 
*:link:backdrop:backdrop:hover:selected, button:backdrop:backdrop:hover:selected:link, 
button:backdrop:backdrop:hover:selected:visited, .selection-mode .titlebar:not(headerbar) 
.subtitle:backdrop:backdrop:hover:link, .selection-mode.titlebar:not(headerbar) 
.subtitle:backdrop:backdrop:hover:link, .selection-mode headerbar .subtitle:backdrop:backdrop:hover:link, 
headerbar.selection-mode .subtitle:backdrop:backdrop:hover:link, *:link:backdrop, button:backdrop:link, 
button:backdrop:visited { color: #15539e; }
+button:backdrop:backdrop:hover:link, button:backdrop:backdrop:hover:visited, button:link > 
label:backdrop:backdrop:hover, button:visited > label:backdrop:backdrop:hover, 
button:backdrop:backdrop:hover:selected:link, button:backdrop:backdrop:hover:selected:visited, button:link > 
label:backdrop:backdrop:hover:selected, button:visited > label:backdrop:backdrop:hover:selected, 
button:backdrop:link, button:backdrop:visited, button:link > label:backdrop, button:visited > label:backdrop, 
*:link:backdrop:backdrop:hover, *:link:backdrop:backdrop:hover:selected, *:link:backdrop { color: #15539e; }
 
-button:link > label:selected, button:visited > label:selected, *:selected button:link > label, *:selected 
button:visited > label, *:link:selected, button:selected:link, button:selected:visited, .selection-mode 
.titlebar:not(headerbar) .subtitle:link, .selection-mode.titlebar:not(headerbar) .subtitle:link, 
.selection-mode headerbar .subtitle:link, headerbar.selection-mode .subtitle:link, *:selected *:link, 
*:selected button:link, *:selected button:visited { color: #d0ddec; }
+.selection-mode .titlebar:not(headerbar) .subtitle:link, .selection-mode.titlebar:not(headerbar) 
.subtitle:link, .selection-mode headerbar .subtitle:link, headerbar.selection-mode .subtitle:link, 
button:selected:link, button:selected:visited, button:link > label:selected, button:visited > label:selected, 
*:selected button:link, *:selected button:visited, *:selected button:link > label, *:selected button:visited 
label, *:link:selected, *:selected *:link { color: #d0ddec; }
 
 button:link, button:visited { text-shadow: none; }
 
@@ -1805,7 +1803,7 @@ infobar.info button:backdrop label, infobar.info button:backdrop, infobar.info b
 
 infobar.info selection, infobar.question selection, infobar.warning selection, infobar.error selection { 
background-color: #1b1b1b; }
 
-infobar.info *:link, infobar.info button:link, infobar.info button:visited, infobar.question *:link, 
infobar.question button:link, infobar.question button:visited, infobar.warning *:link, infobar.warning 
button:link, infobar.warning button:visited, infobar.error *:link, infobar.error button:link, infobar.error 
button:visited { color: #3584e4; }
+infobar.info *:link, infobar.question *:link, infobar.warning *:link, infobar.error *:link { color: #3584e4; 
}
 
 /************ Tooltips * */
 tooltip { padding: 4px; /* not working */ border-radius: 5px; box-shadow: none; text-shadow: 0 1px black; }
@@ -1933,11 +1931,11 @@ button.titlebutton:backdrop { -gtk-icon-shadow: none; }
 
 row:selected label, label:selected, .selection-mode button.titlebutton, .view:selected:focus, 
.view:selected, iconview:selected, .view text:selected, iconview text:selected, textview text:selected, .view 
text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, textview 
text selection:focus, textview text selection, flowbox flowboxchild:selected, spinbutton:not(.vertical) 
selection, entry selection, modelbutton.flat:selected, .menuitem.button.flat:selected, 
treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected { color: #ffffff; }
 
-row:selected label:disabled, label:disabled:selected, .selection-mode button.titlebutton:disabled, 
iconview:disabled:selected:focus, .view:disabled:selected, iconview:disabled:selected, iconview 
text:disabled:selected:focus, textview text:disabled:selected:focus, .view text:disabled:selected, iconview 
text:disabled:selected, textview text:disabled:selected, iconview text selection:disabled:focus, .view text 
selection:disabled, iconview text selection:disabled, textview text selection:disabled, flowbox 
flowboxchild:disabled:selected, label:disabled selection, spinbutton:not(.vertical) selection:disabled, entry 
selection:disabled, modelbutton.flat:disabled:selected, .menuitem.button.flat:disabled:selected, 
row:disabled:selected, calendar:disabled:selected { color: #8aa9ce; }
+label:disabled selection, row:selected label:disabled, label:disabled:selected, .selection-mode 
button.titlebutton:disabled, iconview:disabled:selected:focus, .view:disabled:selected, 
iconview:disabled:selected, iconview text:disabled:selected:focus, textview text:disabled:selected:focus, 
.view text:disabled:selected, iconview text:disabled:selected, textview text:disabled:selected, iconview text 
selection:disabled:focus, .view text selection:disabled, iconview text selection:disabled, textview text 
selection:disabled, flowbox flowboxchild:disabled:selected, spinbutton:not(.vertical) selection:disabled, 
entry selection:disabled, modelbutton.flat:disabled:selected, .menuitem.button.flat:disabled:selected, 
row:disabled:selected, calendar:disabled:selected { color: #8aa9ce; }
 
-row:selected label:backdrop, label:backdrop:selected, .selection-mode button.titlebutton:backdrop, 
iconview:backdrop:selected:focus, .view:backdrop:selected, iconview:backdrop:selected, iconview 
text:backdrop:selected:focus, textview text:backdrop:selected:focus, .view text:backdrop:selected, iconview 
text:backdrop:selected, textview text:backdrop:selected, iconview text selection:backdrop:focus, .view text 
selection:backdrop, iconview text selection:backdrop, textview text selection:backdrop, flowbox 
flowboxchild:backdrop:selected, label:backdrop selection, spinbutton:not(.vertical) selection:backdrop, entry 
selection:backdrop, modelbutton.flat:backdrop:selected, .menuitem.button.flat:backdrop:selected, 
row:backdrop:selected, calendar:backdrop:selected { color: #d6d6d6; }
+label:backdrop selection, row:selected label:backdrop, label:backdrop:selected, .selection-mode 
button.titlebutton:backdrop, iconview:backdrop:selected:focus, .view:backdrop:selected, 
iconview:backdrop:selected, iconview text:backdrop:selected:focus, textview text:backdrop:selected:focus, 
.view text:backdrop:selected, iconview text:backdrop:selected, textview text:backdrop:selected, iconview text 
selection:backdrop:focus, .view text selection:backdrop, iconview text selection:backdrop, textview text 
selection:backdrop, flowbox flowboxchild:backdrop:selected, spinbutton:not(.vertical) selection:backdrop, 
entry selection:backdrop, modelbutton.flat:backdrop:selected, .menuitem.button.flat:backdrop:selected, 
row:backdrop:selected, calendar:backdrop:selected { color: #d6d6d6; }
 
-row:selected label:backdrop:disabled, label:backdrop:disabled:selected, .selection-mode 
button.titlebutton:backdrop:disabled, .view:backdrop:disabled:selected, iconview:backdrop:disabled:selected, 
.view text:backdrop:disabled:selected, iconview text:backdrop:disabled:selected, textview 
text:backdrop:disabled:selected, .view text selection:backdrop:disabled, iconview text 
selection:backdrop:disabled, textview text selection:backdrop:disabled, flowbox 
flowboxchild:backdrop:disabled:selected, label:disabled selection:backdrop, label:backdrop 
selection:disabled, spinbutton:not(.vertical) selection:backdrop:disabled, entry selection:backdrop:disabled, 
modelbutton.flat:backdrop:disabled:selected, .menuitem.button.flat:backdrop:disabled:selected, 
row:backdrop:disabled:selected, calendar:backdrop:disabled:selected { color: #4f7aaf; }
+label:backdrop selection:disabled, row:selected label:backdrop:disabled, label:backdrop:disabled:selected, 
.selection-mode button.titlebutton:backdrop:disabled, .view:backdrop:disabled:selected, 
iconview:backdrop:disabled:selected, .view text:backdrop:disabled:selected, iconview 
text:backdrop:disabled:selected, textview text:backdrop:disabled:selected, .view text 
selection:backdrop:disabled, iconview text selection:backdrop:disabled, textview text 
selection:backdrop:disabled, flowbox flowboxchild:backdrop:disabled:selected, spinbutton:not(.vertical) 
selection:backdrop:disabled, entry selection:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected, 
.menuitem.button.flat:backdrop:disabled:selected, row:backdrop:disabled:selected, 
calendar:backdrop:disabled:selected { color: #4f7aaf; }
 
 .monospace { font-family: monospace; }
 
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 7889f21cd9..9618d53ba7 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -189,33 +189,33 @@ treeview entry.flat:focus, treeview entry:focus { border-color: #3584e4; }
 
 notebook > header > tabs > arrow, button.titlebutton, button { min-height: 24px; min-width: 16px; padding: 
4px 9px; border: 1px solid; border-radius: 5px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); 
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); }
 
-notebook > header > tabs > arrow, button.sidebar-button, button.titlebutton, 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; transition: none; }
+notebook > header > tabs > arrow, button.sidebar-button, button.titlebutton, notebook > header > tabs > 
arrow.flat, button.flat.titlebutton, 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; transition: none; }
 
-notebook > header > tabs > arrow:hover, button.sidebar-button:hover, button.titlebutton:hover, 
button.flat:hover { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); transition-duration: 500ms; }
+notebook > header > tabs > arrow:hover, button.sidebar-button:hover, button.titlebutton:hover, notebook > 
header > tabs > arrow.flat:hover, button.flat.titlebutton:hover, button.flat:hover { transition: all 200ms 
cubic-bezier(0.25, 0.46, 0.45, 0.94); transition-duration: 500ms; }
 
-notebook > header > tabs > arrow:hover:active, button.sidebar-button:hover:active, 
button.titlebutton:hover:active, button.flat:hover:active { transition: all 200ms cubic-bezier(0.25, 0.46, 
0.45, 0.94); }
+notebook > header > tabs > arrow:hover:active, button.sidebar-button:hover:active, 
button.titlebutton:hover:active, notebook > header > tabs > arrow.flat:hover:active, 
button.flat.titlebutton: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.titlebutton: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); background-image: linear-gradient(to top, #f6f5f4, #f8f8f7 1px); 
-gtk-icon-effect: highlight; }
 
 notebook > header > tabs > arrow:active, button.titlebutton:active, notebook > header > tabs > 
arrow:checked, button.titlebutton: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; }
 
-notebook > header > tabs > arrow:backdrop, button.sidebar-button:backdrop, button.titlebutton:backdrop, 
notebook > header > tabs > arrow:backdrop, button.titlebutton:backdrop, button:backdrop.flat, button:backdrop 
{ 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.flat, button.titlebutton:backdrop.flat, notebook > header > tabs > 
arrow:backdrop, button.titlebutton:backdrop, button:backdrop.flat, button:backdrop { 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 label, button.sidebar-button:backdrop label, 
button.titlebutton:backdrop label, notebook > header > tabs > arrow:backdrop, button.sidebar-button:backdrop, 
button.titlebutton:backdrop, notebook > header > tabs > arrow:backdrop label, button.titlebutton:backdrop 
label, notebook > header > tabs > arrow:backdrop, button.titlebutton:backdrop, button:backdrop.flat label, 
button:backdrop.flat, button:backdrop label, button:backdrop { color: #929595; }
+notebook > header > tabs > arrow:backdrop.flat label, button.titlebutton:backdrop.flat label, notebook > 
header > tabs > arrow:backdrop.flat, button.titlebutton:backdrop.flat, notebook > header > tabs > 
arrow:backdrop label, button.titlebutton:backdrop label, notebook > header > tabs > arrow:backdrop, 
button.titlebutton:backdrop, button:backdrop.flat label, button:backdrop.flat, button:backdrop label, 
button:backdrop { color: #929595; }
 
-notebook > header > tabs > arrow:backdrop:active, button.sidebar-button:backdrop:active, 
button.titlebutton:backdrop:active, notebook > header > tabs > arrow:backdrop:checked, 
button.sidebar-button:backdrop:checked, button.titlebutton:backdrop:checked, notebook > header > tabs > 
arrow:backdrop:active, button.titlebutton:backdrop:active, notebook > header > tabs > arrow:backdrop:checked, 
button.titlebutton:backdrop:checked, button:backdrop.flat:active, button:backdrop.flat:checked, 
button:backdrop:active, button:backdrop:checked { border-color: #d5d0cc; background-image: image(#e4e4e0); 
box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+notebook > header > tabs > arrow:backdrop.flat:active, button.titlebutton:backdrop.flat:active, notebook > 
header > tabs > arrow:backdrop.flat:checked, button.titlebutton:backdrop.flat:checked, notebook > header > 
tabs > arrow:backdrop:active, button.titlebutton:backdrop:active, notebook > header > tabs > 
arrow:backdrop:checked, button.titlebutton:backdrop:checked, button:backdrop.flat:active, 
button:backdrop.flat:checked, button:backdrop:active, button:backdrop:checked { border-color: #d5d0cc; 
background-image: image(#e4e4e0); box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
 
-notebook > header > tabs > arrow:backdrop:active label, button.sidebar-button:backdrop:active label, 
button.titlebutton:backdrop:active label, notebook > header > tabs > arrow:backdrop:active, 
button.sidebar-button:backdrop:active, button.titlebutton:backdrop:active, notebook > header > tabs > 
arrow:backdrop:checked label, button.sidebar-button:backdrop:checked label, 
button.titlebutton:backdrop:checked label, notebook > header > tabs > arrow:backdrop:checked, 
button.sidebar-button:backdrop:checked, button.titlebutton:backdrop:checked, notebook > header > tabs > 
arrow:backdrop:active label, button.titlebutton:backdrop:active label, notebook > header > tabs > 
arrow:backdrop:active, button.titlebutton:backdrop:active, notebook > header > tabs > arrow:backdrop:checked 
label, button.titlebutton:backdrop:checked label, notebook > header > tabs > arrow:backdrop:checked, 
button.titlebutton:backdrop:checked, button:backdrop.flat:active label, button:backdrop.flat:active, 
button:back
 drop.fla
 t:checked label, button:backdrop.flat:checked, button:backdrop:active label, button:backdrop:active, 
button:backdrop:checked label, button:backdrop:checked { color: #929595; }
+notebook > header > tabs > arrow:backdrop.flat:active label, button.titlebutton:backdrop.flat:active label, 
notebook > header > tabs > arrow:backdrop.flat:active, button.titlebutton:backdrop.flat:active, notebook > 
header > tabs > arrow:backdrop.flat:checked label, button.titlebutton:backdrop.flat:checked label, notebook > 
header > tabs > arrow:backdrop.flat:checked, button.titlebutton:backdrop.flat:checked, notebook > header > 
tabs > arrow:backdrop:active label, button.titlebutton:backdrop:active label, notebook > header > tabs > 
arrow:backdrop:active, button.titlebutton:backdrop:active, notebook > header > tabs > arrow:backdrop:checked 
label, button.titlebutton:backdrop:checked label, notebook > header > tabs > arrow:backdrop:checked, 
button.titlebutton:backdrop:checked, button:backdrop.flat:active label, button:backdrop.flat:active, 
button:backdrop.flat:checked label, button:backdrop.flat:checked, button:backdrop:active label, 
button:backdrop:active, button:backdrop:check
 ed label
 , button:backdrop:checked { color: #929595; }
 
-notebook > header > tabs > arrow:backdrop:disabled, button.sidebar-button:backdrop:disabled, 
button.titlebutton:backdrop:disabled, notebook > header > tabs > arrow:backdrop:disabled, 
button.titlebutton:backdrop:disabled, button:backdrop.flat:disabled, button:backdrop:disabled { border-color: 
#d5d0cc; background-image: image(#faf9f8); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px 
rgba(255, 255, 255, 0); }
+notebook > header > tabs > arrow:backdrop.flat:disabled, button.titlebutton:backdrop.flat:disabled, notebook 
header > tabs > arrow:backdrop:disabled, button.titlebutton:backdrop:disabled, 
button:backdrop.flat:disabled, button:backdrop:disabled { border-color: #d5d0cc; background-image: 
image(#faf9f8); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
 
-notebook > header > tabs > arrow:backdrop:disabled label, button.sidebar-button:backdrop:disabled label, 
button.titlebutton:backdrop:disabled label, notebook > header > tabs > arrow:backdrop:disabled, 
button.sidebar-button:backdrop:disabled, button.titlebutton:backdrop:disabled, notebook > header > tabs > 
arrow:backdrop:disabled label, button.titlebutton:backdrop:disabled label, notebook > header > tabs > 
arrow:backdrop:disabled, button.titlebutton:backdrop:disabled, button:backdrop.flat:disabled label, 
button:backdrop.flat:disabled, button:backdrop:disabled label, button:backdrop:disabled { color: #d4cfca; }
+notebook > header > tabs > arrow:backdrop.flat:disabled label, button.titlebutton:backdrop.flat:disabled 
label, notebook > header > tabs > arrow:backdrop.flat:disabled, button.titlebutton:backdrop.flat:disabled, 
notebook > header > tabs > arrow:backdrop:disabled label, button.titlebutton:backdrop:disabled label, 
notebook > header > tabs > arrow:backdrop:disabled, button.titlebutton:backdrop:disabled, 
button:backdrop.flat:disabled label, button:backdrop.flat:disabled, button:backdrop:disabled label, 
button:backdrop:disabled { color: #d4cfca; }
 
-notebook > header > tabs > arrow:backdrop:disabled:active, button.sidebar-button:backdrop:disabled:active, 
button.titlebutton:backdrop:disabled:active, notebook > header > tabs > arrow:backdrop:disabled:checked, 
button.sidebar-button:backdrop:disabled:checked, button.titlebutton:backdrop:disabled:checked, notebook > 
header > tabs > arrow:backdrop:disabled:active, button.titlebutton:backdrop:disabled:active, notebook > 
header > tabs > arrow:backdrop:disabled:checked, button.titlebutton:backdrop:disabled:checked, 
button:backdrop.flat:disabled:active, button:backdrop.flat:disabled:checked, button:backdrop:disabled:active, 
button:backdrop:disabled:checked { border-color: #d5d0cc; background-image: image(#e4e4e0); box-shadow: inset 
0 1px rgba(255, 255, 255, 0); }
+notebook > header > tabs > arrow:backdrop.flat:disabled:active, 
button.titlebutton:backdrop.flat:disabled:active, notebook > header > tabs > 
arrow:backdrop.flat:disabled:checked, button.titlebutton:backdrop.flat:disabled:checked, notebook > header > 
tabs > arrow:backdrop:disabled:active, button.titlebutton:backdrop:disabled:active, notebook > header > tabs 
arrow:backdrop:disabled:checked, button.titlebutton:backdrop:disabled:checked, 
button:backdrop.flat:disabled:active, button:backdrop.flat:disabled:checked, button:backdrop:disabled:active, 
button:backdrop:disabled:checked { border-color: #d5d0cc; background-image: image(#e4e4e0); box-shadow: inset 
0 1px rgba(255, 255, 255, 0); }
 
-notebook > header > tabs > arrow:backdrop:disabled:active label, 
button.sidebar-button:backdrop:disabled:active label, button.titlebutton:backdrop:disabled:active label, 
notebook > header > tabs > arrow:backdrop:disabled:checked label, 
button.sidebar-button:backdrop:disabled:checked label, button.titlebutton:backdrop:disabled:checked label, 
notebook > header > tabs > arrow:backdrop:disabled:active label, button.titlebutton:backdrop:disabled:active 
label, notebook > header > tabs > arrow:backdrop:disabled:checked label, 
button.titlebutton:backdrop:disabled:checked label, button:backdrop.flat:disabled:active label, 
button:backdrop.flat:disabled:checked label, button:backdrop:disabled:active label, 
button:backdrop:disabled:checked label { color: #d4cfca; }
+notebook > header > tabs > arrow:backdrop.flat:disabled:active label, 
button.titlebutton:backdrop.flat:disabled:active label, notebook > header > tabs > 
arrow:backdrop.flat:disabled:checked label, button.titlebutton:backdrop.flat:disabled:checked label, notebook 
header > tabs > arrow:backdrop:disabled:active label, button.titlebutton:backdrop:disabled:active label, 
notebook > header > tabs > arrow:backdrop:disabled:checked label, 
button.titlebutton:backdrop:disabled:checked label, button:backdrop.flat:disabled:active label, 
button:backdrop.flat:disabled:checked label, button:backdrop:disabled:active label, 
button:backdrop:disabled:checked label { color: #d4cfca; }
 
-notebook > header > tabs > arrow:backdrop, button.sidebar-button:backdrop, button.titlebutton:backdrop, 
notebook > header > tabs > arrow:disabled, button.sidebar-button:disabled, button.titlebutton:disabled, 
notebook > header > tabs > arrow:backdrop:disabled, button.sidebar-button:backdrop:disabled, 
button.titlebutton:backdrop: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; }
+notebook > header > tabs > arrow.flat:backdrop, button.flat.titlebutton:backdrop, notebook > header > tabs > 
arrow.flat:disabled, button.flat.titlebutton:disabled, notebook > header > tabs > 
arrow.flat:backdrop:disabled, button.flat.titlebutton:backdrop: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; }
 
 notebook > header > tabs > arrow:disabled, button.titlebutton:disabled, button:disabled { border-color: 
#cdc7c2; background-image: image(#faf9f8); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px 
rgba(255, 255, 255, 0); }
 
@@ -427,13 +427,11 @@ button.circular:hover:not(:checked):not(:active):not(:disabled):not(:backdrop) {
 
 toolbar.inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton:backdrop > button.flat, 
.linked:not(.vertical) > spinbutton:not(.vertical), .linked:not(.vertical) > entry, .inline-toolbar button, 
.inline-toolbar button:backdrop, .linked > button, .linked > button:hover, .linked > button:active, .linked > 
button:checked, .linked > button:backdrop, filechooser .path-bar.linked > button, .linked > combobox > box > 
button.combo:dir(ltr), .linked > combobox > box > button.combo:dir(rtl) { border-radius: 0; 
border-right-style: none; }
 
-.linked:not(.vertical) > spinbutton:first-child:not(.vertical), .linked:not(.vertical) > entry:first-child, 
.inline-toolbar button:first-child, .linked > button:first-child, toolbar.inline-toolbar 
toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:first-child > button.flat, 
combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > box > 
button.combo, filechooser .path-bar.linked > button:dir(ltr):first-child, filechooser .path-bar.linked > 
button:dir(rtl):last-child { border-top-left-radius: 5px; border-bottom-left-radius: 5px; 
border-top-right-radius: 0; border-bottom-right-radius: 0; border-right-style: none; }
+toolbar.inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar 
toolbutton:backdrop:first-child > button.flat, .linked:not(.vertical) > 
spinbutton:first-child:not(.vertical), .linked:not(.vertical) > entry:first-child, .inline-toolbar 
button:first-child, .linked > button:first-child, filechooser .path-bar.linked > button:dir(ltr):first-child, 
filechooser .path-bar.linked > button:dir(rtl):last-child, combobox.linked button:nth-child(2):dir(rtl), 
.linked:not(.vertical) > combobox:first-child > box > button.combo { border-top-left-radius: 5px; 
border-bottom-left-radius: 5px; border-top-right-radius: 0; border-bottom-right-radius: 0; 
border-right-style: none; }
 
-.linked:not(.vertical) > spinbutton:last-child:not(.vertical), .linked:not(.vertical) > entry:last-child, 
.inline-toolbar button:last-child, .linked > button:last-child, toolbar.inline-toolbar toolbutton:last-child 
button.flat, toolbar.inline-toolbar toolbutton:backdrop:last-child > button.flat, combobox.linked 
button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > box > button.combo, filechooser 
.path-bar.linked > button:dir(ltr):last-child, filechooser .path-bar.linked > button:dir(rtl):first-child { 
border-top-left-radius: 0; border-bottom-left-radius: 0; border-top-right-radius: 5px; 
border-bottom-right-radius: 5px; border-right-style: solid; }
+toolbar.inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar 
toolbutton:backdrop:last-child > button.flat, .linked:not(.vertical) > spinbutton:last-child:not(.vertical), 
.linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked > button:last-child, 
filechooser .path-bar.linked > button:dir(ltr):last-child, filechooser .path-bar.linked > 
button:dir(rtl):first-child, combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > 
combobox:last-child > box > button.combo { border-top-left-radius: 0; border-bottom-left-radius: 0; 
border-top-right-radius: 5px; border-bottom-right-radius: 5px; border-right-style: solid; }
 
-.linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child, 
.inline-toolbar button:only-child, .linked > button:only-child, toolbar.inline-toolbar toolbutton:only-child 
button.flat, toolbar.inline-toolbar toolbutton:backdrop:only-child > button.flat, .linked:not(.vertical) > 
combobox:only-child > box > button.combo { border-radius: 5px; border-style: solid; }
-
-filechooser .path-bar.linked > button:only-child { border-radius: 5px; border-style: solid; }
+toolbar.inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar 
toolbutton:backdrop:only-child > button.flat, .linked:not(.vertical) > spinbutton:only-child:not(.vertical), 
.linked:not(.vertical) > entry:only-child, .inline-toolbar button:only-child, .linked > button:only-child, 
filechooser .path-bar.linked > button:only-child, .linked:not(.vertical) > combobox:only-child > box > 
button.combo { border-radius: 5px; border-style: solid; }
 
 .linked.vertical > spinbutton:not(.vertical), .linked.vertical > entry, .linked.vertical > button, 
.linked.vertical > button:hover, .linked.vertical > button:active, .linked.vertical > button:checked, 
.linked.vertical > button:backdrop, .linked.vertical > combobox > box > button.combo { border-style: solid 
solid none solid; border-radius: 0; }
 
@@ -477,25 +475,25 @@ list row button.image-button:not(.flat):hover { color: #2e3436; outline-color: r
 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; }
 
 /********* Links * */
-button:link > label, button:visited > label, *:link, button:link, button:visited { color: #1b6acb; }
+button:link, button:visited, button:link > label, button:visited > label, *:link { color: #1b6acb; }
 
-button:link > label:visited, button:visited > label:visited, *:link:visited, button:visited { color: 
#15539e; }
+button:visited, button:link > label:visited, button:visited > label:visited, *:link:visited { color: 
#15539e; }
 
-*:selected button:link > label:visited, *:selected button:visited > label:visited, *:selected 
*:link:visited, *:selected button:visited:link, *:selected button:visited { color: #aecef4; }
+*:selected button:visited, *:selected button:link > label:visited, *:selected button:visited > 
label:visited, *:selected *:link:visited { color: #aecef4; }
 
-button:link > label:hover, button:visited > label:hover, *:link:hover, button:hover:link, 
button:hover:visited { color: #3584e4; }
+button:hover:link, button:hover:visited, button:link > label:hover, button:visited > label:hover, 
*:link:hover { color: #3584e4; }
 
-*:selected button:link > label:hover, *:selected button:visited > label:hover, *:selected *:link:hover, 
*:selected button:hover:link, *:selected button:hover:visited { color: #ebf3fc; }
+*:selected button:hover:link, *:selected button:hover:visited, *:selected button:link > label:hover, 
*:selected button:visited > label:hover, *:selected *:link:hover { color: #ebf3fc; }
 
-button:link > label:active, button:visited > label:active, *:link:active, button:active:link, 
button:active:visited { color: #1b6acb; }
+button:active:link, button:active:visited, button:link > label:active, button:visited > label:active, 
*:link:active { color: #1b6acb; }
 
-*:selected button:link > label:active, *:selected button:visited > label:active, *:selected *:link:active, 
*:selected button:active:link, *:selected button:active:visited { color: #d7e6fa; }
+*:selected button:active:link, *:selected button:active:visited, *:selected button:link > label:active, 
*:selected button:visited > label:active, *:selected *:link:active { color: #d7e6fa; }
 
-button:link > label:disabled, button:visited > label:disabled, button:link > label:disabled:backdrop, 
button:visited > label:disabled:backdrop, *:link:disabled, button:disabled:link, button:disabled:visited, 
*:link:disabled:backdrop, button:disabled:backdrop:link, button:disabled:backdrop:visited { color: rgba(115, 
115, 115, 0.8); }
+button:disabled:link, button:disabled:visited, button:link > label:disabled, button:visited > 
label:disabled, button:disabled:backdrop:link, button:disabled:backdrop:visited, button:link > 
label:disabled:backdrop, button:visited > label:disabled:backdrop, *:link:disabled, *:link:disabled:backdrop 
{ color: rgba(115, 115, 115, 0.8); }
 
-button:link > label:backdrop:backdrop:hover, button:visited > label:backdrop:backdrop:hover, button:link > 
label:backdrop:backdrop:hover:selected, button:visited > label:backdrop:backdrop:hover:selected, button:link 
label:backdrop, button:visited > label:backdrop, *:link:backdrop:backdrop:hover, 
button:backdrop:backdrop:hover:link, button:backdrop:backdrop:hover:visited, 
*:link:backdrop:backdrop:hover:selected, button:backdrop:backdrop:hover:selected:link, 
button:backdrop:backdrop:hover:selected:visited, .selection-mode .titlebar:not(headerbar) 
.subtitle:backdrop:backdrop:hover:link, .selection-mode.titlebar:not(headerbar) 
.subtitle:backdrop:backdrop:hover:link, .selection-mode headerbar .subtitle:backdrop:backdrop:hover:link, 
headerbar.selection-mode .subtitle:backdrop:backdrop:hover:link, *:link:backdrop, button:backdrop:link, 
button:backdrop:visited { color: #3584e4; }
+button:backdrop:backdrop:hover:link, button:backdrop:backdrop:hover:visited, button:link > 
label:backdrop:backdrop:hover, button:visited > label:backdrop:backdrop:hover, 
button:backdrop:backdrop:hover:selected:link, button:backdrop:backdrop:hover:selected:visited, button:link > 
label:backdrop:backdrop:hover:selected, button:visited > label:backdrop:backdrop:hover:selected, 
button:backdrop:link, button:backdrop:visited, button:link > label:backdrop, button:visited > label:backdrop, 
*:link:backdrop:backdrop:hover, *:link:backdrop:backdrop:hover:selected, *:link:backdrop { color: #3584e4; }
 
-button:link > label:selected, button:visited > label:selected, *:selected button:link > label, *:selected 
button:visited > label, *:link:selected, button:selected:link, button:selected:visited, .selection-mode 
.titlebar:not(headerbar) .subtitle:link, .selection-mode.titlebar:not(headerbar) .subtitle:link, 
.selection-mode headerbar .subtitle:link, headerbar.selection-mode .subtitle:link, *:selected *:link, 
*:selected button:link, *:selected button:visited { color: #d7e6fa; }
+.selection-mode .titlebar:not(headerbar) .subtitle:link, .selection-mode.titlebar:not(headerbar) 
.subtitle:link, .selection-mode headerbar .subtitle:link, headerbar.selection-mode .subtitle:link, 
button:selected:link, button:selected:visited, button:link > label:selected, button:visited > label:selected, 
*:selected button:link, *:selected button:visited, *:selected button:link > label, *:selected button:visited 
label, *:link:selected, *:selected *:link { color: #d7e6fa; }
 
 button:link, button:visited { text-shadow: none; }
 
@@ -1821,7 +1819,7 @@ infobar.info button:backdrop label, infobar.info button:backdrop, infobar.info b
 
 infobar.info selection, infobar.question selection, infobar.warning selection, infobar.error selection { 
background-color: #dfdcd8; }
 
-infobar.info *:link, infobar.info button:link, infobar.info button:visited, infobar.question *:link, 
infobar.question button:link, infobar.question button:visited, infobar.warning *:link, infobar.warning 
button:link, infobar.warning button:visited, infobar.error *:link, infobar.error button:link, infobar.error 
button:visited { color: #1b6acb; }
+infobar.info *:link, infobar.question *:link, infobar.warning *:link, infobar.error *:link { color: #1b6acb; 
}
 
 /************ Tooltips * */
 tooltip { padding: 4px; /* not working */ border-radius: 5px; box-shadow: none; text-shadow: 0 1px black; }
@@ -1949,11 +1947,11 @@ button.titlebutton:backdrop { -gtk-icon-shadow: none; }
 
 row:selected label, label:selected, .selection-mode button.titlebutton, .view:selected:focus, 
.view:selected, iconview:selected, .view text:selected, iconview text:selected, textview text:selected, .view 
text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, textview 
text selection:focus, textview text selection, flowbox flowboxchild:selected, spinbutton:not(.vertical) 
selection, entry selection, modelbutton.flat:selected, .menuitem.button.flat:selected, 
treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected { color: #ffffff; }
 
-row:selected label:disabled, label:disabled:selected, .selection-mode button.titlebutton:disabled, 
iconview:disabled:selected:focus, .view:disabled:selected, iconview:disabled:selected, iconview 
text:disabled:selected:focus, textview text:disabled:selected:focus, .view text:disabled:selected, iconview 
text:disabled:selected, textview text:disabled:selected, iconview text selection:disabled:focus, .view text 
selection:disabled, iconview text selection:disabled, textview text selection:disabled, flowbox 
flowboxchild:disabled:selected, label:disabled selection, spinbutton:not(.vertical) selection:disabled, entry 
selection:disabled, modelbutton.flat:disabled:selected, .menuitem.button.flat:disabled:selected, 
row:disabled:selected, calendar:disabled:selected { color: #9ac2f2; }
+label:disabled selection, row:selected label:disabled, label:disabled:selected, .selection-mode 
button.titlebutton:disabled, iconview:disabled:selected:focus, .view:disabled:selected, 
iconview:disabled:selected, iconview text:disabled:selected:focus, textview text:disabled:selected:focus, 
.view text:disabled:selected, iconview text:disabled:selected, textview text:disabled:selected, iconview text 
selection:disabled:focus, .view text selection:disabled, iconview text selection:disabled, textview text 
selection:disabled, flowbox flowboxchild:disabled:selected, spinbutton:not(.vertical) selection:disabled, 
entry selection:disabled, modelbutton.flat:disabled:selected, .menuitem.button.flat:disabled:selected, 
row:disabled:selected, calendar:disabled:selected { color: #9ac2f2; }
 
-row:selected label:backdrop, label:backdrop:selected, .selection-mode button.titlebutton:backdrop, 
iconview:backdrop:selected:focus, .view:backdrop:selected, iconview:backdrop:selected, iconview 
text:backdrop:selected:focus, textview text:backdrop:selected:focus, .view text:backdrop:selected, iconview 
text:backdrop:selected, textview text:backdrop:selected, iconview text selection:backdrop:focus, .view text 
selection:backdrop, iconview text selection:backdrop, textview text selection:backdrop, flowbox 
flowboxchild:backdrop:selected, label:backdrop selection, spinbutton:not(.vertical) selection:backdrop, entry 
selection:backdrop, modelbutton.flat:backdrop:selected, .menuitem.button.flat:backdrop:selected, 
row:backdrop:selected, calendar:backdrop:selected { color: #fcfcfc; }
+label:backdrop selection, row:selected label:backdrop, label:backdrop:selected, .selection-mode 
button.titlebutton:backdrop, iconview:backdrop:selected:focus, .view:backdrop:selected, 
iconview:backdrop:selected, iconview text:backdrop:selected:focus, textview text:backdrop:selected:focus, 
.view text:backdrop:selected, iconview text:backdrop:selected, textview text:backdrop:selected, iconview text 
selection:backdrop:focus, .view text selection:backdrop, iconview text selection:backdrop, textview text 
selection:backdrop, flowbox flowboxchild:backdrop:selected, spinbutton:not(.vertical) selection:backdrop, 
entry selection:backdrop, modelbutton.flat:backdrop:selected, .menuitem.button.flat:backdrop:selected, 
row:backdrop:selected, calendar:backdrop:selected { color: #fcfcfc; }
 
-row:selected label:backdrop:disabled, label:backdrop:disabled:selected, .selection-mode 
button.titlebutton:backdrop:disabled, .view:backdrop:disabled:selected, iconview:backdrop:disabled:selected, 
.view text:backdrop:disabled:selected, iconview text:backdrop:disabled:selected, textview 
text:backdrop:disabled:selected, .view text selection:backdrop:disabled, iconview text 
selection:backdrop:disabled, textview text selection:backdrop:disabled, flowbox 
flowboxchild:backdrop:disabled:selected, label:disabled selection:backdrop, label:backdrop 
selection:disabled, spinbutton:not(.vertical) selection:backdrop:disabled, entry selection:backdrop:disabled, 
modelbutton.flat:backdrop:disabled:selected, .menuitem.button.flat:backdrop:disabled:selected, 
row:backdrop:disabled:selected, calendar:backdrop:disabled:selected { color: #71a8eb; }
+label:backdrop selection:disabled, row:selected label:backdrop:disabled, label:backdrop:disabled:selected, 
.selection-mode button.titlebutton:backdrop:disabled, .view:backdrop:disabled:selected, 
iconview:backdrop:disabled:selected, .view text:backdrop:disabled:selected, iconview 
text:backdrop:disabled:selected, textview text:backdrop:disabled:selected, .view text 
selection:backdrop:disabled, iconview text selection:backdrop:disabled, textview text 
selection:backdrop:disabled, flowbox flowboxchild:backdrop:disabled:selected, spinbutton:not(.vertical) 
selection:backdrop:disabled, entry selection:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected, 
.menuitem.button.flat:backdrop:disabled:selected, row:backdrop:disabled:selected, 
calendar:backdrop:disabled:selected { color: #71a8eb; }
 
 .monospace { font-family: monospace; }
 
diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss
index f9a13c76e3..c403879494 100644
--- a/gtk/theme/HighContrast/_common.scss
+++ b/gtk/theme/HighContrast/_common.scss
@@ -99,6 +99,7 @@ $ease-out-quad: cubic-bezier(0.25, 0.46, 0.45, 0.94);
     color: $insensitive_fg_color;
     background-color: $insensitive_bg_color;
   }
+  @at-root %view_selected,
   &:selected,
   &:selected:focus,
   &:selected:hover { @extend %selected_items; }
@@ -416,6 +417,7 @@ button {
       }
     }
 
+    @at-root %button_basic_flat,
     &.flat {
       @include button(undecorated);
 
@@ -473,6 +475,7 @@ button {
       }
     }
 
+    @at-root %button_basic_drop_active,
     &:drop(active) {
       color: $fg_color;
       border-color: $fg_color;
@@ -763,11 +766,11 @@ toolbar.inline-toolbar toolbutton,
 toolbar.inline-toolbar toolbutton:backdrop {
   & > button.flat { @extend %linked_middle; }
 
-  &:first-child > button.flat { @extend %linked:first-child; }
+  &:first-child > button.flat { @extend %linked_left; }
 
-  &:last-child > button.flat { @extend %linked:last-child; }
+  &:last-child > button.flat { @extend %linked_right; }
 
-  &:only-child > button.flat { @extend %linked:only-child; }
+  &:only-child > button.flat { @extend %linked_only_child; }
 }
 
 %linked_middle {
@@ -791,17 +794,18 @@ toolbar.inline-toolbar toolbutton:backdrop {
     border-right-style: solid;
 }
 
+%linked_only_child {
+    border-radius: 3px;
+    border-style: solid;
+}
+
 // .linked assumes Box, which reverses nodes in RTL, so 1st child is always left
 %linked {
   @extend %linked_middle;
 
   &:first-child { @extend %linked_left; }
   &:last-child { @extend %linked_right; }
-
-  &:only-child {
-    border-radius: 3px;
-    border-style: solid;
-  }
+  &:only-child { @extend %linked_only_child; }
 }
 
 // Other widgets use widget child order, so 1st/last child are at text start/end
@@ -829,24 +833,30 @@ toolbar.inline-toolbar toolbutton:backdrop {
   border-radius: 0;
 }
 
+%linked_vertical_top {
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px;
+}
+
+%linked_vertical_bottom {
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
+  border-style: solid;
+}
+
+%linked_vertical_only_child {
+  border-radius: 3px;
+  border-style: solid;
+}
+
 %linked_vertical{
   @extend %linked_vertical_middle;
 
-  &:first-child {
-    border-top-left-radius: 3px;
-    border-top-right-radius: 3px;
-  }
+  &:first-child { @extend %linked_vertical_top; }
 
-  &:last-child {
-    border-bottom-left-radius: 3px;
-    border-bottom-right-radius: 3px;
-    border-style: solid;
-  }
+  &:last-child { @extend %linked_vertical_bottom; }
 
-  &:only-child {
-    border-radius: 3px;
-    border-style: solid;
-  }
+  &:only-child { @extend %linked_vertical_only_child; }
 }
 
 %undecorated_button {
@@ -860,7 +870,8 @@ toolbar.inline-toolbar toolbutton:backdrop {
 }
 
 /* menu buttons */
-modelbutton.flat,
+
+%menubutton_flat,
 .menuitem.button.flat {
   min-height: 26px;
   padding-left: 5px;
@@ -885,14 +896,19 @@ modelbutton.flat,
   radio:first-child { margin-right: 8px; }
 }
 
-modelbutton.flat arrow {
-  background: none;
+%modelbutton_flat,
+modelbutton.flat {
+  @extend %menubutton_flat;
 
-  &:hover { background: none; }
+  arrow {
+    background: none;
 
-  &.left { -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); }
+    &:hover { background: none; }
 
-  &.right { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
+    &.left { -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); }
+
+    &.right { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
+  }
 }
 
 button.color {
@@ -1159,15 +1175,15 @@ combobox {
 
   &.linked {
     button:nth-child(2) {
-      &:dir(ltr) { @extend %linked:last-child; }
-      &:dir(rtl) { @extend %linked:first-child; }
+      &:dir(ltr) { @extend %linked_right; }
+      &:dir(rtl) { @extend %linked_left; }
     }
   }
 
   &:drop(active) { // FIXME: untested
     box-shadow: none;
 
-    button.combo { @extend %button_basic:drop(active); }
+    button.combo { @extend %button_basic_drop_active; }
   }
 }
 
@@ -1180,14 +1196,14 @@ combobox {
   &:dir(rtl) { @extend %linked_middle; } // specificity bump
 }
 
-.linked:not(.vertical) > combobox:first-child > box > button.combo { @extend %linked:first-child; }
-.linked:not(.vertical) > combobox:last-child > box > button.combo { @extend %linked:last-child; }
-.linked:not(.vertical) > combobox:only-child > box > button.combo { @extend %linked:only-child; }
+.linked:not(.vertical) > combobox:first-child > box > button.combo { @extend %linked_left; }
+.linked:not(.vertical) > combobox:last-child > box > button.combo { @extend %linked_right; }
+.linked:not(.vertical) > combobox:only-child > box > button.combo { @extend %linked_only_child; }
 
 .linked.vertical > combobox > box > button.combo { @extend %linked_vertical_middle; }
-.linked.vertical > combobox:first-child > box > button.combo { @extend %linked_vertical:first-child;}
-.linked.vertical > combobox:last-child > box > button.combo { @extend %linked_vertical:last-child; }
-.linked.vertical > combobox:only-child > box > button.combo { @extend %linked_vertical:only-child; }
+.linked.vertical > combobox:first-child > box > button.combo { @extend %linked_vertical_top;}
+.linked.vertical > combobox:last-child > box > button.combo { @extend %linked_vertical_bottom; }
+.linked.vertical > combobox:only-child > box > button.combo { @extend %linked_vertical_only_child; }
 
 
 /************
@@ -1685,7 +1701,7 @@ popover.background {
   list separator { margin: 0px; }
 
   checkbutton,
-  radiobutton { @extend modelbutton.flat; }
+  radiobutton { @extend %modelbutton_flat; }
 }
 
 /*****************
@@ -2891,7 +2907,7 @@ expander {
 calendar {
   border: 1px solid $borders_color;
   &:selected {
-    @extend .view:selected;
+    @extend %view_selected;
   }
   &.button {
     @extend %undecorated_button;
@@ -3115,7 +3131,7 @@ placessidebar {
     }
 
     @at-root button.sidebar-button {
-      @extend %button_basic.flat;
+      @extend %button_basic_flat;
 
       @extend %button_selected.flat;
 
@@ -3447,7 +3463,7 @@ decoration {
 button.titlebutton {
   @extend %button_basic;
 
-  @extend %button_basic.flat;
+  @extend %button_basic_flat;
 }
 
 /**********************
diff --git a/gtk/theme/HighContrast/gtk-contained-inverse.css 
b/gtk/theme/HighContrast/gtk-contained-inverse.css
index 6de03a6936..1d2878644e 100644
--- a/gtk/theme/HighContrast/gtk-contained-inverse.css
+++ b/gtk/theme/HighContrast/gtk-contained-inverse.css
@@ -178,15 +178,15 @@ button.titlebutton:backdrop:disabled, button:backdrop:disabled { border-width: 2
 
 button.titlebutton:backdrop:disabled:active, button.titlebutton:backdrop:disabled:checked, 
button:backdrop:disabled:active, button:backdrop:disabled:checked { border-width: 2px; border-style: solid; 
color: gray; border-color: #494949; background-image: none; background-color: #090909; }
 
-button.sidebar-button, button.titlebutton, button.flat { border-width: 2px; border-style: solid; color: 
#fff; background-color: transparent; background-image: none; border-color: transparent; transition: none; }
+button.sidebar-button, button.titlebutton, button.flat.titlebutton, button.flat { border-width: 2px; 
border-style: solid; color: #fff; background-color: transparent; background-image: none; border-color: 
transparent; transition: none; }
 
-button.sidebar-button:hover, button.titlebutton:hover, button.flat:hover { transition: all 200ms 
cubic-bezier(0.25, 0.46, 0.45, 0.94); transition-duration: 500ms; }
+button.sidebar-button:hover, button.titlebutton:hover, button.flat.titlebutton:hover, button.flat:hover { 
transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); transition-duration: 500ms; }
 
-button.sidebar-button:hover:active, button.titlebutton:hover:active, button.flat:hover:active { transition: 
all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
+button.sidebar-button:hover:active, button.titlebutton:hover:active, button.flat.titlebutton:hover:active, 
button.flat:hover:active { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
 
-button.sidebar-button:backdrop, button.titlebutton:backdrop, button.sidebar-button:disabled, 
button.titlebutton:disabled, button.sidebar-button:backdrop:disabled, button.titlebutton:backdrop:disabled, 
button.flat:backdrop, button.flat:disabled, button.flat:backdrop:disabled { border-width: 2px; border-style: 
solid; color: gray; background-color: transparent; background-image: none; border-color: transparent; }
+button.sidebar-button:backdrop, button.titlebutton:backdrop, button.sidebar-button:disabled, 
button.titlebutton:disabled, button.sidebar-button:backdrop:disabled, button.titlebutton:backdrop:disabled, 
button.flat.titlebutton:backdrop, button.flat.titlebutton:disabled, 
button.flat.titlebutton:backdrop:disabled, button.flat:backdrop, button.flat:disabled, 
button.flat:backdrop:disabled { border-width: 2px; border-style: solid; color: gray; background-color: 
transparent; background-image: none; border-color: transparent; }
 
-button.titlebutton:hover, button.sidebar-button:hover, button.titlebutton:hover, button:hover, 
button.flat:hover { border-width: 2px; border-style: solid; color: #fff; background-color: #000; 
border-color: gray; background-image: none; -gtk-icon-effect: highlight; }
+button.titlebutton:hover, button.flat.titlebutton:hover, button:hover, button.flat:hover { border-width: 
2px; border-style: solid; color: #fff; background-color: #000; border-color: gray; background-image: none; 
-gtk-icon-effect: highlight; }
 
 button.titlebutton:active, button.titlebutton:checked, button:active, button:checked { border-width: 2px; 
border-style: solid; background-image: none; color: black; background-color: white; border-color: gray; 
transition-duration: 50ms; }
 
@@ -342,11 +342,11 @@ button.destructive-action:disabled:active, button.destructive-action:disabled:ch
 
 toolbar.inline-toolbar toolbutton > button.flat, searchbar > revealer > box.inline-toolbar toolbutton > 
button.flat, toolbar.inline-toolbar toolbutton:backdrop > button.flat, searchbar > revealer > 
box.inline-toolbar toolbutton:backdrop > button.flat, .linked:not(.vertical) > spinbutton:not(.vertical), 
.linked:not(.vertical) > entry, .inline-toolbar button, .inline-toolbar button:backdrop, .linked > button, 
.linked > button:hover, .linked > button:active, .linked > button:checked, .linked > button:backdrop, 
filechooser .path-bar.linked > button, .linked > combobox > box > button.combo:dir(ltr), .linked > combobox > 
box > button.combo:dir(rtl) { border-radius: 0; border-right-style: none; }
 
-.linked:not(.vertical) > spinbutton:first-child:not(.vertical), .linked:not(.vertical) > entry:first-child, 
.inline-toolbar button:first-child, .linked > button:first-child, toolbar.inline-toolbar 
toolbutton:first-child > button.flat, searchbar > revealer > box.inline-toolbar toolbutton:first-child > 
button.flat, toolbar.inline-toolbar toolbutton:backdrop:first-child > button.flat, searchbar > revealer > 
box.inline-toolbar toolbutton:backdrop:first-child > button.flat, combobox.linked 
button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > box > button.combo, filechooser 
.path-bar.linked > button:dir(ltr):first-child, filechooser .path-bar.linked > button:dir(rtl):last-child { 
border-top-left-radius: 3px; border-bottom-left-radius: 3px; border-top-right-radius: 0; 
border-bottom-right-radius: 0; border-right-style: none; }
+toolbar.inline-toolbar toolbutton:first-child > button.flat, searchbar > revealer > box.inline-toolbar 
toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:first-child > button.flat, 
searchbar > revealer > box.inline-toolbar toolbutton:backdrop:first-child > button.flat, 
.linked:not(.vertical) > spinbutton:first-child:not(.vertical), .linked:not(.vertical) > entry:first-child, 
.inline-toolbar button:first-child, .linked > button:first-child, filechooser .path-bar.linked > 
button:dir(ltr):first-child, filechooser .path-bar.linked > button:dir(rtl):last-child, combobox.linked 
button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > box > button.combo { 
border-top-left-radius: 3px; border-bottom-left-radius: 3px; border-top-right-radius: 0; 
border-bottom-right-radius: 0; border-right-style: none; }
 
-.linked:not(.vertical) > spinbutton:last-child:not(.vertical), .linked:not(.vertical) > entry:last-child, 
.inline-toolbar button:last-child, .linked > button:last-child, toolbar.inline-toolbar toolbutton:last-child 
button.flat, searchbar > revealer > box.inline-toolbar toolbutton:last-child > button.flat, 
toolbar.inline-toolbar toolbutton:backdrop:last-child > button.flat, searchbar > revealer > 
box.inline-toolbar toolbutton:backdrop:last-child > button.flat, combobox.linked 
button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > box > button.combo, filechooser 
.path-bar.linked > button:dir(ltr):last-child, filechooser .path-bar.linked > button:dir(rtl):first-child { 
border-top-left-radius: 0; border-bottom-left-radius: 0; border-top-right-radius: 3px; 
border-bottom-right-radius: 3px; border-right-style: solid; }
+toolbar.inline-toolbar toolbutton:last-child > button.flat, searchbar > revealer > box.inline-toolbar 
toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:last-child > button.flat, 
searchbar > revealer > box.inline-toolbar toolbutton:backdrop:last-child > button.flat, 
.linked:not(.vertical) > spinbutton:last-child:not(.vertical), .linked:not(.vertical) > entry:last-child, 
.inline-toolbar button:last-child, .linked > button:last-child, filechooser .path-bar.linked > 
button:dir(ltr):last-child, filechooser .path-bar.linked > button:dir(rtl):first-child, combobox.linked 
button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > box > button.combo { 
border-top-left-radius: 0; border-bottom-left-radius: 0; border-top-right-radius: 3px; 
border-bottom-right-radius: 3px; border-right-style: solid; }
 
-.linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child, 
.inline-toolbar button:only-child, .linked > button:only-child, toolbar.inline-toolbar toolbutton:only-child 
button.flat, searchbar > revealer > box.inline-toolbar toolbutton:only-child > button.flat, 
toolbar.inline-toolbar toolbutton:backdrop:only-child > button.flat, searchbar > revealer > 
box.inline-toolbar toolbutton:backdrop:only-child > button.flat, .linked:not(.vertical) > combobox:only-child 
box > button.combo { border-radius: 3px; border-style: solid; }
+toolbar.inline-toolbar toolbutton:only-child > button.flat, searchbar > revealer > box.inline-toolbar 
toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:only-child > button.flat, 
searchbar > revealer > box.inline-toolbar toolbutton:backdrop:only-child > button.flat, 
.linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child, 
.inline-toolbar button:only-child, .linked > button:only-child, .linked:not(.vertical) > combobox:only-child 
box > button.combo { border-radius: 3px; border-style: solid; }
 
 filechooser .path-bar.linked > button:only-child { border-radius: 3px; border-style: solid; }
 
@@ -358,24 +358,24 @@ filechooser .path-bar.linked > button:only-child { border-radius: 3px; border-st
 
 .linked.vertical > spinbutton:only-child:not(.vertical), .linked.vertical > entry:only-child, 
.linked.vertical > button:only-child, .linked.vertical > combobox:only-child > box > button.combo { 
border-radius: 3px; border-style: solid; }
 
-modelbutton.flat, popover.background checkbutton, popover.background radiobutton, .menuitem.button.flat, 
modelbutton.flat:backdrop, popover.background checkbutton:backdrop, popover.background radiobutton:backdrop, 
modelbutton.flat:backdrop:hover, popover.background checkbutton:backdrop:hover, popover.background 
radiobutton:backdrop:hover, .menuitem.button.flat:backdrop, .menuitem.button.flat:backdrop:hover, 
button:link, button:visited, button:link:hover, button:link:active, button:visited:hover, 
button:visited:active, button:link:backdrop, button:visited:backdrop, notebook tab button, row.activatable, 
row.activatable:backdrop, row.activatable:backdrop:active, row.activatable:backdrop:checked, 
row.activatable:backdrop:disabled, row.activatable:backdrop:disabled:active, 
row.activatable:backdrop:disabled:checked, row.activatable:disabled:active, row.activatable:disabled:checked, 
calendar.button, calendar.button:hover, calendar.button:backdrop, calendar.button:backdrop:hover { b
 ackgroun
 d-color: transparent; background-image: none; border-color: transparent; box-shadow: inset 0 1px rgba(255, 
255, 255, 0), 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
+popover.background checkbutton, popover.background radiobutton, modelbutton.flat, .menuitem.button.flat, 
popover.background checkbutton:backdrop, popover.background radiobutton:backdrop, modelbutton.flat:backdrop, 
popover.background checkbutton:backdrop:hover, popover.background radiobutton:backdrop:hover, 
modelbutton.flat:backdrop:hover, .menuitem.button.flat:backdrop, .menuitem.button.flat:backdrop:hover, 
button:link, button:visited, button:link:hover, button:link:active, button:visited:hover, 
button:visited:active, button:link:backdrop, button:visited:backdrop, notebook tab button, row.activatable, 
row.activatable:backdrop, row.activatable:backdrop:active, row.activatable:backdrop:checked, 
row.activatable:backdrop:disabled, row.activatable:backdrop:disabled:active, 
row.activatable:backdrop:disabled:checked, row.activatable:disabled:active, row.activatable:disabled:checked, 
calendar.button, calendar.button:hover, calendar.button:backdrop, calendar.button:backdrop:hover { b
 ackgroun
 d-color: transparent; background-image: none; border-color: transparent; box-shadow: inset 0 1px rgba(255, 
255, 255, 0), 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
 
 /* menu buttons */
-modelbutton.flat, popover.background checkbutton, popover.background radiobutton, .menuitem.button.flat { 
min-height: 26px; padding-left: 5px; padding-right: 5px; border-radius: 3px; outline-offset: -2px; }
+popover.background checkbutton, popover.background radiobutton, modelbutton.flat, .menuitem.button.flat { 
min-height: 26px; padding-left: 5px; padding-right: 5px; border-radius: 3px; outline-offset: -2px; }
 
-modelbutton.flat:hover, popover.background checkbutton:hover, popover.background radiobutton:hover, 
.menuitem.button.flat:hover { background-color: #0d0d0d; }
+popover.background checkbutton:hover, popover.background radiobutton:hover, modelbutton.flat:hover, 
.menuitem.button.flat:hover { background-color: #0d0d0d; }
 
-modelbutton.flat check:last-child, popover.background checkbutton check:last-child, popover.background 
radiobutton check:last-child, modelbutton.flat radio:last-child, popover.background checkbutton 
radio:last-child, popover.background radiobutton radio:last-child, .menuitem.button.flat check:last-child, 
.menuitem.button.flat radio:last-child { margin-left: 8px; }
+popover.background checkbutton check:last-child, popover.background radiobutton check:last-child, 
modelbutton.flat check:last-child, popover.background checkbutton radio:last-child, popover.background 
radiobutton radio:last-child, modelbutton.flat radio:last-child, .menuitem.button.flat check:last-child, 
.menuitem.button.flat radio:last-child { margin-left: 8px; }
 
-modelbutton.flat check:first-child, popover.background checkbutton check:first-child, popover.background 
radiobutton check:first-child, modelbutton.flat radio:first-child, popover.background checkbutton 
radio:first-child, popover.background radiobutton radio:first-child, .menuitem.button.flat check:first-child, 
.menuitem.button.flat radio:first-child { margin-right: 8px; }
+popover.background checkbutton check:first-child, popover.background radiobutton check:first-child, 
modelbutton.flat check:first-child, popover.background checkbutton radio:first-child, popover.background 
radiobutton radio:first-child, modelbutton.flat radio:first-child, .menuitem.button.flat check:first-child, 
.menuitem.button.flat radio:first-child { margin-right: 8px; }
 
-modelbutton.flat arrow, popover.background checkbutton arrow, popover.background radiobutton arrow { 
background: none; }
+popover.background checkbutton arrow, popover.background radiobutton arrow, modelbutton.flat arrow { 
background: none; }
 
-modelbutton.flat arrow:hover, popover.background checkbutton arrow:hover, popover.background radiobutton 
arrow:hover { background: none; }
+popover.background checkbutton arrow:hover, popover.background radiobutton arrow:hover, modelbutton.flat 
arrow:hover { background: none; }
 
-modelbutton.flat arrow.left, popover.background checkbutton arrow.left, popover.background radiobutton 
arrow.left { -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); }
+popover.background checkbutton arrow.left, popover.background radiobutton arrow.left, modelbutton.flat 
arrow.left { -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); }
 
-modelbutton.flat arrow.right, popover.background checkbutton arrow.right, popover.background radiobutton 
arrow.right { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
+popover.background checkbutton arrow.right, popover.background radiobutton arrow.right, modelbutton.flat 
arrow.right { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
 
 button.color { padding: 4px; }
 
@@ -1160,9 +1160,9 @@ levelbar block.empty { border-width: 1px; border-style: solid; background-color:
 
 levelbar block.empty:backdrop { border-color: rgba(255, 255, 255, 0.15); }
 
-.view:selected, textview text:selected, iconview:selected, calendar:selected, .view:selected:focus, textview 
text:selected:focus, iconview:selected:focus, calendar:focus:selected, .view:selected:hover, textview 
text:selected:hover, iconview:selected:hover, calendar:hover:selected, textview text selection, textview text 
selection:focus, textview text selection:hover, flowbox flowboxchild:selected, label selection, label 
selection:focus, label selection:hover, label selection:backdrop, spinbutton:not(.vertical) selection:focus, 
spinbutton:not(.vertical) selection, entry selection:focus, entry selection, modelbutton.flat:selected, 
popover.background checkbutton:selected, popover.background radiobutton:selected, 
.menuitem.button.flat:selected, treeview.view:selected, row.activatable:selected, .sidebar:selected { 
background-color: #ddd; color: #000; }
+calendar:selected, .view:selected, textview text:selected, iconview:selected, .view:selected:focus, textview 
text:selected:focus, iconview:selected:focus, .view:selected:hover, textview text:selected:hover, 
iconview:selected:hover, textview text selection, textview text selection:focus, textview text 
selection:hover, flowbox flowboxchild:selected, label selection, label selection:focus, label 
selection:hover, label selection:backdrop, spinbutton:not(.vertical) selection:focus, 
spinbutton:not(.vertical) selection, entry selection:focus, entry selection, popover.background 
checkbutton:selected, popover.background radiobutton:selected, modelbutton.flat:selected, 
.menuitem.button.flat:selected, treeview.view:selected, row.activatable:selected, .sidebar:selected { 
background-color: #ddd; color: #000; }
 
-.view:backdrop:selected, textview text:backdrop:selected, iconview:backdrop:selected, 
calendar:backdrop:selected, textview text:backdrop:selected:focus, iconview:backdrop:selected:focus, 
calendar:backdrop:focus:selected, textview text:backdrop:selected:hover, iconview:backdrop:selected:hover, 
calendar:backdrop:hover:selected, textview text selection:backdrop, flowbox flowboxchild:backdrop:selected, 
label selection:backdrop, spinbutton:not(.vertical) selection:backdrop, entry selection:backdrop, 
modelbutton.flat:backdrop:selected, popover.background checkbutton:backdrop:selected, popover.background 
radiobutton:backdrop:selected, .menuitem.button.flat:backdrop:selected, row.activatable:backdrop:selected, 
.sidebar:backdrop:selected { background-color: gray; color: #000; }
+calendar:backdrop:selected, .view:backdrop:selected, textview text:backdrop:selected, 
iconview:backdrop:selected, textview text:backdrop:selected:focus, iconview:backdrop:selected:focus, textview 
text:backdrop:selected:hover, iconview:backdrop:selected:hover, textview text selection:backdrop, flowbox 
flowboxchild:backdrop:selected, label selection:backdrop, spinbutton:not(.vertical) selection:backdrop, entry 
selection:backdrop, popover.background checkbutton:backdrop:selected, popover.background 
radiobutton:backdrop:selected, modelbutton.flat:backdrop:selected, .menuitem.button.flat:backdrop:selected, 
row.activatable:backdrop:selected, .sidebar:backdrop:selected { background-color: gray; color: #000; }
 
 .monospace { font-family: monospace; }
 
diff --git a/gtk/theme/HighContrast/gtk-contained.css b/gtk/theme/HighContrast/gtk-contained.css
index ee52a5884f..de265f4473 100644
--- a/gtk/theme/HighContrast/gtk-contained.css
+++ b/gtk/theme/HighContrast/gtk-contained.css
@@ -178,15 +178,15 @@ button.titlebutton:backdrop:disabled, button:backdrop:disabled { border-width: 2
 
 button.titlebutton:backdrop:disabled:active, button.titlebutton:backdrop:disabled:checked, 
button:backdrop:disabled:active, button:backdrop:disabled:checked { border-width: 2px; border-style: solid; 
color: gray; border-color: silver; background-image: none; background-color: #f6f6f6; }
 
-button.sidebar-button, button.titlebutton, button.flat { border-width: 2px; border-style: solid; color: 
#000; background-color: transparent; background-image: none; border-color: transparent; transition: none; }
+button.sidebar-button, button.titlebutton, button.flat.titlebutton, button.flat { border-width: 2px; 
border-style: solid; color: #000; background-color: transparent; background-image: none; border-color: 
transparent; transition: none; }
 
-button.sidebar-button:hover, button.titlebutton:hover, button.flat:hover { transition: all 200ms 
cubic-bezier(0.25, 0.46, 0.45, 0.94); transition-duration: 500ms; }
+button.sidebar-button:hover, button.titlebutton:hover, button.flat.titlebutton:hover, button.flat:hover { 
transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); transition-duration: 500ms; }
 
-button.sidebar-button:hover:active, button.titlebutton:hover:active, button.flat:hover:active { transition: 
all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
+button.sidebar-button:hover:active, button.titlebutton:hover:active, button.flat.titlebutton:hover:active, 
button.flat:hover:active { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
 
-button.sidebar-button:backdrop, button.titlebutton:backdrop, button.sidebar-button:disabled, 
button.titlebutton:disabled, button.sidebar-button:backdrop:disabled, button.titlebutton:backdrop:disabled, 
button.flat:backdrop, button.flat:disabled, button.flat:backdrop:disabled { border-width: 2px; border-style: 
solid; color: gray; background-color: transparent; background-image: none; border-color: transparent; }
+button.sidebar-button:backdrop, button.titlebutton:backdrop, button.sidebar-button:disabled, 
button.titlebutton:disabled, button.sidebar-button:backdrop:disabled, button.titlebutton:backdrop:disabled, 
button.flat.titlebutton:backdrop, button.flat.titlebutton:disabled, 
button.flat.titlebutton:backdrop:disabled, button.flat:backdrop, button.flat:disabled, 
button.flat:backdrop:disabled { border-width: 2px; border-style: solid; color: gray; background-color: 
transparent; background-image: none; border-color: transparent; }
 
-button.titlebutton:hover, button.sidebar-button:hover, button.titlebutton:hover, button:hover, 
button.flat:hover { border-width: 2px; border-style: solid; color: #000; background-color: #fff; 
border-color: gray; background-image: none; -gtk-icon-effect: highlight; }
+button.titlebutton:hover, button.flat.titlebutton:hover, button:hover, button.flat:hover { border-width: 
2px; border-style: solid; color: #000; background-color: #fff; border-color: gray; background-image: none; 
-gtk-icon-effect: highlight; }
 
 button.titlebutton:active, button.titlebutton:checked, button:active, button:checked { border-width: 2px; 
border-style: solid; background-image: none; color: white; background-color: black; border-color: gray; 
transition-duration: 50ms; }
 
@@ -344,11 +344,11 @@ button.destructive-action:disabled:active, button.destructive-action:disabled:ch
 
 toolbar.inline-toolbar toolbutton > button.flat, searchbar > revealer > box.inline-toolbar toolbutton > 
button.flat, toolbar.inline-toolbar toolbutton:backdrop > button.flat, searchbar > revealer > 
box.inline-toolbar toolbutton:backdrop > button.flat, .linked:not(.vertical) > spinbutton:not(.vertical), 
.linked:not(.vertical) > entry, .inline-toolbar button, .inline-toolbar button:backdrop, .linked > button, 
.linked > button:hover, .linked > button:active, .linked > button:checked, .linked > button:backdrop, 
filechooser .path-bar.linked > button, .linked > combobox > box > button.combo:dir(ltr), .linked > combobox > 
box > button.combo:dir(rtl) { border-radius: 0; border-right-style: none; }
 
-.linked:not(.vertical) > spinbutton:first-child:not(.vertical), .linked:not(.vertical) > entry:first-child, 
.inline-toolbar button:first-child, .linked > button:first-child, toolbar.inline-toolbar 
toolbutton:first-child > button.flat, searchbar > revealer > box.inline-toolbar toolbutton:first-child > 
button.flat, toolbar.inline-toolbar toolbutton:backdrop:first-child > button.flat, searchbar > revealer > 
box.inline-toolbar toolbutton:backdrop:first-child > button.flat, combobox.linked 
button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > box > button.combo, filechooser 
.path-bar.linked > button:dir(ltr):first-child, filechooser .path-bar.linked > button:dir(rtl):last-child { 
border-top-left-radius: 3px; border-bottom-left-radius: 3px; border-top-right-radius: 0; 
border-bottom-right-radius: 0; border-right-style: none; }
+toolbar.inline-toolbar toolbutton:first-child > button.flat, searchbar > revealer > box.inline-toolbar 
toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:first-child > button.flat, 
searchbar > revealer > box.inline-toolbar toolbutton:backdrop:first-child > button.flat, 
.linked:not(.vertical) > spinbutton:first-child:not(.vertical), .linked:not(.vertical) > entry:first-child, 
.inline-toolbar button:first-child, .linked > button:first-child, filechooser .path-bar.linked > 
button:dir(ltr):first-child, filechooser .path-bar.linked > button:dir(rtl):last-child, combobox.linked 
button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > box > button.combo { 
border-top-left-radius: 3px; border-bottom-left-radius: 3px; border-top-right-radius: 0; 
border-bottom-right-radius: 0; border-right-style: none; }
 
-.linked:not(.vertical) > spinbutton:last-child:not(.vertical), .linked:not(.vertical) > entry:last-child, 
.inline-toolbar button:last-child, .linked > button:last-child, toolbar.inline-toolbar toolbutton:last-child 
button.flat, searchbar > revealer > box.inline-toolbar toolbutton:last-child > button.flat, 
toolbar.inline-toolbar toolbutton:backdrop:last-child > button.flat, searchbar > revealer > 
box.inline-toolbar toolbutton:backdrop:last-child > button.flat, combobox.linked 
button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > box > button.combo, filechooser 
.path-bar.linked > button:dir(ltr):last-child, filechooser .path-bar.linked > button:dir(rtl):first-child { 
border-top-left-radius: 0; border-bottom-left-radius: 0; border-top-right-radius: 3px; 
border-bottom-right-radius: 3px; border-right-style: solid; }
+toolbar.inline-toolbar toolbutton:last-child > button.flat, searchbar > revealer > box.inline-toolbar 
toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:last-child > button.flat, 
searchbar > revealer > box.inline-toolbar toolbutton:backdrop:last-child > button.flat, 
.linked:not(.vertical) > spinbutton:last-child:not(.vertical), .linked:not(.vertical) > entry:last-child, 
.inline-toolbar button:last-child, .linked > button:last-child, filechooser .path-bar.linked > 
button:dir(ltr):last-child, filechooser .path-bar.linked > button:dir(rtl):first-child, combobox.linked 
button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > box > button.combo { 
border-top-left-radius: 0; border-bottom-left-radius: 0; border-top-right-radius: 3px; 
border-bottom-right-radius: 3px; border-right-style: solid; }
 
-.linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child, 
.inline-toolbar button:only-child, .linked > button:only-child, toolbar.inline-toolbar toolbutton:only-child 
button.flat, searchbar > revealer > box.inline-toolbar toolbutton:only-child > button.flat, 
toolbar.inline-toolbar toolbutton:backdrop:only-child > button.flat, searchbar > revealer > 
box.inline-toolbar toolbutton:backdrop:only-child > button.flat, .linked:not(.vertical) > combobox:only-child 
box > button.combo { border-radius: 3px; border-style: solid; }
+toolbar.inline-toolbar toolbutton:only-child > button.flat, searchbar > revealer > box.inline-toolbar 
toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:only-child > button.flat, 
searchbar > revealer > box.inline-toolbar toolbutton:backdrop:only-child > button.flat, 
.linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child, 
.inline-toolbar button:only-child, .linked > button:only-child, .linked:not(.vertical) > combobox:only-child 
box > button.combo { border-radius: 3px; border-style: solid; }
 
 filechooser .path-bar.linked > button:only-child { border-radius: 3px; border-style: solid; }
 
@@ -360,24 +360,24 @@ filechooser .path-bar.linked > button:only-child { border-radius: 3px; border-st
 
 .linked.vertical > spinbutton:only-child:not(.vertical), .linked.vertical > entry:only-child, 
.linked.vertical > button:only-child, .linked.vertical > combobox:only-child > box > button.combo { 
border-radius: 3px; border-style: solid; }
 
-modelbutton.flat, popover.background checkbutton, popover.background radiobutton, .menuitem.button.flat, 
modelbutton.flat:backdrop, popover.background checkbutton:backdrop, popover.background radiobutton:backdrop, 
modelbutton.flat:backdrop:hover, popover.background checkbutton:backdrop:hover, popover.background 
radiobutton:backdrop:hover, .menuitem.button.flat:backdrop, .menuitem.button.flat:backdrop:hover, 
button:link, button:visited, button:link:hover, button:link:active, button:visited:hover, 
button:visited:active, button:link:backdrop, button:visited:backdrop, notebook tab button, row.activatable, 
row.activatable:backdrop, row.activatable:backdrop:active, row.activatable:backdrop:checked, 
row.activatable:backdrop:disabled, row.activatable:backdrop:disabled:active, 
row.activatable:backdrop:disabled:checked, row.activatable:disabled:active, row.activatable:disabled:checked, 
calendar.button, calendar.button:hover, calendar.button:backdrop, calendar.button:backdrop:hover { b
 ackgroun
 d-color: transparent; background-image: none; border-color: transparent; box-shadow: inset 0 1px rgba(255, 
255, 255, 0), 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
+popover.background checkbutton, popover.background radiobutton, modelbutton.flat, .menuitem.button.flat, 
popover.background checkbutton:backdrop, popover.background radiobutton:backdrop, modelbutton.flat:backdrop, 
popover.background checkbutton:backdrop:hover, popover.background radiobutton:backdrop:hover, 
modelbutton.flat:backdrop:hover, .menuitem.button.flat:backdrop, .menuitem.button.flat:backdrop:hover, 
button:link, button:visited, button:link:hover, button:link:active, button:visited:hover, 
button:visited:active, button:link:backdrop, button:visited:backdrop, notebook tab button, row.activatable, 
row.activatable:backdrop, row.activatable:backdrop:active, row.activatable:backdrop:checked, 
row.activatable:backdrop:disabled, row.activatable:backdrop:disabled:active, 
row.activatable:backdrop:disabled:checked, row.activatable:disabled:active, row.activatable:disabled:checked, 
calendar.button, calendar.button:hover, calendar.button:backdrop, calendar.button:backdrop:hover { b
 ackgroun
 d-color: transparent; background-image: none; border-color: transparent; box-shadow: inset 0 1px rgba(255, 
255, 255, 0), 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
 
 /* menu buttons */
-modelbutton.flat, popover.background checkbutton, popover.background radiobutton, .menuitem.button.flat { 
min-height: 26px; padding-left: 5px; padding-right: 5px; border-radius: 3px; outline-offset: -2px; }
+popover.background checkbutton, popover.background radiobutton, modelbutton.flat, .menuitem.button.flat { 
min-height: 26px; padding-left: 5px; padding-right: 5px; border-radius: 3px; outline-offset: -2px; }
 
-modelbutton.flat:hover, popover.background checkbutton:hover, popover.background radiobutton:hover, 
.menuitem.button.flat:hover { background-color: white; }
+popover.background checkbutton:hover, popover.background radiobutton:hover, modelbutton.flat:hover, 
.menuitem.button.flat:hover { background-color: white; }
 
-modelbutton.flat check:last-child, popover.background checkbutton check:last-child, popover.background 
radiobutton check:last-child, modelbutton.flat radio:last-child, popover.background checkbutton 
radio:last-child, popover.background radiobutton radio:last-child, .menuitem.button.flat check:last-child, 
.menuitem.button.flat radio:last-child { margin-left: 8px; }
+popover.background checkbutton check:last-child, popover.background radiobutton check:last-child, 
modelbutton.flat check:last-child, popover.background checkbutton radio:last-child, popover.background 
radiobutton radio:last-child, modelbutton.flat radio:last-child, .menuitem.button.flat check:last-child, 
.menuitem.button.flat radio:last-child { margin-left: 8px; }
 
-modelbutton.flat check:first-child, popover.background checkbutton check:first-child, popover.background 
radiobutton check:first-child, modelbutton.flat radio:first-child, popover.background checkbutton 
radio:first-child, popover.background radiobutton radio:first-child, .menuitem.button.flat check:first-child, 
.menuitem.button.flat radio:first-child { margin-right: 8px; }
+popover.background checkbutton check:first-child, popover.background radiobutton check:first-child, 
modelbutton.flat check:first-child, popover.background checkbutton radio:first-child, popover.background 
radiobutton radio:first-child, modelbutton.flat radio:first-child, .menuitem.button.flat check:first-child, 
.menuitem.button.flat radio:first-child { margin-right: 8px; }
 
-modelbutton.flat arrow, popover.background checkbutton arrow, popover.background radiobutton arrow { 
background: none; }
+popover.background checkbutton arrow, popover.background radiobutton arrow, modelbutton.flat arrow { 
background: none; }
 
-modelbutton.flat arrow:hover, popover.background checkbutton arrow:hover, popover.background radiobutton 
arrow:hover { background: none; }
+popover.background checkbutton arrow:hover, popover.background radiobutton arrow:hover, modelbutton.flat 
arrow:hover { background: none; }
 
-modelbutton.flat arrow.left, popover.background checkbutton arrow.left, popover.background radiobutton 
arrow.left { -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); }
+popover.background checkbutton arrow.left, popover.background radiobutton arrow.left, modelbutton.flat 
arrow.left { -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); }
 
-modelbutton.flat arrow.right, popover.background checkbutton arrow.right, popover.background radiobutton 
arrow.right { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
+popover.background checkbutton arrow.right, popover.background radiobutton arrow.right, modelbutton.flat 
arrow.right { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
 
 button.color { padding: 4px; }
 
@@ -1166,9 +1166,9 @@ levelbar block.empty { border-width: 1px; border-style: solid; background-color:
 
 levelbar block.empty:backdrop { border-color: rgba(0, 0, 0, 0.15); }
 
-.view:selected, textview text:selected, iconview:selected, calendar:selected, .view:selected:focus, textview 
text:selected:focus, iconview:selected:focus, calendar:focus:selected, .view:selected:hover, textview 
text:selected:hover, iconview:selected:hover, calendar:hover:selected, textview text selection, textview text 
selection:focus, textview text selection:hover, flowbox flowboxchild:selected, label selection, label 
selection:focus, label selection:hover, label selection:backdrop, spinbutton:not(.vertical) selection:focus, 
spinbutton:not(.vertical) selection, entry selection:focus, entry selection, modelbutton.flat:selected, 
popover.background checkbutton:selected, popover.background radiobutton:selected, 
.menuitem.button.flat:selected, treeview.view:selected, row.activatable:selected, .sidebar:selected { 
background-color: #000; color: #fff; }
+calendar:selected, .view:selected, textview text:selected, iconview:selected, .view:selected:focus, textview 
text:selected:focus, iconview:selected:focus, .view:selected:hover, textview text:selected:hover, 
iconview:selected:hover, textview text selection, textview text selection:focus, textview text 
selection:hover, flowbox flowboxchild:selected, label selection, label selection:focus, label 
selection:hover, label selection:backdrop, spinbutton:not(.vertical) selection:focus, 
spinbutton:not(.vertical) selection, entry selection:focus, entry selection, popover.background 
checkbutton:selected, popover.background radiobutton:selected, modelbutton.flat:selected, 
.menuitem.button.flat:selected, treeview.view:selected, row.activatable:selected, .sidebar:selected { 
background-color: #000; color: #fff; }
 
-.view:backdrop:selected, textview text:backdrop:selected, iconview:backdrop:selected, 
calendar:backdrop:selected, textview text:backdrop:selected:focus, iconview:backdrop:selected:focus, 
calendar:backdrop:focus:selected, textview text:backdrop:selected:hover, iconview:backdrop:selected:hover, 
calendar:backdrop:hover:selected, textview text selection:backdrop, flowbox flowboxchild:backdrop:selected, 
label selection:backdrop, spinbutton:not(.vertical) selection:backdrop, entry selection:backdrop, 
modelbutton.flat:backdrop:selected, popover.background checkbutton:backdrop:selected, popover.background 
radiobutton:backdrop:selected, .menuitem.button.flat:backdrop:selected, row.activatable:backdrop:selected, 
.sidebar:backdrop:selected { background-color: gray; color: #fff; }
+calendar:backdrop:selected, .view:backdrop:selected, textview text:backdrop:selected, 
iconview:backdrop:selected, textview text:backdrop:selected:focus, iconview:backdrop:selected:focus, textview 
text:backdrop:selected:hover, iconview:backdrop:selected:hover, textview text selection:backdrop, flowbox 
flowboxchild:backdrop:selected, label selection:backdrop, spinbutton:not(.vertical) selection:backdrop, entry 
selection:backdrop, popover.background checkbutton:backdrop:selected, popover.background 
radiobutton:backdrop:selected, modelbutton.flat:backdrop:selected, .menuitem.button.flat:backdrop:selected, 
row.activatable:backdrop:selected, .sidebar:backdrop:selected { background-color: gray; color: #fff; }
 
 .monospace { font-family: monospace; }
 


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