From 55a86c9a81d5f360b8191aa83523d69304bddd68 Mon Sep 17 00:00:00 2001
From: EliverLara <eliverlara@gmail.com>
Date: Tue, 26 Feb 2019 14:54:32 -0600
Subject: [PATCH] Fix background color in headerbars text entries

---
 gtk-3.0/_colors.scss              |   4 +-
 gtk-3.0/gtk-dark.css              | 177 +++++++++++++++---------------
 gtk-3.0/gtk.css                   |   3 +-
 gtk-3.0/widgets/_header-bars.scss |   4 +-
 4 files changed, 95 insertions(+), 93 deletions(-)

diff --git a/gtk-3.0/_colors.scss b/gtk-3.0/_colors.scss
index b6e1940..6eef962 100755
--- a/gtk-3.0/_colors.scss
+++ b/gtk-3.0/_colors.scss
@@ -27,14 +27,14 @@ $selected_fg_color: #fefefe;
 $selected_bg_color: #f7b922;
 /*$selected_bg_color: #00e8c6;06d6a0*/
 $selected_borders_color: darken($selected_bg_color, 10%);
-$borders_color: if($variant == 'light', transparentize(black,0.87), transparentize(#eee,0.9));
+$borders_color: if($variant == 'light', transparentize(black,0.87), transparentize(#0C0E15,0.2));
 $borders_edge: if($variant == 'light', transparentize(white, 0.8), transparentize(white, 0.9));
 $link_color: $blue;
 $link_visited_color:transparentize($link_color,0.5);
 $top_highlight: if($variant == 'light', transparentize(white, 0.8), transparentize(white, 0.9));
 $bottom_highlight: if($variant == 'light', transparentize(black, 0.8), transparentize(black, 0.9));
 $dark_fill: mix($borders_color, $bg_color, 35%);
-$headerbar_color: darken($main_dark_color, 7%);
+$headerbar_color: if($variant == 'light', darken($main_dark_color, 7%) , mix($base_color, darken($main_dark_color, 15%), 30%));
 $headerbar_fg_color: lighten( $text_color, 40%);
 $menu_color: if($variant == 'light', $base_color, mix($bg_color, $base_color, 20%));
 $popover_bg_color: $base_color;
diff --git a/gtk-3.0/gtk-dark.css b/gtk-3.0/gtk-dark.css
index b696761..971bda6 100755
--- a/gtk-3.0/gtk-dark.css
+++ b/gtk-3.0/gtk-dark.css
@@ -33,9 +33,9 @@
 /* text/foreground color of selections on backdrop windows */
 @define-color theme_unfocused_selected_fg_color #fefefe;
 /* widgets main borders color */
-@define-color borders rgba(238, 238, 238, 0.1);
+@define-color borders rgba(12, 14, 21, 0.8);
 /* widgets main borders color on backdrop windows */
-@define-color unfocused_borders rgba(91, 93, 102, 0.19);
+@define-color unfocused_borders rgba(13, 16, 23, 0.82);
 /* these are pretty self explicative */
 @define-color warning_color #cc7500;
 @define-color error_color #e6133e;
@@ -89,7 +89,7 @@ read if you used those and something break with a version upgrade you're on your
 ***************/
 .action-bar {
   background-color: #030305;
-  border: solid rgba(238, 238, 238, 0.1);
+  border: solid rgba(12, 14, 21, 0.8);
   border-width: 1px 0 0 0;
   color: #C3C7D1;
   box-shadow: none; }
@@ -220,10 +220,10 @@ headerbar .subtitle {
 
 assistant .sidebar {
   background-color: #181b28;
-  border-top: 1px solid rgba(238, 238, 238, 0.1); }
+  border-top: 1px solid rgba(12, 14, 21, 0.8); }
   assistant .sidebar:backdrop {
     background-color: #1a1d2b;
-    border-color: rgba(91, 93, 102, 0.19); }
+    border-color: rgba(13, 16, 23, 0.82); }
 
 assistant.csd .sidebar {
   border-top-style: none; }
@@ -265,7 +265,7 @@ button {
   min-height: 20px;
   min-width: 16px;
   padding: 2px 6px;
-  border: 1px solid rgba(238, 238, 238, 0.1);
+  border: 1px solid rgba(12, 14, 21, 0.8);
   border-radius: 4px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   font-weight: bold;
@@ -1014,7 +1014,7 @@ toolbar.inline-toolbar toolbutton:backdrop > button.flat:backdrop {
 .linked > button:active,
 .linked > button:checked,
 .linked > button:backdrop, .linked:not(.vertical) > spinbutton:not(.vertical), .linked:not(.vertical) > entry, .linked > combobox > box > button.combo:dir(ltr), .linked > combobox > box > button.combo:dir(rtl) {
-  border: 1px solid rgba(238, 238, 238, 0.1);
+  border: 1px solid rgba(12, 14, 21, 0.8);
   border-radius: 0;
   border-right-style: none;
   box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1); }
@@ -1126,7 +1126,7 @@ notebook .linked > button, list .linked > button, .view .linked > button, iconvi
  ***********/
 calendar {
   color: #C3C7D1;
-  border: 1px solid rgba(238, 238, 238, 0.1); }
+  border: 1px solid rgba(12, 14, 21, 0.8); }
   calendar:selected {
     border-radius: 3px; }
   calendar.header {
@@ -1149,7 +1149,7 @@ calendar {
     color: #C3C7D1; }
   calendar:backdrop {
     color: #a1a5b0;
-    border-color: rgba(91, 93, 102, 0.19); }
+    border-color: rgba(13, 16, 23, 0.82); }
 
 /*************************
  * Check and Radio Items *
@@ -1582,14 +1582,14 @@ colorswatch.right, colorswatch:last-child:not(.bottom) {
 colorswatch.dark overlay {
   color: #fefefe; }
   colorswatch.dark overlay:hover {
-    border-color: rgba(238, 238, 238, 0.1); }
+    border-color: rgba(12, 14, 21, 0.8); }
   colorswatch.dark overlay:backdrop {
     color: rgba(254, 254, 254, 0.5); }
 
 colorswatch.light overlay {
   color: #C3C7D1; }
   colorswatch.light overlay:hover {
-    border-color: rgba(238, 238, 238, 0.1); }
+    border-color: rgba(12, 14, 21, 0.8); }
   colorswatch.light overlay:backdrop {
     color: #a1a5b0; }
 
@@ -1597,18 +1597,18 @@ colorswatch:drop(active) {
   box-shadow: none; }
   colorswatch:drop(active).light overlay {
     border-color: #4e9a06;
-    box-shadow: inset 0 0 0 2px rgba(238, 238, 238, 0.1), inset 0 0 0 1px #4e9a06; }
+    box-shadow: inset 0 0 0 2px rgba(12, 14, 21, 0.8), inset 0 0 0 1px #4e9a06; }
   colorswatch:drop(active).dark overlay {
     border-color: #4e9a06;
-    box-shadow: inset 0 0 0 2px rgba(238, 238, 238, 0.1), inset 0 0 0 1px #4e9a06; }
+    box-shadow: inset 0 0 0 2px rgba(12, 14, 21, 0.8), inset 0 0 0 1px #4e9a06; }
 
 colorswatch overlay {
   box-shadow: inset 0 3px 2px -2px rgba(0, 0, 0, 0.5);
-  border: 1px solid rgba(238, 238, 238, 0.1); }
+  border: 1px solid rgba(12, 14, 21, 0.8); }
   colorswatch overlay:hover {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.3); }
   colorswatch overlay:backdrop, colorswatch overlay:backdrop:hover {
-    border-color: rgba(238, 238, 238, 0.1);
+    border-color: rgba(12, 14, 21, 0.8);
     box-shadow: none; }
 
 colorswatch#add-color-button {
@@ -1700,9 +1700,9 @@ messagedialog.csd .dialog-action-area button {
     color: white; }
 
 filechooser .dialog-action-box {
-  border-top: 1px solid rgba(238, 238, 238, 0.1); }
+  border-top: 1px solid rgba(12, 14, 21, 0.8); }
   filechooser .dialog-action-box:backdrop {
-    border-top-color: rgba(91, 93, 102, 0.19); }
+    border-top-color: rgba(13, 16, 23, 0.82); }
 
 filechooser #pathbarbox {
   border-bottom: 1px solid #161925; }
@@ -1723,7 +1723,7 @@ entry {
   border-radius: 3px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   color: #C3C7D1;
-  border-color: rgba(238, 238, 238, 0.1);
+  border-color: rgba(12, 14, 21, 0.8);
   background-color: #181b28; }
   spinbutton:not(.vertical) image.left,
   entry image.left {
@@ -1770,26 +1770,26 @@ entry {
   spinbutton:disabled:not(.vertical),
   entry:disabled {
     color: #6d707b;
-    border-color: rgba(238, 238, 238, 0.1);
+    border-color: rgba(12, 14, 21, 0.8);
     background-color: #171a26;
     box-shadow: none; }
   spinbutton:backdrop:not(.vertical),
   entry:backdrop {
     color: #a1a5b0;
-    border-color: rgba(91, 93, 102, 0.19);
+    border-color: rgba(13, 16, 23, 0.82);
     background-color: #1a1d2b;
     box-shadow: none;
     transition: 200ms ease-out; }
   spinbutton:backdrop:disabled:not(.vertical),
   entry:backdrop:disabled {
     color: #333955;
-    border-color: rgba(91, 93, 102, 0.19);
+    border-color: rgba(13, 16, 23, 0.82);
     background-color: #171a26;
     box-shadow: none; }
   spinbutton.error:not(.vertical),
   entry.error {
     color: #C3C7D1;
-    border-color: rgba(238, 238, 238, 0.1);
+    border-color: rgba(12, 14, 21, 0.8);
     background-color: #181b28;
     color: #e6133e;
     border-color: #410512; }
@@ -1803,7 +1803,7 @@ entry {
   spinbutton.warning:not(.vertical),
   entry.warning {
     color: #C3C7D1;
-    border-color: rgba(238, 238, 238, 0.1);
+    border-color: rgba(12, 14, 21, 0.8);
     background-color: #181b28;
     color: #cc7500;
     border-color: #1a0f00; }
@@ -1910,20 +1910,20 @@ entry {
 .linked.vertical > spinbutton:not(:disabled):not(.vertical) + spinbutton:not(:disabled):not(.vertical), .linked.vertical >
 entry:not(:disabled) + entry:not(:disabled),
 .linked.vertical > entry:not(:disabled) + spinbutton:not(:disabled):not(.vertical) {
-  border-top-color: rgba(29, 32, 45, 0.73);
+  border-top-color: rgba(21, 24, 36, 0.94);
   background-image: linear-gradient(to bottom, #181b28, #181b28); }
   .linked.vertical > spinbutton:not(:disabled):not(.vertical) + entry:not(:disabled):backdrop,
   .linked.vertical > spinbutton:not(:disabled):not(.vertical) + spinbutton:not(:disabled):backdrop:not(.vertical), .linked.vertical >
   entry:not(:disabled) + entry:not(:disabled):backdrop,
   .linked.vertical > entry:not(:disabled) + spinbutton:not(:disabled):backdrop:not(.vertical) {
-    border-top-color: rgba(29, 32, 46, 0.757);
+    border-top-color: rgba(23, 26, 39, 0.946);
     background-image: linear-gradient(to bottom, #1a1d2b, #1a1d2b); }
 
 .linked.vertical > spinbutton:disabled:not(.vertical) + spinbutton:disabled:not(.vertical),
 .linked.vertical > spinbutton:disabled:not(.vertical) + entry:disabled, .linked.vertical > entry:disabled + spinbutton:disabled:not(.vertical),
 .linked.vertical >
 entry:disabled + entry:disabled {
-  border-top-color: rgba(29, 32, 45, 0.73); }
+  border-top-color: rgba(21, 24, 36, 0.94); }
 
 .linked.vertical > spinbutton:not(.vertical) + spinbutton:focus:not(:only-child):not(.vertical),
 .linked.vertical > spinbutton:not(.vertical) + entry:focus:not(:only-child), .linked.vertical > entry + spinbutton:focus:not(:only-child):not(.vertical),
@@ -1993,7 +1993,7 @@ expander arrow {
   background-color: #161925;
   border-width: 1px;
   border-style: solid solid none;
-  border-color: rgba(238, 238, 238, 0.1);
+  border-color: rgba(12, 14, 21, 0.8);
   border-radius: 3px 3px 0 0;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
   .floating-bar.bottom.left {
@@ -2006,7 +2006,7 @@ expander arrow {
     padding: 4px; }
   .floating-bar:backdrop {
     background-color: #161925;
-    border-color: rgba(91, 93, 102, 0.19); }
+    border-color: rgba(13, 16, 23, 0.82); }
 
 /**********
  * Frames *
@@ -2017,25 +2017,25 @@ frame > border,
   margin: 0;
   padding: 0;
   border-radius: 0;
-  border: 1px solid rgba(238, 238, 238, 0.1); }
+  border: 1px solid rgba(12, 14, 21, 0.8); }
   frame > border.flat,
   .frame.flat {
     border-style: none; }
   frame > border:backdrop,
   .frame:backdrop {
-    border-color: rgba(91, 93, 102, 0.19); }
+    border-color: rgba(13, 16, 23, 0.82); }
 
 actionbar > revealer > box {
   padding: 6px;
-  border-top: 1px solid rgba(238, 238, 238, 0.1); }
+  border-top: 1px solid rgba(12, 14, 21, 0.8); }
   actionbar > revealer > box:backdrop {
-    border-color: rgba(91, 93, 102, 0.19); }
+    border-color: rgba(13, 16, 23, 0.82); }
 
 scrolledwindow viewport.frame {
   border-style: none; }
 
 scrolledwindow overshoot.top {
-  background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(rgba(213, 213, 213, 0.1)), to(rgba(213, 213, 213, 0))), -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(195, 199, 209, 0.07)), to(rgba(195, 199, 209, 0)));
+  background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(rgba(0, 0, 0, 0.8)), to(rgba(0, 0, 0, 0))), -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(195, 199, 209, 0.07)), to(rgba(195, 199, 209, 0)));
   background-size: 100% 5%, 100% 100%;
   background-repeat: no-repeat;
   background-position: center top;
@@ -2043,7 +2043,7 @@ scrolledwindow overshoot.top {
   border: none;
   box-shadow: none; }
   scrolledwindow overshoot.top:backdrop {
-    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(rgba(91, 93, 102, 0.19)), to(rgba(91, 93, 102, 0)));
+    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(rgba(13, 16, 23, 0.82)), to(rgba(13, 16, 23, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center top;
@@ -2052,7 +2052,7 @@ scrolledwindow overshoot.top {
     box-shadow: none; }
 
 scrolledwindow overshoot.bottom {
-  background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(rgba(213, 213, 213, 0.1)), to(rgba(213, 213, 213, 0))), -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(195, 199, 209, 0.07)), to(rgba(195, 199, 209, 0)));
+  background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(rgba(0, 0, 0, 0.8)), to(rgba(0, 0, 0, 0))), -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(195, 199, 209, 0.07)), to(rgba(195, 199, 209, 0)));
   background-size: 100% 5%, 100% 100%;
   background-repeat: no-repeat;
   background-position: center bottom;
@@ -2060,7 +2060,7 @@ scrolledwindow overshoot.bottom {
   border: none;
   box-shadow: none; }
   scrolledwindow overshoot.bottom:backdrop {
-    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(rgba(91, 93, 102, 0.19)), to(rgba(91, 93, 102, 0)));
+    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(rgba(13, 16, 23, 0.82)), to(rgba(13, 16, 23, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center bottom;
@@ -2073,7 +2073,7 @@ scrolledwindow overshoot.left {
   background: linear-gradient(to right, #eee90a, #f7b922);
   box-shadow: 0px 2px 4px rgba(247, 185, 34, 0.98);
   color: snow;
-  background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(rgba(213, 213, 213, 0.1)), to(rgba(213, 213, 213, 0))), -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(195, 199, 209, 0.07)), to(rgba(195, 199, 209, 0)));
+  background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(rgba(0, 0, 0, 0.8)), to(rgba(0, 0, 0, 0))), -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(195, 199, 209, 0.07)), to(rgba(195, 199, 209, 0)));
   background-size: 5% 100%, 100% 100%;
   background-repeat: no-repeat;
   background-position: left center;
@@ -2085,7 +2085,7 @@ scrolledwindow overshoot.left {
     background: linear-gradient(to right, #eee90a, #f7b922);
     box-shadow: 0px 2px 4px rgba(247, 185, 34, 0.98);
     color: snow;
-    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(rgba(91, 93, 102, 0.19)), to(rgba(91, 93, 102, 0)));
+    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(rgba(13, 16, 23, 0.82)), to(rgba(13, 16, 23, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: left center;
@@ -2094,7 +2094,7 @@ scrolledwindow overshoot.left {
     box-shadow: none; }
 
 scrolledwindow overshoot.right {
-  background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(rgba(213, 213, 213, 0.1)), to(rgba(213, 213, 213, 0))), -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(195, 199, 209, 0.07)), to(rgba(195, 199, 209, 0)));
+  background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(rgba(0, 0, 0, 0.8)), to(rgba(0, 0, 0, 0))), -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(195, 199, 209, 0.07)), to(rgba(195, 199, 209, 0)));
   background-size: 5% 100%, 100% 100%;
   background-repeat: no-repeat;
   background-position: right center;
@@ -2102,7 +2102,7 @@ scrolledwindow overshoot.right {
   border: none;
   box-shadow: none; }
   scrolledwindow overshoot.right:backdrop {
-    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(rgba(91, 93, 102, 0.19)), to(rgba(91, 93, 102, 0)));
+    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(rgba(13, 16, 23, 0.82)), to(rgba(13, 16, 23, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: right center;
@@ -2156,12 +2156,12 @@ scrolledwindow undershoot.right {
 
 scrolledwindow junction {
   border-color: transparent;
-  border-image: linear-gradient(to bottom, rgba(238, 238, 238, 0.1) 1px, transparent 1px) 0 0 0 1/0 1px stretch;
+  border-image: linear-gradient(to bottom, rgba(12, 14, 21, 0.8) 1px, transparent 1px) 0 0 0 1/0 1px stretch;
   background-color: #171a27; }
   scrolledwindow junction:dir(rtl) {
     border-image-slice: 0 1 0 0; }
   scrolledwindow junction:backdrop {
-    border-image-source: linear-gradient(to bottom, rgba(91, 93, 102, 0.19) 1px, transparent 1px);
+    border-image-source: linear-gradient(to bottom, rgba(13, 16, 23, 0.82) 1px, transparent 1px);
     background-color: #10131b;
     transition: 200ms ease-out; }
 
@@ -2218,7 +2218,7 @@ GraniteWidgetsWelcome {
   -GtkTreeView-horizontal-separator: 1px;
   -GtkTreeView-vertical-separator: 6px;
   background-color: #161925;
-  border: solid rgba(238, 238, 238, 0.1);
+  border: solid rgba(12, 14, 21, 0.8);
   color: #C3C7D1;
   border-right-width: 1px; }
   .source-list .category-expander {
@@ -2317,7 +2317,7 @@ headerbar {
   border-radius: 0; }
   .titlebar:backdrop,
   headerbar:backdrop {
-    border-color: rgba(91, 93, 102, 0.19);
+    border-color: rgba(13, 16, 23, 0.82);
     transition: 200ms ease-out; }
   .titlebar .title,
   headerbar .title {
@@ -2331,7 +2331,8 @@ headerbar {
     padding-right: 12px; }
   .titlebar:not(headerbar) entry, .titlebar entry,
   headerbar entry {
-    min-height: 24px; }
+    min-height: 24px;
+    background: #0d0e16; }
   .titlebar:not(headerbar) button, .titlebar button,
   headerbar button {
     color: #8b8b8b;
@@ -2817,10 +2818,10 @@ button:visited {
 list {
   color: #C3C7D1;
   background-color: #181b28;
-  border-color: rgba(238, 238, 238, 0.1); }
+  border-color: rgba(12, 14, 21, 0.8); }
   list:backdrop {
     background-color: #1a1d2b;
-    border-color: rgba(91, 93, 102, 0.19); }
+    border-color: rgba(13, 16, 23, 0.82); }
 
 row {
   padding: 5px 11px;
@@ -2851,7 +2852,7 @@ row {
  *********/
 menubar,
 .menubar {
-  background-color: #101013;
+  background-color: #07080c;
   color: white;
   -GtkWidget-window-dragging: true;
   padding: 0px;
@@ -2875,7 +2876,7 @@ menu,
   margin: 4px;
   padding: 2px 0px;
   background: linear-gradient(to bottom, #1a1d2b, #12151f);
-  border: 1px solid rgba(238, 238, 238, 0.1); }
+  border: 1px solid rgba(12, 14, 21, 0.8); }
   .csd menu, .csd
   .menu, .csd
   .context-menu {
@@ -3013,11 +3014,11 @@ assistant {
   border-bottom-right-radius: 4px; }
   assistant .sidebar {
     background-color: #181b28;
-    border-top: 1px solid rgba(238, 238, 238, 0.1);
+    border-top: 1px solid rgba(12, 14, 21, 0.8);
     border-bottom-left-radius: 4px; }
     assistant .sidebar:backdrop {
       background-color: #1a1d2b;
-      border-color: rgba(91, 93, 102, 0.19); }
+      border-color: rgba(13, 16, 23, 0.82); }
   assistant.csd .sidebar {
     border-top-style: none; }
   assistant .sidebar GtkLabel,
@@ -3032,11 +3033,11 @@ assistant {
  *************/
 notebook > header {
   padding: 1px;
-  border-color: rgba(238, 238, 238, 0.1);
+  border-color: rgba(12, 14, 21, 0.8);
   border-width: 1px;
   background-color: #181b28; }
   notebook > header:backdrop {
-    border-color: rgba(91, 93, 102, 0.19);
+    border-color: rgba(13, 16, 23, 0.82);
     background-color: #161925; }
   notebook > header tabs {
     margin: 0px; }
@@ -3058,7 +3059,7 @@ notebook > header {
         box-shadow: none; }
       notebook > header.bottom > tabs > tab:checked {
         background-color: #181b28;
-        box-shadow: -1px 0 0 rgba(238, 238, 238, 0.1), 0px 1px 0 rgba(238, 238, 238, 0.1), 1px 0 0 rgba(238, 238, 238, 0.1); }
+        box-shadow: -1px 0 0 rgba(12, 14, 21, 0.8), 0px 1px 0 rgba(12, 14, 21, 0.8), 1px 0 0 rgba(12, 14, 21, 0.8); }
   notebook > header.left {
     border-right-style: solid; }
     notebook > header.left > tabs {
@@ -3067,7 +3068,7 @@ notebook > header {
         box-shadow: none; }
       notebook > header.left > tabs > tab:checked {
         background-color: #181b28;
-        box-shadow: 0px 1px 0 rgba(238, 238, 238, 0.1), 0px -1px 0 rgba(238, 238, 238, 0.1), 0px 1px 0 rgba(238, 238, 238, 0.1); }
+        box-shadow: 0px 1px 0 rgba(12, 14, 21, 0.8), 0px -1px 0 rgba(12, 14, 21, 0.8), 0px 1px 0 rgba(12, 14, 21, 0.8); }
   notebook > header.right {
     border-left-style: solid; }
     notebook > header.right > tabs {
@@ -3076,7 +3077,7 @@ notebook > header {
         box-shadow: none; }
       notebook > header.right > tabs > tab:checked {
         background-color: #181b28;
-        box-shadow: 0px 1px 0 rgba(238, 238, 238, 0.1), 0px -1px 0 rgba(238, 238, 238, 0.1), 1px 0 0 rgba(238, 238, 238, 0.1); }
+        box-shadow: 0px 1px 0 rgba(12, 14, 21, 0.8), 0px -1px 0 rgba(12, 14, 21, 0.8), 1px 0 0 rgba(12, 14, 21, 0.8); }
   notebook > header.top > tabs > arrow {
     border-top-style: none; }
   notebook > header.bottom > tabs > arrow {
@@ -3132,7 +3133,7 @@ notebook > header {
     notebook > header tab:hover {
       color: #989ca6; }
       notebook > header tab:hover.reorderable-page {
-        border-color: rgba(238, 238, 238, 0);
+        border-color: rgba(12, 14, 21, 0.1);
         background-color: rgba(22, 25, 37, 0.2); }
     notebook > header tab:backdrop {
       color: #4a4d59; }
@@ -3141,16 +3142,16 @@ notebook > header {
         background-color: transparent; }
     notebook > header tab:checked {
       color: #C3C7D1;
-      box-shadow: -1px 0 0 rgba(238, 238, 238, 0.1), 0px -1px 0 rgba(238, 238, 238, 0.1), 1px 0 0 rgba(238, 238, 238, 0.1); }
+      box-shadow: -1px 0 0 rgba(12, 14, 21, 0.8), 0px -1px 0 rgba(12, 14, 21, 0.8), 1px 0 0 rgba(12, 14, 21, 0.8); }
       notebook > header tab:checked.reorderable-page {
-        border-color: rgba(238, 238, 238, 0);
+        border-color: rgba(12, 14, 21, 0.3);
         background-color: rgba(22, 25, 37, 0.5); }
         notebook > header tab:checked.reorderable-page:hover {
           background-color: rgba(22, 25, 37, 0.7); }
     notebook > header tab:backdrop:checked {
       color: #6d707b; }
       notebook > header tab:backdrop:checked.reorderable-page {
-        border-color: rgba(91, 93, 102, 0.19);
+        border-color: rgba(13, 16, 23, 0.82);
         background-color: #1a1d2b; }
     notebook > header tab button.flat {
       padding: 0;
@@ -3223,21 +3224,21 @@ paned > separator {
   -gtk-icon-source: none;
   border-style: none;
   background-color: transparent;
-  background-image: image(rgba(238, 238, 238, 0.1));
+  background-image: image(rgba(12, 14, 21, 0.8));
   background-size: 1px 1px; }
   paned > separator:selected {
     background-image: image(#f7b922); }
   paned > separator:backdrop {
-    background-image: image(rgba(91, 93, 102, 0.19)); }
+    background-image: image(rgba(13, 16, 23, 0.82)); }
   paned > separator.wide {
     min-width: 5px;
     min-height: 5px;
     background-color: #161925;
-    background-image: image(rgba(238, 238, 238, 0.1)), image(rgba(238, 238, 238, 0.1));
+    background-image: image(rgba(12, 14, 21, 0.8)), image(rgba(12, 14, 21, 0.8));
     background-size: 1px 1px, 1px 1px; }
     paned > separator.wide:backdrop {
       background-color: #161925;
-      background-image: image(rgba(91, 93, 102, 0.19)), image(rgba(91, 93, 102, 0.19)); }
+      background-image: image(rgba(13, 16, 23, 0.82)), image(rgba(13, 16, 23, 0.82)); }
 
 paned.horizontal > separator {
   background-repeat: repeat-y; }
@@ -3300,7 +3301,7 @@ popover.background {
   background: linear-gradient(to bottom, #1a1d2b, #12151f);
   box-shadow: 0 4px 6px transparent; }
   .csd popover.background, popover.background {
-    border: 1px solid rgba(238, 238, 238, 0.1); }
+    border: 1px solid rgba(12, 14, 21, 0.8); }
   popover.background:backdrop {
     background-color: #161925;
     box-shadow: none; }
@@ -3426,7 +3427,7 @@ scale {
     -gtk-outline-radius: 5px;
     outline-color: transparent; }
   scale fill:backdrop, scale fill {
-    background-color: rgba(238, 238, 238, 0.1); }
+    background-color: rgba(12, 14, 21, 0.8); }
   scale fill:disabled:backdrop, scale fill:disabled {
     border-color: transparent;
     background-color: transparent; }
@@ -3784,7 +3785,7 @@ scale {
     min-height: 0;
     min-width: 0; }
     scale.color trough {
-      background-image: image(rgba(238, 238, 238, 0.1));
+      background-image: image(rgba(12, 14, 21, 0.8));
       background-repeat: no-repeat; }
     scale.color.horizontal {
       padding: 0 0 15px 0; }
@@ -3851,16 +3852,16 @@ scrollbar {
     -GtkScrollbar-has-backward-stepper: false;
     -GtkScrollbar-has-forward-stepper: false; }
   scrollbar.top {
-    border-bottom: 1px solid rgba(238, 238, 238, 0.1); }
+    border-bottom: 1px solid rgba(12, 14, 21, 0.8); }
   scrollbar.bottom {
-    border-top: 1px solid rgba(238, 238, 238, 0.1); }
+    border-top: 1px solid rgba(12, 14, 21, 0.8); }
   scrollbar.left {
-    border-right: 1px solid rgba(238, 238, 238, 0.1); }
+    border-right: 1px solid rgba(12, 14, 21, 0.8); }
   scrollbar.right {
-    border-left: 1px solid rgba(238, 238, 238, 0.1); }
+    border-left: 1px solid rgba(12, 14, 21, 0.8); }
   scrollbar:backdrop {
     background-color: #10131b;
-    border-color: rgba(91, 93, 102, 0.19);
+    border-color: rgba(13, 16, 23, 0.82);
     transition: 200ms ease-out; }
   scrollbar slider {
     min-width: 6px;
@@ -3985,7 +3986,7 @@ scrollbar {
     -gtk-icon-source: -gtk-icontheme("pan-left-symbolic"); }
 
 treeview ~ scrollbar.vertical {
-  border-top: 1px solid rgba(238, 238, 238, 0.1);
+  border-top: 1px solid rgba(12, 14, 21, 0.8);
   margin-top: -1px; }
 
 /***********
@@ -4001,11 +4002,11 @@ treeview ~ scrollbar.vertical {
     border-right: none;
     border-left-style: none; }
   stacksidebar.sidebar:dir(rtl) list .sidebar:dir(rtl), stacksidebar.sidebar.right list .sidebar:dir(rtl), .sidebar.right {
-    border-left: 1px solid rgba(238, 238, 238, 0.1);
+    border-left: 1px solid rgba(12, 14, 21, 0.8);
     border-right-style: none; }
   .sidebar:backdrop {
     background-color: #181b28;
-    border-color: rgba(91, 93, 102, 0.19);
+    border-color: rgba(13, 16, 23, 0.82);
     transition: 200ms ease-out; }
   .sidebar row {
     padding: 8px 12px;
@@ -4041,7 +4042,7 @@ treeview ~ scrollbar.vertical {
         background-color: rgba(22, 25, 37, 0.4); }
   paned .sidebar.left, paned .sidebar.right, paned .sidebar.left:dir(rtl), paned .sidebar:dir(rtl), paned .sidebar:dir(ltr), paned .sidebar {
     border-style: none;
-    border-color: rgba(238, 238, 238, 0.1); }
+    border-color: rgba(12, 14, 21, 0.8); }
 
 stacksidebar row {
   padding: 10px 4px; }
@@ -4118,7 +4119,7 @@ spinbutton:not(.vertical) {
     color: #b2b6c0;
     background-image: none;
     border-style: none none none solid;
-    border-color: rgba(238, 238, 238, 0);
+    border-color: rgba(12, 14, 21, 0.1);
     border-radius: 0;
     box-shadow: inset 1px 0px 0px 0px rgba(0, 0, 0, 0.07); }
     spinbutton:not(.vertical) button:dir(rtl) {
@@ -4134,7 +4135,7 @@ spinbutton:not(.vertical) {
     spinbutton:not(.vertical) button:backdrop {
       color: #656873;
       background-color: transparent;
-      border-color: rgba(91, 93, 102, 0);
+      border-color: rgba(13, 16, 23, 0.12);
       transition: 200ms ease-out; }
     spinbutton:not(.vertical) button:backdrop:disabled {
       color: rgba(51, 57, 85, 0.3);
@@ -4222,7 +4223,7 @@ spinbutton.vertical button {
   min-width: 32px;
   padding: 0;
   border-width: 1px;
-  border-color: rgba(238, 238, 238, 0.1);
+  border-color: rgba(12, 14, 21, 0.8);
   box-shadow: 0 1px rgba(255, 255, 255, 0.1); }
 
 spinbutton.vertical button.up {
@@ -4401,12 +4402,12 @@ searchbar,
 .inline-toolbar, searchbar,
 .location-bar {
   border-style: solid;
-  border-color: rgba(238, 238, 238, 0.1);
-  background-color: rgba(27, 30, 41, 0.73); }
+  border-color: rgba(12, 14, 21, 0.8);
+  background-color: rgba(20, 23, 33, 0.94); }
   .inline-toolbar:backdrop, searchbar:backdrop,
   .location-bar:backdrop {
-    border-color: rgba(91, 93, 102, 0.19);
-    background-color: rgba(26, 29, 40, 0.7165);
+    border-color: rgba(13, 16, 23, 0.82);
+    background-color: rgba(20, 23, 33, 0.937);
     box-shadow: none;
     transition: 200ms ease-out; }
 
@@ -4591,18 +4592,18 @@ decoration {
   .csd.popup decoration {
     border-radius: 0;
     box-shadow: 0 4px 8px transparent;
-    border: 1px solid rgba(238, 238, 238, 0.1); }
+    border: 1px solid rgba(12, 14, 21, 0.8); }
   tooltip.csd decoration {
     border-radius: 5px;
     box-shadow: none; }
   messagedialog.csd decoration {
     border-radius: 7px;
-    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(238, 238, 238, 0); }
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(12, 14, 21, 0.6); }
   .solid-csd decoration {
     border-radius: 0;
     margin: 4px;
     background-color: #161925;
-    border: solid 1px rgba(91, 93, 102, 0.19);
+    border: solid 1px rgba(13, 16, 23, 0.82);
     box-shadow: none; }
 
 button.titlebutton {
@@ -5927,7 +5928,7 @@ UnityPanelWidget:backdrop,
 .unity-panel.menubar .menuitem.separator,
 .unity-panel.menubar.menuitem.separator {
   border: none;
-  color: rgba(238, 238, 238, 0.1); }
+  color: rgba(12, 14, 21, 0.8); }
 
 /* Force Quit */
 SheetStyleDialog.unity-force-quit {
@@ -6035,7 +6036,7 @@ ConversationListView {
   padding-top: 20px;
   padding-bottom: 0px;
   border-style: none;
-  background-color: #101013;
+  background-color: #07080c;
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border: solid rgba(0, 0, 0, 0.1);
diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css
index 24b2f2e..ad94cc4 100755
--- a/gtk-3.0/gtk.css
+++ b/gtk-3.0/gtk.css
@@ -2338,7 +2338,8 @@ headerbar {
     padding-right: 12px; }
   .titlebar:not(headerbar) entry, .titlebar entry,
   headerbar entry {
-    min-height: 24px; }
+    min-height: 24px;
+    background: #17181c; }
   .titlebar:not(headerbar) button, .titlebar button,
   headerbar button {
     color: #8b8b8b;
diff --git a/gtk-3.0/widgets/_header-bars.scss b/gtk-3.0/widgets/_header-bars.scss
index 1fc3eec..ae5ea58 100644
--- a/gtk-3.0/widgets/_header-bars.scss
+++ b/gtk-3.0/widgets/_header-bars.scss
@@ -5,7 +5,7 @@
 headerbar {
   padding: 0px 13px;
   min-height: 34px;
-  background: if($variant == 'light', $headerbar_color , mix($base_color, darken($headerbar_color, 8%), 30%));
+  background: $headerbar_color;
   color: $headerbar_fg_color;
   border-radius: 0;
   &:backdrop {
@@ -29,7 +29,7 @@ headerbar {
     @extend .dim-label;
   }
  
-  entry { min-height: 24px;}  
+  entry { min-height: 24px; background: lighten($headerbar_color, 3%);}  
   
   button {
     @include button(normal-header);