[gtk+] Adwaita: Update headerbar styling



commit 40f9a0fe697c6c55c199a93174e3380d1f80422e
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Oct 30 01:08:30 2015 -0400

    Adwaita: Update headerbar styling
    
    Adapt to the previous commit.

 gtk/theme/Adwaita/_common.scss           |    6 +-
 gtk/theme/Adwaita/gtk-contained-dark.css |  768 ++++++++++++++++--------------
 gtk/theme/Adwaita/gtk-contained.css      |  768 ++++++++++++++++--------------
 3 files changed, 817 insertions(+), 725 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 1474c5e..25b3a87 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1057,7 +1057,7 @@ GtkComboBox {
  ***************/
 
 .titlebar,
-.header-bar {
+headerbar {
   padding: 6px;
   border-width: 0 0 1px;
   border-style: solid;
@@ -3272,7 +3272,7 @@ decoration {
 }
 
 // Window Close button
-.header-bar button.titlebutton,
+headerbar button.titlebutton,
 .titlebar button.titlebutton {
   @extend button;
   @extend button.flat;
@@ -3281,7 +3281,7 @@ decoration {
   &:backdrop { icon-shadow: none; }
 }
 
-.header-bar.selection-mode button.titlebutton,
+headerbar.selection-mode button.titlebutton,
 .titlebar.selection-mode button.titlebutton {
   @include _button_text_shadow(white, $selected_bg_color);
   &:backdrop { icon-shadow: none; }
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 9a3c8fb..f214663 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -87,7 +87,7 @@ label:insensitive {
     color: #5d6767; }
 
 .dim-label, label.separator, .titlebar .subtitle,
-.header-bar .subtitle {
+headerbar .subtitle {
   opacity: 0.55;
   text-shadow: none; }
 
@@ -314,7 +314,7 @@ entry, spinbutton {
     background-image: -gtk-gradient(radial, center center, 0, center center, 0.01, to(#3583d5), 
to(transparent)); }
   to {
     background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#215d9c), 
to(transparent)); } }
-button, .header-bar button.titlebutton,
+button, headerbar button.titlebutton,
 .titlebar button.titlebutton {
   border: 1px solid;
   border-radius: 3px;
@@ -327,7 +327,7 @@ button, .header-bar button.titlebutton,
   text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
   icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
-  button.flat, .sidebar-button.button, .header-bar button.titlebutton,
+  button.flat, .sidebar-button.button, headerbar button.titlebutton,
   .titlebar button.titlebutton {
     border-color: transparent;
     background-color: transparent;
@@ -336,14 +336,14 @@ button, .header-bar button.titlebutton,
     text-shadow: none;
     icon-shadow: none;
     transition: none; }
-    button.flat:hover, .sidebar-button.button:hover, .header-bar button.titlebutton:hover,
+    button.flat:hover, .sidebar-button.button:hover, headerbar button.titlebutton:hover,
     .titlebar button.titlebutton:hover {
       transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
       transition-duration: 500ms; }
-      button.flat:hover:active, .sidebar-button.button:hover:active, .header-bar 
button.titlebutton:hover:active,
+      button.flat:hover:active, .sidebar-button.button:hover:active, headerbar 
button.titlebutton:hover:active,
       .titlebar button.titlebutton:hover:active {
         transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
-  button:hover, .header-bar button.titlebutton:hover,
+  button:hover, headerbar button.titlebutton:hover,
   .titlebar button.titlebutton:hover {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
@@ -353,8 +353,8 @@ button, .header-bar button.titlebutton,
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1);
     -gtk-image-effect: highlight; }
-  button:active, .header-bar button.titlebutton:active,
-  .titlebar button.titlebutton:active, button:checked, .header-bar button.titlebutton:checked,
+  button:active, headerbar button.titlebutton:active,
+  .titlebar button.titlebutton:active, button:checked, headerbar button.titlebutton:checked,
   .titlebar button.titlebutton:checked {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
@@ -364,8 +364,8 @@ button, .header-bar button.titlebutton,
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
     box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 
238, 236, 0.1);
     transition-duration: 50ms; }
-  button:backdrop, .header-bar button.titlebutton:backdrop,
-  .titlebar button.titlebutton:backdrop, button.flat:backdrop, .sidebar-button.button:backdrop, .header-bar 
button.titlebutton:backdrop,
+  button:backdrop, headerbar button.titlebutton:backdrop,
+  .titlebar button.titlebutton:backdrop, button.flat:backdrop, .sidebar-button.button:backdrop, headerbar 
button.titlebutton:backdrop,
   .titlebar button.titlebutton:backdrop {
     color: #949796;
     border-color: #1f2222;
@@ -374,14 +374,14 @@ button, .header-bar button.titlebutton,
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
     -gtk-image-effect: none; }
-    button:backdrop:active, button:backdrop:checked, button.flat:backdrop:active, 
.sidebar-button.button:backdrop:active, .header-bar button.titlebutton:backdrop:active,
-    .titlebar button.titlebutton:backdrop:active, button.flat:backdrop:checked, 
.sidebar-button.button:backdrop:checked, .header-bar button.titlebutton:backdrop:checked,
+    button:backdrop:active, button:backdrop:checked, button.flat:backdrop:active, 
.sidebar-button.button:backdrop:active, headerbar button.titlebutton:backdrop:active,
+    .titlebar button.titlebutton:backdrop:active, button.flat:backdrop:checked, 
.sidebar-button.button:backdrop:checked, headerbar button.titlebutton:backdrop:checked,
     .titlebar button.titlebutton:backdrop:checked {
       color: #949796;
       border-color: #1f2222;
       background-image: linear-gradient(to bottom, #303535);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-    button:backdrop:insensitive, button.flat:backdrop:insensitive, 
.sidebar-button.button:backdrop:insensitive, .header-bar button.titlebutton:backdrop:insensitive,
+    button:backdrop:insensitive, button.flat:backdrop:insensitive, 
.sidebar-button.button:backdrop:insensitive, headerbar button.titlebutton:backdrop:insensitive,
     .titlebar button.titlebutton:backdrop:insensitive {
       color: #5d6767;
       border-color: #1f2222;
@@ -389,26 +389,26 @@ button, .header-bar button.titlebutton,
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-      button:backdrop:insensitive > .label, .header-bar button.titlebutton:backdrop:insensitive > .label,
-      .titlebar button.titlebutton:backdrop:insensitive > .label, button.flat:backdrop:insensitive > .label, 
.sidebar-button.button:backdrop:insensitive > .label, .header-bar button.titlebutton:backdrop:insensitive > 
.label,
+      button:backdrop:insensitive > .label, headerbar button.titlebutton:backdrop:insensitive > .label,
+      .titlebar button.titlebutton:backdrop:insensitive > .label, button.flat:backdrop:insensitive > .label, 
.sidebar-button.button:backdrop:insensitive > .label, headerbar button.titlebutton:backdrop:insensitive > 
.label,
       .titlebar button.titlebutton:backdrop:insensitive > .label {
         color: inherit; }
-    button:backdrop:insensitive:active, button:backdrop:insensitive:checked, 
button.flat:backdrop:insensitive:active, .sidebar-button.button:backdrop:insensitive:active, .header-bar 
button.titlebutton:backdrop:insensitive:active,
-    .titlebar button.titlebutton:backdrop:insensitive:active, button.flat:backdrop:insensitive:checked, 
.sidebar-button.button:backdrop:insensitive:checked, .header-bar 
button.titlebutton:backdrop:insensitive:checked,
+    button:backdrop:insensitive:active, button:backdrop:insensitive:checked, 
button.flat:backdrop:insensitive:active, .sidebar-button.button:backdrop:insensitive:active, headerbar 
button.titlebutton:backdrop:insensitive:active,
+    .titlebar button.titlebutton:backdrop:insensitive:active, button.flat:backdrop:insensitive:checked, 
.sidebar-button.button:backdrop:insensitive:checked, headerbar 
button.titlebutton:backdrop:insensitive:checked,
     .titlebar button.titlebutton:backdrop:insensitive:checked {
       color: #5d6767;
       border-color: #1f2222;
       background-image: linear-gradient(to bottom, #272929);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-      button:backdrop:insensitive:active > .label, .header-bar 
button.titlebutton:backdrop:insensitive:active > .label,
-      .titlebar button.titlebutton:backdrop:insensitive:active > .label, button:backdrop:insensitive:checked 
.label, .header-bar button.titlebutton:backdrop:insensitive:checked > .label,
-      .titlebar button.titlebutton:backdrop:insensitive:checked > .label, 
button.flat:backdrop:insensitive:active > .label, .sidebar-button.button:backdrop:insensitive:active > 
.label, .header-bar button.titlebutton:backdrop:insensitive:active > .label,
-      .titlebar button.titlebutton:backdrop:insensitive:active > .label, 
button.flat:backdrop:insensitive:checked > .label, .sidebar-button.button:backdrop:insensitive:checked > 
.label, .header-bar button.titlebutton:backdrop:insensitive:checked > .label,
+      button:backdrop:insensitive:active > .label, headerbar button.titlebutton:backdrop:insensitive:active 
.label,
+      .titlebar button.titlebutton:backdrop:insensitive:active > .label, button:backdrop:insensitive:checked 
.label, headerbar button.titlebutton:backdrop:insensitive:checked > .label,
+      .titlebar button.titlebutton:backdrop:insensitive:checked > .label, 
button.flat:backdrop:insensitive:active > .label, .sidebar-button.button:backdrop:insensitive:active > 
.label, headerbar button.titlebutton:backdrop:insensitive:active > .label,
+      .titlebar button.titlebutton:backdrop:insensitive:active > .label, 
button.flat:backdrop:insensitive:checked > .label, .sidebar-button.button:backdrop:insensitive:checked > 
.label, headerbar button.titlebutton:backdrop:insensitive:checked > .label,
       .titlebar button.titlebutton:backdrop:insensitive:checked > .label {
         color: inherit; }
-  button.flat:backdrop, .sidebar-button.button:backdrop, .header-bar button.titlebutton:backdrop,
-  .titlebar button.titlebutton:backdrop, button.flat:insensitive, .sidebar-button.button:insensitive, 
.header-bar button.titlebutton:insensitive,
-  .titlebar button.titlebutton:insensitive, button.flat:backdrop:insensitive, 
.sidebar-button.button:backdrop:insensitive, .header-bar button.titlebutton:backdrop:insensitive,
+  button.flat:backdrop, .sidebar-button.button:backdrop, headerbar button.titlebutton:backdrop,
+  .titlebar button.titlebutton:backdrop, button.flat:insensitive, .sidebar-button.button:insensitive, 
headerbar button.titlebutton:insensitive,
+  .titlebar button.titlebutton:insensitive, button.flat:backdrop:insensitive, 
.sidebar-button.button:backdrop:insensitive, headerbar button.titlebutton:backdrop:insensitive,
   .titlebar button.titlebutton:backdrop:insensitive {
     border-color: transparent;
     background-color: transparent;
@@ -416,7 +416,7 @@ button, .header-bar button.titlebutton,
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
     text-shadow: none;
     icon-shadow: none; }
-  button:insensitive, .header-bar button.titlebutton:insensitive,
+  button:insensitive, headerbar button.titlebutton:insensitive,
   .titlebar button.titlebutton:insensitive {
     color: #949796;
     border-color: #1c1f1f;
@@ -424,7 +424,7 @@ button, .header-bar button.titlebutton,
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
-    button:insensitive > .label, .header-bar button.titlebutton:insensitive > .label,
+    button:insensitive > .label, headerbar button.titlebutton:insensitive > .label,
     .titlebar button.titlebutton:insensitive > .label {
       color: inherit; }
     button:insensitive:active, button:insensitive:checked {
@@ -432,11 +432,11 @@ button, .header-bar button.titlebutton,
       border-color: #1c1f1f;
       background-image: linear-gradient(to bottom, #313434, #333636);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
-      button:insensitive:active > .label, .header-bar button.titlebutton:insensitive:active > .label,
-      .titlebar button.titlebutton:insensitive:active > .label, button:insensitive:checked > .label, 
.header-bar button.titlebutton:insensitive:checked > .label,
+      button:insensitive:active > .label, headerbar button.titlebutton:insensitive:active > .label,
+      .titlebar button.titlebutton:insensitive:active > .label, button:insensitive:checked > .label, 
headerbar button.titlebutton:insensitive:checked > .label,
       .titlebar button.titlebutton:insensitive:checked > .label {
         color: inherit; }
-  button.osd, .header-bar button.osd.titlebutton,
+  button.osd, headerbar button.osd.titlebutton,
   .titlebar button.osd.titlebutton {
     color: #eeeeec;
     border-radius: 5px;
@@ -451,7 +451,7 @@ button, .header-bar button.titlebutton,
     outline-color: rgba(238, 238, 236, 0.3);
     border: none;
     box-shadow: none; }
-    button.osd.image-button, .header-bar button.osd.titlebutton,
+    button.osd.image-button, headerbar button.osd.titlebutton,
     .titlebar button.osd.titlebutton {
       padding: 13px; }
     button.osd:hover {
@@ -494,7 +494,7 @@ button, .header-bar button.titlebutton,
       text-shadow: none;
       icon-shadow: none;
       border: none; }
-  .osd button, .osd .header-bar button.titlebutton, .header-bar .osd button.titlebutton,
+  .osd button, .osd headerbar button.titlebutton, headerbar .osd button.titlebutton,
   .osd .titlebar button.titlebutton,
   .titlebar .osd button.titlebutton {
     color: #eeeeec;
@@ -539,7 +539,7 @@ button, .header-bar button.titlebutton,
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none; }
-    .osd button.flat, .osd .sidebar-button.button, .osd .header-bar button.titlebutton, .header-bar .osd 
button.titlebutton,
+    .osd button.flat, .osd .sidebar-button.button, .osd headerbar button.titlebutton, headerbar .osd 
button.titlebutton,
     .osd .titlebar button.titlebutton,
     .titlebar .osd button.titlebutton {
       border-color: transparent;
@@ -551,7 +551,7 @@ button, .header-bar button.titlebutton,
       box-shadow: none;
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black; }
-      .osd button.flat:hover, .osd .sidebar-button.button:hover, .osd .header-bar button.titlebutton:hover, 
.header-bar .osd button.titlebutton:hover,
+      .osd button.flat:hover, .osd .sidebar-button.button:hover, .osd headerbar button.titlebutton:hover, 
headerbar .osd button.titlebutton:hover,
       .osd .titlebar button.titlebutton:hover,
       .titlebar .osd button.titlebutton:hover {
         color: white;
@@ -565,7 +565,7 @@ button, .header-bar button.titlebutton,
         background-clip: padding-box;
         border-color: transparent;
         box-shadow: none; }
-      .osd button.flat:insensitive, .osd .sidebar-button.button:insensitive, .osd .header-bar 
button.titlebutton:insensitive, .header-bar .osd button.titlebutton:insensitive,
+      .osd button.flat:insensitive, .osd .sidebar-button.button:insensitive, .osd headerbar 
button.titlebutton:insensitive, headerbar .osd button.titlebutton:insensitive,
       .osd .titlebar button.titlebutton:insensitive,
       .titlebar .osd button.titlebutton:insensitive {
         color: #878a89;
@@ -578,7 +578,7 @@ button, .header-bar button.titlebutton,
         background-image: none;
         border-color: transparent;
         box-shadow: none; }
-      .osd button.flat:backdrop, .osd .sidebar-button.button:backdrop, .osd .header-bar 
button.titlebutton:backdrop, .header-bar .osd button.titlebutton:backdrop,
+      .osd button.flat:backdrop, .osd .sidebar-button.button:backdrop, .osd headerbar 
button.titlebutton:backdrop, headerbar .osd button.titlebutton:backdrop,
       .osd .titlebar button.titlebutton:backdrop,
       .titlebar .osd button.titlebutton:backdrop {
         border-color: transparent;
@@ -587,9 +587,9 @@ button, .header-bar button.titlebutton,
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
         text-shadow: none;
         icon-shadow: none; }
-      .osd button.flat:active, .osd .sidebar-button.button:active, .osd .header-bar 
button.titlebutton:active, .header-bar .osd button.titlebutton:active,
+      .osd button.flat:active, .osd .sidebar-button.button:active, .osd headerbar button.titlebutton:active, 
headerbar .osd button.titlebutton:active,
       .osd .titlebar button.titlebutton:active,
-      .titlebar .osd button.titlebutton:active, .osd button.flat:checked, .osd 
.sidebar-button.button:checked, .osd .header-bar button.titlebutton:checked, .header-bar .osd 
button.titlebutton:checked,
+      .titlebar .osd button.titlebutton:active, .osd button.flat:checked, .osd 
.sidebar-button.button:checked, .osd headerbar button.titlebutton:checked, headerbar .osd 
button.titlebutton:checked,
       .osd .titlebar button.titlebutton:checked,
       .titlebar .osd button.titlebutton:checked {
         color: white;
@@ -603,7 +603,7 @@ button, .header-bar button.titlebutton,
         background-clip: padding-box;
         border-color: transparent;
         box-shadow: none; }
-  button.suggested-action, .header-bar button.suggested-action.titlebutton,
+  button.suggested-action, headerbar button.suggested-action.titlebutton,
   .titlebar button.suggested-action.titlebutton {
     color: white;
     outline-color: rgba(255, 255, 255, 0.3);
@@ -612,7 +612,7 @@ button, .header-bar button.titlebutton,
     text-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
-    button.suggested-action.flat, .suggested-action.sidebar-button.button, .header-bar 
button.suggested-action.titlebutton,
+    button.suggested-action.flat, .suggested-action.sidebar-button.button, headerbar 
button.suggested-action.titlebutton,
     .titlebar button.suggested-action.titlebutton {
       border-color: transparent;
       background-color: transparent;
@@ -637,7 +637,7 @@ button, .header-bar button.titlebutton,
       text-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
       box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 
238, 236, 0.1); }
-    button.suggested-action:backdrop, button.suggested-action.flat:backdrop, 
.suggested-action.sidebar-button.button:backdrop, .header-bar button.suggested-action.titlebutton:backdrop,
+    button.suggested-action:backdrop, button.suggested-action.flat:backdrop, 
.suggested-action.sidebar-button.button:backdrop, headerbar button.suggested-action.titlebutton:backdrop,
     .titlebar button.suggested-action.titlebutton:backdrop {
       color: #d3dfeb;
       border-color: #0b1e33;
@@ -645,14 +645,14 @@ button, .header-bar button.titlebutton,
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-      button.suggested-action:backdrop:active, button.suggested-action:backdrop:checked, 
button.suggested-action.flat:backdrop:active, .suggested-action.sidebar-button.button:backdrop:active, 
.header-bar button.suggested-action.titlebutton:backdrop:active,
-      .titlebar button.suggested-action.titlebutton:backdrop:active, 
button.suggested-action.flat:backdrop:checked, .suggested-action.sidebar-button.button:backdrop:checked, 
.header-bar button.suggested-action.titlebutton:backdrop:checked,
+      button.suggested-action:backdrop:active, button.suggested-action:backdrop:checked, 
button.suggested-action.flat:backdrop:active, .suggested-action.sidebar-button.button:backdrop:active, 
headerbar button.suggested-action.titlebutton:backdrop:active,
+      .titlebar button.suggested-action.titlebutton:backdrop:active, 
button.suggested-action.flat:backdrop:checked, .suggested-action.sidebar-button.button:backdrop:checked, 
headerbar button.suggested-action.titlebutton:backdrop:checked,
       .titlebar button.suggested-action.titlebutton:backdrop:checked {
         color: #d1dae3;
         border-color: #0b1e33;
         background-image: linear-gradient(to bottom, #184472);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-      button.suggested-action:backdrop:insensitive, button.suggested-action.flat:backdrop:insensitive, 
.suggested-action.sidebar-button.button:backdrop:insensitive, .header-bar 
button.suggested-action.titlebutton:backdrop:insensitive,
+      button.suggested-action:backdrop:insensitive, button.suggested-action.flat:backdrop:insensitive, 
.suggested-action.sidebar-button.button:backdrop:insensitive, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive,
       .titlebar button.suggested-action.titlebutton:backdrop:insensitive {
         color: #5d6767;
         border-color: #1f2222;
@@ -660,26 +660,26 @@ button, .header-bar button.titlebutton,
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-        button.suggested-action:backdrop:insensitive > .label, .header-bar 
button.suggested-action.titlebutton:backdrop:insensitive > .label,
-        .titlebar button.suggested-action.titlebutton:backdrop:insensitive > .label, 
button.suggested-action.flat:backdrop:insensitive > .label, 
.suggested-action.sidebar-button.button:backdrop:insensitive > .label, .header-bar 
button.suggested-action.titlebutton:backdrop:insensitive > .label,
+        button.suggested-action:backdrop:insensitive > .label, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive > .label,
+        .titlebar button.suggested-action.titlebutton:backdrop:insensitive > .label, 
button.suggested-action.flat:backdrop:insensitive > .label, 
.suggested-action.sidebar-button.button:backdrop:insensitive > .label, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive > .label,
         .titlebar button.suggested-action.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
-        button.suggested-action:backdrop:insensitive:active, 
button.suggested-action:backdrop:insensitive:checked, 
button.suggested-action.flat:backdrop:insensitive:active, 
.suggested-action.sidebar-button.button:backdrop:insensitive:active, .header-bar 
button.suggested-action.titlebutton:backdrop:insensitive:active,
-        .titlebar button.suggested-action.titlebutton:backdrop:insensitive:active, 
button.suggested-action.flat:backdrop:insensitive:checked, 
.suggested-action.sidebar-button.button:backdrop:insensitive:checked, .header-bar 
button.suggested-action.titlebutton:backdrop:insensitive:checked,
+        button.suggested-action:backdrop:insensitive:active, 
button.suggested-action:backdrop:insensitive:checked, 
button.suggested-action.flat:backdrop:insensitive:active, 
.suggested-action.sidebar-button.button:backdrop:insensitive:active, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive:active,
+        .titlebar button.suggested-action.titlebutton:backdrop:insensitive:active, 
button.suggested-action.flat:backdrop:insensitive:checked, 
.suggested-action.sidebar-button.button:backdrop:insensitive:checked, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive:checked,
         .titlebar button.suggested-action.titlebutton:backdrop:insensitive:checked {
           color: #6c88a7;
           border-color: #0b1e33;
           background-image: linear-gradient(to bottom, #1d4877);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-          button.suggested-action:backdrop:insensitive:active > .label, .header-bar 
button.suggested-action.titlebutton:backdrop:insensitive:active > .label,
-          .titlebar button.suggested-action.titlebutton:backdrop:insensitive:active > .label, 
button.suggested-action:backdrop:insensitive:checked > .label, .header-bar 
button.suggested-action.titlebutton:backdrop:insensitive:checked > .label,
-          .titlebar button.suggested-action.titlebutton:backdrop:insensitive:checked > .label, 
button.suggested-action.flat:backdrop:insensitive:active > .label, 
.suggested-action.sidebar-button.button:backdrop:insensitive:active > .label, .header-bar 
button.suggested-action.titlebutton:backdrop:insensitive:active > .label,
-          .titlebar button.suggested-action.titlebutton:backdrop:insensitive:active > .label, 
button.suggested-action.flat:backdrop:insensitive:checked > .label, 
.suggested-action.sidebar-button.button:backdrop:insensitive:checked > .label, .header-bar 
button.suggested-action.titlebutton:backdrop:insensitive:checked > .label,
+          button.suggested-action:backdrop:insensitive:active > .label, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive:active > .label,
+          .titlebar button.suggested-action.titlebutton:backdrop:insensitive:active > .label, 
button.suggested-action:backdrop:insensitive:checked > .label, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive:checked > .label,
+          .titlebar button.suggested-action.titlebutton:backdrop:insensitive:checked > .label, 
button.suggested-action.flat:backdrop:insensitive:active > .label, 
.suggested-action.sidebar-button.button:backdrop:insensitive:active > .label, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive:active > .label,
+          .titlebar button.suggested-action.titlebutton:backdrop:insensitive:active > .label, 
button.suggested-action.flat:backdrop:insensitive:checked > .label, 
.suggested-action.sidebar-button.button:backdrop:insensitive:checked > .label, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive:checked > .label,
           .titlebar button.suggested-action.titlebutton:backdrop:insensitive:checked > .label {
             color: inherit; }
-    button.suggested-action.flat:backdrop, .suggested-action.sidebar-button.button:backdrop, .header-bar 
button.suggested-action.titlebutton:backdrop,
-    .titlebar button.suggested-action.titlebutton:backdrop, button.suggested-action.flat:insensitive, 
.suggested-action.sidebar-button.button:insensitive, .header-bar 
button.suggested-action.titlebutton:insensitive,
-    .titlebar button.suggested-action.titlebutton:insensitive, 
button.suggested-action.flat:backdrop:insensitive, 
.suggested-action.sidebar-button.button:backdrop:insensitive, .header-bar 
button.suggested-action.titlebutton:backdrop:insensitive,
+    button.suggested-action.flat:backdrop, .suggested-action.sidebar-button.button:backdrop, headerbar 
button.suggested-action.titlebutton:backdrop,
+    .titlebar button.suggested-action.titlebutton:backdrop, button.suggested-action.flat:insensitive, 
.suggested-action.sidebar-button.button:insensitive, headerbar 
button.suggested-action.titlebutton:insensitive,
+    .titlebar button.suggested-action.titlebutton:insensitive, 
button.suggested-action.flat:backdrop:insensitive, 
.suggested-action.sidebar-button.button:backdrop:insensitive, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive,
     .titlebar button.suggested-action.titlebutton:backdrop:insensitive {
       border-color: transparent;
       background-color: transparent;
@@ -695,7 +695,7 @@ button, .header-bar button.titlebutton,
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
-      button.suggested-action:insensitive > .label, .header-bar 
button.suggested-action.titlebutton:insensitive > .label,
+      button.suggested-action:insensitive > .label, headerbar 
button.suggested-action.titlebutton:insensitive > .label,
       .titlebar button.suggested-action.titlebutton:insensitive > .label {
         color: inherit; }
       button.suggested-action:insensitive:active, button.suggested-action:insensitive:checked {
@@ -703,8 +703,8 @@ button, .header-bar button.titlebutton,
         border-color: #0b1e33;
         background-image: linear-gradient(to bottom, #1b4470, #1d4877);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
-        button.suggested-action:insensitive:active > .label, .header-bar 
button.suggested-action.titlebutton:insensitive:active > .label,
-        .titlebar button.suggested-action.titlebutton:insensitive:active > .label, 
button.suggested-action:insensitive:checked > .label, .header-bar 
button.suggested-action.titlebutton:insensitive:checked > .label,
+        button.suggested-action:insensitive:active > .label, headerbar 
button.suggested-action.titlebutton:insensitive:active > .label,
+        .titlebar button.suggested-action.titlebutton:insensitive:active > .label, 
button.suggested-action:insensitive:checked > .label, headerbar 
button.suggested-action.titlebutton:insensitive:checked > .label,
         .titlebar button.suggested-action.titlebutton:insensitive:checked > .label {
           color: inherit; }
     .osd button.suggested-action {
@@ -750,7 +750,7 @@ button, .header-bar button.titlebutton,
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none; }
-  button.destructive-action, .header-bar button.destructive-action.titlebutton,
+  button.destructive-action, headerbar button.destructive-action.titlebutton,
   .titlebar button.destructive-action.titlebutton {
     color: white;
     outline-color: rgba(255, 255, 255, 0.3);
@@ -759,7 +759,7 @@ button, .header-bar button.titlebutton,
     text-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.3), 0 1px rgba(238, 238, 236, 0.1); }
-    button.destructive-action.flat, .destructive-action.sidebar-button.button, .header-bar 
button.destructive-action.titlebutton,
+    button.destructive-action.flat, .destructive-action.sidebar-button.button, headerbar 
button.destructive-action.titlebutton,
     .titlebar button.destructive-action.titlebutton {
       border-color: transparent;
       background-color: transparent;
@@ -784,7 +784,7 @@ button, .header-bar button.titlebutton,
       text-shadow: 0 -1px rgba(0, 0, 0, 0.72078);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.72078);
       box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 
238, 236, 0.1); }
-    button.destructive-action:backdrop, button.destructive-action.flat:backdrop, 
.destructive-action.sidebar-button.button:backdrop, .header-bar 
button.destructive-action.titlebutton:backdrop,
+    button.destructive-action:backdrop, button.destructive-action.flat:backdrop, 
.destructive-action.sidebar-button.button:backdrop, headerbar button.destructive-action.titlebutton:backdrop,
     .titlebar button.destructive-action.titlebutton:backdrop {
       color: #f7cfcf;
       border-color: #5e0707;
@@ -792,14 +792,14 @@ button, .header-bar button.titlebutton,
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-      button.destructive-action:backdrop:active, button.destructive-action:backdrop:checked, 
button.destructive-action.flat:backdrop:active, .destructive-action.sidebar-button.button:backdrop:active, 
.header-bar button.destructive-action.titlebutton:backdrop:active,
-      .titlebar button.destructive-action.titlebutton:backdrop:active, 
button.destructive-action.flat:backdrop:checked, .destructive-action.sidebar-button.button:backdrop:checked, 
.header-bar button.destructive-action.titlebutton:backdrop:checked,
+      button.destructive-action:backdrop:active, button.destructive-action:backdrop:checked, 
button.destructive-action.flat:backdrop:active, .destructive-action.sidebar-button.button:backdrop:active, 
headerbar button.destructive-action.titlebutton:backdrop:active,
+      .titlebar button.destructive-action.titlebutton:backdrop:active, 
button.destructive-action.flat:backdrop:checked, .destructive-action.sidebar-button.button:backdrop:checked, 
headerbar button.destructive-action.titlebutton:backdrop:checked,
       .titlebar button.destructive-action.titlebutton:backdrop:checked {
         color: #edcece;
         border-color: #5e0707;
         background-image: linear-gradient(to bottom, #a60c0c);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-      button.destructive-action:backdrop:insensitive, button.destructive-action.flat:backdrop:insensitive, 
.destructive-action.sidebar-button.button:backdrop:insensitive, .header-bar 
button.destructive-action.titlebutton:backdrop:insensitive,
+      button.destructive-action:backdrop:insensitive, button.destructive-action.flat:backdrop:insensitive, 
.destructive-action.sidebar-button.button:backdrop:insensitive, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive,
       .titlebar button.destructive-action.titlebutton:backdrop:insensitive {
         color: #5d6767;
         border-color: #1f2222;
@@ -807,26 +807,26 @@ button, .header-bar button.titlebutton,
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-        button.destructive-action:backdrop:insensitive > .label, .header-bar 
button.destructive-action.titlebutton:backdrop:insensitive > .label,
-        .titlebar button.destructive-action.titlebutton:backdrop:insensitive > .label, 
button.destructive-action.flat:backdrop:insensitive > .label, 
.destructive-action.sidebar-button.button:backdrop:insensitive > .label, .header-bar 
button.destructive-action.titlebutton:backdrop:insensitive > .label,
+        button.destructive-action:backdrop:insensitive > .label, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive > .label,
+        .titlebar button.destructive-action.titlebutton:backdrop:insensitive > .label, 
button.destructive-action.flat:backdrop:insensitive > .label, 
.destructive-action.sidebar-button.button:backdrop:insensitive > .label, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive > .label,
         .titlebar button.destructive-action.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
-        button.destructive-action:backdrop:insensitive:active, 
button.destructive-action:backdrop:insensitive:checked, 
button.destructive-action.flat:backdrop:insensitive:active, 
.destructive-action.sidebar-button.button:backdrop:insensitive:active, .header-bar 
button.destructive-action.titlebutton:backdrop:insensitive:active,
-        .titlebar button.destructive-action.titlebutton:backdrop:insensitive:active, 
button.destructive-action.flat:backdrop:insensitive:checked, 
.destructive-action.sidebar-button.button:backdrop:insensitive:checked, .header-bar 
button.destructive-action.titlebutton:backdrop:insensitive:checked,
+        button.destructive-action:backdrop:insensitive:active, 
button.destructive-action:backdrop:insensitive:checked, 
button.destructive-action.flat:backdrop:insensitive:active, 
.destructive-action.sidebar-button.button:backdrop:insensitive:active, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive:active,
+        .titlebar button.destructive-action.titlebutton:backdrop:insensitive:active, 
button.destructive-action.flat:backdrop:insensitive:checked, 
.destructive-action.sidebar-button.button:backdrop:insensitive:checked, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive:checked,
         .titlebar button.destructive-action.titlebutton:backdrop:insensitive:checked {
           color: #c46565;
           border-color: #5e0707;
           background-image: linear-gradient(to bottom, #a41212);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-          button.destructive-action:backdrop:insensitive:active > .label, .header-bar 
button.destructive-action.titlebutton:backdrop:insensitive:active > .label,
-          .titlebar button.destructive-action.titlebutton:backdrop:insensitive:active > .label, 
button.destructive-action:backdrop:insensitive:checked > .label, .header-bar 
button.destructive-action.titlebutton:backdrop:insensitive:checked > .label,
-          .titlebar button.destructive-action.titlebutton:backdrop:insensitive:checked > .label, 
button.destructive-action.flat:backdrop:insensitive:active > .label, 
.destructive-action.sidebar-button.button:backdrop:insensitive:active > .label, .header-bar 
button.destructive-action.titlebutton:backdrop:insensitive:active > .label,
-          .titlebar button.destructive-action.titlebutton:backdrop:insensitive:active > .label, 
button.destructive-action.flat:backdrop:insensitive:checked > .label, 
.destructive-action.sidebar-button.button:backdrop:insensitive:checked > .label, .header-bar 
button.destructive-action.titlebutton:backdrop:insensitive:checked > .label,
+          button.destructive-action:backdrop:insensitive:active > .label, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive:active > .label,
+          .titlebar button.destructive-action.titlebutton:backdrop:insensitive:active > .label, 
button.destructive-action:backdrop:insensitive:checked > .label, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive:checked > .label,
+          .titlebar button.destructive-action.titlebutton:backdrop:insensitive:checked > .label, 
button.destructive-action.flat:backdrop:insensitive:active > .label, 
.destructive-action.sidebar-button.button:backdrop:insensitive:active > .label, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive:active > .label,
+          .titlebar button.destructive-action.titlebutton:backdrop:insensitive:active > .label, 
button.destructive-action.flat:backdrop:insensitive:checked > .label, 
.destructive-action.sidebar-button.button:backdrop:insensitive:checked > .label, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive:checked > .label,
           .titlebar button.destructive-action.titlebutton:backdrop:insensitive:checked > .label {
             color: inherit; }
-    button.destructive-action.flat:backdrop, .destructive-action.sidebar-button.button:backdrop, .header-bar 
button.destructive-action.titlebutton:backdrop,
-    .titlebar button.destructive-action.titlebutton:backdrop, button.destructive-action.flat:insensitive, 
.destructive-action.sidebar-button.button:insensitive, .header-bar 
button.destructive-action.titlebutton:insensitive,
-    .titlebar button.destructive-action.titlebutton:insensitive, 
button.destructive-action.flat:backdrop:insensitive, 
.destructive-action.sidebar-button.button:backdrop:insensitive, .header-bar 
button.destructive-action.titlebutton:backdrop:insensitive,
+    button.destructive-action.flat:backdrop, .destructive-action.sidebar-button.button:backdrop, headerbar 
button.destructive-action.titlebutton:backdrop,
+    .titlebar button.destructive-action.titlebutton:backdrop, button.destructive-action.flat:insensitive, 
.destructive-action.sidebar-button.button:insensitive, headerbar 
button.destructive-action.titlebutton:insensitive,
+    .titlebar button.destructive-action.titlebutton:insensitive, 
button.destructive-action.flat:backdrop:insensitive, 
.destructive-action.sidebar-button.button:backdrop:insensitive, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive,
     .titlebar button.destructive-action.titlebutton:backdrop:insensitive {
       border-color: transparent;
       background-color: transparent;
@@ -842,7 +842,7 @@ button, .header-bar button.titlebutton,
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
-      button.destructive-action:insensitive > .label, .header-bar 
button.destructive-action.titlebutton:insensitive > .label,
+      button.destructive-action:insensitive > .label, headerbar 
button.destructive-action.titlebutton:insensitive > .label,
       .titlebar button.destructive-action.titlebutton:insensitive > .label {
         color: inherit; }
       button.destructive-action:insensitive:active, button.destructive-action:insensitive:checked {
@@ -850,8 +850,8 @@ button, .header-bar button.titlebutton,
         border-color: #5e0707;
         background-image: linear-gradient(to bottom, #9d1111, #a41212);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
-        button.destructive-action:insensitive:active > .label, .header-bar 
button.destructive-action.titlebutton:insensitive:active > .label,
-        .titlebar button.destructive-action.titlebutton:insensitive:active > .label, 
button.destructive-action:insensitive:checked > .label, .header-bar 
button.destructive-action.titlebutton:insensitive:checked > .label,
+        button.destructive-action:insensitive:active > .label, headerbar 
button.destructive-action.titlebutton:insensitive:active > .label,
+        .titlebar button.destructive-action.titlebutton:insensitive:active > .label, 
button.destructive-action:insensitive:checked > .label, headerbar 
button.destructive-action.titlebutton:insensitive:checked > .label,
         .titlebar button.destructive-action.titlebutton:insensitive:checked > .label {
           color: inherit; }
     .osd button.destructive-action {
@@ -897,58 +897,58 @@ button, .header-bar button.titlebutton,
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none; }
-  button.image-button, .header-bar button.titlebutton,
+  button.image-button, headerbar button.titlebutton,
   .titlebar button.titlebutton {
     padding: 8px; }
   button.text-button, GtkScaleButton.button.text-button,
-  GtkVolumeButton.button.text-button, .header-bar button.text-button.titlebutton,
+  GtkVolumeButton.button.text-button, headerbar button.text-button.titlebutton,
   .titlebar button.text-button.titlebutton {
     padding-left: 16px;
     padding-right: 16px; }
   button.text-button.image-button, GtkScaleButton.button.text-button,
-  GtkVolumeButton.button.text-button, .header-bar button.text-button.titlebutton,
+  GtkVolumeButton.button.text-button, headerbar button.text-button.titlebutton,
   .titlebar button.text-button.titlebutton {
     padding: 5px 8px 6px; }
     button.text-button.image-button label:first-child, GtkScaleButton.button.text-button label:first-child,
-    GtkVolumeButton.button.text-button label:first-child, .header-bar button.text-button.titlebutton 
label:first-child,
+    GtkVolumeButton.button.text-button label:first-child, headerbar button.text-button.titlebutton 
label:first-child,
     .titlebar button.text-button.titlebutton label:first-child {
       padding-left: 8px; }
     button.text-button.image-button label:last-child, GtkScaleButton.button.text-button label:last-child,
-    GtkVolumeButton.button.text-button label:last-child, .header-bar button.text-button.titlebutton 
label:last-child,
+    GtkVolumeButton.button.text-button label:last-child, headerbar button.text-button.titlebutton 
label:last-child,
     .titlebar button.text-button.titlebutton label:last-child {
       padding-right: 8px; }
-  .stack-switcher > button, .header-bar .stack-switcher > button.titlebutton,
+  .stack-switcher > button, headerbar .stack-switcher > button.titlebutton,
   .titlebar .stack-switcher > button.titlebutton {
     outline-offset: -3px; }
-    .stack-switcher > button > label, .header-bar .stack-switcher > button.titlebutton > label,
+    .stack-switcher > button > label,
     .titlebar .stack-switcher > button.titlebutton > label {
       padding-left: 6px;
       padding-right: 6px; }
-    .stack-switcher > button > image, .header-bar .stack-switcher > button.titlebutton > image,
+    .stack-switcher > button > image,
     .titlebar .stack-switcher > button.titlebutton > image {
       padding-left: 6px;
       padding-right: 6px;
       padding-top: 3px;
       padding-bottom: 3px; }
     .stack-switcher > button.text-button, .stack-switcher > GtkScaleButton.button.text-button,
-    .stack-switcher > GtkVolumeButton.button.text-button, .header-bar .stack-switcher > 
button.text-button.titlebutton, .header-bar .stack-switcher > GtkScaleButton.titlebutton.button.text-button,
-    .header-bar .stack-switcher > GtkVolumeButton.titlebutton.button.text-button,
+    .stack-switcher > GtkVolumeButton.button.text-button, headerbar .stack-switcher > 
button.text-button.titlebutton, headerbar .stack-switcher > GtkScaleButton.titlebutton.button.text-button,
+    headerbar .stack-switcher > GtkVolumeButton.titlebutton.button.text-button,
     .titlebar .stack-switcher > button.text-button.titlebutton,
     .titlebar .stack-switcher > GtkScaleButton.titlebutton.button.text-button,
     .titlebar .stack-switcher > GtkVolumeButton.titlebutton.button.text-button {
       padding: 5px 10px 6px; }
-    .stack-switcher > button.image-button, .header-bar .stack-switcher > button.titlebutton,
+    .stack-switcher > button.image-button, headerbar .stack-switcher > button.titlebutton,
     .titlebar .stack-switcher > button.titlebutton {
       padding: 5px 2px; }
     .stack-switcher > button.needs-attention:active > label, .stack-switcher > button.needs-attention:active 
image, .stack-switcher > button.needs-attention:checked > label, .stack-switcher > 
button.needs-attention:checked > image {
       animation: none;
       background-image: none; }
-  .inline-toolbar button, .inline-toolbar .header-bar button.titlebutton, .header-bar .inline-toolbar 
button.titlebutton,
+  .inline-toolbar button, .inline-toolbar headerbar button.titlebutton, headerbar .inline-toolbar 
button.titlebutton,
   .inline-toolbar .titlebar button.titlebutton,
   .titlebar .inline-toolbar button.titlebutton, .inline-toolbar button:backdrop {
     border-radius: 2px;
     border-width: 1px; }
-  .primary-toolbar button, .primary-toolbar .header-bar button.titlebutton, .header-bar .primary-toolbar 
button.titlebutton,
+  .primary-toolbar button, .primary-toolbar headerbar button.titlebutton, headerbar .primary-toolbar 
button.titlebutton,
   .primary-toolbar .titlebar button.titlebutton,
   .titlebar .primary-toolbar button.titlebutton {
     icon-shadow: none; }
@@ -964,7 +964,7 @@ button, .header-bar button.titlebutton,
   .stack-switcher > button.needs-attention > label:dir(rtl), .stack-switcher > button.needs-attention > 
image:dir(rtl), .sidebar-item.needs-attention > label:dir(rtl) {
     background-position: left 3px, left 2px; }
 
-.inline-toolbar GtkToolButton > button, .inline-toolbar .header-bar GtkToolButton > button.titlebutton, 
.header-bar .inline-toolbar GtkToolButton > button.titlebutton,
+.inline-toolbar GtkToolButton > button, .inline-toolbar headerbar GtkToolButton > button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton > button.titlebutton,
 .titlebar .inline-toolbar GtkToolButton > button.titlebutton {
   color: #eeeeec;
@@ -974,7 +974,7 @@ button, .header-bar button.titlebutton,
   text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
   icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
-  .inline-toolbar GtkToolButton > button:hover, .inline-toolbar .header-bar GtkToolButton > 
button.titlebutton:hover,
+  .inline-toolbar GtkToolButton > button:hover, .inline-toolbar headerbar GtkToolButton > 
button.titlebutton:hover,
   .inline-toolbar .titlebar GtkToolButton > button.titlebutton:hover {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
@@ -983,8 +983,8 @@ button, .header-bar button.titlebutton,
     text-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
-  .inline-toolbar GtkToolButton > button:active, .inline-toolbar .header-bar GtkToolButton > 
button.titlebutton:active,
-  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:active, .inline-toolbar GtkToolButton > 
button:checked, .inline-toolbar .header-bar GtkToolButton > button.titlebutton:checked,
+  .inline-toolbar GtkToolButton > button:active, .inline-toolbar headerbar GtkToolButton > 
button.titlebutton:active,
+  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:active, .inline-toolbar GtkToolButton > 
button:checked, .inline-toolbar headerbar GtkToolButton > button.titlebutton:checked,
   .inline-toolbar .titlebar GtkToolButton > button.titlebutton:checked {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
@@ -993,7 +993,7 @@ button, .header-bar button.titlebutton,
     text-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
     box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 
238, 236, 0.1); }
-  .inline-toolbar GtkToolButton > button:insensitive, .inline-toolbar .header-bar GtkToolButton > 
button.titlebutton:insensitive,
+  .inline-toolbar GtkToolButton > button:insensitive, .inline-toolbar headerbar GtkToolButton > 
button.titlebutton:insensitive,
   .inline-toolbar .titlebar GtkToolButton > button.titlebutton:insensitive {
     color: #949796;
     border-color: #1c1f1f;
@@ -1003,8 +1003,8 @@ button, .header-bar button.titlebutton,
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
     .inline-toolbar GtkToolButton > button:insensitive > .label {
       color: inherit; }
-  .inline-toolbar GtkToolButton > button:insensitive:active, .inline-toolbar .header-bar GtkToolButton > 
button.titlebutton:insensitive:active,
-  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:insensitive:active, .inline-toolbar 
GtkToolButton > button:insensitive:checked, .inline-toolbar .header-bar GtkToolButton > 
button.titlebutton:insensitive:checked,
+  .inline-toolbar GtkToolButton > button:insensitive:active, .inline-toolbar headerbar GtkToolButton > 
button.titlebutton:insensitive:active,
+  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:insensitive:active, .inline-toolbar 
GtkToolButton > button:insensitive:checked, .inline-toolbar headerbar GtkToolButton > 
button.titlebutton:insensitive:checked,
   .inline-toolbar .titlebar GtkToolButton > button.titlebutton:insensitive:checked {
     color: #949796;
     border-color: #1c1f1f;
@@ -1012,7 +1012,7 @@ button, .header-bar button.titlebutton,
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
     .inline-toolbar GtkToolButton > button:insensitive:active > .label, .inline-toolbar GtkToolButton > 
button:insensitive:checked > .label {
       color: inherit; }
-  .inline-toolbar GtkToolButton > button:backdrop, .inline-toolbar .header-bar GtkToolButton > 
button.titlebutton:backdrop,
+  .inline-toolbar GtkToolButton > button:backdrop, .inline-toolbar headerbar GtkToolButton > 
button.titlebutton:backdrop,
   .inline-toolbar .titlebar GtkToolButton > button.titlebutton:backdrop {
     color: #949796;
     border-color: #1f2222;
@@ -1020,14 +1020,14 @@ button, .header-bar button.titlebutton,
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-  .inline-toolbar GtkToolButton > button:backdrop:active, .inline-toolbar .header-bar GtkToolButton > 
button.titlebutton:backdrop:active,
-  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:backdrop:active, .inline-toolbar 
GtkToolButton > button:backdrop:checked, .inline-toolbar .header-bar GtkToolButton > 
button.titlebutton:backdrop:checked,
+  .inline-toolbar GtkToolButton > button:backdrop:active, .inline-toolbar headerbar GtkToolButton > 
button.titlebutton:backdrop:active,
+  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:backdrop:active, .inline-toolbar 
GtkToolButton > button:backdrop:checked, .inline-toolbar headerbar GtkToolButton > 
button.titlebutton:backdrop:checked,
   .inline-toolbar .titlebar GtkToolButton > button.titlebutton:backdrop:checked {
     color: #949796;
     border-color: #1f2222;
     background-image: linear-gradient(to bottom, #303535);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-  .inline-toolbar GtkToolButton > button:backdrop:insensitive, .inline-toolbar .header-bar GtkToolButton > 
button.titlebutton:backdrop:insensitive,
+  .inline-toolbar GtkToolButton > button:backdrop:insensitive, .inline-toolbar headerbar GtkToolButton > 
button.titlebutton:backdrop:insensitive,
   .inline-toolbar .titlebar GtkToolButton > button.titlebutton:backdrop:insensitive {
     color: #5d6767;
     border-color: #1f2222;
@@ -1037,8 +1037,8 @@ button, .header-bar button.titlebutton,
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
     .inline-toolbar GtkToolButton > button:backdrop:insensitive > .label {
       color: inherit; }
-  .inline-toolbar GtkToolButton > button:backdrop:insensitive:active, .inline-toolbar .header-bar 
GtkToolButton > button.titlebutton:backdrop:insensitive:active,
-  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:backdrop:insensitive:active, .inline-toolbar 
GtkToolButton > button:backdrop:insensitive:checked, .inline-toolbar .header-bar GtkToolButton > 
button.titlebutton:backdrop:insensitive:checked,
+  .inline-toolbar GtkToolButton > button:backdrop:insensitive:active, .inline-toolbar headerbar 
GtkToolButton > button.titlebutton:backdrop:insensitive:active,
+  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:backdrop:insensitive:active, .inline-toolbar 
GtkToolButton > button:backdrop:insensitive:checked, .inline-toolbar headerbar GtkToolButton > 
button.titlebutton:backdrop:insensitive:checked,
   .inline-toolbar .titlebar GtkToolButton > button.titlebutton:backdrop:insensitive:checked {
     color: #5d6767;
     border-color: #1f2222;
@@ -1047,7 +1047,8 @@ button, .header-bar button.titlebutton,
     .inline-toolbar GtkToolButton > button:backdrop:insensitive:active > .label, .inline-toolbar 
GtkToolButton > button:backdrop:insensitive:checked > .label {
       color: inherit; }
 
-.inline-toolbar.toolbar GtkToolButton > button.flat, .inline-toolbar GtkToolButton > button.flat, 
.inline-toolbar.search-bar GtkToolButton > button.flat, .inline-toolbar.location-bar GtkToolButton > 
button.flat, .inline-toolbar.toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar GtkToolButton > 
.sidebar-button.button, .inline-toolbar.search-bar GtkToolButton > .sidebar-button.button, 
.inline-toolbar.location-bar GtkToolButton > .sidebar-button.button, .inline-toolbar .header-bar 
GtkToolButton > button.titlebutton, .header-bar .inline-toolbar GtkToolButton > button.titlebutton,
+.inline-toolbar.toolbar GtkToolButton > button.flat, .inline-toolbar GtkToolButton > button.flat, 
.inline-toolbar.search-bar GtkToolButton > button.flat, .inline-toolbar.location-bar GtkToolButton > 
button.flat, .inline-toolbar.toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar GtkToolButton > 
.sidebar-button.button, .inline-toolbar.search-bar GtkToolButton > .sidebar-button.button, 
.inline-toolbar.location-bar GtkToolButton > .sidebar-button.button, .inline-toolbar.toolbar headerbar 
GtkToolButton > button.titlebutton, headerbar .inline-toolbar.toolbar GtkToolButton > button.titlebutton, 
.inline-toolbar headerbar GtkToolButton > button.titlebutton, headerbar .inline-toolbar GtkToolButton > 
button.titlebutton, .inline-toolbar.search-bar headerbar GtkToolButton > button.titlebutton, headerbar 
.inline-toolbar.search-bar GtkToolButton > button.titlebutton, .inline-toolbar.location-bar headerbar 
GtkToolButton > button.titlebutton, headerbar .inline-toolbar.location-b
 ar GtkToolButton > button.titlebutton,
+.inline-toolbar .titlebar headerbar GtkToolButton > button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton > button.titlebutton,
 .titlebar .inline-toolbar GtkToolButton > button.titlebutton,
 .inline-toolbar.toolbar GtkToolButton:backdrop > button.flat,
@@ -1058,20 +1059,28 @@ button, .header-bar button.titlebutton,
 .inline-toolbar GtkToolButton:backdrop > .sidebar-button.button,
 .inline-toolbar.search-bar GtkToolButton:backdrop > .sidebar-button.button,
 .inline-toolbar.location-bar GtkToolButton:backdrop > .sidebar-button.button,
-.inline-toolbar .header-bar GtkToolButton:backdrop > button.titlebutton,
-.header-bar .inline-toolbar GtkToolButton:backdrop > button.titlebutton,
+.inline-toolbar.toolbar headerbar GtkToolButton:backdrop > button.titlebutton,
+headerbar .inline-toolbar.toolbar GtkToolButton:backdrop > button.titlebutton,
+.inline-toolbar headerbar GtkToolButton:backdrop > button.titlebutton,
+headerbar .inline-toolbar GtkToolButton:backdrop > button.titlebutton,
+.inline-toolbar.search-bar headerbar GtkToolButton:backdrop > button.titlebutton,
+headerbar .inline-toolbar.search-bar GtkToolButton:backdrop > button.titlebutton,
+.inline-toolbar.location-bar headerbar GtkToolButton:backdrop > button.titlebutton,
+headerbar .inline-toolbar.location-bar GtkToolButton:backdrop > button.titlebutton,
+.inline-toolbar .titlebar headerbar GtkToolButton:backdrop > button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:backdrop > button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:backdrop > button.titlebutton, .linked:not(.vertical) > entry, 
.linked:not(.vertical) > spinbutton, .inline-toolbar button, .inline-toolbar .header-bar button.titlebutton, 
.header-bar .inline-toolbar button.titlebutton,
+.titlebar .inline-toolbar GtkToolButton:backdrop > button.titlebutton, .linked:not(.vertical) > entry, 
.linked:not(.vertical) > spinbutton, .inline-toolbar button, .inline-toolbar headerbar button.titlebutton, 
headerbar .inline-toolbar button.titlebutton,
 .inline-toolbar .titlebar button.titlebutton,
-.titlebar .inline-toolbar button.titlebutton, .inline-toolbar button:backdrop, .linked > button, .header-bar 
.linked > button.titlebutton,
+.titlebar .inline-toolbar button.titlebutton, .inline-toolbar button:backdrop, .linked > button, headerbar 
.linked > button.titlebutton,
 .titlebar .linked > button.titlebutton, .linked > button:hover, .linked > button:active, .linked > 
button:checked, .linked > button:backdrop, .linked > GtkComboBox > .the-button-in-the-combobox:dir(ltr), 
.linked > GtkComboBox > .the-button-in-the-combobox:dir(rtl),
 .linked > GtkComboBoxText > .the-button-in-the-combobox:dir(ltr),
 .linked > GtkComboBoxText > .the-button-in-the-combobox:dir(rtl) {
   border-radius: 0;
   border-right-style: none; }
 
-.linked:not(.vertical) > entry:first-child, .linked:not(.vertical) > spinbutton:first-child, .inline-toolbar 
button:first-child, .linked > button:first-child, .header-bar .linked > button.titlebutton:first-child,
-.titlebar .linked > button.titlebutton:first-child, .inline-toolbar.toolbar GtkToolButton:first-child > 
button.flat, .inline-toolbar GtkToolButton:first-child > button.flat, .inline-toolbar.search-bar 
GtkToolButton:first-child > button.flat, .inline-toolbar.location-bar GtkToolButton:first-child > 
button.flat, .inline-toolbar.toolbar GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar 
GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:first-child > 
.sidebar-button.button, .inline-toolbar.location-bar GtkToolButton:first-child > .sidebar-button.button, 
.inline-toolbar .header-bar GtkToolButton:first-child > button.titlebutton, .header-bar .inline-toolbar 
GtkToolButton:first-child > button.titlebutton,
+.linked:not(.vertical) > entry:first-child, .linked:not(.vertical) > spinbutton:first-child, .inline-toolbar 
button:first-child, .linked > button:first-child, headerbar .linked > button.titlebutton:first-child,
+.titlebar .linked > button.titlebutton:first-child, .inline-toolbar.toolbar GtkToolButton:first-child > 
button.flat, .inline-toolbar GtkToolButton:first-child > button.flat, .inline-toolbar.search-bar 
GtkToolButton:first-child > button.flat, .inline-toolbar.location-bar GtkToolButton:first-child > 
button.flat, .inline-toolbar.toolbar GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar 
GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:first-child > 
.sidebar-button.button, .inline-toolbar.location-bar GtkToolButton:first-child > .sidebar-button.button, 
.inline-toolbar.toolbar headerbar GtkToolButton:first-child > button.titlebutton, headerbar 
.inline-toolbar.toolbar GtkToolButton:first-child > button.titlebutton, .inline-toolbar headerbar 
GtkToolButton:first-child > button.titlebutton, headerbar .inline-toolbar GtkToolButton:first-child > 
button.titlebutton, .inline-toolbar.search-bar headerbar GtkToolButton:first-chil
 d > button.titlebutton, headerbar .inline-toolbar.search-bar GtkToolButton:first-child > button.titlebutton, 
.inline-toolbar.location-bar headerbar GtkToolButton:first-child > button.titlebutton, headerbar 
.inline-toolbar.location-bar GtkToolButton:first-child > button.titlebutton,
+.inline-toolbar .titlebar headerbar GtkToolButton:first-child > button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:first-child > button.titlebutton,
 .titlebar .inline-toolbar GtkToolButton:first-child > button.titlebutton,
 .inline-toolbar.toolbar GtkToolButton:backdrop:first-child > button.flat,
@@ -1082,15 +1091,23 @@ button, .header-bar button.titlebutton,
 .inline-toolbar GtkToolButton:backdrop:first-child > .sidebar-button.button,
 .inline-toolbar.search-bar GtkToolButton:backdrop:first-child > .sidebar-button.button,
 .inline-toolbar.location-bar GtkToolButton:backdrop:first-child > .sidebar-button.button,
-.inline-toolbar .header-bar GtkToolButton:backdrop:first-child > button.titlebutton,
-.header-bar .inline-toolbar GtkToolButton:backdrop:first-child > button.titlebutton,
+.inline-toolbar.toolbar headerbar GtkToolButton:backdrop:first-child > button.titlebutton,
+headerbar .inline-toolbar.toolbar GtkToolButton:backdrop:first-child > button.titlebutton,
+.inline-toolbar headerbar GtkToolButton:backdrop:first-child > button.titlebutton,
+headerbar .inline-toolbar GtkToolButton:backdrop:first-child > button.titlebutton,
+.inline-toolbar.search-bar headerbar GtkToolButton:backdrop:first-child > button.titlebutton,
+headerbar .inline-toolbar.search-bar GtkToolButton:backdrop:first-child > button.titlebutton,
+.inline-toolbar.location-bar headerbar GtkToolButton:backdrop:first-child > button.titlebutton,
+headerbar .inline-toolbar.location-bar GtkToolButton:backdrop:first-child > button.titlebutton,
+.inline-toolbar .titlebar headerbar GtkToolButton:backdrop:first-child > button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:backdrop:first-child > button.titlebutton,
 .titlebar .inline-toolbar GtkToolButton:backdrop:first-child > button.titlebutton, .linked > 
GtkComboBox:first-child > .the-button-in-the-combobox,
 .linked > GtkComboBoxText:first-child > .the-button-in-the-combobox {
   border-top-left-radius: 3px;
   border-bottom-left-radius: 3px; }
-.linked:not(.vertical) > entry:last-child, .linked:not(.vertical) > spinbutton:last-child, .inline-toolbar 
button:last-child, .linked > button:last-child, .header-bar .linked > button.titlebutton:last-child,
-.titlebar .linked > button.titlebutton:last-child, .inline-toolbar.toolbar GtkToolButton:last-child > 
button.flat, .inline-toolbar GtkToolButton:last-child > button.flat, .inline-toolbar.search-bar 
GtkToolButton:last-child > button.flat, .inline-toolbar.location-bar GtkToolButton:last-child > button.flat, 
.inline-toolbar.toolbar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar 
GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:last-child > 
.sidebar-button.button, .inline-toolbar.location-bar GtkToolButton:last-child > .sidebar-button.button, 
.inline-toolbar .header-bar GtkToolButton:last-child > button.titlebutton, .header-bar .inline-toolbar 
GtkToolButton:last-child > button.titlebutton,
+.linked:not(.vertical) > entry:last-child, .linked:not(.vertical) > spinbutton:last-child, .inline-toolbar 
button:last-child, .linked > button:last-child, headerbar .linked > button.titlebutton:last-child,
+.titlebar .linked > button.titlebutton:last-child, .inline-toolbar.toolbar GtkToolButton:last-child > 
button.flat, .inline-toolbar GtkToolButton:last-child > button.flat, .inline-toolbar.search-bar 
GtkToolButton:last-child > button.flat, .inline-toolbar.location-bar GtkToolButton:last-child > button.flat, 
.inline-toolbar.toolbar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar 
GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:last-child > 
.sidebar-button.button, .inline-toolbar.location-bar GtkToolButton:last-child > .sidebar-button.button, 
.inline-toolbar.toolbar headerbar GtkToolButton:last-child > button.titlebutton, headerbar 
.inline-toolbar.toolbar GtkToolButton:last-child > button.titlebutton, .inline-toolbar headerbar 
GtkToolButton:last-child > button.titlebutton, headerbar .inline-toolbar GtkToolButton:last-child > 
button.titlebutton, .inline-toolbar.search-bar headerbar GtkToolButton:last-child > button.tit
 lebutton, headerbar .inline-toolbar.search-bar GtkToolButton:last-child > button.titlebutton, 
.inline-toolbar.location-bar headerbar GtkToolButton:last-child > button.titlebutton, headerbar 
.inline-toolbar.location-bar GtkToolButton:last-child > button.titlebutton,
+.inline-toolbar .titlebar headerbar GtkToolButton:last-child > button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:last-child > button.titlebutton,
 .titlebar .inline-toolbar GtkToolButton:last-child > button.titlebutton,
 .inline-toolbar.toolbar GtkToolButton:backdrop:last-child > button.flat,
@@ -1101,16 +1118,24 @@ button, .header-bar button.titlebutton,
 .inline-toolbar GtkToolButton:backdrop:last-child > .sidebar-button.button,
 .inline-toolbar.search-bar GtkToolButton:backdrop:last-child > .sidebar-button.button,
 .inline-toolbar.location-bar GtkToolButton:backdrop:last-child > .sidebar-button.button,
-.inline-toolbar .header-bar GtkToolButton:backdrop:last-child > button.titlebutton,
-.header-bar .inline-toolbar GtkToolButton:backdrop:last-child > button.titlebutton,
+.inline-toolbar.toolbar headerbar GtkToolButton:backdrop:last-child > button.titlebutton,
+headerbar .inline-toolbar.toolbar GtkToolButton:backdrop:last-child > button.titlebutton,
+.inline-toolbar headerbar GtkToolButton:backdrop:last-child > button.titlebutton,
+headerbar .inline-toolbar GtkToolButton:backdrop:last-child > button.titlebutton,
+.inline-toolbar.search-bar headerbar GtkToolButton:backdrop:last-child > button.titlebutton,
+headerbar .inline-toolbar.search-bar GtkToolButton:backdrop:last-child > button.titlebutton,
+.inline-toolbar.location-bar headerbar GtkToolButton:backdrop:last-child > button.titlebutton,
+headerbar .inline-toolbar.location-bar GtkToolButton:backdrop:last-child > button.titlebutton,
+.inline-toolbar .titlebar headerbar GtkToolButton:backdrop:last-child > button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:backdrop:last-child > button.titlebutton,
 .titlebar .inline-toolbar GtkToolButton:backdrop:last-child > button.titlebutton, .linked > 
GtkComboBox:last-child > .the-button-in-the-combobox,
 .linked > GtkComboBoxText:last-child > .the-button-in-the-combobox {
   border-top-right-radius: 3px;
   border-bottom-right-radius: 3px;
   border-right-style: solid; }
-.linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > spinbutton:only-child, .inline-toolbar 
button:only-child, .linked > button:only-child, .header-bar .linked > button.titlebutton:only-child,
-.titlebar .linked > button.titlebutton:only-child, .inline-toolbar.toolbar GtkToolButton:only-child > 
button.flat, .inline-toolbar GtkToolButton:only-child > button.flat, .inline-toolbar.search-bar 
GtkToolButton:only-child > button.flat, .inline-toolbar.location-bar GtkToolButton:only-child > button.flat, 
.inline-toolbar.toolbar GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar 
GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:only-child > 
.sidebar-button.button, .inline-toolbar.location-bar GtkToolButton:only-child > .sidebar-button.button, 
.inline-toolbar .header-bar GtkToolButton:only-child > button.titlebutton, .header-bar .inline-toolbar 
GtkToolButton:only-child > button.titlebutton,
+.linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > spinbutton:only-child, .inline-toolbar 
button:only-child, .linked > button:only-child, headerbar .linked > button.titlebutton:only-child,
+.titlebar .linked > button.titlebutton:only-child, .inline-toolbar.toolbar GtkToolButton:only-child > 
button.flat, .inline-toolbar GtkToolButton:only-child > button.flat, .inline-toolbar.search-bar 
GtkToolButton:only-child > button.flat, .inline-toolbar.location-bar GtkToolButton:only-child > button.flat, 
.inline-toolbar.toolbar GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar 
GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:only-child > 
.sidebar-button.button, .inline-toolbar.location-bar GtkToolButton:only-child > .sidebar-button.button, 
.inline-toolbar.toolbar headerbar GtkToolButton:only-child > button.titlebutton, headerbar 
.inline-toolbar.toolbar GtkToolButton:only-child > button.titlebutton, .inline-toolbar headerbar 
GtkToolButton:only-child > button.titlebutton, headerbar .inline-toolbar GtkToolButton:only-child > 
button.titlebutton, .inline-toolbar.search-bar headerbar GtkToolButton:only-child > button.tit
 lebutton, headerbar .inline-toolbar.search-bar GtkToolButton:only-child > button.titlebutton, 
.inline-toolbar.location-bar headerbar GtkToolButton:only-child > button.titlebutton, headerbar 
.inline-toolbar.location-bar GtkToolButton:only-child > button.titlebutton,
+.inline-toolbar .titlebar headerbar GtkToolButton:only-child > button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:only-child > button.titlebutton,
 .titlebar .inline-toolbar GtkToolButton:only-child > button.titlebutton,
 .inline-toolbar.toolbar GtkToolButton:backdrop:only-child > button.flat,
@@ -1121,32 +1146,39 @@ button, .header-bar button.titlebutton,
 .inline-toolbar GtkToolButton:backdrop:only-child > .sidebar-button.button,
 .inline-toolbar.search-bar GtkToolButton:backdrop:only-child > .sidebar-button.button,
 .inline-toolbar.location-bar GtkToolButton:backdrop:only-child > .sidebar-button.button,
-.inline-toolbar .header-bar GtkToolButton:backdrop:only-child > button.titlebutton,
-.header-bar .inline-toolbar GtkToolButton:backdrop:only-child > button.titlebutton,
+.inline-toolbar.toolbar headerbar GtkToolButton:backdrop:only-child > button.titlebutton,
+headerbar .inline-toolbar.toolbar GtkToolButton:backdrop:only-child > button.titlebutton,
+.inline-toolbar headerbar GtkToolButton:backdrop:only-child > button.titlebutton,
+headerbar .inline-toolbar GtkToolButton:backdrop:only-child > button.titlebutton,
+.inline-toolbar.search-bar headerbar GtkToolButton:backdrop:only-child > button.titlebutton,
+headerbar .inline-toolbar.search-bar GtkToolButton:backdrop:only-child > button.titlebutton,
+.inline-toolbar.location-bar headerbar GtkToolButton:backdrop:only-child > button.titlebutton,
+headerbar .inline-toolbar.location-bar GtkToolButton:backdrop:only-child > button.titlebutton,
+.inline-toolbar .titlebar headerbar GtkToolButton:backdrop:only-child > button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:backdrop:only-child > button.titlebutton,
 .titlebar .inline-toolbar GtkToolButton:backdrop:only-child > button.titlebutton, .linked > 
GtkComboBox:only-child > .the-button-in-the-combobox,
 .linked > GtkComboBoxText:only-child > .the-button-in-the-combobox {
   border-radius: 3px;
   border-style: solid; }
 
-.linked.vertical > entry, .linked.vertical > button, .header-bar .linked.vertical > button.titlebutton,
+.linked.vertical > entry, .linked.vertical > button, headerbar .linked.vertical > button.titlebutton,
 .titlebar .linked.vertical > button.titlebutton, .linked.vertical > button:hover, .linked.vertical > 
button:active, .linked.vertical > button:checked, .linked.vertical > button:backdrop, .linked.vertical > 
GtkComboBoxText > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox > .the-button-in-the-combobox {
   border-style: solid solid none solid;
   border-radius: 0; }
 
-.linked.vertical > entry:first-child, .linked.vertical > button:first-child, .header-bar .linked.vertical > 
button.titlebutton:first-child,
+.linked.vertical > entry:first-child, .linked.vertical > button:first-child, headerbar .linked.vertical > 
button.titlebutton:first-child,
 .titlebar .linked.vertical > button.titlebutton:first-child, .linked.vertical > GtkComboBoxText:first-child 
.the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox {
   border-top-left-radius: 3px;
   border-top-right-radius: 3px; }
-.linked.vertical > entry:last-child, .linked.vertical > button:last-child, .header-bar .linked.vertical > 
button.titlebutton:last-child,
+.linked.vertical > entry:last-child, .linked.vertical > button:last-child, headerbar .linked.vertical > 
button.titlebutton:last-child,
 .titlebar .linked.vertical > button.titlebutton:last-child, .linked.vertical > GtkComboBoxText:last-child > 
.the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox {
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border-style: solid; }
-.linked.vertical > entry:only-child, .linked.vertical > button:only-child, .header-bar .linked.vertical > 
button.titlebutton:only-child,
+.linked.vertical > entry:only-child, .linked.vertical > button:only-child, headerbar .linked.vertical > 
button.titlebutton:only-child,
 .titlebar .linked.vertical > button.titlebutton:only-child, .linked.vertical > GtkComboBoxText:only-child > 
.the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox {
   border-radius: 3px;
@@ -1155,33 +1187,37 @@ button, .header-bar button.titlebutton,
 modelbutton.flat,
 .menuitem.button.flat, modelbutton.flat:backdrop, modelbutton.flat:backdrop:hover,
 .menuitem.button.flat:backdrop,
-.menuitem.button.flat:backdrop:hover, button:link, .header-bar button.titlebutton:link,
-.titlebar button.titlebutton:link, button:visited, .header-bar button.titlebutton:visited,
-.titlebar button.titlebutton:visited, button:link:hover, button:link:active, button:link:checked, 
button:visited:hover, button:visited:active, button:visited:checked, button:link:backdrop, 
button:visited:backdrop, .menu button, .menu .header-bar button.titlebutton, .header-bar .menu 
button.titlebutton,
+.menuitem.button.flat:backdrop:hover, button:link, headerbar button.titlebutton:link,
+.titlebar button.titlebutton:link, button:visited, headerbar button.titlebutton:visited,
+.titlebar button.titlebutton:visited, button:link:hover, button:link:active, button:link:checked, 
button:visited:hover, button:visited:active, button:visited:checked, button:link:backdrop, 
button:visited:backdrop, .menu button, .menu headerbar button.titlebutton, headerbar .menu button.titlebutton,
 .menu .titlebar button.titlebutton,
-.titlebar .menu button.titlebutton, notebook tab button, notebook tab .header-bar button.titlebutton, 
.header-bar notebook tab button.titlebutton,
+.titlebar .menu button.titlebutton, notebook tab button, notebook tab headerbar button.titlebutton, 
headerbar notebook tab button.titlebutton,
 notebook tab .titlebar button.titlebutton,
-.titlebar notebook tab button.titlebutton, .app-notification button.flat, .app-notification 
.sidebar-button.button, .app-notification .header-bar button.titlebutton, .header-bar .app-notification 
button.titlebutton,
+.titlebar notebook tab button.titlebutton, .app-notification button.flat, .app-notification 
.sidebar-button.button, .app-notification headerbar button.titlebutton, headerbar .app-notification 
button.titlebutton,
 .app-notification .titlebar button.titlebutton,
 .titlebar .app-notification button.titlebutton,
 .app-notification.frame button.flat,
-.app-notification.frame .sidebar-button.button, .app-notification button.flat:backdrop, .app-notification 
.sidebar-button.button:backdrop, .app-notification button.flat:insensitive, .app-notification 
.sidebar-button.button:insensitive, .app-notification button.flat:backdrop:insensitive, .app-notification 
.sidebar-button.button:backdrop:insensitive, .app-notification .header-bar 
button.titlebutton:backdrop:insensitive, .header-bar .app-notification 
button.titlebutton:backdrop:insensitive,
+.app-notification.frame .sidebar-button.button,
+.app-notification.frame headerbar button.titlebutton,
+headerbar .app-notification.frame button.titlebutton, .app-notification button.flat:backdrop, 
.app-notification .sidebar-button.button:backdrop, .app-notification headerbar button.titlebutton:backdrop, 
headerbar .app-notification button.titlebutton:backdrop, .app-notification button.flat:insensitive, 
.app-notification .sidebar-button.button:insensitive, .app-notification headerbar 
button.titlebutton:insensitive, headerbar .app-notification button.titlebutton:insensitive, .app-notification 
button.flat:backdrop:insensitive, .app-notification .sidebar-button.button:backdrop:insensitive, 
.app-notification headerbar button.titlebutton:backdrop:insensitive, headerbar .app-notification 
button.titlebutton:backdrop:insensitive,
 .app-notification .titlebar button.titlebutton:backdrop:insensitive,
 .titlebar .app-notification button.titlebutton:backdrop:insensitive,
 .app-notification.frame button.flat:backdrop,
 .app-notification.frame .sidebar-button.button:backdrop,
-.app-notification.frame .header-bar button.titlebutton:backdrop,
-.header-bar .app-notification.frame button.titlebutton:backdrop,
+.app-notification.frame headerbar button.titlebutton:backdrop,
+headerbar .app-notification.frame button.titlebutton:backdrop,
 .app-notification.frame .titlebar button.titlebutton:backdrop,
 .titlebar .app-notification.frame button.titlebutton:backdrop,
 .app-notification.frame button.flat:insensitive,
 .app-notification.frame .sidebar-button.button:insensitive,
-.app-notification.frame .header-bar button.titlebutton:insensitive,
-.header-bar .app-notification.frame button.titlebutton:insensitive,
+.app-notification.frame headerbar button.titlebutton:insensitive,
+headerbar .app-notification.frame button.titlebutton:insensitive,
 .app-notification.frame .titlebar button.titlebutton:insensitive,
 .titlebar .app-notification.frame button.titlebutton:insensitive,
 .app-notification.frame button.flat:backdrop:insensitive,
-.app-notification.frame .sidebar-button.button:backdrop:insensitive, calendar.button, calendar.button:hover, 
calendar.button:backdrop, calendar.button:insensitive, .scale-popup button:hover, .scale-popup 
button:backdrop, .scale-popup button:backdrop:hover, .scale-popup button:backdrop:insensitive {
+.app-notification.frame .sidebar-button.button:backdrop:insensitive,
+.app-notification.frame headerbar button.titlebutton:backdrop:insensitive,
+headerbar .app-notification.frame button.titlebutton:backdrop:insensitive, calendar.button, 
calendar.button:hover, calendar.button:backdrop, calendar.button:insensitive, .scale-popup button:hover, 
.scale-popup button:backdrop, .scale-popup button:backdrop:hover, .scale-popup button:backdrop:insensitive {
   border-color: transparent;
   background-color: transparent;
   background-image: none;
@@ -1208,14 +1244,14 @@ GtkColorButton.button {
 /*********
  * Links *
  *********/
-*:link, button:link, .header-bar button.titlebutton:link,
-.titlebar button.titlebutton:link, button:visited, .header-bar button.titlebutton:visited,
+*:link, button:link, headerbar button.titlebutton:link,
+.titlebar button.titlebutton:link, button:visited, headerbar button.titlebutton:visited,
 .titlebar button.titlebutton:visited {
   color: #4a90d9; }
-  *:link:visited, button:visited, .header-bar button.titlebutton:visited,
+  *:link:visited, button:visited, headerbar button.titlebutton:visited,
   .titlebar button.titlebutton:visited {
     color: #2a76c6; }
-    *:selected *:link:visited, *:selected button:visited:link, *:selected button:visited, *:selected 
.header-bar button.titlebutton:visited, .header-bar *:selected button.titlebutton:visited,
+    *:selected *:link:visited, *:selected button:visited:link, *:selected button:visited, *:selected 
headerbar button.titlebutton:visited, headerbar *:selected button.titlebutton:visited,
     *:selected .titlebar button.titlebutton:visited,
     .titlebar *:selected button.titlebutton:visited {
       color: #a6bed7; }
@@ -1228,27 +1264,27 @@ GtkColorButton.button {
     *:selected *:link:active, *:selected button:active:link, *:selected button:active:visited {
       color: #d3dfeb; }
   *:link:backdrop, button:backdrop:link, button:backdrop:visited, *:link:backdrop:hover, 
button:backdrop:hover:link, button:backdrop:hover:visited, *:link:backdrop:hover:selected, 
button:backdrop:hover:selected:link, button:backdrop:hover:selected:visited, .titlebar.selection-mode 
.subtitle:backdrop:hover:link,
-  .header-bar.selection-mode .subtitle:backdrop:hover:link {
+  headerbar.selection-mode .subtitle:backdrop:hover:link {
     color: #215d9c; }
   *:link:selected, button:selected:link, button:selected:visited, .titlebar.selection-mode .subtitle:link,
-  .header-bar.selection-mode .subtitle:link, *:selected *:link, *:selected button:link, *:selected 
button:visited {
+  headerbar.selection-mode .subtitle:link, *:selected *:link, *:selected button:link, *:selected 
button:visited {
     color: #d3dfeb; }
 
-button:link, .header-bar button.titlebutton:link,
-.titlebar button.titlebutton:link, button:visited, .header-bar button.titlebutton:visited,
+button:link, headerbar button.titlebutton:link,
+.titlebar button.titlebutton:link, button:visited, headerbar button.titlebutton:visited,
 .titlebar button.titlebutton:visited {
   text-shadow: none; }
   button:link:hover, button:link:active, button:link:checked, button:visited:hover, button:visited:active, 
button:visited:checked {
     text-shadow: none; }
-  button:link > label, .header-bar button.titlebutton:link > label,
-  .titlebar button.titlebutton:link > label, button:visited > label, .header-bar button.titlebutton:visited 
label,
+  button:link > label, headerbar button.titlebutton:link > label,
+  .titlebar button.titlebutton:link > label, button:visited > label, headerbar button.titlebutton:visited > 
label,
   .titlebar button.titlebutton:visited > label {
     text-decoration-line: underline; }
 
 /*****************
  * GtkSpinButton *
  *****************/
-spinbutton:not(.vertical) button, spinbutton:not(.vertical) .header-bar button.titlebutton, .header-bar 
spinbutton:not(.vertical) button.titlebutton,
+spinbutton:not(.vertical) button,
 spinbutton:not(.vertical) .titlebar button.titlebutton,
 .titlebar spinbutton:not(.vertical) button.titlebutton {
   background-image: none;
@@ -1330,7 +1366,7 @@ spinbutton:not(.vertical) .titlebar button.titlebutton,
     border-radius: 0 3px 3px 0; }
   .osd spinbutton:not(.vertical) button:dir(rtl):first-child {
     border-radius: 3px 0 0 3px; }
-spinbutton.vertical button, spinbutton.vertical .header-bar button.titlebutton, .header-bar 
spinbutton.vertical button.titlebutton,
+spinbutton.vertical button,
 spinbutton.vertical .titlebar button.titlebutton,
 .titlebar spinbutton.vertical button.titlebutton {
   padding-top: 8px;
@@ -1366,7 +1402,7 @@ spinbutton.vertical .titlebar button.titlebutton,
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      spinbutton.vertical button:first-child:insensitive > .label, spinbutton.vertical .header-bar 
button.titlebutton:first-child:insensitive > .label,
+      spinbutton.vertical button:first-child:insensitive > .label, spinbutton.vertical headerbar 
button.titlebutton:first-child:insensitive > .label,
       spinbutton.vertical .titlebar button.titlebutton:first-child:insensitive > .label {
         color: inherit; }
     spinbutton.vertical button:first-child:backdrop {
@@ -1383,7 +1419,7 @@ spinbutton.vertical .titlebar button.titlebutton,
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        spinbutton.vertical button:first-child:backdrop:insensitive > .label, spinbutton.vertical 
.header-bar button.titlebutton:first-child:backdrop:insensitive > .label,
+        spinbutton.vertical button:first-child:backdrop:insensitive > .label, spinbutton.vertical headerbar 
button.titlebutton:first-child:backdrop:insensitive > .label,
         spinbutton.vertical .titlebar button.titlebutton:first-child:backdrop:insensitive > .label {
           color: inherit; }
 spinbutton.vertical button:first-child, spinbutton.vertical button:first-child:active, spinbutton.vertical 
button:first-child:hover, spinbutton.vertical button:first-child:insensitive, spinbutton.vertical 
button:first-child:backdrop {
@@ -1518,7 +1554,7 @@ GtkComboBox {
  * Header bars *
  ***************/
 .titlebar,
-.header-bar {
+headerbar {
   padding: 6px;
   border-width: 0 0 1px;
   border-style: solid;
@@ -1528,45 +1564,47 @@ GtkComboBox {
   background-image: linear-gradient(to bottom, #434a4a, #393f3f);
   box-shadow: inset 0 -1px #2e3232, inset 0 1px rgba(238, 238, 236, 0.1); }
   .titlebar:backdrop,
-  .header-bar:backdrop {
+  headerbar:backdrop {
     border-color: #1f2222;
     background-color: #393f3f;
     background-image: none;
     box-shadow: inset 0 1px rgba(238, 238, 236, 0.1); }
   .titlebar .title,
-  .header-bar .title {
+  headerbar .title {
     font-weight: bold;
     padding-left: 12px;
     padding-right: 12px; }
   .titlebar .subtitle,
-  .header-bar .subtitle {
+  headerbar .subtitle {
     font-size: smaller;
     padding-left: 12px;
     padding-right: 12px; }
   .titlebar .header-bar-separator, .titlebar > GtkBox > separator.vertical,
-  .header-bar .header-bar-separator,
-  .header-bar > GtkBox > separator.vertical {
+  headerbar .header-bar-separator,
+  headerbar > GtkBox > separator.vertical {
     -GtkWidget-wide-separators: true;
     -GtkWidget-separator-width: 1px;
     border-width: 0 1px;
     border-image: linear-gradient(to bottom, rgba(28, 31, 31, 0), #1c1f1f 30%, #1c1f1f 70%, rgba(28, 31, 31, 
0) 100%) 0 1/0 1px stretch; }
     .titlebar .header-bar-separator:backdrop, .titlebar > GtkBox > separator.vertical:backdrop,
-    .header-bar .header-bar-separator:backdrop,
-    .header-bar > GtkBox > separator.vertical:backdrop {
+    headerbar .header-bar-separator:backdrop,
+    headerbar > GtkBox > separator.vertical:backdrop {
       border-image: linear-gradient(to bottom, rgba(31, 34, 34, 0.5)) 0 1/1px 1px; }
   .titlebar.selection-mode,
-  .header-bar.selection-mode {
+  headerbar.selection-mode {
     color: #ffffff;
     text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
     border-color: #0f2b48;
     background-image: linear-gradient(to bottom, #256ab1, #215d9c);
     box-shadow: inset 0 -1px #1b4c7f, inset 0 1px rgba(43, 100, 160, 0.55); }
     .titlebar.selection-mode:backdrop,
-    .header-bar.selection-mode:backdrop {
+    headerbar.selection-mode:backdrop {
       background-image: linear-gradient(to bottom, #215d9c);
       box-shadow: inset 0 1px rgba(48, 104, 162, 0.46); }
     .titlebar.selection-mode button,
-    .header-bar.selection-mode button {
+    headerbar.selection-mode button,
+    headerbar.selection-mode .titlebar button.titlebutton,
+    .titlebar headerbar.selection-mode button.titlebutton {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #0b1e33;
@@ -1576,9 +1614,9 @@ GtkComboBox {
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(43, 100, 160, 0.55); }
       .titlebar.selection-mode button.flat, .titlebar.selection-mode .sidebar-button.button,
       .titlebar.selection-mode button.titlebutton,
-      .header-bar.selection-mode button.flat,
-      .header-bar.selection-mode .sidebar-button.button,
-      .header-bar.selection-mode button.titlebutton {
+      headerbar.selection-mode button.flat,
+      headerbar.selection-mode .sidebar-button.button,
+      headerbar.selection-mode button.titlebutton {
         border-color: transparent;
         background-color: transparent;
         background-image: none;
@@ -1586,7 +1624,7 @@ GtkComboBox {
         text-shadow: none;
         icon-shadow: none; }
       .titlebar.selection-mode button:hover,
-      .header-bar.selection-mode button:hover {
+      headerbar.selection-mode button:hover {
         color: #ffffff;
         outline-color: rgba(255, 255, 255, 0.3);
         border-color: #0b1e33;
@@ -1595,8 +1633,8 @@ GtkComboBox {
         icon-shadow: 0 -1px rgba(0, 0, 0, 0.67153);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(43, 100, 160, 0.55); }
       .titlebar.selection-mode button:active, .titlebar.selection-mode button:checked,
-      .header-bar.selection-mode button:active,
-      .header-bar.selection-mode button:checked {
+      headerbar.selection-mode button:active,
+      headerbar.selection-mode button:checked {
         color: #ffffff;
         outline-color: rgba(255, 255, 255, 0.3);
         border-color: #0b1e33;
@@ -1606,10 +1644,10 @@ GtkComboBox {
         box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(43, 
100, 160, 0.55); }
       .titlebar.selection-mode button:backdrop, .titlebar.selection-mode button.flat:backdrop, 
.titlebar.selection-mode .sidebar-button.button:backdrop,
       .titlebar.selection-mode button.titlebutton:backdrop,
-      .header-bar.selection-mode button:backdrop,
-      .header-bar.selection-mode button.flat:backdrop,
-      .header-bar.selection-mode .sidebar-button.button:backdrop,
-      .header-bar.selection-mode button.titlebutton:backdrop {
+      headerbar.selection-mode button:backdrop,
+      headerbar.selection-mode button.flat:backdrop,
+      headerbar.selection-mode .sidebar-button.button:backdrop,
+      headerbar.selection-mode button.titlebutton:backdrop {
         color: #d3dfeb;
         border-color: #0b1e33;
         background-image: linear-gradient(to bottom, #215d9c);
@@ -1621,14 +1659,14 @@ GtkComboBox {
         .titlebar.selection-mode button:backdrop:active, .titlebar.selection-mode button:backdrop:checked, 
.titlebar.selection-mode button.flat:backdrop:active, .titlebar.selection-mode 
.sidebar-button.button:backdrop:active,
         .titlebar.selection-mode button.titlebutton:backdrop:active, .titlebar.selection-mode 
button.flat:backdrop:checked, .titlebar.selection-mode .sidebar-button.button:backdrop:checked,
         .titlebar.selection-mode button.titlebutton:backdrop:checked,
-        .header-bar.selection-mode button:backdrop:active,
-        .header-bar.selection-mode button:backdrop:checked,
-        .header-bar.selection-mode button.flat:backdrop:active,
-        .header-bar.selection-mode .sidebar-button.button:backdrop:active,
-        .header-bar.selection-mode button.titlebutton:backdrop:active,
-        .header-bar.selection-mode button.flat:backdrop:checked,
-        .header-bar.selection-mode .sidebar-button.button:backdrop:checked,
-        .header-bar.selection-mode button.titlebutton:backdrop:checked {
+        headerbar.selection-mode button:backdrop:active,
+        headerbar.selection-mode button:backdrop:checked,
+        headerbar.selection-mode button.flat:backdrop:active,
+        headerbar.selection-mode .sidebar-button.button:backdrop:active,
+        headerbar.selection-mode button.titlebutton:backdrop:active,
+        headerbar.selection-mode button.flat:backdrop:checked,
+        headerbar.selection-mode .sidebar-button.button:backdrop:checked,
+        headerbar.selection-mode button.titlebutton:backdrop:checked {
           color: #d1dae3;
           border-color: #0b1e33;
           background-image: linear-gradient(to bottom, #184472);
@@ -1636,10 +1674,10 @@ GtkComboBox {
           border-color: #0f2b48; }
         .titlebar.selection-mode button:backdrop:insensitive, .titlebar.selection-mode 
button.flat:backdrop:insensitive, .titlebar.selection-mode .sidebar-button.button:backdrop:insensitive,
         .titlebar.selection-mode button.titlebutton:backdrop:insensitive,
-        .header-bar.selection-mode button:backdrop:insensitive,
-        .header-bar.selection-mode button.flat:backdrop:insensitive,
-        .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive,
-        .header-bar.selection-mode button.titlebutton:backdrop:insensitive {
+        headerbar.selection-mode button:backdrop:insensitive,
+        headerbar.selection-mode button.flat:backdrop:insensitive,
+        headerbar.selection-mode .sidebar-button.button:backdrop:insensitive,
+        headerbar.selection-mode button.titlebutton:backdrop:insensitive {
           color: #6f91b4;
           border-color: #0b1e33;
           background-image: linear-gradient(to bottom, #22558b);
@@ -1647,60 +1685,60 @@ GtkComboBox {
           icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0);
           border-color: #0f2b48; }
-          .titlebar.selection-mode button:backdrop:insensitive > .label, .titlebar.selection-mode 
.header-bar button.titlebutton:backdrop:insensitive > .label, .titlebar.selection-mode 
button.flat:backdrop:insensitive > .label, .titlebar.selection-mode 
.sidebar-button.button:backdrop:insensitive > .label, .titlebar.selection-mode .header-bar 
button.titlebutton:backdrop:insensitive > .label,
+          .titlebar.selection-mode button:backdrop:insensitive > .label, .titlebar.selection-mode headerbar 
button.titlebutton:backdrop:insensitive > .label, .titlebar.selection-mode button.flat:backdrop:insensitive > 
.label, .titlebar.selection-mode .sidebar-button.button:backdrop:insensitive > .label, 
.titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive > .label,
           .titlebar.selection-mode button.titlebutton:backdrop:insensitive > .label,
-          .header-bar.selection-mode button:backdrop:insensitive > .label,
-          .header-bar.selection-mode .titlebar button.titlebutton:backdrop:insensitive > .label,
-          .header-bar.selection-mode button.flat:backdrop:insensitive > .label,
-          .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive > .label,
-          .header-bar.selection-mode button.titlebutton:backdrop:insensitive > .label,
-          .header-bar.selection-mode .titlebar button.titlebutton:backdrop:insensitive > .label {
+          headerbar.selection-mode button:backdrop:insensitive > .label,
+          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive > .label,
+          headerbar.selection-mode button.flat:backdrop:insensitive > .label,
+          headerbar.selection-mode .sidebar-button.button:backdrop:insensitive > .label,
+          headerbar.selection-mode button.titlebutton:backdrop:insensitive > .label,
+          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive > .label {
             color: inherit; }
         .titlebar.selection-mode button:backdrop:insensitive:active, .titlebar.selection-mode 
button:backdrop:insensitive:checked, .titlebar.selection-mode button.flat:backdrop:insensitive:active, 
.titlebar.selection-mode .sidebar-button.button:backdrop:insensitive:active,
         .titlebar.selection-mode button.titlebutton:backdrop:insensitive:active, .titlebar.selection-mode 
button.flat:backdrop:insensitive:checked, .titlebar.selection-mode 
.sidebar-button.button:backdrop:insensitive:checked,
         .titlebar.selection-mode button.titlebutton:backdrop:insensitive:checked,
-        .header-bar.selection-mode button:backdrop:insensitive:active,
-        .header-bar.selection-mode button:backdrop:insensitive:checked,
-        .header-bar.selection-mode button.flat:backdrop:insensitive:active,
-        .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive:active,
-        .header-bar.selection-mode button.titlebutton:backdrop:insensitive:active,
-        .header-bar.selection-mode button.flat:backdrop:insensitive:checked,
-        .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive:checked,
-        .header-bar.selection-mode button.titlebutton:backdrop:insensitive:checked {
+        headerbar.selection-mode button:backdrop:insensitive:active,
+        headerbar.selection-mode button:backdrop:insensitive:checked,
+        headerbar.selection-mode button.flat:backdrop:insensitive:active,
+        headerbar.selection-mode .sidebar-button.button:backdrop:insensitive:active,
+        headerbar.selection-mode button.titlebutton:backdrop:insensitive:active,
+        headerbar.selection-mode button.flat:backdrop:insensitive:checked,
+        headerbar.selection-mode .sidebar-button.button:backdrop:insensitive:checked,
+        headerbar.selection-mode button.titlebutton:backdrop:insensitive:checked {
           color: #6c88a7;
           border-color: #0b1e33;
           background-image: linear-gradient(to bottom, #1d4877);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0);
           border-color: #0f2b48; }
-          .titlebar.selection-mode button:backdrop:insensitive:active > .label, .titlebar.selection-mode 
.header-bar button.titlebutton:backdrop:insensitive:active > .label, .titlebar.selection-mode 
button:backdrop:insensitive:checked > .label, .titlebar.selection-mode .header-bar 
button.titlebutton:backdrop:insensitive:checked > .label, .titlebar.selection-mode 
button.flat:backdrop:insensitive:active > .label, .titlebar.selection-mode 
.sidebar-button.button:backdrop:insensitive:active > .label, .titlebar.selection-mode .header-bar 
button.titlebutton:backdrop:insensitive:active > .label,
-          .titlebar.selection-mode button.titlebutton:backdrop:insensitive:active > .label, 
.titlebar.selection-mode button.flat:backdrop:insensitive:checked > .label, .titlebar.selection-mode 
.sidebar-button.button:backdrop:insensitive:checked > .label, .titlebar.selection-mode .header-bar 
button.titlebutton:backdrop:insensitive:checked > .label,
+          .titlebar.selection-mode button:backdrop:insensitive:active > .label, .titlebar.selection-mode 
headerbar button.titlebutton:backdrop:insensitive:active > .label, .titlebar.selection-mode 
button:backdrop:insensitive:checked > .label, .titlebar.selection-mode headerbar 
button.titlebutton:backdrop:insensitive:checked > .label, .titlebar.selection-mode 
button.flat:backdrop:insensitive:active > .label, .titlebar.selection-mode 
.sidebar-button.button:backdrop:insensitive:active > .label, .titlebar.selection-mode headerbar 
button.titlebutton:backdrop:insensitive:active > .label,
+          .titlebar.selection-mode button.titlebutton:backdrop:insensitive:active > .label, 
.titlebar.selection-mode button.flat:backdrop:insensitive:checked > .label, .titlebar.selection-mode 
.sidebar-button.button:backdrop:insensitive:checked > .label, .titlebar.selection-mode headerbar 
button.titlebutton:backdrop:insensitive:checked > .label,
           .titlebar.selection-mode button.titlebutton:backdrop:insensitive:checked > .label,
-          .header-bar.selection-mode button:backdrop:insensitive:active > .label,
-          .header-bar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:active > .label,
-          .header-bar.selection-mode button:backdrop:insensitive:checked > .label,
-          .header-bar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:checked > .label,
-          .header-bar.selection-mode button.flat:backdrop:insensitive:active > .label,
-          .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive:active > .label,
-          .header-bar.selection-mode button.titlebutton:backdrop:insensitive:active > .label,
-          .header-bar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:active > .label,
-          .header-bar.selection-mode button.flat:backdrop:insensitive:checked > .label,
-          .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive:checked > .label,
-          .header-bar.selection-mode button.titlebutton:backdrop:insensitive:checked > .label,
-          .header-bar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:checked > .label {
+          headerbar.selection-mode button:backdrop:insensitive:active > .label,
+          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:active > .label,
+          headerbar.selection-mode button:backdrop:insensitive:checked > .label,
+          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:checked > .label,
+          headerbar.selection-mode button.flat:backdrop:insensitive:active > .label,
+          headerbar.selection-mode .sidebar-button.button:backdrop:insensitive:active > .label,
+          headerbar.selection-mode button.titlebutton:backdrop:insensitive:active > .label,
+          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:active > .label,
+          headerbar.selection-mode button.flat:backdrop:insensitive:checked > .label,
+          headerbar.selection-mode .sidebar-button.button:backdrop:insensitive:checked > .label,
+          headerbar.selection-mode button.titlebutton:backdrop:insensitive:checked > .label,
+          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:checked > .label {
             color: inherit; }
       .titlebar.selection-mode button.flat:backdrop, .titlebar.selection-mode 
.sidebar-button.button:backdrop,
       .titlebar.selection-mode button.titlebutton:backdrop, .titlebar.selection-mode 
button.flat:insensitive, .titlebar.selection-mode .sidebar-button.button:insensitive,
       .titlebar.selection-mode button.titlebutton:insensitive, .titlebar.selection-mode 
button.flat:insensitive:backdrop, .titlebar.selection-mode .sidebar-button.button:insensitive:backdrop,
       .titlebar.selection-mode button.titlebutton:insensitive:backdrop,
-      .header-bar.selection-mode button.flat:backdrop,
-      .header-bar.selection-mode .sidebar-button.button:backdrop,
-      .header-bar.selection-mode button.titlebutton:backdrop,
-      .header-bar.selection-mode button.flat:insensitive,
-      .header-bar.selection-mode .sidebar-button.button:insensitive,
-      .header-bar.selection-mode button.titlebutton:insensitive,
-      .header-bar.selection-mode button.flat:insensitive:backdrop,
-      .header-bar.selection-mode .sidebar-button.button:insensitive:backdrop,
-      .header-bar.selection-mode button.titlebutton:insensitive:backdrop {
+      headerbar.selection-mode button.flat:backdrop,
+      headerbar.selection-mode .sidebar-button.button:backdrop,
+      headerbar.selection-mode button.titlebutton:backdrop,
+      headerbar.selection-mode button.flat:insensitive,
+      headerbar.selection-mode .sidebar-button.button:insensitive,
+      headerbar.selection-mode button.titlebutton:insensitive,
+      headerbar.selection-mode button.flat:insensitive:backdrop,
+      headerbar.selection-mode .sidebar-button.button:insensitive:backdrop,
+      headerbar.selection-mode button.titlebutton:insensitive:backdrop {
         border-color: transparent;
         background-color: transparent;
         background-image: none;
@@ -1708,32 +1746,32 @@ GtkComboBox {
         text-shadow: none;
         icon-shadow: none; }
       .titlebar.selection-mode button:insensitive,
-      .header-bar.selection-mode button:insensitive {
+      headerbar.selection-mode button:insensitive {
         color: #91aac5;
         border-color: #0b1e33;
         background-image: linear-gradient(to bottom, #22558b);
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0.55); }
-        .titlebar.selection-mode button:insensitive > .label, .titlebar.selection-mode .header-bar 
button.titlebutton:insensitive > .label,
-        .header-bar.selection-mode button:insensitive > .label,
-        .header-bar.selection-mode .titlebar button.titlebutton:insensitive > .label {
+        .titlebar.selection-mode button:insensitive > .label, .titlebar.selection-mode headerbar 
button.titlebutton:insensitive > .label,
+        headerbar.selection-mode button:insensitive > .label,
+        headerbar.selection-mode .titlebar button.titlebutton:insensitive > .label {
           color: inherit; }
         .titlebar.selection-mode button:insensitive:active, .titlebar.selection-mode 
button:insensitive:checked,
-        .header-bar.selection-mode button:insensitive:active,
-        .header-bar.selection-mode button:insensitive:checked {
+        headerbar.selection-mode button:insensitive:active,
+        headerbar.selection-mode button:insensitive:checked {
           color: #a5b6c9;
           border-color: #0b1e33;
           background-image: linear-gradient(to bottom, #1b4470, #1d4877);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0.55); }
-          .titlebar.selection-mode button:insensitive:active > .label, .titlebar.selection-mode .header-bar 
button.titlebutton:insensitive:active > .label, .titlebar.selection-mode button:insensitive:checked > .label, 
.titlebar.selection-mode .header-bar button.titlebutton:insensitive:checked > .label,
-          .header-bar.selection-mode button:insensitive:active > .label,
-          .header-bar.selection-mode .titlebar button.titlebutton:insensitive:active > .label,
-          .header-bar.selection-mode button:insensitive:checked > .label,
-          .header-bar.selection-mode .titlebar button.titlebutton:insensitive:checked > .label {
+          .titlebar.selection-mode button:insensitive:active > .label, .titlebar.selection-mode headerbar 
button.titlebutton:insensitive:active > .label, .titlebar.selection-mode button:insensitive:checked > .label, 
.titlebar.selection-mode headerbar button.titlebutton:insensitive:checked > .label,
+          headerbar.selection-mode button:insensitive:active > .label,
+          headerbar.selection-mode .titlebar button.titlebutton:insensitive:active > .label,
+          headerbar.selection-mode button:insensitive:checked > .label,
+          headerbar.selection-mode .titlebar button.titlebutton:insensitive:checked > .label {
             color: inherit; }
       .titlebar.selection-mode button.suggested-action,
-      .header-bar.selection-mode button.suggested-action {
+      headerbar.selection-mode button.suggested-action {
         color: #eeeeec;
         outline-color: rgba(238, 238, 236, 0.3);
         border-color: #1c1f1f;
@@ -1743,7 +1781,7 @@ GtkComboBox {
         box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(43, 100, 160, 0.55);
         border-color: #0f2b48; }
         .titlebar.selection-mode button.suggested-action:hover,
-        .header-bar.selection-mode button.suggested-action:hover {
+        headerbar.selection-mode button.suggested-action:hover {
           color: #eeeeec;
           outline-color: rgba(238, 238, 236, 0.3);
           border-color: #1c1f1f;
@@ -1753,7 +1791,7 @@ GtkComboBox {
           box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(43, 100, 160, 0.55);
           border-color: #0f2b48; }
         .titlebar.selection-mode button.suggested-action:active,
-        .header-bar.selection-mode button.suggested-action:active {
+        headerbar.selection-mode button.suggested-action:active {
           color: #eeeeec;
           outline-color: rgba(238, 238, 236, 0.3);
           border-color: #1c1f1f;
@@ -1763,7 +1801,7 @@ GtkComboBox {
           box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px 
rgba(43, 100, 160, 0.55);
           border-color: #0f2b48; }
         .titlebar.selection-mode button.suggested-action:insensitive,
-        .header-bar.selection-mode button.suggested-action:insensitive {
+        headerbar.selection-mode button.suggested-action:insensitive {
           color: #949796;
           border-color: #1c1f1f;
           background-image: linear-gradient(to bottom, #333636);
@@ -1771,12 +1809,12 @@ GtkComboBox {
           icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0.55);
           border-color: #0f2b48; }
-          .titlebar.selection-mode button.suggested-action:insensitive > .label, .titlebar.selection-mode 
.header-bar button.suggested-action.titlebutton:insensitive > .label,
-          .header-bar.selection-mode button.suggested-action:insensitive > .label,
-          .header-bar.selection-mode .titlebar button.suggested-action.titlebutton:insensitive > .label {
+          .titlebar.selection-mode button.suggested-action:insensitive > .label, .titlebar.selection-mode 
headerbar button.suggested-action.titlebutton:insensitive > .label,
+          headerbar.selection-mode button.suggested-action:insensitive > .label,
+          headerbar.selection-mode .titlebar button.suggested-action.titlebutton:insensitive > .label {
             color: inherit; }
         .titlebar.selection-mode button.suggested-action:backdrop,
-        .header-bar.selection-mode button.suggested-action:backdrop {
+        headerbar.selection-mode button.suggested-action:backdrop {
           color: #949796;
           border-color: #1f2222;
           background-image: linear-gradient(to bottom, #393f3f);
@@ -1785,7 +1823,7 @@ GtkComboBox {
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0);
           border-color: #0f2b48; }
         .titlebar.selection-mode button.suggested-action:backdrop:insensitive,
-        .header-bar.selection-mode button.suggested-action:backdrop:insensitive {
+        headerbar.selection-mode button.suggested-action:backdrop:insensitive {
           color: #5d6767;
           border-color: #1f2222;
           background-image: linear-gradient(to bottom, #333636);
@@ -1793,42 +1831,48 @@ GtkComboBox {
           icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0);
           border-color: #0f2b48; }
-          .titlebar.selection-mode button.suggested-action:backdrop:insensitive > .label, 
.titlebar.selection-mode .header-bar button.suggested-action.titlebutton:backdrop:insensitive > .label,
-          .header-bar.selection-mode button.suggested-action:backdrop:insensitive > .label,
-          .header-bar.selection-mode .titlebar button.suggested-action.titlebutton:backdrop:insensitive > 
.label {
+          .titlebar.selection-mode button.suggested-action:backdrop:insensitive > .label, 
.titlebar.selection-mode headerbar button.suggested-action.titlebutton:backdrop:insensitive > .label,
+          headerbar.selection-mode button.suggested-action:backdrop:insensitive > .label,
+          headerbar.selection-mode .titlebar button.suggested-action.titlebutton:backdrop:insensitive > 
.label {
             color: inherit; }
     .titlebar.selection-mode .selection-menu, .titlebar.selection-mode .selection-menu:backdrop,
-    .header-bar.selection-mode .selection-menu,
-    .header-bar.selection-mode .selection-menu:backdrop {
+    headerbar.selection-mode .selection-menu,
+    headerbar.selection-mode .titlebar.selection-mode .selection-menu:backdrop,
+    .titlebar.selection-mode headerbar.selection-mode .selection-menu:backdrop,
+    headerbar.selection-mode .selection-menu:backdrop {
       border-color: rgba(33, 93, 156, 0);
       background-image: linear-gradient(to bottom, rgba(33, 93, 156, 0));
       box-shadow: none;
       padding-left: 10px;
       padding-right: 10px; }
       .titlebar.selection-mode .selection-menu GtkArrow, .titlebar.selection-mode .selection-menu:backdrop 
GtkArrow,
-      .header-bar.selection-mode .selection-menu GtkArrow,
-      .header-bar.selection-mode .selection-menu:backdrop GtkArrow {
+      headerbar.selection-mode .selection-menu GtkArrow,
+      headerbar.selection-mode .titlebar.selection-mode .selection-menu:backdrop GtkArrow,
+      .titlebar.selection-mode headerbar.selection-mode .selection-menu:backdrop GtkArrow,
+      headerbar.selection-mode .selection-menu:backdrop GtkArrow {
         -GtkArrow-arrow-scaling: 1; }
       .titlebar.selection-mode .selection-menu .arrow,
-      .header-bar.selection-mode .selection-menu .arrow {
+      headerbar.selection-mode .selection-menu .arrow {
         -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
         color: rgba(255, 255, 255, 0.5);
         icon-shadow: none; }
   .tiled .titlebar, .maximized .titlebar, .tiled
-  .header-bar, .maximized
-  .header-bar {
+  headerbar, .maximized
+  headerbar {
     border-radius: 0; }
   .titlebar.default-decoration,
-  .header-bar.default-decoration {
+  headerbar.default-decoration {
     padding: 4px; }
     .titlebar.default-decoration button,
-    .header-bar.default-decoration button {
+    headerbar.default-decoration button,
+    headerbar.default-decoration .titlebar button.titlebutton,
+    .titlebar headerbar.default-decoration button.titlebutton {
       padding: 5px; }
 
 /************
  * Pathbars *
  ************/
-.path-bar button, .path-bar .header-bar button.titlebutton, .header-bar .path-bar button.titlebutton,
+.path-bar button, .path-bar headerbar button.titlebutton, headerbar .path-bar button.titlebutton,
 .path-bar .titlebar button.titlebutton,
 .titlebar .path-bar button.titlebutton {
   padding: 5px 6px 6px; }
@@ -1846,7 +1890,7 @@ GtkComboBox {
   .path-bar button label:only-child {
     padding-right: 0;
     padding-left: 0; }
-  .path-bar button image, .path-bar .header-bar button.titlebutton image, .header-bar .path-bar 
button.titlebutton image,
+  .path-bar button image,
   .path-bar .titlebar button.titlebutton image,
   .titlebar .path-bar button.titlebutton image {
     padding-top: 1px; }
@@ -1922,7 +1966,7 @@ GtkTreeView.view {
     GtkTreeView.view.trough:selected {
       background-color: #184472; }
 
-column-header button, column-header .header-bar button.titlebutton, .header-bar column-header 
button.titlebutton,
+column-header button, column-header headerbar button.titlebutton, headerbar column-header button.titlebutton,
 column-header .titlebar button.titlebutton,
 .titlebar column-header button.titlebutton {
   color: #8c8c8b;
@@ -1930,32 +1974,32 @@ column-header .titlebar button.titlebutton,
   font-weight: bold;
   text-shadow: none;
   box-shadow: none; }
-  column-header button:hover, column-header .header-bar button.titlebutton:hover, .header-bar column-header 
button.titlebutton:hover,
+  column-header button:hover,
   column-header .titlebar button.titlebutton:hover,
   .titlebar column-header button.titlebutton:hover {
     color: #bdbdbc;
     box-shadow: none;
     transition: none; }
-  column-header button:active, column-header .header-bar button.titlebutton:active, .header-bar 
column-header button.titlebutton:active,
+  column-header button:active,
   column-header .titlebar button.titlebutton:active,
   .titlebar column-header button.titlebutton:active {
     color: #eeeeec;
     transition: none; }
-column-header button:last-child, column-header .header-bar button.titlebutton:last-child, .header-bar 
column-header button.titlebutton:last-child,
+column-header button:last-child,
 column-header .titlebar button.titlebutton:last-child,
-.titlebar column-header button.titlebutton:last-child, column-header button:last-child:backdrop, 
column-header:last-child button, column-header:last-child .header-bar button.titlebutton, .header-bar 
column-header:last-child button.titlebutton,
+.titlebar column-header button.titlebutton:last-child, column-header button:last-child:backdrop, 
column-header:last-child button,
 column-header:last-child .titlebar button.titlebutton,
 .titlebar column-header:last-child button.titlebutton, column-header:last-child button:backdrop {
   border-right-style: none; }
 
-column-header.button.dnd, column-header button.dnd, column-header .header-bar button.dnd.titlebutton, 
.header-bar column-header button.dnd.titlebutton,
+column-header.button.dnd, column-header button.dnd,
 column-header .titlebar button.dnd.titlebutton,
 .titlebar column-header button.dnd.titlebutton, column-header.button.dnd:active, 
column-header.button.dnd:selected, column-header.button.dnd:hover {
   transition: none;
   color: #215d9c;
   box-shadow: inset 1px 1px 0 1px #215d9c, inset -1px 0 0 1px #215d9c, inset 1px 1px #292929, inset -1px 0 
#292929; }
 
-column-header button, column-header .header-bar button.titlebutton, .header-bar column-header 
button.titlebutton,
+column-header button, column-header headerbar button.titlebutton, headerbar column-header button.titlebutton,
 column-header .titlebar button.titlebutton,
 .titlebar column-header button.titlebutton, column-header button:hover, column-header button:active {
   padding: 3px 6px;
@@ -1964,12 +2008,12 @@ column-header .titlebar button.titlebutton,
   background-image: none;
   border-color: #393f3f;
   text-shadow: none; }
-  column-header button:insensitive, column-header .header-bar button.titlebutton:insensitive, .header-bar 
column-header button.titlebutton:insensitive,
+  column-header button:insensitive,
   column-header .titlebar button.titlebutton:insensitive,
   .titlebar column-header button.titlebutton:insensitive {
     border-color: #393f3f;
     background-image: none; }
-  column-header button:backdrop, column-header .header-bar button.titlebutton:backdrop, .header-bar 
column-header button.titlebutton:backdrop,
+  column-header button:backdrop,
   column-header .titlebar button.titlebutton:backdrop,
   .titlebar column-header button.titlebutton:backdrop {
     border-color: #393f3f;
@@ -2023,7 +2067,7 @@ column-header .titlebar button.titlebutton,
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
     .menu .menuitem.arrow:dir(rtl) {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
-  .menu button, .menu .header-bar button.titlebutton, .header-bar .menu button.titlebutton,
+  .menu button, .menu headerbar button.titlebutton, headerbar .menu button.titlebutton,
   .menu .titlebar button.titlebutton,
   .titlebar .menu button.titlebutton {
     border-style: none;
@@ -2061,13 +2105,13 @@ column-header .titlebar button.titlebutton,
   .popover > .location-bar, .popover.osd > .toolbar, .popover.osd > .inline-toolbar, .popover.osd > 
.search-bar, .popover.osd > .location-bar {
     border-style: none;
     background-color: transparent; }
-  .popover button.flat, .popover .sidebar-button.button, .popover .header-bar button.titlebutton, 
.header-bar .popover button.titlebutton,
+  .popover button.flat, .popover .sidebar-button.button, .popover headerbar button.titlebutton, headerbar 
.popover button.titlebutton,
   .popover .titlebar button.titlebutton,
   .titlebar .popover button.titlebutton,
   .popover button.flat:hover,
   .popover .sidebar-button.button:hover,
-  .popover .header-bar button.titlebutton:hover,
-  .header-bar .popover button.titlebutton:hover,
+  .popover headerbar button.titlebutton:hover,
+  headerbar .popover button.titlebutton:hover,
   .popover .titlebar button.titlebutton:hover,
   .titlebar .popover button.titlebutton:hover {
     text-shadow: none;
@@ -2287,7 +2331,7 @@ notebook {
       color: #eeeeec; }
       notebook tab:active label:backdrop {
         color: #949796; }
-    notebook tab button, notebook tab .header-bar button.titlebutton, .header-bar notebook tab 
button.titlebutton,
+    notebook tab button, notebook tab headerbar button.titlebutton, headerbar notebook tab 
button.titlebutton,
     notebook tab .titlebar button.titlebutton,
     .titlebar notebook tab button.titlebutton {
       padding: 0;
@@ -2295,7 +2339,7 @@ notebook {
       icon-shadow: none;
       transition: none;
       color: rgba(238, 238, 236, 0.3); }
-      notebook tab button:hover, notebook tab .header-bar button.titlebutton:hover, .header-bar notebook tab 
button.titlebutton:hover,
+      notebook tab button:hover,
       notebook tab .titlebar button.titlebutton:hover,
       .titlebar notebook tab button.titlebutton:hover {
         color: #eeeeec;
@@ -2308,7 +2352,7 @@ notebook {
         box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
         background-image: none;
         box-shadow: none; }
-      notebook tab button:active, notebook tab .header-bar button.titlebutton:active, .header-bar notebook 
tab button.titlebutton:active,
+      notebook tab button:active,
       notebook tab .titlebar button.titlebutton:active,
       .titlebar notebook tab button.titlebutton:active {
         color: #eeeeec;
@@ -2318,12 +2362,12 @@ notebook {
         text-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
         icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
         box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
-      notebook tab button:backdrop, notebook tab .header-bar button.titlebutton:backdrop, .header-bar 
notebook tab button.titlebutton:backdrop,
+      notebook tab button:backdrop,
       notebook tab .titlebar button.titlebutton:backdrop,
       .titlebar notebook tab button.titlebutton:backdrop {
         color: rgba(148, 151, 150, 0.3);
         border-color: transparent; }
-      notebook tab button > image, notebook tab .header-bar button.titlebutton > image, .header-bar notebook 
tab button.titlebutton > image,
+      notebook tab button > image, notebook tab headerbar button.titlebutton > image, headerbar notebook tab 
button.titlebutton > image,
       notebook tab .titlebar button.titlebutton > image,
       .titlebar notebook tab button.titlebutton > image {
         padding: 2px; }
@@ -2351,7 +2395,7 @@ notebook {
   -GtkScrollbar-min-slider-length: 42;
   -GtkRange-stepper-spacing: 0;
   -GtkRange-trough-under-steppers: 1; }
-  .scrollbar button, .scrollbar .header-bar button.titlebutton, .header-bar .scrollbar button.titlebutton,
+  .scrollbar button, .scrollbar headerbar button.titlebutton, headerbar .scrollbar button.titlebutton,
   .scrollbar .titlebar button.titlebutton,
   .titlebar .scrollbar button.titlebutton {
     border: none; }
@@ -2533,7 +2577,7 @@ switch {
 check {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), 
url("assets/checkbox-unchecked-dark 2 png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  check button.flat, check .sidebar-button.button, check .header-bar button.titlebutton, .header-bar check 
button.titlebutton,
+  check button.flat, check .sidebar-button.button, check headerbar button.titlebutton, headerbar check 
button.titlebutton,
   check .titlebar button.titlebutton,
   .titlebar check button.titlebutton {
     icon-shadow: none; }
@@ -2541,7 +2585,7 @@ check {
 check:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-hover-dark.png"), 
url("assets/checkbox-unchecked-hover-dark 2 png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  check:hover button.flat, check:hover .sidebar-button.button, check:hover .header-bar button.titlebutton, 
.header-bar check:hover button.titlebutton,
+  check:hover button.flat, check:hover .sidebar-button.button, check:hover headerbar button.titlebutton, 
headerbar check:hover button.titlebutton,
   check:hover .titlebar button.titlebutton,
   .titlebar check:hover button.titlebutton {
     icon-shadow: none; }
@@ -2549,7 +2593,7 @@ check:hover {
 check:active {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-active-dark.png"), 
url("assets/checkbox-unchecked-active-dark 2 png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  check:active button.flat, check:active .sidebar-button.button, check:active .header-bar 
button.titlebutton, .header-bar check:active button.titlebutton,
+  check:active button.flat, check:active .sidebar-button.button, check:active headerbar button.titlebutton, 
headerbar check:active button.titlebutton,
   check:active .titlebar button.titlebutton,
   .titlebar check:active button.titlebutton {
     icon-shadow: none; }
@@ -2557,7 +2601,7 @@ check:active {
 check:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), 
url("assets/checkbox-unchecked-insensitive-dark 2 png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  check:insensitive button.flat, check:insensitive .sidebar-button.button, check:insensitive .header-bar 
button.titlebutton, .header-bar check:insensitive button.titlebutton,
+  check:insensitive button.flat, check:insensitive .sidebar-button.button, check:insensitive headerbar 
button.titlebutton, headerbar check:insensitive button.titlebutton,
   check:insensitive .titlebar button.titlebutton,
   .titlebar check:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -2565,7 +2609,7 @@ check:insensitive {
 check:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-backdrop-dark.png"), 
url("assets/checkbox-unchecked-backdrop-dark 2 png"));
   icon-shadow: none; }
-  check:backdrop button.flat, check:backdrop .sidebar-button.button, check:backdrop .header-bar 
button.titlebutton, .header-bar check:backdrop button.titlebutton,
+  check:backdrop button.flat, check:backdrop .sidebar-button.button, check:backdrop headerbar 
button.titlebutton, headerbar check:backdrop button.titlebutton,
   check:backdrop .titlebar button.titlebutton,
   .titlebar check:backdrop button.titlebutton {
     icon-shadow: none; }
@@ -2573,7 +2617,7 @@ check:backdrop {
 check:backdrop:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-backdrop-insensitive-dark.png"), 
url("assets/checkbox-unchecked-backdrop-insensitive-dark 2 png"));
   icon-shadow: none; }
-  check:backdrop:insensitive button.flat, check:backdrop:insensitive .sidebar-button.button, 
check:backdrop:insensitive .header-bar button.titlebutton, .header-bar check:backdrop:insensitive 
button.titlebutton,
+  check:backdrop:insensitive button.flat, check:backdrop:insensitive .sidebar-button.button, 
check:backdrop:insensitive headerbar button.titlebutton, headerbar check:backdrop:insensitive 
button.titlebutton,
   check:backdrop:insensitive .titlebar button.titlebutton,
   .titlebar check:backdrop:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -2581,7 +2625,7 @@ check:backdrop:insensitive {
 check:inconsistent {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark 2 
png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  check:inconsistent button.flat, check:inconsistent .sidebar-button.button, check:inconsistent .header-bar 
button.titlebutton, .header-bar check:inconsistent button.titlebutton,
+  check:inconsistent button.flat, check:inconsistent .sidebar-button.button, check:inconsistent headerbar 
button.titlebutton, headerbar check:inconsistent button.titlebutton,
   check:inconsistent .titlebar button.titlebutton,
   .titlebar check:inconsistent button.titlebutton {
     icon-shadow: none; }
@@ -2589,7 +2633,7 @@ check:inconsistent {
 check:inconsistent:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-hover-dark.png"), 
url("assets/checkbox-mixed-hover-dark 2 png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  check:inconsistent:hover button.flat, check:inconsistent:hover .sidebar-button.button, 
check:inconsistent:hover .header-bar button.titlebutton, .header-bar check:inconsistent:hover 
button.titlebutton,
+  check:inconsistent:hover button.flat, check:inconsistent:hover .sidebar-button.button, 
check:inconsistent:hover headerbar button.titlebutton, headerbar check:inconsistent:hover button.titlebutton,
   check:inconsistent:hover .titlebar button.titlebutton,
   .titlebar check:inconsistent:hover button.titlebutton {
     icon-shadow: none; }
@@ -2597,7 +2641,7 @@ check:inconsistent:hover {
 check:inconsistent:selected {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-active-dark.png"), 
url("assets/checkbox-mixed-active-dark 2 png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  check:inconsistent:selected button.flat, check:inconsistent:selected .sidebar-button.button, 
check:inconsistent:selected .header-bar button.titlebutton, .header-bar check:inconsistent:selected 
button.titlebutton,
+  check:inconsistent:selected button.flat, check:inconsistent:selected .sidebar-button.button, 
check:inconsistent:selected headerbar button.titlebutton, headerbar check:inconsistent:selected 
button.titlebutton,
   check:inconsistent:selected .titlebar button.titlebutton,
   .titlebar check:inconsistent:selected button.titlebutton {
     icon-shadow: none; }
@@ -2605,7 +2649,7 @@ check:inconsistent:selected {
 check:inconsistent:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-backdrop-dark.png"), 
url("assets/checkbox-mixed-backdrop-dark 2 png"));
   icon-shadow: none; }
-  check:inconsistent:backdrop button.flat, check:inconsistent:backdrop .sidebar-button.button, 
check:inconsistent:backdrop .header-bar button.titlebutton, .header-bar check:inconsistent:backdrop 
button.titlebutton,
+  check:inconsistent:backdrop button.flat, check:inconsistent:backdrop .sidebar-button.button, 
check:inconsistent:backdrop headerbar button.titlebutton, headerbar check:inconsistent:backdrop 
button.titlebutton,
   check:inconsistent:backdrop .titlebar button.titlebutton,
   .titlebar check:inconsistent:backdrop button.titlebutton {
     icon-shadow: none; }
@@ -2613,7 +2657,7 @@ check:inconsistent:backdrop {
 check:inconsistent:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), 
url("assets/checkbox-mixed-insensitive-dark 2 png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  check:inconsistent:insensitive button.flat, check:inconsistent:insensitive .sidebar-button.button, 
check:inconsistent:insensitive .header-bar button.titlebutton, .header-bar check:inconsistent:insensitive 
button.titlebutton,
+  check:inconsistent:insensitive button.flat, check:inconsistent:insensitive .sidebar-button.button, 
check:inconsistent:insensitive headerbar button.titlebutton, headerbar check:inconsistent:insensitive 
button.titlebutton,
   check:inconsistent:insensitive .titlebar button.titlebutton,
   .titlebar check:inconsistent:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -2621,7 +2665,7 @@ check:inconsistent:insensitive {
 check:inconsistent:insensitive:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-backdrop-insensitive-dark.png"), 
url("assets/checkbox-mixed-backdrop-insensitive-dark 2 png"));
   icon-shadow: none; }
-  check:inconsistent:insensitive:backdrop button.flat, check:inconsistent:insensitive:backdrop 
.sidebar-button.button, check:inconsistent:insensitive:backdrop .header-bar button.titlebutton, .header-bar 
check:inconsistent:insensitive:backdrop button.titlebutton,
+  check:inconsistent:insensitive:backdrop button.flat, check:inconsistent:insensitive:backdrop 
.sidebar-button.button, check:inconsistent:insensitive:backdrop headerbar button.titlebutton, headerbar 
check:inconsistent:insensitive:backdrop button.titlebutton,
   check:inconsistent:insensitive:backdrop .titlebar button.titlebutton,
   .titlebar check:inconsistent:insensitive:backdrop button.titlebutton {
     icon-shadow: none; }
@@ -2629,7 +2673,7 @@ check:inconsistent:insensitive:backdrop {
 check:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark 2 
png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  check:checked button.flat, check:checked .sidebar-button.button, check:checked .header-bar 
button.titlebutton, .header-bar check:checked button.titlebutton,
+  check:checked button.flat, check:checked .sidebar-button.button, check:checked headerbar 
button.titlebutton, headerbar check:checked button.titlebutton,
   check:checked .titlebar button.titlebutton,
   .titlebar check:checked button.titlebutton {
     icon-shadow: none; }
@@ -2637,7 +2681,7 @@ check:checked {
 check:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), 
url("assets/checkbox-checked-insensitive-dark 2 png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  check:checked:insensitive button.flat, check:checked:insensitive .sidebar-button.button, 
check:checked:insensitive .header-bar button.titlebutton, .header-bar check:checked:insensitive 
button.titlebutton,
+  check:checked:insensitive button.flat, check:checked:insensitive .sidebar-button.button, 
check:checked:insensitive headerbar button.titlebutton, headerbar check:checked:insensitive 
button.titlebutton,
   check:checked:insensitive .titlebar button.titlebutton,
   .titlebar check:checked:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -2645,7 +2689,7 @@ check:checked:insensitive {
 check:checked:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-hover-dark.png"), 
url("assets/checkbox-checked-hover-dark 2 png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  check:checked:hover button.flat, check:checked:hover .sidebar-button.button, check:checked:hover 
.header-bar button.titlebutton, .header-bar check:checked:hover button.titlebutton,
+  check:checked:hover button.flat, check:checked:hover .sidebar-button.button, check:checked:hover headerbar 
button.titlebutton, headerbar check:checked:hover button.titlebutton,
   check:checked:hover .titlebar button.titlebutton,
   .titlebar check:checked:hover button.titlebutton {
     icon-shadow: none; }
@@ -2653,7 +2697,7 @@ check:checked:hover {
 check:checked:active {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-active-dark.png"), 
url("assets/checkbox-checked-active-dark 2 png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  check:checked:active button.flat, check:checked:active .sidebar-button.button, check:checked:active 
.header-bar button.titlebutton, .header-bar check:checked:active button.titlebutton,
+  check:checked:active button.flat, check:checked:active .sidebar-button.button, check:checked:active 
headerbar button.titlebutton, headerbar check:checked:active button.titlebutton,
   check:checked:active .titlebar button.titlebutton,
   .titlebar check:checked:active button.titlebutton {
     icon-shadow: none; }
@@ -2661,7 +2705,7 @@ check:checked:active {
 check:backdrop:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-dark.png"), 
url("assets/checkbox-checked-backdrop-dark 2 png"));
   icon-shadow: none; }
-  check:backdrop:checked button.flat, check:backdrop:checked .sidebar-button.button, check:backdrop:checked 
.header-bar button.titlebutton, .header-bar check:backdrop:checked button.titlebutton,
+  check:backdrop:checked button.flat, check:backdrop:checked .sidebar-button.button, check:backdrop:checked 
headerbar button.titlebutton, headerbar check:backdrop:checked button.titlebutton,
   check:backdrop:checked .titlebar button.titlebutton,
   .titlebar check:backdrop:checked button.titlebutton {
     icon-shadow: none; }
@@ -2669,7 +2713,7 @@ check:backdrop:checked {
 check:backdrop:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-insensitive-dark.png"), 
url("assets/checkbox-checked-backdrop-insensitive-dark 2 png"));
   icon-shadow: none; }
-  check:backdrop:checked:insensitive button.flat, check:backdrop:checked:insensitive .sidebar-button.button, 
check:backdrop:checked:insensitive .header-bar button.titlebutton, .header-bar 
check:backdrop:checked:insensitive button.titlebutton,
+  check:backdrop:checked:insensitive button.flat, check:backdrop:checked:insensitive .sidebar-button.button, 
check:backdrop:checked:insensitive headerbar button.titlebutton, headerbar check:backdrop:checked:insensitive 
button.titlebutton,
   check:backdrop:checked:insensitive .titlebar button.titlebutton,
   .titlebar check:backdrop:checked:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -2690,7 +2734,7 @@ check:backdrop:checked:insensitive {
 radio {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark 2 
png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  radio button.flat, radio .sidebar-button.button, radio .header-bar button.titlebutton, .header-bar radio 
button.titlebutton,
+  radio button.flat, radio .sidebar-button.button, radio headerbar button.titlebutton, headerbar radio 
button.titlebutton,
   radio .titlebar button.titlebutton,
   .titlebar radio button.titlebutton {
     icon-shadow: none; }
@@ -2698,7 +2742,7 @@ radio {
 radio:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-hover-dark.png"), 
url("assets/radio-unchecked-hover-dark 2 png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  radio:hover button.flat, radio:hover .sidebar-button.button, radio:hover .header-bar button.titlebutton, 
.header-bar radio:hover button.titlebutton,
+  radio:hover button.flat, radio:hover .sidebar-button.button, radio:hover headerbar button.titlebutton, 
headerbar radio:hover button.titlebutton,
   radio:hover .titlebar button.titlebutton,
   .titlebar radio:hover button.titlebutton {
     icon-shadow: none; }
@@ -2706,7 +2750,7 @@ radio:hover {
 radio:active {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-active-dark.png"), 
url("assets/radio-unchecked-active-dark 2 png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  radio:active button.flat, radio:active .sidebar-button.button, radio:active .header-bar 
button.titlebutton, .header-bar radio:active button.titlebutton,
+  radio:active button.flat, radio:active .sidebar-button.button, radio:active headerbar button.titlebutton, 
headerbar radio:active button.titlebutton,
   radio:active .titlebar button.titlebutton,
   .titlebar radio:active button.titlebutton {
     icon-shadow: none; }
@@ -2714,7 +2758,7 @@ radio:active {
 radio:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), 
url("assets/radio-unchecked-insensitive-dark 2 png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  radio:insensitive button.flat, radio:insensitive .sidebar-button.button, radio:insensitive .header-bar 
button.titlebutton, .header-bar radio:insensitive button.titlebutton,
+  radio:insensitive button.flat, radio:insensitive .sidebar-button.button, radio:insensitive headerbar 
button.titlebutton, headerbar radio:insensitive button.titlebutton,
   radio:insensitive .titlebar button.titlebutton,
   .titlebar radio:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -2722,7 +2766,7 @@ radio:insensitive {
 radio:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-backdrop-dark.png"), 
url("assets/radio-unchecked-backdrop-dark 2 png"));
   icon-shadow: none; }
-  radio:backdrop button.flat, radio:backdrop .sidebar-button.button, radio:backdrop .header-bar 
button.titlebutton, .header-bar radio:backdrop button.titlebutton,
+  radio:backdrop button.flat, radio:backdrop .sidebar-button.button, radio:backdrop headerbar 
button.titlebutton, headerbar radio:backdrop button.titlebutton,
   radio:backdrop .titlebar button.titlebutton,
   .titlebar radio:backdrop button.titlebutton {
     icon-shadow: none; }
@@ -2730,7 +2774,7 @@ radio:backdrop {
 radio:backdrop:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-backdrop-insensitive-dark.png"), 
url("assets/radio-unchecked-backdrop-insensitive-dark 2 png"));
   icon-shadow: none; }
-  radio:backdrop:insensitive button.flat, radio:backdrop:insensitive .sidebar-button.button, 
radio:backdrop:insensitive .header-bar button.titlebutton, .header-bar radio:backdrop:insensitive 
button.titlebutton,
+  radio:backdrop:insensitive button.flat, radio:backdrop:insensitive .sidebar-button.button, 
radio:backdrop:insensitive headerbar button.titlebutton, headerbar radio:backdrop:insensitive 
button.titlebutton,
   radio:backdrop:insensitive .titlebar button.titlebutton,
   .titlebar radio:backdrop:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -2738,7 +2782,7 @@ radio:backdrop:insensitive {
 radio:inconsistent {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark 2 png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  radio:inconsistent button.flat, radio:inconsistent .sidebar-button.button, radio:inconsistent .header-bar 
button.titlebutton, .header-bar radio:inconsistent button.titlebutton,
+  radio:inconsistent button.flat, radio:inconsistent .sidebar-button.button, radio:inconsistent headerbar 
button.titlebutton, headerbar radio:inconsistent button.titlebutton,
   radio:inconsistent .titlebar button.titlebutton,
   .titlebar radio:inconsistent button.titlebutton {
     icon-shadow: none; }
@@ -2746,7 +2790,7 @@ radio:inconsistent {
 radio:inconsistent:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-hover-dark.png"), url("assets/radio-mixed-hover-dark 
2 png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  radio:inconsistent:hover button.flat, radio:inconsistent:hover .sidebar-button.button, 
radio:inconsistent:hover .header-bar button.titlebutton, .header-bar radio:inconsistent:hover 
button.titlebutton,
+  radio:inconsistent:hover button.flat, radio:inconsistent:hover .sidebar-button.button, 
radio:inconsistent:hover headerbar button.titlebutton, headerbar radio:inconsistent:hover button.titlebutton,
   radio:inconsistent:hover .titlebar button.titlebutton,
   .titlebar radio:inconsistent:hover button.titlebutton {
     icon-shadow: none; }
@@ -2754,7 +2798,7 @@ radio:inconsistent:hover {
 radio:inconsistent:selected {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active-dark.png"), 
url("assets/radio-mixed-active-dark 2 png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  radio:inconsistent:selected button.flat, radio:inconsistent:selected .sidebar-button.button, 
radio:inconsistent:selected .header-bar button.titlebutton, .header-bar radio:inconsistent:selected 
button.titlebutton,
+  radio:inconsistent:selected button.flat, radio:inconsistent:selected .sidebar-button.button, 
radio:inconsistent:selected headerbar button.titlebutton, headerbar radio:inconsistent:selected 
button.titlebutton,
   radio:inconsistent:selected .titlebar button.titlebutton,
   .titlebar radio:inconsistent:selected button.titlebutton {
     icon-shadow: none; }
@@ -2762,7 +2806,7 @@ radio:inconsistent:selected {
 radio:inconsistent:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-backdrop-dark.png"), 
url("assets/radio-mixed-backdrop-dark 2 png"));
   icon-shadow: none; }
-  radio:inconsistent:backdrop button.flat, radio:inconsistent:backdrop .sidebar-button.button, 
radio:inconsistent:backdrop .header-bar button.titlebutton, .header-bar radio:inconsistent:backdrop 
button.titlebutton,
+  radio:inconsistent:backdrop button.flat, radio:inconsistent:backdrop .sidebar-button.button, 
radio:inconsistent:backdrop headerbar button.titlebutton, headerbar radio:inconsistent:backdrop 
button.titlebutton,
   radio:inconsistent:backdrop .titlebar button.titlebutton,
   .titlebar radio:inconsistent:backdrop button.titlebutton {
     icon-shadow: none; }
@@ -2770,7 +2814,7 @@ radio:inconsistent:backdrop {
 radio:inconsistent:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), 
url("assets/radio-mixed-insensitive-dark 2 png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  radio:inconsistent:insensitive button.flat, radio:inconsistent:insensitive .sidebar-button.button, 
radio:inconsistent:insensitive .header-bar button.titlebutton, .header-bar radio:inconsistent:insensitive 
button.titlebutton,
+  radio:inconsistent:insensitive button.flat, radio:inconsistent:insensitive .sidebar-button.button, 
radio:inconsistent:insensitive headerbar button.titlebutton, headerbar radio:inconsistent:insensitive 
button.titlebutton,
   radio:inconsistent:insensitive .titlebar button.titlebutton,
   .titlebar radio:inconsistent:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -2778,7 +2822,7 @@ radio:inconsistent:insensitive {
 radio:inconsistent:insensitive:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-backdrop-insensitive-dark.png"), 
url("assets/radio-mixed-backdrop-insensitive-dark 2 png"));
   icon-shadow: none; }
-  radio:inconsistent:insensitive:backdrop button.flat, radio:inconsistent:insensitive:backdrop 
.sidebar-button.button, radio:inconsistent:insensitive:backdrop .header-bar button.titlebutton, .header-bar 
radio:inconsistent:insensitive:backdrop button.titlebutton,
+  radio:inconsistent:insensitive:backdrop button.flat, radio:inconsistent:insensitive:backdrop 
.sidebar-button.button, radio:inconsistent:insensitive:backdrop headerbar button.titlebutton, headerbar 
radio:inconsistent:insensitive:backdrop button.titlebutton,
   radio:inconsistent:insensitive:backdrop .titlebar button.titlebutton,
   .titlebar radio:inconsistent:insensitive:backdrop button.titlebutton {
     icon-shadow: none; }
@@ -2786,7 +2830,7 @@ radio:inconsistent:insensitive:backdrop {
 radio:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark 2 
png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  radio:checked button.flat, radio:checked .sidebar-button.button, radio:checked .header-bar 
button.titlebutton, .header-bar radio:checked button.titlebutton,
+  radio:checked button.flat, radio:checked .sidebar-button.button, radio:checked headerbar 
button.titlebutton, headerbar radio:checked button.titlebutton,
   radio:checked .titlebar button.titlebutton,
   .titlebar radio:checked button.titlebutton {
     icon-shadow: none; }
@@ -2794,7 +2838,7 @@ radio:checked {
 radio:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), 
url("assets/radio-checked-insensitive-dark 2 png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  radio:checked:insensitive button.flat, radio:checked:insensitive .sidebar-button.button, 
radio:checked:insensitive .header-bar button.titlebutton, .header-bar radio:checked:insensitive 
button.titlebutton,
+  radio:checked:insensitive button.flat, radio:checked:insensitive .sidebar-button.button, 
radio:checked:insensitive headerbar button.titlebutton, headerbar radio:checked:insensitive 
button.titlebutton,
   radio:checked:insensitive .titlebar button.titlebutton,
   .titlebar radio:checked:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -2802,7 +2846,7 @@ radio:checked:insensitive {
 radio:checked:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-hover-dark.png"), 
url("assets/radio-checked-hover-dark 2 png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  radio:checked:hover button.flat, radio:checked:hover .sidebar-button.button, radio:checked:hover 
.header-bar button.titlebutton, .header-bar radio:checked:hover button.titlebutton,
+  radio:checked:hover button.flat, radio:checked:hover .sidebar-button.button, radio:checked:hover headerbar 
button.titlebutton, headerbar radio:checked:hover button.titlebutton,
   radio:checked:hover .titlebar button.titlebutton,
   .titlebar radio:checked:hover button.titlebutton {
     icon-shadow: none; }
@@ -2810,7 +2854,7 @@ radio:checked:hover {
 radio:checked:active {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-active-dark.png"), 
url("assets/radio-checked-active-dark 2 png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  radio:checked:active button.flat, radio:checked:active .sidebar-button.button, radio:checked:active 
.header-bar button.titlebutton, .header-bar radio:checked:active button.titlebutton,
+  radio:checked:active button.flat, radio:checked:active .sidebar-button.button, radio:checked:active 
headerbar button.titlebutton, headerbar radio:checked:active button.titlebutton,
   radio:checked:active .titlebar button.titlebutton,
   .titlebar radio:checked:active button.titlebutton {
     icon-shadow: none; }
@@ -2818,7 +2862,7 @@ radio:checked:active {
 radio:backdrop:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop-dark.png"), 
url("assets/radio-checked-backdrop-dark 2 png"));
   icon-shadow: none; }
-  radio:backdrop:checked button.flat, radio:backdrop:checked .sidebar-button.button, radio:backdrop:checked 
.header-bar button.titlebutton, .header-bar radio:backdrop:checked button.titlebutton,
+  radio:backdrop:checked button.flat, radio:backdrop:checked .sidebar-button.button, radio:backdrop:checked 
headerbar button.titlebutton, headerbar radio:backdrop:checked button.titlebutton,
   radio:backdrop:checked .titlebar button.titlebutton,
   .titlebar radio:backdrop:checked button.titlebutton {
     icon-shadow: none; }
@@ -2826,7 +2870,7 @@ radio:backdrop:checked {
 radio:backdrop:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop-insensitive-dark.png"), 
url("assets/radio-checked-backdrop-insensitive-dark 2 png"));
   icon-shadow: none; }
-  radio:backdrop:checked:insensitive button.flat, radio:backdrop:checked:insensitive .sidebar-button.button, 
radio:backdrop:checked:insensitive .header-bar button.titlebutton, .header-bar 
radio:backdrop:checked:insensitive button.titlebutton,
+  radio:backdrop:checked:insensitive button.flat, radio:backdrop:checked:insensitive .sidebar-button.button, 
radio:backdrop:checked:insensitive headerbar button.titlebutton, headerbar radio:backdrop:checked:insensitive 
button.titlebutton,
   radio:backdrop:checked:insensitive .titlebar button.titlebutton,
   .titlebar radio:backdrop:checked:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -3540,7 +3584,7 @@ separator {
   text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
   icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
-  .list-row:selected button.flat, .list-row:selected .sidebar-button.button, .list-row:selected .header-bar 
button.titlebutton, .header-bar .list-row:selected button.titlebutton,
+  .list-row:selected button.flat, .list-row:selected .sidebar-button.button, .list-row:selected headerbar 
button.titlebutton, headerbar .list-row:selected button.titlebutton,
   .list-row:selected .titlebar button.titlebutton,
   .titlebar .list-row:selected button.titlebutton {
     border-color: transparent;
@@ -3566,7 +3610,7 @@ separator {
     text-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
     box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
-  .list-row:selected button:backdrop, .list-row:selected button.flat:backdrop, .list-row:selected 
.sidebar-button.button:backdrop, .list-row:selected .header-bar button.titlebutton:backdrop, .header-bar 
.list-row:selected button.titlebutton:backdrop,
+  .list-row:selected button:backdrop, .list-row:selected button.flat:backdrop, .list-row:selected 
.sidebar-button.button:backdrop, .list-row:selected headerbar button.titlebutton:backdrop, headerbar 
.list-row:selected button.titlebutton:backdrop,
   .list-row:selected .titlebar button.titlebutton:backdrop,
   .titlebar .list-row:selected button.titlebutton:backdrop {
     color: #949796;
@@ -3575,16 +3619,16 @@ separator {
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    .list-row:selected button:backdrop:active, .list-row:selected button:backdrop:checked, 
.list-row:selected button.flat:backdrop:active, .list-row:selected .sidebar-button.button:backdrop:active, 
.list-row:selected .header-bar button.titlebutton:backdrop:active, .header-bar .list-row:selected 
button.titlebutton:backdrop:active,
+    .list-row:selected button:backdrop:active, .list-row:selected button:backdrop:checked, 
.list-row:selected button.flat:backdrop:active, .list-row:selected .sidebar-button.button:backdrop:active, 
.list-row:selected headerbar button.titlebutton:backdrop:active, headerbar .list-row:selected 
button.titlebutton:backdrop:active,
     .list-row:selected .titlebar button.titlebutton:backdrop:active,
-    .titlebar .list-row:selected button.titlebutton:backdrop:active, .list-row:selected 
button.flat:backdrop:checked, .list-row:selected .sidebar-button.button:backdrop:checked, .list-row:selected 
.header-bar button.titlebutton:backdrop:checked, .header-bar .list-row:selected 
button.titlebutton:backdrop:checked,
+    .titlebar .list-row:selected button.titlebutton:backdrop:active, .list-row:selected 
button.flat:backdrop:checked, .list-row:selected .sidebar-button.button:backdrop:checked, .list-row:selected 
headerbar button.titlebutton:backdrop:checked, headerbar .list-row:selected 
button.titlebutton:backdrop:checked,
     .list-row:selected .titlebar button.titlebutton:backdrop:checked,
     .titlebar .list-row:selected button.titlebutton:backdrop:checked {
       color: #949796;
       border-color: #1f2222;
       background-image: linear-gradient(to bottom, #303535);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    .list-row:selected button:backdrop:insensitive, .list-row:selected button.flat:backdrop:insensitive, 
.list-row:selected .sidebar-button.button:backdrop:insensitive, .list-row:selected .header-bar 
button.titlebutton:backdrop:insensitive, .header-bar .list-row:selected 
button.titlebutton:backdrop:insensitive,
+    .list-row:selected button:backdrop:insensitive, .list-row:selected button.flat:backdrop:insensitive, 
.list-row:selected .sidebar-button.button:backdrop:insensitive, .list-row:selected headerbar 
button.titlebutton:backdrop:insensitive, headerbar .list-row:selected button.titlebutton:backdrop:insensitive,
     .list-row:selected .titlebar button.titlebutton:backdrop:insensitive,
     .titlebar .list-row:selected button.titlebutton:backdrop:insensitive {
       color: #5d6767;
@@ -3593,29 +3637,29 @@ separator {
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .list-row:selected button:backdrop:insensitive > .label, .list-row:selected .header-bar 
button.titlebutton:backdrop:insensitive > .label,
-      .list-row:selected .titlebar button.titlebutton:backdrop:insensitive > .label, .list-row:selected 
button.flat:backdrop:insensitive > .label, .list-row:selected .sidebar-button.button:backdrop:insensitive > 
.label, .list-row:selected .header-bar button.titlebutton:backdrop:insensitive > .label, .header-bar 
.list-row:selected button.titlebutton:backdrop:insensitive > .label,
+      .list-row:selected button:backdrop:insensitive > .label, .list-row:selected headerbar 
button.titlebutton:backdrop:insensitive > .label,
+      .list-row:selected .titlebar button.titlebutton:backdrop:insensitive > .label, .list-row:selected 
button.flat:backdrop:insensitive > .label, .list-row:selected .sidebar-button.button:backdrop:insensitive > 
.label, .list-row:selected headerbar button.titlebutton:backdrop:insensitive > .label, headerbar 
.list-row:selected button.titlebutton:backdrop:insensitive > .label,
       .list-row:selected .titlebar button.titlebutton:backdrop:insensitive > .label,
       .titlebar .list-row:selected button.titlebutton:backdrop:insensitive > .label {
         color: inherit; }
-      .list-row:selected button:backdrop:insensitive:active, .list-row:selected 
button:backdrop:insensitive:checked, .list-row:selected button.flat:backdrop:insensitive:active, 
.list-row:selected .sidebar-button.button:backdrop:insensitive:active, .list-row:selected .header-bar 
button.titlebutton:backdrop:insensitive:active, .header-bar .list-row:selected 
button.titlebutton:backdrop:insensitive:active,
+      .list-row:selected button:backdrop:insensitive:active, .list-row:selected 
button:backdrop:insensitive:checked, .list-row:selected button.flat:backdrop:insensitive:active, 
.list-row:selected .sidebar-button.button:backdrop:insensitive:active, .list-row:selected headerbar 
button.titlebutton:backdrop:insensitive:active, headerbar .list-row:selected 
button.titlebutton:backdrop:insensitive:active,
       .list-row:selected .titlebar button.titlebutton:backdrop:insensitive:active,
-      .titlebar .list-row:selected button.titlebutton:backdrop:insensitive:active, .list-row:selected 
button.flat:backdrop:insensitive:checked, .list-row:selected 
.sidebar-button.button:backdrop:insensitive:checked, .list-row:selected .header-bar 
button.titlebutton:backdrop:insensitive:checked, .header-bar .list-row:selected 
button.titlebutton:backdrop:insensitive:checked,
+      .titlebar .list-row:selected button.titlebutton:backdrop:insensitive:active, .list-row:selected 
button.flat:backdrop:insensitive:checked, .list-row:selected 
.sidebar-button.button:backdrop:insensitive:checked, .list-row:selected headerbar 
button.titlebutton:backdrop:insensitive:checked, headerbar .list-row:selected 
button.titlebutton:backdrop:insensitive:checked,
       .list-row:selected .titlebar button.titlebutton:backdrop:insensitive:checked,
       .titlebar .list-row:selected button.titlebutton:backdrop:insensitive:checked {
         color: #5d6767;
         border-color: #1f2222;
         background-image: linear-gradient(to bottom, #272929);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        .list-row:selected button:backdrop:insensitive:active > .label, .list-row:selected .header-bar 
button.titlebutton:backdrop:insensitive:active > .label,
-        .list-row:selected .titlebar button.titlebutton:backdrop:insensitive:active > .label, 
.list-row:selected button:backdrop:insensitive:checked > .label, .list-row:selected .header-bar 
button.titlebutton:backdrop:insensitive:checked > .label,
-        .list-row:selected .titlebar button.titlebutton:backdrop:insensitive:checked > .label, 
.list-row:selected button.flat:backdrop:insensitive:active > .label, .list-row:selected 
.sidebar-button.button:backdrop:insensitive:active > .label, .list-row:selected .header-bar 
button.titlebutton:backdrop:insensitive:active > .label, .header-bar .list-row:selected 
button.titlebutton:backdrop:insensitive:active > .label,
+        .list-row:selected button:backdrop:insensitive:active > .label, .list-row:selected headerbar 
button.titlebutton:backdrop:insensitive:active > .label,
+        .list-row:selected .titlebar button.titlebutton:backdrop:insensitive:active > .label, 
.list-row:selected button:backdrop:insensitive:checked > .label, .list-row:selected headerbar 
button.titlebutton:backdrop:insensitive:checked > .label,
+        .list-row:selected .titlebar button.titlebutton:backdrop:insensitive:checked > .label, 
.list-row:selected button.flat:backdrop:insensitive:active > .label, .list-row:selected 
.sidebar-button.button:backdrop:insensitive:active > .label, .list-row:selected headerbar 
button.titlebutton:backdrop:insensitive:active > .label, headerbar .list-row:selected 
button.titlebutton:backdrop:insensitive:active > .label,
         .list-row:selected .titlebar button.titlebutton:backdrop:insensitive:active > .label,
-        .titlebar .list-row:selected button.titlebutton:backdrop:insensitive:active > .label, 
.list-row:selected button.flat:backdrop:insensitive:checked > .label, .list-row:selected 
.sidebar-button.button:backdrop:insensitive:checked > .label, .list-row:selected .header-bar 
button.titlebutton:backdrop:insensitive:checked > .label, .header-bar .list-row:selected 
button.titlebutton:backdrop:insensitive:checked > .label,
+        .titlebar .list-row:selected button.titlebutton:backdrop:insensitive:active > .label, 
.list-row:selected button.flat:backdrop:insensitive:checked > .label, .list-row:selected 
.sidebar-button.button:backdrop:insensitive:checked > .label, .list-row:selected headerbar 
button.titlebutton:backdrop:insensitive:checked > .label, headerbar .list-row:selected 
button.titlebutton:backdrop:insensitive:checked > .label,
         .list-row:selected .titlebar button.titlebutton:backdrop:insensitive:checked > .label,
         .titlebar .list-row:selected button.titlebutton:backdrop:insensitive:checked > .label {
           color: inherit; }
-  .list-row:selected button.flat:backdrop, .list-row:selected .sidebar-button.button:backdrop, 
.list-row:selected .header-bar button.titlebutton:backdrop, .header-bar .list-row:selected 
button.titlebutton:backdrop,
+  .list-row:selected button.flat:backdrop, .list-row:selected .sidebar-button.button:backdrop, 
.list-row:selected headerbar button.titlebutton:backdrop, headerbar .list-row:selected 
button.titlebutton:backdrop,
   .list-row:selected .titlebar button.titlebutton:backdrop,
   .titlebar .list-row:selected button.titlebutton:backdrop {
     border-color: transparent;
@@ -3632,7 +3676,7 @@ separator {
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    .list-row:selected button:insensitive > .label, .list-row:selected .header-bar 
button.titlebutton:insensitive > .label,
+    .list-row:selected button:insensitive > .label, .list-row:selected headerbar 
button.titlebutton:insensitive > .label,
     .list-row:selected .titlebar button.titlebutton:insensitive > .label {
       color: inherit; }
     .list-row:selected button:insensitive:active, .list-row:selected button:insensitive:checked {
@@ -3640,8 +3684,8 @@ separator {
       border-color: #1c1f1f;
       background-image: linear-gradient(to bottom, #313434, #333636);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .list-row:selected button:insensitive:active > .label, .list-row:selected .header-bar 
button.titlebutton:insensitive:active > .label,
-      .list-row:selected .titlebar button.titlebutton:insensitive:active > .label, .list-row:selected 
button:insensitive:checked > .label, .list-row:selected .header-bar button.titlebutton:insensitive:checked > 
.label,
+      .list-row:selected button:insensitive:active > .label, .list-row:selected headerbar 
button.titlebutton:insensitive:active > .label,
+      .list-row:selected .titlebar button.titlebutton:insensitive:active > .label, .list-row:selected 
button:insensitive:checked > .label, .list-row:selected headerbar button.titlebutton:insensitive:checked > 
.label,
       .list-row:selected .titlebar button.titlebutton:insensitive:checked > .label {
         color: inherit; }
 
@@ -3664,7 +3708,7 @@ separator {
   .app-notification:backdrop,
   .app-notification.frame:backdrop {
     background-image: none; }
-  .app-notification button, .app-notification .header-bar button.titlebutton, .header-bar .app-notification 
button.titlebutton,
+  .app-notification button, .app-notification headerbar button.titlebutton, headerbar .app-notification 
button.titlebutton,
   .app-notification .titlebar button.titlebutton,
   .titlebar .app-notification button.titlebutton,
   .app-notification.frame button {
@@ -3676,13 +3720,13 @@ separator {
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
     outline-color: rgba(238, 238, 236, 0.3); }
-    .app-notification button.flat, .app-notification .sidebar-button.button, .app-notification .header-bar 
button.titlebutton, .header-bar .app-notification button.titlebutton,
+    .app-notification button.flat, .app-notification .sidebar-button.button, .app-notification headerbar 
button.titlebutton, headerbar .app-notification button.titlebutton,
     .app-notification .titlebar button.titlebutton,
     .titlebar .app-notification button.titlebutton,
     .app-notification.frame button.flat,
     .app-notification.frame .sidebar-button.button,
-    .app-notification.frame .header-bar button.titlebutton,
-    .header-bar .app-notification.frame button.titlebutton,
+    .app-notification.frame headerbar button.titlebutton,
+    headerbar .app-notification.frame button.titlebutton,
     .app-notification.frame .titlebar button.titlebutton,
     .titlebar .app-notification.frame button.titlebutton {
       icon-shadow: 0 1px black;
@@ -3815,7 +3859,7 @@ calendar {
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    .message-dialog.csd .dialog-action-area button:insensitive > .label, .message-dialog.csd 
.dialog-action-area .header-bar button.titlebutton:insensitive > .label,
+    .message-dialog.csd .dialog-action-area button:insensitive > .label, .message-dialog.csd 
.dialog-action-area headerbar button.titlebutton:insensitive > .label,
     .message-dialog.csd .dialog-action-area .titlebar button.titlebutton:insensitive > .label {
       color: inherit; }
   .message-dialog.csd .dialog-action-area button:backdrop {
@@ -3832,7 +3876,7 @@ calendar {
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    .message-dialog.csd .dialog-action-area button:backdrop:insensitive > .label, .message-dialog.csd 
.dialog-action-area .header-bar button.titlebutton:backdrop:insensitive > .label,
+    .message-dialog.csd .dialog-action-area button:backdrop:insensitive > .label, .message-dialog.csd 
.dialog-action-area headerbar button.titlebutton:backdrop:insensitive > .label,
     .message-dialog.csd .dialog-action-area .titlebar button.titlebutton:backdrop:insensitive > .label {
       color: inherit; }
   .message-dialog.csd .dialog-action-area button.suggested-action {
@@ -3873,7 +3917,7 @@ calendar {
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        .message-dialog.csd .dialog-action-area button.suggested-action:backdrop:insensitive > .label, 
.message-dialog.csd .dialog-action-area .header-bar button.suggested-action.titlebutton:backdrop:insensitive 
.label,
+        .message-dialog.csd .dialog-action-area button.suggested-action:backdrop:insensitive > .label, 
.message-dialog.csd .dialog-action-area headerbar button.suggested-action.titlebutton:backdrop:insensitive > 
.label,
         .message-dialog.csd .dialog-action-area .titlebar 
button.suggested-action.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
     .message-dialog.csd .dialog-action-area button.suggested-action:insensitive {
@@ -3883,7 +3927,7 @@ calendar {
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .message-dialog.csd .dialog-action-area button.suggested-action:insensitive > .label, 
.message-dialog.csd .dialog-action-area .header-bar button.suggested-action.titlebutton:insensitive > .label,
+      .message-dialog.csd .dialog-action-area button.suggested-action:insensitive > .label, 
.message-dialog.csd .dialog-action-area headerbar button.suggested-action.titlebutton:insensitive > .label,
       .message-dialog.csd .dialog-action-area .titlebar button.suggested-action.titlebutton:insensitive > 
.label {
         color: inherit; }
   .message-dialog.csd .dialog-action-area button.destructive-action {
@@ -3924,7 +3968,7 @@ calendar {
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        .message-dialog.csd .dialog-action-area button.destructive-action:backdrop:insensitive > .label, 
.message-dialog.csd .dialog-action-area .header-bar 
button.destructive-action.titlebutton:backdrop:insensitive > .label,
+        .message-dialog.csd .dialog-action-area button.destructive-action:backdrop:insensitive > .label, 
.message-dialog.csd .dialog-action-area headerbar button.destructive-action.titlebutton:backdrop:insensitive 
.label,
         .message-dialog.csd .dialog-action-area .titlebar 
button.destructive-action.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
     .message-dialog.csd .dialog-action-area button.destructive-action:insensitive {
@@ -3934,7 +3978,7 @@ calendar {
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .message-dialog.csd .dialog-action-area button.destructive-action:insensitive > .label, 
.message-dialog.csd .dialog-action-area .header-bar button.destructive-action.titlebutton:insensitive > 
.label,
+      .message-dialog.csd .dialog-action-area button.destructive-action:insensitive > .label, 
.message-dialog.csd .dialog-action-area headerbar button.destructive-action.titlebutton:insensitive > .label,
       .message-dialog.csd .dialog-action-area .titlebar button.destructive-action.titlebutton:insensitive > 
.label {
         color: inherit; }
 .message-dialog.csd .dialog-action-area button, .message-dialog.csd .dialog-action-area button:hover, 
.message-dialog.csd .dialog-action-area button:active, .message-dialog.csd .dialog-action-area 
button:insensitive, .message-dialog.csd .dialog-action-area button:backdrop, .message-dialog.csd 
.dialog-action-area button:backdrop:insensitive, .message-dialog.csd .dialog-action-area 
button.suggested-action, .message-dialog.csd .dialog-action-area button.suggested-action:hover, 
.message-dialog.csd .dialog-action-area button.suggested-action:active, .message-dialog.csd 
.dialog-action-area button.suggested-action:backdrop, .message-dialog.csd .dialog-action-area 
button.suggested-action:backdrop:insensitive, .message-dialog.csd .dialog-action-area 
button.suggested-action:insensitive, .message-dialog.csd .dialog-action-area button.destructive-action, 
.message-dialog.csd .dialog-action-area button.destructive-action:hover, .message-dialog.csd 
.dialog-action-area button.destructive-ac
 tion:active, .message-dialog.csd .dialog-action-area button.destructive-action:backdrop, .message-dialog.csd 
.dialog-action-area button.destructive-action:backdrop:insensitive, .message-dialog.csd .dialog-action-area 
button.destructive-action:insensitive {
@@ -3995,7 +4039,7 @@ GtkPlacesSidebar.sidebar .sidebar-new-bookmark-row {
   border-radius: 100%;
   outline-radius: 100%; }
   .sidebar-button.button.image-button, GtkScaleButton.sidebar-button.button,
-  GtkVolumeButton.sidebar-button.button, .header-bar button.sidebar-button.button.titlebutton,
+  GtkVolumeButton.sidebar-button.button, headerbar button.sidebar-button.button.titlebutton,
   .titlebar button.sidebar-button.button.titlebutton {
     padding: 5px; }
   .sidebar-button.button:not(:hover):not(:active) > image, .sidebar-button.button:backdrop > image {
@@ -4063,22 +4107,22 @@ infobar {
   color: #ffffff;
   text-shadow: 0 1px #184472;
   border-color: #184472; }
-  .info button, .info .header-bar button.titlebutton, .header-bar .info button.titlebutton,
+  .info button, .info headerbar button.titlebutton, headerbar .info button.titlebutton,
   .info .titlebar button.titlebutton,
   .titlebar .info button.titlebutton,
   .question button,
-  .question .header-bar button.titlebutton,
-  .header-bar .question button.titlebutton,
+  .question headerbar button.titlebutton,
+  headerbar .question button.titlebutton,
   .question .titlebar button.titlebutton,
   .titlebar .question button.titlebutton,
   .warning button,
-  .warning .header-bar button.titlebutton,
-  .header-bar .warning button.titlebutton,
+  .warning headerbar button.titlebutton,
+  headerbar .warning button.titlebutton,
   .warning .titlebar button.titlebutton,
   .titlebar .warning button.titlebutton,
   .error button,
-  .error .header-bar button.titlebutton,
-  .header-bar .error button.titlebutton,
+  .error headerbar button.titlebutton,
+  headerbar .error button.titlebutton,
   .error .titlebar button.titlebutton,
   .titlebar .error button.titlebutton {
     color: #ffffff;
@@ -4120,16 +4164,16 @@ infobar {
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .info button:insensitive > .label, .info .header-bar button.titlebutton:insensitive > .label,
+      .info button:insensitive > .label, .info headerbar button.titlebutton:insensitive > .label,
       .info .titlebar button.titlebutton:insensitive > .label,
       .question button:insensitive > .label,
-      .question .header-bar button.titlebutton:insensitive > .label,
+      .question headerbar button.titlebutton:insensitive > .label,
       .question .titlebar button.titlebutton:insensitive > .label,
       .warning button:insensitive > .label,
-      .warning .header-bar button.titlebutton:insensitive > .label,
+      .warning headerbar button.titlebutton:insensitive > .label,
       .warning .titlebar button.titlebutton:insensitive > .label,
       .error button:insensitive > .label,
-      .error .header-bar button.titlebutton:insensitive > .label,
+      .error headerbar button.titlebutton:insensitive > .label,
       .error .titlebar button.titlebutton:insensitive > .label {
         color: inherit; }
     .info button:backdrop,
@@ -4154,16 +4198,16 @@ infobar {
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         border-color: #0b1e33; }
-        .info button:backdrop:insensitive > .label, .info .header-bar 
button.titlebutton:backdrop:insensitive > .label,
+        .info button:backdrop:insensitive > .label, .info headerbar button.titlebutton:backdrop:insensitive 
.label,
         .info .titlebar button.titlebutton:backdrop:insensitive > .label,
         .question button:backdrop:insensitive > .label,
-        .question .header-bar button.titlebutton:backdrop:insensitive > .label,
+        .question headerbar button.titlebutton:backdrop:insensitive > .label,
         .question .titlebar button.titlebutton:backdrop:insensitive > .label,
         .warning button:backdrop:insensitive > .label,
-        .warning .header-bar button.titlebutton:backdrop:insensitive > .label,
+        .warning headerbar button.titlebutton:backdrop:insensitive > .label,
         .warning .titlebar button.titlebutton:backdrop:insensitive > .label,
         .error button:backdrop:insensitive > .label,
-        .error .header-bar button.titlebutton:backdrop:insensitive > .label,
+        .error headerbar button.titlebutton:backdrop:insensitive > .label,
         .error .titlebar button.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
   .info label:selected, .info label:selected:focus, .info label:selected:hover,
@@ -4312,13 +4356,13 @@ GtkColorSwatch {
   .content-view:backdrop {
     background-color: #282c2c; }
 
-.osd .scale-popup button.flat, .osd .scale-popup .sidebar-button.button, .osd .scale-popup .header-bar 
button.titlebutton, .header-bar .osd .scale-popup button.titlebutton,
+.osd .scale-popup button.flat, .osd .scale-popup .sidebar-button.button, .osd .scale-popup headerbar 
button.titlebutton, headerbar .osd .scale-popup button.titlebutton,
 .osd .scale-popup .titlebar button.titlebutton,
 .titlebar .osd .scale-popup button.titlebutton {
   padding: 6px;
   border-style: none;
   border-radius: 5px; }
-.scale-popup button, .scale-popup .header-bar button.titlebutton, .header-bar .scale-popup 
button.titlebutton,
+.scale-popup button, .scale-popup headerbar button.titlebutton, headerbar .scale-popup button.titlebutton,
 .scale-popup .titlebar button.titlebutton,
 .titlebar .scale-popup button.titlebutton {
   padding: 6px; }
@@ -4359,19 +4403,21 @@ decoration {
     border: solid 1px #1f2222;
     box-shadow: none; }
 
-.header-bar button.titlebutton,
+headerbar button.titlebutton,
+headerbar .titlebar button.titlebutton,
+.titlebar headerbar button.titlebutton,
 .titlebar button.titlebutton {
   text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
   icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176); }
-  .header-bar button.titlebutton:backdrop,
+  headerbar button.titlebutton:backdrop,
   .titlebar button.titlebutton:backdrop {
     icon-shadow: none; }
 
-.header-bar.selection-mode button.titlebutton,
+headerbar.selection-mode button.titlebutton,
 .titlebar.selection-mode button.titlebutton {
   text-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
   icon-shadow: 0 -1px rgba(0, 0, 0, 0.70353); }
-  .header-bar.selection-mode button.titlebutton:backdrop,
+  headerbar.selection-mode button.titlebutton:backdrop,
   .titlebar.selection-mode button.titlebutton:backdrop {
     icon-shadow: none; }
 
@@ -4460,7 +4506,7 @@ entry.cursor-handle,
   icon-shadow: 0 1px black; }
   .touch-selection:backdrop {
     text-shadow: none; }
-  .touch-selection button, .touch-selection .header-bar button.titlebutton, .header-bar .touch-selection 
button.titlebutton,
+  .touch-selection button, .touch-selection headerbar button.titlebutton, headerbar .touch-selection 
button.titlebutton,
   .touch-selection .titlebar button.titlebutton,
   .titlebar .touch-selection button.titlebutton {
     color: #eeeeec;
@@ -4682,12 +4728,12 @@ entry.cursor-handle,
   background-origin: content-box;
   background-position: right center; }
 
-button.circular, .header-bar button.circular.titlebutton,
+button.circular, headerbar button.circular.titlebutton,
 .titlebar button.circular.titlebutton {
   border-radius: 20px;
   outline-radius: 20px; }
 
-button.circular label, .header-bar button.circular.titlebutton label,
+button.circular label,
 .titlebar button.circular.titlebutton label {
   padding: 0; }
 
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 71190ef..977f032 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -87,7 +87,7 @@ label:insensitive {
     color: #c7c7c7; }
 
 .dim-label, label.separator, .titlebar .subtitle,
-.header-bar .subtitle {
+headerbar .subtitle {
   opacity: 0.55;
   text-shadow: none; }
 
@@ -314,7 +314,7 @@ entry, spinbutton {
     background-image: -gtk-gradient(radial, center center, 0, center center, 0.01, to(#4a90d9), 
to(transparent)); }
   to {
     background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#4a90d9), 
to(transparent)); } }
-button, .header-bar button.titlebutton,
+button, headerbar button.titlebutton,
 .titlebar button.titlebutton {
   border: 1px solid;
   border-radius: 3px;
@@ -327,7 +327,7 @@ button, .header-bar button.titlebutton,
   text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   box-shadow: inset 0 1px white, 0 1px white; }
-  button.flat, .sidebar-button.button, .header-bar button.titlebutton,
+  button.flat, .sidebar-button.button, headerbar button.titlebutton,
   .titlebar button.titlebutton {
     border-color: transparent;
     background-color: transparent;
@@ -336,14 +336,14 @@ button, .header-bar button.titlebutton,
     text-shadow: none;
     icon-shadow: none;
     transition: none; }
-    button.flat:hover, .sidebar-button.button:hover, .header-bar button.titlebutton:hover,
+    button.flat:hover, .sidebar-button.button:hover, headerbar button.titlebutton:hover,
     .titlebar button.titlebutton:hover {
       transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
       transition-duration: 500ms; }
-      button.flat:hover:active, .sidebar-button.button:hover:active, .header-bar 
button.titlebutton:hover:active,
+      button.flat:hover:active, .sidebar-button.button:hover:active, headerbar 
button.titlebutton:hover:active,
       .titlebar button.titlebutton:hover:active {
         transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
-  button:hover, .header-bar button.titlebutton:hover,
+  button:hover, headerbar button.titlebutton:hover,
   .titlebar button.titlebutton:hover {
     color: #2e3436;
     outline-color: rgba(46, 52, 54, 0.3);
@@ -353,8 +353,8 @@ button, .header-bar button.titlebutton,
     icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     box-shadow: inset 0 1px white, 0 1px white;
     -gtk-image-effect: highlight; }
-  button:active, .header-bar button.titlebutton:active,
-  .titlebar button.titlebutton:active, button:checked, .header-bar button.titlebutton:checked,
+  button:active, headerbar button.titlebutton:active,
+  .titlebar button.titlebutton:active, button:checked, headerbar button.titlebutton:checked,
   .titlebar button.titlebutton:checked {
     color: #2e3436;
     outline-color: rgba(46, 52, 54, 0.3);
@@ -364,8 +364,8 @@ button, .header-bar button.titlebutton,
     icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px white;
     transition-duration: 50ms; }
-  button:backdrop, .header-bar button.titlebutton:backdrop,
-  .titlebar button.titlebutton:backdrop, button.flat:backdrop, .sidebar-button.button:backdrop, .header-bar 
button.titlebutton:backdrop,
+  button:backdrop, headerbar button.titlebutton:backdrop,
+  .titlebar button.titlebutton:backdrop, button.flat:backdrop, .sidebar-button.button:backdrop, headerbar 
button.titlebutton:backdrop,
   .titlebar button.titlebutton:backdrop {
     color: #8e9192;
     border-color: darkgray;
@@ -374,14 +374,14 @@ button, .header-bar button.titlebutton,
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
     -gtk-image-effect: none; }
-    button:backdrop:active, button:backdrop:checked, button.flat:backdrop:active, 
.sidebar-button.button:backdrop:active, .header-bar button.titlebutton:backdrop:active,
-    .titlebar button.titlebutton:backdrop:active, button.flat:backdrop:checked, 
.sidebar-button.button:backdrop:checked, .header-bar button.titlebutton:backdrop:checked,
+    button:backdrop:active, button:backdrop:checked, button.flat:backdrop:active, 
.sidebar-button.button:backdrop:active, headerbar button.titlebutton:backdrop:active,
+    .titlebar button.titlebutton:backdrop:active, button.flat:backdrop:checked, 
.sidebar-button.button:backdrop:checked, headerbar button.titlebutton:backdrop:checked,
     .titlebar button.titlebutton:backdrop:checked {
       color: #8e9192;
       border-color: darkgray;
       background-image: linear-gradient(to bottom, #d5d5d5);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-    button:backdrop:insensitive, button.flat:backdrop:insensitive, 
.sidebar-button.button:backdrop:insensitive, .header-bar button.titlebutton:backdrop:insensitive,
+    button:backdrop:insensitive, button.flat:backdrop:insensitive, 
.sidebar-button.button:backdrop:insensitive, headerbar button.titlebutton:backdrop:insensitive,
     .titlebar button.titlebutton:backdrop:insensitive {
       color: #c7c7c7;
       border-color: darkgray;
@@ -389,26 +389,26 @@ button, .header-bar button.titlebutton,
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-      button:backdrop:insensitive > .label, .header-bar button.titlebutton:backdrop:insensitive > .label,
-      .titlebar button.titlebutton:backdrop:insensitive > .label, button.flat:backdrop:insensitive > .label, 
.sidebar-button.button:backdrop:insensitive > .label, .header-bar button.titlebutton:backdrop:insensitive > 
.label,
+      button:backdrop:insensitive > .label, headerbar button.titlebutton:backdrop:insensitive > .label,
+      .titlebar button.titlebutton:backdrop:insensitive > .label, button.flat:backdrop:insensitive > .label, 
.sidebar-button.button:backdrop:insensitive > .label, headerbar button.titlebutton:backdrop:insensitive > 
.label,
       .titlebar button.titlebutton:backdrop:insensitive > .label {
         color: inherit; }
-    button:backdrop:insensitive:active, button:backdrop:insensitive:checked, 
button.flat:backdrop:insensitive:active, .sidebar-button.button:backdrop:insensitive:active, .header-bar 
button.titlebutton:backdrop:insensitive:active,
-    .titlebar button.titlebutton:backdrop:insensitive:active, button.flat:backdrop:insensitive:checked, 
.sidebar-button.button:backdrop:insensitive:checked, .header-bar 
button.titlebutton:backdrop:insensitive:checked,
+    button:backdrop:insensitive:active, button:backdrop:insensitive:checked, 
button.flat:backdrop:insensitive:active, .sidebar-button.button:backdrop:insensitive:active, headerbar 
button.titlebutton:backdrop:insensitive:active,
+    .titlebar button.titlebutton:backdrop:insensitive:active, button.flat:backdrop:insensitive:checked, 
.sidebar-button.button:backdrop:insensitive:checked, headerbar 
button.titlebutton:backdrop:insensitive:checked,
     .titlebar button.titlebutton:backdrop:insensitive:checked {
       color: #c7c7c7;
       border-color: darkgray;
       background-image: linear-gradient(to bottom, #e7e7e7);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-      button:backdrop:insensitive:active > .label, .header-bar 
button.titlebutton:backdrop:insensitive:active > .label,
-      .titlebar button.titlebutton:backdrop:insensitive:active > .label, button:backdrop:insensitive:checked 
.label, .header-bar button.titlebutton:backdrop:insensitive:checked > .label,
-      .titlebar button.titlebutton:backdrop:insensitive:checked > .label, 
button.flat:backdrop:insensitive:active > .label, .sidebar-button.button:backdrop:insensitive:active > 
.label, .header-bar button.titlebutton:backdrop:insensitive:active > .label,
-      .titlebar button.titlebutton:backdrop:insensitive:active > .label, 
button.flat:backdrop:insensitive:checked > .label, .sidebar-button.button:backdrop:insensitive:checked > 
.label, .header-bar button.titlebutton:backdrop:insensitive:checked > .label,
+      button:backdrop:insensitive:active > .label, headerbar button.titlebutton:backdrop:insensitive:active 
.label,
+      .titlebar button.titlebutton:backdrop:insensitive:active > .label, button:backdrop:insensitive:checked 
.label, headerbar button.titlebutton:backdrop:insensitive:checked > .label,
+      .titlebar button.titlebutton:backdrop:insensitive:checked > .label, 
button.flat:backdrop:insensitive:active > .label, .sidebar-button.button:backdrop:insensitive:active > 
.label, headerbar button.titlebutton:backdrop:insensitive:active > .label,
+      .titlebar button.titlebutton:backdrop:insensitive:active > .label, 
button.flat:backdrop:insensitive:checked > .label, .sidebar-button.button:backdrop:insensitive:checked > 
.label, headerbar button.titlebutton:backdrop:insensitive:checked > .label,
       .titlebar button.titlebutton:backdrop:insensitive:checked > .label {
         color: inherit; }
-  button.flat:backdrop, .sidebar-button.button:backdrop, .header-bar button.titlebutton:backdrop,
-  .titlebar button.titlebutton:backdrop, button.flat:insensitive, .sidebar-button.button:insensitive, 
.header-bar button.titlebutton:insensitive,
-  .titlebar button.titlebutton:insensitive, button.flat:backdrop:insensitive, 
.sidebar-button.button:backdrop:insensitive, .header-bar button.titlebutton:backdrop:insensitive,
+  button.flat:backdrop, .sidebar-button.button:backdrop, headerbar button.titlebutton:backdrop,
+  .titlebar button.titlebutton:backdrop, button.flat:insensitive, .sidebar-button.button:insensitive, 
headerbar button.titlebutton:insensitive,
+  .titlebar button.titlebutton:insensitive, button.flat:backdrop:insensitive, 
.sidebar-button.button:backdrop:insensitive, headerbar button.titlebutton:backdrop:insensitive,
   .titlebar button.titlebutton:backdrop:insensitive {
     border-color: transparent;
     background-color: transparent;
@@ -416,7 +416,7 @@ button, .header-bar button.titlebutton,
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     icon-shadow: none; }
-  button:insensitive, .header-bar button.titlebutton:insensitive,
+  button:insensitive, headerbar button.titlebutton:insensitive,
   .titlebar button.titlebutton:insensitive {
     color: #8e9192;
     border-color: #a1a1a1;
@@ -424,7 +424,7 @@ button, .header-bar button.titlebutton,
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
-    button:insensitive > .label, .header-bar button.titlebutton:insensitive > .label,
+    button:insensitive > .label, headerbar button.titlebutton:insensitive > .label,
     .titlebar button.titlebutton:insensitive > .label {
       color: inherit; }
     button:insensitive:active, button:insensitive:checked {
@@ -432,11 +432,11 @@ button, .header-bar button.titlebutton,
       border-color: #a1a1a1;
       background-image: linear-gradient(to bottom, #ececec, #f4f4f4);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
-      button:insensitive:active > .label, .header-bar button.titlebutton:insensitive:active > .label,
-      .titlebar button.titlebutton:insensitive:active > .label, button:insensitive:checked > .label, 
.header-bar button.titlebutton:insensitive:checked > .label,
+      button:insensitive:active > .label, headerbar button.titlebutton:insensitive:active > .label,
+      .titlebar button.titlebutton:insensitive:active > .label, button:insensitive:checked > .label, 
headerbar button.titlebutton:insensitive:checked > .label,
       .titlebar button.titlebutton:insensitive:checked > .label {
         color: inherit; }
-  button.osd, .header-bar button.osd.titlebutton,
+  button.osd, headerbar button.osd.titlebutton,
   .titlebar button.osd.titlebutton {
     color: #eeeeec;
     border-radius: 5px;
@@ -451,7 +451,7 @@ button, .header-bar button.titlebutton,
     outline-color: rgba(238, 238, 236, 0.3);
     border: none;
     box-shadow: none; }
-    button.osd.image-button, .header-bar button.osd.titlebutton,
+    button.osd.image-button, headerbar button.osd.titlebutton,
     .titlebar button.osd.titlebutton {
       padding: 13px; }
     button.osd:hover {
@@ -494,7 +494,7 @@ button, .header-bar button.titlebutton,
       text-shadow: none;
       icon-shadow: none;
       border: none; }
-  .osd button, .osd .header-bar button.titlebutton, .header-bar .osd button.titlebutton,
+  .osd button, .osd headerbar button.titlebutton, headerbar .osd button.titlebutton,
   .osd .titlebar button.titlebutton,
   .titlebar .osd button.titlebutton {
     color: #eeeeec;
@@ -539,7 +539,7 @@ button, .header-bar button.titlebutton,
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none; }
-    .osd button.flat, .osd .sidebar-button.button, .osd .header-bar button.titlebutton, .header-bar .osd 
button.titlebutton,
+    .osd button.flat, .osd .sidebar-button.button, .osd headerbar button.titlebutton, headerbar .osd 
button.titlebutton,
     .osd .titlebar button.titlebutton,
     .titlebar .osd button.titlebutton {
       border-color: transparent;
@@ -551,7 +551,7 @@ button, .header-bar button.titlebutton,
       box-shadow: none;
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black; }
-      .osd button.flat:hover, .osd .sidebar-button.button:hover, .osd .header-bar button.titlebutton:hover, 
.header-bar .osd button.titlebutton:hover,
+      .osd button.flat:hover, .osd .sidebar-button.button:hover, .osd headerbar button.titlebutton:hover, 
headerbar .osd button.titlebutton:hover,
       .osd .titlebar button.titlebutton:hover,
       .titlebar .osd button.titlebutton:hover {
         color: white;
@@ -565,7 +565,7 @@ button, .header-bar button.titlebutton,
         background-clip: padding-box;
         border-color: transparent;
         box-shadow: none; }
-      .osd button.flat:insensitive, .osd .sidebar-button.button:insensitive, .osd .header-bar 
button.titlebutton:insensitive, .header-bar .osd button.titlebutton:insensitive,
+      .osd button.flat:insensitive, .osd .sidebar-button.button:insensitive, .osd headerbar 
button.titlebutton:insensitive, headerbar .osd button.titlebutton:insensitive,
       .osd .titlebar button.titlebutton:insensitive,
       .titlebar .osd button.titlebutton:insensitive {
         color: #878a89;
@@ -578,7 +578,7 @@ button, .header-bar button.titlebutton,
         background-image: none;
         border-color: transparent;
         box-shadow: none; }
-      .osd button.flat:backdrop, .osd .sidebar-button.button:backdrop, .osd .header-bar 
button.titlebutton:backdrop, .header-bar .osd button.titlebutton:backdrop,
+      .osd button.flat:backdrop, .osd .sidebar-button.button:backdrop, .osd headerbar 
button.titlebutton:backdrop, headerbar .osd button.titlebutton:backdrop,
       .osd .titlebar button.titlebutton:backdrop,
       .titlebar .osd button.titlebutton:backdrop {
         border-color: transparent;
@@ -587,9 +587,9 @@ button, .header-bar button.titlebutton,
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
         text-shadow: none;
         icon-shadow: none; }
-      .osd button.flat:active, .osd .sidebar-button.button:active, .osd .header-bar 
button.titlebutton:active, .header-bar .osd button.titlebutton:active,
+      .osd button.flat:active, .osd .sidebar-button.button:active, .osd headerbar button.titlebutton:active, 
headerbar .osd button.titlebutton:active,
       .osd .titlebar button.titlebutton:active,
-      .titlebar .osd button.titlebutton:active, .osd button.flat:checked, .osd 
.sidebar-button.button:checked, .osd .header-bar button.titlebutton:checked, .header-bar .osd 
button.titlebutton:checked,
+      .titlebar .osd button.titlebutton:active, .osd button.flat:checked, .osd 
.sidebar-button.button:checked, .osd headerbar button.titlebutton:checked, headerbar .osd 
button.titlebutton:checked,
       .osd .titlebar button.titlebutton:checked,
       .titlebar .osd button.titlebutton:checked {
         color: white;
@@ -603,7 +603,7 @@ button, .header-bar button.titlebutton,
         background-clip: padding-box;
         border-color: transparent;
         box-shadow: none; }
-  button.suggested-action, .header-bar button.suggested-action.titlebutton,
+  button.suggested-action, headerbar button.suggested-action.titlebutton,
   .titlebar button.suggested-action.titlebutton {
     color: white;
     outline-color: rgba(255, 255, 255, 0.3);
@@ -612,7 +612,7 @@ button, .header-bar button.titlebutton,
     text-shadow: 0 -1px rgba(0, 0, 0, 0.54353);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.54353);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 1px white; }
-    button.suggested-action.flat, .suggested-action.sidebar-button.button, .header-bar 
button.suggested-action.titlebutton,
+    button.suggested-action.flat, .suggested-action.sidebar-button.button, headerbar 
button.suggested-action.titlebutton,
     .titlebar button.suggested-action.titlebutton {
       border-color: transparent;
       background-color: transparent;
@@ -637,7 +637,7 @@ button, .header-bar button.titlebutton,
       text-shadow: 0 -1px rgba(0, 0, 0, 0.62353);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.62353);
       box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px white; }
-    button.suggested-action:backdrop, button.suggested-action.flat:backdrop, 
.suggested-action.sidebar-button.button:backdrop, .header-bar button.suggested-action.titlebutton:backdrop,
+    button.suggested-action:backdrop, button.suggested-action.flat:backdrop, 
.suggested-action.sidebar-button.button:backdrop, headerbar button.suggested-action.titlebutton:backdrop,
     .titlebar button.suggested-action.titlebutton:backdrop {
       color: #dbe9f7;
       border-color: #4a90d9;
@@ -645,14 +645,14 @@ button, .header-bar button.titlebutton,
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-      button.suggested-action:backdrop:active, button.suggested-action:backdrop:checked, 
button.suggested-action.flat:backdrop:active, .suggested-action.sidebar-button.button:backdrop:active, 
.header-bar button.suggested-action.titlebutton:backdrop:active,
-      .titlebar button.suggested-action.titlebutton:backdrop:active, 
button.suggested-action.flat:backdrop:checked, .suggested-action.sidebar-button.button:backdrop:checked, 
.header-bar button.suggested-action.titlebutton:backdrop:checked,
+      button.suggested-action:backdrop:active, button.suggested-action:backdrop:checked, 
button.suggested-action.flat:backdrop:active, .suggested-action.sidebar-button.button:backdrop:active, 
headerbar button.suggested-action.titlebutton:backdrop:active,
+      .titlebar button.suggested-action.titlebutton:backdrop:active, 
button.suggested-action.flat:backdrop:checked, .suggested-action.sidebar-button.button:backdrop:checked, 
headerbar button.suggested-action.titlebutton:backdrop:checked,
       .titlebar button.suggested-action.titlebutton:backdrop:checked {
         color: #d4e4f4;
         border-color: #2a76c6;
         background-image: linear-gradient(to bottom, #2a76c6);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-      button.suggested-action:backdrop:insensitive, button.suggested-action.flat:backdrop:insensitive, 
.suggested-action.sidebar-button.button:backdrop:insensitive, .header-bar 
button.suggested-action.titlebutton:backdrop:insensitive,
+      button.suggested-action:backdrop:insensitive, button.suggested-action.flat:backdrop:insensitive, 
.suggested-action.sidebar-button.button:backdrop:insensitive, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive,
       .titlebar button.suggested-action.titlebutton:backdrop:insensitive {
         color: #c7c7c7;
         border-color: darkgray;
@@ -660,26 +660,26 @@ button, .header-bar button.titlebutton,
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-        button.suggested-action:backdrop:insensitive > .label, .header-bar 
button.suggested-action.titlebutton:backdrop:insensitive > .label,
-        .titlebar button.suggested-action.titlebutton:backdrop:insensitive > .label, 
button.suggested-action.flat:backdrop:insensitive > .label, 
.suggested-action.sidebar-button.button:backdrop:insensitive > .label, .header-bar 
button.suggested-action.titlebutton:backdrop:insensitive > .label,
+        button.suggested-action:backdrop:insensitive > .label, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive > .label,
+        .titlebar button.suggested-action.titlebutton:backdrop:insensitive > .label, 
button.suggested-action.flat:backdrop:insensitive > .label, 
.suggested-action.sidebar-button.button:backdrop:insensitive > .label, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive > .label,
         .titlebar button.suggested-action.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
-        button.suggested-action:backdrop:insensitive:active, 
button.suggested-action:backdrop:insensitive:checked, 
button.suggested-action.flat:backdrop:insensitive:active, 
.suggested-action.sidebar-button.button:backdrop:insensitive:active, .header-bar 
button.suggested-action.titlebutton:backdrop:insensitive:active,
-        .titlebar button.suggested-action.titlebutton:backdrop:insensitive:active, 
button.suggested-action.flat:backdrop:insensitive:checked, 
.suggested-action.sidebar-button.button:backdrop:insensitive:checked, .header-bar 
button.suggested-action.titlebutton:backdrop:insensitive:checked,
+        button.suggested-action:backdrop:insensitive:active, 
button.suggested-action:backdrop:insensitive:checked, 
button.suggested-action.flat:backdrop:insensitive:active, 
.suggested-action.sidebar-button.button:backdrop:insensitive:active, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive:active,
+        .titlebar button.suggested-action.titlebutton:backdrop:insensitive:active, 
button.suggested-action.flat:backdrop:insensitive:checked, 
.suggested-action.sidebar-button.button:backdrop:insensitive:checked, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive:checked,
         .titlebar button.suggested-action.titlebutton:backdrop:insensitive:checked {
           color: #8db9e8;
           border-color: #5094db;
           background-image: linear-gradient(to bottom, #5094db);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-          button.suggested-action:backdrop:insensitive:active > .label, .header-bar 
button.suggested-action.titlebutton:backdrop:insensitive:active > .label,
-          .titlebar button.suggested-action.titlebutton:backdrop:insensitive:active > .label, 
button.suggested-action:backdrop:insensitive:checked > .label, .header-bar 
button.suggested-action.titlebutton:backdrop:insensitive:checked > .label,
-          .titlebar button.suggested-action.titlebutton:backdrop:insensitive:checked > .label, 
button.suggested-action.flat:backdrop:insensitive:active > .label, 
.suggested-action.sidebar-button.button:backdrop:insensitive:active > .label, .header-bar 
button.suggested-action.titlebutton:backdrop:insensitive:active > .label,
-          .titlebar button.suggested-action.titlebutton:backdrop:insensitive:active > .label, 
button.suggested-action.flat:backdrop:insensitive:checked > .label, 
.suggested-action.sidebar-button.button:backdrop:insensitive:checked > .label, .header-bar 
button.suggested-action.titlebutton:backdrop:insensitive:checked > .label,
+          button.suggested-action:backdrop:insensitive:active > .label, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive:active > .label,
+          .titlebar button.suggested-action.titlebutton:backdrop:insensitive:active > .label, 
button.suggested-action:backdrop:insensitive:checked > .label, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive:checked > .label,
+          .titlebar button.suggested-action.titlebutton:backdrop:insensitive:checked > .label, 
button.suggested-action.flat:backdrop:insensitive:active > .label, 
.suggested-action.sidebar-button.button:backdrop:insensitive:active > .label, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive:active > .label,
+          .titlebar button.suggested-action.titlebutton:backdrop:insensitive:active > .label, 
button.suggested-action.flat:backdrop:insensitive:checked > .label, 
.suggested-action.sidebar-button.button:backdrop:insensitive:checked > .label, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive:checked > .label,
           .titlebar button.suggested-action.titlebutton:backdrop:insensitive:checked > .label {
             color: inherit; }
-    button.suggested-action.flat:backdrop, .suggested-action.sidebar-button.button:backdrop, .header-bar 
button.suggested-action.titlebutton:backdrop,
-    .titlebar button.suggested-action.titlebutton:backdrop, button.suggested-action.flat:insensitive, 
.suggested-action.sidebar-button.button:insensitive, .header-bar 
button.suggested-action.titlebutton:insensitive,
-    .titlebar button.suggested-action.titlebutton:insensitive, 
button.suggested-action.flat:backdrop:insensitive, 
.suggested-action.sidebar-button.button:backdrop:insensitive, .header-bar 
button.suggested-action.titlebutton:backdrop:insensitive,
+    button.suggested-action.flat:backdrop, .suggested-action.sidebar-button.button:backdrop, headerbar 
button.suggested-action.titlebutton:backdrop,
+    .titlebar button.suggested-action.titlebutton:backdrop, button.suggested-action.flat:insensitive, 
.suggested-action.sidebar-button.button:insensitive, headerbar 
button.suggested-action.titlebutton:insensitive,
+    .titlebar button.suggested-action.titlebutton:insensitive, 
button.suggested-action.flat:backdrop:insensitive, 
.suggested-action.sidebar-button.button:backdrop:insensitive, headerbar 
button.suggested-action.titlebutton:backdrop:insensitive,
     .titlebar button.suggested-action.titlebutton:backdrop:insensitive {
       border-color: transparent;
       background-color: transparent;
@@ -695,7 +695,7 @@ button, .header-bar button.titlebutton,
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
-      button.suggested-action:insensitive > .label, .header-bar 
button.suggested-action.titlebutton:insensitive > .label,
+      button.suggested-action:insensitive > .label, headerbar 
button.suggested-action.titlebutton:insensitive > .label,
       .titlebar button.suggested-action.titlebutton:insensitive > .label {
         color: inherit; }
       button.suggested-action:insensitive:active, button.suggested-action:insensitive:checked {
@@ -703,8 +703,8 @@ button, .header-bar button.titlebutton,
         border-color: #1c5187;
         background-image: linear-gradient(to bottom, #4b8dd3, #5094db);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
-        button.suggested-action:insensitive:active > .label, .header-bar 
button.suggested-action.titlebutton:insensitive:active > .label,
-        .titlebar button.suggested-action.titlebutton:insensitive:active > .label, 
button.suggested-action:insensitive:checked > .label, .header-bar 
button.suggested-action.titlebutton:insensitive:checked > .label,
+        button.suggested-action:insensitive:active > .label, headerbar 
button.suggested-action.titlebutton:insensitive:active > .label,
+        .titlebar button.suggested-action.titlebutton:insensitive:active > .label, 
button.suggested-action:insensitive:checked > .label, headerbar 
button.suggested-action.titlebutton:insensitive:checked > .label,
         .titlebar button.suggested-action.titlebutton:insensitive:checked > .label {
           color: inherit; }
     .osd button.suggested-action {
@@ -750,7 +750,7 @@ button, .header-bar button.titlebutton,
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none; }
-  button.destructive-action, .header-bar button.destructive-action.titlebutton,
+  button.destructive-action, headerbar button.destructive-action.titlebutton,
   .titlebar button.destructive-action.titlebutton {
     color: white;
     outline-color: rgba(255, 255, 255, 0.3);
@@ -759,7 +759,7 @@ button, .header-bar button.titlebutton,
     text-shadow: 0 -1px rgba(0, 0, 0, 0.56078);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.56078);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 1px white; }
-    button.destructive-action.flat, .destructive-action.sidebar-button.button, .header-bar 
button.destructive-action.titlebutton,
+    button.destructive-action.flat, .destructive-action.sidebar-button.button, headerbar 
button.destructive-action.titlebutton,
     .titlebar button.destructive-action.titlebutton {
       border-color: transparent;
       background-color: transparent;
@@ -784,7 +784,7 @@ button, .header-bar button.titlebutton,
       text-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
       box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px white; }
-    button.destructive-action:backdrop, button.destructive-action.flat:backdrop, 
.destructive-action.sidebar-button.button:backdrop, .header-bar 
button.destructive-action.titlebutton:backdrop,
+    button.destructive-action:backdrop, button.destructive-action.flat:backdrop, 
.destructive-action.sidebar-button.button:backdrop, headerbar button.destructive-action.titlebutton:backdrop,
     .titlebar button.destructive-action.titlebutton:backdrop {
       color: #fcd4d4;
       border-color: #ef2929;
@@ -792,14 +792,14 @@ button, .header-bar button.titlebutton,
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-      button.destructive-action:backdrop:active, button.destructive-action:backdrop:checked, 
button.destructive-action.flat:backdrop:active, .destructive-action.sidebar-button.button:backdrop:active, 
.header-bar button.destructive-action.titlebutton:backdrop:active,
-      .titlebar button.destructive-action.titlebutton:backdrop:active, 
button.destructive-action.flat:backdrop:checked, .destructive-action.sidebar-button.button:backdrop:checked, 
.header-bar button.destructive-action.titlebutton:backdrop:checked,
+      button.destructive-action:backdrop:active, button.destructive-action:backdrop:checked, 
button.destructive-action.flat:backdrop:active, .destructive-action.sidebar-button.button:backdrop:active, 
headerbar button.destructive-action.titlebutton:backdrop:active,
+      .titlebar button.destructive-action.titlebutton:backdrop:active, 
button.destructive-action.flat:backdrop:checked, .destructive-action.sidebar-button.button:backdrop:checked, 
headerbar button.destructive-action.titlebutton:backdrop:checked,
       .titlebar button.destructive-action.titlebutton:backdrop:checked {
         color: #f7cfcf;
         border-color: #d51010;
         background-image: linear-gradient(to bottom, #d51010);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-      button.destructive-action:backdrop:insensitive, button.destructive-action.flat:backdrop:insensitive, 
.destructive-action.sidebar-button.button:backdrop:insensitive, .header-bar 
button.destructive-action.titlebutton:backdrop:insensitive,
+      button.destructive-action:backdrop:insensitive, button.destructive-action.flat:backdrop:insensitive, 
.destructive-action.sidebar-button.button:backdrop:insensitive, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive,
       .titlebar button.destructive-action.titlebutton:backdrop:insensitive {
         color: #c7c7c7;
         border-color: darkgray;
@@ -807,26 +807,26 @@ button, .header-bar button.titlebutton,
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-        button.destructive-action:backdrop:insensitive > .label, .header-bar 
button.destructive-action.titlebutton:backdrop:insensitive > .label,
-        .titlebar button.destructive-action.titlebutton:backdrop:insensitive > .label, 
button.destructive-action.flat:backdrop:insensitive > .label, 
.destructive-action.sidebar-button.button:backdrop:insensitive > .label, .header-bar 
button.destructive-action.titlebutton:backdrop:insensitive > .label,
+        button.destructive-action:backdrop:insensitive > .label, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive > .label,
+        .titlebar button.destructive-action.titlebutton:backdrop:insensitive > .label, 
button.destructive-action.flat:backdrop:insensitive > .label, 
.destructive-action.sidebar-button.button:backdrop:insensitive > .label, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive > .label,
         .titlebar button.destructive-action.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
-        button.destructive-action:backdrop:insensitive:active, 
button.destructive-action:backdrop:insensitive:checked, 
button.destructive-action.flat:backdrop:insensitive:active, 
.destructive-action.sidebar-button.button:backdrop:insensitive:active, .header-bar 
button.destructive-action.titlebutton:backdrop:insensitive:active,
-        .titlebar button.destructive-action.titlebutton:backdrop:insensitive:active, 
button.destructive-action.flat:backdrop:insensitive:checked, 
.destructive-action.sidebar-button.button:backdrop:insensitive:checked, .header-bar 
button.destructive-action.titlebutton:backdrop:insensitive:checked,
+        button.destructive-action:backdrop:insensitive:active, 
button.destructive-action:backdrop:insensitive:checked, 
button.destructive-action.flat:backdrop:insensitive:active, 
.destructive-action.sidebar-button.button:backdrop:insensitive:active, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive:active,
+        .titlebar button.destructive-action.titlebutton:backdrop:insensitive:active, 
button.destructive-action.flat:backdrop:insensitive:checked, 
.destructive-action.sidebar-button.button:backdrop:insensitive:checked, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive:checked,
         .titlebar button.destructive-action.titlebutton:backdrop:insensitive:checked {
           color: #f57979;
           border-color: #ef3131;
           background-image: linear-gradient(to bottom, #ef3131);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-          button.destructive-action:backdrop:insensitive:active > .label, .header-bar 
button.destructive-action.titlebutton:backdrop:insensitive:active > .label,
-          .titlebar button.destructive-action.titlebutton:backdrop:insensitive:active > .label, 
button.destructive-action:backdrop:insensitive:checked > .label, .header-bar 
button.destructive-action.titlebutton:backdrop:insensitive:checked > .label,
-          .titlebar button.destructive-action.titlebutton:backdrop:insensitive:checked > .label, 
button.destructive-action.flat:backdrop:insensitive:active > .label, 
.destructive-action.sidebar-button.button:backdrop:insensitive:active > .label, .header-bar 
button.destructive-action.titlebutton:backdrop:insensitive:active > .label,
-          .titlebar button.destructive-action.titlebutton:backdrop:insensitive:active > .label, 
button.destructive-action.flat:backdrop:insensitive:checked > .label, 
.destructive-action.sidebar-button.button:backdrop:insensitive:checked > .label, .header-bar 
button.destructive-action.titlebutton:backdrop:insensitive:checked > .label,
+          button.destructive-action:backdrop:insensitive:active > .label, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive:active > .label,
+          .titlebar button.destructive-action.titlebutton:backdrop:insensitive:active > .label, 
button.destructive-action:backdrop:insensitive:checked > .label, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive:checked > .label,
+          .titlebar button.destructive-action.titlebutton:backdrop:insensitive:checked > .label, 
button.destructive-action.flat:backdrop:insensitive:active > .label, 
.destructive-action.sidebar-button.button:backdrop:insensitive:active > .label, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive:active > .label,
+          .titlebar button.destructive-action.titlebutton:backdrop:insensitive:active > .label, 
button.destructive-action.flat:backdrop:insensitive:checked > .label, 
.destructive-action.sidebar-button.button:backdrop:insensitive:checked > .label, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive:checked > .label,
           .titlebar button.destructive-action.titlebutton:backdrop:insensitive:checked > .label {
             color: inherit; }
-    button.destructive-action.flat:backdrop, .destructive-action.sidebar-button.button:backdrop, .header-bar 
button.destructive-action.titlebutton:backdrop,
-    .titlebar button.destructive-action.titlebutton:backdrop, button.destructive-action.flat:insensitive, 
.destructive-action.sidebar-button.button:insensitive, .header-bar 
button.destructive-action.titlebutton:insensitive,
-    .titlebar button.destructive-action.titlebutton:insensitive, 
button.destructive-action.flat:backdrop:insensitive, 
.destructive-action.sidebar-button.button:backdrop:insensitive, .header-bar 
button.destructive-action.titlebutton:backdrop:insensitive,
+    button.destructive-action.flat:backdrop, .destructive-action.sidebar-button.button:backdrop, headerbar 
button.destructive-action.titlebutton:backdrop,
+    .titlebar button.destructive-action.titlebutton:backdrop, button.destructive-action.flat:insensitive, 
.destructive-action.sidebar-button.button:insensitive, headerbar 
button.destructive-action.titlebutton:insensitive,
+    .titlebar button.destructive-action.titlebutton:insensitive, 
button.destructive-action.flat:backdrop:insensitive, 
.destructive-action.sidebar-button.button:backdrop:insensitive, headerbar 
button.destructive-action.titlebutton:backdrop:insensitive,
     .titlebar button.destructive-action.titlebutton:backdrop:insensitive {
       border-color: transparent;
       background-color: transparent;
@@ -842,7 +842,7 @@ button, .header-bar button.titlebutton,
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
-      button.destructive-action:insensitive > .label, .header-bar 
button.destructive-action.titlebutton:insensitive > .label,
+      button.destructive-action:insensitive > .label, headerbar 
button.destructive-action.titlebutton:insensitive > .label,
       .titlebar button.destructive-action.titlebutton:insensitive > .label {
         color: inherit; }
       button.destructive-action:insensitive:active, button.destructive-action:insensitive:checked {
@@ -850,8 +850,8 @@ button, .header-bar button.titlebutton,
         border-color: #8e0b0b;
         background-image: linear-gradient(to bottom, #e52d2d, #ef3131);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
-        button.destructive-action:insensitive:active > .label, .header-bar 
button.destructive-action.titlebutton:insensitive:active > .label,
-        .titlebar button.destructive-action.titlebutton:insensitive:active > .label, 
button.destructive-action:insensitive:checked > .label, .header-bar 
button.destructive-action.titlebutton:insensitive:checked > .label,
+        button.destructive-action:insensitive:active > .label, headerbar 
button.destructive-action.titlebutton:insensitive:active > .label,
+        .titlebar button.destructive-action.titlebutton:insensitive:active > .label, 
button.destructive-action:insensitive:checked > .label, headerbar 
button.destructive-action.titlebutton:insensitive:checked > .label,
         .titlebar button.destructive-action.titlebutton:insensitive:checked > .label {
           color: inherit; }
     .osd button.destructive-action {
@@ -897,58 +897,58 @@ button, .header-bar button.titlebutton,
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none; }
-  button.image-button, .header-bar button.titlebutton,
+  button.image-button, headerbar button.titlebutton,
   .titlebar button.titlebutton {
     padding: 8px; }
   button.text-button, GtkScaleButton.button.text-button,
-  GtkVolumeButton.button.text-button, .header-bar button.text-button.titlebutton,
+  GtkVolumeButton.button.text-button, headerbar button.text-button.titlebutton,
   .titlebar button.text-button.titlebutton {
     padding-left: 16px;
     padding-right: 16px; }
   button.text-button.image-button, GtkScaleButton.button.text-button,
-  GtkVolumeButton.button.text-button, .header-bar button.text-button.titlebutton,
+  GtkVolumeButton.button.text-button, headerbar button.text-button.titlebutton,
   .titlebar button.text-button.titlebutton {
     padding: 5px 8px 6px; }
     button.text-button.image-button label:first-child, GtkScaleButton.button.text-button label:first-child,
-    GtkVolumeButton.button.text-button label:first-child, .header-bar button.text-button.titlebutton 
label:first-child,
+    GtkVolumeButton.button.text-button label:first-child, headerbar button.text-button.titlebutton 
label:first-child,
     .titlebar button.text-button.titlebutton label:first-child {
       padding-left: 8px; }
     button.text-button.image-button label:last-child, GtkScaleButton.button.text-button label:last-child,
-    GtkVolumeButton.button.text-button label:last-child, .header-bar button.text-button.titlebutton 
label:last-child,
+    GtkVolumeButton.button.text-button label:last-child, headerbar button.text-button.titlebutton 
label:last-child,
     .titlebar button.text-button.titlebutton label:last-child {
       padding-right: 8px; }
-  .stack-switcher > button, .header-bar .stack-switcher > button.titlebutton,
+  .stack-switcher > button, headerbar .stack-switcher > button.titlebutton,
   .titlebar .stack-switcher > button.titlebutton {
     outline-offset: -3px; }
-    .stack-switcher > button > label, .header-bar .stack-switcher > button.titlebutton > label,
+    .stack-switcher > button > label,
     .titlebar .stack-switcher > button.titlebutton > label {
       padding-left: 6px;
       padding-right: 6px; }
-    .stack-switcher > button > image, .header-bar .stack-switcher > button.titlebutton > image,
+    .stack-switcher > button > image,
     .titlebar .stack-switcher > button.titlebutton > image {
       padding-left: 6px;
       padding-right: 6px;
       padding-top: 3px;
       padding-bottom: 3px; }
     .stack-switcher > button.text-button, .stack-switcher > GtkScaleButton.button.text-button,
-    .stack-switcher > GtkVolumeButton.button.text-button, .header-bar .stack-switcher > 
button.text-button.titlebutton, .header-bar .stack-switcher > GtkScaleButton.titlebutton.button.text-button,
-    .header-bar .stack-switcher > GtkVolumeButton.titlebutton.button.text-button,
+    .stack-switcher > GtkVolumeButton.button.text-button, headerbar .stack-switcher > 
button.text-button.titlebutton, headerbar .stack-switcher > GtkScaleButton.titlebutton.button.text-button,
+    headerbar .stack-switcher > GtkVolumeButton.titlebutton.button.text-button,
     .titlebar .stack-switcher > button.text-button.titlebutton,
     .titlebar .stack-switcher > GtkScaleButton.titlebutton.button.text-button,
     .titlebar .stack-switcher > GtkVolumeButton.titlebutton.button.text-button {
       padding: 5px 10px 6px; }
-    .stack-switcher > button.image-button, .header-bar .stack-switcher > button.titlebutton,
+    .stack-switcher > button.image-button, headerbar .stack-switcher > button.titlebutton,
     .titlebar .stack-switcher > button.titlebutton {
       padding: 5px 2px; }
     .stack-switcher > button.needs-attention:active > label, .stack-switcher > button.needs-attention:active 
image, .stack-switcher > button.needs-attention:checked > label, .stack-switcher > 
button.needs-attention:checked > image {
       animation: none;
       background-image: none; }
-  .inline-toolbar button, .inline-toolbar .header-bar button.titlebutton, .header-bar .inline-toolbar 
button.titlebutton,
+  .inline-toolbar button, .inline-toolbar headerbar button.titlebutton, headerbar .inline-toolbar 
button.titlebutton,
   .inline-toolbar .titlebar button.titlebutton,
   .titlebar .inline-toolbar button.titlebutton, .inline-toolbar button:backdrop {
     border-radius: 2px;
     border-width: 1px; }
-  .primary-toolbar button, .primary-toolbar .header-bar button.titlebutton, .header-bar .primary-toolbar 
button.titlebutton,
+  .primary-toolbar button, .primary-toolbar headerbar button.titlebutton, headerbar .primary-toolbar 
button.titlebutton,
   .primary-toolbar .titlebar button.titlebutton,
   .titlebar .primary-toolbar button.titlebutton {
     icon-shadow: none; }
@@ -964,7 +964,7 @@ button, .header-bar button.titlebutton,
   .stack-switcher > button.needs-attention > label:dir(rtl), .stack-switcher > button.needs-attention > 
image:dir(rtl), .sidebar-item.needs-attention > label:dir(rtl) {
     background-position: left 3px, left 4px; }
 
-.inline-toolbar GtkToolButton > button, .inline-toolbar .header-bar GtkToolButton > button.titlebutton, 
.header-bar .inline-toolbar GtkToolButton > button.titlebutton,
+.inline-toolbar GtkToolButton > button, .inline-toolbar headerbar GtkToolButton > button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton > button.titlebutton,
 .titlebar .inline-toolbar GtkToolButton > button.titlebutton {
   color: #2e3436;
@@ -974,7 +974,7 @@ button, .header-bar button.titlebutton,
   text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   box-shadow: inset 0 1px white, 0 1px white; }
-  .inline-toolbar GtkToolButton > button:hover, .inline-toolbar .header-bar GtkToolButton > 
button.titlebutton:hover,
+  .inline-toolbar GtkToolButton > button:hover, .inline-toolbar headerbar GtkToolButton > 
button.titlebutton:hover,
   .inline-toolbar .titlebar GtkToolButton > button.titlebutton:hover {
     color: #2e3436;
     outline-color: rgba(46, 52, 54, 0.3);
@@ -983,8 +983,8 @@ button, .header-bar button.titlebutton,
     text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     box-shadow: inset 0 1px white, 0 1px white; }
-  .inline-toolbar GtkToolButton > button:active, .inline-toolbar .header-bar GtkToolButton > 
button.titlebutton:active,
-  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:active, .inline-toolbar GtkToolButton > 
button:checked, .inline-toolbar .header-bar GtkToolButton > button.titlebutton:checked,
+  .inline-toolbar GtkToolButton > button:active, .inline-toolbar headerbar GtkToolButton > 
button.titlebutton:active,
+  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:active, .inline-toolbar GtkToolButton > 
button:checked, .inline-toolbar headerbar GtkToolButton > button.titlebutton:checked,
   .inline-toolbar .titlebar GtkToolButton > button.titlebutton:checked {
     color: #2e3436;
     outline-color: rgba(46, 52, 54, 0.3);
@@ -993,7 +993,7 @@ button, .header-bar button.titlebutton,
     text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px white; }
-  .inline-toolbar GtkToolButton > button:insensitive, .inline-toolbar .header-bar GtkToolButton > 
button.titlebutton:insensitive,
+  .inline-toolbar GtkToolButton > button:insensitive, .inline-toolbar headerbar GtkToolButton > 
button.titlebutton:insensitive,
   .inline-toolbar .titlebar GtkToolButton > button.titlebutton:insensitive {
     color: #8e9192;
     border-color: #a1a1a1;
@@ -1003,8 +1003,8 @@ button, .header-bar button.titlebutton,
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
     .inline-toolbar GtkToolButton > button:insensitive > .label {
       color: inherit; }
-  .inline-toolbar GtkToolButton > button:insensitive:active, .inline-toolbar .header-bar GtkToolButton > 
button.titlebutton:insensitive:active,
-  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:insensitive:active, .inline-toolbar 
GtkToolButton > button:insensitive:checked, .inline-toolbar .header-bar GtkToolButton > 
button.titlebutton:insensitive:checked,
+  .inline-toolbar GtkToolButton > button:insensitive:active, .inline-toolbar headerbar GtkToolButton > 
button.titlebutton:insensitive:active,
+  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:insensitive:active, .inline-toolbar 
GtkToolButton > button:insensitive:checked, .inline-toolbar headerbar GtkToolButton > 
button.titlebutton:insensitive:checked,
   .inline-toolbar .titlebar GtkToolButton > button.titlebutton:insensitive:checked {
     color: #8e9192;
     border-color: #a1a1a1;
@@ -1012,7 +1012,7 @@ button, .header-bar button.titlebutton,
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
     .inline-toolbar GtkToolButton > button:insensitive:active > .label, .inline-toolbar GtkToolButton > 
button:insensitive:checked > .label {
       color: inherit; }
-  .inline-toolbar GtkToolButton > button:backdrop, .inline-toolbar .header-bar GtkToolButton > 
button.titlebutton:backdrop,
+  .inline-toolbar GtkToolButton > button:backdrop, .inline-toolbar headerbar GtkToolButton > 
button.titlebutton:backdrop,
   .inline-toolbar .titlebar GtkToolButton > button.titlebutton:backdrop {
     color: #8e9192;
     border-color: darkgray;
@@ -1020,14 +1020,14 @@ button, .header-bar button.titlebutton,
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-  .inline-toolbar GtkToolButton > button:backdrop:active, .inline-toolbar .header-bar GtkToolButton > 
button.titlebutton:backdrop:active,
-  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:backdrop:active, .inline-toolbar 
GtkToolButton > button:backdrop:checked, .inline-toolbar .header-bar GtkToolButton > 
button.titlebutton:backdrop:checked,
+  .inline-toolbar GtkToolButton > button:backdrop:active, .inline-toolbar headerbar GtkToolButton > 
button.titlebutton:backdrop:active,
+  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:backdrop:active, .inline-toolbar 
GtkToolButton > button:backdrop:checked, .inline-toolbar headerbar GtkToolButton > 
button.titlebutton:backdrop:checked,
   .inline-toolbar .titlebar GtkToolButton > button.titlebutton:backdrop:checked {
     color: #8e9192;
     border-color: darkgray;
     background-image: linear-gradient(to bottom, #d5d5d5);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-  .inline-toolbar GtkToolButton > button:backdrop:insensitive, .inline-toolbar .header-bar GtkToolButton > 
button.titlebutton:backdrop:insensitive,
+  .inline-toolbar GtkToolButton > button:backdrop:insensitive, .inline-toolbar headerbar GtkToolButton > 
button.titlebutton:backdrop:insensitive,
   .inline-toolbar .titlebar GtkToolButton > button.titlebutton:backdrop:insensitive {
     color: #c7c7c7;
     border-color: darkgray;
@@ -1037,8 +1037,8 @@ button, .header-bar button.titlebutton,
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
     .inline-toolbar GtkToolButton > button:backdrop:insensitive > .label {
       color: inherit; }
-  .inline-toolbar GtkToolButton > button:backdrop:insensitive:active, .inline-toolbar .header-bar 
GtkToolButton > button.titlebutton:backdrop:insensitive:active,
-  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:backdrop:insensitive:active, .inline-toolbar 
GtkToolButton > button:backdrop:insensitive:checked, .inline-toolbar .header-bar GtkToolButton > 
button.titlebutton:backdrop:insensitive:checked,
+  .inline-toolbar GtkToolButton > button:backdrop:insensitive:active, .inline-toolbar headerbar 
GtkToolButton > button.titlebutton:backdrop:insensitive:active,
+  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:backdrop:insensitive:active, .inline-toolbar 
GtkToolButton > button:backdrop:insensitive:checked, .inline-toolbar headerbar GtkToolButton > 
button.titlebutton:backdrop:insensitive:checked,
   .inline-toolbar .titlebar GtkToolButton > button.titlebutton:backdrop:insensitive:checked {
     color: #c7c7c7;
     border-color: darkgray;
@@ -1047,7 +1047,8 @@ button, .header-bar button.titlebutton,
     .inline-toolbar GtkToolButton > button:backdrop:insensitive:active > .label, .inline-toolbar 
GtkToolButton > button:backdrop:insensitive:checked > .label {
       color: inherit; }
 
-.inline-toolbar.toolbar GtkToolButton > button.flat, .inline-toolbar GtkToolButton > button.flat, 
.inline-toolbar.search-bar GtkToolButton > button.flat, .inline-toolbar.location-bar GtkToolButton > 
button.flat, .inline-toolbar.toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar GtkToolButton > 
.sidebar-button.button, .inline-toolbar.search-bar GtkToolButton > .sidebar-button.button, 
.inline-toolbar.location-bar GtkToolButton > .sidebar-button.button, .inline-toolbar .header-bar 
GtkToolButton > button.titlebutton, .header-bar .inline-toolbar GtkToolButton > button.titlebutton,
+.inline-toolbar.toolbar GtkToolButton > button.flat, .inline-toolbar GtkToolButton > button.flat, 
.inline-toolbar.search-bar GtkToolButton > button.flat, .inline-toolbar.location-bar GtkToolButton > 
button.flat, .inline-toolbar.toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar GtkToolButton > 
.sidebar-button.button, .inline-toolbar.search-bar GtkToolButton > .sidebar-button.button, 
.inline-toolbar.location-bar GtkToolButton > .sidebar-button.button, .inline-toolbar.toolbar headerbar 
GtkToolButton > button.titlebutton, headerbar .inline-toolbar.toolbar GtkToolButton > button.titlebutton, 
.inline-toolbar headerbar GtkToolButton > button.titlebutton, headerbar .inline-toolbar GtkToolButton > 
button.titlebutton, .inline-toolbar.search-bar headerbar GtkToolButton > button.titlebutton, headerbar 
.inline-toolbar.search-bar GtkToolButton > button.titlebutton, .inline-toolbar.location-bar headerbar 
GtkToolButton > button.titlebutton, headerbar .inline-toolbar.location-b
 ar GtkToolButton > button.titlebutton,
+.inline-toolbar .titlebar headerbar GtkToolButton > button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton > button.titlebutton,
 .titlebar .inline-toolbar GtkToolButton > button.titlebutton,
 .inline-toolbar.toolbar GtkToolButton:backdrop > button.flat,
@@ -1058,20 +1059,28 @@ button, .header-bar button.titlebutton,
 .inline-toolbar GtkToolButton:backdrop > .sidebar-button.button,
 .inline-toolbar.search-bar GtkToolButton:backdrop > .sidebar-button.button,
 .inline-toolbar.location-bar GtkToolButton:backdrop > .sidebar-button.button,
-.inline-toolbar .header-bar GtkToolButton:backdrop > button.titlebutton,
-.header-bar .inline-toolbar GtkToolButton:backdrop > button.titlebutton,
+.inline-toolbar.toolbar headerbar GtkToolButton:backdrop > button.titlebutton,
+headerbar .inline-toolbar.toolbar GtkToolButton:backdrop > button.titlebutton,
+.inline-toolbar headerbar GtkToolButton:backdrop > button.titlebutton,
+headerbar .inline-toolbar GtkToolButton:backdrop > button.titlebutton,
+.inline-toolbar.search-bar headerbar GtkToolButton:backdrop > button.titlebutton,
+headerbar .inline-toolbar.search-bar GtkToolButton:backdrop > button.titlebutton,
+.inline-toolbar.location-bar headerbar GtkToolButton:backdrop > button.titlebutton,
+headerbar .inline-toolbar.location-bar GtkToolButton:backdrop > button.titlebutton,
+.inline-toolbar .titlebar headerbar GtkToolButton:backdrop > button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:backdrop > button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:backdrop > button.titlebutton, .linked:not(.vertical) > entry, 
.linked:not(.vertical) > spinbutton, .inline-toolbar button, .inline-toolbar .header-bar button.titlebutton, 
.header-bar .inline-toolbar button.titlebutton,
+.titlebar .inline-toolbar GtkToolButton:backdrop > button.titlebutton, .linked:not(.vertical) > entry, 
.linked:not(.vertical) > spinbutton, .inline-toolbar button, .inline-toolbar headerbar button.titlebutton, 
headerbar .inline-toolbar button.titlebutton,
 .inline-toolbar .titlebar button.titlebutton,
-.titlebar .inline-toolbar button.titlebutton, .inline-toolbar button:backdrop, .linked > button, .header-bar 
.linked > button.titlebutton,
+.titlebar .inline-toolbar button.titlebutton, .inline-toolbar button:backdrop, .linked > button, headerbar 
.linked > button.titlebutton,
 .titlebar .linked > button.titlebutton, .linked > button:hover, .linked > button:active, .linked > 
button:checked, .linked > button:backdrop, .linked > GtkComboBox > .the-button-in-the-combobox:dir(ltr), 
.linked > GtkComboBox > .the-button-in-the-combobox:dir(rtl),
 .linked > GtkComboBoxText > .the-button-in-the-combobox:dir(ltr),
 .linked > GtkComboBoxText > .the-button-in-the-combobox:dir(rtl) {
   border-radius: 0;
   border-right-style: none; }
 
-.linked:not(.vertical) > entry:first-child, .linked:not(.vertical) > spinbutton:first-child, .inline-toolbar 
button:first-child, .linked > button:first-child, .header-bar .linked > button.titlebutton:first-child,
-.titlebar .linked > button.titlebutton:first-child, .inline-toolbar.toolbar GtkToolButton:first-child > 
button.flat, .inline-toolbar GtkToolButton:first-child > button.flat, .inline-toolbar.search-bar 
GtkToolButton:first-child > button.flat, .inline-toolbar.location-bar GtkToolButton:first-child > 
button.flat, .inline-toolbar.toolbar GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar 
GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:first-child > 
.sidebar-button.button, .inline-toolbar.location-bar GtkToolButton:first-child > .sidebar-button.button, 
.inline-toolbar .header-bar GtkToolButton:first-child > button.titlebutton, .header-bar .inline-toolbar 
GtkToolButton:first-child > button.titlebutton,
+.linked:not(.vertical) > entry:first-child, .linked:not(.vertical) > spinbutton:first-child, .inline-toolbar 
button:first-child, .linked > button:first-child, headerbar .linked > button.titlebutton:first-child,
+.titlebar .linked > button.titlebutton:first-child, .inline-toolbar.toolbar GtkToolButton:first-child > 
button.flat, .inline-toolbar GtkToolButton:first-child > button.flat, .inline-toolbar.search-bar 
GtkToolButton:first-child > button.flat, .inline-toolbar.location-bar GtkToolButton:first-child > 
button.flat, .inline-toolbar.toolbar GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar 
GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:first-child > 
.sidebar-button.button, .inline-toolbar.location-bar GtkToolButton:first-child > .sidebar-button.button, 
.inline-toolbar.toolbar headerbar GtkToolButton:first-child > button.titlebutton, headerbar 
.inline-toolbar.toolbar GtkToolButton:first-child > button.titlebutton, .inline-toolbar headerbar 
GtkToolButton:first-child > button.titlebutton, headerbar .inline-toolbar GtkToolButton:first-child > 
button.titlebutton, .inline-toolbar.search-bar headerbar GtkToolButton:first-chil
 d > button.titlebutton, headerbar .inline-toolbar.search-bar GtkToolButton:first-child > button.titlebutton, 
.inline-toolbar.location-bar headerbar GtkToolButton:first-child > button.titlebutton, headerbar 
.inline-toolbar.location-bar GtkToolButton:first-child > button.titlebutton,
+.inline-toolbar .titlebar headerbar GtkToolButton:first-child > button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:first-child > button.titlebutton,
 .titlebar .inline-toolbar GtkToolButton:first-child > button.titlebutton,
 .inline-toolbar.toolbar GtkToolButton:backdrop:first-child > button.flat,
@@ -1082,15 +1091,23 @@ button, .header-bar button.titlebutton,
 .inline-toolbar GtkToolButton:backdrop:first-child > .sidebar-button.button,
 .inline-toolbar.search-bar GtkToolButton:backdrop:first-child > .sidebar-button.button,
 .inline-toolbar.location-bar GtkToolButton:backdrop:first-child > .sidebar-button.button,
-.inline-toolbar .header-bar GtkToolButton:backdrop:first-child > button.titlebutton,
-.header-bar .inline-toolbar GtkToolButton:backdrop:first-child > button.titlebutton,
+.inline-toolbar.toolbar headerbar GtkToolButton:backdrop:first-child > button.titlebutton,
+headerbar .inline-toolbar.toolbar GtkToolButton:backdrop:first-child > button.titlebutton,
+.inline-toolbar headerbar GtkToolButton:backdrop:first-child > button.titlebutton,
+headerbar .inline-toolbar GtkToolButton:backdrop:first-child > button.titlebutton,
+.inline-toolbar.search-bar headerbar GtkToolButton:backdrop:first-child > button.titlebutton,
+headerbar .inline-toolbar.search-bar GtkToolButton:backdrop:first-child > button.titlebutton,
+.inline-toolbar.location-bar headerbar GtkToolButton:backdrop:first-child > button.titlebutton,
+headerbar .inline-toolbar.location-bar GtkToolButton:backdrop:first-child > button.titlebutton,
+.inline-toolbar .titlebar headerbar GtkToolButton:backdrop:first-child > button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:backdrop:first-child > button.titlebutton,
 .titlebar .inline-toolbar GtkToolButton:backdrop:first-child > button.titlebutton, .linked > 
GtkComboBox:first-child > .the-button-in-the-combobox,
 .linked > GtkComboBoxText:first-child > .the-button-in-the-combobox {
   border-top-left-radius: 3px;
   border-bottom-left-radius: 3px; }
-.linked:not(.vertical) > entry:last-child, .linked:not(.vertical) > spinbutton:last-child, .inline-toolbar 
button:last-child, .linked > button:last-child, .header-bar .linked > button.titlebutton:last-child,
-.titlebar .linked > button.titlebutton:last-child, .inline-toolbar.toolbar GtkToolButton:last-child > 
button.flat, .inline-toolbar GtkToolButton:last-child > button.flat, .inline-toolbar.search-bar 
GtkToolButton:last-child > button.flat, .inline-toolbar.location-bar GtkToolButton:last-child > button.flat, 
.inline-toolbar.toolbar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar 
GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:last-child > 
.sidebar-button.button, .inline-toolbar.location-bar GtkToolButton:last-child > .sidebar-button.button, 
.inline-toolbar .header-bar GtkToolButton:last-child > button.titlebutton, .header-bar .inline-toolbar 
GtkToolButton:last-child > button.titlebutton,
+.linked:not(.vertical) > entry:last-child, .linked:not(.vertical) > spinbutton:last-child, .inline-toolbar 
button:last-child, .linked > button:last-child, headerbar .linked > button.titlebutton:last-child,
+.titlebar .linked > button.titlebutton:last-child, .inline-toolbar.toolbar GtkToolButton:last-child > 
button.flat, .inline-toolbar GtkToolButton:last-child > button.flat, .inline-toolbar.search-bar 
GtkToolButton:last-child > button.flat, .inline-toolbar.location-bar GtkToolButton:last-child > button.flat, 
.inline-toolbar.toolbar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar 
GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:last-child > 
.sidebar-button.button, .inline-toolbar.location-bar GtkToolButton:last-child > .sidebar-button.button, 
.inline-toolbar.toolbar headerbar GtkToolButton:last-child > button.titlebutton, headerbar 
.inline-toolbar.toolbar GtkToolButton:last-child > button.titlebutton, .inline-toolbar headerbar 
GtkToolButton:last-child > button.titlebutton, headerbar .inline-toolbar GtkToolButton:last-child > 
button.titlebutton, .inline-toolbar.search-bar headerbar GtkToolButton:last-child > button.tit
 lebutton, headerbar .inline-toolbar.search-bar GtkToolButton:last-child > button.titlebutton, 
.inline-toolbar.location-bar headerbar GtkToolButton:last-child > button.titlebutton, headerbar 
.inline-toolbar.location-bar GtkToolButton:last-child > button.titlebutton,
+.inline-toolbar .titlebar headerbar GtkToolButton:last-child > button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:last-child > button.titlebutton,
 .titlebar .inline-toolbar GtkToolButton:last-child > button.titlebutton,
 .inline-toolbar.toolbar GtkToolButton:backdrop:last-child > button.flat,
@@ -1101,16 +1118,24 @@ button, .header-bar button.titlebutton,
 .inline-toolbar GtkToolButton:backdrop:last-child > .sidebar-button.button,
 .inline-toolbar.search-bar GtkToolButton:backdrop:last-child > .sidebar-button.button,
 .inline-toolbar.location-bar GtkToolButton:backdrop:last-child > .sidebar-button.button,
-.inline-toolbar .header-bar GtkToolButton:backdrop:last-child > button.titlebutton,
-.header-bar .inline-toolbar GtkToolButton:backdrop:last-child > button.titlebutton,
+.inline-toolbar.toolbar headerbar GtkToolButton:backdrop:last-child > button.titlebutton,
+headerbar .inline-toolbar.toolbar GtkToolButton:backdrop:last-child > button.titlebutton,
+.inline-toolbar headerbar GtkToolButton:backdrop:last-child > button.titlebutton,
+headerbar .inline-toolbar GtkToolButton:backdrop:last-child > button.titlebutton,
+.inline-toolbar.search-bar headerbar GtkToolButton:backdrop:last-child > button.titlebutton,
+headerbar .inline-toolbar.search-bar GtkToolButton:backdrop:last-child > button.titlebutton,
+.inline-toolbar.location-bar headerbar GtkToolButton:backdrop:last-child > button.titlebutton,
+headerbar .inline-toolbar.location-bar GtkToolButton:backdrop:last-child > button.titlebutton,
+.inline-toolbar .titlebar headerbar GtkToolButton:backdrop:last-child > button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:backdrop:last-child > button.titlebutton,
 .titlebar .inline-toolbar GtkToolButton:backdrop:last-child > button.titlebutton, .linked > 
GtkComboBox:last-child > .the-button-in-the-combobox,
 .linked > GtkComboBoxText:last-child > .the-button-in-the-combobox {
   border-top-right-radius: 3px;
   border-bottom-right-radius: 3px;
   border-right-style: solid; }
-.linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > spinbutton:only-child, .inline-toolbar 
button:only-child, .linked > button:only-child, .header-bar .linked > button.titlebutton:only-child,
-.titlebar .linked > button.titlebutton:only-child, .inline-toolbar.toolbar GtkToolButton:only-child > 
button.flat, .inline-toolbar GtkToolButton:only-child > button.flat, .inline-toolbar.search-bar 
GtkToolButton:only-child > button.flat, .inline-toolbar.location-bar GtkToolButton:only-child > button.flat, 
.inline-toolbar.toolbar GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar 
GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:only-child > 
.sidebar-button.button, .inline-toolbar.location-bar GtkToolButton:only-child > .sidebar-button.button, 
.inline-toolbar .header-bar GtkToolButton:only-child > button.titlebutton, .header-bar .inline-toolbar 
GtkToolButton:only-child > button.titlebutton,
+.linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > spinbutton:only-child, .inline-toolbar 
button:only-child, .linked > button:only-child, headerbar .linked > button.titlebutton:only-child,
+.titlebar .linked > button.titlebutton:only-child, .inline-toolbar.toolbar GtkToolButton:only-child > 
button.flat, .inline-toolbar GtkToolButton:only-child > button.flat, .inline-toolbar.search-bar 
GtkToolButton:only-child > button.flat, .inline-toolbar.location-bar GtkToolButton:only-child > button.flat, 
.inline-toolbar.toolbar GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar 
GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:only-child > 
.sidebar-button.button, .inline-toolbar.location-bar GtkToolButton:only-child > .sidebar-button.button, 
.inline-toolbar.toolbar headerbar GtkToolButton:only-child > button.titlebutton, headerbar 
.inline-toolbar.toolbar GtkToolButton:only-child > button.titlebutton, .inline-toolbar headerbar 
GtkToolButton:only-child > button.titlebutton, headerbar .inline-toolbar GtkToolButton:only-child > 
button.titlebutton, .inline-toolbar.search-bar headerbar GtkToolButton:only-child > button.tit
 lebutton, headerbar .inline-toolbar.search-bar GtkToolButton:only-child > button.titlebutton, 
.inline-toolbar.location-bar headerbar GtkToolButton:only-child > button.titlebutton, headerbar 
.inline-toolbar.location-bar GtkToolButton:only-child > button.titlebutton,
+.inline-toolbar .titlebar headerbar GtkToolButton:only-child > button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:only-child > button.titlebutton,
 .titlebar .inline-toolbar GtkToolButton:only-child > button.titlebutton,
 .inline-toolbar.toolbar GtkToolButton:backdrop:only-child > button.flat,
@@ -1121,32 +1146,39 @@ button, .header-bar button.titlebutton,
 .inline-toolbar GtkToolButton:backdrop:only-child > .sidebar-button.button,
 .inline-toolbar.search-bar GtkToolButton:backdrop:only-child > .sidebar-button.button,
 .inline-toolbar.location-bar GtkToolButton:backdrop:only-child > .sidebar-button.button,
-.inline-toolbar .header-bar GtkToolButton:backdrop:only-child > button.titlebutton,
-.header-bar .inline-toolbar GtkToolButton:backdrop:only-child > button.titlebutton,
+.inline-toolbar.toolbar headerbar GtkToolButton:backdrop:only-child > button.titlebutton,
+headerbar .inline-toolbar.toolbar GtkToolButton:backdrop:only-child > button.titlebutton,
+.inline-toolbar headerbar GtkToolButton:backdrop:only-child > button.titlebutton,
+headerbar .inline-toolbar GtkToolButton:backdrop:only-child > button.titlebutton,
+.inline-toolbar.search-bar headerbar GtkToolButton:backdrop:only-child > button.titlebutton,
+headerbar .inline-toolbar.search-bar GtkToolButton:backdrop:only-child > button.titlebutton,
+.inline-toolbar.location-bar headerbar GtkToolButton:backdrop:only-child > button.titlebutton,
+headerbar .inline-toolbar.location-bar GtkToolButton:backdrop:only-child > button.titlebutton,
+.inline-toolbar .titlebar headerbar GtkToolButton:backdrop:only-child > button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:backdrop:only-child > button.titlebutton,
 .titlebar .inline-toolbar GtkToolButton:backdrop:only-child > button.titlebutton, .linked > 
GtkComboBox:only-child > .the-button-in-the-combobox,
 .linked > GtkComboBoxText:only-child > .the-button-in-the-combobox {
   border-radius: 3px;
   border-style: solid; }
 
-.linked.vertical > entry, .linked.vertical > button, .header-bar .linked.vertical > button.titlebutton,
+.linked.vertical > entry, .linked.vertical > button, headerbar .linked.vertical > button.titlebutton,
 .titlebar .linked.vertical > button.titlebutton, .linked.vertical > button:hover, .linked.vertical > 
button:active, .linked.vertical > button:checked, .linked.vertical > button:backdrop, .linked.vertical > 
GtkComboBoxText > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox > .the-button-in-the-combobox {
   border-style: solid solid none solid;
   border-radius: 0; }
 
-.linked.vertical > entry:first-child, .linked.vertical > button:first-child, .header-bar .linked.vertical > 
button.titlebutton:first-child,
+.linked.vertical > entry:first-child, .linked.vertical > button:first-child, headerbar .linked.vertical > 
button.titlebutton:first-child,
 .titlebar .linked.vertical > button.titlebutton:first-child, .linked.vertical > GtkComboBoxText:first-child 
.the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox {
   border-top-left-radius: 3px;
   border-top-right-radius: 3px; }
-.linked.vertical > entry:last-child, .linked.vertical > button:last-child, .header-bar .linked.vertical > 
button.titlebutton:last-child,
+.linked.vertical > entry:last-child, .linked.vertical > button:last-child, headerbar .linked.vertical > 
button.titlebutton:last-child,
 .titlebar .linked.vertical > button.titlebutton:last-child, .linked.vertical > GtkComboBoxText:last-child > 
.the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox {
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border-style: solid; }
-.linked.vertical > entry:only-child, .linked.vertical > button:only-child, .header-bar .linked.vertical > 
button.titlebutton:only-child,
+.linked.vertical > entry:only-child, .linked.vertical > button:only-child, headerbar .linked.vertical > 
button.titlebutton:only-child,
 .titlebar .linked.vertical > button.titlebutton:only-child, .linked.vertical > GtkComboBoxText:only-child > 
.the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox {
   border-radius: 3px;
@@ -1155,33 +1187,37 @@ button, .header-bar button.titlebutton,
 modelbutton.flat,
 .menuitem.button.flat, modelbutton.flat:backdrop, modelbutton.flat:backdrop:hover,
 .menuitem.button.flat:backdrop,
-.menuitem.button.flat:backdrop:hover, button:link, .header-bar button.titlebutton:link,
-.titlebar button.titlebutton:link, button:visited, .header-bar button.titlebutton:visited,
-.titlebar button.titlebutton:visited, button:link:hover, button:link:active, button:link:checked, 
button:visited:hover, button:visited:active, button:visited:checked, button:link:backdrop, 
button:visited:backdrop, .menu button, .menu .header-bar button.titlebutton, .header-bar .menu 
button.titlebutton,
+.menuitem.button.flat:backdrop:hover, button:link, headerbar button.titlebutton:link,
+.titlebar button.titlebutton:link, button:visited, headerbar button.titlebutton:visited,
+.titlebar button.titlebutton:visited, button:link:hover, button:link:active, button:link:checked, 
button:visited:hover, button:visited:active, button:visited:checked, button:link:backdrop, 
button:visited:backdrop, .menu button, .menu headerbar button.titlebutton, headerbar .menu button.titlebutton,
 .menu .titlebar button.titlebutton,
-.titlebar .menu button.titlebutton, notebook tab button, notebook tab .header-bar button.titlebutton, 
.header-bar notebook tab button.titlebutton,
+.titlebar .menu button.titlebutton, notebook tab button, notebook tab headerbar button.titlebutton, 
headerbar notebook tab button.titlebutton,
 notebook tab .titlebar button.titlebutton,
-.titlebar notebook tab button.titlebutton, .app-notification button.flat, .app-notification 
.sidebar-button.button, .app-notification .header-bar button.titlebutton, .header-bar .app-notification 
button.titlebutton,
+.titlebar notebook tab button.titlebutton, .app-notification button.flat, .app-notification 
.sidebar-button.button, .app-notification headerbar button.titlebutton, headerbar .app-notification 
button.titlebutton,
 .app-notification .titlebar button.titlebutton,
 .titlebar .app-notification button.titlebutton,
 .app-notification.frame button.flat,
-.app-notification.frame .sidebar-button.button, .app-notification button.flat:backdrop, .app-notification 
.sidebar-button.button:backdrop, .app-notification button.flat:insensitive, .app-notification 
.sidebar-button.button:insensitive, .app-notification button.flat:backdrop:insensitive, .app-notification 
.sidebar-button.button:backdrop:insensitive, .app-notification .header-bar 
button.titlebutton:backdrop:insensitive, .header-bar .app-notification 
button.titlebutton:backdrop:insensitive,
+.app-notification.frame .sidebar-button.button,
+.app-notification.frame headerbar button.titlebutton,
+headerbar .app-notification.frame button.titlebutton, .app-notification button.flat:backdrop, 
.app-notification .sidebar-button.button:backdrop, .app-notification headerbar button.titlebutton:backdrop, 
headerbar .app-notification button.titlebutton:backdrop, .app-notification button.flat:insensitive, 
.app-notification .sidebar-button.button:insensitive, .app-notification headerbar 
button.titlebutton:insensitive, headerbar .app-notification button.titlebutton:insensitive, .app-notification 
button.flat:backdrop:insensitive, .app-notification .sidebar-button.button:backdrop:insensitive, 
.app-notification headerbar button.titlebutton:backdrop:insensitive, headerbar .app-notification 
button.titlebutton:backdrop:insensitive,
 .app-notification .titlebar button.titlebutton:backdrop:insensitive,
 .titlebar .app-notification button.titlebutton:backdrop:insensitive,
 .app-notification.frame button.flat:backdrop,
 .app-notification.frame .sidebar-button.button:backdrop,
-.app-notification.frame .header-bar button.titlebutton:backdrop,
-.header-bar .app-notification.frame button.titlebutton:backdrop,
+.app-notification.frame headerbar button.titlebutton:backdrop,
+headerbar .app-notification.frame button.titlebutton:backdrop,
 .app-notification.frame .titlebar button.titlebutton:backdrop,
 .titlebar .app-notification.frame button.titlebutton:backdrop,
 .app-notification.frame button.flat:insensitive,
 .app-notification.frame .sidebar-button.button:insensitive,
-.app-notification.frame .header-bar button.titlebutton:insensitive,
-.header-bar .app-notification.frame button.titlebutton:insensitive,
+.app-notification.frame headerbar button.titlebutton:insensitive,
+headerbar .app-notification.frame button.titlebutton:insensitive,
 .app-notification.frame .titlebar button.titlebutton:insensitive,
 .titlebar .app-notification.frame button.titlebutton:insensitive,
 .app-notification.frame button.flat:backdrop:insensitive,
-.app-notification.frame .sidebar-button.button:backdrop:insensitive, calendar.button, calendar.button:hover, 
calendar.button:backdrop, calendar.button:insensitive, .scale-popup button:hover, .scale-popup 
button:backdrop, .scale-popup button:backdrop:hover, .scale-popup button:backdrop:insensitive {
+.app-notification.frame .sidebar-button.button:backdrop:insensitive,
+.app-notification.frame headerbar button.titlebutton:backdrop:insensitive,
+headerbar .app-notification.frame button.titlebutton:backdrop:insensitive, calendar.button, 
calendar.button:hover, calendar.button:backdrop, calendar.button:insensitive, .scale-popup button:hover, 
.scale-popup button:backdrop, .scale-popup button:backdrop:hover, .scale-popup button:backdrop:insensitive {
   border-color: transparent;
   background-color: transparent;
   background-image: none;
@@ -1208,14 +1244,14 @@ GtkColorButton.button {
 /*********
  * Links *
  *********/
-*:link, button:link, .header-bar button.titlebutton:link,
-.titlebar button.titlebutton:link, button:visited, .header-bar button.titlebutton:visited,
+*:link, button:link, headerbar button.titlebutton:link,
+.titlebar button.titlebutton:link, button:visited, headerbar button.titlebutton:visited,
 .titlebar button.titlebutton:visited {
   color: #2a76c6; }
-  *:link:visited, button:visited, .header-bar button.titlebutton:visited,
+  *:link:visited, button:visited, headerbar button.titlebutton:visited,
   .titlebar button.titlebutton:visited {
     color: #215d9c; }
-    *:selected *:link:visited, *:selected button:visited:link, *:selected button:visited, *:selected 
.header-bar button.titlebutton:visited, .header-bar *:selected button.titlebutton:visited,
+    *:selected *:link:visited, *:selected button:visited:link, *:selected button:visited, *:selected 
headerbar button.titlebutton:visited, headerbar *:selected button.titlebutton:visited,
     *:selected .titlebar button.titlebutton:visited,
     .titlebar *:selected button.titlebutton:visited {
       color: #b7d3f0; }
@@ -1228,27 +1264,27 @@ GtkColorButton.button {
     *:selected *:link:active, *:selected button:active:link, *:selected button:active:visited {
       color: #dbe9f7; }
   *:link:backdrop, button:backdrop:link, button:backdrop:visited, *:link:backdrop:hover, 
button:backdrop:hover:link, button:backdrop:hover:visited, *:link:backdrop:hover:selected, 
button:backdrop:hover:selected:link, button:backdrop:hover:selected:visited, .titlebar.selection-mode 
.subtitle:backdrop:hover:link,
-  .header-bar.selection-mode .subtitle:backdrop:hover:link {
+  headerbar.selection-mode .subtitle:backdrop:hover:link {
     color: #4a90d9; }
   *:link:selected, button:selected:link, button:selected:visited, .titlebar.selection-mode .subtitle:link,
-  .header-bar.selection-mode .subtitle:link, *:selected *:link, *:selected button:link, *:selected 
button:visited {
+  headerbar.selection-mode .subtitle:link, *:selected *:link, *:selected button:link, *:selected 
button:visited {
     color: #dbe9f7; }
 
-button:link, .header-bar button.titlebutton:link,
-.titlebar button.titlebutton:link, button:visited, .header-bar button.titlebutton:visited,
+button:link, headerbar button.titlebutton:link,
+.titlebar button.titlebutton:link, button:visited, headerbar button.titlebutton:visited,
 .titlebar button.titlebutton:visited {
   text-shadow: none; }
   button:link:hover, button:link:active, button:link:checked, button:visited:hover, button:visited:active, 
button:visited:checked {
     text-shadow: none; }
-  button:link > label, .header-bar button.titlebutton:link > label,
-  .titlebar button.titlebutton:link > label, button:visited > label, .header-bar button.titlebutton:visited 
label,
+  button:link > label, headerbar button.titlebutton:link > label,
+  .titlebar button.titlebutton:link > label, button:visited > label, headerbar button.titlebutton:visited > 
label,
   .titlebar button.titlebutton:visited > label {
     text-decoration-line: underline; }
 
 /*****************
  * GtkSpinButton *
  *****************/
-spinbutton:not(.vertical) button, spinbutton:not(.vertical) .header-bar button.titlebutton, .header-bar 
spinbutton:not(.vertical) button.titlebutton,
+spinbutton:not(.vertical) button,
 spinbutton:not(.vertical) .titlebar button.titlebutton,
 .titlebar spinbutton:not(.vertical) button.titlebutton {
   background-image: none;
@@ -1330,7 +1366,7 @@ spinbutton:not(.vertical) .titlebar button.titlebutton,
     border-radius: 0 3px 3px 0; }
   .osd spinbutton:not(.vertical) button:dir(rtl):first-child {
     border-radius: 3px 0 0 3px; }
-spinbutton.vertical button, spinbutton.vertical .header-bar button.titlebutton, .header-bar 
spinbutton.vertical button.titlebutton,
+spinbutton.vertical button,
 spinbutton.vertical .titlebar button.titlebutton,
 .titlebar spinbutton.vertical button.titlebutton {
   padding-top: 8px;
@@ -1366,7 +1402,7 @@ spinbutton.vertical .titlebar button.titlebutton,
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      spinbutton.vertical button:first-child:insensitive > .label, spinbutton.vertical .header-bar 
button.titlebutton:first-child:insensitive > .label,
+      spinbutton.vertical button:first-child:insensitive > .label, spinbutton.vertical headerbar 
button.titlebutton:first-child:insensitive > .label,
       spinbutton.vertical .titlebar button.titlebutton:first-child:insensitive > .label {
         color: inherit; }
     spinbutton.vertical button:first-child:backdrop {
@@ -1383,7 +1419,7 @@ spinbutton.vertical .titlebar button.titlebutton,
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        spinbutton.vertical button:first-child:backdrop:insensitive > .label, spinbutton.vertical 
.header-bar button.titlebutton:first-child:backdrop:insensitive > .label,
+        spinbutton.vertical button:first-child:backdrop:insensitive > .label, spinbutton.vertical headerbar 
button.titlebutton:first-child:backdrop:insensitive > .label,
         spinbutton.vertical .titlebar button.titlebutton:first-child:backdrop:insensitive > .label {
           color: inherit; }
 spinbutton.vertical button:first-child, spinbutton.vertical button:first-child:active, spinbutton.vertical 
button:first-child:hover, spinbutton.vertical button:first-child:insensitive, spinbutton.vertical 
button:first-child:backdrop {
@@ -1518,7 +1554,7 @@ GtkComboBox {
  * Header bars *
  ***************/
 .titlebar,
-.header-bar {
+headerbar {
   padding: 6px;
   border-width: 0 0 1px;
   border-style: solid;
@@ -1528,45 +1564,47 @@ GtkComboBox {
   background-image: linear-gradient(to bottom, #f7f7f7, #ededed);
   box-shadow: inset 0 -1px #dadada, inset 0 1px white; }
   .titlebar:backdrop,
-  .header-bar:backdrop {
+  headerbar:backdrop {
     border-color: darkgray;
     background-color: #ededed;
     background-image: none;
     box-shadow: inset 0 1px white; }
   .titlebar .title,
-  .header-bar .title {
+  headerbar .title {
     font-weight: bold;
     padding-left: 12px;
     padding-right: 12px; }
   .titlebar .subtitle,
-  .header-bar .subtitle {
+  headerbar .subtitle {
     font-size: smaller;
     padding-left: 12px;
     padding-right: 12px; }
   .titlebar .header-bar-separator, .titlebar > GtkBox > separator.vertical,
-  .header-bar .header-bar-separator,
-  .header-bar > GtkBox > separator.vertical {
+  headerbar .header-bar-separator,
+  headerbar > GtkBox > separator.vertical {
     -GtkWidget-wide-separators: true;
     -GtkWidget-separator-width: 1px;
     border-width: 0 1px;
     border-image: linear-gradient(to bottom, rgba(161, 161, 161, 0), #a1a1a1 30%, #a1a1a1 70%, rgba(161, 
161, 161, 0) 100%) 0 1/0 1px stretch; }
     .titlebar .header-bar-separator:backdrop, .titlebar > GtkBox > separator.vertical:backdrop,
-    .header-bar .header-bar-separator:backdrop,
-    .header-bar > GtkBox > separator.vertical:backdrop {
+    headerbar .header-bar-separator:backdrop,
+    headerbar > GtkBox > separator.vertical:backdrop {
       border-image: linear-gradient(to bottom, rgba(169, 169, 169, 0.5)) 0 1/1px 1px; }
   .titlebar.selection-mode,
-  .header-bar.selection-mode {
+  headerbar.selection-mode {
     color: #ffffff;
     text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
     border-color: #184472;
     background-image: linear-gradient(to bottom, #5f9ddd, #4a90d9);
     box-shadow: inset 0 -1px #3975b5, inset 0 1px #a5c8ec; }
     .titlebar.selection-mode:backdrop,
-    .header-bar.selection-mode:backdrop {
+    headerbar.selection-mode:backdrop {
       background-image: linear-gradient(to bottom, #4a90d9);
       box-shadow: inset 0 1px #b7d3f0; }
     .titlebar.selection-mode button,
-    .header-bar.selection-mode button {
+    headerbar.selection-mode button,
+    headerbar.selection-mode .titlebar button.titlebutton,
+    .titlebar headerbar.selection-mode button.titlebutton {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #1c5187;
@@ -1576,9 +1614,9 @@ GtkComboBox {
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 1px #a5c8ec; }
       .titlebar.selection-mode button.flat, .titlebar.selection-mode .sidebar-button.button,
       .titlebar.selection-mode button.titlebutton,
-      .header-bar.selection-mode button.flat,
-      .header-bar.selection-mode .sidebar-button.button,
-      .header-bar.selection-mode button.titlebutton {
+      headerbar.selection-mode button.flat,
+      headerbar.selection-mode .sidebar-button.button,
+      headerbar.selection-mode button.titlebutton {
         border-color: transparent;
         background-color: transparent;
         background-image: none;
@@ -1586,7 +1624,7 @@ GtkComboBox {
         text-shadow: none;
         icon-shadow: none; }
       .titlebar.selection-mode button:hover,
-      .header-bar.selection-mode button:hover {
+      headerbar.selection-mode button:hover {
         color: #ffffff;
         outline-color: rgba(255, 255, 255, 0.3);
         border-color: #1c5187;
@@ -1595,8 +1633,8 @@ GtkComboBox {
         icon-shadow: 0 -1px rgba(0, 0, 0, 0.51153);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 1px #a5c8ec; }
       .titlebar.selection-mode button:active, .titlebar.selection-mode button:checked,
-      .header-bar.selection-mode button:active,
-      .header-bar.selection-mode button:checked {
+      headerbar.selection-mode button:active,
+      headerbar.selection-mode button:checked {
         color: #ffffff;
         outline-color: rgba(255, 255, 255, 0.3);
         border-color: #1c5187;
@@ -1606,10 +1644,10 @@ GtkComboBox {
         box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px #a5c8ec; 
}
       .titlebar.selection-mode button:backdrop, .titlebar.selection-mode button.flat:backdrop, 
.titlebar.selection-mode .sidebar-button.button:backdrop,
       .titlebar.selection-mode button.titlebutton:backdrop,
-      .header-bar.selection-mode button:backdrop,
-      .header-bar.selection-mode button.flat:backdrop,
-      .header-bar.selection-mode .sidebar-button.button:backdrop,
-      .header-bar.selection-mode button.titlebutton:backdrop {
+      headerbar.selection-mode button:backdrop,
+      headerbar.selection-mode button.flat:backdrop,
+      headerbar.selection-mode .sidebar-button.button:backdrop,
+      headerbar.selection-mode button.titlebutton:backdrop {
         color: #dbe9f7;
         border-color: #4a90d9;
         background-image: linear-gradient(to bottom, #4a90d9);
@@ -1621,14 +1659,14 @@ GtkComboBox {
         .titlebar.selection-mode button:backdrop:active, .titlebar.selection-mode button:backdrop:checked, 
.titlebar.selection-mode button.flat:backdrop:active, .titlebar.selection-mode 
.sidebar-button.button:backdrop:active,
         .titlebar.selection-mode button.titlebutton:backdrop:active, .titlebar.selection-mode 
button.flat:backdrop:checked, .titlebar.selection-mode .sidebar-button.button:backdrop:checked,
         .titlebar.selection-mode button.titlebutton:backdrop:checked,
-        .header-bar.selection-mode button:backdrop:active,
-        .header-bar.selection-mode button:backdrop:checked,
-        .header-bar.selection-mode button.flat:backdrop:active,
-        .header-bar.selection-mode .sidebar-button.button:backdrop:active,
-        .header-bar.selection-mode button.titlebutton:backdrop:active,
-        .header-bar.selection-mode button.flat:backdrop:checked,
-        .header-bar.selection-mode .sidebar-button.button:backdrop:checked,
-        .header-bar.selection-mode button.titlebutton:backdrop:checked {
+        headerbar.selection-mode button:backdrop:active,
+        headerbar.selection-mode button:backdrop:checked,
+        headerbar.selection-mode button.flat:backdrop:active,
+        headerbar.selection-mode .sidebar-button.button:backdrop:active,
+        headerbar.selection-mode button.titlebutton:backdrop:active,
+        headerbar.selection-mode button.flat:backdrop:checked,
+        headerbar.selection-mode .sidebar-button.button:backdrop:checked,
+        headerbar.selection-mode button.titlebutton:backdrop:checked {
           color: #d4e4f4;
           border-color: #2a76c6;
           background-image: linear-gradient(to bottom, #2a76c6);
@@ -1636,10 +1674,10 @@ GtkComboBox {
           border-color: #184472; }
         .titlebar.selection-mode button:backdrop:insensitive, .titlebar.selection-mode 
button.flat:backdrop:insensitive, .titlebar.selection-mode .sidebar-button.button:backdrop:insensitive,
         .titlebar.selection-mode button.titlebutton:backdrop:insensitive,
-        .header-bar.selection-mode button:backdrop:insensitive,
-        .header-bar.selection-mode button.flat:backdrop:insensitive,
-        .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive,
-        .header-bar.selection-mode button.titlebutton:backdrop:insensitive {
+        headerbar.selection-mode button:backdrop:insensitive,
+        headerbar.selection-mode button.flat:backdrop:insensitive,
+        headerbar.selection-mode .sidebar-button.button:backdrop:insensitive,
+        headerbar.selection-mode button.titlebutton:backdrop:insensitive {
           color: #9bc2ea;
           border-color: #65a1df;
           background-image: linear-gradient(to bottom, #65a1df);
@@ -1647,60 +1685,60 @@ GtkComboBox {
           icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(165, 200, 236, 0);
           border-color: #184472; }
-          .titlebar.selection-mode button:backdrop:insensitive > .label, .titlebar.selection-mode 
.header-bar button.titlebutton:backdrop:insensitive > .label, .titlebar.selection-mode 
button.flat:backdrop:insensitive > .label, .titlebar.selection-mode 
.sidebar-button.button:backdrop:insensitive > .label, .titlebar.selection-mode .header-bar 
button.titlebutton:backdrop:insensitive > .label,
+          .titlebar.selection-mode button:backdrop:insensitive > .label, .titlebar.selection-mode headerbar 
button.titlebutton:backdrop:insensitive > .label, .titlebar.selection-mode button.flat:backdrop:insensitive > 
.label, .titlebar.selection-mode .sidebar-button.button:backdrop:insensitive > .label, 
.titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive > .label,
           .titlebar.selection-mode button.titlebutton:backdrop:insensitive > .label,
-          .header-bar.selection-mode button:backdrop:insensitive > .label,
-          .header-bar.selection-mode .titlebar button.titlebutton:backdrop:insensitive > .label,
-          .header-bar.selection-mode button.flat:backdrop:insensitive > .label,
-          .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive > .label,
-          .header-bar.selection-mode button.titlebutton:backdrop:insensitive > .label,
-          .header-bar.selection-mode .titlebar button.titlebutton:backdrop:insensitive > .label {
+          headerbar.selection-mode button:backdrop:insensitive > .label,
+          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive > .label,
+          headerbar.selection-mode button.flat:backdrop:insensitive > .label,
+          headerbar.selection-mode .sidebar-button.button:backdrop:insensitive > .label,
+          headerbar.selection-mode button.titlebutton:backdrop:insensitive > .label,
+          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive > .label {
             color: inherit; }
         .titlebar.selection-mode button:backdrop:insensitive:active, .titlebar.selection-mode 
button:backdrop:insensitive:checked, .titlebar.selection-mode button.flat:backdrop:insensitive:active, 
.titlebar.selection-mode .sidebar-button.button:backdrop:insensitive:active,
         .titlebar.selection-mode button.titlebutton:backdrop:insensitive:active, .titlebar.selection-mode 
button.flat:backdrop:insensitive:checked, .titlebar.selection-mode 
.sidebar-button.button:backdrop:insensitive:checked,
         .titlebar.selection-mode button.titlebutton:backdrop:insensitive:checked,
-        .header-bar.selection-mode button:backdrop:insensitive:active,
-        .header-bar.selection-mode button:backdrop:insensitive:checked,
-        .header-bar.selection-mode button.flat:backdrop:insensitive:active,
-        .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive:active,
-        .header-bar.selection-mode button.titlebutton:backdrop:insensitive:active,
-        .header-bar.selection-mode button.flat:backdrop:insensitive:checked,
-        .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive:checked,
-        .header-bar.selection-mode button.titlebutton:backdrop:insensitive:checked {
+        headerbar.selection-mode button:backdrop:insensitive:active,
+        headerbar.selection-mode button:backdrop:insensitive:checked,
+        headerbar.selection-mode button.flat:backdrop:insensitive:active,
+        headerbar.selection-mode .sidebar-button.button:backdrop:insensitive:active,
+        headerbar.selection-mode button.titlebutton:backdrop:insensitive:active,
+        headerbar.selection-mode button.flat:backdrop:insensitive:checked,
+        headerbar.selection-mode .sidebar-button.button:backdrop:insensitive:checked,
+        headerbar.selection-mode button.titlebutton:backdrop:insensitive:checked {
           color: #8db9e8;
           border-color: #5094db;
           background-image: linear-gradient(to bottom, #5094db);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(165, 200, 236, 0);
           border-color: #184472; }
-          .titlebar.selection-mode button:backdrop:insensitive:active > .label, .titlebar.selection-mode 
.header-bar button.titlebutton:backdrop:insensitive:active > .label, .titlebar.selection-mode 
button:backdrop:insensitive:checked > .label, .titlebar.selection-mode .header-bar 
button.titlebutton:backdrop:insensitive:checked > .label, .titlebar.selection-mode 
button.flat:backdrop:insensitive:active > .label, .titlebar.selection-mode 
.sidebar-button.button:backdrop:insensitive:active > .label, .titlebar.selection-mode .header-bar 
button.titlebutton:backdrop:insensitive:active > .label,
-          .titlebar.selection-mode button.titlebutton:backdrop:insensitive:active > .label, 
.titlebar.selection-mode button.flat:backdrop:insensitive:checked > .label, .titlebar.selection-mode 
.sidebar-button.button:backdrop:insensitive:checked > .label, .titlebar.selection-mode .header-bar 
button.titlebutton:backdrop:insensitive:checked > .label,
+          .titlebar.selection-mode button:backdrop:insensitive:active > .label, .titlebar.selection-mode 
headerbar button.titlebutton:backdrop:insensitive:active > .label, .titlebar.selection-mode 
button:backdrop:insensitive:checked > .label, .titlebar.selection-mode headerbar 
button.titlebutton:backdrop:insensitive:checked > .label, .titlebar.selection-mode 
button.flat:backdrop:insensitive:active > .label, .titlebar.selection-mode 
.sidebar-button.button:backdrop:insensitive:active > .label, .titlebar.selection-mode headerbar 
button.titlebutton:backdrop:insensitive:active > .label,
+          .titlebar.selection-mode button.titlebutton:backdrop:insensitive:active > .label, 
.titlebar.selection-mode button.flat:backdrop:insensitive:checked > .label, .titlebar.selection-mode 
.sidebar-button.button:backdrop:insensitive:checked > .label, .titlebar.selection-mode headerbar 
button.titlebutton:backdrop:insensitive:checked > .label,
           .titlebar.selection-mode button.titlebutton:backdrop:insensitive:checked > .label,
-          .header-bar.selection-mode button:backdrop:insensitive:active > .label,
-          .header-bar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:active > .label,
-          .header-bar.selection-mode button:backdrop:insensitive:checked > .label,
-          .header-bar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:checked > .label,
-          .header-bar.selection-mode button.flat:backdrop:insensitive:active > .label,
-          .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive:active > .label,
-          .header-bar.selection-mode button.titlebutton:backdrop:insensitive:active > .label,
-          .header-bar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:active > .label,
-          .header-bar.selection-mode button.flat:backdrop:insensitive:checked > .label,
-          .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive:checked > .label,
-          .header-bar.selection-mode button.titlebutton:backdrop:insensitive:checked > .label,
-          .header-bar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:checked > .label {
+          headerbar.selection-mode button:backdrop:insensitive:active > .label,
+          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:active > .label,
+          headerbar.selection-mode button:backdrop:insensitive:checked > .label,
+          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:checked > .label,
+          headerbar.selection-mode button.flat:backdrop:insensitive:active > .label,
+          headerbar.selection-mode .sidebar-button.button:backdrop:insensitive:active > .label,
+          headerbar.selection-mode button.titlebutton:backdrop:insensitive:active > .label,
+          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:active > .label,
+          headerbar.selection-mode button.flat:backdrop:insensitive:checked > .label,
+          headerbar.selection-mode .sidebar-button.button:backdrop:insensitive:checked > .label,
+          headerbar.selection-mode button.titlebutton:backdrop:insensitive:checked > .label,
+          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:checked > .label {
             color: inherit; }
       .titlebar.selection-mode button.flat:backdrop, .titlebar.selection-mode 
.sidebar-button.button:backdrop,
       .titlebar.selection-mode button.titlebutton:backdrop, .titlebar.selection-mode 
button.flat:insensitive, .titlebar.selection-mode .sidebar-button.button:insensitive,
       .titlebar.selection-mode button.titlebutton:insensitive, .titlebar.selection-mode 
button.flat:insensitive:backdrop, .titlebar.selection-mode .sidebar-button.button:insensitive:backdrop,
       .titlebar.selection-mode button.titlebutton:insensitive:backdrop,
-      .header-bar.selection-mode button.flat:backdrop,
-      .header-bar.selection-mode .sidebar-button.button:backdrop,
-      .header-bar.selection-mode button.titlebutton:backdrop,
-      .header-bar.selection-mode button.flat:insensitive,
-      .header-bar.selection-mode .sidebar-button.button:insensitive,
-      .header-bar.selection-mode button.titlebutton:insensitive,
-      .header-bar.selection-mode button.flat:insensitive:backdrop,
-      .header-bar.selection-mode .sidebar-button.button:insensitive:backdrop,
-      .header-bar.selection-mode button.titlebutton:insensitive:backdrop {
+      headerbar.selection-mode button.flat:backdrop,
+      headerbar.selection-mode .sidebar-button.button:backdrop,
+      headerbar.selection-mode button.titlebutton:backdrop,
+      headerbar.selection-mode button.flat:insensitive,
+      headerbar.selection-mode .sidebar-button.button:insensitive,
+      headerbar.selection-mode button.titlebutton:insensitive,
+      headerbar.selection-mode button.flat:insensitive:backdrop,
+      headerbar.selection-mode .sidebar-button.button:insensitive:backdrop,
+      headerbar.selection-mode button.titlebutton:insensitive:backdrop {
         border-color: transparent;
         background-color: transparent;
         background-image: none;
@@ -1708,32 +1746,32 @@ GtkComboBox {
         text-shadow: none;
         icon-shadow: none; }
       .titlebar.selection-mode button:insensitive,
-      .header-bar.selection-mode button:insensitive {
+      headerbar.selection-mode button:insensitive {
         color: #b2d0ef;
         border-color: #1c5187;
         background-image: linear-gradient(to bottom, #65a1df);
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px #a5c8ec; }
-        .titlebar.selection-mode button:insensitive > .label, .titlebar.selection-mode .header-bar 
button.titlebutton:insensitive > .label,
-        .header-bar.selection-mode button:insensitive > .label,
-        .header-bar.selection-mode .titlebar button.titlebutton:insensitive > .label {
+        .titlebar.selection-mode button:insensitive > .label, .titlebar.selection-mode headerbar 
button.titlebutton:insensitive > .label,
+        headerbar.selection-mode button:insensitive > .label,
+        headerbar.selection-mode .titlebar button.titlebutton:insensitive > .label {
           color: inherit; }
         .titlebar.selection-mode button:insensitive:active, .titlebar.selection-mode 
button:insensitive:checked,
-        .header-bar.selection-mode button:insensitive:active,
-        .header-bar.selection-mode button:insensitive:checked {
+        headerbar.selection-mode button:insensitive:active,
+        headerbar.selection-mode button:insensitive:checked {
           color: #b9d4f1;
           border-color: #1c5187;
           background-image: linear-gradient(to bottom, #4b8dd3, #5094db);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px #a5c8ec; }
-          .titlebar.selection-mode button:insensitive:active > .label, .titlebar.selection-mode .header-bar 
button.titlebutton:insensitive:active > .label, .titlebar.selection-mode button:insensitive:checked > .label, 
.titlebar.selection-mode .header-bar button.titlebutton:insensitive:checked > .label,
-          .header-bar.selection-mode button:insensitive:active > .label,
-          .header-bar.selection-mode .titlebar button.titlebutton:insensitive:active > .label,
-          .header-bar.selection-mode button:insensitive:checked > .label,
-          .header-bar.selection-mode .titlebar button.titlebutton:insensitive:checked > .label {
+          .titlebar.selection-mode button:insensitive:active > .label, .titlebar.selection-mode headerbar 
button.titlebutton:insensitive:active > .label, .titlebar.selection-mode button:insensitive:checked > .label, 
.titlebar.selection-mode headerbar button.titlebutton:insensitive:checked > .label,
+          headerbar.selection-mode button:insensitive:active > .label,
+          headerbar.selection-mode .titlebar button.titlebutton:insensitive:active > .label,
+          headerbar.selection-mode button:insensitive:checked > .label,
+          headerbar.selection-mode .titlebar button.titlebutton:insensitive:checked > .label {
             color: inherit; }
       .titlebar.selection-mode button.suggested-action,
-      .header-bar.selection-mode button.suggested-action {
+      headerbar.selection-mode button.suggested-action {
         color: #2e3436;
         outline-color: rgba(46, 52, 54, 0.3);
         border-color: #a1a1a1;
@@ -1743,7 +1781,7 @@ GtkComboBox {
         box-shadow: inset 0 1px white, 0 1px #a5c8ec;
         border-color: #184472; }
         .titlebar.selection-mode button.suggested-action:hover,
-        .header-bar.selection-mode button.suggested-action:hover {
+        headerbar.selection-mode button.suggested-action:hover {
           color: #2e3436;
           outline-color: rgba(46, 52, 54, 0.3);
           border-color: #a1a1a1;
@@ -1753,7 +1791,7 @@ GtkComboBox {
           box-shadow: inset 0 1px white, 0 1px #a5c8ec;
           border-color: #184472; }
         .titlebar.selection-mode button.suggested-action:active,
-        .header-bar.selection-mode button.suggested-action:active {
+        headerbar.selection-mode button.suggested-action:active {
           color: #2e3436;
           outline-color: rgba(46, 52, 54, 0.3);
           border-color: #a1a1a1;
@@ -1763,7 +1801,7 @@ GtkComboBox {
           box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px 
#a5c8ec;
           border-color: #184472; }
         .titlebar.selection-mode button.suggested-action:insensitive,
-        .header-bar.selection-mode button.suggested-action:insensitive {
+        headerbar.selection-mode button.suggested-action:insensitive {
           color: #8e9192;
           border-color: #a1a1a1;
           background-image: linear-gradient(to bottom, #f4f4f4);
@@ -1771,12 +1809,12 @@ GtkComboBox {
           icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px #a5c8ec;
           border-color: #184472; }
-          .titlebar.selection-mode button.suggested-action:insensitive > .label, .titlebar.selection-mode 
.header-bar button.suggested-action.titlebutton:insensitive > .label,
-          .header-bar.selection-mode button.suggested-action:insensitive > .label,
-          .header-bar.selection-mode .titlebar button.suggested-action.titlebutton:insensitive > .label {
+          .titlebar.selection-mode button.suggested-action:insensitive > .label, .titlebar.selection-mode 
headerbar button.suggested-action.titlebutton:insensitive > .label,
+          headerbar.selection-mode button.suggested-action:insensitive > .label,
+          headerbar.selection-mode .titlebar button.suggested-action.titlebutton:insensitive > .label {
             color: inherit; }
         .titlebar.selection-mode button.suggested-action:backdrop,
-        .header-bar.selection-mode button.suggested-action:backdrop {
+        headerbar.selection-mode button.suggested-action:backdrop {
           color: #8e9192;
           border-color: darkgray;
           background-image: linear-gradient(to bottom, #ededed);
@@ -1785,7 +1823,7 @@ GtkComboBox {
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(165, 200, 236, 0);
           border-color: #184472; }
         .titlebar.selection-mode button.suggested-action:backdrop:insensitive,
-        .header-bar.selection-mode button.suggested-action:backdrop:insensitive {
+        headerbar.selection-mode button.suggested-action:backdrop:insensitive {
           color: #c7c7c7;
           border-color: darkgray;
           background-image: linear-gradient(to bottom, #f4f4f4);
@@ -1793,42 +1831,48 @@ GtkComboBox {
           icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(165, 200, 236, 0);
           border-color: #184472; }
-          .titlebar.selection-mode button.suggested-action:backdrop:insensitive > .label, 
.titlebar.selection-mode .header-bar button.suggested-action.titlebutton:backdrop:insensitive > .label,
-          .header-bar.selection-mode button.suggested-action:backdrop:insensitive > .label,
-          .header-bar.selection-mode .titlebar button.suggested-action.titlebutton:backdrop:insensitive > 
.label {
+          .titlebar.selection-mode button.suggested-action:backdrop:insensitive > .label, 
.titlebar.selection-mode headerbar button.suggested-action.titlebutton:backdrop:insensitive > .label,
+          headerbar.selection-mode button.suggested-action:backdrop:insensitive > .label,
+          headerbar.selection-mode .titlebar button.suggested-action.titlebutton:backdrop:insensitive > 
.label {
             color: inherit; }
     .titlebar.selection-mode .selection-menu, .titlebar.selection-mode .selection-menu:backdrop,
-    .header-bar.selection-mode .selection-menu,
-    .header-bar.selection-mode .selection-menu:backdrop {
+    headerbar.selection-mode .selection-menu,
+    headerbar.selection-mode .titlebar.selection-mode .selection-menu:backdrop,
+    .titlebar.selection-mode headerbar.selection-mode .selection-menu:backdrop,
+    headerbar.selection-mode .selection-menu:backdrop {
       border-color: rgba(74, 144, 217, 0);
       background-image: linear-gradient(to bottom, rgba(74, 144, 217, 0));
       box-shadow: none;
       padding-left: 10px;
       padding-right: 10px; }
       .titlebar.selection-mode .selection-menu GtkArrow, .titlebar.selection-mode .selection-menu:backdrop 
GtkArrow,
-      .header-bar.selection-mode .selection-menu GtkArrow,
-      .header-bar.selection-mode .selection-menu:backdrop GtkArrow {
+      headerbar.selection-mode .selection-menu GtkArrow,
+      headerbar.selection-mode .titlebar.selection-mode .selection-menu:backdrop GtkArrow,
+      .titlebar.selection-mode headerbar.selection-mode .selection-menu:backdrop GtkArrow,
+      headerbar.selection-mode .selection-menu:backdrop GtkArrow {
         -GtkArrow-arrow-scaling: 1; }
       .titlebar.selection-mode .selection-menu .arrow,
-      .header-bar.selection-mode .selection-menu .arrow {
+      headerbar.selection-mode .selection-menu .arrow {
         -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
         color: rgba(255, 255, 255, 0.5);
         icon-shadow: none; }
   .tiled .titlebar, .maximized .titlebar, .tiled
-  .header-bar, .maximized
-  .header-bar {
+  headerbar, .maximized
+  headerbar {
     border-radius: 0; }
   .titlebar.default-decoration,
-  .header-bar.default-decoration {
+  headerbar.default-decoration {
     padding: 4px; }
     .titlebar.default-decoration button,
-    .header-bar.default-decoration button {
+    headerbar.default-decoration button,
+    headerbar.default-decoration .titlebar button.titlebutton,
+    .titlebar headerbar.default-decoration button.titlebutton {
       padding: 5px; }
 
 /************
  * Pathbars *
  ************/
-.path-bar button, .path-bar .header-bar button.titlebutton, .header-bar .path-bar button.titlebutton,
+.path-bar button, .path-bar headerbar button.titlebutton, headerbar .path-bar button.titlebutton,
 .path-bar .titlebar button.titlebutton,
 .titlebar .path-bar button.titlebutton {
   padding: 5px 6px 6px; }
@@ -1846,7 +1890,7 @@ GtkComboBox {
   .path-bar button label:only-child {
     padding-right: 0;
     padding-left: 0; }
-  .path-bar button image, .path-bar .header-bar button.titlebutton image, .header-bar .path-bar 
button.titlebutton image,
+  .path-bar button image,
   .path-bar .titlebar button.titlebutton image,
   .titlebar .path-bar button.titlebutton image {
     padding-top: 1px; }
@@ -1928,7 +1972,7 @@ GtkTreeView.view {
       border-style: solid;
       border-color: #4a90d9; }
 
-column-header button, column-header .header-bar button.titlebutton, .header-bar column-header 
button.titlebutton,
+column-header button, column-header headerbar button.titlebutton, headerbar column-header button.titlebutton,
 column-header .titlebar button.titlebutton,
 .titlebar column-header button.titlebutton {
   color: #979a9b;
@@ -1936,32 +1980,32 @@ column-header .titlebar button.titlebutton,
   font-weight: bold;
   text-shadow: none;
   box-shadow: none; }
-  column-header button:hover, column-header .header-bar button.titlebutton:hover, .header-bar column-header 
button.titlebutton:hover,
+  column-header button:hover,
   column-header .titlebar button.titlebutton:hover,
   .titlebar column-header button.titlebutton:hover {
     color: #636769;
     box-shadow: none;
     transition: none; }
-  column-header button:active, column-header .header-bar button.titlebutton:active, .header-bar 
column-header button.titlebutton:active,
+  column-header button:active,
   column-header .titlebar button.titlebutton:active,
   .titlebar column-header button.titlebutton:active {
     color: #2e3436;
     transition: none; }
-column-header button:last-child, column-header .header-bar button.titlebutton:last-child, .header-bar 
column-header button.titlebutton:last-child,
+column-header button:last-child,
 column-header .titlebar button.titlebutton:last-child,
-.titlebar column-header button.titlebutton:last-child, column-header button:last-child:backdrop, 
column-header:last-child button, column-header:last-child .header-bar button.titlebutton, .header-bar 
column-header:last-child button.titlebutton,
+.titlebar column-header button.titlebutton:last-child, column-header button:last-child:backdrop, 
column-header:last-child button,
 column-header:last-child .titlebar button.titlebutton,
 .titlebar column-header:last-child button.titlebutton, column-header:last-child button:backdrop {
   border-right-style: none; }
 
-column-header.button.dnd, column-header button.dnd, column-header .header-bar button.dnd.titlebutton, 
.header-bar column-header button.dnd.titlebutton,
+column-header.button.dnd, column-header button.dnd,
 column-header .titlebar button.dnd.titlebutton,
 .titlebar column-header button.dnd.titlebutton, column-header.button.dnd:active, 
column-header.button.dnd:selected, column-header.button.dnd:hover {
   transition: none;
   color: #4a90d9;
   box-shadow: inset 1px 1px 0 1px #4a90d9, inset -1px 0 0 1px #4a90d9, inset 1px 1px #ffffff, inset -1px 0 
#ffffff; }
 
-column-header button, column-header .header-bar button.titlebutton, .header-bar column-header 
button.titlebutton,
+column-header button, column-header headerbar button.titlebutton, headerbar column-header button.titlebutton,
 column-header .titlebar button.titlebutton,
 .titlebar column-header button.titlebutton, column-header button:hover, column-header button:active {
   padding: 3px 6px;
@@ -1970,12 +2014,12 @@ column-header .titlebar button.titlebutton,
   background-image: none;
   border-color: #ededed;
   text-shadow: none; }
-  column-header button:insensitive, column-header .header-bar button.titlebutton:insensitive, .header-bar 
column-header button.titlebutton:insensitive,
+  column-header button:insensitive,
   column-header .titlebar button.titlebutton:insensitive,
   .titlebar column-header button.titlebutton:insensitive {
     border-color: #ededed;
     background-image: none; }
-  column-header button:backdrop, column-header .header-bar button.titlebutton:backdrop, .header-bar 
column-header button.titlebutton:backdrop,
+  column-header button:backdrop,
   column-header .titlebar button.titlebutton:backdrop,
   .titlebar column-header button.titlebutton:backdrop {
     border-color: #ededed;
@@ -2029,7 +2073,7 @@ column-header .titlebar button.titlebutton,
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
     .menu .menuitem.arrow:dir(rtl) {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
-  .menu button, .menu .header-bar button.titlebutton, .header-bar .menu button.titlebutton,
+  .menu button, .menu headerbar button.titlebutton, headerbar .menu button.titlebutton,
   .menu .titlebar button.titlebutton,
   .titlebar .menu button.titlebutton {
     border-style: none;
@@ -2067,13 +2111,13 @@ column-header .titlebar button.titlebutton,
   .popover > .location-bar, .popover.osd > .toolbar, .popover.osd > .inline-toolbar, .popover.osd > 
.search-bar, .popover.osd > .location-bar {
     border-style: none;
     background-color: transparent; }
-  .popover button.flat, .popover .sidebar-button.button, .popover .header-bar button.titlebutton, 
.header-bar .popover button.titlebutton,
+  .popover button.flat, .popover .sidebar-button.button, .popover headerbar button.titlebutton, headerbar 
.popover button.titlebutton,
   .popover .titlebar button.titlebutton,
   .titlebar .popover button.titlebutton,
   .popover button.flat:hover,
   .popover .sidebar-button.button:hover,
-  .popover .header-bar button.titlebutton:hover,
-  .header-bar .popover button.titlebutton:hover,
+  .popover headerbar button.titlebutton:hover,
+  headerbar .popover button.titlebutton:hover,
   .popover .titlebar button.titlebutton:hover,
   .titlebar .popover button.titlebutton:hover {
     text-shadow: none;
@@ -2293,7 +2337,7 @@ notebook {
       color: #2e3436; }
       notebook tab:active label:backdrop {
         color: #8e9192; }
-    notebook tab button, notebook tab .header-bar button.titlebutton, .header-bar notebook tab 
button.titlebutton,
+    notebook tab button, notebook tab headerbar button.titlebutton, headerbar notebook tab 
button.titlebutton,
     notebook tab .titlebar button.titlebutton,
     .titlebar notebook tab button.titlebutton {
       padding: 0;
@@ -2301,7 +2345,7 @@ notebook {
       icon-shadow: none;
       transition: none;
       color: rgba(46, 52, 54, 0.3); }
-      notebook tab button:hover, notebook tab .header-bar button.titlebutton:hover, .header-bar notebook tab 
button.titlebutton:hover,
+      notebook tab button:hover,
       notebook tab .titlebar button.titlebutton:hover,
       .titlebar notebook tab button.titlebutton:hover {
         color: #2e3436;
@@ -2314,7 +2358,7 @@ notebook {
         box-shadow: inset 0 1px white;
         background-image: none;
         box-shadow: none; }
-      notebook tab button:active, notebook tab .header-bar button.titlebutton:active, .header-bar notebook 
tab button.titlebutton:active,
+      notebook tab button:active,
       notebook tab .titlebar button.titlebutton:active,
       .titlebar notebook tab button.titlebutton:active {
         color: #2e3436;
@@ -2324,12 +2368,12 @@ notebook {
         text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
         icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
         box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
-      notebook tab button:backdrop, notebook tab .header-bar button.titlebutton:backdrop, .header-bar 
notebook tab button.titlebutton:backdrop,
+      notebook tab button:backdrop,
       notebook tab .titlebar button.titlebutton:backdrop,
       .titlebar notebook tab button.titlebutton:backdrop {
         color: rgba(142, 145, 146, 0.3);
         border-color: transparent; }
-      notebook tab button > image, notebook tab .header-bar button.titlebutton > image, .header-bar notebook 
tab button.titlebutton > image,
+      notebook tab button > image, notebook tab headerbar button.titlebutton > image, headerbar notebook tab 
button.titlebutton > image,
       notebook tab .titlebar button.titlebutton > image,
       .titlebar notebook tab button.titlebutton > image {
         padding: 2px; }
@@ -2357,7 +2401,7 @@ notebook {
   -GtkScrollbar-min-slider-length: 42;
   -GtkRange-stepper-spacing: 0;
   -GtkRange-trough-under-steppers: 1; }
-  .scrollbar button, .scrollbar .header-bar button.titlebutton, .header-bar .scrollbar button.titlebutton,
+  .scrollbar button, .scrollbar headerbar button.titlebutton, headerbar .scrollbar button.titlebutton,
   .scrollbar .titlebar button.titlebutton,
   .titlebar .scrollbar button.titlebutton {
     border: none; }
@@ -2551,7 +2595,7 @@ switch {
 check {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked.png"), url("assets/checkbox-unchecked 2 
png"));
   icon-shadow: 0 1px 0 white; }
-  check button.flat, check .sidebar-button.button, check .header-bar button.titlebutton, .header-bar check 
button.titlebutton,
+  check button.flat, check .sidebar-button.button, check headerbar button.titlebutton, headerbar check 
button.titlebutton,
   check .titlebar button.titlebutton,
   .titlebar check button.titlebutton {
     icon-shadow: none; }
@@ -2563,7 +2607,7 @@ check {
 check:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-hover.png"), 
url("assets/checkbox-unchecked-hover 2 png"));
   icon-shadow: 0 1px 0 white; }
-  check:hover button.flat, check:hover .sidebar-button.button, check:hover .header-bar button.titlebutton, 
.header-bar check:hover button.titlebutton,
+  check:hover button.flat, check:hover .sidebar-button.button, check:hover headerbar button.titlebutton, 
headerbar check:hover button.titlebutton,
   check:hover .titlebar button.titlebutton,
   .titlebar check:hover button.titlebutton {
     icon-shadow: none; }
@@ -2575,7 +2619,7 @@ check:hover {
 check:active {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-active.png"), 
url("assets/checkbox-unchecked-active 2 png"));
   icon-shadow: 0 1px 0 white; }
-  check:active button.flat, check:active .sidebar-button.button, check:active .header-bar 
button.titlebutton, .header-bar check:active button.titlebutton,
+  check:active button.flat, check:active .sidebar-button.button, check:active headerbar button.titlebutton, 
headerbar check:active button.titlebutton,
   check:active .titlebar button.titlebutton,
   .titlebar check:active button.titlebutton {
     icon-shadow: none; }
@@ -2587,7 +2631,7 @@ check:active {
 check:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive.png"), 
url("assets/checkbox-unchecked-insensitive 2 png"));
   icon-shadow: 0 1px 0 white; }
-  check:insensitive button.flat, check:insensitive .sidebar-button.button, check:insensitive .header-bar 
button.titlebutton, .header-bar check:insensitive button.titlebutton,
+  check:insensitive button.flat, check:insensitive .sidebar-button.button, check:insensitive headerbar 
button.titlebutton, headerbar check:insensitive button.titlebutton,
   check:insensitive .titlebar button.titlebutton,
   .titlebar check:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -2599,7 +2643,7 @@ check:insensitive {
 check:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-backdrop.png"), 
url("assets/checkbox-unchecked-backdrop 2 png"));
   icon-shadow: none; }
-  check:backdrop button.flat, check:backdrop .sidebar-button.button, check:backdrop .header-bar 
button.titlebutton, .header-bar check:backdrop button.titlebutton,
+  check:backdrop button.flat, check:backdrop .sidebar-button.button, check:backdrop headerbar 
button.titlebutton, headerbar check:backdrop button.titlebutton,
   check:backdrop .titlebar button.titlebutton,
   .titlebar check:backdrop button.titlebutton {
     icon-shadow: none; }
@@ -2611,7 +2655,7 @@ check:backdrop {
 check:backdrop:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-backdrop-insensitive.png"), 
url("assets/checkbox-unchecked-backdrop-insensitive 2 png"));
   icon-shadow: none; }
-  check:backdrop:insensitive button.flat, check:backdrop:insensitive .sidebar-button.button, 
check:backdrop:insensitive .header-bar button.titlebutton, .header-bar check:backdrop:insensitive 
button.titlebutton,
+  check:backdrop:insensitive button.flat, check:backdrop:insensitive .sidebar-button.button, 
check:backdrop:insensitive headerbar button.titlebutton, headerbar check:backdrop:insensitive 
button.titlebutton,
   check:backdrop:insensitive .titlebar button.titlebutton,
   .titlebar check:backdrop:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -2623,7 +2667,7 @@ check:backdrop:insensitive {
 check:inconsistent {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed.png"), url("assets/checkbox-mixed 2 png"));
   icon-shadow: 0 1px 0 white; }
-  check:inconsistent button.flat, check:inconsistent .sidebar-button.button, check:inconsistent .header-bar 
button.titlebutton, .header-bar check:inconsistent button.titlebutton,
+  check:inconsistent button.flat, check:inconsistent .sidebar-button.button, check:inconsistent headerbar 
button.titlebutton, headerbar check:inconsistent button.titlebutton,
   check:inconsistent .titlebar button.titlebutton,
   .titlebar check:inconsistent button.titlebutton {
     icon-shadow: none; }
@@ -2635,7 +2679,7 @@ check:inconsistent {
 check:inconsistent:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-hover.png"), url("assets/checkbox-mixed-hover 2 
png"));
   icon-shadow: 0 1px 0 white; }
-  check:inconsistent:hover button.flat, check:inconsistent:hover .sidebar-button.button, 
check:inconsistent:hover .header-bar button.titlebutton, .header-bar check:inconsistent:hover 
button.titlebutton,
+  check:inconsistent:hover button.flat, check:inconsistent:hover .sidebar-button.button, 
check:inconsistent:hover headerbar button.titlebutton, headerbar check:inconsistent:hover button.titlebutton,
   check:inconsistent:hover .titlebar button.titlebutton,
   .titlebar check:inconsistent:hover button.titlebutton {
     icon-shadow: none; }
@@ -2647,7 +2691,7 @@ check:inconsistent:hover {
 check:inconsistent:selected {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-active.png"), url("assets/checkbox-mixed-active 2 
png"));
   icon-shadow: 0 1px 0 white; }
-  check:inconsistent:selected button.flat, check:inconsistent:selected .sidebar-button.button, 
check:inconsistent:selected .header-bar button.titlebutton, .header-bar check:inconsistent:selected 
button.titlebutton,
+  check:inconsistent:selected button.flat, check:inconsistent:selected .sidebar-button.button, 
check:inconsistent:selected headerbar button.titlebutton, headerbar check:inconsistent:selected 
button.titlebutton,
   check:inconsistent:selected .titlebar button.titlebutton,
   .titlebar check:inconsistent:selected button.titlebutton {
     icon-shadow: none; }
@@ -2659,7 +2703,7 @@ check:inconsistent:selected {
 check:inconsistent:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-backdrop.png"), 
url("assets/checkbox-mixed-backdrop 2 png"));
   icon-shadow: none; }
-  check:inconsistent:backdrop button.flat, check:inconsistent:backdrop .sidebar-button.button, 
check:inconsistent:backdrop .header-bar button.titlebutton, .header-bar check:inconsistent:backdrop 
button.titlebutton,
+  check:inconsistent:backdrop button.flat, check:inconsistent:backdrop .sidebar-button.button, 
check:inconsistent:backdrop headerbar button.titlebutton, headerbar check:inconsistent:backdrop 
button.titlebutton,
   check:inconsistent:backdrop .titlebar button.titlebutton,
   .titlebar check:inconsistent:backdrop button.titlebutton {
     icon-shadow: none; }
@@ -2671,7 +2715,7 @@ check:inconsistent:backdrop {
 check:inconsistent:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive.png"), 
url("assets/checkbox-mixed-insensitive 2 png"));
   icon-shadow: 0 1px 0 white; }
-  check:inconsistent:insensitive button.flat, check:inconsistent:insensitive .sidebar-button.button, 
check:inconsistent:insensitive .header-bar button.titlebutton, .header-bar check:inconsistent:insensitive 
button.titlebutton,
+  check:inconsistent:insensitive button.flat, check:inconsistent:insensitive .sidebar-button.button, 
check:inconsistent:insensitive headerbar button.titlebutton, headerbar check:inconsistent:insensitive 
button.titlebutton,
   check:inconsistent:insensitive .titlebar button.titlebutton,
   .titlebar check:inconsistent:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -2683,7 +2727,7 @@ check:inconsistent:insensitive {
 check:inconsistent:insensitive:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-backdrop-insensitive.png"), 
url("assets/checkbox-mixed-backdrop-insensitive 2 png"));
   icon-shadow: none; }
-  check:inconsistent:insensitive:backdrop button.flat, check:inconsistent:insensitive:backdrop 
.sidebar-button.button, check:inconsistent:insensitive:backdrop .header-bar button.titlebutton, .header-bar 
check:inconsistent:insensitive:backdrop button.titlebutton,
+  check:inconsistent:insensitive:backdrop button.flat, check:inconsistent:insensitive:backdrop 
.sidebar-button.button, check:inconsistent:insensitive:backdrop headerbar button.titlebutton, headerbar 
check:inconsistent:insensitive:backdrop button.titlebutton,
   check:inconsistent:insensitive:backdrop .titlebar button.titlebutton,
   .titlebar check:inconsistent:insensitive:backdrop button.titlebutton {
     icon-shadow: none; }
@@ -2695,7 +2739,7 @@ check:inconsistent:insensitive:backdrop {
 check:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked.png"), url("assets/checkbox-checked 2 png"));
   icon-shadow: 0 1px 0 white; }
-  check:checked button.flat, check:checked .sidebar-button.button, check:checked .header-bar 
button.titlebutton, .header-bar check:checked button.titlebutton,
+  check:checked button.flat, check:checked .sidebar-button.button, check:checked headerbar 
button.titlebutton, headerbar check:checked button.titlebutton,
   check:checked .titlebar button.titlebutton,
   .titlebar check:checked button.titlebutton {
     icon-shadow: none; }
@@ -2707,7 +2751,7 @@ check:checked {
 check:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive.png"), 
url("assets/checkbox-checked-insensitive 2 png"));
   icon-shadow: 0 1px 0 white; }
-  check:checked:insensitive button.flat, check:checked:insensitive .sidebar-button.button, 
check:checked:insensitive .header-bar button.titlebutton, .header-bar check:checked:insensitive 
button.titlebutton,
+  check:checked:insensitive button.flat, check:checked:insensitive .sidebar-button.button, 
check:checked:insensitive headerbar button.titlebutton, headerbar check:checked:insensitive 
button.titlebutton,
   check:checked:insensitive .titlebar button.titlebutton,
   .titlebar check:checked:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -2719,7 +2763,7 @@ check:checked:insensitive {
 check:checked:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-hover.png"), url("assets/checkbox-checked-hover 
2 png"));
   icon-shadow: 0 1px 0 white; }
-  check:checked:hover button.flat, check:checked:hover .sidebar-button.button, check:checked:hover 
.header-bar button.titlebutton, .header-bar check:checked:hover button.titlebutton,
+  check:checked:hover button.flat, check:checked:hover .sidebar-button.button, check:checked:hover headerbar 
button.titlebutton, headerbar check:checked:hover button.titlebutton,
   check:checked:hover .titlebar button.titlebutton,
   .titlebar check:checked:hover button.titlebutton {
     icon-shadow: none; }
@@ -2731,7 +2775,7 @@ check:checked:hover {
 check:checked:active {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-active.png"), 
url("assets/checkbox-checked-active 2 png"));
   icon-shadow: 0 1px 0 white; }
-  check:checked:active button.flat, check:checked:active .sidebar-button.button, check:checked:active 
.header-bar button.titlebutton, .header-bar check:checked:active button.titlebutton,
+  check:checked:active button.flat, check:checked:active .sidebar-button.button, check:checked:active 
headerbar button.titlebutton, headerbar check:checked:active button.titlebutton,
   check:checked:active .titlebar button.titlebutton,
   .titlebar check:checked:active button.titlebutton {
     icon-shadow: none; }
@@ -2743,7 +2787,7 @@ check:checked:active {
 check:backdrop:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop.png"), 
url("assets/checkbox-checked-backdrop 2 png"));
   icon-shadow: none; }
-  check:backdrop:checked button.flat, check:backdrop:checked .sidebar-button.button, check:backdrop:checked 
.header-bar button.titlebutton, .header-bar check:backdrop:checked button.titlebutton,
+  check:backdrop:checked button.flat, check:backdrop:checked .sidebar-button.button, check:backdrop:checked 
headerbar button.titlebutton, headerbar check:backdrop:checked button.titlebutton,
   check:backdrop:checked .titlebar button.titlebutton,
   .titlebar check:backdrop:checked button.titlebutton {
     icon-shadow: none; }
@@ -2755,7 +2799,7 @@ check:backdrop:checked {
 check:backdrop:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-insensitive.png"), 
url("assets/checkbox-checked-backdrop-insensitive 2 png"));
   icon-shadow: none; }
-  check:backdrop:checked:insensitive button.flat, check:backdrop:checked:insensitive .sidebar-button.button, 
check:backdrop:checked:insensitive .header-bar button.titlebutton, .header-bar 
check:backdrop:checked:insensitive button.titlebutton,
+  check:backdrop:checked:insensitive button.flat, check:backdrop:checked:insensitive .sidebar-button.button, 
check:backdrop:checked:insensitive headerbar button.titlebutton, headerbar check:backdrop:checked:insensitive 
button.titlebutton,
   check:backdrop:checked:insensitive .titlebar button.titlebutton,
   .titlebar check:backdrop:checked:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -2780,7 +2824,7 @@ check:backdrop:checked:insensitive {
 radio {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked.png"), url("assets/radio-unchecked 2 png"));
   icon-shadow: 0 1px 0 white; }
-  radio button.flat, radio .sidebar-button.button, radio .header-bar button.titlebutton, .header-bar radio 
button.titlebutton,
+  radio button.flat, radio .sidebar-button.button, radio headerbar button.titlebutton, headerbar radio 
button.titlebutton,
   radio .titlebar button.titlebutton,
   .titlebar radio button.titlebutton {
     icon-shadow: none; }
@@ -2792,7 +2836,7 @@ radio {
 radio:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-hover.png"), url("assets/radio-unchecked-hover 2 
png"));
   icon-shadow: 0 1px 0 white; }
-  radio:hover button.flat, radio:hover .sidebar-button.button, radio:hover .header-bar button.titlebutton, 
.header-bar radio:hover button.titlebutton,
+  radio:hover button.flat, radio:hover .sidebar-button.button, radio:hover headerbar button.titlebutton, 
headerbar radio:hover button.titlebutton,
   radio:hover .titlebar button.titlebutton,
   .titlebar radio:hover button.titlebutton {
     icon-shadow: none; }
@@ -2804,7 +2848,7 @@ radio:hover {
 radio:active {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-active.png"), url("assets/radio-unchecked-active 
2 png"));
   icon-shadow: 0 1px 0 white; }
-  radio:active button.flat, radio:active .sidebar-button.button, radio:active .header-bar 
button.titlebutton, .header-bar radio:active button.titlebutton,
+  radio:active button.flat, radio:active .sidebar-button.button, radio:active headerbar button.titlebutton, 
headerbar radio:active button.titlebutton,
   radio:active .titlebar button.titlebutton,
   .titlebar radio:active button.titlebutton {
     icon-shadow: none; }
@@ -2816,7 +2860,7 @@ radio:active {
 radio:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive.png"), 
url("assets/radio-unchecked-insensitive 2 png"));
   icon-shadow: 0 1px 0 white; }
-  radio:insensitive button.flat, radio:insensitive .sidebar-button.button, radio:insensitive .header-bar 
button.titlebutton, .header-bar radio:insensitive button.titlebutton,
+  radio:insensitive button.flat, radio:insensitive .sidebar-button.button, radio:insensitive headerbar 
button.titlebutton, headerbar radio:insensitive button.titlebutton,
   radio:insensitive .titlebar button.titlebutton,
   .titlebar radio:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -2828,7 +2872,7 @@ radio:insensitive {
 radio:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-backdrop.png"), 
url("assets/radio-unchecked-backdrop 2 png"));
   icon-shadow: none; }
-  radio:backdrop button.flat, radio:backdrop .sidebar-button.button, radio:backdrop .header-bar 
button.titlebutton, .header-bar radio:backdrop button.titlebutton,
+  radio:backdrop button.flat, radio:backdrop .sidebar-button.button, radio:backdrop headerbar 
button.titlebutton, headerbar radio:backdrop button.titlebutton,
   radio:backdrop .titlebar button.titlebutton,
   .titlebar radio:backdrop button.titlebutton {
     icon-shadow: none; }
@@ -2840,7 +2884,7 @@ radio:backdrop {
 radio:backdrop:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-backdrop-insensitive.png"), 
url("assets/radio-unchecked-backdrop-insensitive 2 png"));
   icon-shadow: none; }
-  radio:backdrop:insensitive button.flat, radio:backdrop:insensitive .sidebar-button.button, 
radio:backdrop:insensitive .header-bar button.titlebutton, .header-bar radio:backdrop:insensitive 
button.titlebutton,
+  radio:backdrop:insensitive button.flat, radio:backdrop:insensitive .sidebar-button.button, 
radio:backdrop:insensitive headerbar button.titlebutton, headerbar radio:backdrop:insensitive 
button.titlebutton,
   radio:backdrop:insensitive .titlebar button.titlebutton,
   .titlebar radio:backdrop:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -2852,7 +2896,7 @@ radio:backdrop:insensitive {
 radio:inconsistent {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed.png"), url("assets/radio-mixed 2 png"));
   icon-shadow: 0 1px 0 white; }
-  radio:inconsistent button.flat, radio:inconsistent .sidebar-button.button, radio:inconsistent .header-bar 
button.titlebutton, .header-bar radio:inconsistent button.titlebutton,
+  radio:inconsistent button.flat, radio:inconsistent .sidebar-button.button, radio:inconsistent headerbar 
button.titlebutton, headerbar radio:inconsistent button.titlebutton,
   radio:inconsistent .titlebar button.titlebutton,
   .titlebar radio:inconsistent button.titlebutton {
     icon-shadow: none; }
@@ -2864,7 +2908,7 @@ radio:inconsistent {
 radio:inconsistent:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-hover.png"), url("assets/radio-mixed-hover 2 png"));
   icon-shadow: 0 1px 0 white; }
-  radio:inconsistent:hover button.flat, radio:inconsistent:hover .sidebar-button.button, 
radio:inconsistent:hover .header-bar button.titlebutton, .header-bar radio:inconsistent:hover 
button.titlebutton,
+  radio:inconsistent:hover button.flat, radio:inconsistent:hover .sidebar-button.button, 
radio:inconsistent:hover headerbar button.titlebutton, headerbar radio:inconsistent:hover button.titlebutton,
   radio:inconsistent:hover .titlebar button.titlebutton,
   .titlebar radio:inconsistent:hover button.titlebutton {
     icon-shadow: none; }
@@ -2876,7 +2920,7 @@ radio:inconsistent:hover {
 radio:inconsistent:selected {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active.png"), url("assets/radio-mixed-active 2 
png"));
   icon-shadow: 0 1px 0 white; }
-  radio:inconsistent:selected button.flat, radio:inconsistent:selected .sidebar-button.button, 
radio:inconsistent:selected .header-bar button.titlebutton, .header-bar radio:inconsistent:selected 
button.titlebutton,
+  radio:inconsistent:selected button.flat, radio:inconsistent:selected .sidebar-button.button, 
radio:inconsistent:selected headerbar button.titlebutton, headerbar radio:inconsistent:selected 
button.titlebutton,
   radio:inconsistent:selected .titlebar button.titlebutton,
   .titlebar radio:inconsistent:selected button.titlebutton {
     icon-shadow: none; }
@@ -2888,7 +2932,7 @@ radio:inconsistent:selected {
 radio:inconsistent:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-backdrop.png"), url("assets/radio-mixed-backdrop 2 
png"));
   icon-shadow: none; }
-  radio:inconsistent:backdrop button.flat, radio:inconsistent:backdrop .sidebar-button.button, 
radio:inconsistent:backdrop .header-bar button.titlebutton, .header-bar radio:inconsistent:backdrop 
button.titlebutton,
+  radio:inconsistent:backdrop button.flat, radio:inconsistent:backdrop .sidebar-button.button, 
radio:inconsistent:backdrop headerbar button.titlebutton, headerbar radio:inconsistent:backdrop 
button.titlebutton,
   radio:inconsistent:backdrop .titlebar button.titlebutton,
   .titlebar radio:inconsistent:backdrop button.titlebutton {
     icon-shadow: none; }
@@ -2900,7 +2944,7 @@ radio:inconsistent:backdrop {
 radio:inconsistent:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive.png"), 
url("assets/radio-mixed-insensitive 2 png"));
   icon-shadow: 0 1px 0 white; }
-  radio:inconsistent:insensitive button.flat, radio:inconsistent:insensitive .sidebar-button.button, 
radio:inconsistent:insensitive .header-bar button.titlebutton, .header-bar radio:inconsistent:insensitive 
button.titlebutton,
+  radio:inconsistent:insensitive button.flat, radio:inconsistent:insensitive .sidebar-button.button, 
radio:inconsistent:insensitive headerbar button.titlebutton, headerbar radio:inconsistent:insensitive 
button.titlebutton,
   radio:inconsistent:insensitive .titlebar button.titlebutton,
   .titlebar radio:inconsistent:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -2912,7 +2956,7 @@ radio:inconsistent:insensitive {
 radio:inconsistent:insensitive:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-backdrop-insensitive.png"), 
url("assets/radio-mixed-backdrop-insensitive 2 png"));
   icon-shadow: none; }
-  radio:inconsistent:insensitive:backdrop button.flat, radio:inconsistent:insensitive:backdrop 
.sidebar-button.button, radio:inconsistent:insensitive:backdrop .header-bar button.titlebutton, .header-bar 
radio:inconsistent:insensitive:backdrop button.titlebutton,
+  radio:inconsistent:insensitive:backdrop button.flat, radio:inconsistent:insensitive:backdrop 
.sidebar-button.button, radio:inconsistent:insensitive:backdrop headerbar button.titlebutton, headerbar 
radio:inconsistent:insensitive:backdrop button.titlebutton,
   radio:inconsistent:insensitive:backdrop .titlebar button.titlebutton,
   .titlebar radio:inconsistent:insensitive:backdrop button.titlebutton {
     icon-shadow: none; }
@@ -2924,7 +2968,7 @@ radio:inconsistent:insensitive:backdrop {
 radio:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked.png"), url("assets/radio-checked 2 png"));
   icon-shadow: 0 1px 0 white; }
-  radio:checked button.flat, radio:checked .sidebar-button.button, radio:checked .header-bar 
button.titlebutton, .header-bar radio:checked button.titlebutton,
+  radio:checked button.flat, radio:checked .sidebar-button.button, radio:checked headerbar 
button.titlebutton, headerbar radio:checked button.titlebutton,
   radio:checked .titlebar button.titlebutton,
   .titlebar radio:checked button.titlebutton {
     icon-shadow: none; }
@@ -2936,7 +2980,7 @@ radio:checked {
 radio:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive.png"), 
url("assets/radio-checked-insensitive 2 png"));
   icon-shadow: 0 1px 0 white; }
-  radio:checked:insensitive button.flat, radio:checked:insensitive .sidebar-button.button, 
radio:checked:insensitive .header-bar button.titlebutton, .header-bar radio:checked:insensitive 
button.titlebutton,
+  radio:checked:insensitive button.flat, radio:checked:insensitive .sidebar-button.button, 
radio:checked:insensitive headerbar button.titlebutton, headerbar radio:checked:insensitive 
button.titlebutton,
   radio:checked:insensitive .titlebar button.titlebutton,
   .titlebar radio:checked:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -2948,7 +2992,7 @@ radio:checked:insensitive {
 radio:checked:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-hover.png"), url("assets/radio-checked-hover 2 
png"));
   icon-shadow: 0 1px 0 white; }
-  radio:checked:hover button.flat, radio:checked:hover .sidebar-button.button, radio:checked:hover 
.header-bar button.titlebutton, .header-bar radio:checked:hover button.titlebutton,
+  radio:checked:hover button.flat, radio:checked:hover .sidebar-button.button, radio:checked:hover headerbar 
button.titlebutton, headerbar radio:checked:hover button.titlebutton,
   radio:checked:hover .titlebar button.titlebutton,
   .titlebar radio:checked:hover button.titlebutton {
     icon-shadow: none; }
@@ -2960,7 +3004,7 @@ radio:checked:hover {
 radio:checked:active {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-active.png"), url("assets/radio-checked-active 2 
png"));
   icon-shadow: 0 1px 0 white; }
-  radio:checked:active button.flat, radio:checked:active .sidebar-button.button, radio:checked:active 
.header-bar button.titlebutton, .header-bar radio:checked:active button.titlebutton,
+  radio:checked:active button.flat, radio:checked:active .sidebar-button.button, radio:checked:active 
headerbar button.titlebutton, headerbar radio:checked:active button.titlebutton,
   radio:checked:active .titlebar button.titlebutton,
   .titlebar radio:checked:active button.titlebutton {
     icon-shadow: none; }
@@ -2972,7 +3016,7 @@ radio:checked:active {
 radio:backdrop:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop.png"), url("assets/radio-checked-backdrop 
2 png"));
   icon-shadow: none; }
-  radio:backdrop:checked button.flat, radio:backdrop:checked .sidebar-button.button, radio:backdrop:checked 
.header-bar button.titlebutton, .header-bar radio:backdrop:checked button.titlebutton,
+  radio:backdrop:checked button.flat, radio:backdrop:checked .sidebar-button.button, radio:backdrop:checked 
headerbar button.titlebutton, headerbar radio:backdrop:checked button.titlebutton,
   radio:backdrop:checked .titlebar button.titlebutton,
   .titlebar radio:backdrop:checked button.titlebutton {
     icon-shadow: none; }
@@ -2984,7 +3028,7 @@ radio:backdrop:checked {
 radio:backdrop:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop-insensitive.png"), 
url("assets/radio-checked-backdrop-insensitive 2 png"));
   icon-shadow: none; }
-  radio:backdrop:checked:insensitive button.flat, radio:backdrop:checked:insensitive .sidebar-button.button, 
radio:backdrop:checked:insensitive .header-bar button.titlebutton, .header-bar 
radio:backdrop:checked:insensitive button.titlebutton,
+  radio:backdrop:checked:insensitive button.flat, radio:backdrop:checked:insensitive .sidebar-button.button, 
radio:backdrop:checked:insensitive headerbar button.titlebutton, headerbar radio:backdrop:checked:insensitive 
button.titlebutton,
   radio:backdrop:checked:insensitive .titlebar button.titlebutton,
   .titlebar radio:backdrop:checked:insensitive button.titlebutton {
     icon-shadow: none; }
@@ -3703,7 +3747,7 @@ separator {
   icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   box-shadow: inset 0 1px white;
   border-color: #184472; }
-  .list-row:selected button.flat, .list-row:selected .sidebar-button.button, .list-row:selected .header-bar 
button.titlebutton, .header-bar .list-row:selected button.titlebutton,
+  .list-row:selected button.flat, .list-row:selected .sidebar-button.button, .list-row:selected headerbar 
button.titlebutton, headerbar .list-row:selected button.titlebutton,
   .list-row:selected .titlebar button.titlebutton,
   .titlebar .list-row:selected button.titlebutton {
     border-color: transparent;
@@ -3731,7 +3775,7 @@ separator {
     icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6);
     border-color: #184472; }
-  .list-row:selected button:backdrop, .list-row:selected button.flat:backdrop, .list-row:selected 
.sidebar-button.button:backdrop, .list-row:selected .header-bar button.titlebutton:backdrop, .header-bar 
.list-row:selected button.titlebutton:backdrop,
+  .list-row:selected button:backdrop, .list-row:selected button.flat:backdrop, .list-row:selected 
.sidebar-button.button:backdrop, .list-row:selected headerbar button.titlebutton:backdrop, headerbar 
.list-row:selected button.titlebutton:backdrop,
   .list-row:selected .titlebar button.titlebutton:backdrop,
   .titlebar .list-row:selected button.titlebutton:backdrop {
     color: #8e9192;
@@ -3741,9 +3785,9 @@ separator {
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     border-color: #184472; }
-    .list-row:selected button:backdrop:active, .list-row:selected button:backdrop:checked, 
.list-row:selected button.flat:backdrop:active, .list-row:selected .sidebar-button.button:backdrop:active, 
.list-row:selected .header-bar button.titlebutton:backdrop:active, .header-bar .list-row:selected 
button.titlebutton:backdrop:active,
+    .list-row:selected button:backdrop:active, .list-row:selected button:backdrop:checked, 
.list-row:selected button.flat:backdrop:active, .list-row:selected .sidebar-button.button:backdrop:active, 
.list-row:selected headerbar button.titlebutton:backdrop:active, headerbar .list-row:selected 
button.titlebutton:backdrop:active,
     .list-row:selected .titlebar button.titlebutton:backdrop:active,
-    .titlebar .list-row:selected button.titlebutton:backdrop:active, .list-row:selected 
button.flat:backdrop:checked, .list-row:selected .sidebar-button.button:backdrop:checked, .list-row:selected 
.header-bar button.titlebutton:backdrop:checked, .header-bar .list-row:selected 
button.titlebutton:backdrop:checked,
+    .titlebar .list-row:selected button.titlebutton:backdrop:active, .list-row:selected 
button.flat:backdrop:checked, .list-row:selected .sidebar-button.button:backdrop:checked, .list-row:selected 
headerbar button.titlebutton:backdrop:checked, headerbar .list-row:selected 
button.titlebutton:backdrop:checked,
     .list-row:selected .titlebar button.titlebutton:backdrop:checked,
     .titlebar .list-row:selected button.titlebutton:backdrop:checked {
       color: #8e9192;
@@ -3751,7 +3795,7 @@ separator {
       background-image: linear-gradient(to bottom, #d5d5d5);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       border-color: #184472; }
-    .list-row:selected button:backdrop:insensitive, .list-row:selected button.flat:backdrop:insensitive, 
.list-row:selected .sidebar-button.button:backdrop:insensitive, .list-row:selected .header-bar 
button.titlebutton:backdrop:insensitive, .header-bar .list-row:selected 
button.titlebutton:backdrop:insensitive,
+    .list-row:selected button:backdrop:insensitive, .list-row:selected button.flat:backdrop:insensitive, 
.list-row:selected .sidebar-button.button:backdrop:insensitive, .list-row:selected headerbar 
button.titlebutton:backdrop:insensitive, headerbar .list-row:selected button.titlebutton:backdrop:insensitive,
     .list-row:selected .titlebar button.titlebutton:backdrop:insensitive,
     .titlebar .list-row:selected button.titlebutton:backdrop:insensitive {
       color: #c7c7c7;
@@ -3761,14 +3805,14 @@ separator {
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       border-color: #184472; }
-      .list-row:selected button:backdrop:insensitive > .label, .list-row:selected .header-bar 
button.titlebutton:backdrop:insensitive > .label,
-      .list-row:selected .titlebar button.titlebutton:backdrop:insensitive > .label, .list-row:selected 
button.flat:backdrop:insensitive > .label, .list-row:selected .sidebar-button.button:backdrop:insensitive > 
.label, .list-row:selected .header-bar button.titlebutton:backdrop:insensitive > .label, .header-bar 
.list-row:selected button.titlebutton:backdrop:insensitive > .label,
+      .list-row:selected button:backdrop:insensitive > .label, .list-row:selected headerbar 
button.titlebutton:backdrop:insensitive > .label,
+      .list-row:selected .titlebar button.titlebutton:backdrop:insensitive > .label, .list-row:selected 
button.flat:backdrop:insensitive > .label, .list-row:selected .sidebar-button.button:backdrop:insensitive > 
.label, .list-row:selected headerbar button.titlebutton:backdrop:insensitive > .label, headerbar 
.list-row:selected button.titlebutton:backdrop:insensitive > .label,
       .list-row:selected .titlebar button.titlebutton:backdrop:insensitive > .label,
       .titlebar .list-row:selected button.titlebutton:backdrop:insensitive > .label {
         color: inherit; }
-      .list-row:selected button:backdrop:insensitive:active, .list-row:selected 
button:backdrop:insensitive:checked, .list-row:selected button.flat:backdrop:insensitive:active, 
.list-row:selected .sidebar-button.button:backdrop:insensitive:active, .list-row:selected .header-bar 
button.titlebutton:backdrop:insensitive:active, .header-bar .list-row:selected 
button.titlebutton:backdrop:insensitive:active,
+      .list-row:selected button:backdrop:insensitive:active, .list-row:selected 
button:backdrop:insensitive:checked, .list-row:selected button.flat:backdrop:insensitive:active, 
.list-row:selected .sidebar-button.button:backdrop:insensitive:active, .list-row:selected headerbar 
button.titlebutton:backdrop:insensitive:active, headerbar .list-row:selected 
button.titlebutton:backdrop:insensitive:active,
       .list-row:selected .titlebar button.titlebutton:backdrop:insensitive:active,
-      .titlebar .list-row:selected button.titlebutton:backdrop:insensitive:active, .list-row:selected 
button.flat:backdrop:insensitive:checked, .list-row:selected 
.sidebar-button.button:backdrop:insensitive:checked, .list-row:selected .header-bar 
button.titlebutton:backdrop:insensitive:checked, .header-bar .list-row:selected 
button.titlebutton:backdrop:insensitive:checked,
+      .titlebar .list-row:selected button.titlebutton:backdrop:insensitive:active, .list-row:selected 
button.flat:backdrop:insensitive:checked, .list-row:selected 
.sidebar-button.button:backdrop:insensitive:checked, .list-row:selected headerbar 
button.titlebutton:backdrop:insensitive:checked, headerbar .list-row:selected 
button.titlebutton:backdrop:insensitive:checked,
       .list-row:selected .titlebar button.titlebutton:backdrop:insensitive:checked,
       .titlebar .list-row:selected button.titlebutton:backdrop:insensitive:checked {
         color: #c7c7c7;
@@ -3776,15 +3820,15 @@ separator {
         background-image: linear-gradient(to bottom, #e7e7e7);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         border-color: #184472; }
-        .list-row:selected button:backdrop:insensitive:active > .label, .list-row:selected .header-bar 
button.titlebutton:backdrop:insensitive:active > .label,
-        .list-row:selected .titlebar button.titlebutton:backdrop:insensitive:active > .label, 
.list-row:selected button:backdrop:insensitive:checked > .label, .list-row:selected .header-bar 
button.titlebutton:backdrop:insensitive:checked > .label,
-        .list-row:selected .titlebar button.titlebutton:backdrop:insensitive:checked > .label, 
.list-row:selected button.flat:backdrop:insensitive:active > .label, .list-row:selected 
.sidebar-button.button:backdrop:insensitive:active > .label, .list-row:selected .header-bar 
button.titlebutton:backdrop:insensitive:active > .label, .header-bar .list-row:selected 
button.titlebutton:backdrop:insensitive:active > .label,
+        .list-row:selected button:backdrop:insensitive:active > .label, .list-row:selected headerbar 
button.titlebutton:backdrop:insensitive:active > .label,
+        .list-row:selected .titlebar button.titlebutton:backdrop:insensitive:active > .label, 
.list-row:selected button:backdrop:insensitive:checked > .label, .list-row:selected headerbar 
button.titlebutton:backdrop:insensitive:checked > .label,
+        .list-row:selected .titlebar button.titlebutton:backdrop:insensitive:checked > .label, 
.list-row:selected button.flat:backdrop:insensitive:active > .label, .list-row:selected 
.sidebar-button.button:backdrop:insensitive:active > .label, .list-row:selected headerbar 
button.titlebutton:backdrop:insensitive:active > .label, headerbar .list-row:selected 
button.titlebutton:backdrop:insensitive:active > .label,
         .list-row:selected .titlebar button.titlebutton:backdrop:insensitive:active > .label,
-        .titlebar .list-row:selected button.titlebutton:backdrop:insensitive:active > .label, 
.list-row:selected button.flat:backdrop:insensitive:checked > .label, .list-row:selected 
.sidebar-button.button:backdrop:insensitive:checked > .label, .list-row:selected .header-bar 
button.titlebutton:backdrop:insensitive:checked > .label, .header-bar .list-row:selected 
button.titlebutton:backdrop:insensitive:checked > .label,
+        .titlebar .list-row:selected button.titlebutton:backdrop:insensitive:active > .label, 
.list-row:selected button.flat:backdrop:insensitive:checked > .label, .list-row:selected 
.sidebar-button.button:backdrop:insensitive:checked > .label, .list-row:selected headerbar 
button.titlebutton:backdrop:insensitive:checked > .label, headerbar .list-row:selected 
button.titlebutton:backdrop:insensitive:checked > .label,
         .list-row:selected .titlebar button.titlebutton:backdrop:insensitive:checked > .label,
         .titlebar .list-row:selected button.titlebutton:backdrop:insensitive:checked > .label {
           color: inherit; }
-  .list-row:selected button.flat:backdrop, .list-row:selected .sidebar-button.button:backdrop, 
.list-row:selected .header-bar button.titlebutton:backdrop, .header-bar .list-row:selected 
button.titlebutton:backdrop,
+  .list-row:selected button.flat:backdrop, .list-row:selected .sidebar-button.button:backdrop, 
.list-row:selected headerbar button.titlebutton:backdrop, headerbar .list-row:selected 
button.titlebutton:backdrop,
   .list-row:selected .titlebar button.titlebutton:backdrop,
   .titlebar .list-row:selected button.titlebutton:backdrop {
     border-color: transparent;
@@ -3802,7 +3846,7 @@ separator {
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     border-color: #184472; }
-    .list-row:selected button:insensitive > .label, .list-row:selected .header-bar 
button.titlebutton:insensitive > .label,
+    .list-row:selected button:insensitive > .label, .list-row:selected headerbar 
button.titlebutton:insensitive > .label,
     .list-row:selected .titlebar button.titlebutton:insensitive > .label {
       color: inherit; }
     .list-row:selected button:insensitive:active, .list-row:selected button:insensitive:checked {
@@ -3810,8 +3854,8 @@ separator {
       border-color: #a1a1a1;
       background-image: linear-gradient(to bottom, #ececec, #f4f4f4);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .list-row:selected button:insensitive:active > .label, .list-row:selected .header-bar 
button.titlebutton:insensitive:active > .label,
-      .list-row:selected .titlebar button.titlebutton:insensitive:active > .label, .list-row:selected 
button:insensitive:checked > .label, .list-row:selected .header-bar button.titlebutton:insensitive:checked > 
.label,
+      .list-row:selected button:insensitive:active > .label, .list-row:selected headerbar 
button.titlebutton:insensitive:active > .label,
+      .list-row:selected .titlebar button.titlebutton:insensitive:active > .label, .list-row:selected 
button:insensitive:checked > .label, .list-row:selected headerbar button.titlebutton:insensitive:checked > 
.label,
       .list-row:selected .titlebar button.titlebutton:insensitive:checked > .label {
         color: inherit; }
 
@@ -3834,7 +3878,7 @@ separator {
   .app-notification:backdrop,
   .app-notification.frame:backdrop {
     background-image: none; }
-  .app-notification button, .app-notification .header-bar button.titlebutton, .header-bar .app-notification 
button.titlebutton,
+  .app-notification button, .app-notification headerbar button.titlebutton, headerbar .app-notification 
button.titlebutton,
   .app-notification .titlebar button.titlebutton,
   .titlebar .app-notification button.titlebutton,
   .app-notification.frame button {
@@ -3846,13 +3890,13 @@ separator {
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
     outline-color: rgba(238, 238, 236, 0.3); }
-    .app-notification button.flat, .app-notification .sidebar-button.button, .app-notification .header-bar 
button.titlebutton, .header-bar .app-notification button.titlebutton,
+    .app-notification button.flat, .app-notification .sidebar-button.button, .app-notification headerbar 
button.titlebutton, headerbar .app-notification button.titlebutton,
     .app-notification .titlebar button.titlebutton,
     .titlebar .app-notification button.titlebutton,
     .app-notification.frame button.flat,
     .app-notification.frame .sidebar-button.button,
-    .app-notification.frame .header-bar button.titlebutton,
-    .header-bar .app-notification.frame button.titlebutton,
+    .app-notification.frame headerbar button.titlebutton,
+    headerbar .app-notification.frame button.titlebutton,
     .app-notification.frame .titlebar button.titlebutton,
     .titlebar .app-notification.frame button.titlebutton {
       icon-shadow: 0 1px black;
@@ -3987,7 +4031,7 @@ calendar {
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    .message-dialog.csd .dialog-action-area button:insensitive > .label, .message-dialog.csd 
.dialog-action-area .header-bar button.titlebutton:insensitive > .label,
+    .message-dialog.csd .dialog-action-area button:insensitive > .label, .message-dialog.csd 
.dialog-action-area headerbar button.titlebutton:insensitive > .label,
     .message-dialog.csd .dialog-action-area .titlebar button.titlebutton:insensitive > .label {
       color: inherit; }
   .message-dialog.csd .dialog-action-area button:backdrop {
@@ -4004,7 +4048,7 @@ calendar {
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    .message-dialog.csd .dialog-action-area button:backdrop:insensitive > .label, .message-dialog.csd 
.dialog-action-area .header-bar button.titlebutton:backdrop:insensitive > .label,
+    .message-dialog.csd .dialog-action-area button:backdrop:insensitive > .label, .message-dialog.csd 
.dialog-action-area headerbar button.titlebutton:backdrop:insensitive > .label,
     .message-dialog.csd .dialog-action-area .titlebar button.titlebutton:backdrop:insensitive > .label {
       color: inherit; }
   .message-dialog.csd .dialog-action-area button.suggested-action {
@@ -4045,7 +4089,7 @@ calendar {
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        .message-dialog.csd .dialog-action-area button.suggested-action:backdrop:insensitive > .label, 
.message-dialog.csd .dialog-action-area .header-bar button.suggested-action.titlebutton:backdrop:insensitive 
.label,
+        .message-dialog.csd .dialog-action-area button.suggested-action:backdrop:insensitive > .label, 
.message-dialog.csd .dialog-action-area headerbar button.suggested-action.titlebutton:backdrop:insensitive > 
.label,
         .message-dialog.csd .dialog-action-area .titlebar 
button.suggested-action.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
     .message-dialog.csd .dialog-action-area button.suggested-action:insensitive {
@@ -4055,7 +4099,7 @@ calendar {
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .message-dialog.csd .dialog-action-area button.suggested-action:insensitive > .label, 
.message-dialog.csd .dialog-action-area .header-bar button.suggested-action.titlebutton:insensitive > .label,
+      .message-dialog.csd .dialog-action-area button.suggested-action:insensitive > .label, 
.message-dialog.csd .dialog-action-area headerbar button.suggested-action.titlebutton:insensitive > .label,
       .message-dialog.csd .dialog-action-area .titlebar button.suggested-action.titlebutton:insensitive > 
.label {
         color: inherit; }
   .message-dialog.csd .dialog-action-area button.destructive-action {
@@ -4096,7 +4140,7 @@ calendar {
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        .message-dialog.csd .dialog-action-area button.destructive-action:backdrop:insensitive > .label, 
.message-dialog.csd .dialog-action-area .header-bar 
button.destructive-action.titlebutton:backdrop:insensitive > .label,
+        .message-dialog.csd .dialog-action-area button.destructive-action:backdrop:insensitive > .label, 
.message-dialog.csd .dialog-action-area headerbar button.destructive-action.titlebutton:backdrop:insensitive 
.label,
         .message-dialog.csd .dialog-action-area .titlebar 
button.destructive-action.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
     .message-dialog.csd .dialog-action-area button.destructive-action:insensitive {
@@ -4106,7 +4150,7 @@ calendar {
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .message-dialog.csd .dialog-action-area button.destructive-action:insensitive > .label, 
.message-dialog.csd .dialog-action-area .header-bar button.destructive-action.titlebutton:insensitive > 
.label,
+      .message-dialog.csd .dialog-action-area button.destructive-action:insensitive > .label, 
.message-dialog.csd .dialog-action-area headerbar button.destructive-action.titlebutton:insensitive > .label,
       .message-dialog.csd .dialog-action-area .titlebar button.destructive-action.titlebutton:insensitive > 
.label {
         color: inherit; }
 .message-dialog.csd .dialog-action-area button, .message-dialog.csd .dialog-action-area button:hover, 
.message-dialog.csd .dialog-action-area button:active, .message-dialog.csd .dialog-action-area 
button:insensitive, .message-dialog.csd .dialog-action-area button:backdrop, .message-dialog.csd 
.dialog-action-area button:backdrop:insensitive, .message-dialog.csd .dialog-action-area 
button.suggested-action, .message-dialog.csd .dialog-action-area button.suggested-action:hover, 
.message-dialog.csd .dialog-action-area button.suggested-action:active, .message-dialog.csd 
.dialog-action-area button.suggested-action:backdrop, .message-dialog.csd .dialog-action-area 
button.suggested-action:backdrop:insensitive, .message-dialog.csd .dialog-action-area 
button.suggested-action:insensitive, .message-dialog.csd .dialog-action-area button.destructive-action, 
.message-dialog.csd .dialog-action-area button.destructive-action:hover, .message-dialog.csd 
.dialog-action-area button.destructive-ac
 tion:active, .message-dialog.csd .dialog-action-area button.destructive-action:backdrop, .message-dialog.csd 
.dialog-action-area button.destructive-action:backdrop:insensitive, .message-dialog.csd .dialog-action-area 
button.destructive-action:insensitive {
@@ -4167,7 +4211,7 @@ GtkPlacesSidebar.sidebar .sidebar-new-bookmark-row {
   border-radius: 100%;
   outline-radius: 100%; }
   .sidebar-button.button.image-button, GtkScaleButton.sidebar-button.button,
-  GtkVolumeButton.sidebar-button.button, .header-bar button.sidebar-button.button.titlebutton,
+  GtkVolumeButton.sidebar-button.button, headerbar button.sidebar-button.button.titlebutton,
   .titlebar button.sidebar-button.button.titlebutton {
     padding: 5px; }
   .sidebar-button.button:not(:hover):not(:active) > image, .sidebar-button.button:backdrop > image {
@@ -4235,22 +4279,22 @@ infobar {
   color: #ffffff;
   text-shadow: 0 1px #2a76c6;
   border-color: #2a76c6; }
-  .info button, .info .header-bar button.titlebutton, .header-bar .info button.titlebutton,
+  .info button, .info headerbar button.titlebutton, headerbar .info button.titlebutton,
   .info .titlebar button.titlebutton,
   .titlebar .info button.titlebutton,
   .question button,
-  .question .header-bar button.titlebutton,
-  .header-bar .question button.titlebutton,
+  .question headerbar button.titlebutton,
+  headerbar .question button.titlebutton,
   .question .titlebar button.titlebutton,
   .titlebar .question button.titlebutton,
   .warning button,
-  .warning .header-bar button.titlebutton,
-  .header-bar .warning button.titlebutton,
+  .warning headerbar button.titlebutton,
+  headerbar .warning button.titlebutton,
   .warning .titlebar button.titlebutton,
   .titlebar .warning button.titlebutton,
   .error button,
-  .error .header-bar button.titlebutton,
-  .header-bar .error button.titlebutton,
+  .error headerbar button.titlebutton,
+  headerbar .error button.titlebutton,
   .error .titlebar button.titlebutton,
   .titlebar .error button.titlebutton {
     color: #ffffff;
@@ -4292,16 +4336,16 @@ infobar {
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .info button:insensitive > .label, .info .header-bar button.titlebutton:insensitive > .label,
+      .info button:insensitive > .label, .info headerbar button.titlebutton:insensitive > .label,
       .info .titlebar button.titlebutton:insensitive > .label,
       .question button:insensitive > .label,
-      .question .header-bar button.titlebutton:insensitive > .label,
+      .question headerbar button.titlebutton:insensitive > .label,
       .question .titlebar button.titlebutton:insensitive > .label,
       .warning button:insensitive > .label,
-      .warning .header-bar button.titlebutton:insensitive > .label,
+      .warning headerbar button.titlebutton:insensitive > .label,
       .warning .titlebar button.titlebutton:insensitive > .label,
       .error button:insensitive > .label,
-      .error .header-bar button.titlebutton:insensitive > .label,
+      .error headerbar button.titlebutton:insensitive > .label,
       .error .titlebar button.titlebutton:insensitive > .label {
         color: inherit; }
     .info button:backdrop,
@@ -4326,16 +4370,16 @@ infobar {
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         border-color: #1c5187; }
-        .info button:backdrop:insensitive > .label, .info .header-bar 
button.titlebutton:backdrop:insensitive > .label,
+        .info button:backdrop:insensitive > .label, .info headerbar button.titlebutton:backdrop:insensitive 
.label,
         .info .titlebar button.titlebutton:backdrop:insensitive > .label,
         .question button:backdrop:insensitive > .label,
-        .question .header-bar button.titlebutton:backdrop:insensitive > .label,
+        .question headerbar button.titlebutton:backdrop:insensitive > .label,
         .question .titlebar button.titlebutton:backdrop:insensitive > .label,
         .warning button:backdrop:insensitive > .label,
-        .warning .header-bar button.titlebutton:backdrop:insensitive > .label,
+        .warning headerbar button.titlebutton:backdrop:insensitive > .label,
         .warning .titlebar button.titlebutton:backdrop:insensitive > .label,
         .error button:backdrop:insensitive > .label,
-        .error .header-bar button.titlebutton:backdrop:insensitive > .label,
+        .error headerbar button.titlebutton:backdrop:insensitive > .label,
         .error .titlebar button.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
   .info label:selected, .info label:selected:focus, .info label:selected:hover,
@@ -4484,13 +4528,13 @@ GtkColorSwatch {
   .content-view:backdrop {
     background-color: #dbdbdb; }
 
-.osd .scale-popup button.flat, .osd .scale-popup .sidebar-button.button, .osd .scale-popup .header-bar 
button.titlebutton, .header-bar .osd .scale-popup button.titlebutton,
+.osd .scale-popup button.flat, .osd .scale-popup .sidebar-button.button, .osd .scale-popup headerbar 
button.titlebutton, headerbar .osd .scale-popup button.titlebutton,
 .osd .scale-popup .titlebar button.titlebutton,
 .titlebar .osd .scale-popup button.titlebutton {
   padding: 6px;
   border-style: none;
   border-radius: 5px; }
-.scale-popup button, .scale-popup .header-bar button.titlebutton, .header-bar .scale-popup 
button.titlebutton,
+.scale-popup button, .scale-popup headerbar button.titlebutton, headerbar .scale-popup button.titlebutton,
 .scale-popup .titlebar button.titlebutton,
 .titlebar .scale-popup button.titlebutton {
   padding: 6px; }
@@ -4531,19 +4575,21 @@ decoration {
     border: solid 1px darkgray;
     box-shadow: none; }
 
-.header-bar button.titlebutton,
+headerbar button.titlebutton,
+headerbar .titlebar button.titlebutton,
+.titlebar headerbar button.titlebutton,
 .titlebar button.titlebutton {
   text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); }
-  .header-bar button.titlebutton:backdrop,
+  headerbar button.titlebutton:backdrop,
   .titlebar button.titlebutton:backdrop {
     icon-shadow: none; }
 
-.header-bar.selection-mode button.titlebutton,
+headerbar.selection-mode button.titlebutton,
 .titlebar.selection-mode button.titlebutton {
   text-shadow: 0 -1px rgba(0, 0, 0, 0.54353);
   icon-shadow: 0 -1px rgba(0, 0, 0, 0.54353); }
-  .header-bar.selection-mode button.titlebutton:backdrop,
+  headerbar.selection-mode button.titlebutton:backdrop,
   .titlebar.selection-mode button.titlebutton:backdrop {
     icon-shadow: none; }
 
@@ -4633,7 +4679,7 @@ entry.cursor-handle,
   icon-shadow: 0 1px black; }
   .touch-selection:backdrop {
     text-shadow: none; }
-  .touch-selection button, .touch-selection .header-bar button.titlebutton, .header-bar .touch-selection 
button.titlebutton,
+  .touch-selection button, .touch-selection headerbar button.titlebutton, headerbar .touch-selection 
button.titlebutton,
   .touch-selection .titlebar button.titlebutton,
   .titlebar .touch-selection button.titlebutton {
     color: #eeeeec;
@@ -4855,12 +4901,12 @@ entry.cursor-handle,
   background-origin: content-box;
   background-position: right center; }
 
-button.circular, .header-bar button.circular.titlebutton,
+button.circular, headerbar button.circular.titlebutton,
 .titlebar button.circular.titlebutton {
   border-radius: 20px;
   outline-radius: 20px; }
 
-button.circular label, .header-bar button.circular.titlebutton label,
+button.circular label,
 .titlebar button.circular.titlebutton label {
   padding: 0; }
 


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