diff --git a/gtk/theme/HighContrast/gtk.css b/gtk/theme/HighContrast/gtk.css
index db3a1cb38b..6c698846f6 100644
--- a/gtk/theme/HighContrast/gtk.css
+++ b/gtk/theme/HighContrast/gtk.css
@@ -5,15 +5,15 @@
 @define-color theme_selected_bg_color #000;
 @define-color theme_selected_fg_color #fff;
 @define-color insensitive_bg_color white;
-@define-color insensitive_fg_color #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;
@@ -85,7 +85,7 @@
     color: #000; }
   .gtkstyle-fallback:insensitive {
     background-color: white;
-    color: #7f7f7f; }
+    color: gray; }
   .gtkstyle-fallback:selected {
     background-color: #000;
     color: #fff; }
@@ -120,7 +120,7 @@ flowbox flowboxchild {
     outline-offset: -2px; }
 
 label:insensitive, label:backdrop:insensitive {
-  color: #7f7f7f; }
+  color: gray; }
 
 /*********************
  * Spinner Animation *
@@ -150,15 +150,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 {
@@ -166,13 +166,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:insensitive, spinbutton:insensitive {
     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 {
@@ -186,7 +186,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 {
@@ -218,10 +218,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;
@@ -230,19 +230,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:insensitive:backdrop, .linked.vertical spinbutton:insensitive: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;
@@ -250,37 +250,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:insensitive, .linked.vertical spinbutton:first-child:insensitive {
         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:insensitive:backdrop, .linked.vertical spinbutton:first-child:insensitive:backdrop {
           background-color: transparent;
           border-style: solid;
           background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-          color: #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;
@@ -289,13 +289,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; }
@@ -306,15 +306,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:insensitive:backdrop, .linked.vertical spinbutton:last-child:insensitive:backdrop {
           background-color: transparent;
           border-style: solid;
           background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-          color: #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 {
@@ -332,7 +332,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 {
@@ -343,7 +343,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; }
 
@@ -364,13 +364,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 {
@@ -379,14 +379,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; }
@@ -394,37 +394,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:insensitive, button.flat:backdrop:insensitive, button.sidebar-button:backdrop:insensitive {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
+      color: gray;
       background-color: white;
-      border-color: #8b8b8b;
+      border-color: #8d8d8d;
       background-image: none; }
     button:backdrop:insensitive:active, button.flat:backdrop:insensitive:active, button.sidebar-button:backdrop:insensitive:active {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
-      border-color: #8b8b8b;
+      color: gray;
+      border-color: #8d8d8d;
       background-image: none;
-      background-color: whitesmoke; }
+      background-color: #f6f6f6; }
   button:insensitive {
     border-width: 2px;
     border-style: solid;
-    color: #7f7f7f;
+    color: gray;
     background-color: white;
-    border-color: #7f7f7f;
+    border-color: gray;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
     button:insensitive:active, button:insensitive.flat:active, button.sidebar-button:insensitive:active {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
-      border-color: #7f7f7f;
+      color: gray;
+      border-color: gray;
       background-image: none;
       background-color: white; }
   .osd button {
@@ -455,7 +455,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; }
@@ -492,16 +492,16 @@ button {
       button.suggested-action:backdrop:insensitive {
         border-width: 2px;
         border-style: solid;
-        color: #7f7f7f;
+        color: gray;
         background-color: white;
-        border-color: #8b8b8b;
+        border-color: #8d8d8d;
         background-image: none; }
     button.suggested-action:insensitive {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
+      color: gray;
       background-color: white;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -538,16 +538,16 @@ button {
       button.destructive-action:backdrop:insensitive {
         border-width: 2px;
         border-style: solid;
-        color: #7f7f7f;
+        color: gray;
         background-color: white;
-        border-color: #8b8b8b;
+        border-color: #8d8d8d;
         background-image: none; }
     button.destructive-action:insensitive {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
+      color: gray;
       background-color: white;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -567,13 +567,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;
@@ -581,21 +581,21 @@ button {
     background-image: none;
     color: white;
     background-color: black;
-    border-color: #7f7f7f; }
+    border-color: gray; }
   .inline-toolbar toolbutton > button:insensitive {
     border-width: 2px;
     border-style: solid;
-    color: #7f7f7f;
+    color: gray;
     background-color: white;
-    border-color: #7f7f7f;
+    border-color: gray;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
   .inline-toolbar toolbutton > button:insensitive:active {
     border-width: 2px;
     border-style: solid;
-    color: #7f7f7f;
-    border-color: #7f7f7f;
+    color: gray;
+    border-color: gray;
     background-image: none;
     background-color: white; }
   .inline-toolbar toolbutton > button:backdrop {
@@ -603,7 +603,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; }
@@ -611,23 +611,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:insensitive {
     border-width: 2px;
     border-style: solid;
-    color: #7f7f7f;
+    color: gray;
     background-color: white;
-    border-color: #8b8b8b;
+    border-color: #8d8d8d;
     background-image: none; }
   .inline-toolbar toolbutton > button:backdrop:insensitive:active {
     border-width: 2px;
     border-style: solid;
-    color: #7f7f7f;
-    border-color: #8b8b8b;
+    color: gray;
+    border-color: #8d8d8d;
     background-image: none;
-    background-color: whitesmoke; }
+    background-color: #f6f6f6; }
 
 toolbar.inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton > button.sidebar-button {
   border-radius: 0;
@@ -717,7 +717,7 @@ modelbutton.flat,
       background-color: #000; }
   modelbutton.flat:insensitive,
   .menuitem.button.flat:insensitive {
-    color: #7f7f7f; }
+    color: gray; }
 
 button.color {
   padding: 4px; }
@@ -762,12 +762,12 @@ 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: none;
     border-width: 0 0 0 1px;
-    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(rtl) {
       border-width: 0 1px 0 0; }
@@ -776,17 +776,17 @@ spinbutton {
       background-color: rgba(0, 0, 0, 0.05); }
     spinbutton button:insensitive {
       box-shadow: none;
-      color: rgba(127, 127, 127, 0.3); }
+      color: rgba(128, 128, 128, 0.3); }
     spinbutton button:active {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2);
       background-color: rgba(0, 0, 0, 0.1); }
     spinbutton button:backdrop {
-      border-color: rgba(139, 139, 139, 0.3);
+      border-color: rgba(141, 141, 141, 0.3);
       background-color: #fff;
       box-shadow: none; }
     spinbutton button:backdrop:insensitive {
       box-shadow: none;
-      color: rgba(127, 127, 127, 0.3);
+      color: rgba(128, 128, 128, 0.3);
       border-width: 0 0 0 1px; }
       spinbutton button:backdrop:insensitive:dir(rtl) {
         border-width: 0 1px 0 0; }
@@ -796,27 +796,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:insensitive {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
+      color: gray;
       background-color: white;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -825,7 +825,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; }
@@ -835,27 +835,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:insensitive {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
+      color: gray;
       background-color: white;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -864,16 +864,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:insensitive {
     border-width: 2px;
     border-style: solid;
-    color: #7f7f7f;
+    color: gray;
     background-color: white;
-    border-color: #8b8b8b;
+    border-color: #8d8d8d;
     background-image: none; }
   spinbutton.vertical.entry {
     border-radius: 0; }
@@ -895,7 +895,7 @@ combobox {
   text-shadow: 0 1px white;
   -gtk-icon-shadow: 0 1px white; }
   combobox:insensitive {
-    color: #7f7f7f;
+    color: gray;
     text-shadow: none;
     -gtk-icon-shadow: none; }
   combobox:backdrop {
@@ -903,7 +903,7 @@ combobox {
     text-shadow: none;
     -gtk-icon-shadow: none; }
   combobox:backdrop:insensitive {
-    color: #7f7f7f; }
+    color: gray; }
   combobox .menuitem {
     text-shadow: none; }
   combobox separator.vertical,
@@ -939,10 +939,10 @@ toolbar {
     padding: 3px;
     border-radius: 0  0 4px 4px; }
   toolbar.vertical {
-    border-right: 1px solid #7f7f7f; }
+    border-right: 1px solid gray; }
     toolbar.vertical:dir(rtl) {
       border-right: none;
-      border-left: 1px solid #7f7f7f; }
+      border-left: 1px solid gray; }
 
 searchbar {
   border-width: 0 0 1px;
@@ -950,12 +950,12 @@ searchbar {
 
 toolbar.inline-toolbar, searchbar {
   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:backdrop {
-    border-color: #8b8b8b;
-    background-color: #d6d6d6;
+    border-color: #8d8d8d;
+    background-color: #d7d7d7;
     box-shadow: none; }
 
 /***************
@@ -965,15 +965,15 @@ toolbar.inline-toolbar, searchbar {
 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; }
@@ -999,7 +999,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;
@@ -1028,9 +1028,9 @@ headerbar {
       headerbar.selection-mode button:insensitive {
         border-width: 2px;
         border-style: solid;
-        color: #7f7f7f;
+        color: gray;
         background-color: white;
-        border-color: #7f7f7f;
+        border-color: gray;
         background-image: none;
         text-shadow: none;
         -gtk-icon-shadow: none; }
@@ -1049,9 +1049,9 @@ headerbar {
       headerbar.selection-mode button:backdrop:insensitive {
         border-width: 2px;
         border-style: solid;
-        color: #7f7f7f;
+        color: gray;
         background-color: white;
-        border-color: #8b8b8b;
+        border-color: #8d8d8d;
         background-image: none; }
       .titlebar.selection-mode button.suggested-action,
       headerbar.selection-mode button.suggested-action {
@@ -1060,14 +1060,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 {
@@ -1076,14 +1076,14 @@ headerbar {
           background-image: none;
           color: white;
           background-color: black;
-          border-color: #7f7f7f; }
+          border-color: gray; }
         .titlebar.selection-mode button.suggested-action:insensitive,
         headerbar.selection-mode button.suggested-action:insensitive {
           border-width: 2px;
           border-style: solid;
-          color: #7f7f7f;
+          color: gray;
           background-color: white;
-          border-color: #7f7f7f;
+          border-color: gray;
           background-image: none;
           text-shadow: none;
           -gtk-icon-shadow: none; }
@@ -1093,7 +1093,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; }
@@ -1101,9 +1101,9 @@ headerbar {
         headerbar.selection-mode button.suggested-action:backdrop:insensitive {
           border-width: 2px;
           border-style: solid;
-          color: #7f7f7f;
+          color: gray;
           background-color: white;
-          border-color: #8b8b8b;
+          border-color: #8d8d8d;
           background-image: none; }
     .titlebar.selection-mode .selection-menu,
     headerbar.selection-mode .selection-menu {
@@ -1146,26 +1146,26 @@ 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:insensitive {
-    color: #7f7f7f; }
+    color: gray; }
     treeview.view:insensitive:selected {
       color: #666666; }
       treeview.view:insensitive:selected:backdrop {
-        color: #7f7f7f; }
+        color: gray; }
     treeview.view:insensitive:backdrop {
-      color: #7f7f7f; }
+      color: gray; }
   treeview.view.separator:backdrop {
     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;
@@ -1173,21 +1173,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;
@@ -1208,12 +1208,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; }
@@ -1233,7 +1233,7 @@ treeview.view header button, treeview.view header button:hover, treeview.view he
   treeview.view header button:backdrop {
     border-color: #fff;
     border-width: 0 1px 1px 0;
-    color: #7f7f7f;
+    color: gray;
     background-image: none; }
     treeview.view header button:backdrop:insensitive {
       border-width: 0 1px 1px 0;
@@ -1269,7 +1269,7 @@ treeview.view.progressbar {
       box-shadow: inset 0 -3px #000;
       color: #000; }
     .menubar > .menuitem:insensitive {
-      color: #7f7f7f;
+      color: gray;
       box-shadow: none; }
 
 menu,
@@ -1285,10 +1285,10 @@ menu,
       background-color: #000; }
     menu .menuitem:insensitive,
     .menu .menuitem:insensitive {
-      color: #7f7f7f; }
+      color: gray; }
       menu .menuitem:insensitive:backdrop,
       .menu .menuitem:insensitive:backdrop {
-        color: #7f7f7f; }
+        color: gray; }
     menu .menuitem:backdrop, menu .menuitem:backdrop:hover,
     .menu .menuitem:backdrop,
     .menu .menuitem:backdrop:hover {
@@ -1318,7 +1318,7 @@ menu,
 popover {
   margin: 10px;
   padding: 2px;
-  border-color: #7f7f7f;
+  border-color: gray;
   border-width: 1px;
   border-style: solid;
   border-radius: 5px;
@@ -1343,7 +1343,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;
@@ -1373,7 +1373,7 @@ popover {
         border-width: 2px;
         border-style: solid;
         border-color: rgba(255, 255, 255, 0.2);
-        color: #7f7f7f; }
+        color: gray; }
 
 /*****************
  * Notebooks and *
@@ -1391,13 +1391,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 {
@@ -1407,34 +1407,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:active {
         color: #000; }
       notebook header tabs arrow:insensitive {
-        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 {
@@ -1472,7 +1472,7 @@ notebook {
     background-color: transparent;
     outline-offset: 0; }
     notebook tab:hover {
-      border-color: #7f7f7f; }
+      border-color: gray; }
     notebook tab:active, notebook tab:backdrop:active {
       border-color: #000; }
     notebook tab:backdrop {
@@ -1481,17 +1481,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:active {
         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:active:hover {
           background-color: rgba(255, 255, 255, 0.7); }
         .top notebook tab.reorderable-page:active:backdrop {
-          border-color: #8b8b8b;
+          border-color: #8d8d8d;
           background-color: #fff;
           border-bottom-color: #000; }
       .top notebook tab.reorderable-page:backdrop {
@@ -1500,17 +1500,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:active {
         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:active:hover {
           background-color: rgba(255, 255, 255, 0.7); }
         .bottom notebook tab.reorderable-page:active:backdrop {
-          border-color: #8b8b8b;
+          border-color: #8d8d8d;
           background-color: #fff;
           border-top-color: #000; }
       .bottom notebook tab.reorderable-page:backdrop {
@@ -1519,17 +1519,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:active {
         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:active:hover {
           background-color: rgba(255, 255, 255, 0.7); }
         .left notebook tab.reorderable-page:active:backdrop {
-          border-color: #8b8b8b;
+          border-color: #8d8d8d;
           background-color: #fff;
           border-right-color: #000; }
       .left notebook tab.reorderable-page:backdrop {
@@ -1538,17 +1538,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:active {
         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:active:hover {
           background-color: rgba(255, 255, 255, 0.7); }
         .right notebook tab.reorderable-page:active:backdrop {
-          border-color: #8b8b8b;
+          border-color: #8d8d8d;
           background-color: #fff;
           border-left-color: #000; }
       .right notebook tab.reorderable-page:backdrop {
@@ -1557,12 +1557,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:active label {
       color: #000; }
       notebook tab:active label:backdrop {
@@ -1578,7 +1578,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;
@@ -1589,7 +1589,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);
@@ -1617,11 +1617,11 @@ scrollbar {
   scrollbar slider {
     border-radius: 20px;
     border: 5px solid transparent;
-    background-color: #7f7f7f; }
+    background-color: gray; }
     scrollbar slider:backdrop, scrollbar slider:insensitive {
-      background-color: #e5e5e5; }
+      background-color: #e6e6e6; }
     scrollbar slider:hover {
-      background-color: #4c4c4c; }
+      background-color: #4d4d4d; }
     scrollbar slider:prelight:active {
       background-color: #000; }
     scrollbar slider.fine-tune {
@@ -1661,8 +1661,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); }
@@ -1672,25 +1672,25 @@ switch {
     background-color: #000;
     text-shadow: 0 0 2px white; }
   switch:insensitive {
-    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:insensitive, switch:backdrop:insensitive:active {
       background-color: white;
-      color: #7f7f7f;
-      border-color: #7f7f7f; }
+      color: gray;
+      border-color: gray; }
   switch slider {
     border-radius: 3px;
     border-width: 2px;
@@ -1698,24 +1698,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:insensitive {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
+      color: gray;
       background-color: white;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -1724,18 +1724,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:insensitive {
         border-width: 2px;
         border-style: solid;
-        color: #7f7f7f;
+        color: gray;
         background-color: white;
-        border-color: #8b8b8b;
+        border-color: #8d8d8d;
         background-image: none; }
 
 /*************************
@@ -1750,19 +1750,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   background-image: none;
   -gtk-icon-source: -gtk-icontheme("checkbox-symbolic"); }
   .check:hover {
-    color: #323232; }
+    color: #333333; }
   .check:checked, .check:active {
     -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); }
     .check:checked:insensitive, .check:active:insensitive {
-      color: #7f7f7f; }
+      color: gray; }
       .check:checked:insensitive:backdrop, .check:active:insensitive:backdrop {
-        color: #7f7f7f; }
+        color: gray; }
     .check:checked:backdrop, .check:active:backdrop {
       color: #000; }
   .check:insensitive {
-    color: #7f7f7f; }
+    color: gray; }
     .check:insensitive:backdrop {
-      color: #7f7f7f; }
+      color: gray; }
   .check:inconsistent {
     -gtk-icon-source: -gtk-icontheme("checkbox-mixed-symbolic"); }
   .check:backdrop {
@@ -1775,19 +1775,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   background-image: none;
   -gtk-icon-source: -gtk-icontheme("radio-symbolic"); }
   .radio:hover {
-    color: #323232; }
+    color: #333333; }
   .radio:checked, .radio:active {
     -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); }
     .radio:checked:insensitive, .radio:active:insensitive {
-      color: #7f7f7f; }
+      color: gray; }
       .radio:checked:insensitive:backdrop, .radio:active:insensitive:backdrop {
-        color: #7f7f7f; }
+        color: gray; }
     .radio:checked:backdrop, .radio:active:backdrop {
       color: #000; }
   .radio:insensitive {
-    color: #7f7f7f; }
+    color: gray; }
     .radio:insensitive:backdrop {
-      color: #7f7f7f; }
+      color: gray; }
   .radio:inconsistent {
     -gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); }
   .radio:backdrop {
@@ -1824,9 +1824,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 {
@@ -1834,9 +1834,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:insensitive,
     scale.scale-has-marks-above.scale-has-marks-below trough slider:insensitive,
@@ -1850,7 +1850,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:insensitive,
@@ -1858,9 +1858,9 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:backdrop:insensitive {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
+      color: gray;
       background-color: white;
-      border-color: #8b8b8b;
+      border-color: #8d8d8d;
       background-image: none; }
     scale trough slider:active,
     scale.scale-has-marks-above.scale-has-marks-below trough slider:active,
@@ -1873,8 +1873,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,
@@ -1884,28 +1884,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:insensitive, scale trough.hilight:insensitive,
     scale.scale-has-marks-above.scale-has-marks-below trough:insensitive,
     scale.scale-has-marks-above.scale-has-marks-below trough.hilight:insensitive,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough:insensitive,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough.hilight:insensitive {
-      border-color: #7f7f7f;
+      border-color: gray;
       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:insensitive, scale trough .hilight:backdrop:insensitive,
     scale.scale-has-marks-above.scale-has-marks-below trough:backdrop:insensitive,
     scale.scale-has-marks-above.scale-has-marks-below trough .hilight:backdrop:insensitive,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough:backdrop:insensitive,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough .hilight:backdrop:insensitive {
-      border-color: #7f7f7f;
+      border-color: gray;
       background-color: #fff; }
 
 /*****************
@@ -1916,17 +1916,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;
@@ -1968,8 +1968,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;
@@ -2032,7 +2032,7 @@ spinbutton selection:focus, modelbutton.flat:hover, modelbutton.flat:selected,
   spinbutton selection:backdrop:focus, modelbutton.flat:backdrop:hover, modelbutton.flat:backdrop:selected,
   .menuitem.button.flat:backdrop:hover,
   .menuitem.button.flat:backdrop:selected, treeview.view:backdrop:selected, row.activatable:backdrop:selected, .sidebar:backdrop:selected, placessidebar .view:backdrop:selected, placessidebar calendar:backdrop:selected {
-    background-color: #7f7f7f;
+    background-color: gray;
     color: #fff; }
 
 /**********
@@ -2040,14 +2040,14 @@ spinbutton selection:focus, modelbutton.flat:hover, modelbutton.flat:selected,
  **********/
 frame,
 .frame {
-  border: 1px solid #7f7f7f;
+  border: 1px solid gray;
   padding: 0; }
   frame.flat,
   .frame.flat {
     border-style: none; }
   frame:backdrop,
   .frame:backdrop {
-    border-color: #8b8b8b; }
+    border-color: #8d8d8d; }
   frame.action-bar,
   .frame.action-bar {
     padding: 6px;
@@ -2061,7 +2061,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;
@@ -2070,7 +2070,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;
@@ -2079,7 +2079,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;
@@ -2088,7 +2088,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;
@@ -2097,7 +2097,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;
@@ -2106,7 +2106,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;
@@ -2115,7 +2115,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;
@@ -2124,7 +2124,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;
@@ -2189,7 +2189,7 @@ scrollbar scrolledwindow trough {
 
 separator, placessidebar .view separator,
 placessidebar .view separator:backdrop {
-  color: #7f7f7f; }
+  color: gray; }
   GtkFileChooserButton separator.vertical,
   GtkFileChooserButton placessidebar .view separator.vertical:backdrop,
   placessidebar .view GtkFileChooserButton separator.vertical:backdrop, button.font separator.vertical {
@@ -2200,10 +2200,10 @@ placessidebar .view 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; }
 
@@ -2235,7 +2235,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 {
@@ -2263,9 +2263,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; }
@@ -2286,22 +2286,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:inconsistent, calendar:inconsistent:backdrop {
     color: alpha(currentColor,0.55); }
   calendar.highlight, calendar.highlight:backdrop {
@@ -2327,13 +2327,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;
@@ -2341,13 +2341,13 @@ messagedialog.csd {
       background-image: none;
       color: white;
       background-color: black;
-      border-color: #7f7f7f; }
+      border-color: gray; }
     messagedialog.csd .dialog-action-area button:insensitive {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
+      color: gray;
       background-color: white;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -2356,16 +2356,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:insensitive {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
+      color: gray;
       background-color: white;
-      border-color: #8b8b8b;
+      border-color: #8d8d8d;
       background-image: none; }
     messagedialog.csd .dialog-action-area button.suggested-action {
       border-width: 2px;
@@ -2400,16 +2400,16 @@ messagedialog.csd {
         messagedialog.csd .dialog-action-area button.suggested-action:backdrop:insensitive {
           border-width: 2px;
           border-style: solid;
-          color: #7f7f7f;
+          color: gray;
           background-color: white;
-          border-color: #8b8b8b;
+          border-color: #8d8d8d;
           background-image: none; }
       messagedialog.csd .dialog-action-area button.suggested-action:insensitive {
         border-width: 2px;
         border-style: solid;
-        color: #7f7f7f;
+        color: gray;
         background-color: white;
-        border-color: #7f7f7f;
+        border-color: gray;
         background-image: none;
         text-shadow: none;
         -gtk-icon-shadow: none; }
@@ -2446,16 +2446,16 @@ messagedialog.csd {
         messagedialog.csd .dialog-action-area button.destructive-action:backdrop:insensitive {
           border-width: 2px;
           border-style: solid;
-          color: #7f7f7f;
+          color: gray;
           background-color: white;
-          border-color: #8b8b8b;
+          border-color: #8d8d8d;
           background-image: none; }
       messagedialog.csd .dialog-action-area button.destructive-action:insensitive {
         border-width: 2px;
         border-style: solid;
-        color: #7f7f7f;
+        color: gray;
         background-color: white;
-        border-color: #7f7f7f;
+        border-color: gray;
         background-image: none;
         text-shadow: none;
         -gtk-icon-shadow: none; }
@@ -2469,9 +2469,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 *
@@ -2481,10 +2481,10 @@ GtkFileChooserDialog .dialog-action-box {
   .sidebar:backdrop {
     background-color: #fff; }
   .sidebar > GtkScrolledWindow > .frame {
-    border-right: 1px solid #7f7f7f; }
+    border-right: 1px solid gray; }
     .sidebar > GtkScrolledWindow > .frame:dir(rtl) {
       border-right: none;
-      border-left: 1px solid #7f7f7f; }
+      border-left: 1px solid gray; }
 
 placessidebar row {
   padding: 0px; }
@@ -2511,9 +2511,9 @@ placessidebar .view {
   color: #000;
   background-color: transparent; }
   placessidebar .view .image {
-    color: #4c4c4c; }
+    color: #4d4d4d; }
     placessidebar .view .image:selected {
-      color: #e5e5e5; }
+      color: #e6e6e6; }
 
 stacksidebar row {
   padding: 10px 4px; }
@@ -2534,9 +2534,9 @@ paned {
   paned separator, paned placessidebar .view separator, placessidebar .view paned separator,
   paned placessidebar .view separator:backdrop,
   placessidebar .view paned separator:backdrop {
-    background-image: linear-gradient(to bottom, #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.wide {
   -GtkPaned-handle-size: 5;
@@ -2546,12 +2546,12 @@ paned.wide {
   placessidebar .view paned.wide separator:backdrop {
     background-color: transparent;
     border-style: none solid;
-    border-color: #7f7f7f;
+    border-color: gray;
     border-width: 1px; }
   paned.wide.vertical separator {
     border-style: solid none; }
   paned.wide separator:backdrop {
-    border-color: #8b8b8b; }
+    border-color: #8d8d8d; }
 
 /**************
  * GtkInfoBar *
@@ -2604,9 +2604,9 @@ infobar {
     .error button:insensitive {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
+      color: gray;
       background-color: white;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -2628,9 +2628,9 @@ infobar {
     .error button:backdrop:insensitive {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
+      color: gray;
       background-color: white;
-      border-color: #8b8b8b;
+      border-color: #8d8d8d;
       background-image: none; }
   .info label:selected,
   .info label:selected:focus,
@@ -2706,7 +2706,7 @@ colorswatch {
     colorswatch.light:backdrop {
       color: rgba(0, 0, 0, 0.3); }
   colorswatch overlay, colorswatch overlay:selected {
-    border: 1px solid #7f7f7f; }
+    border: 1px solid gray; }
     colorswatch overlay:hover, colorswatch overlay:selected:hover {
       border-color: black; }
   colorswatch#add-color-button {
@@ -2715,7 +2715,7 @@ colorswatch {
     color: #000;
     background-image: none;
     background-color: #fff;
-    border-color: #7f7f7f;
+    border-color: gray;
     border-style: solid;
     border-width: 1px;
     box-shadow: none; }
@@ -2724,19 +2724,19 @@ colorswatch {
       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;
       border-width: 1px;
-      color: #7f7f7f; }
+      color: gray; }
     colorswatch#add-color-button overlay {
       border-width: 2px;
       border-style: solid;
@@ -2765,7 +2765,7 @@ decoration {
     border-radius: 0;
     margin: 4px;
     background-color: #fff;
-    border: solid 1px #8b8b8b;
+    border: solid 1px #8d8d8d;
     box-shadow: none; }
 
 button.titlebutton {
@@ -2780,20 +2780,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;
@@ -2878,7 +2878,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; }