diff --git a/gtk/theme/HighContrast/_colors.scss b/gtk/theme/HighContrast/_colors.scss
index d73c2abd67..41f264adf4 100644
--- a/gtk/theme/HighContrast/_colors.scss
+++ b/gtk/theme/HighContrast/_colors.scss
@@ -27,7 +27,7 @@ $osd_borders_color: transparentize(#fff,0.8);
 //insensitive state derived colors
 $insensitive_fg_color: mix($fg_color, $bg_color, 50%);
 $insensitive_bg_color: mix($bg_color, $base_color, 60%);
-$insensitive_borders_color: $borders_color;
+$insensitive_borders_color: mix($borders_color, $base_color, 50%);
 
 //colors for the backdrop state, derived from the main colors.
 $backdrop_base_color: $base_color;
diff --git a/gtk/theme/HighContrast/_drawing.scss b/gtk/theme/HighContrast/_drawing.scss
index 6bbf987cdc..966a2eaf4d 100644
--- a/gtk/theme/HighContrast/_drawing.scss
+++ b/gtk/theme/HighContrast/_drawing.scss
@@ -206,7 +206,7 @@
   //
     color: $insensitive_fg_color;
     background-color: $insensitive_bg_color;
-    border-color: $backdrop_borders_color;
+    border-color: $insensitive_borders_color;
     background-image: none;
   }
 
@@ -215,7 +215,7 @@
   // backdrop insensitive pushed button
   //
     color: $insensitive_fg_color;
-    border-color: $backdrop_borders_color;
+    border-color: $insensitive_borders_color;
     background-image: none;
     background-color: mix($backdrop_borders_color,$backdrop_bg_color, 8%);
   }
diff --git a/gtk/theme/HighContrast/gtk-contained-inverse.css b/gtk/theme/HighContrast/gtk-contained-inverse.css
index 2b3483eeff..e6818232c5 100644
--- a/gtk/theme/HighContrast/gtk-contained-inverse.css
+++ b/gtk/theme/HighContrast/gtk-contained-inverse.css
@@ -4,16 +4,16 @@
 @define-color theme_base_color #111;
 @define-color theme_selected_bg_color #aaa;
 @define-color theme_selected_fg_color #fff;
-@define-color insensitive_bg_color #060606;
-@define-color insensitive_fg_color #7f7f7f;
+@define-color insensitive_bg_color #070707;
+@define-color insensitive_fg_color gray;
 @define-color insensitive_base_color #111;
 @define-color theme_unfocused_fg_color #fff;
 @define-color theme_unfocused_bg_color #000;
 @define-color theme_unfocused_base_color #111;
 @define-color theme_unfocused_selected_bg_color #aaa;
 @define-color theme_unfocused_selected_fg_color #fff;
-@define-color borders #7f7f7f;
-@define-color unfocused_borders #727272;
+@define-color borders gray;
+@define-color unfocused_borders #737373;
 @define-color warning_color #f57900;
 @define-color error_color #cc0000;
 @define-color success_color #73d216;
