From c044220f6236a7b2b7c8edf28e7e97d47a52ba4f Mon Sep 17 00:00:00 2001
From: Lapo Calamandrei <calamandrei@gmail.com>
Date: Fri, 17 Oct 2014 20:03:17 +0200
Subject: [PATCH] Adwaita: dimmed backdrop foreground color

To make focused window more evident.
---
 gtk/resources/theme/Adwaita/_colors.scss      |  2 +-
 .../theme/Adwaita/gtk-contained-dark.css      | 76 +++++++++----------
 gtk/resources/theme/Adwaita/gtk-contained.css | 70 ++++++++---------
 3 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/gtk/resources/theme/Adwaita/_colors.scss b/gtk/resources/theme/Adwaita/_colors.scss
index d1fa4b6fc7..cf9ab2db42 100644
--- a/gtk/resources/theme/Adwaita/_colors.scss
+++ b/gtk/resources/theme/Adwaita/_colors.scss
@@ -38,7 +38,7 @@ $insensitive_borders_color: $borders_color;
 //colors for the backdrop state, derived from the main colors.
 $backdrop_base_color: if($variant =='light', darken($base_color,1%), lighten($base_color,1%));
 $backdrop_bg_color: $bg_color;
-$backdrop_fg_color: mix($fg_color, $backdrop_bg_color, 80%);
+$backdrop_fg_color: mix($fg_color, $backdrop_bg_color, 50%);
 $backdrop_insensitive_color: if($variant =='light', darken($backdrop_bg_color,15%), lighten($backdrop_bg_color,15%));
 $backdrop_borders_color: mix($borders_color, $bg_color, 90%);
 $backdrop_dark_fill: mix($backdrop_borders_color,$backdrop_bg_color, 35%);
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 6394f7378b..6d439d55d4 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -68,7 +68,7 @@
   color: #eeeeec;
   background-color: #292929; }
   .view:backdrop {
-    color: #c9cbc9;
+    color: #939695;
     background-color: #2c2c2c; }
 
 .rubberband {
@@ -96,7 +96,7 @@
   color: #eeeeec; }
   .label.separator:backdrop,
   .sidebar .view .label.separator:backdrop {
-    color: #c9cbc9; }
+    color: #939695; }
 .label:insensitive {
   color: #939695; }
   .label:insensitive:backdrop {
@@ -200,7 +200,7 @@ GtkTextView {
   .entry:backdrop {
     background-color: transparent;
     background-image: linear-gradient(to bottom, #212121, #292929 90%);
-    color: #c9cbc9;
+    color: #939695;
     border-color: #1e2222;
     background-image: linear-gradient(to bottom, #2c2c2c);
     box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(238, 238, 236, 0); }
@@ -273,7 +273,7 @@ GtkTextView {
     .entry.image:active {
       color: #215d9c; }
     .entry.image:backdrop {
-      color: #a9aba9; }
+      color: #7e8080; }
   .linked.vertical .entry {
     background-color: transparent;
     background-image: linear-gradient(to bottom, #212121, #292929 90%);
@@ -304,7 +304,7 @@ GtkTextView {
     .linked.vertical .entry:backdrop {
       background-color: transparent;
       background-image: linear-gradient(to bottom, #212121, #292929 90%);
-      color: #c9cbc9;
+      color: #939695;
       border-color: #1e2222;
       background-image: linear-gradient(to bottom, #2c2c2c);
       box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent;
@@ -340,7 +340,7 @@ GtkTextView {
       .linked.vertical .entry:first-child:backdrop {
         background-color: transparent;
         background-image: linear-gradient(to bottom, #212121, #292929 90%);
-        color: #c9cbc9;
+        color: #939695;
         border-color: #1e2222;
         background-image: linear-gradient(to bottom, #2c2c2c);
         box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent;
@@ -372,7 +372,7 @@ GtkTextView {
       .linked.vertical .entry:last-child:backdrop {
         background-color: transparent;
         background-image: linear-gradient(to bottom, #212121, #292929 90%);
-        color: #c9cbc9;
+        color: #939695;
         border-color: #1e2222;
         background-image: linear-gradient(to bottom, #2c2c2c);
         box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(238, 238, 236, 0); }
@@ -447,7 +447,7 @@ GtkCalendar.header .button.titlebutton {
   GtkCalendar.header .button.titlebutton:backdrop, .button.flat:backdrop, .header-bar .titlebutton.button:backdrop,
   .titlebar .titlebutton.button:backdrop,
   GtkCalendar.header .titlebutton.button:backdrop {
-    color: #c9cbc9;
+    color: #939695;
     border-color: #1e2222;
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
@@ -459,7 +459,7 @@ GtkCalendar.header .button.titlebutton {
     GtkCalendar.header .titlebutton.button:backdrop:active, .button.flat:backdrop:checked, .header-bar .titlebutton.button:backdrop:checked,
     .titlebar .titlebutton.button:backdrop:checked,
     GtkCalendar.header .titlebutton.button:backdrop:checked {
-      color: #c9cbc9;
+      color: #939695;
       border-color: #1e2222;
       background-image: linear-gradient(to bottom, #2f3434);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
@@ -1049,14 +1049,14 @@ GtkCalendar.header .inline-toolbar GtkToolButton > .button.titlebutton {
     .inline-toolbar GtkToolButton > .button:insensitive:active > .label, .inline-toolbar GtkToolButton > .button:insensitive:checked > .label {
       color: inherit; }
   .inline-toolbar GtkToolButton > .button:backdrop {
-    color: #c9cbc9;
+    color: #939695;
     border-color: #1e2222;
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
   .inline-toolbar GtkToolButton > .button:backdrop:active, .inline-toolbar GtkToolButton > .button:backdrop:checked {
-    color: #c9cbc9;
+    color: #939695;
     border-color: #1e2222;
     background-image: linear-gradient(to bottom, #2f3434);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
@@ -1394,7 +1394,7 @@ GtkCalendar.header .button.titlebutton:visited {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2);
       background-color: rgba(0, 0, 0, 0.1); }
     .spinbutton .button:backdrop {
-      color: #b9bbb9;
+      color: #888b8a;
       border-color: rgba(30, 34, 34, 0.3);
       background-color: transparent; }
     .spinbutton .button:backdrop:insensitive {
@@ -1440,7 +1440,7 @@ GtkCalendar.header .button.titlebutton:visited {
         .spinbutton.vertical .button:first-child:insensitive > .label, .spinbutton.vertical:dir(rtl) .button:first-child:insensitive > .label {
           color: inherit; }
       .spinbutton.vertical .button:first-child:backdrop, .spinbutton.vertical:dir(rtl) .button:first-child:backdrop {
-        color: #c9cbc9;
+        color: #939695;
         border-color: #1e2222;
         background-image: linear-gradient(to bottom, #393f3f);
         text-shadow: none;
@@ -1480,7 +1480,7 @@ GtkCalendar.header .button.titlebutton:visited {
         .spinbutton.vertical .button:last-child:insensitive > .label, .spinbutton.vertical:dir(rtl) .button:last-child:insensitive > .label {
           color: inherit; }
       .spinbutton.vertical .button:last-child:backdrop, .spinbutton.vertical:dir(rtl) .button:last-child:backdrop {
-        color: #c9cbc9;
+        color: #939695;
         border-color: #1e2222;
         background-image: linear-gradient(to bottom, #393f3f);
         text-shadow: none;
@@ -1525,7 +1525,7 @@ GtkComboBox {
     text-shadow: none;
     icon-shadow: none; }
   GtkComboBox:backdrop {
-    color: #c9cbc9;
+    color: #939695;
     text-shadow: none;
     icon-shadow: none; }
   GtkComboBox:backdrop:insensitive {
@@ -1826,7 +1826,7 @@ GtkComboBox {
             color: inherit; }
         .titlebar.selection-mode .button.suggested-action:backdrop, GtkCalendar.selection-mode.header .button.suggested-action:backdrop,
         .header-bar.selection-mode .button.suggested-action:backdrop {
-          color: #c9cbc9;
+          color: #939695;
           border-color: #1e2222;
           background-image: linear-gradient(to bottom, #393f3f);
           text-shadow: none;
@@ -1930,7 +1930,7 @@ GtkTreeView.view {
     GtkTreeView.view.expander:checked {
       -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
     GtkTreeView.view.expander:backdrop {
-      color: #999b99; }
+      color: #747675; }
   GtkTreeView.view.progressbar {
     border-radius: 4px;
     border-color: #0f2b48;
@@ -2022,7 +2022,7 @@ GtkCalendar.header column-header .button.titlebutton, column-header .button:hove
   GtkCalendar.header column-header .button.titlebutton:backdrop {
     border-color: #393f3f;
     border-style: none solid solid none;
-    color: #818584;
+    color: #666a6a;
     background-image: none;
     background-color: #2c2c2c; }
     column-header .button:backdrop:insensitive {
@@ -2062,7 +2062,7 @@ GtkCalendar.header column-header .button.titlebutton, column-header .button:hove
       .menu .menuitem:insensitive:backdrop {
         color: #5d6767; }
     .menu .menuitem:backdrop, .menu .menuitem:backdrop:hover {
-      color: #c9cbc9;
+      color: #939695;
       background-color: #2c2c2c; }
     .menu .menuitem.arrow {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
@@ -2389,15 +2389,15 @@ GtkCalendar.header column-header .button.titlebutton, column-header .button:hove
       font-weight: bold;
       color: #939695; }
       .notebook tab .label:backdrop, .notebook tab .label.prelight-page:backdrop {
-        color: #939998; }
+        color: #787e7e; }
     .notebook tab .prelight-page .label, .notebook tab .label.prelight-page {
       color: #c0c2c0; }
       .notebook tab .prelight-page .label:backdrop, .notebook tab .label.prelight-page:backdrop {
-        color: #939998; }
+        color: #787e7e; }
     .notebook tab .active-page .label, .notebook tab .label.active-page {
       color: #eeeeec; }
       .notebook tab .active-page .label:backdrop, .notebook tab .label.active-page:backdrop {
-        color: #c9cbc9; }
+        color: #939695; }
     .notebook tab .button, .notebook tab .header-bar .button.titlebutton, .header-bar .notebook tab .button.titlebutton,
     .notebook tab .titlebar .button.titlebutton,
     .titlebar .notebook tab .button.titlebutton,
@@ -2428,7 +2428,7 @@ GtkCalendar.header column-header .button.titlebutton, column-header .button:hove
         icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
         box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
       .notebook tab .button:backdrop {
-        color: rgba(201, 203, 201, 0.3);
+        color: rgba(147, 150, 149, 0.3);
         border-color: transparent; }
       .notebook tab .button > GtkImage, .notebook tab .header-bar .button.titlebutton > GtkImage, .header-bar .notebook tab .button.titlebutton > GtkImage,
       .notebook tab .titlebar .button.titlebutton > GtkImage,
@@ -2445,7 +2445,7 @@ GtkCalendar.header column-header .button.titlebutton, column-header .button:hove
     .notebook.arrow:insensitive {
       color: rgba(147, 150, 149, 0.3); }
     .notebook.arrow:backdrop {
-      color: rgba(201, 203, 201, 0.4); }
+      color: rgba(147, 150, 149, 0.4); }
       .notebook.arrow:backdrop:insensitive {
         color: #5d6767; }
 
@@ -2523,7 +2523,7 @@ GtkSwitch {
       box-shadow: 0 1px rgba(238, 238, 236, 0.1);
       text-shadow: none; }
     GtkSwitch.trough:backdrop {
-      color: #c9cbc9;
+      color: #939695;
       border-color: #1e2222;
       background-image: linear-gradient(to bottom, #2f3434);
       box-shadow: none;
@@ -2569,7 +2569,7 @@ GtkSwitch {
       GtkSwitch.slider:insensitive > .label {
         color: inherit; }
     GtkSwitch.slider:backdrop {
-      color: #c9cbc9;
+      color: #939695;
       border-color: #1e2222;
       background-image: linear-gradient(to bottom, #393f3f);
       text-shadow: none;
@@ -3476,7 +3476,7 @@ GtkProgressBar {
     .level-bar.trough:backdrop {
       background-color: transparent;
       background-image: linear-gradient(to bottom, #212121, #292929 90%);
-      color: #c9cbc9;
+      color: #939695;
       border-color: #1e2222;
       background-image: linear-gradient(to bottom, #2c2c2c);
       box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(238, 238, 236, 0); }
@@ -3507,7 +3507,7 @@ GtkProgressBar {
       border-color: rgba(238, 238, 236, 0.1);
       box-shadow: none; }
       .level-bar.fill-block.empty-fill-block:backdrop {
-        border-color: rgba(201, 203, 201, 0.15); }
+        border-color: rgba(147, 150, 149, 0.15); }
 
 /**********
  * Frames *
@@ -3611,7 +3611,7 @@ GtkCalendar.header .list-row.button.titlebutton {
   .titlebar .list-row:selected .titlebutton.button:backdrop,
   .list-row:selected GtkCalendar.header .titlebutton.button:backdrop,
   GtkCalendar.header .list-row:selected .titlebutton.button:backdrop {
-    color: #c9cbc9;
+    color: #939695;
     border-color: #1e2222;
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
@@ -3626,7 +3626,7 @@ GtkCalendar.header .list-row.button.titlebutton {
     .titlebar .list-row:selected .titlebutton.button:backdrop:checked,
     .list-row:selected GtkCalendar.header .titlebutton.button:backdrop:checked,
     GtkCalendar.header .list-row:selected .titlebutton.button:backdrop:checked {
-      color: #c9cbc9;
+      color: #939695;
       border-color: #1e2222;
       background-image: linear-gradient(to bottom, #2f3434);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -3681,7 +3681,7 @@ GtkCalendar.header .list-row.button.titlebutton {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
     text-shadow: none;
     icon-shadow: none;
-    color: #c9cbc9; }
+    color: #939695; }
   .list-row:selected .button:insensitive {
     color: #939695;
     border-color: #1c1f1f;
@@ -3815,7 +3815,7 @@ GtkCalendar {
     color: #ffffff;
     border-radius: 3px; }
     GtkCalendar:selected:backdrop {
-      color: #c9cbc9; }
+      color: #939695; }
   GtkCalendar.header {
     box-shadow: inset 0 -1px #303535, inset 0px 1px rgba(238, 238, 236, 0.1), 0 1px 2px rgba(0, 0, 0, 0.1);
     border: 1px solid #1c1f1f;
@@ -3833,7 +3833,7 @@ GtkCalendar {
     GtkCalendar.button:backdrop, .header-bar GtkCalendar.button.titlebutton:backdrop,
     .titlebar GtkCalendar.button.titlebutton:backdrop,
     GtkCalendar.header GtkCalendar.button.titlebutton:backdrop {
-      color: rgba(201, 203, 201, 0.45); }
+      color: rgba(147, 150, 149, 0.45); }
   GtkCalendar.highlight {
     color: alpha(currentColor,0.55); }
   GtkCalendar:backdrop {
@@ -3889,7 +3889,7 @@ GtkCalendar {
       .message-dialog.csd .dialog-action-area .button:insensitive > .label {
         color: inherit; }
     .message-dialog.csd .dialog-action-area .button:backdrop {
-      color: #c9cbc9;
+      color: #939695;
       border-color: #1e2222;
       background-image: linear-gradient(to bottom, #393f3f);
       text-shadow: none;
@@ -4268,7 +4268,7 @@ GtkColorSwatch {
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
     GtkColorSwatch#add-color-button:backdrop {
-      color: #c9cbc9;
+      color: #939695;
       border-color: #1e2222;
       background-image: linear-gradient(to bottom, #393f3f);
       text-shadow: none;
@@ -4351,7 +4351,7 @@ GtkCalendar.header .menuitem.titlebutton.button:selected, .list-row:selected {
   .view:backdrop:selected, .label:backdrop:selected, .grid-child:backdrop:selected, .entry:backdrop:selected, .menuitem.button.flat:backdrop:selected, .header-bar .menuitem.titlebutton.button:backdrop:selected,
   .titlebar .menuitem.titlebutton.button:backdrop:selected,
   GtkCalendar.header .menuitem.titlebutton.button:backdrop:selected, .list-row:backdrop:selected {
-    color: #c9cbc9; }
+    color: #939695; }
 
 /* Decouple the font of context menus from their entry/textview */
 .touch-selection,
@@ -4370,7 +4370,7 @@ GtkCalendar.header .menuitem.titlebutton.button:selected, .list-row:selected {
 @define-color insensitive_bg_color #323636;
 @define-color insensitive_fg_color #939695;
 @define-color insensitive_base_color #292929;
-@define-color theme_unfocused_fg_color #c9cbc9;
+@define-color theme_unfocused_fg_color #939695;
 @define-color theme_unfocused_bg_color #393f3f;
 @define-color theme_unfocused_base_color #2c2c2c;
 @define-color theme_unfocused_selected_bg_color #215d9c;
@@ -4381,7 +4381,7 @@ GtkCalendar.header .menuitem.titlebutton.button:selected, .list-row:selected {
 @define-color error_color #cc0000;
 @define-color success_color #5aa411;
 @define-color wm_title shade(#eeeeec, 1.8);
-@define-color wm_unfocused_title #c9cbc9;
+@define-color wm_unfocused_title #939695;
 @define-color wm_highlight transparent;
 @define-color wm_borders_edge rgba(238, 238, 236, 0.1);
 @define-color wm_bg_a shade(#393f3f, 1.2);
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index 82b2bf95c0..7394c74941 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -68,7 +68,7 @@
   color: #2e3436;
   background-color: #ffffff; }
   .view:backdrop {
-    color: #54595a;
+    color: #8d9091;
     background-color: #fcfcfc; }
 
 .rubberband {
@@ -96,7 +96,7 @@
   color: #2e3436; }
   .label.separator:backdrop,
   .sidebar .view .label.separator:backdrop {
-    color: #54595a; }
+    color: #8d9091; }
 .label:insensitive {
   color: #8d9091; }
   .label:insensitive:backdrop {
@@ -200,7 +200,7 @@ GtkTextView {
   .entry:backdrop {
     background-color: transparent;
     background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
-    color: #54595a;
+    color: #8d9091;
     border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #fcfcfc);
     box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(255, 255, 255, 0); }
@@ -265,7 +265,7 @@ GtkTextView {
     .entry.image:active {
       color: #4a90d9; }
     .entry.image:backdrop {
-      color: #75797a; }
+      color: #a3a5a6; }
   .linked.vertical .entry {
     background-color: transparent;
     background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
@@ -296,7 +296,7 @@ GtkTextView {
     .linked.vertical .entry:backdrop {
       background-color: transparent;
       background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
-      color: #54595a;
+      color: #8d9091;
       border-color: #a8a8a8;
       background-image: linear-gradient(to bottom, #fcfcfc);
       box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent;
@@ -332,7 +332,7 @@ GtkTextView {
       .linked.vertical .entry:first-child:backdrop {
         background-color: transparent;
         background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
-        color: #54595a;
+        color: #8d9091;
         border-color: #a8a8a8;
         background-image: linear-gradient(to bottom, #fcfcfc);
         box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent;
@@ -364,7 +364,7 @@ GtkTextView {
       .linked.vertical .entry:last-child:backdrop {
         background-color: transparent;
         background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
-        color: #54595a;
+        color: #8d9091;
         border-color: #a8a8a8;
         background-image: linear-gradient(to bottom, #fcfcfc);
         box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(255, 255, 255, 0); }
@@ -439,7 +439,7 @@ GtkCalendar.header .button.titlebutton {
   GtkCalendar.header .button.titlebutton:backdrop, .button.flat:backdrop, .header-bar .titlebutton.button:backdrop,
   .titlebar .titlebutton.button:backdrop,
   GtkCalendar.header .titlebutton.button:backdrop {
-    color: #54595a;
+    color: #8d9091;
     border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #ededed);
     text-shadow: none;
@@ -451,7 +451,7 @@ GtkCalendar.header .button.titlebutton {
     GtkCalendar.header .titlebutton.button:backdrop:active, .button.flat:backdrop:checked, .header-bar .titlebutton.button:backdrop:checked,
     .titlebar .titlebutton.button:backdrop:checked,
     GtkCalendar.header .titlebutton.button:backdrop:checked {
-      color: #54595a;
+      color: #8d9091;
       border-color: #a8a8a8;
       background-image: linear-gradient(to bottom, #d4d4d4);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
@@ -1041,14 +1041,14 @@ GtkCalendar.header .inline-toolbar GtkToolButton > .button.titlebutton {
     .inline-toolbar GtkToolButton > .button:insensitive:active > .label, .inline-toolbar GtkToolButton > .button:insensitive:checked > .label {
       color: inherit; }
   .inline-toolbar GtkToolButton > .button:backdrop {
-    color: #54595a;
+    color: #8d9091;
     border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #ededed);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
   .inline-toolbar GtkToolButton > .button:backdrop:active, .inline-toolbar GtkToolButton > .button:backdrop:checked {
-    color: #54595a;
+    color: #8d9091;
     border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #d4d4d4);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
@@ -1386,7 +1386,7 @@ GtkCalendar.header .button.titlebutton:visited {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2);
       background-color: rgba(0, 0, 0, 0.1); }
     .spinbutton .button:backdrop {
-      color: #64696a;
+      color: #989a9b;
       border-color: rgba(168, 168, 168, 0.3);
       background-color: transparent; }
     .spinbutton .button:backdrop:insensitive {
@@ -1432,7 +1432,7 @@ GtkCalendar.header .button.titlebutton:visited {
         .spinbutton.vertical .button:first-child:insensitive > .label, .spinbutton.vertical:dir(rtl) .button:first-child:insensitive > .label {
           color: inherit; }
       .spinbutton.vertical .button:first-child:backdrop, .spinbutton.vertical:dir(rtl) .button:first-child:backdrop {
-        color: #54595a;
+        color: #8d9091;
         border-color: #a8a8a8;
         background-image: linear-gradient(to bottom, #ededed);
         text-shadow: none;
@@ -1472,7 +1472,7 @@ GtkCalendar.header .button.titlebutton:visited {
         .spinbutton.vertical .button:last-child:insensitive > .label, .spinbutton.vertical:dir(rtl) .button:last-child:insensitive > .label {
           color: inherit; }
       .spinbutton.vertical .button:last-child:backdrop, .spinbutton.vertical:dir(rtl) .button:last-child:backdrop {
-        color: #54595a;
+        color: #8d9091;
         border-color: #a8a8a8;
         background-image: linear-gradient(to bottom, #ededed);
         text-shadow: none;
@@ -1517,7 +1517,7 @@ GtkComboBox {
     text-shadow: none;
     icon-shadow: none; }
   GtkComboBox:backdrop {
-    color: #54595a;
+    color: #8d9091;
     text-shadow: none;
     icon-shadow: none; }
   GtkComboBox:backdrop:insensitive {
@@ -1818,7 +1818,7 @@ GtkComboBox {
             color: inherit; }
         .titlebar.selection-mode .button.suggested-action:backdrop, GtkCalendar.selection-mode.header .button.suggested-action:backdrop,
         .header-bar.selection-mode .button.suggested-action:backdrop {
-          color: #54595a;
+          color: #8d9091;
           border-color: #a8a8a8;
           background-image: linear-gradient(to bottom, #ededed);
           text-shadow: none;
@@ -1922,7 +1922,7 @@ GtkTreeView.view {
     GtkTreeView.view.expander:checked {
       -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
     GtkTreeView.view.expander:backdrop {
-      color: #86898a; }
+      color: #aeb0b1; }
   GtkTreeView.view.progressbar {
     color: #ffffff;
     border-radius: 4px;
@@ -2019,7 +2019,7 @@ GtkCalendar.header column-header .button.titlebutton, column-header .button:hove
   GtkCalendar.header column-header .button.titlebutton:backdrop {
     border-color: #ededed;
     border-style: none solid solid none;
-    color: #a0a3a3;
+    color: #bdbebf;
     background-image: none;
     background-color: #fcfcfc; }
     column-header .button:backdrop:insensitive {
@@ -2059,7 +2059,7 @@ GtkCalendar.header column-header .button.titlebutton, column-header .button:hove
       .menu .menuitem:insensitive:backdrop {
         color: #c7c7c7; }
     .menu .menuitem:backdrop, .menu .menuitem:backdrop:hover {
-      color: #54595a;
+      color: #8d9091;
       background-color: #fcfcfc; }
     .menu .menuitem.arrow {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
@@ -2386,15 +2386,15 @@ GtkCalendar.header column-header .button.titlebutton, column-header .button:hove
       font-weight: bold;
       color: #8d9091; }
       .notebook tab .label:backdrop, .notebook tab .label.prelight-page:backdrop {
-        color: #8d9090; }
+        color: #aaabac; }
     .notebook tab .prelight-page .label, .notebook tab .label.prelight-page {
       color: #5d6263; }
       .notebook tab .prelight-page .label:backdrop, .notebook tab .label.prelight-page:backdrop {
-        color: #8d9090; }
+        color: #aaabac; }
     .notebook tab .active-page .label, .notebook tab .label.active-page {
       color: #2e3436; }
       .notebook tab .active-page .label:backdrop, .notebook tab .label.active-page:backdrop {
-        color: #54595a; }
+        color: #8d9091; }
     .notebook tab .button, .notebook tab .header-bar .button.titlebutton, .header-bar .notebook tab .button.titlebutton,
     .notebook tab .titlebar .button.titlebutton,
     .titlebar .notebook tab .button.titlebutton,
@@ -2425,7 +2425,7 @@ GtkCalendar.header column-header .button.titlebutton, column-header .button:hove
         icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
         box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
       .notebook tab .button:backdrop {
-        color: rgba(84, 89, 90, 0.3);
+        color: rgba(141, 144, 145, 0.3);
         border-color: transparent; }
       .notebook tab .button > GtkImage, .notebook tab .header-bar .button.titlebutton > GtkImage, .header-bar .notebook tab .button.titlebutton > GtkImage,
       .notebook tab .titlebar .button.titlebutton > GtkImage,
@@ -2442,7 +2442,7 @@ GtkCalendar.header column-header .button.titlebutton, column-header .button:hove
     .notebook.arrow:insensitive {
       color: rgba(141, 144, 145, 0.3); }
     .notebook.arrow:backdrop {
-      color: rgba(84, 89, 90, 0.4); }
+      color: rgba(141, 144, 145, 0.4); }
       .notebook.arrow:backdrop:insensitive {
         color: #c7c7c7; }
 
@@ -2520,7 +2520,7 @@ GtkSwitch {
       box-shadow: 0 1px white;
       text-shadow: none; }
     GtkSwitch.trough:backdrop {
-      color: #54595a;
+      color: #8d9091;
       border-color: #a8a8a8;
       background-image: linear-gradient(to bottom, #d4d4d4);
       box-shadow: none;
@@ -2567,7 +2567,7 @@ GtkSwitch {
       GtkSwitch.slider:insensitive > .label {
         color: inherit; }
     GtkSwitch.slider:backdrop {
-      color: #54595a;
+      color: #8d9091;
       border-color: #a8a8a8;
       background-image: linear-gradient(to bottom, #ededed);
       text-shadow: none;
@@ -3629,7 +3629,7 @@ GtkProgressBar {
     .level-bar.trough:backdrop {
       background-color: transparent;
       background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
-      color: #54595a;
+      color: #8d9091;
       border-color: #a8a8a8;
       background-image: linear-gradient(to bottom, #fcfcfc);
       box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(255, 255, 255, 0); }
@@ -3660,7 +3660,7 @@ GtkProgressBar {
       border-color: rgba(46, 52, 54, 0.2);
       box-shadow: none; }
       .level-bar.fill-block.empty-fill-block:backdrop {
-        border-color: rgba(84, 89, 90, 0.15); }
+        border-color: rgba(141, 144, 145, 0.15); }
 
 /**********
  * Frames *
@@ -3767,7 +3767,7 @@ GtkCalendar.header .list-row.button.titlebutton {
   .titlebar .list-row:selected .titlebutton.button:backdrop,
   .list-row:selected GtkCalendar.header .titlebutton.button:backdrop,
   GtkCalendar.header .list-row:selected .titlebutton.button:backdrop {
-    color: #54595a;
+    color: #8d9091;
     border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #ededed);
     text-shadow: none;
@@ -3783,7 +3783,7 @@ GtkCalendar.header .list-row.button.titlebutton {
     .titlebar .list-row:selected .titlebutton.button:backdrop:checked,
     .list-row:selected GtkCalendar.header .titlebutton.button:backdrop:checked,
     GtkCalendar.header .list-row:selected .titlebutton.button:backdrop:checked {
-      color: #54595a;
+      color: #8d9091;
       border-color: #a8a8a8;
       background-image: linear-gradient(to bottom, #d4d4d4);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
@@ -3994,7 +3994,7 @@ GtkCalendar {
     GtkCalendar.button:backdrop, .header-bar GtkCalendar.button.titlebutton:backdrop,
     .titlebar GtkCalendar.button.titlebutton:backdrop,
     GtkCalendar.header GtkCalendar.button.titlebutton:backdrop {
-      color: rgba(84, 89, 90, 0.45); }
+      color: rgba(141, 144, 145, 0.45); }
   GtkCalendar.highlight {
     color: alpha(currentColor,0.55); }
   GtkCalendar:backdrop {
@@ -4050,7 +4050,7 @@ GtkCalendar {
       .message-dialog.csd .dialog-action-area .button:insensitive > .label {
         color: inherit; }
     .message-dialog.csd .dialog-action-area .button:backdrop {
-      color: #54595a;
+      color: #8d9091;
       border-color: #a8a8a8;
       background-image: linear-gradient(to bottom, #ededed);
       text-shadow: none;
@@ -4429,7 +4429,7 @@ GtkColorSwatch {
       icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
       box-shadow: inset 0 1px white, 0 1px white; }
     GtkColorSwatch#add-color-button:backdrop {
-      color: #54595a;
+      color: #8d9091;
       border-color: #a8a8a8;
       background-image: linear-gradient(to bottom, #ededed);
       text-shadow: none;
@@ -4532,7 +4532,7 @@ GtkCalendar.header .menuitem.titlebutton.button:selected, .list-row:selected {
 @define-color insensitive_bg_color #f4f4f4;
 @define-color insensitive_fg_color #8d9091;
 @define-color insensitive_base_color #ffffff;
-@define-color theme_unfocused_fg_color #54595a;
+@define-color theme_unfocused_fg_color #8d9091;
 @define-color theme_unfocused_bg_color #ededed;
 @define-color theme_unfocused_base_color #fcfcfc;
 @define-color theme_unfocused_selected_bg_color #4a90d9;
@@ -4543,7 +4543,7 @@ GtkCalendar.header .menuitem.titlebutton.button:selected, .list-row:selected {
 @define-color error_color #cc0000;
 @define-color success_color #73d216;
 @define-color wm_title shade(#2e3436, 1.8);
-@define-color wm_unfocused_title #54595a;
+@define-color wm_unfocused_title #8d9091;
 @define-color wm_highlight white;
 @define-color wm_borders_edge white;
 @define-color wm_bg_a shade(#ededed, 1.2);