spinner: Active spinners should be :checked, not :active

If that sounds confusing, it's because GTK and CSS can sometimes not
agree on naming.

:active for CSS means that a button is currently pressed on an element.
And that is clearly not the case for spinning spinners.

6 files changed, 957 insertions, 1125 deletions

diff --git a/gtk/gtkspinner.c b/gtk/gtkspinner.c
index cb31419465..6916f720ff 100644
--- a/gtk/gtkspinner.c
+++ b/gtk/gtkspinner.c
@@ -252,10 +252,10 @@ gtk_spinner_set_active (GtkSpinner *spinner,
 
       if (active)
         gtk_widget_set_state_flags (GTK_WIDGET (spinner),
-                                    GTK_STATE_FLAG_ACTIVE, FALSE);
+                                    GTK_STATE_FLAG_CHECKED, FALSE);
       else
         gtk_widget_unset_state_flags (GTK_WIDGET (spinner),
-                                      GTK_STATE_FLAG_ACTIVE);
+                                      GTK_STATE_FLAG_CHECKED);
     }
 }
 
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index c77491a38d..7ab5edc403 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -214,7 +214,7 @@ spinner {
   background: none;
   opacity: 0; // non spinning spinner makes no sense
   -gtk-icon-source: -gtk-icontheme('process-working-symbolic');
-  &:active {
+  &:checked {
     opacity: 1;
     animation: spin 1s linear infinite;
     &:insensitive {
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index eb72f46ea5..fe48d6c695 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -30,7 +30,7 @@
   .background:backdrop {
     text-shadow: none;
     -gtk-icon-shadow: none;
-    color: #949796;
+    color: #939695;
     background-color: #393f3f; }
 
 /*
@@ -52,8 +52,8 @@
     background-color: #212424;
     color: #eeeeec; }
   .gtkstyle-fallback:insensitive {
-    background-color: #333636;
-    color: #949796; }
+    background-color: #323636;
+    color: #939695; }
   .gtkstyle-fallback:selected {
     background-color: #215d9c;
     color: #ffffff; }
@@ -64,14 +64,14 @@ textview text,
   background-color: #292929; }
   textview text:backdrop,
   .view:backdrop {
-    color: #d5d5d5;
+    color: #d4d4d4;
     background-color: #2c2c2c; }
 
 iconview {
   color: white;
   background-color: #292929; }
   iconview:backdrop {
-    color: #d5d5d5;
+    color: #d4d4d4;
     background-color: #2c2c2c; }
 
 .rubberband,
@@ -91,9 +91,9 @@ flowbox flowboxchild {
 label.separator {
   color: #eeeeec; }
   label.separator:backdrop {
-    color: #949796; }
+    color: #939695; }
 label:insensitive {
-  color: #949796; }
+  color: #939695; }
   label:insensitive:backdrop {
     color: #5d6767; }
 
@@ -111,18 +111,18 @@ assistant .sidebar {
     border-left: 1px solid #1c1f1f; }
   assistant .sidebar:backdrop {
     background-color: #2c2c2c;
-    border-color: #1f2222; }
+    border-color: #1e2222; }
 assistant.csd .sidebar {
   border-top-style: none; }
 assistant .sidebar label {
   padding: 6px 12px; }
 assistant .sidebar label.highlight {
-  background-color: #5d6262; }
+  background-color: #5d6261; }
 
 textview {
   background-color: #313434; }
   textview:backdrop {
-    background-color: #333636; }
+    background-color: #323535; }
 
 popover.magnifier,
 popover.osd,
@@ -153,10 +153,10 @@ spinner {
   background: none;
   opacity: 0;
   -gtk-icon-source: -gtk-icontheme("process-working-symbolic"); }
-  spinner:active {
+  spinner:checked {
     opacity: 1;
     animation: spin 1s linear infinite; }
-    spinner:active:insensitive {
+    spinner:checked:insensitive {
       opacity: 0.5; }
 
 /****************
@@ -168,7 +168,7 @@ entry, spinbutton {
   border-radius: 3px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   background-color: transparent;
-  background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+  background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
   color: white;
   border-color: #1c1f1f;
   box-shadow: inset 0 0 0 1px rgba(33, 93, 156, 0), 0 1px rgba(238, 238, 236, 0.1); }
@@ -181,7 +181,7 @@ entry, spinbutton {
   entry.flat, spinbutton.flat, entry.flat:focus, spinbutton.flat:focus {
     padding: 2px;
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
     color: white;
     border-color: #1c1f1f;
     box-shadow: inset 0 0 0 1px rgba(33, 93, 156, 0);
@@ -189,29 +189,29 @@ entry, spinbutton {
     border-radius: 0; }
   entry:focus, spinbutton:focus {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
     box-shadow: inset 0 0 0 1px #215d9c, 0 1px rgba(238, 238, 236, 0.1);
     border-color: #0f2b48; }
   entry:insensitive, spinbutton:insensitive {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
-    color: #949796;
+    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+    color: #939695;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #333636);
+    background-image: linear-gradient(to bottom, #323636);
     box-shadow: 0 1px rgba(238, 238, 236, 0.1); }
   entry:backdrop, spinbutton:backdrop {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
-    color: #d5d5d5;
-    border-color: #1f2222;
+    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+    color: #d4d4d4;
+    border-color: #1e2222;
     background-image: linear-gradient(to bottom, #2c2c2c);
     box-shadow: 0 1px rgba(238, 238, 236, 0); }
   entry:backdrop:insensitive, spinbutton:backdrop:insensitive {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
     color: #5d6767;
-    border-color: #1f2222;
-    background-image: linear-gradient(to bottom, #333636);
+    border-color: #1e2222;
+    background-image: linear-gradient(to bottom, #323636);
     box-shadow: 0 1px rgba(238, 238, 236, 0); }
   entry progress, spinbutton progress {
     margin: 1px;
@@ -231,7 +231,7 @@ entry, spinbutton {
     border-color: #1a0000; }
     entry.error:focus, spinbutton.error:focus {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
       box-shadow: inset 0 0 0 1px #cc0000, 0 1px rgba(238, 238, 236, 0.1);
       border-color: #1a0000; }
     entry.error:selected, spinbutton.error:selected, entry.error:selected:focus, spinbutton.error:selected:focus {
@@ -241,22 +241,22 @@ entry, spinbutton {
     border-color: #432100; }
     entry.warning:focus, spinbutton.warning:focus {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
       box-shadow: inset 0 0 0 1px #f57900, 0 1px rgba(238, 238, 236, 0.1);
       border-color: #432100; }
     entry.warning:selected, spinbutton.warning:selected, entry.warning:selected:focus, spinbutton.warning:selected:focus {
       background-color: #f57900; }
   entry image, spinbutton image {
-    color: #c7c7c5; }
+    color: #c6c6c5; }
     entry image:hover, spinbutton image:hover {
       color: #eeeeec; }
     entry image:active, spinbutton image:active {
       color: #215d9c; }
     entry image:backdrop, spinbutton image:backdrop {
-      color: #7f8281; }
+      color: #7e8080; }
   .osd entry, .osd spinbutton {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
@@ -266,7 +266,7 @@ entry, spinbutton {
     -gtk-icon-shadow: 0 1px black; }
     .osd entry:focus, .osd spinbutton:focus {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
       color: white;
       border-color: #215d9c;
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
@@ -276,7 +276,7 @@ entry, spinbutton {
       -gtk-icon-shadow: 0 1px black; }
     .osd entry:backdrop, .osd spinbutton:backdrop {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
@@ -286,10 +286,10 @@ entry, spinbutton {
       -gtk-icon-shadow: none; }
     .osd entry:insensitive, .osd spinbutton:insensitive {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
-      color: #878a89;
+      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -303,7 +303,7 @@ entry, spinbutton {
   border-top-color: #252626;
   background-image: linear-gradient(to bottom, #292929); }
   .linked.vertical > entry:not(:insensitive) + entry:not(:insensitive):backdrop, .linked.vertical > spinbutton:not(:insensitive) + entry:not(:insensitive):backdrop, .linked.vertical > entry:not(:insensitive) + spinbutton:not(:insensitive):backdrop, .linked.vertical > spinbutton:not(:insensitive) + spinbutton:not(:insensitive):backdrop {
-    border-top-color: #282929;
+    border-top-color: #272929;
     background-image: linear-gradient(to bottom, #2c2c2c); }
 .linked.vertical > entry + entry:focus:not(:last-child), .linked.vertical > spinbutton + entry:focus:not(:last-child), .linked.vertical > entry + spinbutton:focus:not(:last-child), .linked.vertical > spinbutton + spinbutton:focus:not(:last-child) {
   border-top-color: #0f2b48;
@@ -378,8 +378,8 @@ button, headerbar button.titlebutton,
   button:backdrop, headerbar button.titlebutton:backdrop,
   .titlebar button.titlebutton:backdrop, button.flat:backdrop, button.sidebar-button:backdrop, headerbar button.titlebutton:backdrop,
   .titlebar button.titlebutton:backdrop {
-    color: #949796;
-    border-color: #1f2222;
+    color: #939695;
+    border-color: #1e2222;
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     -gtk-icon-shadow: none;
@@ -388,32 +388,29 @@ button, headerbar button.titlebutton,
     button:backdrop:active, button:backdrop:checked, button.flat:backdrop:active, button.sidebar-button:backdrop:active, headerbar button.titlebutton:backdrop:active,
     .titlebar button.titlebutton:backdrop:active, button.flat:backdrop:checked, button.sidebar-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);
+      color: #939695;
+      border-color: #1e2222;
+      background-image: linear-gradient(to bottom, #2f3434);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
     button:backdrop:insensitive, button.flat:backdrop:insensitive, button.sidebar-button:backdrop:insensitive, headerbar button.titlebutton:backdrop:insensitive,
     .titlebar button.titlebutton:backdrop:insensitive {
       color: #5d6767;
-      border-color: #1f2222;
-      background-image: linear-gradient(to bottom, #333636);
+      border-color: #1e2222;
+      background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-      button:backdrop:insensitive > .label, headerbar button.titlebutton:backdrop:insensitive > .label,
-      .titlebar button.titlebutton:backdrop:insensitive > .label, button.flat:backdrop:insensitive > .label, button.sidebar-button:backdrop:insensitive > .label, headerbar button.titlebutton:backdrop:insensitive > .label,
+      button:backdrop:insensitive > .label, button.flat:backdrop:insensitive > .label, button.sidebar-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, button.sidebar-button:backdrop:insensitive:active, headerbar button.titlebutton:backdrop:insensitive:active,
     .titlebar button.titlebutton:backdrop:insensitive:active, button.flat:backdrop:insensitive:checked, button.sidebar-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);
+      border-color: #1e2222;
+      background-image: linear-gradient(to bottom, #262929);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-      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, button.sidebar-button:backdrop:insensitive:active > .label, headerbar button.titlebutton:backdrop:insensitive:active > .label,
+      button:backdrop:insensitive:active > .label, button:backdrop:insensitive:checked > .label, button.flat:backdrop:insensitive:active > .label, button.sidebar-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, button.sidebar-button:backdrop:insensitive:checked > .label, headerbar button.titlebutton:backdrop:insensitive:checked > .label,
       .titlebar button.titlebutton:backdrop:insensitive:checked > .label {
         color: inherit; }
@@ -429,23 +426,20 @@ button, headerbar button.titlebutton,
     -gtk-icon-shadow: none; }
   button:insensitive, headerbar button.titlebutton:insensitive,
   .titlebar button.titlebutton:insensitive {
-    color: #949796;
+    color: #939695;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #333636);
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
-    button:insensitive > .label, headerbar button.titlebutton:insensitive > .label,
-    .titlebar button.titlebutton:insensitive > .label {
+    button:insensitive > .label {
       color: inherit; }
     button:insensitive:active, button:insensitive:checked {
-      color: #949796;
+      color: #939695;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #313434, #333636);
+      background-image: linear-gradient(to bottom, #2f3333, #323636);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
-      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 {
+      button:insensitive:active > .label, button:insensitive:checked > .label {
         color: inherit; }
   button.osd, headerbar button.osd.titlebutton,
   .titlebar button.osd.titlebutton {
@@ -488,9 +482,9 @@ button, headerbar button.titlebutton,
       border: none;
       box-shadow: none; }
     button.osd:insensitive, button.osd:backdrop:insensitive {
-      color: #878a89;
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -535,9 +529,9 @@ button, headerbar button.titlebutton,
       -gtk-icon-shadow: none;
       outline-color: rgba(238, 238, 236, 0.3); }
     .osd button:insensitive, .osd button:backdrop:insensitive {
-      color: #878a89;
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -579,9 +573,9 @@ button, headerbar button.titlebutton,
       .osd button.flat:insensitive, .osd button.sidebar-button:insensitive, .osd headerbar button.titlebutton:insensitive, headerbar .osd button.titlebutton:insensitive,
       .osd .titlebar button.titlebutton:insensitive,
       .titlebar .osd button.titlebutton:insensitive {
-        color: #878a89;
+        color: #878989;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -650,7 +644,7 @@ button, headerbar button.titlebutton,
       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, button.suggested-action.sidebar-button:backdrop, headerbar button.suggested-action.titlebutton:backdrop,
     .titlebar button.suggested-action.titlebutton:backdrop {
-      color: #d3dfeb;
+      color: #d2deeb;
       border-color: #0b1e33;
       background-image: linear-gradient(to bottom, #215d9c);
       text-shadow: none;
@@ -659,32 +653,29 @@ button, headerbar button.titlebutton,
       button.suggested-action:backdrop:active, button.suggested-action:backdrop:checked, button.suggested-action.flat:backdrop:active, button.suggested-action.sidebar-button:backdrop:active, headerbar button.suggested-action.titlebutton:backdrop:active,
       .titlebar button.suggested-action.titlebutton:backdrop:active, button.suggested-action.flat:backdrop:checked, button.suggested-action.sidebar-button:backdrop:checked, headerbar button.suggested-action.titlebutton:backdrop:checked,
       .titlebar button.suggested-action.titlebutton:backdrop:checked {
-        color: #d1dae3;
+        color: #d0d9e2;
         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, button.suggested-action.sidebar-button:backdrop:insensitive, headerbar button.suggested-action.titlebutton:backdrop:insensitive,
       .titlebar button.suggested-action.titlebutton:backdrop:insensitive {
         color: #5d6767;
-        border-color: #1f2222;
-        background-image: linear-gradient(to bottom, #333636);
+        border-color: #1e2222;
+        background-image: linear-gradient(to bottom, #323636);
         text-shadow: none;
         -gtk-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, headerbar button.suggested-action.titlebutton:backdrop:insensitive > .label,
-        .titlebar button.suggested-action.titlebutton:backdrop:insensitive > .label, button.suggested-action.flat:backdrop:insensitive > .label, button.suggested-action.sidebar-button:backdrop:insensitive > .label, headerbar button.suggested-action.titlebutton:backdrop:insensitive > .label,
+        button.suggested-action:backdrop:insensitive > .label, button.suggested-action.flat:backdrop:insensitive > .label, button.suggested-action.sidebar-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, button.suggested-action.sidebar-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, button.suggested-action.sidebar-button:backdrop:insensitive:checked, headerbar button.suggested-action.titlebutton:backdrop:insensitive:checked,
         .titlebar button.suggested-action.titlebutton:backdrop:insensitive:checked {
-          color: #6c88a7;
+          color: #6c88a5;
           border-color: #0b1e33;
-          background-image: linear-gradient(to bottom, #1d4877);
+          background-image: linear-gradient(to bottom, #1d4876);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-          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, button.suggested-action.sidebar-button:backdrop:insensitive:active > .label, headerbar button.suggested-action.titlebutton:backdrop:insensitive:active > .label,
+          button.suggested-action:backdrop:insensitive:active > .label, button.suggested-action:backdrop:insensitive:checked > .label, button.suggested-action.flat:backdrop:insensitive:active > .label, button.suggested-action.sidebar-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, button.suggested-action.sidebar-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; }
@@ -700,23 +691,20 @@ button, headerbar button.titlebutton,
       -gtk-icon-shadow: none;
       color: rgba(33, 93, 156, 0.8); }
     button.suggested-action:insensitive {
-      color: #949796;
+      color: #939695;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #333636);
+      background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       -gtk-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, headerbar button.suggested-action.titlebutton:insensitive > .label,
-      .titlebar button.suggested-action.titlebutton:insensitive > .label {
+      button.suggested-action:insensitive > .label {
         color: inherit; }
       button.suggested-action:insensitive:active, button.suggested-action:insensitive:checked {
-        color: #a5b6c9;
+        color: #a4b5c8;
         border-color: #0b1e33;
-        background-image: linear-gradient(to bottom, #1b4470, #1d4877);
+        background-image: linear-gradient(to bottom, #1b436f, #1d4876);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
-        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 {
+        button.suggested-action:insensitive:active > .label, button.suggested-action:insensitive:checked > .label {
           color: inherit; }
     .osd button.suggested-action {
       color: #eeeeec;
@@ -746,9 +734,9 @@ button, headerbar button.titlebutton,
         -gtk-icon-shadow: none;
         outline-color: rgba(238, 238, 236, 0.3); }
       .osd button.suggested-action:insensitive, .osd button.suggested-action:backdrop:insensitive {
-        color: #878a89;
+        color: #878989;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -797,7 +785,7 @@ button, headerbar button.titlebutton,
       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, button.destructive-action.sidebar-button:backdrop, headerbar button.destructive-action.titlebutton:backdrop,
     .titlebar button.destructive-action.titlebutton:backdrop {
-      color: #f7cfcf;
+      color: #f6cfcf;
       border-color: #5e0707;
       background-image: linear-gradient(to bottom, #d51010);
       text-shadow: none;
@@ -813,25 +801,22 @@ button, headerbar button.titlebutton,
       button.destructive-action:backdrop:insensitive, button.destructive-action.flat:backdrop:insensitive, button.destructive-action.sidebar-button:backdrop:insensitive, headerbar button.destructive-action.titlebutton:backdrop:insensitive,
       .titlebar button.destructive-action.titlebutton:backdrop:insensitive {
         color: #5d6767;
-        border-color: #1f2222;
-        background-image: linear-gradient(to bottom, #333636);
+        border-color: #1e2222;
+        background-image: linear-gradient(to bottom, #323636);
         text-shadow: none;
         -gtk-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, headerbar button.destructive-action.titlebutton:backdrop:insensitive > .label,
-        .titlebar button.destructive-action.titlebutton:backdrop:insensitive > .label, button.destructive-action.flat:backdrop:insensitive > .label, button.destructive-action.sidebar-button:backdrop:insensitive > .label, headerbar button.destructive-action.titlebutton:backdrop:insensitive > .label,
+        button.destructive-action:backdrop:insensitive > .label, button.destructive-action.flat:backdrop:insensitive > .label, button.destructive-action.sidebar-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, button.destructive-action.sidebar-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, button.destructive-action.sidebar-button:backdrop:insensitive:checked, headerbar button.destructive-action.titlebutton:backdrop:insensitive:checked,
         .titlebar button.destructive-action.titlebutton:backdrop:insensitive:checked {
-          color: #c46565;
+          color: #c36464;
           border-color: #5e0707;
-          background-image: linear-gradient(to bottom, #a41212);
+          background-image: linear-gradient(to bottom, #a41111);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-          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, button.destructive-action.sidebar-button:backdrop:insensitive:active > .label, headerbar button.destructive-action.titlebutton:backdrop:insensitive:active > .label,
+          button.destructive-action:backdrop:insensitive:active > .label, button.destructive-action:backdrop:insensitive:checked > .label, button.destructive-action.flat:backdrop:insensitive:active > .label, button.destructive-action.sidebar-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, button.destructive-action.sidebar-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; }
@@ -847,23 +832,20 @@ button, headerbar button.titlebutton,
       -gtk-icon-shadow: none;
       color: rgba(213, 16, 16, 0.8); }
     button.destructive-action:insensitive {
-      color: #949796;
+      color: #939695;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #333636);
+      background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       -gtk-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, headerbar button.destructive-action.titlebutton:insensitive > .label,
-      .titlebar button.destructive-action.titlebutton:insensitive > .label {
+      button.destructive-action:insensitive > .label {
         color: inherit; }
       button.destructive-action:insensitive:active, button.destructive-action:insensitive:checked {
-        color: #dba0a0;
+        color: #da9f9f;
         border-color: #5e0707;
-        background-image: linear-gradient(to bottom, #9d1111, #a41212);
+        background-image: linear-gradient(to bottom, #9d1010, #a41111);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
-        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 {
+        button.destructive-action:insensitive:active > .label, button.destructive-action:insensitive:checked > .label {
           color: inherit; }
     .osd button.destructive-action {
       color: #eeeeec;
@@ -893,9 +875,9 @@ button, headerbar button.titlebutton,
         -gtk-icon-shadow: none;
         outline-color: rgba(238, 238, 236, 0.3); }
       .osd button.destructive-action:insensitive, .osd button.destructive-action:backdrop:insensitive {
-        color: #878a89;
+        color: #878989;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -942,11 +924,7 @@ button, headerbar button.titlebutton,
       padding-top: 3px;
       padding-bottom: 3px; }
     .stack-switcher > button.text-button, .stack-switcher > GtkScaleButton.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 {
+    .stack-switcher > GtkVolumeButton.button.text-button {
       padding: 5px 10px 6px; }
     .stack-switcher > button.image-button, headerbar .stack-switcher > button.titlebutton,
     .titlebar .stack-switcher > button.titlebutton {
@@ -975,7 +953,7 @@ button, headerbar button.titlebutton,
   .stack-switcher > button.needs-attention > label:dir(rtl), .stack-switcher > button.needs-attention > image:dir(rtl), stacksidebar row.needs-attention > label:dir(rtl) {
     background-position: left 3px, left 2px; }
 
-.inline-toolbar toolbutton > button, .inline-toolbar headerbar toolbutton > button.titlebutton,
+.inline-toolbar toolbutton > button,
 .inline-toolbar .titlebar toolbutton > button.titlebutton,
 .titlebar .inline-toolbar toolbutton > button.titlebutton {
   color: #eeeeec;
@@ -985,8 +963,7 @@ button, headerbar button.titlebutton,
   text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
   -gtk-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 toolbutton > button:hover, .inline-toolbar headerbar toolbutton > button.titlebutton:hover,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:hover {
+  .inline-toolbar toolbutton > button:hover {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #1c1f1f;
@@ -994,9 +971,7 @@ button, headerbar button.titlebutton,
     text-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
     -gtk-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 toolbutton > button:active, .inline-toolbar headerbar toolbutton > button.titlebutton:active,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:active, .inline-toolbar toolbutton > button:checked, .inline-toolbar headerbar toolbutton > button.titlebutton:checked,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:checked {
+  .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #1c1f1f;
@@ -1004,56 +979,47 @@ button, headerbar button.titlebutton,
     text-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
     -gtk-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 toolbutton > button:insensitive, .inline-toolbar headerbar toolbutton > button.titlebutton:insensitive,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:insensitive {
-    color: #949796;
+  .inline-toolbar toolbutton > button:insensitive {
+    color: #939695;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #333636);
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
     .inline-toolbar toolbutton > button:insensitive > .label {
       color: inherit; }
-  .inline-toolbar toolbutton > button:insensitive:active, .inline-toolbar headerbar toolbutton > button.titlebutton:insensitive:active,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:insensitive:active, .inline-toolbar toolbutton > button:insensitive:checked, .inline-toolbar headerbar toolbutton > button.titlebutton:insensitive:checked,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:insensitive:checked {
-    color: #949796;
+  .inline-toolbar toolbutton > button:insensitive:active, .inline-toolbar toolbutton > button:insensitive:checked {
+    color: #939695;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #313434, #333636);
+    background-image: linear-gradient(to bottom, #2f3333, #323636);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
     .inline-toolbar toolbutton > button:insensitive:active > .label, .inline-toolbar toolbutton > button:insensitive:checked > .label {
       color: inherit; }
-  .inline-toolbar toolbutton > button:backdrop, .inline-toolbar headerbar toolbutton > button.titlebutton:backdrop,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop {
-    color: #949796;
-    border-color: #1f2222;
+  .inline-toolbar toolbutton > button:backdrop {
+    color: #939695;
+    border-color: #1e2222;
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-  .inline-toolbar toolbutton > button:backdrop:active, .inline-toolbar headerbar toolbutton > button.titlebutton:backdrop:active,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop:active, .inline-toolbar toolbutton > button:backdrop:checked, .inline-toolbar headerbar toolbutton > button.titlebutton:backdrop:checked,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop:checked {
-    color: #949796;
-    border-color: #1f2222;
-    background-image: linear-gradient(to bottom, #303535);
+  .inline-toolbar toolbutton > button:backdrop:active, .inline-toolbar toolbutton > button:backdrop:checked {
+    color: #939695;
+    border-color: #1e2222;
+    background-image: linear-gradient(to bottom, #2f3434);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-  .inline-toolbar toolbutton > button:backdrop:insensitive, .inline-toolbar headerbar toolbutton > button.titlebutton:backdrop:insensitive,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop:insensitive {
+  .inline-toolbar toolbutton > button:backdrop:insensitive {
     color: #5d6767;
-    border-color: #1f2222;
-    background-image: linear-gradient(to bottom, #333636);
+    border-color: #1e2222;
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
     .inline-toolbar toolbutton > button:backdrop:insensitive > .label {
       color: inherit; }
-  .inline-toolbar toolbutton > button:backdrop:insensitive:active, .inline-toolbar headerbar toolbutton > button.titlebutton:backdrop:insensitive:active,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop:insensitive:active, .inline-toolbar toolbutton > button:backdrop:insensitive:checked, .inline-toolbar headerbar toolbutton > button.titlebutton:backdrop:insensitive:checked,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop:insensitive:checked {
+  .inline-toolbar toolbutton > button:backdrop:insensitive:active, .inline-toolbar toolbutton > button:backdrop:insensitive:checked {
     color: #5d6767;
-    border-color: #1f2222;
-    background-image: linear-gradient(to bottom, #272929);
+    border-color: #1e2222;
+    background-image: linear-gradient(to bottom, #262929);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
     .inline-toolbar toolbutton > button:backdrop:insensitive:active > .label, .inline-toolbar toolbutton > button:backdrop:insensitive:checked > .label {
       color: inherit; }
@@ -1079,8 +1045,7 @@ headerbar .inline-toolbar toolbutton:backdrop > button.titlebutton,
   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, headerbar .linked > button.titlebutton:first-child,
-.titlebar .linked > button.titlebutton:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, searchbar.inline-toolbar toolbutton:first-child > button.flat,
+.linked:not(.vertical) > entry:first-child, .linked:not(.vertical) > spinbutton:first-child, .inline-toolbar button:first-child, .linked > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, searchbar.inline-toolbar toolbutton:first-child > button.flat,
 .inline-toolbar.location-bar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, searchbar.inline-toolbar toolbutton:first-child > button.sidebar-button,
 .inline-toolbar.location-bar toolbutton:first-child > button.sidebar-button, .inline-toolbar headerbar toolbutton:first-child > button.titlebutton, headerbar .inline-toolbar toolbutton:first-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:first-child > button.titlebutton,
@@ -1099,8 +1064,7 @@ headerbar .inline-toolbar toolbutton:backdrop:first-child > button.titlebutton,
 .titlebar .inline-toolbar toolbutton:backdrop:first-child > button.titlebutton, .linked > combobox:first-child > button.combo {
   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, headerbar .linked > button.titlebutton:last-child,
-.titlebar .linked > button.titlebutton:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, searchbar.inline-toolbar toolbutton:last-child > button.flat,
+.linked:not(.vertical) > entry:last-child, .linked:not(.vertical) > spinbutton:last-child, .inline-toolbar button:last-child, .linked > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, searchbar.inline-toolbar toolbutton:last-child > button.flat,
 .inline-toolbar.location-bar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, searchbar.inline-toolbar toolbutton:last-child > button.sidebar-button,
 .inline-toolbar.location-bar toolbutton:last-child > button.sidebar-button, .inline-toolbar headerbar toolbutton:last-child > button.titlebutton, headerbar .inline-toolbar toolbutton:last-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:last-child > button.titlebutton,
@@ -1120,8 +1084,7 @@ headerbar .inline-toolbar toolbutton:backdrop:last-child > button.titlebutton,
   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, headerbar .linked > button.titlebutton:only-child,
-.titlebar .linked > button.titlebutton:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, searchbar.inline-toolbar toolbutton:only-child > button.flat,
+.linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > spinbutton:only-child, .inline-toolbar button:only-child, .linked > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, searchbar.inline-toolbar toolbutton:only-child > button.flat,
 .inline-toolbar.location-bar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, searchbar.inline-toolbar toolbutton:only-child > button.sidebar-button,
 .inline-toolbar.location-bar toolbutton:only-child > button.sidebar-button, .inline-toolbar headerbar toolbutton:only-child > button.titlebutton, headerbar .inline-toolbar toolbutton:only-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:only-child > button.titlebutton,
@@ -1141,22 +1104,18 @@ headerbar .inline-toolbar toolbutton:backdrop:only-child > button.titlebutton,
   border-radius: 3px;
   border-style: solid; }
 
-.linked.vertical > entry, .linked.vertical > spinbutton, .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 > combobox > button.combo {
+.linked.vertical > entry, .linked.vertical > spinbutton, .linked.vertical > button, .linked.vertical > button:hover, .linked.vertical > button:active, .linked.vertical > button:checked, .linked.vertical > button:backdrop, .linked.vertical > combobox > button.combo {
   border-style: solid solid none solid;
   border-radius: 0; }
 
-.linked.vertical > entry:first-child, .linked.vertical > spinbutton:first-child, .linked.vertical > button:first-child, headerbar .linked.vertical > button.titlebutton:first-child,
-.titlebar .linked.vertical > button.titlebutton:first-child, .linked.vertical > combobox:first-child > button.combo {
+.linked.vertical > entry:first-child, .linked.vertical > spinbutton:first-child, .linked.vertical > button:first-child, .linked.vertical > combobox:first-child > button.combo {
   border-top-left-radius: 3px;
   border-top-right-radius: 3px; }
-.linked.vertical > entry:last-child, .linked.vertical > spinbutton:last-child, .linked.vertical > button:last-child, headerbar .linked.vertical > button.titlebutton:last-child,
-.titlebar .linked.vertical > button.titlebutton:last-child, .linked.vertical > combobox:last-child > button.combo {
+.linked.vertical > entry:last-child, .linked.vertical > spinbutton:last-child, .linked.vertical > button:last-child, .linked.vertical > combobox:last-child > button.combo {
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border-style: solid; }
-.linked.vertical > entry:only-child, .linked.vertical > spinbutton:only-child, .linked.vertical > button:only-child, headerbar .linked.vertical > button.titlebutton:only-child,
-.titlebar .linked.vertical > button.titlebutton:only-child, .linked.vertical > combobox:only-child > button.combo {
+.linked.vertical > entry:only-child, .linked.vertical > spinbutton:only-child, .linked.vertical > button:only-child, .linked.vertical > combobox:only-child > button.combo {
   border-radius: 3px;
   border-style: solid; }
 
@@ -1206,7 +1165,7 @@ modelbutton.flat,
   outline-offset: -1px; }
   modelbutton.flat:hover,
   .menuitem.button.flat:hover {
-    background-color: #4b5150; }
+    background-color: #4b5050; }
 
 button.color, headerbar button.color.titlebutton,
 .titlebar button.color.titlebutton {
@@ -1234,17 +1193,17 @@ button.color, headerbar button.color.titlebutton,
   *:link:hover, button:hover:link, button:hover:visited {
     color: #74aae2; }
     *:selected *:link:hover, *:selected button:hover:link, *:selected button:hover:visited {
-      color: #e9eff5; }
+      color: #e8eef5; }
   *:link:active, button:active:link, button:active:visited {
     color: #4a90d9; }
     *:selected *:link:active, *:selected button:active:link, *:selected button:active:visited {
-      color: #d3dfeb; }
+      color: #d2deeb; }
   *: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,
   headerbar.selection-mode .subtitle:backdrop:hover:link {
     color: #215d9c; }
   *:link:selected, button:selected:link, button:selected:visited, .titlebar.selection-mode .subtitle:link,
   headerbar.selection-mode .subtitle:link, *:selected *:link, *:selected button:link, *:selected button:visited {
-    color: #d3dfeb; }
+    color: #d2deeb; }
 
 button:link, headerbar button.titlebutton:link,
 .titlebar button.titlebutton:link, button:visited, headerbar button.titlebutton:visited,
@@ -1252,8 +1211,8 @@ button:link, headerbar button.titlebutton:link,
   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, headerbar button.titlebutton:link > label,
-  .titlebar button.titlebutton:link > label, button:visited > label, headerbar button.titlebutton:visited > label,
+  button:link > label,
+  .titlebar button.titlebutton:link > label, button:visited > label,
   .titlebar button.titlebutton:visited > label {
     text-decoration-line: underline; }
 
@@ -1266,7 +1225,7 @@ spinbutton:not(.vertical) .titlebar button.titlebutton,
   background-image: none;
   border-style: none none none solid;
   border-color: rgba(28, 31, 31, 0.3);
-  color: #dadad9;
+  color: #dadad8;
   border-radius: 0;
   box-shadow: none; }
   spinbutton:not(.vertical) button:dir(rtl) {
@@ -1275,13 +1234,13 @@ spinbutton:not(.vertical) .titlebar button.titlebutton,
     color: #eeeeec;
     background-color: rgba(238, 238, 236, 0.05); }
   spinbutton:not(.vertical) button:insensitive {
-    color: rgba(148, 151, 150, 0.3); }
+    color: rgba(147, 150, 149, 0.3); }
   spinbutton:not(.vertical) button:active {
     box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2);
     background-color: rgba(0, 0, 0, 0.1); }
   spinbutton:not(.vertical) button:backdrop {
-    color: #8a8c8b;
-    border-color: rgba(31, 34, 34, 0.3);
+    color: #888b8a;
+    border-color: rgba(30, 34, 34, 0.3);
     background-color: transparent; }
   spinbutton:not(.vertical) button:backdrop:insensitive {
     background-image: none;
@@ -1334,7 +1293,7 @@ spinbutton:not(.vertical) .titlebar button.titlebutton,
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
     text-shadow: none;
     -gtk-icon-shadow: none;
-    color: #878a89;
+    color: #878989;
     border-color: rgba(0, 0, 0, 0.5);
     -gtk-icon-shadow: none;
     box-shadow: none; }
@@ -1376,31 +1335,29 @@ spinbutton.vertical {
         -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
       spinbutton.vertical button:first-child:insensitive {
-        color: #949796;
+        color: #939695;
         border-color: #1c1f1f;
-        background-image: linear-gradient(to bottom, #333636);
+        background-image: linear-gradient(to bottom, #323636);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        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 {
+        spinbutton.vertical button:first-child:insensitive > .label {
           color: inherit; }
       spinbutton.vertical button:first-child:backdrop {
-        color: #949796;
-        border-color: #1f2222;
+        color: #939695;
+        border-color: #1e2222;
         background-image: linear-gradient(to bottom, #393f3f);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
         spinbutton.vertical button:first-child:backdrop:insensitive {
           color: #5d6767;
-          border-color: #1f2222;
-          background-image: linear-gradient(to bottom, #333636);
+          border-color: #1e2222;
+          background-image: linear-gradient(to bottom, #323636);
           text-shadow: none;
           -gtk-icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-          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 {
+          spinbutton.vertical button: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 {
     border-radius: 3px 3px 0 0;
@@ -1436,9 +1393,9 @@ spinbutton.vertical {
     -gtk-icon-shadow: none;
     outline-color: rgba(238, 238, 236, 0.3); }
   .osd spinbutton.vertical button:first-child:insensitive {
-    color: #878a89;
+    color: #878989;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+    background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -1466,16 +1423,16 @@ combobox {
   -GtkComboBox-shadow-type: none;
   text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
   -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176); }
-  combobox > button.combo, headerbar combobox > button.combo.titlebutton,
+  combobox > button.combo,
   .titlebar combobox > button.combo.titlebutton {
     padding-top: 3px;
     padding-bottom: 4px; }
   combobox:insensitive {
-    color: #949796;
+    color: #939695;
     text-shadow: none;
     -gtk-icon-shadow: none; }
   combobox:backdrop {
-    color: #949796;
+    color: #939695;
     text-shadow: none;
     -gtk-icon-shadow: none; }
   combobox:backdrop:insensitive {
@@ -1490,13 +1447,11 @@ combobox {
   combobox > entry.combo:dir(rtl), combobox > spinbutton.combo:dir(rtl) {
     border-top-left-radius: 0;
     border-bottom-left-radius: 0; }
-  combobox > button.combo:not(:only-child):dir(ltr), headerbar combobox > button.combo.titlebutton:not(:only-child):dir(ltr),
-  .titlebar combobox > button.combo.titlebutton:not(:only-child):dir(ltr) {
+  combobox > button.combo:not(:only-child):dir(ltr) {
     border-top-left-radius: 0;
     border-bottom-left-radius: 0;
     border-left-style: none; }
-  combobox > button.combo:not(:only-child):dir(rtl), headerbar combobox > button.combo.titlebutton:not(:only-child):dir(rtl),
-  .titlebar combobox > button.combo.titlebutton:not(:only-child):dir(rtl) {
+  combobox > button.combo:not(:only-child):dir(rtl) {
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
     border-right-style: none; }
@@ -1532,11 +1487,11 @@ searchbar,
   border-style: solid;
   border-color: #1c1f1f;
   background-color: #303535;
-  box-shadow: inset 0 2px 3px -1px #242828, 0 1px rgba(238, 238, 236, 0.1); }
+  box-shadow: inset 0 2px 3px -1px #242727, 0 1px rgba(238, 238, 236, 0.1); }
   .inline-toolbar:backdrop, searchbar:backdrop,
   .location-bar:backdrop {
-    border-color: #1f2222;
-    background-color: #303535;
+    border-color: #1e2222;
+    background-color: #2f3434;
     box-shadow: none; }
 
 /***************
@@ -1551,10 +1506,10 @@ headerbar {
   border-radius: 7px 7px 0 0;
   background-color: transparent;
   background-image: linear-gradient(to bottom, #434a4a, #393f3f);
-  box-shadow: inset 0 -1px #2e3232, inset 0 1px rgba(238, 238, 236, 0.1); }
+  box-shadow: inset 0 -1px #2d3232, inset 0 1px rgba(238, 238, 236, 0.1); }
   .titlebar:backdrop,
   headerbar:backdrop {
-    border-color: #1f2222;
+    border-color: #1e2222;
     background-color: #393f3f;
     background-image: none;
     box-shadow: inset 0 1px rgba(238, 238, 236, 0.1); }
@@ -1578,18 +1533,18 @@ headerbar {
     .titlebar .header-bar-separator:backdrop, .titlebar > 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; }
+      border-image: linear-gradient(to bottom, rgba(30, 34, 34, 0.5)) 0 1/1px 1px; }
   .titlebar.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); }
+    box-shadow: inset 0 -1px #1a4b7e, inset 0 1px rgba(43, 100, 160, 0.55); }
     .titlebar.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); }
+      box-shadow: inset 0 1px rgba(48, 103, 161, 0.46); }
     .titlebar.selection-mode button,
     headerbar.selection-mode button,
     headerbar.selection-mode .titlebar button.titlebutton,
@@ -1637,7 +1592,7 @@ headerbar {
       headerbar.selection-mode button.flat:backdrop,
       headerbar.selection-mode button.sidebar-button:backdrop,
       headerbar.selection-mode button.titlebutton:backdrop {
-        color: #d3dfeb;
+        color: #d2deeb;
         border-color: #0b1e33;
         background-image: linear-gradient(to bottom, #215d9c);
         text-shadow: none;
@@ -1656,7 +1611,7 @@ headerbar {
         headerbar.selection-mode button.flat:backdrop:checked,
         headerbar.selection-mode button.sidebar-button:backdrop:checked,
         headerbar.selection-mode button.titlebutton:backdrop:checked {
-          color: #d1dae3;
+          color: #d0d9e2;
           border-color: #0b1e33;
           background-image: linear-gradient(to bottom, #184472);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0);
@@ -1667,21 +1622,19 @@ headerbar {
         headerbar.selection-mode button.flat:backdrop:insensitive,
         headerbar.selection-mode button.sidebar-button:backdrop:insensitive,
         headerbar.selection-mode button.titlebutton:backdrop:insensitive {
-          color: #6f91b4;
+          color: #6f90b2;
           border-color: #0b1e33;
-          background-image: linear-gradient(to bottom, #22558b);
+          background-image: linear-gradient(to bottom, #22558a);
           text-shadow: none;
           -gtk-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 headerbar button.titlebutton:backdrop:insensitive > .label, .titlebar.selection-mode button.flat:backdrop:insensitive > .label, .titlebar.selection-mode button.sidebar-button:backdrop:insensitive > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive > .label,
+          .titlebar.selection-mode button:backdrop:insensitive > .label, .titlebar.selection-mode button.flat:backdrop:insensitive > .label, .titlebar.selection-mode button.sidebar-button:backdrop:insensitive > .label,
           .titlebar.selection-mode 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 button.sidebar-button:backdrop:insensitive > .label,
-          headerbar.selection-mode button.titlebutton:backdrop:insensitive > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive > .label {
+          headerbar.selection-mode 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 button.sidebar-button:backdrop:insensitive:active,
         .titlebar.selection-mode button.titlebutton:backdrop:insensitive:active, .titlebar.selection-mode button.flat:backdrop:insensitive:checked, .titlebar.selection-mode button.sidebar-button:backdrop:insensitive:checked,
@@ -1694,26 +1647,22 @@ headerbar {
         headerbar.selection-mode button.flat:backdrop:insensitive:checked,
         headerbar.selection-mode button.sidebar-button:backdrop:insensitive:checked,
         headerbar.selection-mode button.titlebutton:backdrop:insensitive:checked {
-          color: #6c88a7;
+          color: #6c88a5;
           border-color: #0b1e33;
-          background-image: linear-gradient(to bottom, #1d4877);
+          background-image: linear-gradient(to bottom, #1d4876);
           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 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 button.sidebar-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 button.sidebar-button:backdrop:insensitive:checked > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive:checked > .label,
+          .titlebar.selection-mode button:backdrop:insensitive:active > .label, .titlebar.selection-mode button:backdrop:insensitive:checked > .label, .titlebar.selection-mode button.flat:backdrop:insensitive:active > .label, .titlebar.selection-mode button.sidebar-button: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 button.sidebar-button:backdrop:insensitive:checked > .label,
           .titlebar.selection-mode 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 button.sidebar-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 button.sidebar-button:backdrop:insensitive:checked > .label,
-          headerbar.selection-mode button.titlebutton:backdrop:insensitive:checked > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:checked > .label {
+          headerbar.selection-mode button.titlebutton:backdrop:insensitive:checked > .label {
             color: inherit; }
       .titlebar.selection-mode button.flat:backdrop, .titlebar.selection-mode button.sidebar-button:backdrop,
       .titlebar.selection-mode button.titlebutton:backdrop, .titlebar.selection-mode button.flat:insensitive, .titlebar.selection-mode button.sidebar-button:insensitive,
@@ -1736,28 +1685,25 @@ headerbar {
         -gtk-icon-shadow: none; }
       .titlebar.selection-mode button:insensitive,
       headerbar.selection-mode button:insensitive {
-        color: #91aac5;
+        color: #90aac4;
         border-color: #0b1e33;
-        background-image: linear-gradient(to bottom, #22558b);
+        background-image: linear-gradient(to bottom, #22558a);
         text-shadow: none;
         -gtk-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 headerbar button.titlebutton:insensitive > .label,
-        headerbar.selection-mode button:insensitive > .label,
-        headerbar.selection-mode .titlebar button.titlebutton:insensitive > .label {
+        .titlebar.selection-mode button:insensitive > .label,
+        headerbar.selection-mode button:insensitive > .label {
           color: inherit; }
         .titlebar.selection-mode button:insensitive:active, .titlebar.selection-mode button:insensitive:checked,
         headerbar.selection-mode button:insensitive:active,
         headerbar.selection-mode button:insensitive:checked {
-          color: #a5b6c9;
+          color: #a4b5c8;
           border-color: #0b1e33;
-          background-image: linear-gradient(to bottom, #1b4470, #1d4877);
+          background-image: linear-gradient(to bottom, #1b436f, #1d4876);
           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 headerbar button.titlebutton:insensitive:active > .label, .titlebar.selection-mode button:insensitive:checked > .label, .titlebar.selection-mode headerbar button.titlebutton:insensitive:checked > .label,
+          .titlebar.selection-mode button:insensitive:active > .label, .titlebar.selection-mode button: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 {
+          headerbar.selection-mode button:insensitive:checked > .label {
             color: inherit; }
       .titlebar.selection-mode button.suggested-action,
       headerbar.selection-mode button.suggested-action {
@@ -1791,21 +1737,20 @@ headerbar {
           border-color: #0f2b48; }
         .titlebar.selection-mode button.suggested-action:insensitive,
         headerbar.selection-mode button.suggested-action:insensitive {
-          color: #949796;
+          color: #939695;
           border-color: #1c1f1f;
-          background-image: linear-gradient(to bottom, #333636);
+          background-image: linear-gradient(to bottom, #323636);
           text-shadow: none;
           -gtk-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 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 {
+          .titlebar.selection-mode button.suggested-action:insensitive > .label,
+          headerbar.selection-mode button.suggested-action:insensitive > .label {
             color: inherit; }
         .titlebar.selection-mode button.suggested-action:backdrop,
         headerbar.selection-mode button.suggested-action:backdrop {
-          color: #949796;
-          border-color: #1f2222;
+          color: #939695;
+          border-color: #1e2222;
           background-image: linear-gradient(to bottom, #393f3f);
           text-shadow: none;
           -gtk-icon-shadow: none;
@@ -1814,15 +1759,14 @@ headerbar {
         .titlebar.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);
+          border-color: #1e2222;
+          background-image: linear-gradient(to bottom, #323636);
           text-shadow: none;
           -gtk-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 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 {
+          .titlebar.selection-mode button.suggested-action:backdrop:insensitive > .label,
+          headerbar.selection-mode button.suggested-action:backdrop:insensitive > .label {
             color: inherit; }
     .titlebar.selection-mode .selection-menu, .titlebar.selection-mode .selection-menu:backdrop,
     headerbar.selection-mode .selection-menu,
@@ -1893,33 +1837,33 @@ treeview.view {
   -GtkTreeView-tree-line-width: 1;
   -GtkTreeView-tree-line-pattern: '';
   -GtkTreeView-expander-size: 16;
-  border-left-color: #8c8c8b;
+  border-left-color: #8b8b8a;
   border-top-color: #393f3f; }
   treeview.view:selected {
     border-radius: 0; }
   treeview.view:selected, treeview.view:backdrop:selected {
-    border-left-color: #90aece;
+    border-left-color: #90aecd;
     border-top-color: rgba(238, 238, 236, 0.1); }
   treeview.view:insensitive {
-    color: #949796; }
+    color: #939695; }
     treeview.view:insensitive:selected {
-      color: #7a9ec4; }
+      color: #799dc3; }
       treeview.view:insensitive:selected:backdrop {
-        color: #648eba; }
+        color: #638db9; }
     treeview.view:insensitive:backdrop {
       color: #5d6767; }
   treeview.view.separator:backdrop {
     color: rgba(0, 0, 0, 0.1); }
   treeview.view:backdrop {
-    border-left-color: #676b6b;
+    border-left-color: #666a6a;
     border-top: #393f3f; }
   treeview.view.dnd {
     border-style: solid none;
     border-width: 1px;
-    border-color: #88a6c4; }
+    border-color: #87a5c4; }
   treeview.view.expander {
     -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
-    color: #b3b3b2; }
+    color: #b2b2b1; }
     treeview.view.expander:dir(rtl) {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
     treeview.view.expander:hover {
@@ -1933,7 +1877,7 @@ treeview.view {
     treeview.view.expander:checked {
       -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
     treeview.view.expander:backdrop {
-      color: #757776; }
+      color: #747675; }
   treeview.view.progressbar {
     border: 1px solid #0f2b48;
     border-radius: 4px;
@@ -1957,13 +1901,13 @@ treeview.view {
   treeview.view header button,
   treeview.view header .titlebar button.titlebutton,
   .titlebar treeview.view header button.titlebutton {
-    color: #8c8c8b;
+    color: #8b8b8a;
     background-color: #292929;
     font-weight: bold;
     text-shadow: none;
     box-shadow: none; }
     treeview.view header button:hover {
-      color: #bdbdbc;
+      color: #bcbcbb;
       box-shadow: none;
       transition: none; }
     treeview.view header button:active {
@@ -1991,7 +1935,7 @@ treeview.view header .titlebar button.titlebutton,
   treeview.view header button:backdrop {
     border-color: #393f3f;
     border-style: none solid solid none;
-    color: #676b6b;
+    color: #666a6a;
     background-image: none;
     background-color: #2c2c2c; }
     treeview.view header button:backdrop:insensitive {
@@ -2018,7 +1962,7 @@ menubar,
       color: #4a90d9; }
     menubar > menuitem:insensitive,
     .menubar > menuitem:insensitive {
-      color: #949796;
+      color: #939695;
       box-shadow: none; }
 
 menu,
@@ -2040,14 +1984,14 @@ menu,
       background-color: #215d9c; }
     menu menuitem:insensitive,
     .menu menuitem:insensitive {
-      color: #949796; }
+      color: #939695; }
       menu menuitem:insensitive:backdrop,
       .menu menuitem:insensitive:backdrop {
         color: #5d6767; }
     menu menuitem:backdrop, menu menuitem:backdrop:hover,
     .menu menuitem:backdrop,
     .menu menuitem:backdrop:hover {
-      color: #949796;
+      color: #939695;
       background-color: #2c2c2c; }
     menu menuitem arrow,
     .menu menuitem arrow {
@@ -2061,13 +2005,13 @@ menu,
     border-radius: 0; }
     menu arrow.top,
     .menu arrow.top {
-      border-bottom: 1px solid #3d3d3d; }
+      border-bottom: 1px solid #3c3c3c; }
     menu arrow.bottom,
     .menu arrow.bottom {
-      border-top: 1px solid #3d3d3d; }
+      border-top: 1px solid #3c3c3c; }
     menu arrow:hover,
     .menu arrow:hover {
-      background-color: #3d3d3d; }
+      background-color: #3c3c3c; }
     menu arrow:insensitive,
     .menu arrow:insensitive {
       color: transparent;
@@ -2126,7 +2070,7 @@ notebook {
   notebook.frame {
     border: 1px solid #1c1f1f; }
     notebook.frame:backdrop {
-      border-color: #1f2222; }
+      border-color: #1e2222; }
   notebook header {
     background-color: #303535; }
     .frame notebook header {
@@ -2140,11 +2084,11 @@ notebook {
       .frame notebook header.left {
         border-right-width: 0; }
       .frame notebook header:backdrop {
-        border-color: #1f2222; }
+        border-color: #1e2222; }
     notebook header.top {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 -1px #1c1f1f; }
       notebook header.top:backdrop {
-        box-shadow: inset 0 -1px #1f2222; }
+        box-shadow: inset 0 -1px #1e2222; }
       notebook header.top tab {
         padding: 8px 20px;
         border-bottom-width: 3px; }
@@ -2156,7 +2100,7 @@ notebook {
     notebook header.bottom {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 1px #1c1f1f; }
       notebook header.bottom:backdrop {
-        box-shadow: inset 0 1px #1f2222; }
+        box-shadow: inset 0 1px #1e2222; }
       notebook header.bottom tab {
         padding: 8px 20px;
         border-top-width: 3px; }
@@ -2168,7 +2112,7 @@ notebook {
     notebook header.right {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 1px 0 #1c1f1f; }
       notebook header.right:backdrop {
-        box-shadow: inset 1px 0 #1f2222; }
+        box-shadow: inset 1px 0 #1e2222; }
       notebook header.right tab {
         padding: 5px 20px;
         border-left-width: 3px; }
@@ -2178,7 +2122,7 @@ notebook {
     notebook header.left {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset -1px 0 #1c1f1f; }
       notebook header.left:backdrop {
-        box-shadow: inset -1px 0 #1f2222; }
+        box-shadow: inset -1px 0 #1e2222; }
       notebook header.left tab {
         padding: 5px 20px;
         border-right-width: 3px; }
@@ -2186,7 +2130,7 @@ notebook {
           border-bottom-width: 1px;
           border-top-width: 1px; }
     notebook header:backdrop {
-      background-color: #303535;
+      background-color: #2f3434;
       box-shadow: none; }
     notebook header.top tabs arrow.up, notebook header.bottom tabs arrow.up {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
@@ -2197,15 +2141,15 @@ notebook {
     notebook header.left tabs arrow.down, notebook header.right tabs arrow.down {
       -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); }
     notebook header tabs arrow {
-      color: #949796; }
+      color: #939695; }
       notebook header tabs arrow:hover {
-        color: #c1c3c1; }
+        color: #c0c2c0; }
       notebook header tabs arrow:active {
         color: #eeeeec; }
       notebook header tabs arrow:insensitive {
-        color: rgba(148, 151, 150, 0.3); }
+        color: rgba(147, 150, 149, 0.3); }
       notebook header tabs arrow:backdrop {
-        color: rgba(148, 151, 150, 0.4); }
+        color: rgba(147, 150, 149, 0.4); }
       notebook header tabs arrow:backdrop:insensitive {
         color: #5d6767; }
   notebook tab {
@@ -2234,7 +2178,7 @@ notebook {
         .top notebook tab.reorderable-page:active:hover {
           background-color: rgba(57, 63, 63, 0.7); }
         .top notebook tab.reorderable-page:active:backdrop {
-          border-color: #1f2222;
+          border-color: #1e2222;
           background-color: #393f3f;
           border-bottom-color: #215d9c; }
       .top notebook tab.reorderable-page:backdrop {
@@ -2253,7 +2197,7 @@ notebook {
         .bottom notebook tab.reorderable-page:active:hover {
           background-color: rgba(57, 63, 63, 0.7); }
         .bottom notebook tab.reorderable-page:active:backdrop {
-          border-color: #1f2222;
+          border-color: #1e2222;
           background-color: #393f3f;
           border-top-color: #215d9c; }
       .bottom notebook tab.reorderable-page:backdrop {
@@ -2272,7 +2216,7 @@ notebook {
         .left notebook tab.reorderable-page:active:hover {
           background-color: rgba(57, 63, 63, 0.7); }
         .left notebook tab.reorderable-page:active:backdrop {
-          border-color: #1f2222;
+          border-color: #1e2222;
           background-color: #393f3f;
           border-right-color: #215d9c; }
       .left notebook tab.reorderable-page:backdrop {
@@ -2291,7 +2235,7 @@ notebook {
         .right notebook tab.reorderable-page:active:hover {
           background-color: rgba(57, 63, 63, 0.7); }
         .right notebook tab.reorderable-page:active:backdrop {
-          border-color: #1f2222;
+          border-color: #1e2222;
           background-color: #393f3f;
           border-left-color: #215d9c; }
       .right notebook tab.reorderable-page:backdrop {
@@ -2300,17 +2244,17 @@ notebook {
     notebook tab label {
       padding: 0 2px;
       font-weight: bold;
-      color: #949796; }
+      color: #939695; }
       notebook tab label:backdrop {
-        color: #797f7f; }
+        color: #787e7e; }
     notebook tab:hover label {
-      color: #c1c3c1; }
+      color: #c0c2c0; }
       notebook tab:hover label:backdrop {
-        color: #797f7f; }
+        color: #787e7e; }
     notebook tab:active label {
       color: #eeeeec; }
       notebook tab:active label:backdrop {
-        color: #949796; }
+        color: #939695; }
     notebook tab button, notebook tab headerbar button.titlebutton, headerbar notebook tab button.titlebutton,
     notebook tab .titlebar button.titlebutton,
     .titlebar notebook tab button.titlebutton {
@@ -2345,7 +2289,7 @@ notebook {
       notebook tab button:backdrop,
       notebook tab .titlebar button.titlebutton:backdrop,
       .titlebar notebook tab button.titlebutton:backdrop {
-        color: rgba(148, 151, 150, 0.3);
+        color: rgba(147, 150, 149, 0.3);
         border-color: transparent; }
       notebook tab button > image, notebook tab headerbar button.titlebutton > image, headerbar notebook tab button.titlebutton > image,
       notebook tab .titlebar button.titlebutton > image,
@@ -2391,15 +2335,15 @@ scrollbar {
     border: 1px none #1c1f1f; }
     scrollbar trough:backdrop {
       background-color: #323737;
-      border-color: #1f2222; }
+      border-color: #1e2222; }
   scrollbar slider {
-    background-color: #a6a8a7; }
+    background-color: #a5a8a6; }
     scrollbar slider:hover {
-      background-color: #cacbc9; }
+      background-color: #c9cbc9; }
     scrollbar slider:prelight:active {
       background-color: #2a76c6; }
     scrollbar slider:backdrop {
-      background-color: #5d6262; }
+      background-color: #5d6161; }
     scrollbar slider:insensitive {
       background-color: transparent; }
   scrollbar slider {
@@ -2452,16 +2396,16 @@ switch {
     box-shadow: 0 1px rgba(238, 238, 236, 0.1);
     text-shadow: 0 1px rgba(15, 43, 72, 0.5), 0 0 2px rgba(255, 255, 255, 0.6); }
   switch:insensitive {
-    color: #949796;
+    color: #939695;
     border-color: #1c1f1f;
     background-image: none;
-    background-color: #333636;
+    background-color: #323636;
     box-shadow: 0 1px rgba(238, 238, 236, 0.1);
     text-shadow: none; }
   switch:backdrop {
-    color: #949796;
-    border-color: #1f2222;
-    background-image: linear-gradient(to bottom, #303535);
+    color: #939695;
+    border-color: #1e2222;
+    background-image: linear-gradient(to bottom, #2f3434);
     box-shadow: none;
     text-shadow: none; }
     switch:backdrop:active {
@@ -2470,9 +2414,9 @@ switch {
       box-shadow: none; }
   switch:insensitive {
     color: #5d6767;
-    border-color: #1f2222;
+    border-color: #1e2222;
     background-image: none;
-    background-color: #333636; }
+    background-color: #323636; }
   switch slider {
     border: 1px solid;
     border-radius: 3px;
@@ -2483,7 +2427,7 @@ switch {
     text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
     -gtk-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);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px rgba(57, 63, 63, 0.6), inset 0 -1px #2b2f2f; }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px rgba(57, 63, 63, 0.6), inset 0 -1px #2a2f2f; }
   switch:hover slider {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
@@ -2492,21 +2436,21 @@ switch {
     text-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
     -gtk-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);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px rgba(57, 63, 63, 0.6), inset 0 -1px #2b2f2f; }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px rgba(57, 63, 63, 0.6), inset 0 -1px #2a2f2f; }
   switch:active slider {
     border: 1px solid #0f2b48; }
   switch:insensitive slider {
-    color: #949796;
+    color: #939695;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #333636);
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     switch:insensitive slider > .label {
       color: inherit; }
   switch:backdrop slider {
-    color: #949796;
-    border-color: #1f2222;
+    color: #939695;
+    border-color: #1e2222;
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     -gtk-icon-shadow: none;
@@ -2516,8 +2460,8 @@ switch {
     border-color: #0f2b48; }
   switch:backdrop:insensitive slider {
     color: #5d6767;
-    border-color: #1f2222;
-    background-image: linear-gradient(to bottom, #333636);
+    border-color: #1e2222;
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
@@ -2674,7 +2618,7 @@ check:backdrop:checked:insensitive {
 
 menu menuitem.check {
   -gtk-icon-source: -gtk-icontheme("checkbox-symbolic");
-  color: #a6a8a7;
+  color: #a5a8a6;
   -gtk-icon-shadow: none; }
   menu menuitem.check:active, menu menuitem.check:checked {
     -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); }
@@ -2683,7 +2627,7 @@ menu menuitem.check {
   menu menuitem.check:hover {
     color: #ffffff; }
   menu menuitem.check:insensitive {
-    color: #676b6b; }
+    color: #666a6a; }
 
 radio {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png"));
@@ -2831,7 +2775,7 @@ radio:backdrop:checked:insensitive {
 
 menu menuitem.radio {
   -gtk-icon-source: -gtk-icontheme("radio-symbolic");
-  color: #a6a8a7;
+  color: #a5a8a6;
   -gtk-icon-shadow: none; }
   menu menuitem.radio:active, menu menuitem.radio:checked {
     -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); }
@@ -2840,7 +2784,7 @@ menu menuitem.radio {
   menu menuitem.radio:hover {
     color: #ffffff; }
   menu menuitem.radio:insensitive {
-    color: #676b6b; }
+    color: #666a6a; }
 
 .view.check, .view.radio,
 row .check, row .radio {
@@ -2894,7 +2838,7 @@ checkbutton.text-button, radiobutton.text-button {
   padding: 1px 2px 4px;
   outline-offset: 0; }
   checkbutton.text-button:insensitive, checkbutton.text-button:insensitive:active, checkbutton.text-button:insensitive:inconsistent, radiobutton.text-button:insensitive, radiobutton.text-button:insensitive:active, radiobutton.text-button:insensitive:inconsistent {
-    color: #949796; }
+    color: #939695; }
     checkbutton.text-button:insensitive:backdrop, checkbutton.text-button:insensitive:active:backdrop, checkbutton.text-button:insensitive:inconsistent:backdrop, radiobutton.text-button:insensitive:backdrop, radiobutton.text-button:insensitive:active:backdrop, radiobutton.text-button:insensitive:inconsistent:backdrop {
       color: #5d6767; }
 
@@ -2936,7 +2880,7 @@ scale {
       border: 1px solid;
       border-radius: 50%;
       border-color: #151717;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px #393f3f, inset 0 -1px #2b2f2f; }
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px #393f3f, inset 0 -1px #2a2f2f; }
       scale trough slider:hover {
         color: #eeeeec;
         outline-color: rgba(238, 238, 236, 0.3);
@@ -2951,18 +2895,18 @@ scale {
       scale trough slider:insensitive {
         border-style: solid;
         border-radius: 50%;
-        background-image: linear-gradient(to bottom, #333636);
+        background-image: linear-gradient(to bottom, #323636);
         box-shadow: none; }
       scale trough slider:backdrop {
         border-style: solid;
         border-radius: 50%;
-        border-color: #181a1a;
+        border-color: #171a1a;
         background-image: linear-gradient(to bottom, #393f3f);
         box-shadow: none; }
       scale trough slider:backdrop:insensitive {
         color: #5d6767;
-        border-color: #1f2222;
-        background-image: linear-gradient(to bottom, #333636);
+        border-color: #1e2222;
+        background-image: linear-gradient(to bottom, #323636);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
@@ -3033,15 +2977,15 @@ scale {
     scale trough:insensitive, scale trough.vertical:insensitive {
       border-color: #1c1f1f;
       background-image: none;
-      background-color: #333636;
+      background-color: #323636;
       box-shadow: 0 1px rgba(238, 238, 236, 0.1); }
     scale trough:backdrop {
-      border-color: #1f2222;
-      background-color: #2b2f2f;
+      border-color: #1e2222;
+      background-color: #2a2f2f;
       box-shadow: none; }
     scale trough:backdrop:insensitive, scale trough .highlight:backdrop:insensitive {
-      border-color: #1f2222;
-      background-color: #333636; }
+      border-color: #1e2222;
+      background-color: #323636; }
     .osd scale trough {
       border-color: rgba(0, 0, 0, 0.7);
       box-shadow: none;
@@ -3070,10 +3014,10 @@ scale {
     row:selected scale:insensitive, row:selected scale.highlight:insensitive {
       border-color: #215d9c;
       box-shadow: none;
-      background-color: #90aece;
+      background-color: #90aecd;
       background-image: none; }
       row:selected scale:insensitive:backdrop, row:selected scale.highlight:insensitive:backdrop {
-        background-color: #90aece; }
+        background-color: #90aecd; }
 
 scale marks {
   color: alpha(currentColor,0.5); }
@@ -3317,10 +3261,10 @@ progressbar {
   progressbar trough {
     border: 1px solid #1c1f1f;
     border-radius: 3px;
-    background-color: #2f3434; }
+    background-color: #2e3333; }
     progressbar trough:backdrop {
-      border-color: #1f2222;
-      background-color: #303535;
+      border-color: #1e2222;
+      background-color: #2f3434;
       box-shadow: 0 1px rgba(255, 255, 255, 0); }
 
 progressbar.horizontal progress {
@@ -3375,15 +3319,15 @@ levelbar {
     padding: 2px;
     border-radius: 3px;
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
     color: white;
     border-color: #1c1f1f;
     box-shadow: inset 0 0 0 1px rgba(33, 93, 156, 0), 0 1px rgba(238, 238, 236, 0.1); }
     levelbar trough:backdrop {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
-      color: #d5d5d5;
-      border-color: #1f2222;
+      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+      color: #d4d4d4;
+      border-color: #1e2222;
       background-image: linear-gradient(to bottom, #2c2c2c);
       box-shadow: 0 1px rgba(238, 238, 236, 0); }
   levelbar.horizontal.discrete block {
@@ -3420,7 +3364,7 @@ levelbar {
     border-color: rgba(238, 238, 236, 0.1);
     box-shadow: none; }
     levelbar block.empty:backdrop {
-      border-color: rgba(148, 151, 150, 0.15); }
+      border-color: rgba(147, 150, 149, 0.15); }
 
 /**********
  * Frames *
@@ -3434,14 +3378,14 @@ frame,
     border-style: none; }
   frame:backdrop,
   .frame:backdrop {
-    border-color: #1f2222; }
+    border-color: #1e2222; }
 
 paper {
   border: 1px solid #1c1f1f;
   background: white;
   padding: 0; }
   paper:backdrop {
-    border-color: #1f2222; }
+    border-color: #1e2222; }
 
 actionbar frame {
   padding: 6px;
@@ -3461,7 +3405,7 @@ scrolledwindow overshoot.top {
   box-shadow: none; }
   placessidebar overshoot.top:backdrop,
   scrolledwindow overshoot.top:backdrop {
-    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#1f2222), to(rgba(31, 34, 34, 0)));
+    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#1e2222), to(rgba(30, 34, 34, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center top;
@@ -3479,7 +3423,7 @@ scrolledwindow overshoot.bottom {
   box-shadow: none; }
   placessidebar overshoot.bottom:backdrop,
   scrolledwindow overshoot.bottom:backdrop {
-    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#1f2222), to(rgba(31, 34, 34, 0)));
+    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#1e2222), to(rgba(30, 34, 34, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center bottom;
@@ -3497,7 +3441,7 @@ scrolledwindow overshoot.left {
   box-shadow: none; }
   placessidebar overshoot.left:backdrop,
   scrolledwindow overshoot.left:backdrop {
-    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#1f2222), to(rgba(31, 34, 34, 0)));
+    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#1e2222), to(rgba(30, 34, 34, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: left center;
@@ -3515,7 +3459,7 @@ scrolledwindow overshoot.right {
   box-shadow: none; }
   placessidebar overshoot.right:backdrop,
   scrolledwindow overshoot.right:backdrop {
-    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#1f2222), to(rgba(31, 34, 34, 0)));
+    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#1e2222), to(rgba(30, 34, 34, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: right center;
@@ -3576,7 +3520,7 @@ scrolledwindow junction {
     border-image-slice: 0 1 0 0; }
   placessidebar junction:backdrop,
   scrolledwindow junction:backdrop {
-    border-image-source: linear-gradient(to bottom, #1f2222 1px, transparent 1px);
+    border-image-source: linear-gradient(to bottom, #1e2222 1px, transparent 1px);
     background-color: #323737; }
 
 separator {
@@ -3592,7 +3536,7 @@ list {
   border-color: #1c1f1f; }
   list:backdrop {
     background-color: #2c2c2c;
-    border-color: #1f2222; }
+    border-color: #1e2222; }
   list row {
     padding: 2px; }
 
@@ -3605,7 +3549,7 @@ row.activatable:backdrop:hover {
 row.activatable:selected:active {
   box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); }
 row.activatable:selected.has-open-popup, row.activatable:selected:hover {
-  background-color: #366ca4; }
+  background-color: #356ba4; }
 row.activatable:selected:backdrop {
   background-color: #215d9c; }
 
@@ -3648,8 +3592,8 @@ row:selected .titlebar button.titlebutton,
   row:selected button:backdrop, row:selected button.flat:backdrop, row:selected button.sidebar-button:backdrop, row:selected headerbar button.titlebutton:backdrop, headerbar row:selected button.titlebutton:backdrop,
   row:selected .titlebar button.titlebutton:backdrop,
   .titlebar row:selected button.titlebutton:backdrop {
-    color: #949796;
-    border-color: #1f2222;
+    color: #939695;
+    border-color: #1e2222;
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     -gtk-icon-shadow: none;
@@ -3659,21 +3603,20 @@ row:selected .titlebar button.titlebutton,
     .titlebar row:selected button.titlebutton:backdrop:active, row:selected button.flat:backdrop:checked, row:selected button.sidebar-button:backdrop:checked, row:selected headerbar button.titlebutton:backdrop:checked, headerbar row:selected button.titlebutton:backdrop:checked,
     row:selected .titlebar button.titlebutton:backdrop:checked,
     .titlebar row:selected button.titlebutton:backdrop:checked {
-      color: #949796;
-      border-color: #1f2222;
-      background-image: linear-gradient(to bottom, #303535);
+      color: #939695;
+      border-color: #1e2222;
+      background-image: linear-gradient(to bottom, #2f3434);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     row:selected button:backdrop:insensitive, row:selected button.flat:backdrop:insensitive, row:selected button.sidebar-button:backdrop:insensitive, row:selected headerbar button.titlebutton:backdrop:insensitive, headerbar row:selected button.titlebutton:backdrop:insensitive,
     row:selected .titlebar button.titlebutton:backdrop:insensitive,
     .titlebar row:selected button.titlebutton:backdrop:insensitive {
       color: #5d6767;
-      border-color: #1f2222;
-      background-image: linear-gradient(to bottom, #333636);
+      border-color: #1e2222;
+      background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      row:selected button:backdrop:insensitive > .label, row:selected headerbar button.titlebutton:backdrop:insensitive > .label,
-      row:selected .titlebar button.titlebutton:backdrop:insensitive > .label, row:selected button.flat:backdrop:insensitive > .label, row:selected button.sidebar-button:backdrop:insensitive > .label, row:selected headerbar button.titlebutton:backdrop:insensitive > .label, headerbar row:selected button.titlebutton:backdrop:insensitive > .label,
+      row:selected button:backdrop:insensitive > .label, row:selected button.flat:backdrop:insensitive > .label, row:selected button.sidebar-button:backdrop:insensitive > .label, row:selected headerbar button.titlebutton:backdrop:insensitive > .label, headerbar row:selected button.titlebutton:backdrop:insensitive > .label,
       row:selected .titlebar button.titlebutton:backdrop:insensitive > .label,
       .titlebar row:selected button.titlebutton:backdrop:insensitive > .label {
         color: inherit; }
@@ -3683,12 +3626,10 @@ row:selected .titlebar button.titlebutton,
       row:selected .titlebar button.titlebutton:backdrop:insensitive:checked,
       .titlebar row:selected button.titlebutton:backdrop:insensitive:checked {
         color: #5d6767;
-        border-color: #1f2222;
-        background-image: linear-gradient(to bottom, #272929);
+        border-color: #1e2222;
+        background-image: linear-gradient(to bottom, #262929);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        row:selected button:backdrop:insensitive:active > .label, row:selected headerbar button.titlebutton:backdrop:insensitive:active > .label,
-        row:selected .titlebar button.titlebutton:backdrop:insensitive:active > .label, row:selected button:backdrop:insensitive:checked > .label, row:selected headerbar button.titlebutton:backdrop:insensitive:checked > .label,
-        row:selected .titlebar button.titlebutton:backdrop:insensitive:checked > .label, row:selected button.flat:backdrop:insensitive:active > .label, row:selected button.sidebar-button:backdrop:insensitive:active > .label, row:selected headerbar button.titlebutton:backdrop:insensitive:active > .label, headerbar row:selected button.titlebutton:backdrop:insensitive:active > .label,
+        row:selected button:backdrop:insensitive:active > .label, row:selected button:backdrop:insensitive:checked > .label, row:selected button.flat:backdrop:insensitive:active > .label, row:selected button.sidebar-button:backdrop:insensitive:active > .label, row:selected headerbar button.titlebutton:backdrop:insensitive:active > .label, headerbar row:selected button.titlebutton:backdrop:insensitive:active > .label,
         row:selected .titlebar button.titlebutton:backdrop:insensitive:active > .label,
         .titlebar row:selected button.titlebutton:backdrop:insensitive:active > .label, row:selected button.flat:backdrop:insensitive:checked > .label, row:selected button.sidebar-button:backdrop:insensitive:checked > .label, row:selected headerbar button.titlebutton:backdrop:insensitive:checked > .label, headerbar row:selected button.titlebutton:backdrop:insensitive:checked > .label,
         row:selected .titlebar button.titlebutton:backdrop:insensitive:checked > .label,
@@ -3703,25 +3644,22 @@ row:selected .titlebar button.titlebutton,
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
     text-shadow: none;
     -gtk-icon-shadow: none;
-    color: #949796; }
+    color: #939695; }
   row:selected button:insensitive {
-    color: #949796;
+    color: #939695;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #333636);
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    row:selected button:insensitive > .label, row:selected headerbar button.titlebutton:insensitive > .label,
-    row:selected .titlebar button.titlebutton:insensitive > .label {
+    row:selected button:insensitive > .label {
       color: inherit; }
     row:selected button:insensitive:active, row:selected button:insensitive:checked {
-      color: #949796;
+      color: #939695;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #313434, #333636);
+      background-image: linear-gradient(to bottom, #2f3333, #323636);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      row:selected button:insensitive:active > .label, row:selected headerbar button.titlebutton:insensitive:active > .label,
-      row:selected .titlebar button.titlebutton:insensitive:active > .label, row:selected button:insensitive:checked > .label, row:selected headerbar button.titlebutton:insensitive:checked > .label,
-      row:selected .titlebar button.titlebutton:insensitive:checked > .label {
+      row:selected button:insensitive:active > .label, row:selected button:insensitive:checked > .label {
         color: inherit; }
 
 row {
@@ -3792,9 +3730,9 @@ row {
     .app-notification button:insensitive, .app-notification button:backdrop:insensitive,
     .app-notification.frame button:insensitive,
     .app-notification.frame button:backdrop:insensitive {
-      color: #878a89;
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -3837,17 +3775,17 @@ calendar {
     calendar.button:hover {
       color: #eeeeec; }
     calendar.button:backdrop {
-      color: rgba(148, 151, 150, 0.45); }
+      color: rgba(147, 150, 149, 0.45); }
     calendar.button:insensitive {
-      color: rgba(148, 151, 150, 0.45); }
+      color: rgba(147, 150, 149, 0.45); }
   calendar:inconsistent, calendar:inconsistent:backdrop {
     color: alpha(currentColor,0.55); }
   calendar.highlight, calendar.highlight:backdrop {
     font-size: smaller;
     color: #eeeeec; }
   calendar:backdrop {
-    color: #d5d5d5;
-    border-color: #1f2222; }
+    color: #d4d4d4;
+    border-color: #1e2222; }
 
 /***********
  * Dialogs *
@@ -3890,31 +3828,29 @@ messagedialog.csd .dialog-action-area button {
     -gtk-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); }
   messagedialog.csd .dialog-action-area button:insensitive {
-    color: #949796;
+    color: #939695;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #333636);
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    messagedialog.csd .dialog-action-area button:insensitive > .label, messagedialog.csd .dialog-action-area headerbar button.titlebutton:insensitive > .label,
-    messagedialog.csd .dialog-action-area .titlebar button.titlebutton:insensitive > .label {
+    messagedialog.csd .dialog-action-area button:insensitive > .label {
       color: inherit; }
   messagedialog.csd .dialog-action-area button:backdrop {
-    color: #949796;
-    border-color: #1f2222;
+    color: #939695;
+    border-color: #1e2222;
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   messagedialog.csd .dialog-action-area button:backdrop:insensitive {
     color: #5d6767;
-    border-color: #1f2222;
-    background-image: linear-gradient(to bottom, #333636);
+    border-color: #1e2222;
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    messagedialog.csd .dialog-action-area button:backdrop:insensitive > .label, messagedialog.csd .dialog-action-area headerbar button.titlebutton:backdrop:insensitive > .label,
-    messagedialog.csd .dialog-action-area .titlebar button.titlebutton:backdrop:insensitive > .label {
+    messagedialog.csd .dialog-action-area button:backdrop:insensitive > .label {
       color: inherit; }
   messagedialog.csd .dialog-action-area button.suggested-action {
     color: white;
@@ -3941,7 +3877,7 @@ messagedialog.csd .dialog-action-area button {
       -gtk-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); }
     messagedialog.csd .dialog-action-area button.suggested-action:backdrop {
-      color: #d3dfeb;
+      color: #d2deeb;
       border-color: #0b1e33;
       background-image: linear-gradient(to bottom, #215d9c);
       text-shadow: none;
@@ -3949,23 +3885,21 @@ messagedialog.csd .dialog-action-area button {
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       messagedialog.csd .dialog-action-area button.suggested-action:backdrop:insensitive {
         color: #5d6767;
-        border-color: #1f2222;
-        background-image: linear-gradient(to bottom, #333636);
+        border-color: #1e2222;
+        background-image: linear-gradient(to bottom, #323636);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        messagedialog.csd .dialog-action-area button.suggested-action:backdrop:insensitive > .label, messagedialog.csd .dialog-action-area headerbar button.suggested-action.titlebutton:backdrop:insensitive > .label,
-        messagedialog.csd .dialog-action-area .titlebar button.suggested-action.titlebutton:backdrop:insensitive > .label {
+        messagedialog.csd .dialog-action-area button.suggested-action:backdrop:insensitive > .label {
           color: inherit; }
     messagedialog.csd .dialog-action-area button.suggested-action:insensitive {
-      color: #949796;
+      color: #939695;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #333636);
+      background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      messagedialog.csd .dialog-action-area button.suggested-action:insensitive > .label, messagedialog.csd .dialog-action-area headerbar button.suggested-action.titlebutton:insensitive > .label,
-      messagedialog.csd .dialog-action-area .titlebar button.suggested-action.titlebutton:insensitive > .label {
+      messagedialog.csd .dialog-action-area button.suggested-action:insensitive > .label {
         color: inherit; }
   messagedialog.csd .dialog-action-area button.destructive-action {
     color: white;
@@ -3992,7 +3926,7 @@ messagedialog.csd .dialog-action-area button {
       -gtk-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); }
     messagedialog.csd .dialog-action-area button.destructive-action:backdrop {
-      color: #f7cfcf;
+      color: #f6cfcf;
       border-color: #5e0707;
       background-image: linear-gradient(to bottom, #d51010);
       text-shadow: none;
@@ -4000,23 +3934,21 @@ messagedialog.csd .dialog-action-area button {
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       messagedialog.csd .dialog-action-area button.destructive-action:backdrop:insensitive {
         color: #5d6767;
-        border-color: #1f2222;
-        background-image: linear-gradient(to bottom, #333636);
+        border-color: #1e2222;
+        background-image: linear-gradient(to bottom, #323636);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        messagedialog.csd .dialog-action-area button.destructive-action:backdrop:insensitive > .label, messagedialog.csd .dialog-action-area headerbar button.destructive-action.titlebutton:backdrop:insensitive > .label,
-        messagedialog.csd .dialog-action-area .titlebar button.destructive-action.titlebutton:backdrop:insensitive > .label {
+        messagedialog.csd .dialog-action-area button.destructive-action:backdrop:insensitive > .label {
           color: inherit; }
     messagedialog.csd .dialog-action-area button.destructive-action:insensitive {
-      color: #949796;
+      color: #939695;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #333636);
+      background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      messagedialog.csd .dialog-action-area button.destructive-action:insensitive > .label, messagedialog.csd .dialog-action-area headerbar button.destructive-action.titlebutton:insensitive > .label,
-      messagedialog.csd .dialog-action-area .titlebar button.destructive-action.titlebutton:insensitive > .label {
+      messagedialog.csd .dialog-action-area button.destructive-action:insensitive > .label {
         color: inherit; }
 messagedialog.csd .dialog-action-area button, messagedialog.csd .dialog-action-area button:hover, messagedialog.csd .dialog-action-area button:active, messagedialog.csd .dialog-action-area button:insensitive, messagedialog.csd .dialog-action-area button:backdrop, messagedialog.csd .dialog-action-area button:backdrop:insensitive, messagedialog.csd .dialog-action-area button.suggested-action, messagedialog.csd .dialog-action-area button.suggested-action:hover, messagedialog.csd .dialog-action-area button.suggested-action:active, messagedialog.csd .dialog-action-area button.suggested-action:backdrop, messagedialog.csd .dialog-action-area button.suggested-action:backdrop:insensitive, messagedialog.csd .dialog-action-area button.suggested-action:insensitive, messagedialog.csd .dialog-action-area button.destructive-action, messagedialog.csd .dialog-action-area button.destructive-action:hover, messagedialog.csd .dialog-action-area button.destructive-action:active, messagedialog.csd .dialog-action-area button.destructive-action:backdrop, messagedialog.csd .dialog-action-area button.destructive-action:backdrop:insensitive, messagedialog.csd .dialog-action-area button.destructive-action:insensitive {
   border-left-style: solid;
@@ -4033,7 +3965,7 @@ messagedialog.csd .dialog-action-area button:first-child {
 GtkFileChooserDialog .dialog-action-box {
   border-top: 1px solid #1c1f1f; }
   GtkFileChooserDialog .dialog-action-box:backdrop {
-    border-top-color: #1f2222; }
+    border-top-color: #1e2222; }
 
 /***********
  * Sidebar *
@@ -4042,7 +3974,7 @@ GtkFileChooserDialog .dialog-action-box {
   border: none;
   background-color: #313434; }
   .sidebar:backdrop {
-    background-color: #333636; }
+    background-color: #323535; }
 
 stacksidebar row {
   padding: 10px 4px; }
@@ -4074,9 +4006,7 @@ placessidebar row {
     padding: 5px;
     border-radius: 100%;
     outline-radius: 100%; }
-    button.sidebar-button:not(:hover):not(:active) > image, headerbar button.sidebar-button.titlebutton:not(:hover):not(:active) > image,
-    .titlebar button.sidebar-button.titlebutton:not(:hover):not(:active) > image, button.sidebar-button:backdrop > image, headerbar button.sidebar-button.titlebutton:backdrop > image,
-    .titlebar button.sidebar-button.titlebutton:backdrop > image {
+    button.sidebar-button:not(:hover):not(:active) > image, button.sidebar-button:backdrop > image {
       opacity: 0.7; }
 placessidebar row:selected:active {
   box-shadow: none; }
@@ -4107,7 +4037,7 @@ paned {
   paned separator {
     background-color: #1c1f1f; }
     paned separator:backdrop {
-      background-color: #1f2222; }
+      background-color: #1e2222; }
   paned separator:selected {
     background-color: #215d9c; }
 
@@ -4122,7 +4052,7 @@ paned.wide {
   paned.wide.vertical separator {
     border-style: solid none; }
   paned.wide separator:backdrop {
-    border-color: #1f2222; }
+    border-color: #1e2222; }
 
 /**************
  * GtkInfoBar *
@@ -4189,29 +4119,22 @@ infobar {
     .question button:insensitive,
     .warning button:insensitive,
     .error button:insensitive {
-      color: #91aac5;
+      color: #90aac4;
       border-color: #0b1e33;
-      background-image: linear-gradient(to bottom, #22558b);
+      background-image: linear-gradient(to bottom, #22558a);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .info button:insensitive > .label, .info headerbar button.titlebutton:insensitive > .label,
-      .info .titlebar button.titlebutton:insensitive > .label,
+      .info button:insensitive > .label,
       .question button:insensitive > .label,
-      .question headerbar button.titlebutton:insensitive > .label,
-      .question .titlebar button.titlebutton:insensitive > .label,
       .warning button:insensitive > .label,
-      .warning headerbar button.titlebutton:insensitive > .label,
-      .warning .titlebar button.titlebutton:insensitive > .label,
-      .error button:insensitive > .label,
-      .error headerbar button.titlebutton:insensitive > .label,
-      .error .titlebar button.titlebutton:insensitive > .label {
+      .error button:insensitive > .label {
         color: inherit; }
     .info button:backdrop,
     .question button:backdrop,
     .warning button:backdrop,
     .error button:backdrop {
-      color: #d3dfeb;
+      color: #d2deeb;
       border-color: #0b1e33;
       background-image: linear-gradient(to bottom, #215d9c);
       text-shadow: none;
@@ -4222,24 +4145,17 @@ infobar {
       .question button:backdrop:insensitive,
       .warning button:backdrop:insensitive,
       .error button:backdrop:insensitive {
-        color: #6f91b4;
+        color: #6f90b2;
         border-color: #0b1e33;
-        background-image: linear-gradient(to bottom, #22558b);
+        background-image: linear-gradient(to bottom, #22558a);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         border-color: #0b1e33; }
-        .info button:backdrop:insensitive > .label, .info headerbar button.titlebutton:backdrop:insensitive > .label,
-        .info .titlebar button.titlebutton:backdrop:insensitive > .label,
+        .info button:backdrop:insensitive > .label,
         .question button:backdrop:insensitive > .label,
-        .question headerbar button.titlebutton:backdrop:insensitive > .label,
-        .question .titlebar button.titlebutton:backdrop:insensitive > .label,
         .warning button:backdrop:insensitive > .label,
-        .warning headerbar button.titlebutton:backdrop:insensitive > .label,
-        .warning .titlebar button.titlebutton:backdrop:insensitive > .label,
-        .error button:backdrop:insensitive > .label,
-        .error headerbar button.titlebutton:backdrop:insensitive > .label,
-        .error .titlebar button.titlebutton:backdrop:insensitive > .label {
+        .error button:backdrop:insensitive > .label {
           color: inherit; }
   .info label:selected, .info label:selected:focus, .info label:selected:hover,
   .question label:selected,
@@ -4354,8 +4270,8 @@ colorswatch {
       -gtk-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); }
     colorswatch#add-color-button:backdrop {
-      color: #949796;
-      border-color: #1f2222;
+      color: #939695;
+      border-color: #1e2222;
       background-image: linear-gradient(to bottom, #393f3f);
       text-shadow: none;
       -gtk-icon-shadow: none;
@@ -4425,7 +4341,7 @@ decoration {
     border-radius: 0;
     margin: 4px;
     background-color: #393f3f;
-    border: solid 1px #1f2222;
+    border: solid 1px #1e2222;
     box-shadow: none; }
 
 headerbar button.titlebutton,
@@ -4455,7 +4371,7 @@ textview text selection, textview text selection:focus,
   textview text selection:insensitive,
   .view selection:insensitive, iconview:insensitive:selected, flowbox flowboxchild:insensitive:selected, label selection:insensitive, entry selection:insensitive, spinbutton selection:insensitive, modelbutton.flat:insensitive:selected,
   .menuitem.button.flat:insensitive:selected, treeview.view:insensitive:selected, row:insensitive:selected, .sidebar :insensitive:selected, placessidebar row:selected:insensitive label {
-    color: #90aece; }
+    color: #90aecd; }
   textview text selection:backdrop,
   .view selection:backdrop, iconview:backdrop:selected, flowbox flowboxchild:backdrop:selected, label selection:backdrop, entry selection:backdrop, spinbutton selection:backdrop, modelbutton.flat:backdrop:selected,
   .menuitem.button.flat:backdrop:selected, treeview.view:backdrop:selected, row:backdrop:selected, .sidebar :backdrop:selected {
@@ -4463,7 +4379,7 @@ textview text selection, textview text selection:focus,
     textview text selection:backdrop:insensitive,
     .view selection:backdrop:insensitive, iconview:backdrop:insensitive:selected, flowbox flowboxchild:backdrop:insensitive:selected, label selection:backdrop:insensitive, entry selection:backdrop:insensitive, spinbutton selection:backdrop:insensitive, modelbutton.flat:backdrop:insensitive:selected,
     .menuitem.button.flat:backdrop:insensitive:selected, treeview.view:backdrop:insensitive:selected, row:backdrop:insensitive:selected, .sidebar :backdrop:insensitive:selected, placessidebar row:selected:insensitive label:backdrop, placessidebar row:selected:backdrop:insensitive label {
-      color: #648eba; }
+      color: #638db9; }
 
 .monospace {
   font: Monospace; }
@@ -4547,9 +4463,9 @@ popover.touch-selection {
       -gtk-icon-shadow: none;
       outline-color: rgba(238, 238, 236, 0.3); }
     popover.touch-selection button:insensitive, popover.touch-selection button:backdrop:insensitive {
-      color: #878a89;
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -4681,16 +4597,16 @@ text/foreground color of selections */
 @define-color theme_selected_fg_color #ffffff;
 /*
 base background color of insensitive widgets */
-@define-color insensitive_bg_color #333636;
+@define-color insensitive_bg_color #323636;
 /*
 text foreground color of insensitive widgets */
-@define-color insensitive_fg_color #949796;
+@define-color insensitive_fg_color #939695;
 /*
 insensitive text widgets and the like base background color */
 @define-color insensitive_base_color #292929;
 /*
 widget text/foreground color on backdrop windows */
-@define-color theme_unfocused_fg_color #949796;
+@define-color theme_unfocused_fg_color #939695;
 /*
 text color for entries, views and content in general on backdrop windows */
 @define-color theme_unfocused_text_color white;
@@ -4711,7 +4627,7 @@ widgets main borders color */
 @define-color borders #1c1f1f;
 /*
 widgets main borders color on backdrop windows */
-@define-color unfocused_borders #1f2222;
+@define-color unfocused_borders #1e2222;
 /*
 these are pretty self explicative */
 @define-color warning_color #f57900;
@@ -4721,7 +4637,7 @@ these are pretty self explicative */
 these colors are exported for the window manager and shouldn't be used in applications,
 read if you used those and something break with a version upgrade you're on your own... */
 @define-color wm_title shade(#eeeeec, 1.8);
-@define-color wm_unfocused_title #949796;
+@define-color wm_unfocused_title #939695;
 @define-color wm_highlight transparent;
 @define-color wm_borders_edge rgba(238, 238, 236, 0.1);
 @define-color wm_bg_a shade(#393f3f, 1.2);
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 2578e65e2a..22691c1919 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -30,7 +30,7 @@
   .background:backdrop {
     text-shadow: none;
     -gtk-icon-shadow: none;
-    color: #8e9192;
+    color: #8d9091;
     background-color: #ededed; }
 
 /*
@@ -49,11 +49,11 @@
     background-color: white;
     color: #2e3436; }
   .gtkstyle-fallback:active {
-    background-color: #d4d4d4;
+    background-color: lightgray;
     color: #2e3436; }
   .gtkstyle-fallback:insensitive {
     background-color: #f4f4f4;
-    color: #8e9192; }
+    color: #8d9091; }
   .gtkstyle-fallback:selected {
     background-color: #4a90d9;
     color: #ffffff; }
@@ -64,14 +64,14 @@ textview text,
   background-color: #ffffff; }
   textview text:backdrop,
   .view:backdrop {
-    color: #333333;
+    color: #323232;
     background-color: white; }
 
 iconview {
   color: black;
   background-color: #ffffff; }
   iconview:backdrop {
-    color: #333333;
+    color: #323232;
     background-color: white; }
 
 .rubberband,
@@ -91,9 +91,9 @@ flowbox flowboxchild {
 label.separator {
   color: #2e3436; }
   label.separator:backdrop {
-    color: #8e9192; }
+    color: #8d9091; }
 label:insensitive {
-  color: #8e9192; }
+  color: #8d9091; }
   label:insensitive:backdrop {
     color: #c7c7c7; }
 
@@ -111,13 +111,13 @@ assistant .sidebar {
     border-left: 1px solid #a1a1a1; }
   assistant .sidebar:backdrop {
     background-color: white;
-    border-color: darkgray; }
+    border-color: #a8a8a8; }
 assistant.csd .sidebar {
   border-top-style: none; }
 assistant .sidebar label {
   padding: 6px 12px; }
 assistant .sidebar label.highlight {
-  background-color: #c7c8c8; }
+  background-color: #c6c8c8; }
 
 textview {
   background-color: #f6f6f6; }
@@ -153,10 +153,10 @@ spinner {
   background: none;
   opacity: 0;
   -gtk-icon-source: -gtk-icontheme("process-working-symbolic"); }
-  spinner:active {
+  spinner:checked {
     opacity: 1;
     animation: spin 1s linear infinite; }
-    spinner:active:insensitive {
+    spinner:checked:insensitive {
       opacity: 0.5; }
 
 /****************
@@ -195,22 +195,22 @@ entry, spinbutton {
   entry:insensitive, spinbutton:insensitive {
     background-color: transparent;
     background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
-    color: #8e9192;
+    color: #8d9091;
     border-color: #a1a1a1;
     background-image: linear-gradient(to bottom, #f4f4f4);
     box-shadow: 0 1px white; }
   entry:backdrop, spinbutton:backdrop {
     background-color: transparent;
     background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
-    color: #333333;
-    border-color: darkgray;
+    color: #323232;
+    border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, white);
     box-shadow: 0 1px rgba(255, 255, 255, 0); }
   entry:backdrop:insensitive, spinbutton:backdrop:insensitive {
     background-color: transparent;
     background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
     color: #c7c7c7;
-    border-color: darkgray;
+    border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #f4f4f4);
     box-shadow: 0 1px rgba(255, 255, 255, 0); }
   entry progress, spinbutton progress {
@@ -247,13 +247,13 @@ entry, spinbutton {
     entry.warning:selected, spinbutton.warning:selected, entry.warning:selected:focus, spinbutton.warning:selected:focus {
       background-color: #f57900; }
   entry image, spinbutton image {
-    color: #585d5e; }
+    color: #575c5e; }
     entry image:hover, spinbutton image:hover {
       color: #2e3436; }
     entry image:active, spinbutton image:active {
       color: #4a90d9; }
     entry image:backdrop, spinbutton image:backdrop {
-      color: #a5a7a8; }
+      color: #a3a6a7; }
   .osd entry, .osd spinbutton {
     background-color: transparent;
     background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
@@ -287,9 +287,9 @@ entry, spinbutton {
     .osd entry:insensitive, .osd spinbutton:insensitive {
       background-color: transparent;
       background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
-      color: #878a89;
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -300,10 +300,10 @@ entry, spinbutton {
 .linked.vertical > entry:focus:not(:last-child), .linked.vertical > spinbutton:focus:not(:last-child) {
   box-shadow: inset 0 0 0 1px #4a90d9; }
 .linked.vertical > entry:not(:insensitive) + entry:not(:insensitive), .linked.vertical > spinbutton:not(:insensitive) + entry:not(:insensitive), .linked.vertical > entry:not(:insensitive) + spinbutton:not(:insensitive), .linked.vertical > spinbutton:not(:insensitive) + spinbutton:not(:insensitive) {
-  border-top-color: #e3e3e3;
+  border-top-color: #e2e2e2;
   background-image: linear-gradient(to bottom, #ffffff); }
   .linked.vertical > entry:not(:insensitive) + entry:not(:insensitive):backdrop, .linked.vertical > spinbutton:not(:insensitive) + entry:not(:insensitive):backdrop, .linked.vertical > entry:not(:insensitive) + spinbutton:not(:insensitive):backdrop, .linked.vertical > spinbutton:not(:insensitive) + spinbutton:not(:insensitive):backdrop {
-    border-top-color: #e5e5e5;
+    border-top-color: #e4e4e4;
     background-image: linear-gradient(to bottom, white); }
 .linked.vertical > entry + entry:focus:not(:last-child), .linked.vertical > spinbutton + entry:focus:not(:last-child), .linked.vertical > entry + spinbutton:focus:not(:last-child), .linked.vertical > spinbutton + spinbutton:focus:not(:last-child) {
   border-top-color: #4a90d9;
@@ -378,8 +378,8 @@ button, headerbar button.titlebutton,
   button:backdrop, headerbar button.titlebutton:backdrop,
   .titlebar button.titlebutton:backdrop, button.flat:backdrop, button.sidebar-button:backdrop, headerbar button.titlebutton:backdrop,
   .titlebar button.titlebutton:backdrop {
-    color: #8e9192;
-    border-color: darkgray;
+    color: #8d9091;
+    border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #ededed);
     text-shadow: none;
     -gtk-icon-shadow: none;
@@ -388,32 +388,29 @@ button, headerbar button.titlebutton,
     button:backdrop:active, button:backdrop:checked, button.flat:backdrop:active, button.sidebar-button:backdrop:active, headerbar button.titlebutton:backdrop:active,
     .titlebar button.titlebutton:backdrop:active, button.flat:backdrop:checked, button.sidebar-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);
+      color: #8d9091;
+      border-color: #a8a8a8;
+      background-image: linear-gradient(to bottom, #d4d4d4);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
     button:backdrop:insensitive, button.flat:backdrop:insensitive, button.sidebar-button:backdrop:insensitive, headerbar button.titlebutton:backdrop:insensitive,
     .titlebar button.titlebutton:backdrop:insensitive {
       color: #c7c7c7;
-      border-color: darkgray;
+      border-color: #a8a8a8;
       background-image: linear-gradient(to bottom, #f4f4f4);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-      button:backdrop:insensitive > .label, headerbar button.titlebutton:backdrop:insensitive > .label,
-      .titlebar button.titlebutton:backdrop:insensitive > .label, button.flat:backdrop:insensitive > .label, button.sidebar-button:backdrop:insensitive > .label, headerbar button.titlebutton:backdrop:insensitive > .label,
+      button:backdrop:insensitive > .label, button.flat:backdrop:insensitive > .label, button.sidebar-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, button.sidebar-button:backdrop:insensitive:active, headerbar button.titlebutton:backdrop:insensitive:active,
     .titlebar button.titlebutton:backdrop:insensitive:active, button.flat:backdrop:insensitive:checked, button.sidebar-button:backdrop:insensitive:checked, headerbar button.titlebutton:backdrop:insensitive:checked,
     .titlebar button.titlebutton:backdrop:insensitive:checked {
       color: #c7c7c7;
-      border-color: darkgray;
+      border-color: #a8a8a8;
       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, 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, button.sidebar-button:backdrop:insensitive:active > .label, headerbar button.titlebutton:backdrop:insensitive:active > .label,
+      button:backdrop:insensitive:active > .label, button:backdrop:insensitive:checked > .label, button.flat:backdrop:insensitive:active > .label, button.sidebar-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, button.sidebar-button:backdrop:insensitive:checked > .label, headerbar button.titlebutton:backdrop:insensitive:checked > .label,
       .titlebar button.titlebutton:backdrop:insensitive:checked > .label {
         color: inherit; }
@@ -429,23 +426,20 @@ button, headerbar button.titlebutton,
     -gtk-icon-shadow: none; }
   button:insensitive, headerbar button.titlebutton:insensitive,
   .titlebar button.titlebutton:insensitive {
-    color: #8e9192;
+    color: #8d9091;
     border-color: #a1a1a1;
     background-image: linear-gradient(to bottom, #f4f4f4);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
-    button:insensitive > .label, headerbar button.titlebutton:insensitive > .label,
-    .titlebar button.titlebutton:insensitive > .label {
+    button:insensitive > .label {
       color: inherit; }
     button:insensitive:active, button:insensitive:checked {
-      color: #8e9192;
+      color: #8d9091;
       border-color: #a1a1a1;
-      background-image: linear-gradient(to bottom, #ececec, #f4f4f4);
+      background-image: linear-gradient(to bottom, #ebebeb, #f4f4f4);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
-      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 {
+      button:insensitive:active > .label, button:insensitive:checked > .label {
         color: inherit; }
   button.osd, headerbar button.osd.titlebutton,
   .titlebar button.osd.titlebutton {
@@ -488,9 +482,9 @@ button, headerbar button.titlebutton,
       border: none;
       box-shadow: none; }
     button.osd:insensitive, button.osd:backdrop:insensitive {
-      color: #878a89;
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -535,9 +529,9 @@ button, headerbar button.titlebutton,
       -gtk-icon-shadow: none;
       outline-color: rgba(238, 238, 236, 0.3); }
     .osd button:insensitive, .osd button:backdrop:insensitive {
-      color: #878a89;
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -579,9 +573,9 @@ button, headerbar button.titlebutton,
       .osd button.flat:insensitive, .osd button.sidebar-button:insensitive, .osd headerbar button.titlebutton:insensitive, headerbar .osd button.titlebutton:insensitive,
       .osd .titlebar button.titlebutton:insensitive,
       .titlebar .osd button.titlebutton:insensitive {
-        color: #878a89;
+        color: #878989;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -650,7 +644,7 @@ button, headerbar button.titlebutton,
       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, button.suggested-action.sidebar-button:backdrop, headerbar button.suggested-action.titlebutton:backdrop,
     .titlebar button.suggested-action.titlebutton:backdrop {
-      color: #dbe9f7;
+      color: #dae8f7;
       border-color: #4a90d9;
       background-image: linear-gradient(to bottom, #4a90d9);
       text-shadow: none;
@@ -659,32 +653,29 @@ button, headerbar button.titlebutton,
       button.suggested-action:backdrop:active, button.suggested-action:backdrop:checked, button.suggested-action.flat:backdrop:active, button.suggested-action.sidebar-button:backdrop:active, headerbar button.suggested-action.titlebutton:backdrop:active,
       .titlebar button.suggested-action.titlebutton:backdrop:active, button.suggested-action.flat:backdrop:checked, button.suggested-action.sidebar-button:backdrop:checked, headerbar button.suggested-action.titlebutton:backdrop:checked,
       .titlebar button.suggested-action.titlebutton:backdrop:checked {
-        color: #d4e4f4;
+        color: #d4e3f3;
         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, button.suggested-action.sidebar-button:backdrop:insensitive, headerbar button.suggested-action.titlebutton:backdrop:insensitive,
       .titlebar button.suggested-action.titlebutton:backdrop:insensitive {
         color: #c7c7c7;
-        border-color: darkgray;
+        border-color: #a8a8a8;
         background-image: linear-gradient(to bottom, #f4f4f4);
         text-shadow: none;
         -gtk-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, headerbar button.suggested-action.titlebutton:backdrop:insensitive > .label,
-        .titlebar button.suggested-action.titlebutton:backdrop:insensitive > .label, button.suggested-action.flat:backdrop:insensitive > .label, button.suggested-action.sidebar-button:backdrop:insensitive > .label, headerbar button.suggested-action.titlebutton:backdrop:insensitive > .label,
+        button.suggested-action:backdrop:insensitive > .label, button.suggested-action.flat:backdrop:insensitive > .label, button.suggested-action.sidebar-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, button.suggested-action.sidebar-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, button.suggested-action.sidebar-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);
+          color: #8db8e6;
+          border-color: #5093da;
+          background-image: linear-gradient(to bottom, #5093da);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-          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, button.suggested-action.sidebar-button:backdrop:insensitive:active > .label, headerbar button.suggested-action.titlebutton:backdrop:insensitive:active > .label,
+          button.suggested-action:backdrop:insensitive:active > .label, button.suggested-action:backdrop:insensitive:checked > .label, button.suggested-action.flat:backdrop:insensitive:active > .label, button.suggested-action.sidebar-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, button.suggested-action.sidebar-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; }
@@ -700,23 +691,20 @@ button, headerbar button.titlebutton,
       -gtk-icon-shadow: none;
       color: rgba(74, 144, 217, 0.8); }
     button.suggested-action:insensitive {
-      color: #8e9192;
+      color: #8d9091;
       border-color: #a1a1a1;
       background-image: linear-gradient(to bottom, #f4f4f4);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
-      button.suggested-action:insensitive > .label, headerbar button.suggested-action.titlebutton:insensitive > .label,
-      .titlebar button.suggested-action.titlebutton:insensitive > .label {
+      button.suggested-action:insensitive > .label {
         color: inherit; }
       button.suggested-action:insensitive:active, button.suggested-action:insensitive:checked {
-        color: #b9d4f1;
+        color: #b9d3f0;
         border-color: #1c5187;
-        background-image: linear-gradient(to bottom, #4b8dd3, #5094db);
+        background-image: linear-gradient(to bottom, #4a8cd1, #5093da);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
-        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 {
+        button.suggested-action:insensitive:active > .label, button.suggested-action:insensitive:checked > .label {
           color: inherit; }
     .osd button.suggested-action {
       color: #eeeeec;
@@ -746,9 +734,9 @@ button, headerbar button.titlebutton,
         -gtk-icon-shadow: none;
         outline-color: rgba(238, 238, 236, 0.3); }
       .osd button.suggested-action:insensitive, .osd button.suggested-action:backdrop:insensitive {
-        color: #878a89;
+        color: #878989;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -797,7 +785,7 @@ button, headerbar button.titlebutton,
       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, button.destructive-action.sidebar-button:backdrop, headerbar button.destructive-action.titlebutton:backdrop,
     .titlebar button.destructive-action.titlebutton:backdrop {
-      color: #fcd4d4;
+      color: #fbd4d4;
       border-color: #ef2929;
       background-image: linear-gradient(to bottom, #ef2929);
       text-shadow: none;
@@ -806,32 +794,29 @@ button, headerbar button.titlebutton,
       button.destructive-action:backdrop:active, button.destructive-action:backdrop:checked, button.destructive-action.flat:backdrop:active, button.destructive-action.sidebar-button:backdrop:active, headerbar button.destructive-action.titlebutton:backdrop:active,
       .titlebar button.destructive-action.titlebutton:backdrop:active, button.destructive-action.flat:backdrop:checked, button.destructive-action.sidebar-button:backdrop:checked, headerbar button.destructive-action.titlebutton:backdrop:checked,
       .titlebar button.destructive-action.titlebutton:backdrop:checked {
-        color: #f7cfcf;
+        color: #f6cfcf;
         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, button.destructive-action.sidebar-button:backdrop:insensitive, headerbar button.destructive-action.titlebutton:backdrop:insensitive,
       .titlebar button.destructive-action.titlebutton:backdrop:insensitive {
         color: #c7c7c7;
-        border-color: darkgray;
+        border-color: #a8a8a8;
         background-image: linear-gradient(to bottom, #f4f4f4);
         text-shadow: none;
         -gtk-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, headerbar button.destructive-action.titlebutton:backdrop:insensitive > .label,
-        .titlebar button.destructive-action.titlebutton:backdrop:insensitive > .label, button.destructive-action.flat:backdrop:insensitive > .label, button.destructive-action.sidebar-button:backdrop:insensitive > .label, headerbar button.destructive-action.titlebutton:backdrop:insensitive > .label,
+        button.destructive-action:backdrop:insensitive > .label, button.destructive-action.flat:backdrop:insensitive > .label, button.destructive-action.sidebar-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, button.destructive-action.sidebar-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, button.destructive-action.sidebar-button:backdrop:insensitive:checked, headerbar button.destructive-action.titlebutton:backdrop:insensitive:checked,
         .titlebar button.destructive-action.titlebutton:backdrop:insensitive:checked {
-          color: #f57979;
+          color: #f47979;
           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, 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, button.destructive-action.sidebar-button:backdrop:insensitive:active > .label, headerbar button.destructive-action.titlebutton:backdrop:insensitive:active > .label,
+          button.destructive-action:backdrop:insensitive:active > .label, button.destructive-action:backdrop:insensitive:checked > .label, button.destructive-action.flat:backdrop:insensitive:active > .label, button.destructive-action.sidebar-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, button.destructive-action.sidebar-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; }
@@ -847,23 +832,20 @@ button, headerbar button.titlebutton,
       -gtk-icon-shadow: none;
       color: rgba(239, 41, 41, 0.8); }
     button.destructive-action:insensitive {
-      color: #8e9192;
+      color: #8d9091;
       border-color: #a1a1a1;
       background-image: linear-gradient(to bottom, #f4f4f4);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
-      button.destructive-action:insensitive > .label, headerbar button.destructive-action.titlebutton:insensitive > .label,
-      .titlebar button.destructive-action.titlebutton:insensitive > .label {
+      button.destructive-action:insensitive > .label {
         color: inherit; }
       button.destructive-action:insensitive:active, button.destructive-action:insensitive:checked {
-        color: #f9adad;
+        color: #f8acac;
         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, 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 {
+        button.destructive-action:insensitive:active > .label, button.destructive-action:insensitive:checked > .label {
           color: inherit; }
     .osd button.destructive-action {
       color: #eeeeec;
@@ -893,9 +875,9 @@ button, headerbar button.titlebutton,
         -gtk-icon-shadow: none;
         outline-color: rgba(238, 238, 236, 0.3); }
       .osd button.destructive-action:insensitive, .osd button.destructive-action:backdrop:insensitive {
-        color: #878a89;
+        color: #878989;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -942,11 +924,7 @@ button, headerbar button.titlebutton,
       padding-top: 3px;
       padding-bottom: 3px; }
     .stack-switcher > button.text-button, .stack-switcher > GtkScaleButton.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 {
+    .stack-switcher > GtkVolumeButton.button.text-button {
       padding: 5px 10px 6px; }
     .stack-switcher > button.image-button, headerbar .stack-switcher > button.titlebutton,
     .titlebar .stack-switcher > button.titlebutton {
@@ -975,7 +953,7 @@ button, headerbar button.titlebutton,
   .stack-switcher > button.needs-attention > label:dir(rtl), .stack-switcher > button.needs-attention > image:dir(rtl), stacksidebar row.needs-attention > label:dir(rtl) {
     background-position: left 3px, left 4px; }
 
-.inline-toolbar toolbutton > button, .inline-toolbar headerbar toolbutton > button.titlebutton,
+.inline-toolbar toolbutton > button,
 .inline-toolbar .titlebar toolbutton > button.titlebutton,
 .titlebar .inline-toolbar toolbutton > button.titlebutton {
   color: #2e3436;
@@ -985,8 +963,7 @@ button, headerbar button.titlebutton,
   text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   box-shadow: inset 0 1px white, 0 1px white; }
-  .inline-toolbar toolbutton > button:hover, .inline-toolbar headerbar toolbutton > button.titlebutton:hover,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:hover {
+  .inline-toolbar toolbutton > button:hover {
     color: #2e3436;
     outline-color: rgba(46, 52, 54, 0.3);
     border-color: #a1a1a1;
@@ -994,9 +971,7 @@ button, headerbar button.titlebutton,
     text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     box-shadow: inset 0 1px white, 0 1px white; }
-  .inline-toolbar toolbutton > button:active, .inline-toolbar headerbar toolbutton > button.titlebutton:active,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:active, .inline-toolbar toolbutton > button:checked, .inline-toolbar headerbar toolbutton > button.titlebutton:checked,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:checked {
+  .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
     color: #2e3436;
     outline-color: rgba(46, 52, 54, 0.3);
     border-color: #a1a1a1;
@@ -1004,9 +979,8 @@ button, headerbar button.titlebutton,
     text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     -gtk-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 toolbutton > button:insensitive, .inline-toolbar headerbar toolbutton > button.titlebutton:insensitive,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:insensitive {
-    color: #8e9192;
+  .inline-toolbar toolbutton > button:insensitive {
+    color: #8d9091;
     border-color: #a1a1a1;
     background-image: linear-gradient(to bottom, #f4f4f4);
     text-shadow: none;
@@ -1014,45 +988,37 @@ button, headerbar button.titlebutton,
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
     .inline-toolbar toolbutton > button:insensitive > .label {
       color: inherit; }
-  .inline-toolbar toolbutton > button:insensitive:active, .inline-toolbar headerbar toolbutton > button.titlebutton:insensitive:active,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:insensitive:active, .inline-toolbar toolbutton > button:insensitive:checked, .inline-toolbar headerbar toolbutton > button.titlebutton:insensitive:checked,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:insensitive:checked {
-    color: #8e9192;
+  .inline-toolbar toolbutton > button:insensitive:active, .inline-toolbar toolbutton > button:insensitive:checked {
+    color: #8d9091;
     border-color: #a1a1a1;
-    background-image: linear-gradient(to bottom, #ececec, #f4f4f4);
+    background-image: linear-gradient(to bottom, #ebebeb, #f4f4f4);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
     .inline-toolbar toolbutton > button:insensitive:active > .label, .inline-toolbar toolbutton > button:insensitive:checked > .label {
       color: inherit; }
-  .inline-toolbar toolbutton > button:backdrop, .inline-toolbar headerbar toolbutton > button.titlebutton:backdrop,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop {
-    color: #8e9192;
-    border-color: darkgray;
+  .inline-toolbar toolbutton > button:backdrop {
+    color: #8d9091;
+    border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #ededed);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-  .inline-toolbar toolbutton > button:backdrop:active, .inline-toolbar headerbar toolbutton > button.titlebutton:backdrop:active,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop:active, .inline-toolbar toolbutton > button:backdrop:checked, .inline-toolbar headerbar toolbutton > button.titlebutton:backdrop:checked,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop:checked {
-    color: #8e9192;
-    border-color: darkgray;
-    background-image: linear-gradient(to bottom, #d5d5d5);
+  .inline-toolbar toolbutton > button:backdrop:active, .inline-toolbar toolbutton > button:backdrop:checked {
+    color: #8d9091;
+    border-color: #a8a8a8;
+    background-image: linear-gradient(to bottom, #d4d4d4);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-  .inline-toolbar toolbutton > button:backdrop:insensitive, .inline-toolbar headerbar toolbutton > button.titlebutton:backdrop:insensitive,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop:insensitive {
+  .inline-toolbar toolbutton > button:backdrop:insensitive {
     color: #c7c7c7;
-    border-color: darkgray;
+    border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #f4f4f4);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
     .inline-toolbar toolbutton > button:backdrop:insensitive > .label {
       color: inherit; }
-  .inline-toolbar toolbutton > button:backdrop:insensitive:active, .inline-toolbar headerbar toolbutton > button.titlebutton:backdrop:insensitive:active,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop:insensitive:active, .inline-toolbar toolbutton > button:backdrop:insensitive:checked, .inline-toolbar headerbar toolbutton > button.titlebutton:backdrop:insensitive:checked,
-  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop:insensitive:checked {
+  .inline-toolbar toolbutton > button:backdrop:insensitive:active, .inline-toolbar toolbutton > button:backdrop:insensitive:checked {
     color: #c7c7c7;
-    border-color: darkgray;
+    border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #e7e7e7);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
     .inline-toolbar toolbutton > button:backdrop:insensitive:active > .label, .inline-toolbar toolbutton > button:backdrop:insensitive:checked > .label {
@@ -1079,8 +1045,7 @@ headerbar .inline-toolbar toolbutton:backdrop > button.titlebutton,
   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, headerbar .linked > button.titlebutton:first-child,
-.titlebar .linked > button.titlebutton:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, searchbar.inline-toolbar toolbutton:first-child > button.flat,
+.linked:not(.vertical) > entry:first-child, .linked:not(.vertical) > spinbutton:first-child, .inline-toolbar button:first-child, .linked > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, searchbar.inline-toolbar toolbutton:first-child > button.flat,
 .inline-toolbar.location-bar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, searchbar.inline-toolbar toolbutton:first-child > button.sidebar-button,
 .inline-toolbar.location-bar toolbutton:first-child > button.sidebar-button, .inline-toolbar headerbar toolbutton:first-child > button.titlebutton, headerbar .inline-toolbar toolbutton:first-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:first-child > button.titlebutton,
@@ -1099,8 +1064,7 @@ headerbar .inline-toolbar toolbutton:backdrop:first-child > button.titlebutton,
 .titlebar .inline-toolbar toolbutton:backdrop:first-child > button.titlebutton, .linked > combobox:first-child > button.combo {
   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, headerbar .linked > button.titlebutton:last-child,
-.titlebar .linked > button.titlebutton:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, searchbar.inline-toolbar toolbutton:last-child > button.flat,
+.linked:not(.vertical) > entry:last-child, .linked:not(.vertical) > spinbutton:last-child, .inline-toolbar button:last-child, .linked > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, searchbar.inline-toolbar toolbutton:last-child > button.flat,
 .inline-toolbar.location-bar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, searchbar.inline-toolbar toolbutton:last-child > button.sidebar-button,
 .inline-toolbar.location-bar toolbutton:last-child > button.sidebar-button, .inline-toolbar headerbar toolbutton:last-child > button.titlebutton, headerbar .inline-toolbar toolbutton:last-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:last-child > button.titlebutton,
@@ -1120,8 +1084,7 @@ headerbar .inline-toolbar toolbutton:backdrop:last-child > button.titlebutton,
   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, headerbar .linked > button.titlebutton:only-child,
-.titlebar .linked > button.titlebutton:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, searchbar.inline-toolbar toolbutton:only-child > button.flat,
+.linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > spinbutton:only-child, .inline-toolbar button:only-child, .linked > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, searchbar.inline-toolbar toolbutton:only-child > button.flat,
 .inline-toolbar.location-bar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, searchbar.inline-toolbar toolbutton:only-child > button.sidebar-button,
 .inline-toolbar.location-bar toolbutton:only-child > button.sidebar-button, .inline-toolbar headerbar toolbutton:only-child > button.titlebutton, headerbar .inline-toolbar toolbutton:only-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:only-child > button.titlebutton,
@@ -1141,22 +1104,18 @@ headerbar .inline-toolbar toolbutton:backdrop:only-child > button.titlebutton,
   border-radius: 3px;
   border-style: solid; }
 
-.linked.vertical > entry, .linked.vertical > spinbutton, .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 > combobox > button.combo {
+.linked.vertical > entry, .linked.vertical > spinbutton, .linked.vertical > button, .linked.vertical > button:hover, .linked.vertical > button:active, .linked.vertical > button:checked, .linked.vertical > button:backdrop, .linked.vertical > combobox > button.combo {
   border-style: solid solid none solid;
   border-radius: 0; }
 
-.linked.vertical > entry:first-child, .linked.vertical > spinbutton:first-child, .linked.vertical > button:first-child, headerbar .linked.vertical > button.titlebutton:first-child,
-.titlebar .linked.vertical > button.titlebutton:first-child, .linked.vertical > combobox:first-child > button.combo {
+.linked.vertical > entry:first-child, .linked.vertical > spinbutton:first-child, .linked.vertical > button:first-child, .linked.vertical > combobox:first-child > button.combo {
   border-top-left-radius: 3px;
   border-top-right-radius: 3px; }
-.linked.vertical > entry:last-child, .linked.vertical > spinbutton:last-child, .linked.vertical > button:last-child, headerbar .linked.vertical > button.titlebutton:last-child,
-.titlebar .linked.vertical > button.titlebutton:last-child, .linked.vertical > combobox:last-child > button.combo {
+.linked.vertical > entry:last-child, .linked.vertical > spinbutton:last-child, .linked.vertical > button:last-child, .linked.vertical > combobox:last-child > button.combo {
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border-style: solid; }
-.linked.vertical > entry:only-child, .linked.vertical > spinbutton:only-child, .linked.vertical > button:only-child, headerbar .linked.vertical > button.titlebutton:only-child,
-.titlebar .linked.vertical > button.titlebutton:only-child, .linked.vertical > combobox:only-child > button.combo {
+.linked.vertical > entry:only-child, .linked.vertical > spinbutton:only-child, .linked.vertical > button:only-child, .linked.vertical > combobox:only-child > button.combo {
   border-radius: 3px;
   border-style: solid; }
 
@@ -1206,7 +1165,7 @@ modelbutton.flat,
   outline-offset: -1px; }
   modelbutton.flat:hover,
   .menuitem.button.flat:hover {
-    background-color: #dadbdb; }
+    background-color: #d9dada; }
 
 button.color, headerbar button.color.titlebutton,
 .titlebar button.color.titlebutton {
@@ -1230,21 +1189,21 @@ button.color, headerbar button.color.titlebutton,
     *: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; }
+      color: #b6d2ef; }
   *:link:hover, button:hover:link, button:hover:visited {
     color: #4a90d9; }
     *:selected *:link:hover, *:selected button:hover:link, *:selected button:hover:visited {
-      color: #edf4fb; }
+      color: #ecf3fb; }
   *:link:active, button:active:link, button:active:visited {
     color: #2a76c6; }
     *:selected *:link:active, *:selected button:active:link, *:selected button:active:visited {
-      color: #dbe9f7; }
+      color: #dae8f7; }
   *: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,
   headerbar.selection-mode .subtitle:backdrop:hover:link {
     color: #4a90d9; }
   *:link:selected, button:selected:link, button:selected:visited, .titlebar.selection-mode .subtitle:link,
   headerbar.selection-mode .subtitle:link, *:selected *:link, *:selected button:link, *:selected button:visited {
-    color: #dbe9f7; }
+    color: #dae8f7; }
 
 button:link, headerbar button.titlebutton:link,
 .titlebar button.titlebutton:link, button:visited, headerbar button.titlebutton:visited,
@@ -1252,8 +1211,8 @@ button:link, headerbar button.titlebutton:link,
   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, headerbar button.titlebutton:link > label,
-  .titlebar button.titlebutton:link > label, button:visited > label, headerbar button.titlebutton:visited > label,
+  button:link > label,
+  .titlebar button.titlebutton:link > label, button:visited > label,
   .titlebar button.titlebutton:visited > label {
     text-decoration-line: underline; }
 
@@ -1266,7 +1225,7 @@ spinbutton:not(.vertical) .titlebar button.titlebutton,
   background-image: none;
   border-style: none none none solid;
   border-color: rgba(161, 161, 161, 0.3);
-  color: #43484a;
+  color: #42484a;
   border-radius: 0;
   box-shadow: none; }
   spinbutton:not(.vertical) button:dir(rtl) {
@@ -1275,13 +1234,13 @@ spinbutton:not(.vertical) .titlebar button.titlebutton,
     color: #2e3436;
     background-color: rgba(46, 52, 54, 0.05); }
   spinbutton:not(.vertical) button:insensitive {
-    color: rgba(142, 145, 146, 0.3); }
+    color: rgba(141, 144, 145, 0.3); }
   spinbutton:not(.vertical) button:active {
     box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2);
     background-color: rgba(0, 0, 0, 0.1); }
   spinbutton:not(.vertical) button:backdrop {
-    color: #999c9d;
-    border-color: rgba(169, 169, 169, 0.3);
+    color: #989b9c;
+    border-color: rgba(168, 168, 168, 0.3);
     background-color: transparent; }
   spinbutton:not(.vertical) button:backdrop:insensitive {
     background-image: none;
@@ -1334,7 +1293,7 @@ spinbutton:not(.vertical) .titlebar button.titlebutton,
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     -gtk-icon-shadow: none;
-    color: #878a89;
+    color: #878989;
     border-color: rgba(0, 0, 0, 0.5);
     -gtk-icon-shadow: none;
     box-shadow: none; }
@@ -1376,31 +1335,29 @@ spinbutton.vertical {
         -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
         box-shadow: inset 0 1px white; }
       spinbutton.vertical button:first-child:insensitive {
-        color: #8e9192;
+        color: #8d9091;
         border-color: #a1a1a1;
         background-image: linear-gradient(to bottom, #f4f4f4);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        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 {
+        spinbutton.vertical button:first-child:insensitive > .label {
           color: inherit; }
       spinbutton.vertical button:first-child:backdrop {
-        color: #8e9192;
-        border-color: darkgray;
+        color: #8d9091;
+        border-color: #a8a8a8;
         background-image: linear-gradient(to bottom, #ededed);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
         spinbutton.vertical button:first-child:backdrop:insensitive {
           color: #c7c7c7;
-          border-color: darkgray;
+          border-color: #a8a8a8;
           background-image: linear-gradient(to bottom, #f4f4f4);
           text-shadow: none;
           -gtk-icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-          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 {
+          spinbutton.vertical button: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 {
     border-radius: 3px 3px 0 0;
@@ -1436,9 +1393,9 @@ spinbutton.vertical {
     -gtk-icon-shadow: none;
     outline-color: rgba(238, 238, 236, 0.3); }
   .osd spinbutton.vertical button:first-child:insensitive {
-    color: #878a89;
+    color: #878989;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+    background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -1466,16 +1423,16 @@ combobox {
   -GtkComboBox-shadow-type: none;
   text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); }
-  combobox > button.combo, headerbar combobox > button.combo.titlebutton,
+  combobox > button.combo,
   .titlebar combobox > button.combo.titlebutton {
     padding-top: 3px;
     padding-bottom: 4px; }
   combobox:insensitive {
-    color: #8e9192;
+    color: #8d9091;
     text-shadow: none;
     -gtk-icon-shadow: none; }
   combobox:backdrop {
-    color: #8e9192;
+    color: #8d9091;
     text-shadow: none;
     -gtk-icon-shadow: none; }
   combobox:backdrop:insensitive {
@@ -1490,13 +1447,11 @@ combobox {
   combobox > entry.combo:dir(rtl), combobox > spinbutton.combo:dir(rtl) {
     border-top-left-radius: 0;
     border-bottom-left-radius: 0; }
-  combobox > button.combo:not(:only-child):dir(ltr), headerbar combobox > button.combo.titlebutton:not(:only-child):dir(ltr),
-  .titlebar combobox > button.combo.titlebutton:not(:only-child):dir(ltr) {
+  combobox > button.combo:not(:only-child):dir(ltr) {
     border-top-left-radius: 0;
     border-bottom-left-radius: 0;
     border-left-style: none; }
-  combobox > button.combo:not(:only-child):dir(rtl), headerbar combobox > button.combo.titlebutton:not(:only-child):dir(rtl),
-  .titlebar combobox > button.combo.titlebutton:not(:only-child):dir(rtl) {
+  combobox > button.combo:not(:only-child):dir(rtl) {
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
     border-right-style: none; }
@@ -1535,8 +1490,8 @@ searchbar,
   box-shadow: inset 0 2px 3px -1px #b6b6b6, 0 1px white; }
   .inline-toolbar:backdrop, searchbar:backdrop,
   .location-bar:backdrop {
-    border-color: darkgray;
-    background-color: #d5d5d5;
+    border-color: #a8a8a8;
+    background-color: #d4d4d4;
     box-shadow: none; }
 
 /***************
@@ -1551,10 +1506,10 @@ headerbar {
   border-radius: 7px 7px 0 0;
   background-color: transparent;
   background-image: linear-gradient(to bottom, #f7f7f7, #ededed);
-  box-shadow: inset 0 -1px #dadada, inset 0 1px white; }
+  box-shadow: inset 0 -1px #d9d9d9, inset 0 1px white; }
   .titlebar:backdrop,
   headerbar:backdrop {
-    border-color: darkgray;
+    border-color: #a8a8a8;
     background-color: #ededed;
     background-image: none;
     box-shadow: inset 0 1px white; }
@@ -1578,18 +1533,18 @@ headerbar {
     .titlebar .header-bar-separator:backdrop, .titlebar > 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; }
+      border-image: linear-gradient(to bottom, rgba(168, 168, 168, 0.5)) 0 1/1px 1px; }
   .titlebar.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; }
+    box-shadow: inset 0 -1px #3875b4, inset 0 1px #a4c7ec; }
     .titlebar.selection-mode:backdrop,
     headerbar.selection-mode:backdrop {
       background-image: linear-gradient(to bottom, #4a90d9);
-      box-shadow: inset 0 1px #b7d3f0; }
+      box-shadow: inset 0 1px #b6d2ef; }
     .titlebar.selection-mode button,
     headerbar.selection-mode button,
     headerbar.selection-mode .titlebar button.titlebutton,
@@ -1600,7 +1555,7 @@ headerbar {
       background-image: linear-gradient(to bottom, #5f9ddd, #4a90d9 40%, #3583d5);
       text-shadow: 0 -1px rgba(0, 0, 0, 0.54353);
       -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.54353);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 1px #a5c8ec; }
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 1px #a4c7ec; }
       .titlebar.selection-mode button.flat, .titlebar.selection-mode button.sidebar-button,
       .titlebar.selection-mode button.titlebutton,
       headerbar.selection-mode button.flat,
@@ -1620,7 +1575,7 @@ headerbar {
         background-image: linear-gradient(to bottom, #85b4e5, #5b9add 40%, #4a90d9);
         text-shadow: 0 -1px rgba(0, 0, 0, 0.51153);
         -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.51153);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 1px #a5c8ec; }
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 1px #a4c7ec; }
       .titlebar.selection-mode button:active, .titlebar.selection-mode button:checked,
       headerbar.selection-mode button:active,
       headerbar.selection-mode button:checked {
@@ -1630,19 +1585,19 @@ headerbar {
         background-image: linear-gradient(to bottom, #2b79cb, #2e7fd3 40%, #3583d5);
         text-shadow: 0 -1px rgba(0, 0, 0, 0.62353);
         -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.62353);
-        box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px #a5c8ec; }
+        box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px #a4c7ec; }
       .titlebar.selection-mode button:backdrop, .titlebar.selection-mode button.flat:backdrop, .titlebar.selection-mode button.sidebar-button:backdrop,
       .titlebar.selection-mode button.titlebutton:backdrop,
       headerbar.selection-mode button:backdrop,
       headerbar.selection-mode button.flat:backdrop,
       headerbar.selection-mode button.sidebar-button:backdrop,
       headerbar.selection-mode button.titlebutton:backdrop {
-        color: #dbe9f7;
+        color: #dae8f7;
         border-color: #4a90d9;
         background-image: linear-gradient(to bottom, #4a90d9);
         text-shadow: none;
         -gtk-icon-shadow: none;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(165, 200, 236, 0);
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(164, 199, 236, 0);
         -gtk-icon-effect: none;
         border-color: #184472; }
         .titlebar.selection-mode button:backdrop:active, .titlebar.selection-mode button:backdrop:checked, .titlebar.selection-mode button.flat:backdrop:active, .titlebar.selection-mode button.sidebar-button:backdrop:active,
@@ -1656,10 +1611,10 @@ headerbar {
         headerbar.selection-mode button.flat:backdrop:checked,
         headerbar.selection-mode button.sidebar-button:backdrop:checked,
         headerbar.selection-mode button.titlebutton:backdrop:checked {
-          color: #d4e4f4;
+          color: #d4e3f3;
           border-color: #2a76c6;
           background-image: linear-gradient(to bottom, #2a76c6);
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(165, 200, 236, 0);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(164, 199, 236, 0);
           border-color: #184472; }
         .titlebar.selection-mode button:backdrop:insensitive, .titlebar.selection-mode button.flat:backdrop:insensitive, .titlebar.selection-mode button.sidebar-button:backdrop:insensitive,
         .titlebar.selection-mode button.titlebutton:backdrop:insensitive,
@@ -1667,21 +1622,19 @@ headerbar {
         headerbar.selection-mode button.flat:backdrop:insensitive,
         headerbar.selection-mode button.sidebar-button:backdrop:insensitive,
         headerbar.selection-mode button.titlebutton:backdrop:insensitive {
-          color: #9bc2ea;
-          border-color: #65a1df;
-          background-image: linear-gradient(to bottom, #65a1df);
+          color: #9ac1e9;
+          border-color: #65a0de;
+          background-image: linear-gradient(to bottom, #65a0de);
           text-shadow: none;
           -gtk-icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(165, 200, 236, 0);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(164, 199, 236, 0);
           border-color: #184472; }
-          .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 button.sidebar-button:backdrop:insensitive > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive > .label,
+          .titlebar.selection-mode button:backdrop:insensitive > .label, .titlebar.selection-mode button.flat:backdrop:insensitive > .label, .titlebar.selection-mode button.sidebar-button:backdrop:insensitive > .label,
           .titlebar.selection-mode 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 button.sidebar-button:backdrop:insensitive > .label,
-          headerbar.selection-mode button.titlebutton:backdrop:insensitive > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive > .label {
+          headerbar.selection-mode 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 button.sidebar-button:backdrop:insensitive:active,
         .titlebar.selection-mode button.titlebutton:backdrop:insensitive:active, .titlebar.selection-mode button.flat:backdrop:insensitive:checked, .titlebar.selection-mode button.sidebar-button:backdrop:insensitive:checked,
@@ -1694,26 +1647,22 @@ headerbar {
         headerbar.selection-mode button.flat:backdrop:insensitive:checked,
         headerbar.selection-mode button.sidebar-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);
+          color: #8db8e6;
+          border-color: #5093da;
+          background-image: linear-gradient(to bottom, #5093da);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(164, 199, 236, 0);
           border-color: #184472; }
-          .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 button.sidebar-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 button.sidebar-button:backdrop:insensitive:checked > .label, .titlebar.selection-mode headerbar button.titlebutton:backdrop:insensitive:checked > .label,
+          .titlebar.selection-mode button:backdrop:insensitive:active > .label, .titlebar.selection-mode button:backdrop:insensitive:checked > .label, .titlebar.selection-mode button.flat:backdrop:insensitive:active > .label, .titlebar.selection-mode button.sidebar-button: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 button.sidebar-button:backdrop:insensitive:checked > .label,
           .titlebar.selection-mode 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 button.sidebar-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 button.sidebar-button:backdrop:insensitive:checked > .label,
-          headerbar.selection-mode button.titlebutton:backdrop:insensitive:checked > .label,
-          headerbar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:checked > .label {
+          headerbar.selection-mode button.titlebutton:backdrop:insensitive:checked > .label {
             color: inherit; }
       .titlebar.selection-mode button.flat:backdrop, .titlebar.selection-mode button.sidebar-button:backdrop,
       .titlebar.selection-mode button.titlebutton:backdrop, .titlebar.selection-mode button.flat:insensitive, .titlebar.selection-mode button.sidebar-button:insensitive,
@@ -1736,28 +1685,25 @@ headerbar {
         -gtk-icon-shadow: none; }
       .titlebar.selection-mode button:insensitive,
       headerbar.selection-mode button:insensitive {
-        color: #b2d0ef;
+        color: #b2cfee;
         border-color: #1c5187;
-        background-image: linear-gradient(to bottom, #65a1df);
+        background-image: linear-gradient(to bottom, #65a0de);
         text-shadow: none;
         -gtk-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 headerbar button.titlebutton:insensitive > .label,
-        headerbar.selection-mode button:insensitive > .label,
-        headerbar.selection-mode .titlebar button.titlebutton:insensitive > .label {
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px #a4c7ec; }
+        .titlebar.selection-mode button:insensitive > .label,
+        headerbar.selection-mode button:insensitive > .label {
           color: inherit; }
         .titlebar.selection-mode button:insensitive:active, .titlebar.selection-mode button:insensitive:checked,
         headerbar.selection-mode button:insensitive:active,
         headerbar.selection-mode button:insensitive:checked {
-          color: #b9d4f1;
+          color: #b9d3f0;
           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 headerbar button.titlebutton:insensitive:active > .label, .titlebar.selection-mode button:insensitive:checked > .label, .titlebar.selection-mode headerbar button.titlebutton:insensitive:checked > .label,
+          background-image: linear-gradient(to bottom, #4a8cd1, #5093da);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px #a4c7ec; }
+          .titlebar.selection-mode button:insensitive:active > .label, .titlebar.selection-mode button: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 {
+          headerbar.selection-mode button:insensitive:checked > .label {
             color: inherit; }
       .titlebar.selection-mode button.suggested-action,
       headerbar.selection-mode button.suggested-action {
@@ -1767,7 +1713,7 @@ headerbar {
         background-image: linear-gradient(to bottom, #fafafa, #ededed 40%, #e0e0e0);
         text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
         -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
-        box-shadow: inset 0 1px white, 0 1px #a5c8ec;
+        box-shadow: inset 0 1px white, 0 1px #a4c7ec;
         border-color: #184472; }
         .titlebar.selection-mode button.suggested-action:hover,
         headerbar.selection-mode button.suggested-action:hover {
@@ -1777,7 +1723,7 @@ headerbar {
           background-image: linear-gradient(to bottom, white, #f7f7f7 40%, #ededed);
           text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
           -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
-          box-shadow: inset 0 1px white, 0 1px #a5c8ec;
+          box-shadow: inset 0 1px white, 0 1px #a4c7ec;
           border-color: #184472; }
         .titlebar.selection-mode button.suggested-action:active,
         headerbar.selection-mode button.suggested-action:active {
@@ -1787,42 +1733,40 @@ headerbar {
           background-image: linear-gradient(to bottom, #d6d6d6, gainsboro 40%, #e0e0e0);
           text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
           -gtk-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 #a5c8ec;
+          box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px #a4c7ec;
           border-color: #184472; }
         .titlebar.selection-mode button.suggested-action:insensitive,
         headerbar.selection-mode button.suggested-action:insensitive {
-          color: #8e9192;
+          color: #8d9091;
           border-color: #a1a1a1;
           background-image: linear-gradient(to bottom, #f4f4f4);
           text-shadow: none;
           -gtk-icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px #a5c8ec;
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px #a4c7ec;
           border-color: #184472; }
-          .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 {
+          .titlebar.selection-mode button.suggested-action:insensitive > .label,
+          headerbar.selection-mode button.suggested-action:insensitive > .label {
             color: inherit; }
         .titlebar.selection-mode button.suggested-action:backdrop,
         headerbar.selection-mode button.suggested-action:backdrop {
-          color: #8e9192;
-          border-color: darkgray;
+          color: #8d9091;
+          border-color: #a8a8a8;
           background-image: linear-gradient(to bottom, #ededed);
           text-shadow: none;
           -gtk-icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(165, 200, 236, 0);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(164, 199, 236, 0);
           border-color: #184472; }
         .titlebar.selection-mode button.suggested-action:backdrop:insensitive,
         headerbar.selection-mode button.suggested-action:backdrop:insensitive {
           color: #c7c7c7;
-          border-color: darkgray;
+          border-color: #a8a8a8;
           background-image: linear-gradient(to bottom, #f4f4f4);
           text-shadow: none;
           -gtk-icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(165, 200, 236, 0);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(164, 199, 236, 0);
           border-color: #184472; }
-          .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 {
+          .titlebar.selection-mode button.suggested-action:backdrop:insensitive > .label,
+          headerbar.selection-mode button.suggested-action:backdrop:insensitive > .label {
             color: inherit; }
     .titlebar.selection-mode .selection-menu, .titlebar.selection-mode .selection-menu:backdrop,
     headerbar.selection-mode .selection-menu,
@@ -1893,15 +1837,15 @@ treeview.view {
   -GtkTreeView-tree-line-width: 1;
   -GtkTreeView-tree-line-pattern: '';
   -GtkTreeView-expander-size: 16;
-  border-left-color: #979a9b;
+  border-left-color: #96999a;
   border-top-color: #ededed; }
   treeview.view:selected {
     border-radius: 0; }
   treeview.view:selected, treeview.view:backdrop:selected {
-    border-left-color: #a5c8ec;
+    border-left-color: #a4c7ec;
     border-top-color: rgba(46, 52, 54, 0.1); }
   treeview.view:insensitive {
-    color: #8e9192; }
+    color: #8d9091; }
     treeview.view:insensitive:selected {
       color: #92bce8; }
       treeview.view:insensitive:selected:backdrop {
@@ -1911,29 +1855,29 @@ treeview.view {
   treeview.view.separator:backdrop {
     color: rgba(0, 0, 0, 0.1); }
   treeview.view:backdrop {
-    border-left-color: #bebfc0;
+    border-left-color: #bdbebf;
     border-top: #ededed; }
   treeview.view.dnd {
     border-style: solid none;
     border-width: 1px;
-    border-color: #3c6288; }
+    border-color: #3c6287; }
   treeview.view.expander {
     -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
-    color: #6d7172; }
+    color: #6c7072; }
     treeview.view.expander:dir(rtl) {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
     treeview.view.expander:hover {
       color: #2e3436; }
     treeview.view.expander:selected {
-      color: #c9def4; }
+      color: #c8ddf3; }
       treeview.view.expander:selected:hover {
         color: #ffffff; }
       treeview.view.expander:selected:backdrop {
-        color: #c9def4; }
+        color: #c8ddf3; }
     treeview.view.expander:checked {
       -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
     treeview.view.expander:backdrop {
-      color: #b0b2b3; }
+      color: #afb1b2; }
   treeview.view.progressbar {
     color: #ffffff;
     border: 1px solid #184472;
@@ -1963,13 +1907,13 @@ treeview.view {
   treeview.view header button,
   treeview.view header .titlebar button.titlebutton,
   .titlebar treeview.view header button.titlebutton {
-    color: #979a9b;
+    color: #96999a;
     background-color: #ffffff;
     font-weight: bold;
     text-shadow: none;
     box-shadow: none; }
     treeview.view header button:hover {
-      color: #636769;
+      color: #626668;
       box-shadow: none;
       transition: none; }
     treeview.view header button:active {
@@ -1997,7 +1941,7 @@ treeview.view header .titlebar button.titlebutton,
   treeview.view header button:backdrop {
     border-color: #ededed;
     border-style: none solid solid none;
-    color: #bebfc0;
+    color: #bdbebf;
     background-image: none;
     background-color: white; }
     treeview.view header button:backdrop:insensitive {
@@ -2024,7 +1968,7 @@ menubar,
       color: #2a76c6; }
     menubar > menuitem:insensitive,
     .menubar > menuitem:insensitive {
-      color: #8e9192;
+      color: #8d9091;
       box-shadow: none; }
 
 menu,
@@ -2046,14 +1990,14 @@ menu,
       background-color: #4a90d9; }
     menu menuitem:insensitive,
     .menu menuitem:insensitive {
-      color: #8e9192; }
+      color: #8d9091; }
       menu menuitem:insensitive:backdrop,
       .menu menuitem:insensitive:backdrop {
         color: #c7c7c7; }
     menu menuitem:backdrop, menu menuitem:backdrop:hover,
     .menu menuitem:backdrop,
     .menu menuitem:backdrop:hover {
-      color: #8e9192;
+      color: #8d9091;
       background-color: white; }
     menu menuitem arrow,
     .menu menuitem arrow {
@@ -2067,13 +2011,13 @@ menu,
     border-radius: 0; }
     menu arrow.top,
     .menu arrow.top {
-      border-bottom: 1px solid #eaebeb; }
+      border-bottom: 1px solid #eaeaea; }
     menu arrow.bottom,
     .menu arrow.bottom {
-      border-top: 1px solid #eaebeb; }
+      border-top: 1px solid #eaeaea; }
     menu arrow:hover,
     .menu arrow:hover {
-      background-color: #eaebeb; }
+      background-color: #eaeaea; }
     menu arrow:insensitive,
     .menu arrow:insensitive {
       color: transparent;
@@ -2132,7 +2076,7 @@ notebook {
   notebook.frame {
     border: 1px solid #a1a1a1; }
     notebook.frame:backdrop {
-      border-color: darkgray; }
+      border-color: #a8a8a8; }
   notebook header {
     background-color: #d6d6d6; }
     .frame notebook header {
@@ -2146,11 +2090,11 @@ notebook {
       .frame notebook header.left {
         border-right-width: 0; }
       .frame notebook header:backdrop {
-        border-color: darkgray; }
+        border-color: #a8a8a8; }
     notebook header.top {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 -1px #a1a1a1; }
       notebook header.top:backdrop {
-        box-shadow: inset 0 -1px darkgray; }
+        box-shadow: inset 0 -1px #a8a8a8; }
       notebook header.top tab {
         padding: 8px 20px;
         border-bottom-width: 3px; }
@@ -2162,7 +2106,7 @@ notebook {
     notebook header.bottom {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 1px #a1a1a1; }
       notebook header.bottom:backdrop {
-        box-shadow: inset 0 1px darkgray; }
+        box-shadow: inset 0 1px #a8a8a8; }
       notebook header.bottom tab {
         padding: 8px 20px;
         border-top-width: 3px; }
@@ -2174,7 +2118,7 @@ notebook {
     notebook header.right {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 1px 0 #a1a1a1; }
       notebook header.right:backdrop {
-        box-shadow: inset 1px 0 darkgray; }
+        box-shadow: inset 1px 0 #a8a8a8; }
       notebook header.right tab {
         padding: 5px 20px;
         border-left-width: 3px; }
@@ -2184,7 +2128,7 @@ notebook {
     notebook header.left {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset -1px 0 #a1a1a1; }
       notebook header.left:backdrop {
-        box-shadow: inset -1px 0 darkgray; }
+        box-shadow: inset -1px 0 #a8a8a8; }
       notebook header.left tab {
         padding: 5px 20px;
         border-right-width: 3px; }
@@ -2192,7 +2136,7 @@ notebook {
           border-bottom-width: 1px;
           border-top-width: 1px; }
     notebook header:backdrop {
-      background-color: #d5d5d5;
+      background-color: #d4d4d4;
       box-shadow: none; }
     notebook header.top tabs arrow.up, notebook header.bottom tabs arrow.up {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
@@ -2203,15 +2147,15 @@ notebook {
     notebook header.left tabs arrow.down, notebook header.right tabs arrow.down {
       -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); }
     notebook header tabs arrow {
-      color: #8e9192; }
+      color: #8d9091; }
       notebook header tabs arrow:hover {
-        color: #5e6364; }
+        color: #5d6263; }
       notebook header tabs arrow:active {
         color: #2e3436; }
       notebook header tabs arrow:insensitive {
-        color: rgba(142, 145, 146, 0.3); }
+        color: rgba(141, 144, 145, 0.3); }
       notebook header tabs arrow:backdrop {
-        color: rgba(142, 145, 146, 0.4); }
+        color: rgba(141, 144, 145, 0.4); }
       notebook header tabs arrow:backdrop:insensitive {
         color: #c7c7c7; }
   notebook tab {
@@ -2240,7 +2184,7 @@ notebook {
         .top notebook tab.reorderable-page:active:hover {
           background-color: rgba(237, 237, 237, 0.7); }
         .top notebook tab.reorderable-page:active:backdrop {
-          border-color: darkgray;
+          border-color: #a8a8a8;
           background-color: #ededed;
           border-bottom-color: #4a90d9; }
       .top notebook tab.reorderable-page:backdrop {
@@ -2259,7 +2203,7 @@ notebook {
         .bottom notebook tab.reorderable-page:active:hover {
           background-color: rgba(237, 237, 237, 0.7); }
         .bottom notebook tab.reorderable-page:active:backdrop {
-          border-color: darkgray;
+          border-color: #a8a8a8;
           background-color: #ededed;
           border-top-color: #4a90d9; }
       .bottom notebook tab.reorderable-page:backdrop {
@@ -2278,7 +2222,7 @@ notebook {
         .left notebook tab.reorderable-page:active:hover {
           background-color: rgba(237, 237, 237, 0.7); }
         .left notebook tab.reorderable-page:active:backdrop {
-          border-color: darkgray;
+          border-color: #a8a8a8;
           background-color: #ededed;
           border-right-color: #4a90d9; }
       .left notebook tab.reorderable-page:backdrop {
@@ -2297,7 +2241,7 @@ notebook {
         .right notebook tab.reorderable-page:active:hover {
           background-color: rgba(237, 237, 237, 0.7); }
         .right notebook tab.reorderable-page:active:backdrop {
-          border-color: darkgray;
+          border-color: #a8a8a8;
           background-color: #ededed;
           border-left-color: #4a90d9; }
       .right notebook tab.reorderable-page:backdrop {
@@ -2306,17 +2250,17 @@ notebook {
     notebook tab label {
       padding: 0 2px;
       font-weight: bold;
-      color: #8e9192; }
+      color: #8d9091; }
       notebook tab label:backdrop {
-        color: #abacad; }
+        color: #aaabac; }
     notebook tab:hover label {
-      color: #5e6364; }
+      color: #5d6263; }
       notebook tab:hover label:backdrop {
-        color: #abacad; }
+        color: #aaabac; }
     notebook tab:active label {
       color: #2e3436; }
       notebook tab:active label:backdrop {
-        color: #8e9192; }
+        color: #8d9091; }
     notebook tab button, notebook tab headerbar button.titlebutton, headerbar notebook tab button.titlebutton,
     notebook tab .titlebar button.titlebutton,
     .titlebar notebook tab button.titlebutton {
@@ -2351,7 +2295,7 @@ notebook {
       notebook tab button:backdrop,
       notebook tab .titlebar button.titlebutton:backdrop,
       .titlebar notebook tab button.titlebutton:backdrop {
-        color: rgba(142, 145, 146, 0.3);
+        color: rgba(141, 144, 145, 0.3);
         border-color: transparent; }
       notebook tab button > image, notebook tab headerbar button.titlebutton > image, headerbar notebook tab button.titlebutton > image,
       notebook tab .titlebar button.titlebutton > image,
@@ -2397,15 +2341,15 @@ scrollbar {
     border: 1px none #a1a1a1; }
     scrollbar trough:backdrop {
       background-color: #e5e5e5;
-      border-color: darkgray; }
+      border-color: #a8a8a8; }
   scrollbar slider {
     background-color: #7a7e7f; }
     scrollbar slider:hover {
-      background-color: #54595b; }
+      background-color: #54595a; }
     scrollbar slider:prelight:active {
       background-color: #2a76c6; }
     scrollbar slider:backdrop {
-      background-color: #c7c8c9; }
+      background-color: #c6c7c8; }
     scrollbar slider:insensitive {
       background-color: transparent; }
   scrollbar slider {
@@ -2446,7 +2390,7 @@ switch {
   border: 1px solid #a1a1a1;
   border-radius: 3px;
   color: #2e3436;
-  background-image: linear-gradient(to bottom, #cfcfcf);
+  background-image: linear-gradient(to bottom, #cecece);
   text-shadow: 0 1px rgba(0, 0, 0, 0.1); }
   * {
     -GtkSwitch-slider-width: 45px;
@@ -2458,16 +2402,16 @@ switch {
     box-shadow: 0 1px white;
     text-shadow: 0 1px rgba(24, 68, 114, 0.5), 0 0 2px rgba(255, 255, 255, 0.6); }
   switch:insensitive {
-    color: #8e9192;
+    color: #8d9091;
     border-color: #a1a1a1;
     background-image: none;
     background-color: #f4f4f4;
     box-shadow: 0 1px white;
     text-shadow: none; }
   switch:backdrop {
-    color: #8e9192;
-    border-color: darkgray;
-    background-image: linear-gradient(to bottom, #d5d5d5);
+    color: #8d9091;
+    border-color: #a8a8a8;
+    background-image: linear-gradient(to bottom, #d4d4d4);
     box-shadow: none;
     text-shadow: none; }
     switch:backdrop:active {
@@ -2477,7 +2421,7 @@ switch {
       box-shadow: none; }
   switch:insensitive {
     color: #c7c7c7;
-    border-color: darkgray;
+    border-color: #a8a8a8;
     background-image: none;
     background-color: #f4f4f4; }
   switch slider {
@@ -2503,7 +2447,7 @@ switch {
   switch:active slider {
     border: 1px solid #184472; }
   switch:insensitive slider {
-    color: #8e9192;
+    color: #8d9091;
     border-color: #a1a1a1;
     background-image: linear-gradient(to bottom, #f4f4f4);
     text-shadow: none;
@@ -2512,8 +2456,8 @@ switch {
     switch:insensitive slider > .label {
       color: inherit; }
   switch:backdrop slider {
-    color: #8e9192;
-    border-color: darkgray;
+    color: #8d9091;
+    border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #ededed);
     text-shadow: none;
     -gtk-icon-shadow: none;
@@ -2523,7 +2467,7 @@ switch {
     border-color: #4a90d9; }
   switch:backdrop:insensitive slider {
     color: #c7c7c7;
-    border-color: darkgray;
+    border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #f4f4f4);
     text-shadow: none;
     -gtk-icon-shadow: none;
@@ -2773,7 +2717,7 @@ menu menuitem.check {
   menu menuitem.check:hover {
     color: #ffffff; }
   menu menuitem.check:insensitive {
-    color: #bebfc0; }
+    color: #bdbebf; }
 
 radio {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked.png"), url("assets/radio-unchecked@2.png"));
@@ -3002,7 +2946,7 @@ menu menuitem.radio {
   menu menuitem.radio:hover {
     color: #ffffff; }
   menu menuitem.radio:insensitive {
-    color: #bebfc0; }
+    color: #bdbebf; }
 
 .view.check, .view.radio,
 row .check, row .radio {
@@ -3056,7 +3000,7 @@ checkbutton.text-button, radiobutton.text-button {
   padding: 1px 2px 4px;
   outline-offset: 0; }
   checkbutton.text-button:insensitive, checkbutton.text-button:insensitive:active, checkbutton.text-button:insensitive:inconsistent, radiobutton.text-button:insensitive, radiobutton.text-button:insensitive:active, radiobutton.text-button:insensitive:inconsistent {
-    color: #8e9192; }
+    color: #8d9091; }
     checkbutton.text-button:insensitive:backdrop, checkbutton.text-button:insensitive:active:backdrop, checkbutton.text-button:insensitive:inconsistent:backdrop, radiobutton.text-button:insensitive:backdrop, radiobutton.text-button:insensitive:active:backdrop, radiobutton.text-button:insensitive:inconsistent:backdrop {
       color: #c7c7c7; }
 
@@ -3085,7 +3029,7 @@ scale {
   scale trough {
     border: 1px solid #a1a1a1;
     border-radius: 3px;
-    background-color: #cfcfcf;
+    background-color: #cecece;
     box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1), 0 1px white; }
     scale trough slider {
       color: #2e3436;
@@ -3118,12 +3062,12 @@ scale {
       scale trough slider:backdrop {
         border-style: solid;
         border-radius: 50%;
-        border-color: #a1a1a1;
+        border-color: #a0a0a0;
         background-image: linear-gradient(to bottom, #ededed);
         box-shadow: none; }
       scale trough slider:backdrop:insensitive {
         color: #c7c7c7;
-        border-color: darkgray;
+        border-color: #a8a8a8;
         background-image: linear-gradient(to bottom, #f4f4f4);
         text-shadow: none;
         -gtk-icon-shadow: none;
@@ -3198,11 +3142,11 @@ scale {
       background-color: #f4f4f4;
       box-shadow: 0 1px white; }
     scale trough:backdrop {
-      border-color: darkgray;
+      border-color: #a8a8a8;
       background-color: #c7c7c7;
       box-shadow: none; }
     scale trough:backdrop:insensitive, scale trough .highlight:backdrop:insensitive {
-      border-color: darkgray;
+      border-color: #a8a8a8;
       background-color: #f4f4f4; }
     .osd scale trough {
       border-color: rgba(0, 0, 0, 0.7);
@@ -3232,10 +3176,10 @@ scale {
     row:selected scale:insensitive, row:selected scale.highlight:insensitive {
       border-color: #4a90d9;
       box-shadow: none;
-      background-color: #a5c8ec;
+      background-color: #a4c7ec;
       background-image: none; }
       row:selected scale:insensitive:backdrop, row:selected scale.highlight:insensitive:backdrop {
-        background-color: #a5c8ec; }
+        background-color: #a4c7ec; }
 
 scale marks {
   color: alpha(currentColor,0.5); }
@@ -3481,8 +3425,8 @@ progressbar {
     border-radius: 3px;
     background-color: #d2d2d2; }
     progressbar trough:backdrop {
-      border-color: darkgray;
-      background-color: #d5d5d5;
+      border-color: #a8a8a8;
+      background-color: #d4d4d4;
       box-shadow: 0 1px rgba(255, 255, 255, 0); }
 
 progressbar.horizontal progress {
@@ -3544,8 +3488,8 @@ levelbar {
     levelbar trough:backdrop {
       background-color: transparent;
       background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
-      color: #333333;
-      border-color: darkgray;
+      color: #323232;
+      border-color: #a8a8a8;
       background-image: linear-gradient(to bottom, white);
       box-shadow: 0 1px rgba(255, 255, 255, 0); }
   levelbar.horizontal.discrete block {
@@ -3582,7 +3526,7 @@ levelbar {
     border-color: rgba(46, 52, 54, 0.2);
     box-shadow: none; }
     levelbar block.empty:backdrop {
-      border-color: rgba(142, 145, 146, 0.15); }
+      border-color: rgba(141, 144, 145, 0.15); }
 
 /**********
  * Frames *
@@ -3596,14 +3540,14 @@ frame,
     border-style: none; }
   frame:backdrop,
   .frame:backdrop {
-    border-color: darkgray; }
+    border-color: #a8a8a8; }
 
 paper {
   border: 1px solid #a1a1a1;
   background: white;
   padding: 0; }
   paper:backdrop {
-    border-color: darkgray; }
+    border-color: #a8a8a8; }
 
 actionbar frame {
   padding: 6px;
@@ -3623,7 +3567,7 @@ scrolledwindow overshoot.top {
   box-shadow: none; }
   placessidebar overshoot.top:backdrop,
   scrolledwindow overshoot.top:backdrop {
-    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(darkgray), to(rgba(169, 169, 169, 0)));
+    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#a8a8a8), to(rgba(168, 168, 168, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center top;
@@ -3641,7 +3585,7 @@ scrolledwindow overshoot.bottom {
   box-shadow: none; }
   placessidebar overshoot.bottom:backdrop,
   scrolledwindow overshoot.bottom:backdrop {
-    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(darkgray), to(rgba(169, 169, 169, 0)));
+    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#a8a8a8), to(rgba(168, 168, 168, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center bottom;
@@ -3659,7 +3603,7 @@ scrolledwindow overshoot.left {
   box-shadow: none; }
   placessidebar overshoot.left:backdrop,
   scrolledwindow overshoot.left:backdrop {
-    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(darkgray), to(rgba(169, 169, 169, 0)));
+    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#a8a8a8), to(rgba(168, 168, 168, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: left center;
@@ -3677,7 +3621,7 @@ scrolledwindow overshoot.right {
   box-shadow: none; }
   placessidebar overshoot.right:backdrop,
   scrolledwindow overshoot.right:backdrop {
-    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(darkgray), to(rgba(169, 169, 169, 0)));
+    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#a8a8a8), to(rgba(168, 168, 168, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: right center;
@@ -3738,7 +3682,7 @@ scrolledwindow junction {
     border-image-slice: 0 1 0 0; }
   placessidebar junction:backdrop,
   scrolledwindow junction:backdrop {
-    border-image-source: linear-gradient(to bottom, darkgray 1px, transparent 1px);
+    border-image-source: linear-gradient(to bottom, #a8a8a8 1px, transparent 1px);
     background-color: #e5e5e5; }
 
 separator {
@@ -3754,7 +3698,7 @@ list {
   border-color: #a1a1a1; }
   list:backdrop {
     background-color: white;
-    border-color: darkgray; }
+    border-color: #a8a8a8; }
   list row {
     padding: 2px; }
 
@@ -3767,7 +3711,7 @@ row.activatable:backdrop:hover {
 row.activatable:selected:active {
   box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); }
 row.activatable:selected.has-open-popup, row.activatable:selected:hover {
-  background-color: #4787c9; }
+  background-color: #4786c8; }
 row.activatable:selected:backdrop {
   background-color: #4a90d9; }
 
@@ -3813,8 +3757,8 @@ row:selected .titlebar button.titlebutton,
   row:selected button:backdrop, row:selected button.flat:backdrop, row:selected button.sidebar-button:backdrop, row:selected headerbar button.titlebutton:backdrop, headerbar row:selected button.titlebutton:backdrop,
   row:selected .titlebar button.titlebutton:backdrop,
   .titlebar row:selected button.titlebutton:backdrop {
-    color: #8e9192;
-    border-color: darkgray;
+    color: #8d9091;
+    border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #ededed);
     text-shadow: none;
     -gtk-icon-shadow: none;
@@ -3825,23 +3769,22 @@ row:selected .titlebar button.titlebutton,
     .titlebar row:selected button.titlebutton:backdrop:active, row:selected button.flat:backdrop:checked, row:selected button.sidebar-button:backdrop:checked, row:selected headerbar button.titlebutton:backdrop:checked, headerbar row:selected button.titlebutton:backdrop:checked,
     row:selected .titlebar button.titlebutton:backdrop:checked,
     .titlebar row:selected button.titlebutton:backdrop:checked {
-      color: #8e9192;
-      border-color: darkgray;
-      background-image: linear-gradient(to bottom, #d5d5d5);
+      color: #8d9091;
+      border-color: #a8a8a8;
+      background-image: linear-gradient(to bottom, #d4d4d4);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       border-color: #184472; }
     row:selected button:backdrop:insensitive, row:selected button.flat:backdrop:insensitive, row:selected button.sidebar-button:backdrop:insensitive, row:selected headerbar button.titlebutton:backdrop:insensitive, headerbar row:selected button.titlebutton:backdrop:insensitive,
     row:selected .titlebar button.titlebutton:backdrop:insensitive,
     .titlebar row:selected button.titlebutton:backdrop:insensitive {
       color: #c7c7c7;
-      border-color: darkgray;
+      border-color: #a8a8a8;
       background-image: linear-gradient(to bottom, #f4f4f4);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       border-color: #184472; }
-      row:selected button:backdrop:insensitive > .label, row:selected headerbar button.titlebutton:backdrop:insensitive > .label,
-      row:selected .titlebar button.titlebutton:backdrop:insensitive > .label, row:selected button.flat:backdrop:insensitive > .label, row:selected button.sidebar-button:backdrop:insensitive > .label, row:selected headerbar button.titlebutton:backdrop:insensitive > .label, headerbar row:selected button.titlebutton:backdrop:insensitive > .label,
+      row:selected button:backdrop:insensitive > .label, row:selected button.flat:backdrop:insensitive > .label, row:selected button.sidebar-button:backdrop:insensitive > .label, row:selected headerbar button.titlebutton:backdrop:insensitive > .label, headerbar row:selected button.titlebutton:backdrop:insensitive > .label,
       row:selected .titlebar button.titlebutton:backdrop:insensitive > .label,
       .titlebar row:selected button.titlebutton:backdrop:insensitive > .label {
         color: inherit; }
@@ -3851,13 +3794,11 @@ row:selected .titlebar button.titlebutton,
       row:selected .titlebar button.titlebutton:backdrop:insensitive:checked,
       .titlebar row:selected button.titlebutton:backdrop:insensitive:checked {
         color: #c7c7c7;
-        border-color: darkgray;
+        border-color: #a8a8a8;
         background-image: linear-gradient(to bottom, #e7e7e7);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         border-color: #184472; }
-        row:selected button:backdrop:insensitive:active > .label, row:selected headerbar button.titlebutton:backdrop:insensitive:active > .label,
-        row:selected .titlebar button.titlebutton:backdrop:insensitive:active > .label, row:selected button:backdrop:insensitive:checked > .label, row:selected headerbar button.titlebutton:backdrop:insensitive:checked > .label,
-        row:selected .titlebar button.titlebutton:backdrop:insensitive:checked > .label, row:selected button.flat:backdrop:insensitive:active > .label, row:selected button.sidebar-button:backdrop:insensitive:active > .label, row:selected headerbar button.titlebutton:backdrop:insensitive:active > .label, headerbar row:selected button.titlebutton:backdrop:insensitive:active > .label,
+        row:selected button:backdrop:insensitive:active > .label, row:selected button:backdrop:insensitive:checked > .label, row:selected button.flat:backdrop:insensitive:active > .label, row:selected button.sidebar-button:backdrop:insensitive:active > .label, row:selected headerbar button.titlebutton:backdrop:insensitive:active > .label, headerbar row:selected button.titlebutton:backdrop:insensitive:active > .label,
         row:selected .titlebar button.titlebutton:backdrop:insensitive:active > .label,
         .titlebar row:selected button.titlebutton:backdrop:insensitive:active > .label, row:selected button.flat:backdrop:insensitive:checked > .label, row:selected button.sidebar-button:backdrop:insensitive:checked > .label, row:selected headerbar button.titlebutton:backdrop:insensitive:checked > .label, headerbar row:selected button.titlebutton:backdrop:insensitive:checked > .label,
         row:selected .titlebar button.titlebutton:backdrop:insensitive:checked > .label,
@@ -3874,24 +3815,21 @@ row:selected .titlebar button.titlebutton,
     -gtk-icon-shadow: none;
     color: white; }
   row:selected button:insensitive {
-    color: #8e9192;
+    color: #8d9091;
     border-color: #a1a1a1;
     background-image: linear-gradient(to bottom, #f4f4f4);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     border-color: #184472; }
-    row:selected button:insensitive > .label, row:selected headerbar button.titlebutton:insensitive > .label,
-    row:selected .titlebar button.titlebutton:insensitive > .label {
+    row:selected button:insensitive > .label {
       color: inherit; }
     row:selected button:insensitive:active, row:selected button:insensitive:checked {
-      color: #8e9192;
+      color: #8d9091;
       border-color: #a1a1a1;
-      background-image: linear-gradient(to bottom, #ececec, #f4f4f4);
+      background-image: linear-gradient(to bottom, #ebebeb, #f4f4f4);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      row:selected button:insensitive:active > .label, row:selected headerbar button.titlebutton:insensitive:active > .label,
-      row:selected .titlebar button.titlebutton:insensitive:active > .label, row:selected button:insensitive:checked > .label, row:selected headerbar button.titlebutton:insensitive:checked > .label,
-      row:selected .titlebar button.titlebutton:insensitive:checked > .label {
+      row:selected button:insensitive:active > .label, row:selected button:insensitive:checked > .label {
         color: inherit; }
 
 row {
@@ -3962,9 +3900,9 @@ row {
     .app-notification button:insensitive, .app-notification button:backdrop:insensitive,
     .app-notification.frame button:insensitive,
     .app-notification.frame button:backdrop:insensitive {
-      color: #878a89;
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -4007,17 +3945,17 @@ calendar {
     calendar.button:hover {
       color: #2e3436; }
     calendar.button:backdrop {
-      color: rgba(142, 145, 146, 0.45); }
+      color: rgba(141, 144, 145, 0.45); }
     calendar.button:insensitive {
-      color: rgba(142, 145, 146, 0.45); }
+      color: rgba(141, 144, 145, 0.45); }
   calendar:inconsistent, calendar:inconsistent:backdrop {
     color: alpha(currentColor,0.55); }
   calendar.highlight, calendar.highlight:backdrop {
     font-size: smaller;
     color: #2e3436; }
   calendar:backdrop {
-    color: #333333;
-    border-color: darkgray; }
+    color: #323232;
+    border-color: #a8a8a8; }
 
 /***********
  * Dialogs *
@@ -4062,31 +4000,29 @@ messagedialog.csd .dialog-action-area button {
     -gtk-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); }
   messagedialog.csd .dialog-action-area button:insensitive {
-    color: #8e9192;
+    color: #8d9091;
     border-color: #a1a1a1;
     background-image: linear-gradient(to bottom, #f4f4f4);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    messagedialog.csd .dialog-action-area button:insensitive > .label, messagedialog.csd .dialog-action-area headerbar button.titlebutton:insensitive > .label,
-    messagedialog.csd .dialog-action-area .titlebar button.titlebutton:insensitive > .label {
+    messagedialog.csd .dialog-action-area button:insensitive > .label {
       color: inherit; }
   messagedialog.csd .dialog-action-area button:backdrop {
-    color: #8e9192;
-    border-color: darkgray;
+    color: #8d9091;
+    border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #ededed);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   messagedialog.csd .dialog-action-area button:backdrop:insensitive {
     color: #c7c7c7;
-    border-color: darkgray;
+    border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #f4f4f4);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    messagedialog.csd .dialog-action-area button:backdrop:insensitive > .label, messagedialog.csd .dialog-action-area headerbar button.titlebutton:backdrop:insensitive > .label,
-    messagedialog.csd .dialog-action-area .titlebar button.titlebutton:backdrop:insensitive > .label {
+    messagedialog.csd .dialog-action-area button:backdrop:insensitive > .label {
       color: inherit; }
   messagedialog.csd .dialog-action-area button.suggested-action {
     color: white;
@@ -4113,7 +4049,7 @@ messagedialog.csd .dialog-action-area button {
       -gtk-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); }
     messagedialog.csd .dialog-action-area button.suggested-action:backdrop {
-      color: #dbe9f7;
+      color: #dae8f7;
       border-color: #4a90d9;
       background-image: linear-gradient(to bottom, #4a90d9);
       text-shadow: none;
@@ -4121,23 +4057,21 @@ messagedialog.csd .dialog-action-area button {
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       messagedialog.csd .dialog-action-area button.suggested-action:backdrop:insensitive {
         color: #c7c7c7;
-        border-color: darkgray;
+        border-color: #a8a8a8;
         background-image: linear-gradient(to bottom, #f4f4f4);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        messagedialog.csd .dialog-action-area button.suggested-action:backdrop:insensitive > .label, messagedialog.csd .dialog-action-area headerbar button.suggested-action.titlebutton:backdrop:insensitive > .label,
-        messagedialog.csd .dialog-action-area .titlebar button.suggested-action.titlebutton:backdrop:insensitive > .label {
+        messagedialog.csd .dialog-action-area button.suggested-action:backdrop:insensitive > .label {
           color: inherit; }
     messagedialog.csd .dialog-action-area button.suggested-action:insensitive {
-      color: #8e9192;
+      color: #8d9091;
       border-color: #a1a1a1;
       background-image: linear-gradient(to bottom, #f4f4f4);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      messagedialog.csd .dialog-action-area button.suggested-action:insensitive > .label, messagedialog.csd .dialog-action-area headerbar button.suggested-action.titlebutton:insensitive > .label,
-      messagedialog.csd .dialog-action-area .titlebar button.suggested-action.titlebutton:insensitive > .label {
+      messagedialog.csd .dialog-action-area button.suggested-action:insensitive > .label {
         color: inherit; }
   messagedialog.csd .dialog-action-area button.destructive-action {
     color: white;
@@ -4164,7 +4098,7 @@ messagedialog.csd .dialog-action-area button {
       -gtk-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); }
     messagedialog.csd .dialog-action-area button.destructive-action:backdrop {
-      color: #fcd4d4;
+      color: #fbd4d4;
       border-color: #ef2929;
       background-image: linear-gradient(to bottom, #ef2929);
       text-shadow: none;
@@ -4172,23 +4106,21 @@ messagedialog.csd .dialog-action-area button {
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       messagedialog.csd .dialog-action-area button.destructive-action:backdrop:insensitive {
         color: #c7c7c7;
-        border-color: darkgray;
+        border-color: #a8a8a8;
         background-image: linear-gradient(to bottom, #f4f4f4);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        messagedialog.csd .dialog-action-area button.destructive-action:backdrop:insensitive > .label, messagedialog.csd .dialog-action-area headerbar button.destructive-action.titlebutton:backdrop:insensitive > .label,
-        messagedialog.csd .dialog-action-area .titlebar button.destructive-action.titlebutton:backdrop:insensitive > .label {
+        messagedialog.csd .dialog-action-area button.destructive-action:backdrop:insensitive > .label {
           color: inherit; }
     messagedialog.csd .dialog-action-area button.destructive-action:insensitive {
-      color: #8e9192;
+      color: #8d9091;
       border-color: #a1a1a1;
       background-image: linear-gradient(to bottom, #f4f4f4);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      messagedialog.csd .dialog-action-area button.destructive-action:insensitive > .label, messagedialog.csd .dialog-action-area headerbar button.destructive-action.titlebutton:insensitive > .label,
-      messagedialog.csd .dialog-action-area .titlebar button.destructive-action.titlebutton:insensitive > .label {
+      messagedialog.csd .dialog-action-area button.destructive-action:insensitive > .label {
         color: inherit; }
 messagedialog.csd .dialog-action-area button, messagedialog.csd .dialog-action-area button:hover, messagedialog.csd .dialog-action-area button:active, messagedialog.csd .dialog-action-area button:insensitive, messagedialog.csd .dialog-action-area button:backdrop, messagedialog.csd .dialog-action-area button:backdrop:insensitive, messagedialog.csd .dialog-action-area button.suggested-action, messagedialog.csd .dialog-action-area button.suggested-action:hover, messagedialog.csd .dialog-action-area button.suggested-action:active, messagedialog.csd .dialog-action-area button.suggested-action:backdrop, messagedialog.csd .dialog-action-area button.suggested-action:backdrop:insensitive, messagedialog.csd .dialog-action-area button.suggested-action:insensitive, messagedialog.csd .dialog-action-area button.destructive-action, messagedialog.csd .dialog-action-area button.destructive-action:hover, messagedialog.csd .dialog-action-area button.destructive-action:active, messagedialog.csd .dialog-action-area button.destructive-action:backdrop, messagedialog.csd .dialog-action-area button.destructive-action:backdrop:insensitive, messagedialog.csd .dialog-action-area button.destructive-action:insensitive {
   border-left-style: solid;
@@ -4205,7 +4137,7 @@ messagedialog.csd .dialog-action-area button:first-child {
 GtkFileChooserDialog .dialog-action-box {
   border-top: 1px solid #a1a1a1; }
   GtkFileChooserDialog .dialog-action-box:backdrop {
-    border-top-color: darkgray; }
+    border-top-color: #a8a8a8; }
 
 /***********
  * Sidebar *
@@ -4246,9 +4178,7 @@ placessidebar row {
     padding: 5px;
     border-radius: 100%;
     outline-radius: 100%; }
-    button.sidebar-button:not(:hover):not(:active) > image, headerbar button.sidebar-button.titlebutton:not(:hover):not(:active) > image,
-    .titlebar button.sidebar-button.titlebutton:not(:hover):not(:active) > image, button.sidebar-button:backdrop > image, headerbar button.sidebar-button.titlebutton:backdrop > image,
-    .titlebar button.sidebar-button.titlebutton:backdrop > image {
+    button.sidebar-button:not(:hover):not(:active) > image, button.sidebar-button:backdrop > image {
       opacity: 0.7; }
 placessidebar row:selected:active {
   box-shadow: none; }
@@ -4279,7 +4209,7 @@ paned {
   paned separator {
     background-color: #a1a1a1; }
     paned separator:backdrop {
-      background-color: darkgray; }
+      background-color: #a8a8a8; }
   paned separator:selected {
     background-color: #4a90d9; }
 
@@ -4294,7 +4224,7 @@ paned.wide {
   paned.wide.vertical separator {
     border-style: solid none; }
   paned.wide separator:backdrop {
-    border-color: darkgray; }
+    border-color: #a8a8a8; }
 
 /**************
  * GtkInfoBar *
@@ -4361,29 +4291,22 @@ infobar {
     .question button:insensitive,
     .warning button:insensitive,
     .error button:insensitive {
-      color: #b2d0ef;
+      color: #b2cfee;
       border-color: #1c5187;
-      background-image: linear-gradient(to bottom, #65a1df);
+      background-image: linear-gradient(to bottom, #65a0de);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .info button:insensitive > .label, .info headerbar button.titlebutton:insensitive > .label,
-      .info .titlebar button.titlebutton:insensitive > .label,
+      .info button:insensitive > .label,
       .question button:insensitive > .label,
-      .question headerbar button.titlebutton:insensitive > .label,
-      .question .titlebar button.titlebutton:insensitive > .label,
       .warning button:insensitive > .label,
-      .warning headerbar button.titlebutton:insensitive > .label,
-      .warning .titlebar button.titlebutton:insensitive > .label,
-      .error button:insensitive > .label,
-      .error headerbar button.titlebutton:insensitive > .label,
-      .error .titlebar button.titlebutton:insensitive > .label {
+      .error button:insensitive > .label {
         color: inherit; }
     .info button:backdrop,
     .question button:backdrop,
     .warning button:backdrop,
     .error button:backdrop {
-      color: #dbe9f7;
+      color: #dae8f7;
       border-color: #4a90d9;
       background-image: linear-gradient(to bottom, #4a90d9);
       text-shadow: none;
@@ -4394,24 +4317,17 @@ infobar {
       .question button:backdrop:insensitive,
       .warning button:backdrop:insensitive,
       .error button:backdrop:insensitive {
-        color: #9bc2ea;
-        border-color: #65a1df;
-        background-image: linear-gradient(to bottom, #65a1df);
+        color: #9ac1e9;
+        border-color: #65a0de;
+        background-image: linear-gradient(to bottom, #65a0de);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         border-color: #1c5187; }
-        .info button:backdrop:insensitive > .label, .info headerbar button.titlebutton:backdrop:insensitive > .label,
-        .info .titlebar button.titlebutton:backdrop:insensitive > .label,
+        .info button:backdrop:insensitive > .label,
         .question button:backdrop:insensitive > .label,
-        .question headerbar button.titlebutton:backdrop:insensitive > .label,
-        .question .titlebar button.titlebutton:backdrop:insensitive > .label,
         .warning button:backdrop:insensitive > .label,
-        .warning headerbar button.titlebutton:backdrop:insensitive > .label,
-        .warning .titlebar button.titlebutton:backdrop:insensitive > .label,
-        .error button:backdrop:insensitive > .label,
-        .error headerbar button.titlebutton:backdrop:insensitive > .label,
-        .error .titlebar button.titlebutton:backdrop:insensitive > .label {
+        .error button:backdrop:insensitive > .label {
           color: inherit; }
   .info label:selected, .info label:selected:focus, .info label:selected:hover,
   .question label:selected,
@@ -4526,8 +4442,8 @@ colorswatch {
       -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
       box-shadow: inset 0 1px white, 0 1px white; }
     colorswatch#add-color-button:backdrop {
-      color: #8e9192;
-      border-color: darkgray;
+      color: #8d9091;
+      border-color: #a8a8a8;
       background-image: linear-gradient(to bottom, #ededed);
       text-shadow: none;
       -gtk-icon-shadow: none;
@@ -4597,7 +4513,7 @@ decoration {
     border-radius: 0;
     margin: 4px;
     background-color: #ededed;
-    border: solid 1px darkgray;
+    border: solid 1px #a8a8a8;
     box-shadow: none; }
 
 headerbar button.titlebutton,
@@ -4628,7 +4544,7 @@ textview text selection, textview text selection:focus,
   textview text selection:insensitive,
   .view selection:insensitive, iconview:insensitive:selected, flowbox flowboxchild:insensitive:selected, label selection:insensitive, entry selection:insensitive, spinbutton selection:insensitive, modelbutton.flat:insensitive:selected,
   .menuitem.button.flat:insensitive:selected, treeview.view:insensitive:selected, row:insensitive:selected, .sidebar :insensitive:selected, placessidebar row:selected:insensitive label {
-    color: #a5c8ec; }
+    color: #a4c7ec; }
   textview text selection:backdrop,
   .view selection:backdrop, iconview:backdrop:selected, flowbox flowboxchild:backdrop:selected, label selection:backdrop, entry selection:backdrop, spinbutton selection:backdrop, modelbutton.flat:backdrop:selected,
   .menuitem.button.flat:backdrop:selected, treeview.view:backdrop:selected, row:backdrop:selected, .sidebar :backdrop:selected {
@@ -4720,9 +4636,9 @@ popover.touch-selection {
       -gtk-icon-shadow: none;
       outline-color: rgba(238, 238, 236, 0.3); }
     popover.touch-selection button:insensitive, popover.touch-selection button:backdrop:insensitive {
-      color: #878a89;
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -4857,13 +4773,13 @@ base background color of insensitive widgets */
 @define-color insensitive_bg_color #f4f4f4;
 /*
 text foreground color of insensitive widgets */
-@define-color insensitive_fg_color #8e9192;
+@define-color insensitive_fg_color #8d9091;
 /*
 insensitive text widgets and the like base background color */
 @define-color insensitive_base_color #ffffff;
 /*
 widget text/foreground color on backdrop windows */
-@define-color theme_unfocused_fg_color #8e9192;
+@define-color theme_unfocused_fg_color #8d9091;
 /*
 text color for entries, views and content in general on backdrop windows */
 @define-color theme_unfocused_text_color black;
@@ -4884,7 +4800,7 @@ widgets main borders color */
 @define-color borders #a1a1a1;
 /*
 widgets main borders color on backdrop windows */
-@define-color unfocused_borders darkgray;
+@define-color unfocused_borders #a8a8a8;
 /*
 these are pretty self explicative */
 @define-color warning_color #f57900;
@@ -4894,7 +4810,7 @@ these are pretty self explicative */
 these colors are exported for the window manager and shouldn't be used in applications,
 read if you used those and something break with a version upgrade you're on your own... */
 @define-color wm_title shade(#2e3436, 1.8);
-@define-color wm_unfocused_title #8e9192;
+@define-color wm_unfocused_title #8d9091;
 @define-color wm_highlight white;
 @define-color wm_borders_edge white;
 @define-color wm_bg_a shade(#ededed, 1.2);
diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss
index cb1daea32e..28f9e7abaa 100644
--- a/gtk/theme/HighContrast/_common.scss
+++ b/gtk/theme/HighContrast/_common.scss
@@ -167,7 +167,7 @@ spinner {
   background-color: blue;
   opacity: 0; // non spinning spinner makes no sense
   -gtk-icon-source: -gtk-icontheme('process-working-symbolic');
-  &:active {
+  &:checked {
     opacity: 1;
     animation: spin 1s linear infinite;
     &:insensitive {
diff --git a/gtk/theme/HighContrast/gtk.css b/gtk/theme/HighContrast/gtk.css
index 6ed83705cf..fe5145edef 100644
--- a/gtk/theme/HighContrast/gtk.css
+++ b/gtk/theme/HighContrast/gtk.css
@@ -5,15 +5,15 @@
 @define-color theme_selected_bg_color #000;
 @define-color theme_selected_fg_color #fff;
 @define-color insensitive_bg_color white;
-@define-color insensitive_fg_color gray;
+@define-color insensitive_fg_color #7f7f7f;
 @define-color insensitive_base_color #fff;
 @define-color theme_unfocused_fg_color #000;
 @define-color theme_unfocused_bg_color #fff;
 @define-color theme_unfocused_base_color #fff;
 @define-color theme_unfocused_selected_bg_color #000;
 @define-color theme_unfocused_selected_fg_color #fff;
-@define-color borders gray;
-@define-color unfocused_borders #8d8d8d;
+@define-color borders #7f7f7f;
+@define-color unfocused_borders #8b8b8b;
 @define-color warning_color #f57900;
 @define-color error_color #cc0000;
 @define-color success_color #73d216;
@@ -86,7 +86,7 @@
     color: #000; }
   .gtkstyle-fallback:insensitive {
     background-color: white;
-    color: gray; }
+    color: #7f7f7f; }
   .gtkstyle-fallback:selected {
     background-color: #000;
     color: #fff; }
@@ -121,7 +121,7 @@ flowbox flowboxchild {
     outline-offset: -2px; }
 
 label:insensitive, label:backdrop:insensitive {
-  color: gray; }
+  color: #7f7f7f; }
 
 /*********************
  * Spinner Animation *
@@ -134,10 +134,10 @@ spinner {
   background-color: blue;
   opacity: 0;
   -gtk-icon-source: -gtk-icontheme("process-working-symbolic"); }
-  spinner:active {
+  spinner:checked {
     opacity: 1;
     animation: spin 1s linear infinite; }
-    spinner:active:insensitive {
+    spinner:checked:insensitive {
       opacity: 0.5; }
 
 /****************
@@ -151,15 +151,15 @@ entry, spinbutton {
   background-color: transparent;
   border-style: solid;
   background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-  border-color: gray;
-  box-shadow: inset 0 2px 2px -2px gray; }
+  border-color: #7f7f7f;
+  box-shadow: inset 0 2px 2px -2px #7f7f7f; }
   entry.flat, entry.flat:focus, spinbutton.flat, spinbutton.flat:focus {
     padding: 2px;
     background-color: transparent;
     border-style: solid;
     background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-    border-color: gray;
-    box-shadow: inset 0 2px 2px -2px gray;
+    border-color: #7f7f7f;
+    box-shadow: inset 0 2px 2px -2px #7f7f7f;
     border: none;
     border-radius: 0; }
   entry:focus, spinbutton:focus {
@@ -167,13 +167,13 @@ entry, spinbutton {
     border-style: solid;
     background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
     border-color: #000;
-    box-shadow: inset 0 2px 2px -2px gray, inset 0 0 2px 1px #cccccc; }
+    box-shadow: inset 0 2px 2px -2px #7f7f7f, inset 0 0 2px 1px #cccccc; }
   entry:insensitive, spinbutton:insensitive {
     background-color: transparent;
     border-style: solid;
     background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-    color: gray;
-    border-color: gray;
+    color: #7f7f7f;
+    border-color: #7f7f7f;
     background-image: linear-gradient(to bottom, white);
     box-shadow: none; }
   entry:backdrop, spinbutton:backdrop {
@@ -187,7 +187,7 @@ entry, spinbutton {
     background-color: transparent;
     border-style: solid;
     background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-    color: gray;
+    color: #7f7f7f;
     background-image: linear-gradient(to bottom, #fff);
     box-shadow: 0 1px rgba(255, 255, 255, 0); }
   entry selection, entry selection:backdrop, spinbutton selection, spinbutton selection:backdrop {
@@ -219,10 +219,10 @@ entry, spinbutton {
     background-color: transparent;
     border-style: solid;
     background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-    border-color: gray;
-    box-shadow: inset 0 2px 2px -2px gray;
+    border-color: #7f7f7f;
+    box-shadow: inset 0 2px 2px -2px #7f7f7f;
     background-image: linear-gradient(to bottom, #fff);
-    border-bottom-color: #d9d9d9;
+    border-bottom-color: #d8d8d8;
     box-shadow: none; }
     .linked.vertical entry:focus, .linked.vertical spinbutton:focus {
       border-color: #000;
@@ -231,19 +231,19 @@ entry, spinbutton {
       background-color: transparent;
       border-style: solid;
       background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-      color: gray;
-      border-color: gray;
+      color: #7f7f7f;
+      border-color: #7f7f7f;
       background-image: linear-gradient(to bottom, white);
       box-shadow: none;
-      border-bottom-color: #d9d9d9; }
+      border-bottom-color: #d8d8d8; }
       .linked.vertical entry:insensitive:backdrop, .linked.vertical spinbutton:insensitive:backdrop {
         background-color: transparent;
         border-style: solid;
         background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-        color: gray;
+        color: #7f7f7f;
         background-image: linear-gradient(to bottom, #fff);
         box-shadow: 0 1px rgba(255, 255, 255, 0);
-        border-bottom-color: #dddddd; }
+        border-bottom-color: gainsboro; }
     .linked.vertical entry:backdrop, .linked.vertical spinbutton:backdrop {
       background-color: transparent;
       border-style: solid;
@@ -251,37 +251,37 @@ entry, spinbutton {
       color: #000;
       background-image: linear-gradient(to bottom, #fff);
       box-shadow: 0 1px rgba(255, 255, 255, 0);
-      border-bottom-color: #dddddd; }
+      border-bottom-color: gainsboro; }
     .linked.vertical entry:first-child, .linked.vertical spinbutton:first-child {
       background-color: transparent;
       border-style: solid;
       background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-      border-color: gray;
-      box-shadow: inset 0 2px 2px -2px gray;
-      border-bottom-color: #d9d9d9; }
+      border-color: #7f7f7f;
+      box-shadow: inset 0 2px 2px -2px #7f7f7f;
+      border-bottom-color: #d8d8d8; }
       .linked.vertical entry:first-child:focus, .linked.vertical spinbutton:first-child:focus {
         background-color: transparent;
         border-style: solid;
         background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
         border-color: #000;
-        box-shadow: inset 0 2px 2px -2px gray, inset 0 0 2px 1px #cccccc; }
+        box-shadow: inset 0 2px 2px -2px #7f7f7f, inset 0 0 2px 1px #cccccc; }
       .linked.vertical entry:first-child:insensitive, .linked.vertical spinbutton:first-child:insensitive {
         background-color: transparent;
         border-style: solid;
         background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-        color: gray;
-        border-color: gray;
+        color: #7f7f7f;
+        border-color: #7f7f7f;
         background-image: linear-gradient(to bottom, white);
         box-shadow: none;
-        border-bottom-color: #dddddd; }
+        border-bottom-color: gainsboro; }
         .linked.vertical entry:first-child:insensitive:backdrop, .linked.vertical spinbutton:first-child:insensitive:backdrop {
           background-color: transparent;
           border-style: solid;
           background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-          color: gray;
+          color: #7f7f7f;
           background-image: linear-gradient(to bottom, #fff);
           box-shadow: 0 1px rgba(255, 255, 255, 0);
-          border-bottom-color: #dddddd;
+          border-bottom-color: gainsboro;
           border-top-style: solid; }
       .linked.vertical entry:first-child:backdrop, .linked.vertical spinbutton:first-child:backdrop {
         background-color: transparent;
@@ -290,13 +290,13 @@ entry, spinbutton {
         color: #000;
         background-image: linear-gradient(to bottom, #fff);
         box-shadow: 0 1px rgba(255, 255, 255, 0);
-        border-bottom-color: #dddddd; }
+        border-bottom-color: gainsboro; }
     .linked.vertical entry:last-child, .linked.vertical spinbutton:last-child {
       background-color: transparent;
       border-style: solid;
       background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-      border-color: gray;
-      box-shadow: inset 0 2px 2px -2px gray;
+      border-color: #7f7f7f;
+      box-shadow: inset 0 2px 2px -2px #7f7f7f;
       border-top-width: 0;
       background-image: linear-gradient(to bottom, #fff);
       box-shadow: none; }
@@ -307,15 +307,15 @@ entry, spinbutton {
         background-color: transparent;
         border-style: solid;
         background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-        color: gray;
-        border-color: gray;
+        color: #7f7f7f;
+        border-color: #7f7f7f;
         background-image: linear-gradient(to bottom, white);
         box-shadow: none; }
         .linked.vertical entry:last-child:insensitive:backdrop, .linked.vertical spinbutton:last-child:insensitive:backdrop {
           background-color: transparent;
           border-style: solid;
           background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-          color: gray;
+          color: #7f7f7f;
           background-image: linear-gradient(to bottom, #fff);
           box-shadow: 0 1px rgba(255, 255, 255, 0); }
       .linked.vertical entry:last-child:backdrop, .linked.vertical spinbutton:last-child:backdrop {
@@ -333,7 +333,7 @@ entry, spinbutton {
       border-style: solid;
       background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
       border-color: #cc0000;
-      box-shadow: inset 0 2px 2px -2px gray, inset 0 0 2px 1px #f5cccc; }
+      box-shadow: inset 0 2px 2px -2px #7f7f7f, inset 0 0 2px 1px #f4cccc; }
     entry.error:selected, entry.error:selected:focus, spinbutton.error:selected, spinbutton.error:selected:focus {
       background-color: #cc0000; }
   entry.warning, spinbutton.warning {
@@ -344,7 +344,7 @@ entry, spinbutton {
       border-style: solid;
       background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
       border-color: #f57900;
-      box-shadow: inset 0 2px 2px -2px gray, inset 0 0 2px 1px #fde4cc; }
+      box-shadow: inset 0 2px 2px -2px #7f7f7f, inset 0 0 2px 1px #fde4cc; }
     entry.warning:selected, entry.warning:selected:focus, spinbutton.warning:selected, spinbutton.warning:selected:focus {
       background-color: #f57900; }
 
@@ -365,13 +365,13 @@ button {
   color: #000;
   background-image: none;
   background-color: #fff;
-  border-color: gray; }
+  border-color: #7f7f7f; }
   button:hover, button.flat:hover, button.sidebar-button:hover {
     border-width: 2px;
     border-style: solid;
     color: #000;
     background-color: #fff;
-    border-color: gray;
+    border-color: #7f7f7f;
     background-image: none;
     -gtk-icon-effect: highlight; }
   button:active, button.flat:active, button.sidebar-button:active, button:checked, button.flat:checked, button.sidebar-button:checked {
@@ -380,14 +380,14 @@ button {
     background-image: none;
     color: white;
     background-color: black;
-    border-color: gray;
+    border-color: #7f7f7f;
     transition-duration: 50ms; }
   button:backdrop, button.flat:backdrop, button.sidebar-button:backdrop {
     border-width: 2px;
     border-style: solid;
     color: #000;
     background-color: #fff;
-    border-color: #8d8d8d;
+    border-color: #8b8b8b;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
@@ -395,37 +395,37 @@ button {
       border-width: 2px;
       border-style: solid;
       color: white;
-      background-color: #8d8d8d;
-      border-color: #8d8d8d;
+      background-color: #8b8b8b;
+      border-color: #8b8b8b;
       background-image: none; }
     button:backdrop:insensitive, button.flat:backdrop:insensitive, button.sidebar-button:backdrop:insensitive {
       border-width: 2px;
       border-style: solid;
-      color: gray;
+      color: #7f7f7f;
       background-color: white;
-      border-color: #8d8d8d;
+      border-color: #8b8b8b;
       background-image: none; }
     button:backdrop:insensitive:active, button.flat:backdrop:insensitive:active, button.sidebar-button:backdrop:insensitive:active {
       border-width: 2px;
       border-style: solid;
-      color: gray;
-      border-color: #8d8d8d;
+      color: #7f7f7f;
+      border-color: #8b8b8b;
       background-image: none;
-      background-color: #f6f6f6; }
+      background-color: whitesmoke; }
   button:insensitive {
     border-width: 2px;
     border-style: solid;
-    color: gray;
+    color: #7f7f7f;
     background-color: white;
-    border-color: gray;
+    border-color: #7f7f7f;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
     button:insensitive:active, button:insensitive.flat:active, button.sidebar-button:insensitive:active {
       border-width: 2px;
       border-style: solid;
-      color: gray;
-      border-color: gray;
+      color: #7f7f7f;
+      border-color: #7f7f7f;
       background-image: none;
       background-color: white; }
   .osd button {
@@ -456,7 +456,7 @@ button {
       border-width: 2px;
       border-style: solid;
       border-color: rgba(255, 255, 255, 0.2);
-      color: gray; }
+      color: #7f7f7f; }
     .osd button:backdrop {
       border-width: 2px;
       border-style: solid; }
@@ -493,16 +493,16 @@ button {
       button.suggested-action:backdrop:insensitive {
         border-width: 2px;
         border-style: solid;
-        color: gray;
+        color: #7f7f7f;
         background-color: white;
-        border-color: #8d8d8d;
+        border-color: #8b8b8b;
         background-image: none; }
     button.suggested-action:insensitive {
       border-width: 2px;
       border-style: solid;
-      color: gray;
+      color: #7f7f7f;
       background-color: white;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -539,16 +539,16 @@ button {
       button.destructive-action:backdrop:insensitive {
         border-width: 2px;
         border-style: solid;
-        color: gray;
+        color: #7f7f7f;
         background-color: white;
-        border-color: #8d8d8d;
+        border-color: #8b8b8b;
         background-image: none; }
     button.destructive-action:insensitive {
       border-width: 2px;
       border-style: solid;
-      color: gray;
+      color: #7f7f7f;
       background-color: white;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -568,13 +568,13 @@ button {
   color: #000;
   background-image: none;
   background-color: #fff;
-  border-color: gray; }
+  border-color: #7f7f7f; }
   .inline-toolbar toolbutton > button:hover {
     border-width: 2px;
     border-style: solid;
     color: #000;
     background-color: #fff;
-    border-color: gray;
+    border-color: #7f7f7f;
     background-image: none; }
   .inline-toolbar toolbutton > button:active {
     border-width: 2px;
@@ -582,21 +582,21 @@ button {
     background-image: none;
     color: white;
     background-color: black;
-    border-color: gray; }
+    border-color: #7f7f7f; }
   .inline-toolbar toolbutton > button:insensitive {
     border-width: 2px;
     border-style: solid;
-    color: gray;
+    color: #7f7f7f;
     background-color: white;
-    border-color: gray;
+    border-color: #7f7f7f;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
   .inline-toolbar toolbutton > button:insensitive:active {
     border-width: 2px;
     border-style: solid;
-    color: gray;
-    border-color: gray;
+    color: #7f7f7f;
+    border-color: #7f7f7f;
     background-image: none;
     background-color: white; }
   .inline-toolbar toolbutton > button:backdrop {
@@ -604,7 +604,7 @@ button {
     border-style: solid;
     color: #000;
     background-color: #fff;
-    border-color: #8d8d8d;
+    border-color: #8b8b8b;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
@@ -612,23 +612,23 @@ button {
     border-width: 2px;
     border-style: solid;
     color: white;
-    background-color: #8d8d8d;
-    border-color: #8d8d8d;
+    background-color: #8b8b8b;
+    border-color: #8b8b8b;
     background-image: none; }
   .inline-toolbar toolbutton > button:backdrop:insensitive {
     border-width: 2px;
     border-style: solid;
-    color: gray;
+    color: #7f7f7f;
     background-color: white;
-    border-color: #8d8d8d;
+    border-color: #8b8b8b;
     background-image: none; }
   .inline-toolbar toolbutton > button:backdrop:insensitive:active {
     border-width: 2px;
     border-style: solid;
-    color: gray;
-    border-color: #8d8d8d;
+    color: #7f7f7f;
+    border-color: #8b8b8b;
     background-image: none;
-    background-color: #f6f6f6; }
+    background-color: whitesmoke; }
 
 toolbar.inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton > button.sidebar-button {
   border-radius: 0;
@@ -718,7 +718,7 @@ modelbutton.flat,
       background-color: #000; }
   modelbutton.flat:insensitive,
   .menuitem.button.flat:insensitive {
-    color: gray; }
+    color: #7f7f7f; }
 
 button.color {
   padding: 4px; }
@@ -763,12 +763,12 @@ spinbutton {
     background-color: transparent;
     border-style: solid;
     background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-    border-color: gray;
-    box-shadow: inset 0 2px 2px -2px gray;
+    border-color: #7f7f7f;
+    box-shadow: inset 0 2px 2px -2px #7f7f7f;
     background-image: none;
     border-width: 0 0 0 1px;
-    border-color: rgba(128, 128, 128, 0.3);
-    color: #0d0d0d;
+    border-color: rgba(127, 127, 127, 0.3);
+    color: #0c0c0c;
     border-radius: 0; }
     spinbutton button:dir(rtl) {
       border-width: 0 1px 0 0; }
@@ -777,17 +777,17 @@ spinbutton {
       background-color: rgba(0, 0, 0, 0.05); }
     spinbutton button:insensitive {
       box-shadow: none;
-      color: rgba(128, 128, 128, 0.3); }
+      color: rgba(127, 127, 127, 0.3); }
     spinbutton button:active {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2);
       background-color: rgba(0, 0, 0, 0.1); }
     spinbutton button:backdrop {
-      border-color: rgba(141, 141, 141, 0.3);
+      border-color: rgba(139, 139, 139, 0.3);
       background-color: #fff;
       box-shadow: none; }
     spinbutton button:backdrop:insensitive {
       box-shadow: none;
-      color: rgba(128, 128, 128, 0.3);
+      color: rgba(127, 127, 127, 0.3);
       border-width: 0 0 0 1px; }
       spinbutton button:backdrop:insensitive:dir(rtl) {
         border-width: 0 1px 0 0; }
@@ -797,27 +797,27 @@ spinbutton {
     color: #000;
     background-image: none;
     background-color: #fff;
-    border-color: gray; }
+    border-color: #7f7f7f; }
     spinbutton.vertical button:first-child:active {
       border-width: 2px;
       border-style: solid;
       background-image: none;
       color: white;
       background-color: black;
-      border-color: gray; }
+      border-color: #7f7f7f; }
     spinbutton.vertical button:first-child:hover {
       border-width: 2px;
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none; }
     spinbutton.vertical button:first-child:insensitive {
       border-width: 2px;
       border-style: solid;
-      color: gray;
+      color: #7f7f7f;
       background-color: white;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -826,7 +826,7 @@ spinbutton {
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: #8d8d8d;
+      border-color: #8b8b8b;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -836,27 +836,27 @@ spinbutton {
     color: #000;
     background-image: none;
     background-color: #fff;
-    border-color: gray; }
+    border-color: #7f7f7f; }
     spinbutton.vertical button:last-child:active {
       border-width: 2px;
       border-style: solid;
       background-image: none;
       color: white;
       background-color: black;
-      border-color: gray; }
+      border-color: #7f7f7f; }
     spinbutton.vertical button:last-child:hover {
       border-width: 2px;
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none; }
     spinbutton.vertical button:last-child:insensitive {
       border-width: 2px;
       border-style: solid;
-      color: gray;
+      color: #7f7f7f;
       background-color: white;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -865,16 +865,16 @@ spinbutton {
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: #8d8d8d;
+      border-color: #8b8b8b;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
   spinbutton.vertical button:backdrop:insensitive {
     border-width: 2px;
     border-style: solid;
-    color: gray;
+    color: #7f7f7f;
     background-color: white;
-    border-color: #8d8d8d;
+    border-color: #8b8b8b;
     background-image: none; }
   spinbutton.vertical.entry {
     border-radius: 0; }
@@ -896,7 +896,7 @@ combobox {
   text-shadow: 0 1px white;
   -gtk-icon-shadow: 0 1px white; }
   combobox:insensitive {
-    color: gray;
+    color: #7f7f7f;
     text-shadow: none;
     -gtk-icon-shadow: none; }
   combobox:backdrop {
@@ -904,7 +904,7 @@ combobox {
     text-shadow: none;
     -gtk-icon-shadow: none; }
   combobox:backdrop:insensitive {
-    color: gray; }
+    color: #7f7f7f; }
   combobox .menuitem {
     text-shadow: none; }
   combobox separator.vertical,
@@ -940,10 +940,10 @@ toolbar {
     padding: 3px;
     border-radius: 0  0 4px 4px; }
   toolbar.vertical {
-    border-right: 1px solid gray; }
+    border-right: 1px solid #7f7f7f; }
     toolbar.vertical:dir(rtl) {
       border-right: none;
-      border-left: 1px solid gray; }
+      border-left: 1px solid #7f7f7f; }
 
 searchbar {
   border-width: 0 0 1px;
@@ -951,12 +951,12 @@ searchbar {
 
 toolbar.inline-toolbar, searchbar {
   border-style: solid;
-  border-color: gray;
-  background-color: #d9d9d9;
-  box-shadow: inset 0 2px 3px -1px #a4a4a4; }
+  border-color: #7f7f7f;
+  background-color: #d8d8d8;
+  box-shadow: inset 0 2px 3px -1px #a2a2a2; }
   toolbar.inline-toolbar:backdrop, searchbar:backdrop {
-    border-color: #8d8d8d;
-    background-color: #d7d7d7;
+    border-color: #8b8b8b;
+    background-color: #d6d6d6;
     box-shadow: none; }
 
 /***************
@@ -966,15 +966,15 @@ toolbar.inline-toolbar, searchbar {
 headerbar {
   border-width: 0 0 1px;
   border-style: solid;
-  border-color: gray;
+  border-color: #7f7f7f;
   border-radius: 7px 7px 0 0;
   background-color: transparent;
   background-image: linear-gradient(to bottom, white, #fff);
-  box-shadow: inset 0 -1px #d9d9d9, inset 0 1px #fff;
+  box-shadow: inset 0 -1px #d8d8d8, inset 0 1px #fff;
   padding: 6px; }
   .titlebar:backdrop,
   headerbar:backdrop {
-    border-color: #8d8d8d;
+    border-color: #8b8b8b;
     background-color: #fff;
     background-image: none;
     box-shadow: none; }
@@ -1000,7 +1000,7 @@ headerbar {
     color: black;
     text-shadow: 0 1px rgba(0, 0, 0, 0.5);
     background-image: linear-gradient(to bottom, #0d0d0d, #050505);
-    box-shadow: inset 0 -1px #d9d9d9, inset 0 1px gray; }
+    box-shadow: inset 0 -1px #d8d8d8, inset 0 1px #7f7f7f; }
     .titlebar.selection-mode button,
     headerbar.selection-mode button {
       border-width: 2px;
@@ -1029,9 +1029,9 @@ headerbar {
       headerbar.selection-mode button:insensitive {
         border-width: 2px;
         border-style: solid;
-        color: gray;
+        color: #7f7f7f;
         background-color: white;
-        border-color: gray;
+        border-color: #7f7f7f;
         background-image: none;
         text-shadow: none;
         -gtk-icon-shadow: none; }
@@ -1050,9 +1050,9 @@ headerbar {
       headerbar.selection-mode button:backdrop:insensitive {
         border-width: 2px;
         border-style: solid;
-        color: gray;
+        color: #7f7f7f;
         background-color: white;
-        border-color: #8d8d8d;
+        border-color: #8b8b8b;
         background-image: none; }
       .titlebar.selection-mode button.suggested-action,
       headerbar.selection-mode button.suggested-action {
@@ -1061,14 +1061,14 @@ headerbar {
         color: #000;
         background-image: none;
         background-color: #fff;
-        border-color: gray; }
+        border-color: #7f7f7f; }
         .titlebar.selection-mode button.suggested-action:hover,
         headerbar.selection-mode button.suggested-action:hover {
           border-width: 2px;
           border-style: solid;
           color: #000;
           background-color: #fff;
-          border-color: gray;
+          border-color: #7f7f7f;
           background-image: none; }
         .titlebar.selection-mode button.suggested-action:active,
         headerbar.selection-mode button.suggested-action:active {
@@ -1077,14 +1077,14 @@ headerbar {
           background-image: none;
           color: white;
           background-color: black;
-          border-color: gray; }
+          border-color: #7f7f7f; }
         .titlebar.selection-mode button.suggested-action:insensitive,
         headerbar.selection-mode button.suggested-action:insensitive {
           border-width: 2px;
           border-style: solid;
-          color: gray;
+          color: #7f7f7f;
           background-color: white;
-          border-color: gray;
+          border-color: #7f7f7f;
           background-image: none;
           text-shadow: none;
           -gtk-icon-shadow: none; }
@@ -1094,7 +1094,7 @@ headerbar {
           border-style: solid;
           color: #000;
           background-color: #fff;
-          border-color: #8d8d8d;
+          border-color: #8b8b8b;
           background-image: none;
           text-shadow: none;
           -gtk-icon-shadow: none; }
@@ -1102,9 +1102,9 @@ headerbar {
         headerbar.selection-mode button.suggested-action:backdrop:insensitive {
           border-width: 2px;
           border-style: solid;
-          color: gray;
+          color: #7f7f7f;
           background-color: white;
-          border-color: #8d8d8d;
+          border-color: #8b8b8b;
           background-image: none; }
     .titlebar.selection-mode .selection-menu,
     headerbar.selection-mode .selection-menu {
@@ -1147,26 +1147,26 @@ treeview.view {
   -GtkTreeView-tree-line-width: 1;
   -GtkTreeView-tree-line-pattern: '';
   -GtkTreeView-expander-size: 16;
-  border-left-color: gray;
+  border-left-color: #7f7f7f;
   border-top-color: #fff; }
   treeview.view:selected {
     border-radius: 0; }
   treeview.view:selected, treeview.view:backdrop:selected {
-    border-left-color: gray;
+    border-left-color: #7f7f7f;
     border-top-color: rgba(0, 0, 0, 0.1); }
   treeview.view:insensitive {
-    color: gray; }
+    color: #7f7f7f; }
     treeview.view:insensitive:selected {
       color: #666666; }
       treeview.view:insensitive:selected:backdrop {
-        color: gray; }
+        color: #7f7f7f; }
     treeview.view:insensitive:backdrop {
-      color: gray; }
+      color: #7f7f7f; }
   treeview.view.separator:backdrop {
     color: rgba(0, 0, 0, 0.1); }
   treeview.view:backdrop {
     color: #000;
-    border-left-color: gray;
+    border-left-color: #7f7f7f;
     border-top: #fff; }
   treeview.view.dnd {
     border-style: solid none;
@@ -1174,21 +1174,21 @@ treeview.view {
     border-color: black; }
   treeview.view.expander {
     -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
-    color: #4d4d4d; }
+    color: #4c4c4c; }
     treeview.view.expander:dir(rtl) {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
     treeview.view.expander:hover {
       color: #000; }
     treeview.view.expander:selected {
-      color: #b3b3b3; }
+      color: #b2b2b2; }
       treeview.view.expander:selected:hover {
         color: #fff; }
       treeview.view.expander:selected:backdrop {
-        color: #b3b3b3; }
+        color: #b2b2b2; }
     treeview.view.expander:checked {
       -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
     treeview.view.expander:backdrop {
-      color: #4d4d4d; }
+      color: #4c4c4c; }
   treeview.view.progressbar {
     color: #fff;
     border: 1px solid #000;
@@ -1209,12 +1209,12 @@ treeview.view {
       border-style: solid;
       border-color: #000; }
   treeview.view header button {
-    color: gray;
+    color: #7f7f7f;
     font-weight: bold;
     text-shadow: none;
     box-shadow: none; }
     treeview.view header button:hover {
-      color: #404040;
+      color: #3f3f3f;
       box-shadow: none; }
     treeview.view header button:active {
       color: #fff; }
@@ -1234,7 +1234,7 @@ treeview.view header button, treeview.view header button:hover, treeview.view he
   treeview.view header button:backdrop {
     border-color: #fff;
     border-width: 0 1px 1px 0;
-    color: gray;
+    color: #7f7f7f;
     background-image: none; }
     treeview.view header button:backdrop:insensitive {
       border-width: 0 1px 1px 0;
@@ -1270,7 +1270,7 @@ treeview.view.progressbar {
       box-shadow: inset 0 -3px #000;
       color: #000; }
     .menubar > .menuitem:insensitive {
-      color: gray;
+      color: #7f7f7f;
       box-shadow: none; }
 
 menu,
@@ -1286,10 +1286,10 @@ menu,
       background-color: #000; }
     menu .menuitem:insensitive,
     .menu .menuitem:insensitive {
-      color: gray; }
+      color: #7f7f7f; }
       menu .menuitem:insensitive:backdrop,
       .menu .menuitem:insensitive:backdrop {
-        color: gray; }
+        color: #7f7f7f; }
     menu .menuitem:backdrop, menu .menuitem:backdrop:hover,
     .menu .menuitem:backdrop,
     .menu .menuitem:backdrop:hover {
@@ -1308,7 +1308,7 @@ menu,
 popover {
   margin: 10px;
   padding: 2px;
-  border-color: gray;
+  border-color: #7f7f7f;
   border-width: 1px;
   border-style: solid;
   border-radius: 5px;
@@ -1333,7 +1333,7 @@ popover {
   popover.magnifier, popover.osd {
     background-image: none;
     background-color: rgba(0, 0, 0, 0.8);
-    border: 1px solid gray;
+    border: 1px solid #7f7f7f;
     color: #fff; }
     popover.magnifier button, popover.osd button {
       color: white;
@@ -1363,7 +1363,7 @@ popover {
         border-width: 2px;
         border-style: solid;
         border-color: rgba(255, 255, 255, 0.2);
-        color: gray; }
+        color: #7f7f7f; }
 
 /*****************
  * Notebooks and *
@@ -1381,13 +1381,13 @@ notebook {
   notebook:backdrop {
     background-color: #fff; }
   notebook.frame {
-    border: 1px solid gray; }
+    border: 1px solid #7f7f7f; }
     notebook.frame:backdrop {
-      border-color: #8d8d8d; }
+      border-color: #8b8b8b; }
   notebook header {
-    background-color: #d9d9d9; }
+    background-color: #d8d8d8; }
     .frame notebook header {
-      border: 1px solid gray; }
+      border: 1px solid #7f7f7f; }
       .frame notebook header.top {
         border-bottom-width: 0; }
       .frame notebook header.bottom {
@@ -1397,34 +1397,34 @@ notebook {
       .frame notebook header.left {
         border-right-width: 0; }
       .frame notebook header:backdrop {
-        border-color: #8d8d8d; }
+        border-color: #8b8b8b; }
     notebook header.top {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 -1px gray; }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 -1px #7f7f7f; }
       notebook header.top:backdrop {
-        box-shadow: inset 0 -1px #8d8d8d; }
+        box-shadow: inset 0 -1px #8b8b8b; }
     notebook header.bottom {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 1px gray; }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 1px #7f7f7f; }
       notebook header.bottom:backdrop {
-        box-shadow: inset 0 1px #8d8d8d; }
+        box-shadow: inset 0 1px #8b8b8b; }
     notebook header.right {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 1px 0 gray; }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 1px 0 #7f7f7f; }
       notebook header.right:backdrop {
-        box-shadow: inset 1px 0 #8d8d8d; }
+        box-shadow: inset 1px 0 #8b8b8b; }
     notebook header.left {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset -1px 0 gray; }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset -1px 0 #7f7f7f; }
       notebook header.left:backdrop {
-        box-shadow: inset -1px 0 #8d8d8d; }
+        box-shadow: inset -1px 0 #8b8b8b; }
     notebook header:backdrop {
-      background-color: #d7d7d7;
+      background-color: #d6d6d6;
       box-shadow: none; }
     notebook header tabs arrow {
-      color: gray; }
+      color: #7f7f7f; }
       notebook header tabs arrow:hover {
-        color: #404040; }
+        color: #3f3f3f; }
       notebook header tabs arrow:active {
         color: #000; }
       notebook header tabs arrow:insensitive {
-        color: rgba(128, 128, 128, 0.3); }
+        color: rgba(127, 127, 127, 0.3); }
       notebook header tabs arrow:backdrop {
         color: rgba(0, 0, 0, 0.4); }
   notebook header.top tab {
@@ -1462,7 +1462,7 @@ notebook {
     background-color: transparent;
     outline-offset: 0; }
     notebook tab:hover {
-      border-color: gray; }
+      border-color: #7f7f7f; }
     notebook tab:active, notebook tab:backdrop:active {
       border-color: #000; }
     notebook tab:backdrop {
@@ -1471,17 +1471,17 @@ notebook {
     .top notebook tab.reorderable-page {
       border-color: transparent; }
       .top notebook tab.reorderable-page:hover {
-        border-color: rgba(128, 128, 128, 0.3);
-        border-bottom-color: gray;
+        border-color: rgba(127, 127, 127, 0.3);
+        border-bottom-color: #7f7f7f;
         background-color: rgba(255, 255, 255, 0.2); }
       .top notebook tab.reorderable-page:active {
         background-color: rgba(255, 255, 255, 0.5);
-        border-color: rgba(128, 128, 128, 0.5);
+        border-color: rgba(127, 127, 127, 0.5);
         border-bottom-color: #000; }
         .top notebook tab.reorderable-page:active:hover {
           background-color: rgba(255, 255, 255, 0.7); }
         .top notebook tab.reorderable-page:active:backdrop {
-          border-color: #8d8d8d;
+          border-color: #8b8b8b;
           background-color: #fff;
           border-bottom-color: #000; }
       .top notebook tab.reorderable-page:backdrop {
@@ -1490,17 +1490,17 @@ notebook {
     .bottom notebook tab.reorderable-page {
       border-color: transparent; }
       .bottom notebook tab.reorderable-page:hover {
-        border-color: rgba(128, 128, 128, 0.3);
-        border-top-color: gray;
+        border-color: rgba(127, 127, 127, 0.3);
+        border-top-color: #7f7f7f;
         background-color: rgba(255, 255, 255, 0.2); }
       .bottom notebook tab.reorderable-page:active {
         background-color: rgba(255, 255, 255, 0.5);
-        border-color: rgba(128, 128, 128, 0.5);
+        border-color: rgba(127, 127, 127, 0.5);
         border-top-color: #000; }
         .bottom notebook tab.reorderable-page:active:hover {
           background-color: rgba(255, 255, 255, 0.7); }
         .bottom notebook tab.reorderable-page:active:backdrop {
-          border-color: #8d8d8d;
+          border-color: #8b8b8b;
           background-color: #fff;
           border-top-color: #000; }
       .bottom notebook tab.reorderable-page:backdrop {
@@ -1509,17 +1509,17 @@ notebook {
     .left notebook tab.reorderable-page {
       border-color: transparent; }
       .left notebook tab.reorderable-page:hover {
-        border-color: rgba(128, 128, 128, 0.3);
-        border-right-color: gray;
+        border-color: rgba(127, 127, 127, 0.3);
+        border-right-color: #7f7f7f;
         background-color: rgba(255, 255, 255, 0.2); }
       .left notebook tab.reorderable-page:active {
         background-color: rgba(255, 255, 255, 0.5);
-        border-color: rgba(128, 128, 128, 0.5);
+        border-color: rgba(127, 127, 127, 0.5);
         border-right-color: #000; }
         .left notebook tab.reorderable-page:active:hover {
           background-color: rgba(255, 255, 255, 0.7); }
         .left notebook tab.reorderable-page:active:backdrop {
-          border-color: #8d8d8d;
+          border-color: #8b8b8b;
           background-color: #fff;
           border-right-color: #000; }
       .left notebook tab.reorderable-page:backdrop {
@@ -1528,17 +1528,17 @@ notebook {
     .right notebook tab.reorderable-page {
       border-color: transparent; }
       .right notebook tab.reorderable-page:hover {
-        border-color: rgba(128, 128, 128, 0.3);
-        border-left-color: gray;
+        border-color: rgba(127, 127, 127, 0.3);
+        border-left-color: #7f7f7f;
         background-color: rgba(255, 255, 255, 0.2); }
       .right notebook tab.reorderable-page:active {
         background-color: rgba(255, 255, 255, 0.5);
-        border-color: rgba(128, 128, 128, 0.5);
+        border-color: rgba(127, 127, 127, 0.5);
         border-left-color: #000; }
         .right notebook tab.reorderable-page:active:hover {
           background-color: rgba(255, 255, 255, 0.7); }
         .right notebook tab.reorderable-page:active:backdrop {
-          border-color: #8d8d8d;
+          border-color: #8b8b8b;
           background-color: #fff;
           border-left-color: #000; }
       .right notebook tab.reorderable-page:backdrop {
@@ -1547,12 +1547,12 @@ notebook {
     notebook tab label {
       padding: 0 2px;
       font-weight: bold;
-      color: gray;
+      color: #7f7f7f;
       /* color: inherit doesn't work here */ }
       notebook tab label:backdrop {
-        color: gray; }
+        color: #7f7f7f; }
     notebook tab:hover label {
-      color: #404040; }
+      color: #3f3f3f; }
     notebook tab:active label {
       color: #000; }
       notebook tab:active label:backdrop {
@@ -1568,7 +1568,7 @@ notebook {
         border-style: solid;
         color: #000;
         background-color: #fff;
-        border-color: gray;
+        border-color: #7f7f7f;
         background-image: none;
         border-width: 2px;
         background-image: none;
@@ -1579,7 +1579,7 @@ notebook {
         background-image: none;
         color: white;
         background-color: black;
-        border-color: gray;
+        border-color: #7f7f7f;
         border-width: 2px; }
       notebook tab button:backdrop, notebook tab button:backdrop:hover {
         color: rgba(0, 0, 0, 0.3);
@@ -1607,11 +1607,11 @@ scrollbar {
   scrollbar slider {
     border-radius: 20px;
     border: 5px solid transparent;
-    background-color: gray; }
+    background-color: #7f7f7f; }
     scrollbar slider:backdrop, scrollbar slider:insensitive {
-      background-color: #e6e6e6; }
+      background-color: #e5e5e5; }
     scrollbar slider:hover {
-      background-color: #4d4d4d; }
+      background-color: #4c4c4c; }
     scrollbar slider:prelight:active {
       background-color: #000; }
     scrollbar slider.fine-tune {
@@ -1651,8 +1651,8 @@ switch {
   border-width: 1px;
   border-style: solid;
   border-radius: 3px;
-  border-color: gray;
-  background-color: #cccccc;
+  border-color: #7f7f7f;
+  background-color: #cbcbcb;
   box-shadow: inset 0 1px rgba(0, 0, 0, 0.1);
   /*outset not working*/
   text-shadow: 0 1px rgba(0, 0, 0, 0.1); }
@@ -1662,25 +1662,25 @@ switch {
     background-color: #000;
     text-shadow: 0 0 2px white; }
   switch:insensitive {
-    color: gray;
-    border-color: gray;
+    color: #7f7f7f;
+    border-color: #7f7f7f;
     background-color: white;
     text-shadow: none; }
   switch:backdrop {
     color: #000;
-    border-color: #8d8d8d;
+    border-color: #8b8b8b;
     background-color: #fff;
     box-shadow: none;
     text-shadow: none; }
     switch:backdrop:active {
       color: #fff;
-      border-color: #8d8d8d;
-      background-color: #8d8d8d;
+      border-color: #8b8b8b;
+      background-color: #8b8b8b;
       box-shadow: none; }
     switch:backdrop:insensitive, switch:backdrop:insensitive:active {
       background-color: white;
-      color: gray;
-      border-color: gray; }
+      color: #7f7f7f;
+      border-color: #7f7f7f; }
   switch slider {
     border-radius: 3px;
     border-width: 2px;
@@ -1688,24 +1688,24 @@ switch {
     color: #000;
     background-image: none;
     background-color: #fff;
-    border-color: gray;
-    box-shadow: inset 0 1px white, inset 0 -2px rgba(255, 255, 255, 0.6), inset 0 -1px silver; }
+    border-color: #7f7f7f;
+    box-shadow: inset 0 1px white, inset 0 -2px rgba(255, 255, 255, 0.6), inset 0 -1px #bfbfbf; }
     switch slider:hover {
       border-width: 2px;
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none;
-      box-shadow: inset 0 1px white, inset 0 -2px rgba(255, 255, 255, 0.6), inset 0 -1px silver; }
+      box-shadow: inset 0 1px white, inset 0 -2px rgba(255, 255, 255, 0.6), inset 0 -1px #bfbfbf; }
     switch slider:active {
       border-color: #000; }
     switch slider:insensitive {
       border-width: 2px;
       border-style: solid;
-      color: gray;
+      color: #7f7f7f;
       background-color: white;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -1714,18 +1714,18 @@ switch {
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: #8d8d8d;
+      border-color: #8b8b8b;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
       switch slider:backdrop:active {
-        border-color: #8d8d8d; }
+        border-color: #8b8b8b; }
       switch slider:backdrop:insensitive {
         border-width: 2px;
         border-style: solid;
-        color: gray;
+        color: #7f7f7f;
         background-color: white;
-        border-color: #8d8d8d;
+        border-color: #8b8b8b;
         background-image: none; }
 
 /*************************
@@ -1740,19 +1740,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   background-image: none;
   -gtk-icon-source: -gtk-icontheme("checkbox-symbolic"); }
   .check:hover {
-    color: #333333; }
+    color: #323232; }
   .check:checked, .check:active {
     -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); }
     .check:checked:insensitive, .check:active:insensitive {
-      color: gray; }
+      color: #7f7f7f; }
       .check:checked:insensitive:backdrop, .check:active:insensitive:backdrop {
-        color: gray; }
+        color: #7f7f7f; }
     .check:checked:backdrop, .check:active:backdrop {
       color: #000; }
   .check:insensitive {
-    color: gray; }
+    color: #7f7f7f; }
     .check:insensitive:backdrop {
-      color: gray; }
+      color: #7f7f7f; }
   .check:inconsistent {
     -gtk-icon-source: -gtk-icontheme("checkbox-mixed-symbolic"); }
   .check:backdrop {
@@ -1765,19 +1765,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   background-image: none;
   -gtk-icon-source: -gtk-icontheme("radio-symbolic"); }
   .radio:hover {
-    color: #333333; }
+    color: #323232; }
   .radio:checked, .radio:active {
     -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); }
     .radio:checked:insensitive, .radio:active:insensitive {
-      color: gray; }
+      color: #7f7f7f; }
       .radio:checked:insensitive:backdrop, .radio:active:insensitive:backdrop {
-        color: gray; }
+        color: #7f7f7f; }
     .radio:checked:backdrop, .radio:active:backdrop {
       color: #000; }
   .radio:insensitive {
-    color: gray; }
+    color: #7f7f7f; }
     .radio:insensitive:backdrop {
-      color: gray; }
+      color: #7f7f7f; }
   .radio:inconsistent {
     -gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); }
   .radio:backdrop {
@@ -1814,9 +1814,9 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
     color: #000;
     background-image: none;
     background-color: #fff;
-    border-color: gray;
+    border-color: #7f7f7f;
     border-radius: 50%;
-    border-color: #787878; }
+    border-color: #777777; }
     scale trough slider:hover,
     scale.scale-has-marks-above.scale-has-marks-below trough slider:hover,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:hover {
@@ -1824,9 +1824,9 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none;
-      border-color: #787878;
+      border-color: #777777;
       border-radius: 50%; }
     scale trough slider:insensitive,
     scale.scale-has-marks-above.scale-has-marks-below trough slider:insensitive,
@@ -1840,7 +1840,7 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:backdrop {
       border-style: solid;
       border-radius: 50%;
-      border-color: #858585;
+      border-color: #838383;
       background-image: none;
       box-shadow: none; }
     scale trough slider:backdrop:insensitive,
@@ -1848,9 +1848,9 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:backdrop:insensitive {
       border-width: 2px;
       border-style: solid;
-      color: gray;
+      color: #7f7f7f;
       background-color: white;
-      border-color: #8d8d8d;
+      border-color: #8b8b8b;
       background-image: none; }
     scale trough slider:active,
     scale.scale-has-marks-above.scale-has-marks-below trough slider:active,
@@ -1863,8 +1863,8 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
     border-width: 1px;
     border-style: solid;
     border-radius: 3px;
-    border-color: gray;
-    background-color: #cccccc;
+    border-color: #7f7f7f;
+    background-color: #cbcbcb;
     box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); }
     scale trough.highlight,
     scale.scale-has-marks-above.scale-has-marks-below trough.highlight,
@@ -1874,28 +1874,28 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
       scale trough.highlight:backdrop,
       scale.scale-has-marks-above.scale-has-marks-below trough.highlight:backdrop,
       scale.vertical.scale-has-marks-above.scale-has-marks-below trough.highlight:backdrop {
-        border-color: gray;
-        background-color: gray;
+        border-color: #7f7f7f;
+        background-color: #7f7f7f;
         box-shadow: none; }
     scale trough:insensitive, scale trough.hilight:insensitive,
     scale.scale-has-marks-above.scale-has-marks-below trough:insensitive,
     scale.scale-has-marks-above.scale-has-marks-below trough.hilight:insensitive,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough:insensitive,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough.hilight:insensitive {
-      border-color: gray;
+      border-color: #7f7f7f;
       background-color: white; }
     scale trough:backdrop,
     scale.scale-has-marks-above.scale-has-marks-below trough:backdrop,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough:backdrop {
-      border-color: #8d8d8d;
-      background-color: silver;
+      border-color: #8b8b8b;
+      background-color: #bfbfbf;
       box-shadow: none; }
     scale trough:backdrop:insensitive, scale trough .hilight:backdrop:insensitive,
     scale.scale-has-marks-above.scale-has-marks-below trough:backdrop:insensitive,
     scale.scale-has-marks-above.scale-has-marks-below trough .hilight:backdrop:insensitive,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough:backdrop:insensitive,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough .hilight:backdrop:insensitive {
-      border-color: gray;
+      border-color: #7f7f7f;
       background-color: #fff; }
 
 /*****************
@@ -1906,17 +1906,17 @@ progressbar {
   font-size: 83%;
   color: #000; }
   progressbar:backdrop {
-    color: gray; }
+    color: #7f7f7f; }
   progressbar trough {
     border-width: 1px;
     border-style: solid;
     border-radius: 3px;
-    border-color: gray;
-    background-color: lightgray;
+    border-color: #7f7f7f;
+    background-color: #d2d2d2;
     box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); }
     progressbar trough:backdrop {
-      border-color: #8d8d8d;
-      background-color: #d7d7d7;
+      border-color: #8b8b8b;
+      background-color: #d6d6d6;
       box-shadow: 0 1px rgba(255, 255, 255, 0); }
   progressbar.osd trough {
     background-color: transparent;
@@ -1958,8 +1958,8 @@ levelbar trough {
   background-color: transparent;
   border-style: solid;
   background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-  border-color: gray;
-  box-shadow: inset 0 2px 2px -2px gray; }
+  border-color: #7f7f7f;
+  box-shadow: inset 0 2px 2px -2px #7f7f7f; }
   levelbar trough:backdrop {
     background-color: transparent;
     border-style: solid;
@@ -2022,7 +2022,7 @@ spinbutton selection:focus, modelbutton.flat:hover, modelbutton.flat:selected,
   spinbutton selection:backdrop:focus, modelbutton.flat:backdrop:hover, modelbutton.flat:backdrop:selected,
   .menuitem.button.flat:backdrop:hover,
   .menuitem.button.flat:backdrop:selected, treeview.view:backdrop:selected, row.activatable:backdrop:selected, .sidebar:backdrop:selected, placessidebar .view:backdrop:selected, placessidebar calendar:backdrop:selected {
-    background-color: gray;
+    background-color: #7f7f7f;
     color: #fff; }
 
 /**********
@@ -2030,14 +2030,14 @@ spinbutton selection:focus, modelbutton.flat:hover, modelbutton.flat:selected,
  **********/
 frame,
 .frame {
-  border: 1px solid gray;
+  border: 1px solid #7f7f7f;
   padding: 0; }
   frame.flat,
   .frame.flat {
     border-style: none; }
   frame:backdrop,
   .frame:backdrop {
-    border-color: #8d8d8d; }
+    border-color: #8b8b8b; }
   frame.action-bar,
   .frame.action-bar {
     padding: 6px;
@@ -2051,7 +2051,7 @@ scrolledwindow viewport.frame {
   border-style: none; }
 placessidebar overshoot.top,
 scrolledwindow overshoot.top {
-  background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#010101), to(rgba(1, 1, 1, 0))), -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent));
+  background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(black), to(transparent)), -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent));
   background-size: 100% 5%, 100% 100%;
   background-repeat: no-repeat;
   background-position: center top;
@@ -2060,7 +2060,7 @@ scrolledwindow overshoot.top {
   box-shadow: none; }
   placessidebar overshoot.top:backdrop,
   scrolledwindow overshoot.top:backdrop {
-    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#8d8d8d), to(rgba(141, 141, 141, 0)));
+    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#8b8b8b), to(rgba(139, 139, 139, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center top;
@@ -2069,7 +2069,7 @@ scrolledwindow overshoot.top {
     box-shadow: none; }
 placessidebar overshoot.bottom,
 scrolledwindow overshoot.bottom {
-  background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#010101), to(rgba(1, 1, 1, 0))), -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent));
+  background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(black), to(transparent)), -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent));
   background-size: 100% 5%, 100% 100%;
   background-repeat: no-repeat;
   background-position: center bottom;
@@ -2078,7 +2078,7 @@ scrolledwindow overshoot.bottom {
   box-shadow: none; }
   placessidebar overshoot.bottom:backdrop,
   scrolledwindow overshoot.bottom:backdrop {
-    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#8d8d8d), to(rgba(141, 141, 141, 0)));
+    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#8b8b8b), to(rgba(139, 139, 139, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center bottom;
@@ -2087,7 +2087,7 @@ scrolledwindow overshoot.bottom {
     box-shadow: none; }
 placessidebar overshoot.left,
 scrolledwindow overshoot.left {
-  background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#010101), to(rgba(1, 1, 1, 0))), -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent));
+  background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(black), to(transparent)), -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent));
   background-size: 5% 100%, 100% 100%;
   background-repeat: no-repeat;
   background-position: left center;
@@ -2096,7 +2096,7 @@ scrolledwindow overshoot.left {
   box-shadow: none; }
   placessidebar overshoot.left:backdrop,
   scrolledwindow overshoot.left:backdrop {
-    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#8d8d8d), to(rgba(141, 141, 141, 0)));
+    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#8b8b8b), to(rgba(139, 139, 139, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: left center;
@@ -2105,7 +2105,7 @@ scrolledwindow overshoot.left {
     box-shadow: none; }
 placessidebar overshoot.right,
 scrolledwindow overshoot.right {
-  background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#010101), to(rgba(1, 1, 1, 0))), -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent));
+  background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(black), to(transparent)), -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent));
   background-size: 5% 100%, 100% 100%;
   background-repeat: no-repeat;
   background-position: right center;
@@ -2114,7 +2114,7 @@ scrolledwindow overshoot.right {
   box-shadow: none; }
   placessidebar overshoot.right:backdrop,
   scrolledwindow overshoot.right:backdrop {
-    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#8d8d8d), to(rgba(141, 141, 141, 0)));
+    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#8b8b8b), to(rgba(139, 139, 139, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: right center;
@@ -2179,7 +2179,7 @@ scrollbar scrolledwindow trough {
 
 separator, placessidebar .view separator,
 placessidebar .view separator:backdrop {
-  color: gray; }
+  color: #7f7f7f; }
   GtkFileChooserButton separator.vertical,
   GtkFileChooserButton placessidebar .view separator.vertical:backdrop,
   placessidebar .view GtkFileChooserButton separator.vertical:backdrop, button.font separator.vertical {
@@ -2190,10 +2190,10 @@ placessidebar .view separator:backdrop {
  *********/
 list {
   background-color: #fff;
-  border-color: gray; }
+  border-color: #7f7f7f; }
   list:backdrop {
     background-color: #fff;
-    border-color: #8d8d8d; }
+    border-color: #8b8b8b; }
   list row {
     padding: 2px; }
 
@@ -2225,7 +2225,7 @@ row.activatable {
     row.activatable:selected:hover, placessidebar .has-open-popup:selected {
       background-color: black; }
     row.activatable:selected:backdrop {
-      background-color: gray; }
+      background-color: #7f7f7f; }
     row.activatable:selected .button.flat {
       color: #fff; }
       row.activatable:selected .button.flat:hover {
@@ -2253,9 +2253,9 @@ row.activatable {
   padding: 10px;
   border-width: 0 1px 1px;
   border-style: solid;
-  border-color: gray;
+  border-color: #7f7f7f;
   border-radius: 0 0 6px 6px;
-  background-image: linear-gradient(to bottom, #f0f0f0 5%, whitesmoke); }
+  background-image: linear-gradient(to bottom, #efefef 5%, #f4f4f4); }
   .app-notification .button,
   .app-notification.frame .button {
     padding: 6px; }
@@ -2276,22 +2276,22 @@ expander arrow {
  * Calendar *
  ***********/
 calendar {
-  border: 1px solid gray; }
+  border: 1px solid #7f7f7f; }
   calendar.button {
     padding: 0 4px;
     color: #999999; }
     calendar.button:hover {
       color: #000; }
     calendar.button:backdrop, calendar.button:backdrop:hover {
-      color: gray; }
+      color: #7f7f7f; }
   calendar.view {
     border-radius: 2px; }
   calendar.header {
     background: linear-gradient(to bottom, white, #fafafa);
-    border-bottom-color: silver; }
+    border-bottom-color: #bfbfbf; }
     calendar.header:backdrop {
       background-image: linear-gradient(to bottom, #fff);
-      border-bottom-color: #c6c6c6; }
+      border-bottom-color: #c5c5c5; }
   calendar:inconsistent, calendar:inconsistent:backdrop {
     color: alpha(currentColor,0.55); }
   calendar.highlight, calendar.highlight:backdrop {
@@ -2317,13 +2317,13 @@ messagedialog.csd {
     color: #000;
     background-image: none;
     background-color: #fff;
-    border-color: gray; }
+    border-color: #7f7f7f; }
     messagedialog.csd .dialog-action-area button:hover {
       border-width: 2px;
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none; }
     messagedialog.csd .dialog-action-area button:active {
       border-width: 2px;
@@ -2331,13 +2331,13 @@ messagedialog.csd {
       background-image: none;
       color: white;
       background-color: black;
-      border-color: gray; }
+      border-color: #7f7f7f; }
     messagedialog.csd .dialog-action-area button:insensitive {
       border-width: 2px;
       border-style: solid;
-      color: gray;
+      color: #7f7f7f;
       background-color: white;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -2346,16 +2346,16 @@ messagedialog.csd {
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: #8d8d8d;
+      border-color: #8b8b8b;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
     messagedialog.csd .dialog-action-area button:backdrop:insensitive {
       border-width: 2px;
       border-style: solid;
-      color: gray;
+      color: #7f7f7f;
       background-color: white;
-      border-color: #8d8d8d;
+      border-color: #8b8b8b;
       background-image: none; }
     messagedialog.csd .dialog-action-area button.suggested-action {
       border-width: 2px;
@@ -2390,16 +2390,16 @@ messagedialog.csd {
         messagedialog.csd .dialog-action-area button.suggested-action:backdrop:insensitive {
           border-width: 2px;
           border-style: solid;
-          color: gray;
+          color: #7f7f7f;
           background-color: white;
-          border-color: #8d8d8d;
+          border-color: #8b8b8b;
           background-image: none; }
       messagedialog.csd .dialog-action-area button.suggested-action:insensitive {
         border-width: 2px;
         border-style: solid;
-        color: gray;
+        color: #7f7f7f;
         background-color: white;
-        border-color: gray;
+        border-color: #7f7f7f;
         background-image: none;
         text-shadow: none;
         -gtk-icon-shadow: none; }
@@ -2436,16 +2436,16 @@ messagedialog.csd {
         messagedialog.csd .dialog-action-area button.destructive-action:backdrop:insensitive {
           border-width: 2px;
           border-style: solid;
-          color: gray;
+          color: #7f7f7f;
           background-color: white;
-          border-color: #8d8d8d;
+          border-color: #8b8b8b;
           background-image: none; }
       messagedialog.csd .dialog-action-area button.destructive-action:insensitive {
         border-width: 2px;
         border-style: solid;
-        color: gray;
+        color: #7f7f7f;
         background-color: white;
-        border-color: gray;
+        border-color: #7f7f7f;
         background-image: none;
         text-shadow: none;
         -gtk-icon-shadow: none; }
@@ -2459,9 +2459,9 @@ messagedialog.csd {
     border-bottom-left-radius: 7px; }
 
 GtkFileChooserDialog .dialog-action-box {
-  border-top: 1px solid gray; }
+  border-top: 1px solid #7f7f7f; }
   GtkFileChooserDialog .dialog-action-box:backdrop {
-    border-top-color: #8d8d8d; }
+    border-top-color: #8b8b8b; }
 
 /***********
  * Sidebar *
@@ -2471,10 +2471,10 @@ GtkFileChooserDialog .dialog-action-box {
   .sidebar:backdrop {
     background-color: #fff; }
   .sidebar > GtkScrolledWindow > .frame {
-    border-right: 1px solid gray; }
+    border-right: 1px solid #7f7f7f; }
     .sidebar > GtkScrolledWindow > .frame:dir(rtl) {
       border-right: none;
-      border-left: 1px solid gray; }
+      border-left: 1px solid #7f7f7f; }
 
 placessidebar row {
   padding: 0px; }
@@ -2501,9 +2501,9 @@ placessidebar .view {
   color: #000;
   background-color: transparent; }
   placessidebar .view .image {
-    color: #4d4d4d; }
+    color: #4c4c4c; }
     placessidebar .view .image:selected {
-      color: #e6e6e6; }
+      color: #e5e5e5; }
 
 stacksidebar row {
   padding: 10px 4px; }
@@ -2524,9 +2524,9 @@ paned {
   paned separator, paned placessidebar .view separator, placessidebar .view paned separator,
   paned placessidebar .view separator:backdrop,
   placessidebar .view paned separator:backdrop {
-    background-image: linear-gradient(to bottom, gray); }
+    background-image: linear-gradient(to bottom, #7f7f7f); }
     paned separator:backdrop {
-      background-image: linear-gradient(to bottom, #8d8d8d); }
+      background-image: linear-gradient(to bottom, #8b8b8b); }
 
 paned.wide {
   -GtkPaned-handle-size: 5;
@@ -2536,12 +2536,12 @@ paned.wide {
   placessidebar .view paned.wide separator:backdrop {
     background-color: transparent;
     border-style: none solid;
-    border-color: gray;
+    border-color: #7f7f7f;
     border-width: 1px; }
   paned.wide.vertical separator {
     border-style: solid none; }
   paned.wide separator:backdrop {
-    border-color: #8d8d8d; }
+    border-color: #8b8b8b; }
 
 /**************
  * GtkInfoBar *
@@ -2594,9 +2594,9 @@ infobar {
     .error button:insensitive {
       border-width: 2px;
       border-style: solid;
-      color: gray;
+      color: #7f7f7f;
       background-color: white;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -2618,9 +2618,9 @@ infobar {
     .error button:backdrop:insensitive {
       border-width: 2px;
       border-style: solid;
-      color: gray;
+      color: #7f7f7f;
       background-color: white;
-      border-color: #8d8d8d;
+      border-color: #8b8b8b;
       background-image: none; }
   .info label:selected,
   .info label:selected:focus,
@@ -2696,7 +2696,7 @@ colorswatch {
     colorswatch.light:backdrop {
       color: rgba(0, 0, 0, 0.3); }
   colorswatch overlay, colorswatch overlay:selected {
-    border: 1px solid gray; }
+    border: 1px solid #7f7f7f; }
     colorswatch overlay:hover, colorswatch overlay:selected:hover {
       border-color: black; }
   colorswatch#add-color-button {
@@ -2705,7 +2705,7 @@ colorswatch {
     color: #000;
     background-image: none;
     background-color: #fff;
-    border-color: gray;
+    border-color: #7f7f7f;
     border-style: solid;
     border-width: 1px;
     box-shadow: none; }
@@ -2714,19 +2714,19 @@ colorswatch {
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: gray;
+      border-color: #7f7f7f;
       background-image: none; }
     colorswatch#add-color-button:backdrop {
       border-width: 2px;
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: #8d8d8d;
+      border-color: #8b8b8b;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none;
       border-width: 1px;
-      color: gray; }
+      color: #7f7f7f; }
     colorswatch#add-color-button overlay {
       border-width: 2px;
       border-style: solid;
@@ -2755,7 +2755,7 @@ decoration {
     border-radius: 0;
     margin: 4px;
     background-color: #fff;
-    border: solid 1px #8d8d8d;
+    border: solid 1px #8b8b8b;
     box-shadow: none; }
 
 button.titlebutton {
@@ -2770,20 +2770,20 @@ button.titlebutton {
     color: #000;
     background-image: none;
     background-color: #fff;
-    border-color: gray; }
+    border-color: #7f7f7f; }
   button.titlebutton:active {
     border-width: 2px;
     border-style: solid;
     background-image: none;
     color: white;
     background-color: black;
-    border-color: gray; }
+    border-color: #7f7f7f; }
   button.titlebutton:backdrop {
     border-width: 2px;
     border-style: solid;
     color: #000;
     background-color: #fff;
-    border-color: #8d8d8d;
+    border-color: #8b8b8b;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none;
@@ -2868,7 +2868,7 @@ cursor-handle {
       border-width: 2px;
       border-style: solid;
       border-color: rgba(255, 255, 255, 0.2);
-      color: gray; }
+      color: #7f7f7f; }
     .touch-selection button:backdrop {
       border-width: 2px;
       border-style: solid; }