@@ -79,8 +79,8 @@
     background-color: black;
     color: #fff; }
   .gtkstyle-fallback:disabled {
-    background-color: #060606;
-    color: #7f7f7f; }
+    background-color: #070707;
+    color: gray; }
   .gtkstyle-fallback:selected {
     background-color: #aaa;
     color: #fff; }
@@ -106,7 +106,7 @@ flowbox flowboxchild {
     outline-offset: -2px; }
 
 label:disabled, label:backdrop:disabled {
-  color: #7f7f7f; }
+  color: gray; }
 
 /*********************
  * Spinner Animation *
@@ -135,15 +135,15 @@ entry, spinbutton {
   background-color: transparent;
   border-style: solid;
   background-image: linear-gradient(to bottom, #090909, #111 90%);
-  border-color: #7f7f7f;
-  box-shadow: inset 0 2px 2px -2px #080808; }
+  border-color: gray;
+  box-shadow: inset 0 2px 2px -2px #090909; }
   entry.flat, entry.flat:focus, spinbutton.flat, spinbutton.flat:focus {
     padding: 2px;
     background-color: transparent;
     border-style: solid;
     background-image: linear-gradient(to bottom, #090909, #111 90%);
-    border-color: #7f7f7f;
-    box-shadow: inset 0 2px 2px -2px #080808;
+    border-color: gray;
+    box-shadow: inset 0 2px 2px -2px #090909;
     border: none;
     border-radius: 0; }
   entry:focus, spinbutton:focus {
@@ -151,14 +151,14 @@ entry, spinbutton {
     border-style: solid;
     background-image: linear-gradient(to bottom, #090909, #111 90%);
     border-color: #aaa;
-    box-shadow: inset 0 2px 2px -2px #080808, inset 0 0 2px 1px #2f2f2f; }
+    box-shadow: inset 0 2px 2px -2px #090909, inset 0 0 2px 1px #303030; }
   entry:disabled, spinbutton:disabled {
     background-color: transparent;
     border-style: solid;
     background-image: linear-gradient(to bottom, #090909, #111 90%);
-    color: #7f7f7f;
-    border-color: #7f7f7f;
-    background-image: linear-gradient(to bottom, #060606);
+    color: gray;
+    border-color: gray;
+    background-image: linear-gradient(to bottom, #070707);
     box-shadow: none; }
   entry:backdrop, spinbutton:backdrop {
     background-color: transparent;
@@ -171,7 +171,7 @@ entry, spinbutton {
     background-color: transparent;
     border-style: solid;
     background-image: linear-gradient(to bottom, #090909, #111 90%);
-    color: #7f7f7f;
+    color: gray;
     background-image: linear-gradient(to bottom, #000);
     box-shadow: 0 1px rgba(255, 255, 255, 0); }
   entry selection, entry selection:backdrop, spinbutton selection, spinbutton selection:backdrop {
@@ -203,8 +203,8 @@ entry, spinbutton {
     background-color: transparent;
     border-style: solid;
     background-image: linear-gradient(to bottom, #090909, #111 90%);
-    border-color: #7f7f7f;
-    box-shadow: inset 0 2px 2px -2px #080808;
+    border-color: gray;
+    box-shadow: inset 0 2px 2px -2px #090909;
     background-image: linear-gradient(to bottom, #111);
     border-bottom-color: #323232;
     box-shadow: none; }
@@ -215,16 +215,16 @@ entry, spinbutton {
       background-color: transparent;
       border-style: solid;
       background-image: linear-gradient(to bottom, #090909, #111 90%);
-      color: #7f7f7f;
-      border-color: #7f7f7f;
-      background-image: linear-gradient(to bottom, #060606);
+      color: gray;
+      border-color: gray;
+      background-image: linear-gradient(to bottom, #070707);
       box-shadow: none;
       border-bottom-color: #323232; }
       .linked.vertical entry:disabled:backdrop, .linked.vertical spinbutton:disabled:backdrop {
         background-color: transparent;
         border-style: solid;
         background-image: linear-gradient(to bottom, #090909, #111 90%);
-        color: #7f7f7f;
+        color: gray;
         background-image: linear-gradient(to bottom, #000);
         box-shadow: 0 1px rgba(255, 255, 255, 0);
         border-bottom-color: #2e2e2e; }
@@ -240,29 +240,29 @@ entry, spinbutton {
       background-color: transparent;
       border-style: solid;
       background-image: linear-gradient(to bottom, #090909, #111 90%);
-      border-color: #7f7f7f;
-      box-shadow: inset 0 2px 2px -2px #080808;
+      border-color: gray;
+      box-shadow: inset 0 2px 2px -2px #090909;
       border-bottom-color: #323232; }
       .linked.vertical entry:first-child:focus, .linked.vertical spinbutton:first-child:focus {
         background-color: transparent;
         border-style: solid;
         background-image: linear-gradient(to bottom, #090909, #111 90%);
         border-color: #aaa;
-        box-shadow: inset 0 2px 2px -2px #080808, inset 0 0 2px 1px #2f2f2f; }
+        box-shadow: inset 0 2px 2px -2px #090909, inset 0 0 2px 1px #303030; }
       .linked.vertical entry:first-child:disabled, .linked.vertical spinbutton:first-child:disabled {
         background-color: transparent;
         border-style: solid;
         background-image: linear-gradient(to bottom, #090909, #111 90%);
-        color: #7f7f7f;
-        border-color: #7f7f7f;
-        background-image: linear-gradient(to bottom, #060606);
+        color: gray;
+        border-color: gray;
+        background-image: linear-gradient(to bottom, #070707);
         box-shadow: none;
         border-bottom-color: #2e2e2e; }
         .linked.vertical entry:first-child:disabled:backdrop, .linked.vertical spinbutton:first-child:disabled:backdrop {
           background-color: transparent;
           border-style: solid;
           background-image: linear-gradient(to bottom, #090909, #111 90%);
-          color: #7f7f7f;
+          color: gray;
           background-image: linear-gradient(to bottom, #000);
           box-shadow: 0 1px rgba(255, 255, 255, 0);
           border-bottom-color: #2e2e2e;
@@ -279,8 +279,8 @@ entry, spinbutton {
       background-color: transparent;
       border-style: solid;
       background-image: linear-gradient(to bottom, #090909, #111 90%);
-      border-color: #7f7f7f;
-      box-shadow: inset 0 2px 2px -2px #080808;
+      border-color: gray;
+      box-shadow: inset 0 2px 2px -2px #090909;
       border-top-width: 0;
       background-image: linear-gradient(to bottom, #111);
       box-shadow: none; }
@@ -291,15 +291,15 @@ entry, spinbutton {
         background-color: transparent;
         border-style: solid;
         background-image: linear-gradient(to bottom, #090909, #111 90%);
-        color: #7f7f7f;
-        border-color: #7f7f7f;
-        background-image: linear-gradient(to bottom, #060606);
+        color: gray;
+        border-color: gray;
+        background-image: linear-gradient(to bottom, #070707);
         box-shadow: none; }
         .linked.vertical entry:last-child:disabled:backdrop, .linked.vertical spinbutton:last-child:disabled:backdrop {
           background-color: transparent;
           border-style: solid;
           background-image: linear-gradient(to bottom, #090909, #111 90%);
-          color: #7f7f7f;
+          color: gray;
           background-image: linear-gradient(to bottom, #000);
           box-shadow: 0 1px rgba(255, 255, 255, 0); }
       .linked.vertical entry:last-child:backdrop, .linked.vertical spinbutton:last-child:backdrop {
@@ -317,7 +317,7 @@ entry, spinbutton {
       border-style: solid;
       background-image: linear-gradient(to bottom, #090909, #111 90%);
       border-color: #cc0000;
-      box-shadow: inset 0 2px 2px -2px #080808, inset 0 0 2px 1px #360d0d; }
+      box-shadow: inset 0 2px 2px -2px #090909, inset 0 0 2px 1px #360e0e; }
     entry.error:selected, entry.error:selected:focus, spinbutton.error:selected, spinbutton.error:selected:focus {
       background-color: #cc0000; }
   entry.warning, spinbutton.warning {
@@ -328,7 +328,7 @@ entry, spinbutton {
       border-style: solid;
       background-image: linear-gradient(to bottom, #090909, #111 90%);
       border-color: #f57900;
-      box-shadow: inset 0 2px 2px -2px #080808, inset 0 0 2px 1px #3e250d; }
+      box-shadow: inset 0 2px 2px -2px #090909, inset 0 0 2px 1px #3f260e; }
     entry.warning:selected, entry.warning:selected:focus, spinbutton.warning:selected, spinbutton.warning:selected:focus {
       background-color: #f57900; }
 
@@ -349,13 +349,13 @@ button {
   color: #fff;
   background-image: none;
   background-color: #000;
-  border-color: #7f7f7f; }
+  border-color: gray; }
   button:hover, button.flat:hover, button.sidebar-button:hover {
     border-width: 2px;
     border-style: solid;
     color: #fff;
     background-color: #000;
-    border-color: #7f7f7f;
+    border-color: gray;
     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 {
@@ -364,14 +364,14 @@ button {
     background-image: none;
     color: black;
     background-color: white;
-    border-color: #7f7f7f;
+    border-color: gray;
     transition-duration: 50ms; }
   button:backdrop, button.flat:backdrop, button.sidebar-button:backdrop {
     border-width: 2px;
     border-style: solid;
     color: #fff;
     background-color: #000;
-    border-color: #727272;
+    border-color: #737373;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
@@ -379,39 +379,39 @@ button {
       border-width: 2px;
       border-style: solid;
       color: black;
-      background-color: #727272;
-      border-color: #727272;
+      background-color: #737373;
+      border-color: #737373;
       background-image: none; }
     button:backdrop:disabled, button.flat:backdrop:disabled, button.sidebar-button:backdrop:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
-      background-color: #060606;
-      border-color: #727272;
+      color: gray;
+      background-color: #070707;
+      border-color: #494949;
       background-image: none; }
     button:backdrop:disabled:active, button.flat:backdrop:disabled:active, button.sidebar-button:backdrop:disabled:active {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
-      border-color: #727272;
+      color: gray;
+      border-color: #494949;
       background-image: none;
       background-color: #090909; }
   button:disabled {
     border-width: 2px;
     border-style: solid;
-    color: #7f7f7f;
-    background-color: #060606;
-    border-color: #7f7f7f;
+    color: gray;
+    background-color: #070707;
+    border-color: #494949;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
     button:disabled:active, button:disabled.flat:active, button.sidebar-button:disabled:active {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
-      border-color: #7f7f7f;
+      color: gray;
+      border-color: #494949;
       background-image: none;
-      background-color: #060606; }
+      background-color: #070707; }
   .osd button {
     padding: 6px;
     border-width: 1px 1px 2px 1px;
@@ -440,7 +440,7 @@ button {
       border-width: 2px;
       border-style: solid;
       border-color: rgba(255, 255, 255, 0.2);
-      color: #7f7f7f; }
+      color: gray; }
     .osd button:backdrop {
       border-width: 2px;
       border-style: solid; }
@@ -477,16 +477,16 @@ button {
       button.suggested-action:backdrop:disabled {
         border-width: 2px;
         border-style: solid;
-        color: #7f7f7f;
-        background-color: #060606;
-        border-color: #727272;
+        color: gray;
+        background-color: #070707;
+        border-color: #494949;
         background-image: none; }
     button.suggested-action:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
-      background-color: #060606;
-      border-color: #7f7f7f;
+      color: gray;
+      background-color: #070707;
+      border-color: #494949;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -523,16 +523,16 @@ button {
       button.destructive-action:backdrop:disabled {
         border-width: 2px;
         border-style: solid;
-        color: #7f7f7f;
-        background-color: #060606;
-        border-color: #727272;
+        color: gray;
+        background-color: #070707;
+        border-color: #494949;
         background-image: none; }
     button.destructive-action:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
-      background-color: #060606;
-      border-color: #7f7f7f;
+      color: gray;
+      background-color: #070707;
+      border-color: #494949;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -552,13 +552,13 @@ button {
   color: #fff;
   background-image: none;
   background-color: #000;
-  border-color: #7f7f7f; }
+  border-color: gray; }
   .inline-toolbar toolbutton > button:hover {
     border-width: 2px;
     border-style: solid;
     color: #fff;
     background-color: #000;
-    border-color: #7f7f7f;
+    border-color: gray;
     background-image: none; }
   .inline-toolbar toolbutton > button:active {
     border-width: 2px;
@@ -566,29 +566,29 @@ button {
     background-image: none;
     color: black;
     background-color: white;
-    border-color: #7f7f7f; }
+    border-color: gray; }
   .inline-toolbar toolbutton > button:disabled {
     border-width: 2px;
     border-style: solid;
-    color: #7f7f7f;
-    background-color: #060606;
-    border-color: #7f7f7f;
+    color: gray;
+    background-color: #070707;
+    border-color: #494949;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
   .inline-toolbar toolbutton > button:disabled:active {
     border-width: 2px;
     border-style: solid;
-    color: #7f7f7f;
-    border-color: #7f7f7f;
+    color: gray;
+    border-color: #494949;
     background-image: none;
-    background-color: #060606; }
+    background-color: #070707; }
   .inline-toolbar toolbutton > button:backdrop {
     border-width: 2px;
     border-style: solid;
     color: #fff;
     background-color: #000;
-    border-color: #727272;
+    border-color: #737373;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
@@ -596,21 +596,21 @@ button {
     border-width: 2px;
     border-style: solid;
     color: black;
-    background-color: #727272;
-    border-color: #727272;
+    background-color: #737373;
+    border-color: #737373;
     background-image: none; }
   .inline-toolbar toolbutton > button:backdrop:disabled {
     border-width: 2px;
     border-style: solid;
-    color: #7f7f7f;
-    background-color: #060606;
-    border-color: #727272;
+    color: gray;
+    background-color: #070707;
+    border-color: #494949;
     background-image: none; }
   .inline-toolbar toolbutton > button:backdrop:disabled:active {
     border-width: 2px;
     border-style: solid;
-    color: #7f7f7f;
-    border-color: #727272;
+    color: gray;
+    border-color: #494949;
     background-image: none;
     background-color: #090909; }
 
@@ -702,7 +702,7 @@ modelbutton.flat,
       background-color: #aaa; }
   modelbutton.flat:disabled,
   .menuitem.button.flat:disabled {
-    color: #7f7f7f; }
+    color: gray; }
 
 button.color {
   padding: 4px; }
@@ -745,7 +745,7 @@ spinbutton {
    */ }
   spinbutton button {
     background-image: none;
-    border-color: rgba(127, 127, 127, 0.3);
+    border-color: rgba(128, 128, 128, 0.3);
     color: #f3f3f3;
     border-radius: 0; }
     spinbutton button:dir(ltr) {
@@ -761,7 +761,7 @@ spinbutton {
         border-style: none solid none none; }
     spinbutton button:disabled {
       box-shadow: none;
-      color: rgba(127, 127, 127, 0.3); }
+      color: rgba(128, 128, 128, 0.3); }
       spinbutton button:disabled:dir(ltr) {
         border-style: none none none solid; }
       spinbutton button:disabled:dir(rtl) {
@@ -770,7 +770,7 @@ spinbutton {
       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(114, 114, 114, 0.3);
+      border-color: rgba(115, 115, 115, 0.3);
       background-color: #000;
       box-shadow: none; }
       spinbutton button:backdrop:dir(ltr) {
@@ -779,7 +779,7 @@ spinbutton {
         border-style: none solid none none; }
     spinbutton button:backdrop:disabled {
       box-shadow: none;
-      color: rgba(127, 127, 127, 0.3); }
+      color: rgba(128, 128, 128, 0.3); }
       spinbutton button:backdrop:disabled:dir(rtl) {
         border-width: 0 1px 0 0; }
       spinbutton button:backdrop:disabled:dir(ltr) {
@@ -792,27 +792,27 @@ spinbutton {
     color: #fff;
     background-image: none;
     background-color: #000;
-    border-color: #7f7f7f; }
+    border-color: gray; }
     spinbutton.vertical button:first-child:active {
       border-width: 2px;
       border-style: solid;
       background-image: none;
       color: black;
       background-color: white;
-      border-color: #7f7f7f; }
+      border-color: gray; }
     spinbutton.vertical button:first-child:hover {
       border-width: 2px;
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none; }
     spinbutton.vertical button:first-child:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
-      background-color: #060606;
-      border-color: #7f7f7f;
+      color: gray;
+      background-color: #070707;
+      border-color: #494949;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -821,7 +821,7 @@ spinbutton {
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: #727272;
+      border-color: #737373;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -831,27 +831,27 @@ spinbutton {
     color: #fff;
     background-image: none;
     background-color: #000;
-    border-color: #7f7f7f; }
+    border-color: gray; }
     spinbutton.vertical button:last-child:active {
       border-width: 2px;
       border-style: solid;
       background-image: none;
       color: black;
       background-color: white;
-      border-color: #7f7f7f; }
+      border-color: gray; }
     spinbutton.vertical button:last-child:hover {
       border-width: 2px;
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none; }
     spinbutton.vertical button:last-child:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
-      background-color: #060606;
-      border-color: #7f7f7f;
+      color: gray;
+      background-color: #070707;
+      border-color: #494949;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -860,16 +860,16 @@ spinbutton {
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: #727272;
+      border-color: #737373;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
   spinbutton.vertical button:backdrop:disabled {
     border-width: 2px;
     border-style: solid;
-    color: #7f7f7f;
-    background-color: #060606;
-    border-color: #727272;
+    color: gray;
+    background-color: #070707;
+    border-color: #494949;
     background-image: none; }
   spinbutton.vertical.entry {
     border-radius: 0; }
@@ -890,7 +890,7 @@ combobox {
     padding-left: 8px;
     padding-right: 8px; }
   combobox:disabled {
-    color: #7f7f7f;
+    color: gray;
     text-shadow: none;
     -gtk-icon-shadow: none; }
   combobox:backdrop {
@@ -898,7 +898,7 @@ combobox {
     text-shadow: none;
     -gtk-icon-shadow: none; }
   combobox:backdrop:disabled {
-    color: #7f7f7f; }
+    color: gray; }
   combobox arrow {
     -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
     min-height: 16px;
@@ -935,25 +935,25 @@ toolbar, searchbar {
     padding: 3px;
     border-radius: 0  0 4px 4px; }
   toolbar.vertical, searchbar.vertical {
-    border-right: 1px solid #7f7f7f; }
+    border-right: 1px solid gray; }
     toolbar.vertical:dir(rtl), searchbar.vertical:dir(rtl) {
       border-right: none;
-      border-left: 1px solid #7f7f7f; }
+      border-left: 1px solid gray; }
 
 searchbar {
   border-width: 0 0 1px;
-  border-color: #7f7f7f;
+  border-color: gray;
   border-style: none none solid none;
   padding: 3px; }
 
 toolbar.inline-toolbar, searchbar.inline-toolbar {
   border-style: solid;
-  border-color: #7f7f7f;
+  border-color: gray;
   background-color: #262626;
-  box-shadow: inset 0 2px 3px -1px #5b5b5b; }
+  box-shadow: inset 0 2px 3px -1px #5c5c5c; }
   toolbar.inline-toolbar:backdrop, searchbar.inline-toolbar:backdrop {
-    border-color: #727272;
-    background-color: #272727;
+    border-color: #737373;
+    background-color: #282828;
     box-shadow: none; }
 
 /***************
@@ -963,7 +963,7 @@ toolbar.inline-toolbar, searchbar.inline-toolbar {
 headerbar {
   border-width: 0 0 1px;
   border-style: solid;
-  border-color: #7f7f7f;
+  border-color: gray;
   border-radius: 7px 7px 0 0;
   background-color: transparent;
   background-image: linear-gradient(to bottom, #0a0a0a, #000);
@@ -971,7 +971,7 @@ headerbar {
   padding: 6px; }
   .titlebar:backdrop,
   headerbar:backdrop {
-    border-color: #727272;
+    border-color: #737373;
     background-color: #000;
     background-image: none;
     box-shadow: none; }
@@ -1026,9 +1026,9 @@ headerbar {
       headerbar.selection-mode button:disabled {
         border-width: 2px;
         border-style: solid;
-        color: #7f7f7f;
-        background-color: #060606;
-        border-color: #7f7f7f;
+        color: gray;
+        background-color: #070707;
+        border-color: #494949;
         background-image: none;
         text-shadow: none;
         -gtk-icon-shadow: none; }
@@ -1047,9 +1047,9 @@ headerbar {
       headerbar.selection-mode button:backdrop:disabled {
         border-width: 2px;
         border-style: solid;
-        color: #7f7f7f;
-        background-color: #060606;
-        border-color: #727272;
+        color: gray;
+        background-color: #070707;
+        border-color: #494949;
         background-image: none; }
       .titlebar.selection-mode button.suggested-action,
       headerbar.selection-mode button.suggested-action {
@@ -1058,14 +1058,14 @@ headerbar {
         color: #fff;
         background-image: none;
         background-color: #000;
-        border-color: #7f7f7f; }
+        border-color: gray; }
         .titlebar.selection-mode button.suggested-action:hover,
         headerbar.selection-mode button.suggested-action:hover {
           border-width: 2px;
           border-style: solid;
           color: #fff;
           background-color: #000;
-          border-color: #7f7f7f;
+          border-color: gray;
           background-image: none; }
         .titlebar.selection-mode button.suggested-action:active,
         headerbar.selection-mode button.suggested-action:active {
@@ -1074,14 +1074,14 @@ headerbar {
           background-image: none;
           color: black;
           background-color: white;
-          border-color: #7f7f7f; }
+          border-color: gray; }
         .titlebar.selection-mode button.suggested-action:disabled,
         headerbar.selection-mode button.suggested-action:disabled {
           border-width: 2px;
           border-style: solid;
-          color: #7f7f7f;
-          background-color: #060606;
-          border-color: #7f7f7f;
+          color: gray;
+          background-color: #070707;
+          border-color: #494949;
           background-image: none;
           text-shadow: none;
           -gtk-icon-shadow: none; }
@@ -1091,7 +1091,7 @@ headerbar {
           border-style: solid;
           color: #fff;
           background-color: #000;
-          border-color: #727272;
+          border-color: #737373;
           background-image: none;
           text-shadow: none;
           -gtk-icon-shadow: none; }
@@ -1099,9 +1099,9 @@ headerbar {
         headerbar.selection-mode button.suggested-action:backdrop:disabled {
           border-width: 2px;
           border-style: solid;
-          color: #7f7f7f;
-          background-color: #060606;
-          border-color: #727272;
+          color: gray;
+          background-color: #070707;
+          border-color: #494949;
           background-image: none; }
     .titlebar.selection-mode .selection-menu,
     headerbar.selection-mode .selection-menu {
@@ -1149,44 +1149,44 @@ treeview.view {
   treeview.view:selected {
     border-radius: 0; }
   treeview.view:selected, treeview.view:backdrop:selected {
-    border-left-color: #d4d4d4;
+    border-left-color: #d5d5d5;
     border-top-color: rgba(255, 255, 255, 0.1); }
   treeview.view:disabled {
-    color: #7f7f7f; }
+    color: gray; }
     treeview.view:disabled:selected {
       color: #cccccc; }
       treeview.view:disabled:selected:backdrop {
-        color: #d4d4d4; }
+        color: #d5d5d5; }
     treeview.view:disabled:backdrop {
-      color: #7f7f7f; }
+      color: gray; }
   treeview.view.separator:backdrop {
     min-height: 2px;
     color: rgba(0, 0, 0, 0.1); }
   treeview.view:backdrop {
     color: #fff;
-    border-left-color: #7f7f7f;
+    border-left-color: gray;
     border-top: #000; }
   treeview.view.dnd {
     border-style: solid none;
     border-width: 1px;
-    border-color: #d4d4d4; }
+    border-color: #d5d5d5; }
   treeview.view.expander {
     -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
-    color: #b7b7b7; }
+    color: #b8b8b8; }
     treeview.view.expander:dir(rtl) {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
     treeview.view.expander:hover {
       color: #fff; }
     treeview.view.expander:selected {
-      color: #e5e5e5; }
+      color: #e6e6e6; }
       treeview.view.expander:selected:hover {
         color: #fff; }
       treeview.view.expander:selected:backdrop {
-        color: #e5e5e5; }
+        color: #e6e6e6; }
     treeview.view.expander:checked {
       -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
     treeview.view.expander:backdrop {
-      color: #b7b7b7; }
+      color: #b8b8b8; }
   treeview.view.progressbar {
     color: #111;
     border: 1px solid #aaa;
@@ -1212,7 +1212,7 @@ treeview.view {
     text-shadow: none;
     box-shadow: none; }
     treeview.view header button:hover {
-      color: #c3c3c3;
+      color: #c4c4c4;
       box-shadow: none; }
     treeview.view header button:active {
       color: #fff; }
@@ -1225,15 +1225,15 @@ treeview.view header button, treeview.view header button:hover, treeview.view he
   border-radius: 0;
   border-width: 1px;
   background-image: none;
-  border-color: #7f7f7f;
+  border-color: gray;
   text-shadow: none; }
   treeview.view header button:disabled {
     border-color: #000;
     background-image: none; }
   treeview.view header button:backdrop {
-    border-color: #7f7f7f;
+    border-color: gray;
     border-style: none solid solid none;
-    color: #7f7f7f;
+    color: gray;
     background-image: none;
     background-color: #111; }
     treeview.view header button:backdrop:disabled {
@@ -1243,7 +1243,7 @@ treeview.view header button, treeview.view header button:hover, treeview.view he
 treeview.view.progressbar {
   color: #111;
   border-radius: 4px;
-  background-image: linear-gradient(to bottom, #aaa, #909090); }
+  background-image: linear-gradient(to bottom, #aaa, #919191); }
   treeview.view.progressbar:selected {
     color: #aaa;
     background-image: linear-gradient(to bottom, #111, black); }
@@ -1270,7 +1270,7 @@ menubar,
       color: #aaa; }
     menubar > menuitem:disabled,
     .menubar > menuitem:disabled {
-      color: #7f7f7f;
+      color: gray;
       box-shadow: none; }
 
 menu,
@@ -1278,7 +1278,7 @@ menu,
   margin: 4px;
   padding: 0px;
   background-color: #111;
-  border: 1px solid #7f7f7f; }
+  border: 1px solid gray; }
   menu menuitem,
   .menu menuitem {
     text-shadow: none;
@@ -1290,10 +1290,10 @@ menu,
       background-color: #aaa; }
     menu menuitem:disabled,
     .menu menuitem:disabled {
-      color: #7f7f7f; }
+      color: gray; }
       menu menuitem:disabled:backdrop,
       .menu menuitem:disabled:backdrop {
-        color: #7f7f7f; }
+        color: gray; }
     menu menuitem:backdrop, menu menuitem:backdrop:hover,
     .menu menuitem:backdrop,
     .menu menuitem:backdrop:hover {
@@ -1326,7 +1326,7 @@ menuitem check, menuitem radio {
 popover {
   margin: 10px;
   padding: 2px;
-  border-color: #7f7f7f;
+  border-color: gray;
   border-width: 1px;
   border-style: solid;
   border-radius: 5px;
@@ -1357,7 +1357,7 @@ popover {
   popover.magnifier, popover.osd {
     background-image: none;
     background-color: rgba(0, 0, 0, 0.8);
-    border: 1px solid #7f7f7f;
+    border: 1px solid gray;
     color: #fff; }
     popover.magnifier button, popover.osd button {
       color: white;
@@ -1387,7 +1387,7 @@ popover {
         border-width: 2px;
         border-style: solid;
         border-color: rgba(255, 255, 255, 0.2);
-        color: #7f7f7f; }
+        color: gray; }
 
 /*****************
  * Notebooks and *
@@ -1400,13 +1400,13 @@ notebook {
   notebook:backdrop {
     background-color: #111; }
   notebook.frame {
-    border: 1px solid #7f7f7f; }
+    border: 1px solid gray; }
     notebook.frame:backdrop {
-      border-color: #727272; }
+      border-color: #737373; }
   notebook header {
     background-color: #262626; }
     .frame notebook header {
-      border: 1px solid #7f7f7f; }
+      border: 1px solid gray; }
       .frame notebook header.top {
         border-bottom-width: 0; }
       .frame notebook header.bottom {
@@ -1416,34 +1416,34 @@ notebook {
       .frame notebook header.left {
         border-right-width: 0; }
       .frame notebook header:backdrop {
-        border-color: #727272; }
+        border-color: #737373; }
     notebook header.top {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 -1px #7f7f7f; }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 -1px gray; }
       notebook header.top:backdrop {
-        box-shadow: inset 0 -1px #727272; }
+        box-shadow: inset 0 -1px #737373; }
     notebook header.bottom {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 1px #7f7f7f; }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 1px gray; }
       notebook header.bottom:backdrop {
-        box-shadow: inset 0 1px #727272; }
+        box-shadow: inset 0 1px #737373; }
     notebook header.right {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 1px 0 #7f7f7f; }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 1px 0 gray; }
       notebook header.right:backdrop {
-        box-shadow: inset 1px 0 #727272; }
+        box-shadow: inset 1px 0 #737373; }
     notebook header.left {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset -1px 0 #7f7f7f; }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset -1px 0 gray; }
       notebook header.left:backdrop {
-        box-shadow: inset -1px 0 #727272; }
+        box-shadow: inset -1px 0 #737373; }
     notebook header:backdrop {
-      background-color: #272727;
+      background-color: #282828;
       box-shadow: none; }
     notebook header tabs arrow {
-      color: #7f7f7f; }
+      color: gray; }
       notebook header tabs arrow:hover {
-        color: #bfbfbf; }
+        color: silver; }
       notebook header tabs arrow:checked {
         color: #fff; }
       notebook header tabs arrow:disabled {
-        color: rgba(127, 127, 127, 0.3); }
+        color: rgba(128, 128, 128, 0.3); }
       notebook header tabs arrow:backdrop {
         color: rgba(255, 255, 255, 0.4); }
   notebook header.top tab {
@@ -1481,7 +1481,7 @@ notebook {
     background-color: transparent;
     outline-offset: 0; }
     notebook tab:hover {
-      border-color: #7f7f7f; }
+      border-color: gray; }
     notebook tab:checked, notebook tab:backdrop:checked {
       border-color: #aaa; }
     notebook tab:backdrop {
@@ -1490,17 +1490,17 @@ notebook {
     .top notebook tab.reorderable-page {
       border-color: transparent; }
       .top notebook tab.reorderable-page:hover {
-        border-color: rgba(127, 127, 127, 0.3);
-        border-bottom-color: #7f7f7f;
+        border-color: rgba(128, 128, 128, 0.3);
+        border-bottom-color: gray;
         background-color: rgba(0, 0, 0, 0.2); }
       .top notebook tab.reorderable-page:checked {
         background-color: rgba(0, 0, 0, 0.5);
-        border-color: rgba(127, 127, 127, 0.5);
+        border-color: rgba(128, 128, 128, 0.5);
         border-bottom-color: #aaa; }
         .top notebook tab.reorderable-page:checked:hover {
           background-color: rgba(0, 0, 0, 0.7); }
         .top notebook tab.reorderable-page:checked:backdrop {
-          border-color: #727272;
+          border-color: #737373;
           background-color: #000;
           border-bottom-color: #aaa; }
       .top notebook tab.reorderable-page:backdrop {
@@ -1509,17 +1509,17 @@ notebook {
     .bottom notebook tab.reorderable-page {
       border-color: transparent; }
       .bottom notebook tab.reorderable-page:hover {
-        border-color: rgba(127, 127, 127, 0.3);
-        border-top-color: #7f7f7f;
+        border-color: rgba(128, 128, 128, 0.3);
+        border-top-color: gray;
         background-color: rgba(0, 0, 0, 0.2); }
       .bottom notebook tab.reorderable-page:checked {
         background-color: rgba(0, 0, 0, 0.5);
-        border-color: rgba(127, 127, 127, 0.5);
+        border-color: rgba(128, 128, 128, 0.5);
         border-top-color: #aaa; }
         .bottom notebook tab.reorderable-page:checked:hover {
           background-color: rgba(0, 0, 0, 0.7); }
         .bottom notebook tab.reorderable-page:checked:backdrop {
-          border-color: #727272;
+          border-color: #737373;
           background-color: #000;
           border-top-color: #aaa; }
       .bottom notebook tab.reorderable-page:backdrop {
@@ -1528,17 +1528,17 @@ notebook {
     .left notebook tab.reorderable-page {
       border-color: transparent; }
       .left notebook tab.reorderable-page:hover {
-        border-color: rgba(127, 127, 127, 0.3);
-        border-right-color: #7f7f7f;
+        border-color: rgba(128, 128, 128, 0.3);
+        border-right-color: gray;
         background-color: rgba(0, 0, 0, 0.2); }
       .left notebook tab.reorderable-page:checked {
         background-color: rgba(0, 0, 0, 0.5);
-        border-color: rgba(127, 127, 127, 0.5);
+        border-color: rgba(128, 128, 128, 0.5);
         border-right-color: #aaa; }
         .left notebook tab.reorderable-page:checked:hover {
           background-color: rgba(0, 0, 0, 0.7); }
         .left notebook tab.reorderable-page:checked:backdrop {
-          border-color: #727272;
+          border-color: #737373;
           background-color: #000;
           border-right-color: #aaa; }
       .left notebook tab.reorderable-page:backdrop {
@@ -1547,17 +1547,17 @@ notebook {
     .right notebook tab.reorderable-page {
       border-color: transparent; }
       .right notebook tab.reorderable-page:hover {
-        border-color: rgba(127, 127, 127, 0.3);
-        border-left-color: #7f7f7f;
+        border-color: rgba(128, 128, 128, 0.3);
+        border-left-color: gray;
         background-color: rgba(0, 0, 0, 0.2); }
       .right notebook tab.reorderable-page:checked {
         background-color: rgba(0, 0, 0, 0.5);
-        border-color: rgba(127, 127, 127, 0.5);
+        border-color: rgba(128, 128, 128, 0.5);
         border-left-color: #aaa; }
         .right notebook tab.reorderable-page:checked:hover {
           background-color: rgba(0, 0, 0, 0.7); }
         .right notebook tab.reorderable-page:checked:backdrop {
-          border-color: #727272;
+          border-color: #737373;
           background-color: #000;
           border-left-color: #aaa; }
       .right notebook tab.reorderable-page:backdrop {
@@ -1566,12 +1566,12 @@ notebook {
     notebook tab label {
       padding: 0 2px;
       font-weight: bold;
-      color: #7f7f7f;
+      color: gray;
       /* color: inherit doesn't work here */ }
       notebook tab label:backdrop {
-        color: #7f7f7f; }
+        color: gray; }
     notebook tab:hover label {
-      color: #bfbfbf; }
+      color: silver; }
     notebook tab:checked label {
       color: #fff; }
       notebook tab:checked label:backdrop {
@@ -1587,7 +1587,7 @@ notebook {
         border-style: solid;
         color: #fff;
         background-color: #000;
-        border-color: #7f7f7f;
+        border-color: gray;
         background-image: none;
         border-width: 2px;
         background-image: none;
@@ -1598,7 +1598,7 @@ notebook {
         background-image: none;
         color: black;
         background-color: white;
-        border-color: #7f7f7f;
+        border-color: gray;
         border-width: 2px; }
       notebook tab button:backdrop, notebook tab button:backdrop:hover {
         color: rgba(255, 255, 255, 0.3);
@@ -1623,11 +1623,11 @@ scrollbar {
   scrollbar slider {
     border-radius: 20px;
     border: 5px solid transparent;
-    background-color: #7f7f7f; }
+    background-color: gray; }
     scrollbar slider:backdrop, scrollbar slider:disabled {
-      background-color: #191919; }
+      background-color: #1a1a1a; }
     scrollbar slider:hover {
-      background-color: #b2b2b2; }
+      background-color: #b3b3b3; }
     scrollbar slider:hover:active {
       background-color: #aaa; }
     scrollbar slider.fine-tune {
@@ -1663,8 +1663,8 @@ switch {
   border-width: 1px;
   border-style: solid;
   border-radius: 3px;
-  border-color: #7f7f7f;
-  background-color: #323232;
+  border-color: gray;
+  background-color: #333333;
   box-shadow: inset 0 1px rgba(0, 0, 0, 0.1);
   /*outset not working*/
   text-shadow: 0 1px rgba(0, 0, 0, 0.1); }
@@ -1674,25 +1674,25 @@ switch {
     background-color: #aaa;
     text-shadow: 0 0 2px white; }
   switch:disabled {
-    color: #7f7f7f;
-    border-color: #7f7f7f;
-    background-color: #060606;
+    color: gray;
+    border-color: gray;
+    background-color: #070707;
     text-shadow: none; }
   switch:backdrop {
     color: #fff;
-    border-color: #727272;
+    border-color: #737373;
     background-color: #000;
     box-shadow: none;
     text-shadow: none; }
     switch:backdrop:active {
       color: #fff;
-      border-color: #727272;
-      background-color: #727272;
+      border-color: #737373;
+      background-color: #737373;
       box-shadow: none; }
     switch:backdrop:disabled, switch:backdrop:disabled:active {
-      background-color: #060606;
-      color: #7f7f7f;
-      border-color: #7f7f7f; }
+      background-color: #070707;
+      color: gray;
+      border-color: gray; }
   switch slider {
     margin: -1px;
     min-width: 45px;
@@ -1704,24 +1704,24 @@ switch {
     color: #fff;
     background-image: none;
     background-color: #000;
-    border-color: #7f7f7f;
-    box-shadow: inset 0 1px white, inset 0 -2px rgba(0, 0, 0, 0.6), inset 0 -1px #3f3f3f; }
+    border-color: gray;
+    box-shadow: inset 0 1px white, inset 0 -2px rgba(0, 0, 0, 0.6), inset 0 -1px #404040; }
     switch slider:hover {
       border-width: 2px;
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none;
-      box-shadow: inset 0 1px white, inset 0 -2px rgba(0, 0, 0, 0.6), inset 0 -1px #3f3f3f; }
+      box-shadow: inset 0 1px white, inset 0 -2px rgba(0, 0, 0, 0.6), inset 0 -1px #404040; }
     switch slider:active {
       border-color: #aaa; }
     switch slider:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
-      background-color: #060606;
-      border-color: #7f7f7f;
+      color: gray;
+      background-color: #070707;
+      border-color: #494949;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -1730,18 +1730,18 @@ switch {
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: #727272;
+      border-color: #737373;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
       switch slider:backdrop:active {
-        border-color: #727272; }
+        border-color: #737373; }
       switch slider:backdrop:disabled {
         border-width: 2px;
         border-style: solid;
-        color: #7f7f7f;
-        background-color: #060606;
-        border-color: #727272;
+        color: gray;
+        background-color: #070707;
+        border-color: #494949;
         background-image: none; }
 
 /*************************
@@ -1760,15 +1760,15 @@ check {
   check:checked, check:active {
     -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); }
     check:checked:disabled, check:active:disabled {
-      color: #7f7f7f; }
+      color: gray; }
       check:checked:disabled:backdrop, check:active:disabled:backdrop {
-        color: #7f7f7f; }
+        color: gray; }
     check:checked:backdrop, check:active:backdrop {
       color: #fff; }
   check:disabled {
-    color: #7f7f7f; }
+    color: gray; }
     check:disabled:backdrop {
-      color: #7f7f7f; }
+      color: gray; }
   check:indeterminate {
     -gtk-icon-source: -gtk-icontheme("checkbox-mixed-symbolic"); }
   check:backdrop {
@@ -1785,15 +1785,15 @@ radio {
   radio:checked, radio:active {
     -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); }
     radio:checked:disabled, radio:active:disabled {
-      color: #7f7f7f; }
+      color: gray; }
       radio:checked:disabled:backdrop, radio:active:disabled:backdrop {
-        color: #7f7f7f; }
+        color: gray; }
     radio:checked:backdrop, radio:active:backdrop {
       color: #fff; }
   radio:disabled {
-    color: #7f7f7f; }
+    color: gray; }
     radio:disabled:backdrop {
-      color: #7f7f7f; }
+      color: gray; }
   radio:indeterminate {
     -gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); }
   radio:backdrop {
@@ -1838,9 +1838,9 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
     color: #fff;
     background-image: none;
     background-color: #000;
-    border-color: #7f7f7f;
+    border-color: gray;
     border-radius: 50%;
-    border-color: #777777; }
+    border-color: #787878; }
     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 {
@@ -1848,9 +1848,9 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none;
-      border-color: #777777;
+      border-color: #787878;
       border-radius: 50%; }
     scale trough slider:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough slider:disabled,
@@ -1864,7 +1864,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: #6a6a6a;
+      border-color: #6b6b6b;
       background-image: none;
       box-shadow: none; }
     scale trough slider:backdrop:disabled,
@@ -1872,9 +1872,9 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:backdrop:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
-      background-color: #060606;
-      border-color: #727272;
+      color: gray;
+      background-color: #070707;
+      border-color: #494949;
       background-image: none; }
     scale trough slider:active,
     scale.scale-has-marks-above.scale-has-marks-below trough slider:active,
@@ -1887,8 +1887,8 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
     border-width: 1px;
     border-style: solid;
     border-radius: 3px;
-    border-color: #7f7f7f;
-    background-color: #323232;
+    border-color: gray;
+    background-color: #333333;
     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,
@@ -1898,28 +1898,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: #7f7f7f;
-        background-color: #7f7f7f;
+        border-color: gray;
+        background-color: gray;
         box-shadow: none; }
     scale trough:disabled, scale trough.hilight:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough.hilight:disabled,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough:disabled,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough.hilight:disabled {
-      border-color: #7f7f7f;
-      background-color: #060606; }
+      border-color: #494949;
+      background-color: #070707; }
     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: #727272;
-      background-color: #3f3f3f;
+      border-color: #737373;
+      background-color: #404040;
       box-shadow: none; }
     scale trough:backdrop:disabled, scale trough .hilight:backdrop:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough:backdrop:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough .hilight:backdrop:disabled,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough:backdrop:disabled,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough .hilight:backdrop:disabled {
-      border-color: #7f7f7f;
+      border-color: gray;
       background-color: #000; }
 
 /*****************
@@ -1930,17 +1930,17 @@ progressbar {
   font-size: 83%;
   color: #fff; }
   progressbar:backdrop {
-    color: #7f7f7f; }
+    color: gray; }
   progressbar trough {
     border-width: 1px;
     border-style: solid;
     border-radius: 3px;
-    border-color: #7f7f7f;
-    background-color: #2c2c2c;
+    border-color: gray;
+    background-color: #2d2d2d;
     box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); }
     progressbar trough:backdrop {
-      border-color: #727272;
-      background-color: #272727;
+      border-color: #737373;
+      background-color: #282828;
       box-shadow: 0 1px rgba(255, 255, 255, 0); }
   progressbar.osd trough {
     background-color: transparent;
@@ -1977,8 +1977,8 @@ levelbar trough {
   background-color: transparent;
   border-style: solid;
   background-image: linear-gradient(to bottom, #090909, #111 90%);
-  border-color: #7f7f7f;
-  box-shadow: inset 0 2px 2px -2px #080808; }
+  border-color: gray;
+  box-shadow: inset 0 2px 2px -2px #090909; }
   levelbar trough:backdrop {
     background-color: transparent;
     border-style: solid;
@@ -2004,7 +2004,7 @@ levelbar block.filled.low {
 levelbar block.filled.high {
   border-width: 1px;
   border-style: solid;
-  border-color: #909090;
+  border-color: #919191;
   background-color: #aaa;
   box-shadow: 0 1px rgba(0, 0, 0, 0.1);
   border-radius: 1px; }
@@ -2045,7 +2045,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, row.activatable:backdrop:selected, .sidebar:backdrop:selected {
-    background-color: #7f7f7f;
+    background-color: gray;
     color: #fff; }
 
 /**********
@@ -2053,19 +2053,19 @@ spinbutton selection:focus, modelbutton.flat:hover, modelbutton.flat:selected,
  **********/
 frame border,
 .frame {
-  border: 1px solid #7f7f7f;
+  border: 1px solid gray;
   padding: 0; }
   frame border.flat,
   .frame.flat {
     border-style: none; }
   frame border:backdrop,
   .frame:backdrop {
-    border-color: #727272; }
+    border-color: #737373; }
 
 actionbar box {
   padding: 6px;
   border-width: 1px 0 0;
-  border-color: #7f7f7f;
+  border-color: gray;
   border-style: solid none none; }
 
 placessidebar .frame,
@@ -2076,7 +2076,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(black), to(transparent)), -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(255, 255, 255, 0.5)), to(rgba(255, 255, 255, 0)));
+  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(255, 255, 255, 0.5)), to(rgba(255, 255, 255, 0)));
   background-size: 100% 5%, 100% 100%;
   background-repeat: no-repeat;
   background-position: center top;
@@ -2085,7 +2085,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(#727272), to(rgba(114, 114, 114, 0)));
+    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#737373), to(rgba(115, 115, 115, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center top;
@@ -2094,7 +2094,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(black), to(transparent)), -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(255, 255, 255, 0.5)), to(rgba(255, 255, 255, 0)));
+  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(255, 255, 255, 0.5)), to(rgba(255, 255, 255, 0)));
   background-size: 100% 5%, 100% 100%;
   background-repeat: no-repeat;
   background-position: center bottom;
@@ -2103,7 +2103,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(#727272), to(rgba(114, 114, 114, 0)));
+    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#737373), to(rgba(115, 115, 115, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center bottom;
@@ -2112,7 +2112,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(black), to(transparent)), -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(255, 255, 255, 0.5)), to(rgba(255, 255, 255, 0)));
+  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(255, 255, 255, 0.5)), to(rgba(255, 255, 255, 0)));
   background-size: 5% 100%, 100% 100%;
   background-repeat: no-repeat;
   background-position: left center;
@@ -2121,7 +2121,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(#727272), to(rgba(114, 114, 114, 0)));
+    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#737373), to(rgba(115, 115, 115, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: left center;
@@ -2130,7 +2130,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(black), to(transparent)), -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(255, 255, 255, 0.5)), to(rgba(255, 255, 255, 0)));
+  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(255, 255, 255, 0.5)), to(rgba(255, 255, 255, 0)));
   background-size: 5% 100%, 100% 100%;
   background-repeat: no-repeat;
   background-position: right center;
@@ -2139,7 +2139,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(#727272), to(rgba(114, 114, 114, 0)));
+    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#737373), to(rgba(115, 115, 115, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: right center;
@@ -2207,7 +2207,7 @@ placessidebar .view separator:backdrop,
 placessidebar textview text separator:backdrop,
 textview placessidebar text separator:backdrop,
 placessidebar iconview separator:backdrop {
-  background: #7f7f7f;
+  background: gray;
   min-width: 1px;
   min-height: 1px; }
 
@@ -2216,10 +2216,10 @@ placessidebar iconview separator:backdrop {
  *********/
 list {
   background-color: #111;
-  border-color: #7f7f7f; }
+  border-color: gray; }
   list:backdrop {
     background-color: #111;
-    border-color: #727272; }
+    border-color: #737373; }
   list row {
     padding: 2px; }
 
@@ -2240,7 +2240,7 @@ row.activatable:disabled:checked {
 row.activatable {
   color: #fff; }
   row.activatable:hover, placessidebar .has-open-popup {
-    background-color: #1c1c1c; }
+    background-color: #1d1d1d; }
   row.activatable:active {
     box-shadow: inset 0 2px 2px -2px rgba(0, 0, 0, 0.2); }
   row.activatable:selected {
@@ -2249,9 +2249,9 @@ row.activatable {
     row.activatable:selected:active {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); }
     row.activatable:selected:hover, placessidebar .has-open-popup:selected {
-      background-color: #b2b2b2; }
+      background-color: #b3b3b3; }
     row.activatable:selected:backdrop {
-      background-color: #7f7f7f; }
+      background-color: gray; }
     row.activatable:selected .button.flat {
       color: #fff; }
       row.activatable:selected .button.flat:hover {
@@ -2279,7 +2279,7 @@ row.activatable {
   padding: 10px;
   border-width: 0 1px 1px;
   border-style: solid;
-  border-color: #7f7f7f;
+  border-color: gray;
   border-radius: 0 0 6px 6px;
   background-image: linear-gradient(to bottom, black 5%, black); }
   .app-notification .button,
@@ -2304,7 +2304,7 @@ expander arrow {
  * Calendar *
  ***********/
 calendar {
-  border: 1px solid #7f7f7f; }
+  border: 1px solid gray; }
   calendar.button {
     padding: 0 4px;
     color: #707070; }
@@ -2316,10 +2316,10 @@ calendar {
     border-radius: 2px; }
   calendar.header {
     background: linear-gradient(to bottom, #050505, black);
-    border-bottom-color: #3f3f3f; }
+    border-bottom-color: #404040; }
     calendar.header:backdrop {
       background-image: linear-gradient(to bottom, #000);
-      border-bottom-color: #393939; }
+      border-bottom-color: #3a3a3a; }
   calendar:indeterminate, calendar:indeterminate:backdrop {
     color: alpha(currentColor,0.55); }
   calendar.highlight, calendar.highlight:backdrop {
@@ -2345,13 +2345,13 @@ messagedialog.csd {
     color: #fff;
     background-image: none;
     background-color: #000;
-    border-color: #7f7f7f; }
+    border-color: gray; }
     messagedialog.csd .dialog-action-area button:hover {
       border-width: 2px;
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none; }
     messagedialog.csd .dialog-action-area button:active {
       border-width: 2px;
@@ -2359,13 +2359,13 @@ messagedialog.csd {
       background-image: none;
       color: black;
       background-color: white;
-      border-color: #7f7f7f; }
+      border-color: gray; }
     messagedialog.csd .dialog-action-area button:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
-      background-color: #060606;
-      border-color: #7f7f7f;
+      color: gray;
+      background-color: #070707;
+      border-color: #494949;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -2374,16 +2374,16 @@ messagedialog.csd {
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: #727272;
+      border-color: #737373;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
     messagedialog.csd .dialog-action-area button:backdrop:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
-      background-color: #060606;
-      border-color: #727272;
+      color: gray;
+      background-color: #070707;
+      border-color: #494949;
       background-image: none; }
     messagedialog.csd .dialog-action-area button.suggested-action {
       border-width: 2px;
@@ -2418,16 +2418,16 @@ messagedialog.csd {
         messagedialog.csd .dialog-action-area button.suggested-action:backdrop:disabled {
           border-width: 2px;
           border-style: solid;
-          color: #7f7f7f;
-          background-color: #060606;
-          border-color: #727272;
+          color: gray;
+          background-color: #070707;
+          border-color: #494949;
           background-image: none; }
       messagedialog.csd .dialog-action-area button.suggested-action:disabled {
         border-width: 2px;
         border-style: solid;
-        color: #7f7f7f;
-        background-color: #060606;
-        border-color: #7f7f7f;
+        color: gray;
+        background-color: #070707;
+        border-color: #494949;
         background-image: none;
         text-shadow: none;
         -gtk-icon-shadow: none; }
@@ -2464,16 +2464,16 @@ messagedialog.csd {
         messagedialog.csd .dialog-action-area button.destructive-action:backdrop:disabled {
           border-width: 2px;
           border-style: solid;
-          color: #7f7f7f;
-          background-color: #060606;
-          border-color: #727272;
+          color: gray;
+          background-color: #070707;
+          border-color: #494949;
           background-image: none; }
       messagedialog.csd .dialog-action-area button.destructive-action:disabled {
         border-width: 2px;
         border-style: solid;
-        color: #7f7f7f;
-        background-color: #060606;
-        border-color: #7f7f7f;
+        color: gray;
+        background-color: #070707;
+        border-color: #494949;
         background-image: none;
         text-shadow: none;
         -gtk-icon-shadow: none; }
@@ -2487,9 +2487,9 @@ messagedialog.csd {
     border-bottom-left-radius: 7px; }
 
 GtkFileChooserDialog .dialog-action-box {
-  border-top: 1px solid #7f7f7f; }
+  border-top: 1px solid gray; }
   GtkFileChooserDialog .dialog-action-box:backdrop {
-    border-top-color: #727272; }
+    border-top-color: #737373; }
 
 /***********
  * Sidebar *
@@ -2499,10 +2499,10 @@ GtkFileChooserDialog .dialog-action-box {
   .sidebar:backdrop {
     background-color: #000; }
   .sidebar > scrolledwindow > .frame {
-    border-right: 1px solid #7f7f7f; }
+    border-right: 1px solid gray; }
     .sidebar > scrolledwindow > .frame:dir(rtl) {
       border-right: none;
-      border-left: 1px solid #7f7f7f; }
+      border-left: 1px solid gray; }
 
 placessidebar row {
   padding: 0px; }
@@ -2529,9 +2529,9 @@ placessidebar .view, placessidebar textview text, textview placessidebar text, p
   color: #fff;
   background-color: transparent; }
   placessidebar .view .image, placessidebar textview text .image, textview placessidebar text .image, placessidebar iconview .image {
-    color: #b2b2b2; }
+    color: #b3b3b3; }
     placessidebar .view .image:selected, placessidebar textview text .image:selected, textview placessidebar text .image:selected, placessidebar iconview .image:selected {
-      color: #f6f6f6; }
+      color: #f7f7f7; }
 
 stacksidebar row {
   padding: 10px 4px; }
@@ -2555,9 +2555,9 @@ paned placessidebar iconview separator:backdrop,
 placessidebar iconview paned separator:backdrop {
   min-width: 1px;
   min-height: 1px;
-  background-image: linear-gradient(to bottom, #7f7f7f); }
+  background-image: linear-gradient(to bottom, gray); }
   paned separator:backdrop {
-    background-image: linear-gradient(to bottom, #727272); }
+    background-image: linear-gradient(to bottom, #737373); }
 paned:dir(ltr).horizontal separator {
   margin: 0 -8px 0 0;
   padding: 0 8px 0 0; }
@@ -2598,7 +2598,7 @@ placessidebar iconview paned separator.wide:backdrop {
   min-height: 5px;
   background-color: transparent;
   border-style: none solid;
-  border-color: #7f7f7f;
+  border-color: gray;
   border-width: 1px; }
 
 /**************
@@ -2614,8 +2614,8 @@ infobar {
 .error {
   background-color: #aaa;
   color: #fff;
-  text-shadow: 0 1px #909090;
-  border-color: #909090; }
+  text-shadow: 0 1px #919191;
+  border-color: #919191; }
   .info button,
   .question button,
   .warning button,
@@ -2652,9 +2652,9 @@ infobar {
     .error button:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
-      background-color: #060606;
-      border-color: #7f7f7f;
+      color: gray;
+      background-color: #070707;
+      border-color: #494949;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -2676,9 +2676,9 @@ infobar {
     .error button:backdrop:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
-      background-color: #060606;
-      border-color: #727272;
+      color: gray;
+      background-color: #070707;
+      border-color: #494949;
       background-image: none; }
   .info label:selected,
   .info label:selected:focus,
@@ -2780,20 +2780,20 @@ colorswatch {
     color: #fff;
     background-image: none;
     background-color: #000;
-    border-color: #7f7f7f; }
+    border-color: gray; }
     colorswatch#add-color-button:hover {
       border-width: 2px;
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none; }
     colorswatch#add-color-button:backdrop {
       border-width: 2px;
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: #727272;
+      border-color: #737373;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -2824,7 +2824,7 @@ decoration {
     border-radius: 0;
     margin: 4px;
     background-color: #000;
-    border: solid 1px #727272;
+    border: solid 1px #737373;
     box-shadow: none; }
 
 button.titlebutton {
@@ -2839,20 +2839,20 @@ button.titlebutton {
     color: #fff;
     background-image: none;
     background-color: #000;
-    border-color: #7f7f7f; }
+    border-color: gray; }
   button.titlebutton:active {
     border-width: 2px;
     border-style: solid;
     background-image: none;
     color: black;
     background-color: white;
-    border-color: #7f7f7f; }
+    border-color: gray; }
   button.titlebutton:backdrop {
     border-width: 2px;
     border-style: solid;
     color: #fff;
     background-color: #000;
-    border-color: #727272;
+    border-color: #737373;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none;
@@ -2937,7 +2937,7 @@ cursor-handle {
       border-width: 2px;
       border-style: solid;
       border-color: rgba(255, 255, 255, 0.2);
-      color: #7f7f7f; }
+      color: gray; }
     .touch-selection button:backdrop {
       border-width: 2px;
       border-style: solid; }
diff --git a/gtk/theme/HighContrast/gtk-contained.css b/gtk/theme/HighContrast/gtk-contained.css
index fa3f4d7e12..4418aa4c9f 100644
--- a/gtk/theme/HighContrast/gtk-contained.css
+++ b/gtk/theme/HighContrast/gtk-contained.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 #7f7f7f;
+@define-color insensitive_fg_color gray;
 @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 #7f7f7f;
-@define-color unfocused_borders #8b8b8b;
+@define-color borders gray;
+@define-color unfocused_borders #8d8d8d;
 @define-color warning_color #f57900;
 @define-color error_color #cc0000;
 @define-color success_color #73d216;
@@ -80,7 +80,7 @@
     color: #000; }
   .gtkstyle-fallback:disabled {
     background-color: white;
-    color: #7f7f7f; }
+    color: gray; }
   .gtkstyle-fallback:selected {
     background-color: #000;
     color: #fff; }
@@ -106,7 +106,7 @@ flowbox flowboxchild {
     outline-offset: -2px; }
 
 label:disabled, label:backdrop:disabled {
-  color: #7f7f7f; }
+  color: gray; }
 
 /*********************
  * Spinner Animation *
@@ -135,15 +135,15 @@ entry, spinbutton {
   background-color: transparent;
   border-style: solid;
   background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-  border-color: #7f7f7f;
-  box-shadow: inset 0 2px 2px -2px #7f7f7f; }
+  border-color: gray;
+  box-shadow: inset 0 2px 2px -2px gray; }
   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: #7f7f7f;
-    box-shadow: inset 0 2px 2px -2px #7f7f7f;
+    border-color: gray;
+    box-shadow: inset 0 2px 2px -2px gray;
     border: none;
     border-radius: 0; }
   entry:focus, spinbutton:focus {
@@ -151,13 +151,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 #7f7f7f, inset 0 0 2px 1px #cccccc; }
+    box-shadow: inset 0 2px 2px -2px gray, inset 0 0 2px 1px #cccccc; }
   entry:disabled, spinbutton:disabled {
     background-color: transparent;
     border-style: solid;
     background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-    color: #7f7f7f;
-    border-color: #7f7f7f;
+    color: gray;
+    border-color: gray;
     background-image: linear-gradient(to bottom, white);
     box-shadow: none; }
   entry:backdrop, spinbutton:backdrop {
@@ -171,7 +171,7 @@ entry, spinbutton {
     background-color: transparent;
     border-style: solid;
     background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-    color: #7f7f7f;
+    color: gray;
     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 {
@@ -203,10 +203,10 @@ entry, spinbutton {
     background-color: transparent;
     border-style: solid;
     background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-    border-color: #7f7f7f;
-    box-shadow: inset 0 2px 2px -2px #7f7f7f;
+    border-color: gray;
+    box-shadow: inset 0 2px 2px -2px gray;
     background-image: linear-gradient(to bottom, #fff);
-    border-bottom-color: #d8d8d8;
+    border-bottom-color: #d9d9d9;
     box-shadow: none; }
     .linked.vertical entry:focus, .linked.vertical spinbutton:focus {
       border-color: #000;
@@ -215,19 +215,19 @@ entry, spinbutton {
       background-color: transparent;
       border-style: solid;
       background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-      color: #7f7f7f;
-      border-color: #7f7f7f;
+      color: gray;
+      border-color: gray;
       background-image: linear-gradient(to bottom, white);
       box-shadow: none;
-      border-bottom-color: #d8d8d8; }
+      border-bottom-color: #d9d9d9; }
       .linked.vertical entry:disabled:backdrop, .linked.vertical spinbutton:disabled:backdrop {
         background-color: transparent;
         border-style: solid;
         background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-        color: #7f7f7f;
+        color: gray;
         background-image: linear-gradient(to bottom, #fff);
         box-shadow: 0 1px rgba(255, 255, 255, 0);
-        border-bottom-color: gainsboro; }
+        border-bottom-color: #dddddd; }
     .linked.vertical entry:backdrop, .linked.vertical spinbutton:backdrop {
       background-color: transparent;
       border-style: solid;
@@ -235,37 +235,37 @@ entry, spinbutton {
       color: #000;
       background-image: linear-gradient(to bottom, #fff);
       box-shadow: 0 1px rgba(255, 255, 255, 0);
-      border-bottom-color: gainsboro; }
+      border-bottom-color: #dddddd; }
     .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: #7f7f7f;
-      box-shadow: inset 0 2px 2px -2px #7f7f7f;
-      border-bottom-color: #d8d8d8; }
+      border-color: gray;
+      box-shadow: inset 0 2px 2px -2px gray;
+      border-bottom-color: #d9d9d9; }
       .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 #7f7f7f, inset 0 0 2px 1px #cccccc; }
+        box-shadow: inset 0 2px 2px -2px gray, inset 0 0 2px 1px #cccccc; }
       .linked.vertical entry:first-child:disabled, .linked.vertical spinbutton:first-child:disabled {
         background-color: transparent;
         border-style: solid;
         background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-        color: #7f7f7f;
-        border-color: #7f7f7f;
+        color: gray;
+        border-color: gray;
         background-image: linear-gradient(to bottom, white);
         box-shadow: none;
-        border-bottom-color: gainsboro; }
+        border-bottom-color: #dddddd; }
         .linked.vertical entry:first-child:disabled:backdrop, .linked.vertical spinbutton:first-child:disabled:backdrop {
           background-color: transparent;
           border-style: solid;
           background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-          color: #7f7f7f;
+          color: gray;
           background-image: linear-gradient(to bottom, #fff);
           box-shadow: 0 1px rgba(255, 255, 255, 0);
-          border-bottom-color: gainsboro;
+          border-bottom-color: #dddddd;
           border-top-style: solid; }
       .linked.vertical entry:first-child:backdrop, .linked.vertical spinbutton:first-child:backdrop {
         background-color: transparent;
@@ -274,13 +274,13 @@ entry, spinbutton {
         color: #000;
         background-image: linear-gradient(to bottom, #fff);
         box-shadow: 0 1px rgba(255, 255, 255, 0);
-        border-bottom-color: gainsboro; }
+        border-bottom-color: #dddddd; }
     .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: #7f7f7f;
-      box-shadow: inset 0 2px 2px -2px #7f7f7f;
+      border-color: gray;
+      box-shadow: inset 0 2px 2px -2px gray;
       border-top-width: 0;
       background-image: linear-gradient(to bottom, #fff);
       box-shadow: none; }
@@ -291,15 +291,15 @@ entry, spinbutton {
         background-color: transparent;
         border-style: solid;
         background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-        color: #7f7f7f;
-        border-color: #7f7f7f;
+        color: gray;
+        border-color: gray;
         background-image: linear-gradient(to bottom, white);
         box-shadow: none; }
         .linked.vertical entry:last-child:disabled:backdrop, .linked.vertical spinbutton:last-child:disabled:backdrop {
           background-color: transparent;
           border-style: solid;
           background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-          color: #7f7f7f;
+          color: gray;
           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 {
@@ -317,7 +317,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 #7f7f7f, inset 0 0 2px 1px #f4cccc; }
+      box-shadow: inset 0 2px 2px -2px gray, inset 0 0 2px 1px #f5cccc; }
     entry.error:selected, entry.error:selected:focus, spinbutton.error:selected, spinbutton.error:selected:focus {
       background-color: #cc0000; }
   entry.warning, spinbutton.warning {
@@ -328,7 +328,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 #7f7f7f, inset 0 0 2px 1px #fde4cc; }
+      box-shadow: inset 0 2px 2px -2px gray, inset 0 0 2px 1px #fde4cc; }
     entry.warning:selected, entry.warning:selected:focus, spinbutton.warning:selected, spinbutton.warning:selected:focus {
       background-color: #f57900; }
 
@@ -349,13 +349,13 @@ button {
   color: #000;
   background-image: none;
   background-color: #fff;
-  border-color: #7f7f7f; }
+  border-color: gray; }
   button:hover, button.flat:hover, button.sidebar-button:hover {
     border-width: 2px;
     border-style: solid;
     color: #000;
     background-color: #fff;
-    border-color: #7f7f7f;
+    border-color: gray;
     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 {
@@ -364,14 +364,14 @@ button {
     background-image: none;
     color: white;
     background-color: black;
-    border-color: #7f7f7f;
+    border-color: gray;
     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: #8b8b8b;
+    border-color: #8d8d8d;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
@@ -379,37 +379,37 @@ button {
       border-width: 2px;
       border-style: solid;
       color: white;
-      background-color: #8b8b8b;
-      border-color: #8b8b8b;
+      background-color: #8d8d8d;
+      border-color: #8d8d8d;
       background-image: none; }
     button:backdrop:disabled, button.flat:backdrop:disabled, button.sidebar-button:backdrop:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
+      color: gray;
       background-color: white;
-      border-color: #8b8b8b;
+      border-color: silver;
       background-image: none; }
     button:backdrop:disabled:active, button.flat:backdrop:disabled:active, button.sidebar-button:backdrop:disabled:active {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
-      border-color: #8b8b8b;
+      color: gray;
+      border-color: silver;
       background-image: none;
-      background-color: whitesmoke; }
+      background-color: #f6f6f6; }
   button:disabled {
     border-width: 2px;
     border-style: solid;
-    color: #7f7f7f;
+    color: gray;
     background-color: white;
-    border-color: #7f7f7f;
+    border-color: silver;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
     button:disabled:active, button:disabled.flat:active, button.sidebar-button:disabled:active {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
-      border-color: #7f7f7f;
+      color: gray;
+      border-color: silver;
       background-image: none;
       background-color: white; }
   .osd button {
@@ -440,7 +440,7 @@ button {
       border-width: 2px;
       border-style: solid;
       border-color: rgba(255, 255, 255, 0.2);
-      color: #7f7f7f; }
+      color: gray; }
     .osd button:backdrop {
       border-width: 2px;
       border-style: solid; }
@@ -477,16 +477,16 @@ button {
       button.suggested-action:backdrop:disabled {
         border-width: 2px;
         border-style: solid;
-        color: #7f7f7f;
+        color: gray;
         background-color: white;
-        border-color: #8b8b8b;
+        border-color: silver;
         background-image: none; }
     button.suggested-action:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
+      color: gray;
       background-color: white;
-      border-color: #7f7f7f;
+      border-color: silver;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -523,16 +523,16 @@ button {
       button.destructive-action:backdrop:disabled {
         border-width: 2px;
         border-style: solid;
-        color: #7f7f7f;
+        color: gray;
         background-color: white;
-        border-color: #8b8b8b;
+        border-color: silver;
         background-image: none; }
     button.destructive-action:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
+      color: gray;
       background-color: white;
-      border-color: #7f7f7f;
+      border-color: silver;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -552,13 +552,13 @@ button {
   color: #000;
   background-image: none;
   background-color: #fff;
-  border-color: #7f7f7f; }
+  border-color: gray; }
   .inline-toolbar toolbutton > button:hover {
     border-width: 2px;
     border-style: solid;
     color: #000;
     background-color: #fff;
-    border-color: #7f7f7f;
+    border-color: gray;
     background-image: none; }
   .inline-toolbar toolbutton > button:active {
     border-width: 2px;
@@ -566,21 +566,21 @@ button {
     background-image: none;
     color: white;
     background-color: black;
-    border-color: #7f7f7f; }
+    border-color: gray; }
   .inline-toolbar toolbutton > button:disabled {
     border-width: 2px;
     border-style: solid;
-    color: #7f7f7f;
+    color: gray;
     background-color: white;
-    border-color: #7f7f7f;
+    border-color: silver;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
   .inline-toolbar toolbutton > button:disabled:active {
     border-width: 2px;
     border-style: solid;
-    color: #7f7f7f;
-    border-color: #7f7f7f;
+    color: gray;
+    border-color: silver;
     background-image: none;
     background-color: white; }
   .inline-toolbar toolbutton > button:backdrop {
@@ -588,7 +588,7 @@ button {
     border-style: solid;
     color: #000;
     background-color: #fff;
-    border-color: #8b8b8b;
+    border-color: #8d8d8d;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
@@ -596,23 +596,23 @@ button {
     border-width: 2px;
     border-style: solid;
     color: white;
-    background-color: #8b8b8b;
-    border-color: #8b8b8b;
+    background-color: #8d8d8d;
+    border-color: #8d8d8d;
     background-image: none; }
   .inline-toolbar toolbutton > button:backdrop:disabled {
     border-width: 2px;
     border-style: solid;
-    color: #7f7f7f;
+    color: gray;
     background-color: white;
-    border-color: #8b8b8b;
+    border-color: silver;
     background-image: none; }
   .inline-toolbar toolbutton > button:backdrop:disabled:active {
     border-width: 2px;
     border-style: solid;
-    color: #7f7f7f;
-    border-color: #8b8b8b;
+    color: gray;
+    border-color: silver;
     background-image: none;
-    background-color: whitesmoke; }
+    background-color: #f6f6f6; }
 
 toolbar.inline-toolbar toolbutton > button.flat, searchbar.inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton > button.sidebar-button, searchbar.inline-toolbar toolbutton > button.sidebar-button {
   border-radius: 0;
@@ -702,7 +702,7 @@ modelbutton.flat,
       background-color: #000; }
   modelbutton.flat:disabled,
   .menuitem.button.flat:disabled {
-    color: #7f7f7f; }
+    color: gray; }
 
 button.color {
   padding: 4px; }
@@ -745,8 +745,8 @@ spinbutton {
    */ }
   spinbutton button {
     background-image: none;
-    border-color: rgba(127, 127, 127, 0.3);
-    color: #0c0c0c;
+    border-color: rgba(128, 128, 128, 0.3);
+    color: #0d0d0d;
     border-radius: 0; }
     spinbutton button:dir(ltr) {
       border-style: none none none solid; }
@@ -761,7 +761,7 @@ spinbutton {
         border-style: none solid none none; }
     spinbutton button:disabled {
       box-shadow: none;
-      color: rgba(127, 127, 127, 0.3); }
+      color: rgba(128, 128, 128, 0.3); }
       spinbutton button:disabled:dir(ltr) {
         border-style: none none none solid; }
       spinbutton button:disabled:dir(rtl) {
@@ -770,7 +770,7 @@ spinbutton {
       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(139, 139, 139, 0.3);
+      border-color: rgba(141, 141, 141, 0.3);
       background-color: #fff;
       box-shadow: none; }
       spinbutton button:backdrop:dir(ltr) {
@@ -779,7 +779,7 @@ spinbutton {
         border-style: none solid none none; }
     spinbutton button:backdrop:disabled {
       box-shadow: none;
-      color: rgba(127, 127, 127, 0.3); }
+      color: rgba(128, 128, 128, 0.3); }
       spinbutton button:backdrop:disabled:dir(rtl) {
         border-width: 0 1px 0 0; }
       spinbutton button:backdrop:disabled:dir(ltr) {
@@ -792,27 +792,27 @@ spinbutton {
     color: #000;
     background-image: none;
     background-color: #fff;
-    border-color: #7f7f7f; }
+    border-color: gray; }
     spinbutton.vertical button:first-child:active {
       border-width: 2px;
       border-style: solid;
       background-image: none;
       color: white;
       background-color: black;
-      border-color: #7f7f7f; }
+      border-color: gray; }
     spinbutton.vertical button:first-child:hover {
       border-width: 2px;
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none; }
     spinbutton.vertical button:first-child:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
+      color: gray;
       background-color: white;
-      border-color: #7f7f7f;
+      border-color: silver;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -821,7 +821,7 @@ spinbutton {
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: #8b8b8b;
+      border-color: #8d8d8d;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -831,27 +831,27 @@ spinbutton {
     color: #000;
     background-image: none;
     background-color: #fff;
-    border-color: #7f7f7f; }
+    border-color: gray; }
     spinbutton.vertical button:last-child:active {
       border-width: 2px;
       border-style: solid;
       background-image: none;
       color: white;
       background-color: black;
-      border-color: #7f7f7f; }
+      border-color: gray; }
     spinbutton.vertical button:last-child:hover {
       border-width: 2px;
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none; }
     spinbutton.vertical button:last-child:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
+      color: gray;
       background-color: white;
-      border-color: #7f7f7f;
+      border-color: silver;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -860,16 +860,16 @@ spinbutton {
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: #8b8b8b;
+      border-color: #8d8d8d;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
   spinbutton.vertical button:backdrop:disabled {
     border-width: 2px;
     border-style: solid;
-    color: #7f7f7f;
+    color: gray;
     background-color: white;
-    border-color: #8b8b8b;
+    border-color: silver;
     background-image: none; }
   spinbutton.vertical.entry {
     border-radius: 0; }
@@ -890,7 +890,7 @@ combobox {
     padding-left: 8px;
     padding-right: 8px; }
   combobox:disabled {
-    color: #7f7f7f;
+    color: gray;
     text-shadow: none;
     -gtk-icon-shadow: none; }
   combobox:backdrop {
@@ -898,7 +898,7 @@ combobox {
     text-shadow: none;
     -gtk-icon-shadow: none; }
   combobox:backdrop:disabled {
-    color: #7f7f7f; }
+    color: gray; }
   combobox arrow {
     -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
     min-height: 16px;
@@ -935,25 +935,25 @@ toolbar, searchbar {
     padding: 3px;
     border-radius: 0  0 4px 4px; }
   toolbar.vertical, searchbar.vertical {
-    border-right: 1px solid #7f7f7f; }
+    border-right: 1px solid gray; }
     toolbar.vertical:dir(rtl), searchbar.vertical:dir(rtl) {
       border-right: none;
-      border-left: 1px solid #7f7f7f; }
+      border-left: 1px solid gray; }
 
 searchbar {
   border-width: 0 0 1px;
-  border-color: #7f7f7f;
+  border-color: gray;
   border-style: none none solid none;
   padding: 3px; }
 
 toolbar.inline-toolbar, searchbar.inline-toolbar {
   border-style: solid;
-  border-color: #7f7f7f;
-  background-color: #d8d8d8;
-  box-shadow: inset 0 2px 3px -1px #a2a2a2; }
+  border-color: gray;
+  background-color: #d9d9d9;
+  box-shadow: inset 0 2px 3px -1px #a4a4a4; }
   toolbar.inline-toolbar:backdrop, searchbar.inline-toolbar:backdrop {
-    border-color: #8b8b8b;
-    background-color: #d6d6d6;
+    border-color: #8d8d8d;
+    background-color: #d7d7d7;
     box-shadow: none; }
 
 /***************
@@ -963,15 +963,15 @@ toolbar.inline-toolbar, searchbar.inline-toolbar {
 headerbar {
   border-width: 0 0 1px;
   border-style: solid;
-  border-color: #7f7f7f;
+  border-color: gray;
   border-radius: 7px 7px 0 0;
   background-color: transparent;
   background-image: linear-gradient(to bottom, white, #fff);
-  box-shadow: inset 0 -1px #d8d8d8, inset 0 1px #fff;
+  box-shadow: inset 0 -1px #d9d9d9, inset 0 1px #fff;
   padding: 6px; }
   .titlebar:backdrop,
   headerbar:backdrop {
-    border-color: #8b8b8b;
+    border-color: #8d8d8d;
     background-color: #fff;
     background-image: none;
     box-shadow: none; }
@@ -997,7 +997,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 #d8d8d8, inset 0 1px #7f7f7f; }
+    box-shadow: inset 0 -1px #d9d9d9, inset 0 1px gray; }
     .titlebar.selection-mode button,
     headerbar.selection-mode button {
       border-width: 2px;
@@ -1026,9 +1026,9 @@ headerbar {
       headerbar.selection-mode button:disabled {
         border-width: 2px;
         border-style: solid;
-        color: #7f7f7f;
+        color: gray;
         background-color: white;
-        border-color: #7f7f7f;
+        border-color: silver;
         background-image: none;
         text-shadow: none;
         -gtk-icon-shadow: none; }
@@ -1047,9 +1047,9 @@ headerbar {
       headerbar.selection-mode button:backdrop:disabled {
         border-width: 2px;
         border-style: solid;
-        color: #7f7f7f;
+        color: gray;
         background-color: white;
-        border-color: #8b8b8b;
+        border-color: silver;
         background-image: none; }
       .titlebar.selection-mode button.suggested-action,
       headerbar.selection-mode button.suggested-action {
@@ -1058,14 +1058,14 @@ headerbar {
         color: #000;
         background-image: none;
         background-color: #fff;
-        border-color: #7f7f7f; }
+        border-color: gray; }
         .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: #7f7f7f;
+          border-color: gray;
           background-image: none; }
         .titlebar.selection-mode button.suggested-action:active,
         headerbar.selection-mode button.suggested-action:active {
@@ -1074,14 +1074,14 @@ headerbar {
           background-image: none;
           color: white;
           background-color: black;
-          border-color: #7f7f7f; }
+          border-color: gray; }
         .titlebar.selection-mode button.suggested-action:disabled,
         headerbar.selection-mode button.suggested-action:disabled {
           border-width: 2px;
           border-style: solid;
-          color: #7f7f7f;
+          color: gray;
           background-color: white;
-          border-color: #7f7f7f;
+          border-color: silver;
           background-image: none;
           text-shadow: none;
           -gtk-icon-shadow: none; }
@@ -1091,7 +1091,7 @@ headerbar {
           border-style: solid;
           color: #000;
           background-color: #fff;
-          border-color: #8b8b8b;
+          border-color: #8d8d8d;
           background-image: none;
           text-shadow: none;
           -gtk-icon-shadow: none; }
@@ -1099,9 +1099,9 @@ headerbar {
         headerbar.selection-mode button.suggested-action:backdrop:disabled {
           border-width: 2px;
           border-style: solid;
-          color: #7f7f7f;
+          color: gray;
           background-color: white;
-          border-color: #8b8b8b;
+          border-color: silver;
           background-image: none; }
     .titlebar.selection-mode .selection-menu,
     headerbar.selection-mode .selection-menu {
@@ -1144,27 +1144,27 @@ treeview.view {
   -GtkTreeView-tree-line-width: 1;
   -GtkTreeView-tree-line-pattern: '';
   -GtkTreeView-expander-size: 16;
-  border-left-color: #7f7f7f;
+  border-left-color: gray;
   border-top-color: #fff; }
   treeview.view:selected {
     border-radius: 0; }
   treeview.view:selected, treeview.view:backdrop:selected {
-    border-left-color: #7f7f7f;
+    border-left-color: gray;
     border-top-color: rgba(0, 0, 0, 0.1); }
   treeview.view:disabled {
-    color: #7f7f7f; }
+    color: gray; }
     treeview.view:disabled:selected {
       color: #666666; }
       treeview.view:disabled:selected:backdrop {
-        color: #7f7f7f; }
+        color: gray; }
     treeview.view:disabled:backdrop {
-      color: #7f7f7f; }
+      color: gray; }
   treeview.view.separator:backdrop {
     min-height: 2px;
     color: rgba(0, 0, 0, 0.1); }
   treeview.view:backdrop {
     color: #000;
-    border-left-color: #7f7f7f;
+    border-left-color: gray;
     border-top: #fff; }
   treeview.view.dnd {
     border-style: solid none;
@@ -1172,21 +1172,21 @@ treeview.view {
     border-color: black; }
   treeview.view.expander {
     -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
-    color: #4c4c4c; }
+    color: #4d4d4d; }
     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: #b2b2b2; }
+      color: #b3b3b3; }
       treeview.view.expander:selected:hover {
         color: #fff; }
       treeview.view.expander:selected:backdrop {
-        color: #b2b2b2; }
+        color: #b3b3b3; }
     treeview.view.expander:checked {
       -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
     treeview.view.expander:backdrop {
-      color: #4c4c4c; }
+      color: #4d4d4d; }
   treeview.view.progressbar {
     color: #fff;
     border: 1px solid #000;
@@ -1207,12 +1207,12 @@ treeview.view {
       border-style: solid;
       border-color: #000; }
   treeview.view header button {
-    color: #7f7f7f;
+    color: gray;
     font-weight: bold;
     text-shadow: none;
     box-shadow: none; }
     treeview.view header button:hover {
-      color: #3f3f3f;
+      color: #404040;
       box-shadow: none; }
     treeview.view header button:active {
       color: #fff; }
@@ -1225,15 +1225,15 @@ treeview.view header button, treeview.view header button:hover, treeview.view he
   border-radius: 0;
   border-width: 1px;
   background-image: none;
-  border-color: #7f7f7f;
+  border-color: gray;
   text-shadow: none; }
   treeview.view header button:disabled {
     border-color: #fff;
     background-image: none; }
   treeview.view header button:backdrop {
-    border-color: #7f7f7f;
+    border-color: gray;
     border-style: none solid solid none;
-    color: #7f7f7f;
+    color: gray;
     background-image: none;
     background-color: #fff; }
     treeview.view header button:backdrop:disabled {
@@ -1270,7 +1270,7 @@ menubar,
       color: #000; }
     menubar > menuitem:disabled,
     .menubar > menuitem:disabled {
-      color: #7f7f7f;
+      color: gray;
       box-shadow: none; }
 
 menu,
@@ -1278,7 +1278,7 @@ menu,
   margin: 4px;
   padding: 0px;
   background-color: #fff;
-  border: 1px solid #7f7f7f; }
+  border: 1px solid gray; }
   menu menuitem,
   .menu menuitem {
     text-shadow: none;
@@ -1290,10 +1290,10 @@ menu,
       background-color: #000; }
     menu menuitem:disabled,
     .menu menuitem:disabled {
-      color: #7f7f7f; }
+      color: gray; }
       menu menuitem:disabled:backdrop,
       .menu menuitem:disabled:backdrop {
-        color: #7f7f7f; }
+        color: gray; }
     menu menuitem:backdrop, menu menuitem:backdrop:hover,
     .menu menuitem:backdrop,
     .menu menuitem:backdrop:hover {
@@ -1326,7 +1326,7 @@ menuitem check, menuitem radio {
 popover {
   margin: 10px;
   padding: 2px;
-  border-color: #7f7f7f;
+  border-color: gray;
   border-width: 1px;
   border-style: solid;
   border-radius: 5px;
@@ -1357,7 +1357,7 @@ popover {
   popover.magnifier, popover.osd {
     background-image: none;
     background-color: rgba(0, 0, 0, 0.8);
-    border: 1px solid #7f7f7f;
+    border: 1px solid gray;
     color: #fff; }
     popover.magnifier button, popover.osd button {
       color: white;
@@ -1387,7 +1387,7 @@ popover {
         border-width: 2px;
         border-style: solid;
         border-color: rgba(255, 255, 255, 0.2);
-        color: #7f7f7f; }
+        color: gray; }
 
 /*****************
  * Notebooks and *
@@ -1400,13 +1400,13 @@ notebook {
   notebook:backdrop {
     background-color: #fff; }
   notebook.frame {
-    border: 1px solid #7f7f7f; }
+    border: 1px solid gray; }
     notebook.frame:backdrop {
-      border-color: #8b8b8b; }
+      border-color: #8d8d8d; }
   notebook header {
-    background-color: #d8d8d8; }
+    background-color: #d9d9d9; }
     .frame notebook header {
-      border: 1px solid #7f7f7f; }
+      border: 1px solid gray; }
       .frame notebook header.top {
         border-bottom-width: 0; }
       .frame notebook header.bottom {
@@ -1416,34 +1416,34 @@ notebook {
       .frame notebook header.left {
         border-right-width: 0; }
       .frame notebook header:backdrop {
-        border-color: #8b8b8b; }
+        border-color: #8d8d8d; }
     notebook header.top {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 -1px #7f7f7f; }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 -1px gray; }
       notebook header.top:backdrop {
-        box-shadow: inset 0 -1px #8b8b8b; }
+        box-shadow: inset 0 -1px #8d8d8d; }
     notebook header.bottom {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 1px #7f7f7f; }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 1px gray; }
       notebook header.bottom:backdrop {
-        box-shadow: inset 0 1px #8b8b8b; }
+        box-shadow: inset 0 1px #8d8d8d; }
     notebook header.right {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 1px 0 #7f7f7f; }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 1px 0 gray; }
       notebook header.right:backdrop {
-        box-shadow: inset 1px 0 #8b8b8b; }
+        box-shadow: inset 1px 0 #8d8d8d; }
     notebook header.left {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset -1px 0 #7f7f7f; }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset -1px 0 gray; }
       notebook header.left:backdrop {
-        box-shadow: inset -1px 0 #8b8b8b; }
+        box-shadow: inset -1px 0 #8d8d8d; }
     notebook header:backdrop {
-      background-color: #d6d6d6;
+      background-color: #d7d7d7;
       box-shadow: none; }
     notebook header tabs arrow {
-      color: #7f7f7f; }
+      color: gray; }
       notebook header tabs arrow:hover {
-        color: #3f3f3f; }
+        color: #404040; }
       notebook header tabs arrow:checked {
         color: #000; }
       notebook header tabs arrow:disabled {
-        color: rgba(127, 127, 127, 0.3); }
+        color: rgba(128, 128, 128, 0.3); }
       notebook header tabs arrow:backdrop {
         color: rgba(0, 0, 0, 0.4); }
   notebook header.top tab {
@@ -1481,7 +1481,7 @@ notebook {
     background-color: transparent;
     outline-offset: 0; }
     notebook tab:hover {
-      border-color: #7f7f7f; }
+      border-color: gray; }
     notebook tab:checked, notebook tab:backdrop:checked {
       border-color: #000; }
     notebook tab:backdrop {
@@ -1490,17 +1490,17 @@ notebook {
     .top notebook tab.reorderable-page {
       border-color: transparent; }
       .top notebook tab.reorderable-page:hover {
-        border-color: rgba(127, 127, 127, 0.3);
-        border-bottom-color: #7f7f7f;
+        border-color: rgba(128, 128, 128, 0.3);
+        border-bottom-color: gray;
         background-color: rgba(255, 255, 255, 0.2); }
       .top notebook tab.reorderable-page:checked {
         background-color: rgba(255, 255, 255, 0.5);
-        border-color: rgba(127, 127, 127, 0.5);
+        border-color: rgba(128, 128, 128, 0.5);
         border-bottom-color: #000; }
         .top notebook tab.reorderable-page:checked:hover {
           background-color: rgba(255, 255, 255, 0.7); }
         .top notebook tab.reorderable-page:checked:backdrop {
-          border-color: #8b8b8b;
+          border-color: #8d8d8d;
           background-color: #fff;
           border-bottom-color: #000; }
       .top notebook tab.reorderable-page:backdrop {
@@ -1509,17 +1509,17 @@ notebook {
     .bottom notebook tab.reorderable-page {
       border-color: transparent; }
       .bottom notebook tab.reorderable-page:hover {
-        border-color: rgba(127, 127, 127, 0.3);
-        border-top-color: #7f7f7f;
+        border-color: rgba(128, 128, 128, 0.3);
+        border-top-color: gray;
         background-color: rgba(255, 255, 255, 0.2); }
       .bottom notebook tab.reorderable-page:checked {
         background-color: rgba(255, 255, 255, 0.5);
-        border-color: rgba(127, 127, 127, 0.5);
+        border-color: rgba(128, 128, 128, 0.5);
         border-top-color: #000; }
         .bottom notebook tab.reorderable-page:checked:hover {
           background-color: rgba(255, 255, 255, 0.7); }
         .bottom notebook tab.reorderable-page:checked:backdrop {
-          border-color: #8b8b8b;
+          border-color: #8d8d8d;
           background-color: #fff;
           border-top-color: #000; }
       .bottom notebook tab.reorderable-page:backdrop {
@@ -1528,17 +1528,17 @@ notebook {
     .left notebook tab.reorderable-page {
       border-color: transparent; }
       .left notebook tab.reorderable-page:hover {
-        border-color: rgba(127, 127, 127, 0.3);
-        border-right-color: #7f7f7f;
+        border-color: rgba(128, 128, 128, 0.3);
+        border-right-color: gray;
         background-color: rgba(255, 255, 255, 0.2); }
       .left notebook tab.reorderable-page:checked {
         background-color: rgba(255, 255, 255, 0.5);
-        border-color: rgba(127, 127, 127, 0.5);
+        border-color: rgba(128, 128, 128, 0.5);
         border-right-color: #000; }
         .left notebook tab.reorderable-page:checked:hover {
           background-color: rgba(255, 255, 255, 0.7); }
         .left notebook tab.reorderable-page:checked:backdrop {
-          border-color: #8b8b8b;
+          border-color: #8d8d8d;
           background-color: #fff;
           border-right-color: #000; }
       .left notebook tab.reorderable-page:backdrop {
@@ -1547,17 +1547,17 @@ notebook {
     .right notebook tab.reorderable-page {
       border-color: transparent; }
       .right notebook tab.reorderable-page:hover {
-        border-color: rgba(127, 127, 127, 0.3);
-        border-left-color: #7f7f7f;
+        border-color: rgba(128, 128, 128, 0.3);
+        border-left-color: gray;
         background-color: rgba(255, 255, 255, 0.2); }
       .right notebook tab.reorderable-page:checked {
         background-color: rgba(255, 255, 255, 0.5);
-        border-color: rgba(127, 127, 127, 0.5);
+        border-color: rgba(128, 128, 128, 0.5);
         border-left-color: #000; }
         .right notebook tab.reorderable-page:checked:hover {
           background-color: rgba(255, 255, 255, 0.7); }
         .right notebook tab.reorderable-page:checked:backdrop {
-          border-color: #8b8b8b;
+          border-color: #8d8d8d;
           background-color: #fff;
           border-left-color: #000; }
       .right notebook tab.reorderable-page:backdrop {
@@ -1566,12 +1566,12 @@ notebook {
     notebook tab label {
       padding: 0 2px;
       font-weight: bold;
-      color: #7f7f7f;
+      color: gray;
       /* color: inherit doesn't work here */ }
       notebook tab label:backdrop {
-        color: #7f7f7f; }
+        color: gray; }
     notebook tab:hover label {
-      color: #3f3f3f; }
+      color: #404040; }
     notebook tab:checked label {
       color: #000; }
       notebook tab:checked label:backdrop {
@@ -1587,7 +1587,7 @@ notebook {
         border-style: solid;
         color: #000;
         background-color: #fff;
-        border-color: #7f7f7f;
+        border-color: gray;
         background-image: none;
         border-width: 2px;
         background-image: none;
@@ -1598,7 +1598,7 @@ notebook {
         background-image: none;
         color: white;
         background-color: black;
-        border-color: #7f7f7f;
+        border-color: gray;
         border-width: 2px; }
       notebook tab button:backdrop, notebook tab button:backdrop:hover {
         color: rgba(0, 0, 0, 0.3);
@@ -1623,11 +1623,11 @@ scrollbar {
   scrollbar slider {
     border-radius: 20px;
     border: 5px solid transparent;
-    background-color: #7f7f7f; }
+    background-color: gray; }
     scrollbar slider:backdrop, scrollbar slider:disabled {
-      background-color: #e5e5e5; }
+      background-color: #e6e6e6; }
     scrollbar slider:hover {
-      background-color: #4c4c4c; }
+      background-color: #4d4d4d; }
     scrollbar slider:hover:active {
       background-color: #000; }
     scrollbar slider.fine-tune {
@@ -1663,8 +1663,8 @@ switch {
   border-width: 1px;
   border-style: solid;
   border-radius: 3px;
-  border-color: #7f7f7f;
-  background-color: #cbcbcb;
+  border-color: gray;
+  background-color: #cccccc;
   box-shadow: inset 0 1px rgba(0, 0, 0, 0.1);
   /*outset not working*/
   text-shadow: 0 1px rgba(0, 0, 0, 0.1); }
@@ -1674,25 +1674,25 @@ switch {
     background-color: #000;
     text-shadow: 0 0 2px white; }
   switch:disabled {
-    color: #7f7f7f;
-    border-color: #7f7f7f;
+    color: gray;
+    border-color: gray;
     background-color: white;
     text-shadow: none; }
   switch:backdrop {
     color: #000;
-    border-color: #8b8b8b;
+    border-color: #8d8d8d;
     background-color: #fff;
     box-shadow: none;
     text-shadow: none; }
     switch:backdrop:active {
       color: #fff;
-      border-color: #8b8b8b;
-      background-color: #8b8b8b;
+      border-color: #8d8d8d;
+      background-color: #8d8d8d;
       box-shadow: none; }
     switch:backdrop:disabled, switch:backdrop:disabled:active {
       background-color: white;
-      color: #7f7f7f;
-      border-color: #7f7f7f; }
+      color: gray;
+      border-color: gray; }
   switch slider {
     margin: -1px;
     min-width: 45px;
@@ -1704,24 +1704,24 @@ switch {
     color: #000;
     background-image: none;
     background-color: #fff;
-    border-color: #7f7f7f;
-    box-shadow: inset 0 1px white, inset 0 -2px rgba(255, 255, 255, 0.6), inset 0 -1px #bfbfbf; }
+    border-color: gray;
+    box-shadow: inset 0 1px white, inset 0 -2px rgba(255, 255, 255, 0.6), inset 0 -1px silver; }
     switch slider:hover {
       border-width: 2px;
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none;
-      box-shadow: inset 0 1px white, inset 0 -2px rgba(255, 255, 255, 0.6), inset 0 -1px #bfbfbf; }
+      box-shadow: inset 0 1px white, inset 0 -2px rgba(255, 255, 255, 0.6), inset 0 -1px silver; }
     switch slider:active {
       border-color: #000; }
     switch slider:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
+      color: gray;
       background-color: white;
-      border-color: #7f7f7f;
+      border-color: silver;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -1730,18 +1730,18 @@ switch {
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: #8b8b8b;
+      border-color: #8d8d8d;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
       switch slider:backdrop:active {
-        border-color: #8b8b8b; }
+        border-color: #8d8d8d; }
       switch slider:backdrop:disabled {
         border-width: 2px;
         border-style: solid;
-        color: #7f7f7f;
+        color: gray;
         background-color: white;
-        border-color: #8b8b8b;
+        border-color: silver;
         background-image: none; }
 
 /*************************
@@ -1760,15 +1760,15 @@ check {
   check:checked, check:active {
     -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); }
     check:checked:disabled, check:active:disabled {
-      color: #7f7f7f; }
+      color: gray; }
       check:checked:disabled:backdrop, check:active:disabled:backdrop {
-        color: #7f7f7f; }
+        color: gray; }
     check:checked:backdrop, check:active:backdrop {
       color: #000; }
   check:disabled {
-    color: #7f7f7f; }
+    color: gray; }
     check:disabled:backdrop {
-      color: #7f7f7f; }
+      color: gray; }
   check:indeterminate {
     -gtk-icon-source: -gtk-icontheme("checkbox-mixed-symbolic"); }
   check:backdrop {
@@ -1785,15 +1785,15 @@ radio {
   radio:checked, radio:active {
     -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); }
     radio:checked:disabled, radio:active:disabled {
-      color: #7f7f7f; }
+      color: gray; }
       radio:checked:disabled:backdrop, radio:active:disabled:backdrop {
-        color: #7f7f7f; }
+        color: gray; }
     radio:checked:backdrop, radio:active:backdrop {
       color: #000; }
   radio:disabled {
-    color: #7f7f7f; }
+    color: gray; }
     radio:disabled:backdrop {
-      color: #7f7f7f; }
+      color: gray; }
   radio:indeterminate {
     -gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); }
   radio:backdrop {
@@ -1838,9 +1838,9 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
     color: #000;
     background-image: none;
     background-color: #fff;
-    border-color: #7f7f7f;
+    border-color: gray;
     border-radius: 50%;
-    border-color: #777777; }
+    border-color: #787878; }
     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 {
@@ -1848,9 +1848,9 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none;
-      border-color: #777777;
+      border-color: #787878;
       border-radius: 50%; }
     scale trough slider:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough slider:disabled,
@@ -1864,7 +1864,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: #838383;
+      border-color: #858585;
       background-image: none;
       box-shadow: none; }
     scale trough slider:backdrop:disabled,
@@ -1872,9 +1872,9 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:backdrop:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
+      color: gray;
       background-color: white;
-      border-color: #8b8b8b;
+      border-color: silver;
       background-image: none; }
     scale trough slider:active,
     scale.scale-has-marks-above.scale-has-marks-below trough slider:active,
@@ -1887,8 +1887,8 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
     border-width: 1px;
     border-style: solid;
     border-radius: 3px;
-    border-color: #7f7f7f;
-    background-color: #cbcbcb;
+    border-color: gray;
+    background-color: #cccccc;
     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,
@@ -1898,28 +1898,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: #7f7f7f;
-        background-color: #7f7f7f;
+        border-color: gray;
+        background-color: gray;
         box-shadow: none; }
     scale trough:disabled, scale trough.hilight:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough.hilight:disabled,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough:disabled,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough.hilight:disabled {
-      border-color: #7f7f7f;
+      border-color: silver;
       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: #8b8b8b;
-      background-color: #bfbfbf;
+      border-color: #8d8d8d;
+      background-color: silver;
       box-shadow: none; }
     scale trough:backdrop:disabled, scale trough .hilight:backdrop:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough:backdrop:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough .hilight:backdrop:disabled,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough:backdrop:disabled,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough .hilight:backdrop:disabled {
-      border-color: #7f7f7f;
+      border-color: gray;
       background-color: #fff; }
 
 /*****************
@@ -1930,17 +1930,17 @@ progressbar {
   font-size: 83%;
   color: #000; }
   progressbar:backdrop {
-    color: #7f7f7f; }
+    color: gray; }
   progressbar trough {
     border-width: 1px;
     border-style: solid;
     border-radius: 3px;
-    border-color: #7f7f7f;
-    background-color: #d2d2d2;
+    border-color: gray;
+    background-color: lightgray;
     box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); }
     progressbar trough:backdrop {
-      border-color: #8b8b8b;
-      background-color: #d6d6d6;
+      border-color: #8d8d8d;
+      background-color: #d7d7d7;
       box-shadow: 0 1px rgba(255, 255, 255, 0); }
   progressbar.osd trough {
     background-color: transparent;
@@ -1977,8 +1977,8 @@ levelbar trough {
   background-color: transparent;
   border-style: solid;
   background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-  border-color: #7f7f7f;
-  box-shadow: inset 0 2px 2px -2px #7f7f7f; }
+  border-color: gray;
+  box-shadow: inset 0 2px 2px -2px gray; }
   levelbar trough:backdrop {
     background-color: transparent;
     border-style: solid;
@@ -2045,7 +2045,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, row.activatable:backdrop:selected, .sidebar:backdrop:selected {
-    background-color: #7f7f7f;
+    background-color: gray;
     color: #fff; }
 
 /**********
@@ -2053,19 +2053,19 @@ spinbutton selection:focus, modelbutton.flat:hover, modelbutton.flat:selected,
  **********/
 frame border,
 .frame {
-  border: 1px solid #7f7f7f;
+  border: 1px solid gray;
   padding: 0; }
   frame border.flat,
   .frame.flat {
     border-style: none; }
   frame border:backdrop,
   .frame:backdrop {
-    border-color: #8b8b8b; }
+    border-color: #8d8d8d; }
 
 actionbar box {
   padding: 6px;
   border-width: 1px 0 0;
-  border-color: #7f7f7f;
+  border-color: gray;
   border-style: solid none none; }
 
 placessidebar .frame,
@@ -2076,7 +2076,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(black), to(transparent)), -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(#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-size: 100% 5%, 100% 100%;
   background-repeat: no-repeat;
   background-position: center top;
@@ -2085,7 +2085,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(#8b8b8b), to(rgba(139, 139, 139, 0)));
+    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#8d8d8d), to(rgba(141, 141, 141, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center top;
@@ -2094,7 +2094,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(black), to(transparent)), -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(#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-size: 100% 5%, 100% 100%;
   background-repeat: no-repeat;
   background-position: center bottom;
@@ -2103,7 +2103,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(#8b8b8b), to(rgba(139, 139, 139, 0)));
+    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#8d8d8d), to(rgba(141, 141, 141, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center bottom;
@@ -2112,7 +2112,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(black), to(transparent)), -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(#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-size: 5% 100%, 100% 100%;
   background-repeat: no-repeat;
   background-position: left center;
@@ -2121,7 +2121,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(#8b8b8b), to(rgba(139, 139, 139, 0)));
+    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#8d8d8d), to(rgba(141, 141, 141, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: left center;
@@ -2130,7 +2130,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(black), to(transparent)), -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(#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-size: 5% 100%, 100% 100%;
   background-repeat: no-repeat;
   background-position: right center;
@@ -2139,7 +2139,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(#8b8b8b), to(rgba(139, 139, 139, 0)));
+    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#8d8d8d), to(rgba(141, 141, 141, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: right center;
@@ -2207,7 +2207,7 @@ placessidebar .view separator:backdrop,
 placessidebar textview text separator:backdrop,
 textview placessidebar text separator:backdrop,
 placessidebar iconview separator:backdrop {
-  background: #7f7f7f;
+  background: gray;
   min-width: 1px;
   min-height: 1px; }
 
@@ -2216,10 +2216,10 @@ placessidebar iconview separator:backdrop {
  *********/
 list {
   background-color: #fff;
-  border-color: #7f7f7f; }
+  border-color: gray; }
   list:backdrop {
     background-color: #fff;
-    border-color: #8b8b8b; }
+    border-color: #8d8d8d; }
   list row {
     padding: 2px; }
 
@@ -2251,7 +2251,7 @@ row.activatable {
     row.activatable:selected:hover, placessidebar .has-open-popup:selected {
       background-color: black; }
     row.activatable:selected:backdrop {
-      background-color: #7f7f7f; }
+      background-color: gray; }
     row.activatable:selected .button.flat {
       color: #fff; }
       row.activatable:selected .button.flat:hover {
@@ -2279,9 +2279,9 @@ row.activatable {
   padding: 10px;
   border-width: 0 1px 1px;
   border-style: solid;
-  border-color: #7f7f7f;
+  border-color: gray;
   border-radius: 0 0 6px 6px;
-  background-image: linear-gradient(to bottom, #efefef 5%, #f4f4f4); }
+  background-image: linear-gradient(to bottom, #f0f0f0 5%, whitesmoke); }
   .app-notification .button,
   .app-notification.frame .button {
     padding: 6px; }
@@ -2304,22 +2304,22 @@ expander arrow {
  * Calendar *
  ***********/
 calendar {
-  border: 1px solid #7f7f7f; }
+  border: 1px solid gray; }
   calendar.button {
     padding: 0 4px;
     color: #999999; }
     calendar.button:hover {
       color: #000; }
     calendar.button:backdrop, calendar.button:backdrop:hover {
-      color: #7f7f7f; }
+      color: gray; }
   calendar.view {
     border-radius: 2px; }
   calendar.header {
     background: linear-gradient(to bottom, white, #fafafa);
-    border-bottom-color: #bfbfbf; }
+    border-bottom-color: silver; }
     calendar.header:backdrop {
       background-image: linear-gradient(to bottom, #fff);
-      border-bottom-color: #c5c5c5; }
+      border-bottom-color: #c6c6c6; }
   calendar:indeterminate, calendar:indeterminate:backdrop {
     color: alpha(currentColor,0.55); }
   calendar.highlight, calendar.highlight:backdrop {
@@ -2345,13 +2345,13 @@ messagedialog.csd {
     color: #000;
     background-image: none;
     background-color: #fff;
-    border-color: #7f7f7f; }
+    border-color: gray; }
     messagedialog.csd .dialog-action-area button:hover {
       border-width: 2px;
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none; }
     messagedialog.csd .dialog-action-area button:active {
       border-width: 2px;
@@ -2359,13 +2359,13 @@ messagedialog.csd {
       background-image: none;
       color: white;
       background-color: black;
-      border-color: #7f7f7f; }
+      border-color: gray; }
     messagedialog.csd .dialog-action-area button:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
+      color: gray;
       background-color: white;
-      border-color: #7f7f7f;
+      border-color: silver;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -2374,16 +2374,16 @@ messagedialog.csd {
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: #8b8b8b;
+      border-color: #8d8d8d;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
     messagedialog.csd .dialog-action-area button:backdrop:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
+      color: gray;
       background-color: white;
-      border-color: #8b8b8b;
+      border-color: silver;
       background-image: none; }
     messagedialog.csd .dialog-action-area button.suggested-action {
       border-width: 2px;
@@ -2418,16 +2418,16 @@ messagedialog.csd {
         messagedialog.csd .dialog-action-area button.suggested-action:backdrop:disabled {
           border-width: 2px;
           border-style: solid;
-          color: #7f7f7f;
+          color: gray;
           background-color: white;
-          border-color: #8b8b8b;
+          border-color: silver;
           background-image: none; }
       messagedialog.csd .dialog-action-area button.suggested-action:disabled {
         border-width: 2px;
         border-style: solid;
-        color: #7f7f7f;
+        color: gray;
         background-color: white;
-        border-color: #7f7f7f;
+        border-color: silver;
         background-image: none;
         text-shadow: none;
         -gtk-icon-shadow: none; }
@@ -2464,16 +2464,16 @@ messagedialog.csd {
         messagedialog.csd .dialog-action-area button.destructive-action:backdrop:disabled {
           border-width: 2px;
           border-style: solid;
-          color: #7f7f7f;
+          color: gray;
           background-color: white;
-          border-color: #8b8b8b;
+          border-color: silver;
           background-image: none; }
       messagedialog.csd .dialog-action-area button.destructive-action:disabled {
         border-width: 2px;
         border-style: solid;
-        color: #7f7f7f;
+        color: gray;
         background-color: white;
-        border-color: #7f7f7f;
+        border-color: silver;
         background-image: none;
         text-shadow: none;
         -gtk-icon-shadow: none; }
@@ -2487,9 +2487,9 @@ messagedialog.csd {
     border-bottom-left-radius: 7px; }
 
 GtkFileChooserDialog .dialog-action-box {
-  border-top: 1px solid #7f7f7f; }
+  border-top: 1px solid gray; }
   GtkFileChooserDialog .dialog-action-box:backdrop {
-    border-top-color: #8b8b8b; }
+    border-top-color: #8d8d8d; }
 
 /***********
  * Sidebar *
@@ -2499,10 +2499,10 @@ GtkFileChooserDialog .dialog-action-box {
   .sidebar:backdrop {
     background-color: #fff; }
   .sidebar > scrolledwindow > .frame {
-    border-right: 1px solid #7f7f7f; }
+    border-right: 1px solid gray; }
     .sidebar > scrolledwindow > .frame:dir(rtl) {
       border-right: none;
-      border-left: 1px solid #7f7f7f; }
+      border-left: 1px solid gray; }
 
 placessidebar row {
   padding: 0px; }
@@ -2529,9 +2529,9 @@ placessidebar .view, placessidebar textview text, textview placessidebar text, p
   color: #000;
   background-color: transparent; }
   placessidebar .view .image, placessidebar textview text .image, textview placessidebar text .image, placessidebar iconview .image {
-    color: #4c4c4c; }
+    color: #4d4d4d; }
     placessidebar .view .image:selected, placessidebar textview text .image:selected, textview placessidebar text .image:selected, placessidebar iconview .image:selected {
-      color: #e5e5e5; }
+      color: #e6e6e6; }
 
 stacksidebar row {
   padding: 10px 4px; }
@@ -2555,9 +2555,9 @@ paned placessidebar iconview separator:backdrop,
 placessidebar iconview paned separator:backdrop {
   min-width: 1px;
   min-height: 1px;
-  background-image: linear-gradient(to bottom, #7f7f7f); }
+  background-image: linear-gradient(to bottom, gray); }
   paned separator:backdrop {
-    background-image: linear-gradient(to bottom, #8b8b8b); }
+    background-image: linear-gradient(to bottom, #8d8d8d); }
 paned:dir(ltr).horizontal separator {
   margin: 0 -8px 0 0;
   padding: 0 8px 0 0; }
@@ -2598,7 +2598,7 @@ placessidebar iconview paned separator.wide:backdrop {
   min-height: 5px;
   background-color: transparent;
   border-style: none solid;
-  border-color: #7f7f7f;
+  border-color: gray;
   border-width: 1px; }
 
 /**************
@@ -2652,9 +2652,9 @@ infobar {
     .error button:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
+      color: gray;
       background-color: white;
-      border-color: #7f7f7f;
+      border-color: silver;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -2676,9 +2676,9 @@ infobar {
     .error button:backdrop:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
+      color: gray;
       background-color: white;
-      border-color: #8b8b8b;
+      border-color: silver;
       background-image: none; }
   .info label:selected,
   .info label:selected:focus,
@@ -2780,20 +2780,20 @@ colorswatch {
     color: #000;
     background-image: none;
     background-color: #fff;
-    border-color: #7f7f7f; }
+    border-color: gray; }
     colorswatch#add-color-button:hover {
       border-width: 2px;
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none; }
     colorswatch#add-color-button:backdrop {
       border-width: 2px;
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: #8b8b8b;
+      border-color: #8d8d8d;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -2824,7 +2824,7 @@ decoration {
     border-radius: 0;
     margin: 4px;
     background-color: #fff;
-    border: solid 1px #8b8b8b;
+    border: solid 1px #8d8d8d;
     box-shadow: none; }
 
 button.titlebutton {
@@ -2839,20 +2839,20 @@ button.titlebutton {
     color: #000;
     background-image: none;
     background-color: #fff;
-    border-color: #7f7f7f; }
+    border-color: gray; }
   button.titlebutton:active {
     border-width: 2px;
     border-style: solid;
     background-image: none;
     color: white;
     background-color: black;
-    border-color: #7f7f7f; }
+    border-color: gray; }
   button.titlebutton:backdrop {
     border-width: 2px;
     border-style: solid;
     color: #000;
     background-color: #fff;
-    border-color: #8b8b8b;
+    border-color: #8d8d8d;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none;
@@ -2937,7 +2937,7 @@ cursor-handle {
       border-width: 2px;
       border-style: solid;
       border-color: rgba(255, 255, 255, 0.2);
-      color: #7f7f7f; }
+      color: gray; }
     .touch-selection button:backdrop {
       border-width: 2px;
       border-style: solid; }