[gtk+] Adwaita: rerender css



commit 4d307db13c52f5e7802b967267feb12a73bc3102
Author: Jakub Steiner <jimmac gmail com>
Date:   Mon Aug 31 10:47:01 2015 +0200

    Adwaita: rerender css
    
    - fixes previous commit
    - for some reason sass won't overwrite a confliced css

 gtk/theme/Adwaita/gtk-contained-dark.css |  579 ++++++++++++++----------------
 gtk/theme/Adwaita/gtk-contained.css      |  513 ++++++++++++---------------
 2 files changed, 498 insertions(+), 594 deletions(-)
---
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index c16aa07..f297ef7 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -36,7 +36,7 @@
   .background:backdrop {
     text-shadow: none;
     icon-shadow: none;
-    color: #949796;
+    color: #939695;
     background-color: #393f3f; }
 
 /*
@@ -58,8 +58,8 @@
     background-color: #212424;
     color: #eeeeec; }
   .gtkstyle-fallback:insensitive {
-    background-color: #333636;
-    color: #949796; }
+    background-color: #323636;
+    color: #939695; }
   .gtkstyle-fallback:selected {
     background-color: #215d9c;
     color: #ffffff; }
@@ -68,7 +68,7 @@
   color: white;
   background-color: #292929; }
   .view:backdrop {
-    color: #d5d5d5;
+    color: #d4d4d4;
     background-color: #2c2c2c; }
   .view:selected, GtkCalendar:selected {
     border-radius: 3px; }
@@ -80,9 +80,9 @@
 .label.separator {
   color: #eeeeec; }
   .label.separator:backdrop {
-    color: #949796; }
+    color: #939695; }
 .label:insensitive {
-  color: #949796; }
+  color: #939695; }
   .label:insensitive:backdrop {
     color: #5d6767; }
 
@@ -100,18 +100,18 @@ GtkAssistant .sidebar {
     border-left: 1px solid #1c1f1f; }
   GtkAssistant .sidebar:backdrop {
     background-color: #2c2c2c;
-    border-color: #1f2222; }
+    border-color: #1e2222; }
 GtkAssistant.csd .sidebar {
   border-top-style: none; }
 GtkAssistant .sidebar .label {
   padding: 6px 12px; }
 GtkAssistant .sidebar .label.highlight {
-  background-color: #5d6262; }
+  background-color: #5d6261; }
 
 GtkTextView {
   background-color: #313434; }
   GtkTextView:backdrop {
-    background-color: #333636; }
+    background-color: #323535; }
 
 .grid-child {
   padding: 3px;
@@ -158,7 +158,7 @@ GtkTextView {
   border-radius: 3px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   background-color: transparent;
-  background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+  background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
   color: white;
   border-color: #1c1f1f;
   box-shadow: inset 0 0 0 1px rgba(33, 93, 156, 0), 0 1px rgba(238, 238, 236, 0.1); }
@@ -169,7 +169,7 @@ GtkTextView {
   .entry.flat, .entry.flat:focus {
     padding: 2px;
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
     color: white;
     border-color: #1c1f1f;
     box-shadow: inset 0 0 0 1px rgba(33, 93, 156, 0);
@@ -177,29 +177,29 @@ GtkTextView {
     border-radius: 0; }
   .entry:focus {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
     box-shadow: inset 0 0 0 1px #215d9c, 0 1px rgba(238, 238, 236, 0.1);
     border-color: #0f2b48; }
   .entry:insensitive {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
-    color: #949796;
+    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+    color: #939695;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #333636);
+    background-image: linear-gradient(to bottom, #323636);
     box-shadow: 0 1px rgba(238, 238, 236, 0.1); }
   .entry:backdrop {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
-    color: #d5d5d5;
-    border-color: #1f2222;
+    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+    color: #d4d4d4;
+    border-color: #1e2222;
     background-image: linear-gradient(to bottom, #2c2c2c);
     box-shadow: 0 1px rgba(238, 238, 236, 0); }
   .entry:backdrop:insensitive {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
     color: #5d6767;
-    border-color: #1f2222;
-    background-image: linear-gradient(to bottom, #333636);
+    border-color: #1e2222;
+    background-image: linear-gradient(to bottom, #323636);
     box-shadow: 0 1px rgba(238, 238, 236, 0); }
   .entry.progressbar {
     margin: 1px;
@@ -219,7 +219,7 @@ GtkTextView {
     border-color: #1a0000; }
     .entry.error:focus {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
       box-shadow: inset 0 0 0 1px #cc0000, 0 1px rgba(238, 238, 236, 0.1);
       border-color: #1a0000; }
     .entry.error:selected, .entry.error:selected:focus {
@@ -229,22 +229,22 @@ GtkTextView {
     border-color: #432100; }
     .entry.warning:focus {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
       box-shadow: inset 0 0 0 1px #f57900, 0 1px rgba(238, 238, 236, 0.1);
       border-color: #432100; }
     .entry.warning:selected, .entry.warning:selected:focus {
       background-color: #f57900; }
   .entry.image {
-    color: #c7c7c5; }
+    color: #c6c6c5; }
     .entry.image:hover {
       color: #eeeeec; }
     .entry.image:active {
       color: #215d9c; }
     .entry.image:backdrop {
-      color: #7f8281; }
+      color: #7e8080; }
   .osd .entry {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
@@ -254,7 +254,7 @@ GtkTextView {
     icon-shadow: 0 1px black; }
     .osd .entry:focus {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
       color: white;
       border-color: #215d9c;
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
@@ -264,7 +264,7 @@ GtkTextView {
       icon-shadow: 0 1px black; }
     .osd .entry:backdrop {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
@@ -274,10 +274,10 @@ GtkTextView {
       icon-shadow: none; }
     .osd .entry:insensitive {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
-      color: #878a89;
+      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -291,7 +291,7 @@ GtkTextView {
   border-top-color: #252626;
   background-image: linear-gradient(to bottom, #292929); }
   .linked.vertical > .entry:not(:insensitive) + .entry:not(:insensitive):backdrop {
-    border-top-color: #282929;
+    border-top-color: #272929;
     background-image: linear-gradient(to bottom, #2c2c2c); }
 .linked.vertical > .entry + .entry:focus:not(:last-child) {
   border-top-color: #0f2b48;
@@ -365,8 +365,8 @@ GtkTextView {
   .button:backdrop, .header-bar .button.titlebutton:backdrop,
   .titlebar .button.titlebutton:backdrop, .button.flat:backdrop, .sidebar-button.button:backdrop, 
.header-bar .titlebutton.button:backdrop,
   .titlebar .titlebutton.button:backdrop {
-    color: #949796;
-    border-color: #1f2222;
+    color: #939695;
+    border-color: #1e2222;
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     icon-shadow: none;
@@ -375,15 +375,15 @@ GtkTextView {
     .button:backdrop:active, .button:backdrop:checked, .button.flat:backdrop:active, 
.sidebar-button.button:backdrop:active, .header-bar .titlebutton.button:backdrop:active,
     .titlebar .titlebutton.button:backdrop:active, .button.flat:backdrop:checked, 
.sidebar-button.button:backdrop:checked, .header-bar .titlebutton.button:backdrop:checked,
     .titlebar .titlebutton.button:backdrop:checked {
-      color: #949796;
-      border-color: #1f2222;
-      background-image: linear-gradient(to bottom, #303535);
+      color: #939695;
+      border-color: #1e2222;
+      background-image: linear-gradient(to bottom, #2f3434);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
     .button:backdrop:insensitive, .button.flat:backdrop:insensitive, 
.sidebar-button.button:backdrop:insensitive, .header-bar .titlebutton.button:backdrop:insensitive,
     .titlebar .titlebutton.button:backdrop:insensitive {
       color: #5d6767;
-      border-color: #1f2222;
-      background-image: linear-gradient(to bottom, #333636);
+      border-color: #1e2222;
+      background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
@@ -395,8 +395,8 @@ GtkTextView {
     .titlebar .titlebutton.button:backdrop:insensitive:active, .button.flat:backdrop:insensitive:checked, 
.sidebar-button.button:backdrop:insensitive:checked, .header-bar 
.titlebutton.button:backdrop:insensitive:checked,
     .titlebar .titlebutton.button:backdrop:insensitive:checked {
       color: #5d6767;
-      border-color: #1f2222;
-      background-image: linear-gradient(to bottom, #272929);
+      border-color: #1e2222;
+      background-image: linear-gradient(to bottom, #262929);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
       .button:backdrop:insensitive:active > .label, .header-bar 
.button.titlebutton:backdrop:insensitive:active > .label,
       .titlebar .button.titlebutton:backdrop:insensitive:active > .label, 
.button:backdrop:insensitive:checked > .label, .header-bar .button.titlebutton:backdrop:insensitive:checked > 
.label,
@@ -416,9 +416,9 @@ GtkTextView {
     icon-shadow: none; }
   .button:insensitive, .header-bar .button.titlebutton:insensitive,
   .titlebar .button.titlebutton:insensitive {
-    color: #949796;
+    color: #939695;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #333636);
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
@@ -426,9 +426,9 @@ GtkTextView {
     .titlebar .button.titlebutton:insensitive > .label {
       color: inherit; }
     .button:insensitive:active, .button:insensitive:checked {
-      color: #949796;
+      color: #939695;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #313434, #333636);
+      background-image: linear-gradient(to bottom, #2f3333, #323636);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
       .button:insensitive:active > .label, .header-bar .button.titlebutton:insensitive:active > .label,
       .titlebar .button.titlebutton:insensitive:active > .label, .button:insensitive:checked > .label, 
.header-bar .button.titlebutton:insensitive:checked > .label,
@@ -476,9 +476,9 @@ GtkTextView {
       border: none;
       box-shadow: none; }
     .button.osd:insensitive, .button.osd:backdrop:insensitive {
-      color: #878a89;
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -539,9 +539,9 @@ GtkTextView {
       icon-shadow: none;
       outline-color: rgba(238, 238, 236, 0.3); }
     .osd .button:insensitive, .osd .button:backdrop:insensitive {
-      color: #878a89;
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -583,9 +583,9 @@ GtkTextView {
       .osd .button.flat:insensitive, .osd .sidebar-button.button:insensitive, .osd .header-bar 
.titlebutton.button:insensitive, .header-bar .osd .titlebutton.button:insensitive,
       .osd .titlebar .titlebutton.button:insensitive,
       .titlebar .osd .titlebutton.button:insensitive {
-        color: #878a89;
+        color: #878989;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -654,7 +654,7 @@ GtkTextView {
       box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 
238, 236, 0.1); }
     .button.suggested-action:backdrop, .button.suggested-action.flat:backdrop, 
.suggested-action.sidebar-button.button:backdrop, .header-bar .suggested-action.titlebutton.button:backdrop,
     .titlebar .suggested-action.titlebutton.button:backdrop {
-      color: #d3dfeb;
+      color: #d2deeb;
       border-color: #0b1e33;
       background-image: linear-gradient(to bottom, #215d9c);
       text-shadow: none;
@@ -663,15 +663,15 @@ GtkTextView {
       .button.suggested-action:backdrop:active, .button.suggested-action:backdrop:checked, 
.button.suggested-action.flat:backdrop:active, .suggested-action.sidebar-button.button:backdrop:active, 
.header-bar .suggested-action.titlebutton.button:backdrop:active,
       .titlebar .suggested-action.titlebutton.button:backdrop:active, 
.button.suggested-action.flat:backdrop:checked, .suggested-action.sidebar-button.button:backdrop:checked, 
.header-bar .suggested-action.titlebutton.button:backdrop:checked,
       .titlebar .suggested-action.titlebutton.button:backdrop:checked {
-        color: #d1dae3;
+        color: #d0d9e2;
         border-color: #0b1e33;
         background-image: linear-gradient(to bottom, #184472);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
       .button.suggested-action:backdrop:insensitive, .button.suggested-action.flat:backdrop:insensitive, 
.suggested-action.sidebar-button.button:backdrop:insensitive, .header-bar 
.suggested-action.titlebutton.button:backdrop:insensitive,
       .titlebar .suggested-action.titlebutton.button:backdrop:insensitive {
         color: #5d6767;
-        border-color: #1f2222;
-        background-image: linear-gradient(to bottom, #333636);
+        border-color: #1e2222;
+        background-image: linear-gradient(to bottom, #323636);
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
@@ -682,9 +682,9 @@ GtkTextView {
         .button.suggested-action:backdrop:insensitive:active, 
.button.suggested-action:backdrop:insensitive:checked, 
.button.suggested-action.flat:backdrop:insensitive:active, 
.suggested-action.sidebar-button.button:backdrop:insensitive:active, .header-bar 
.suggested-action.titlebutton.button:backdrop:insensitive:active,
         .titlebar .suggested-action.titlebutton.button:backdrop:insensitive:active, 
.button.suggested-action.flat:backdrop:insensitive:checked, 
.suggested-action.sidebar-button.button:backdrop:insensitive:checked, .header-bar 
.suggested-action.titlebutton.button:backdrop:insensitive:checked,
         .titlebar .suggested-action.titlebutton.button:backdrop:insensitive:checked {
-          color: #6c88a7;
+          color: #6c88a5;
           border-color: #0b1e33;
-          background-image: linear-gradient(to bottom, #1d4877);
+          background-image: linear-gradient(to bottom, #1d4876);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
           .button.suggested-action:backdrop:insensitive:active > .label, .header-bar 
.suggested-action.button.titlebutton:backdrop:insensitive:active > .label,
           .titlebar .suggested-action.button.titlebutton:backdrop:insensitive:active > .label, 
.button.suggested-action:backdrop:insensitive:checked > .label, .header-bar 
.suggested-action.button.titlebutton:backdrop:insensitive:checked > .label,
@@ -704,9 +704,9 @@ GtkTextView {
       icon-shadow: none;
       color: rgba(33, 93, 156, 0.8); }
     .button.suggested-action:insensitive {
-      color: #949796;
+      color: #939695;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #333636);
+      background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
@@ -714,9 +714,9 @@ GtkTextView {
       .titlebar .suggested-action.button.titlebutton:insensitive > .label {
         color: inherit; }
       .button.suggested-action:insensitive:active, .button.suggested-action:insensitive:checked {
-        color: #a5b6c9;
+        color: #a4b5c8;
         border-color: #0b1e33;
-        background-image: linear-gradient(to bottom, #1b4470, #1d4877);
+        background-image: linear-gradient(to bottom, #1b436f, #1d4876);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
         .button.suggested-action:insensitive:active > .label, .header-bar 
.suggested-action.button.titlebutton:insensitive:active > .label,
         .titlebar .suggested-action.button.titlebutton:insensitive:active > .label, 
.button.suggested-action:insensitive:checked > .label, .header-bar 
.suggested-action.button.titlebutton:insensitive:checked > .label,
@@ -750,9 +750,9 @@ GtkTextView {
         icon-shadow: none;
         outline-color: rgba(238, 238, 236, 0.3); }
       .osd .button.suggested-action:insensitive, .osd .button.suggested-action:backdrop:insensitive {
-        color: #878a89;
+        color: #878989;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -801,7 +801,7 @@ GtkTextView {
       box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 
238, 236, 0.1); }
     .button.destructive-action:backdrop, .button.destructive-action.flat:backdrop, 
.destructive-action.sidebar-button.button:backdrop, .header-bar 
.destructive-action.titlebutton.button:backdrop,
     .titlebar .destructive-action.titlebutton.button:backdrop {
-      color: #f7cfcf;
+      color: #f6cfcf;
       border-color: #5e0707;
       background-image: linear-gradient(to bottom, #d51010);
       text-shadow: none;
@@ -817,8 +817,8 @@ GtkTextView {
       .button.destructive-action:backdrop:insensitive, .button.destructive-action.flat:backdrop:insensitive, 
.destructive-action.sidebar-button.button:backdrop:insensitive, .header-bar 
.destructive-action.titlebutton.button:backdrop:insensitive,
       .titlebar .destructive-action.titlebutton.button:backdrop:insensitive {
         color: #5d6767;
-        border-color: #1f2222;
-        background-image: linear-gradient(to bottom, #333636);
+        border-color: #1e2222;
+        background-image: linear-gradient(to bottom, #323636);
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
@@ -829,9 +829,9 @@ GtkTextView {
         .button.destructive-action:backdrop:insensitive:active, 
.button.destructive-action:backdrop:insensitive:checked, 
.button.destructive-action.flat:backdrop:insensitive:active, 
.destructive-action.sidebar-button.button:backdrop:insensitive:active, .header-bar 
.destructive-action.titlebutton.button:backdrop:insensitive:active,
         .titlebar .destructive-action.titlebutton.button:backdrop:insensitive:active, 
.button.destructive-action.flat:backdrop:insensitive:checked, 
.destructive-action.sidebar-button.button:backdrop:insensitive:checked, .header-bar 
.destructive-action.titlebutton.button:backdrop:insensitive:checked,
         .titlebar .destructive-action.titlebutton.button:backdrop:insensitive:checked {
-          color: #c46565;
+          color: #c36464;
           border-color: #5e0707;
-          background-image: linear-gradient(to bottom, #a41212);
+          background-image: linear-gradient(to bottom, #a41111);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
           .button.destructive-action:backdrop:insensitive:active > .label, .header-bar 
.destructive-action.button.titlebutton:backdrop:insensitive:active > .label,
           .titlebar .destructive-action.button.titlebutton:backdrop:insensitive:active > .label, 
.button.destructive-action:backdrop:insensitive:checked > .label, .header-bar 
.destructive-action.button.titlebutton:backdrop:insensitive:checked > .label,
@@ -851,9 +851,9 @@ GtkTextView {
       icon-shadow: none;
       color: rgba(213, 16, 16, 0.8); }
     .button.destructive-action:insensitive {
-      color: #949796;
+      color: #939695;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #333636);
+      background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
@@ -861,9 +861,9 @@ GtkTextView {
       .titlebar .destructive-action.button.titlebutton:insensitive > .label {
         color: inherit; }
       .button.destructive-action:insensitive:active, .button.destructive-action:insensitive:checked {
-        color: #dba0a0;
+        color: #da9f9f;
         border-color: #5e0707;
-        background-image: linear-gradient(to bottom, #9d1111, #a41212);
+        background-image: linear-gradient(to bottom, #9d1010, #a41111);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
         .button.destructive-action:insensitive:active > .label, .header-bar 
.destructive-action.button.titlebutton:insensitive:active > .label,
         .titlebar .destructive-action.button.titlebutton:insensitive:active > .label, 
.button.destructive-action:insensitive:checked > .label, .header-bar 
.destructive-action.button.titlebutton:insensitive:checked > .label,
@@ -897,9 +897,9 @@ GtkTextView {
         icon-shadow: none;
         outline-color: rgba(238, 238, 236, 0.3); }
       .osd .button.destructive-action:insensitive, .osd .button.destructive-action:backdrop:insensitive {
-        color: #878a89;
+        color: #878989;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -1007,13 +1007,9 @@ GtkTextView {
     box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 
238, 236, 0.1); }
   .inline-toolbar GtkToolButton > .button:insensitive, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:insensitive,
   .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:insensitive {
-<<<<<<< HEAD
-    color: #949796;
-=======
     color: #939695;
->>>>>>> Adwaita, HighContrast: day names in GtkCalendar
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #333636);
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
@@ -1022,25 +1018,16 @@ GtkTextView {
   .inline-toolbar GtkToolButton > .button:insensitive:active, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:insensitive:active,
   .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:insensitive:active, .inline-toolbar 
GtkToolButton > .button:insensitive:checked, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:insensitive:checked,
   .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:insensitive:checked {
-<<<<<<< HEAD
-    color: #949796;
-=======
     color: #939695;
->>>>>>> Adwaita, HighContrast: day names in GtkCalendar
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #313434, #333636);
+    background-image: linear-gradient(to bottom, #2f3333, #323636);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
     .inline-toolbar GtkToolButton > .button:insensitive:active > .label, .inline-toolbar GtkToolButton > 
.button:insensitive:checked > .label {
       color: inherit; }
   .inline-toolbar GtkToolButton > .button:backdrop, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:backdrop,
   .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop {
-<<<<<<< HEAD
-    color: #949796;
-    border-color: #1f2222;
-=======
     color: #939695;
     border-color: #1e2222;
->>>>>>> Adwaita, HighContrast: day names in GtkCalendar
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     icon-shadow: none;
@@ -1048,21 +1035,15 @@ GtkTextView {
   .inline-toolbar GtkToolButton > .button:backdrop:active, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:backdrop:active,
   .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop:active, .inline-toolbar 
GtkToolButton > .button:backdrop:checked, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:backdrop:checked,
   .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop:checked {
-<<<<<<< HEAD
-    color: #949796;
-    border-color: #1f2222;
-    background-image: linear-gradient(to bottom, #303535);
-=======
     color: #939695;
     border-color: #1e2222;
     background-image: linear-gradient(to bottom, #2f3434);
->>>>>>> Adwaita, HighContrast: day names in GtkCalendar
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
   .inline-toolbar GtkToolButton > .button:backdrop:insensitive, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:backdrop:insensitive,
   .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop:insensitive {
     color: #5d6767;
-    border-color: #1f2222;
-    background-image: linear-gradient(to bottom, #333636);
+    border-color: #1e2222;
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
@@ -1072,8 +1053,8 @@ GtkTextView {
   .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop:insensitive:active, .inline-toolbar 
GtkToolButton > .button:backdrop:insensitive:checked, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:backdrop:insensitive:checked,
   .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop:insensitive:checked {
     color: #5d6767;
-    border-color: #1f2222;
-    background-image: linear-gradient(to bottom, #272929);
+    border-color: #1e2222;
+    background-image: linear-gradient(to bottom, #262929);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
     .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active > .label, .inline-toolbar 
GtkToolButton > .button:backdrop:insensitive:checked > .label {
       color: inherit; }
@@ -1161,18 +1142,12 @@ GtkTextView {
   border-style: solid; }
 
 .linked.vertical > .entry, .linked.vertical > .button, .header-bar .linked.vertical > .button.titlebutton,
-<<<<<<< HEAD
 .titlebar .linked.vertical > .button.titlebutton, .linked.vertical > .button:hover, .linked.vertical > 
.button:active, .linked.vertical > .button:checked, .linked.vertical > .button:backdrop, .linked.vertical > 
GtkComboBoxText > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox > .the-button-in-the-combobox {
-=======
-.titlebar .linked.vertical > .button.titlebutton, .linked.vertical > .button:hover, .linked.vertical > 
.button:active, .linked.vertical > .button:checked, .linked.vertical > .button:backdrop, .linked.vertical > 
GtkComboBoxText > .button,
-.linked.vertical > GtkComboBox > .button {
->>>>>>> Adwaita, HighContrast: day names in GtkCalendar
   border-style: solid solid none solid;
   border-radius: 0; }
 
 .linked.vertical > .entry:first-child, .linked.vertical > .button:first-child, .header-bar .linked.vertical 
.button.titlebutton:first-child,
-<<<<<<< HEAD
 .titlebar .linked.vertical > .button.titlebutton:first-child, .linked.vertical > GtkComboBoxText:first-child 
.the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox {
   border-top-left-radius: 3px;
@@ -1180,26 +1155,12 @@ GtkTextView {
 .linked.vertical > .entry:last-child, .linked.vertical > .button:last-child, .header-bar .linked.vertical > 
.button.titlebutton:last-child,
 .titlebar .linked.vertical > .button.titlebutton:last-child, .linked.vertical > GtkComboBoxText:last-child > 
.the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox {
-=======
-.titlebar .linked.vertical > .button.titlebutton:first-child, .linked.vertical > GtkComboBoxText:first-child 
.button,
-.linked.vertical > GtkComboBox:first-child > .button {
-  border-top-left-radius: 3px;
-  border-top-right-radius: 3px; }
-.linked.vertical > .entry:last-child, .linked.vertical > .button:last-child, .header-bar .linked.vertical > 
.button.titlebutton:last-child,
-.titlebar .linked.vertical > .button.titlebutton:last-child, .linked.vertical > GtkComboBoxText:last-child > 
.button,
-.linked.vertical > GtkComboBox:last-child > .button {
->>>>>>> Adwaita, HighContrast: day names in GtkCalendar
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border-style: solid; }
 .linked.vertical > .entry:only-child, .linked.vertical > .button:only-child, .header-bar .linked.vertical > 
.button.titlebutton:only-child,
-<<<<<<< HEAD
 .titlebar .linked.vertical > .button.titlebutton:only-child, .linked.vertical > GtkComboBoxText:only-child > 
.the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox {
-=======
-.titlebar .linked.vertical > .button.titlebutton:only-child, .linked.vertical > GtkComboBoxText:only-child > 
.button,
-.linked.vertical > GtkComboBox:only-child > .button {
->>>>>>> Adwaita, HighContrast: day names in GtkCalendar
   border-radius: 3px;
   border-style: solid; }
 
@@ -1245,7 +1206,7 @@ GtkTextView {
   outline-offset: -1px; }
   .menuitem.button.flat:hover, .menuitem.sidebar-button.button:hover, .header-bar 
.menuitem.titlebutton.button:hover,
   .titlebar .menuitem.titlebutton.button:hover {
-    background-color: #4b5150; }
+    background-color: #4b5050; }
 
 GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton,
 .titlebar GtkColorButton.button.titlebutton {
@@ -1271,17 +1232,17 @@ GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton,
   *:link:hover, .button:hover:link, .button:hover:visited {
     color: #74aae2; }
     *:selected *:link:hover, *:selected .button:hover:link, *:selected .button:hover:visited {
-      color: #e9eff5; }
+      color: #e8eef5; }
   *:link:active, .button:active:link, .button:active:visited {
     color: #4a90d9; }
     *:selected *:link:active, *:selected .button:active:link, *:selected .button:active:visited {
-      color: #d3dfeb; }
+      color: #d2deeb; }
   *:link:backdrop, .button:backdrop:link, .button:backdrop:visited, *:link:backdrop:hover, 
.button:backdrop:hover:link, .button:backdrop:hover:visited, *:link:backdrop:hover:selected, 
.button:backdrop:hover:selected:link, .button:backdrop:hover:selected:visited, .titlebar.selection-mode 
.subtitle:backdrop:hover:link,
   .header-bar.selection-mode .subtitle:backdrop:hover:link {
     color: #215d9c; }
   *:link:selected, .button:selected:link, .button:selected:visited, .titlebar.selection-mode .subtitle:link,
   .header-bar.selection-mode .subtitle:link, *:selected *:link, *:selected .button:link, *:selected 
.button:visited {
-    color: #d3dfeb; }
+    color: #d2deeb; }
 
 .button:link, .header-bar .button.titlebutton:link,
 .titlebar .button.titlebutton:link, .button:visited, .header-bar .button.titlebutton:visited,
@@ -1303,7 +1264,7 @@ GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton,
   background-image: none;
   border-style: none none none solid;
   border-color: rgba(28, 31, 31, 0.3);
-  color: #dadad9;
+  color: #dadad8;
   border-radius: 0;
   box-shadow: none; }
   .spinbutton .button:dir(rtl) {
@@ -1312,13 +1273,13 @@ GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton,
     color: #eeeeec;
     background-color: rgba(238, 238, 236, 0.05); }
   .spinbutton .button:insensitive {
-    color: rgba(148, 151, 150, 0.3); }
+    color: rgba(147, 150, 149, 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 {
-    color: #8a8c8b;
-    border-color: rgba(31, 34, 34, 0.3);
+    color: #888b8a;
+    border-color: rgba(30, 34, 34, 0.3);
     background-color: transparent; }
   .spinbutton .button:backdrop:insensitive {
     background-image: none;
@@ -1371,7 +1332,7 @@ GtkColorButton.button, .header-bar GtkColorButton.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: #878a89;
+    color: #878989;
     border-color: rgba(0, 0, 0, 0.5);
     icon-shadow: none;
     box-shadow: none; }
@@ -1407,9 +1368,9 @@ GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton,
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
     .spinbutton.vertical .button:first-child:insensitive, .spinbutton.vertical:dir(rtl) 
.button:first-child:insensitive {
-      color: #949796;
+      color: #939695;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #333636);
+      background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -1418,8 +1379,8 @@ GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton,
       .spinbutton.vertical:dir(rtl) .titlebar .button.titlebutton:first-child:insensitive > .label {
         color: inherit; }
     .spinbutton.vertical .button:first-child:backdrop, .spinbutton.vertical:dir(rtl) 
.button:first-child:backdrop {
-      color: #949796;
-      border-color: #1f2222;
+      color: #939695;
+      border-color: #1e2222;
       background-image: linear-gradient(to bottom, #393f3f);
       text-shadow: none;
       icon-shadow: none;
@@ -1449,9 +1410,9 @@ GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton,
       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); }
     .spinbutton.vertical .button:last-child:insensitive, .spinbutton.vertical:dir(rtl) 
.button:last-child:insensitive {
-      color: #949796;
+      color: #939695;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #333636);
+      background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
@@ -1460,16 +1421,16 @@ GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton,
       .spinbutton.vertical:dir(rtl) .titlebar .button.titlebutton:last-child:insensitive > .label {
         color: inherit; }
     .spinbutton.vertical .button:last-child:backdrop, .spinbutton.vertical:dir(rtl) 
.button:last-child:backdrop {
-      color: #949796;
-      border-color: #1f2222;
+      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); }
   .spinbutton.vertical .button:backdrop:insensitive, .spinbutton.vertical:dir(rtl) 
.button:backdrop:insensitive {
     color: #5d6767;
-    border-color: #1f2222;
-    background-image: linear-gradient(to bottom, #333636);
+    border-color: #1e2222;
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
@@ -1507,11 +1468,11 @@ GtkComboBox {
     padding-top: 3px;
     padding-bottom: 4px; }
   GtkComboBox:insensitive {
-    color: #949796;
+    color: #939695;
     text-shadow: none;
     icon-shadow: none; }
   GtkComboBox:backdrop {
-    color: #949796;
+    color: #939695;
     text-shadow: none;
     icon-shadow: none; }
   GtkComboBox:backdrop:insensitive {
@@ -1561,10 +1522,10 @@ GtkComboBox {
   border-style: solid;
   border-color: #1c1f1f;
   background-color: #303535;
-  box-shadow: inset 0 2px 3px -1px #242828, 0 1px rgba(238, 238, 236, 0.1); }
+  box-shadow: inset 0 2px 3px -1px #242727, 0 1px rgba(238, 238, 236, 0.1); }
   .inline-toolbar:backdrop, .search-bar:backdrop, .location-bar:backdrop {
-    border-color: #1f2222;
-    background-color: #303535;
+    border-color: #1e2222;
+    background-color: #2f3434;
     box-shadow: none; }
 
 /***************
@@ -1579,10 +1540,10 @@ GtkComboBox {
   border-radius: 7px 7px 0 0;
   background-color: transparent;
   background-image: linear-gradient(to bottom, #434a4a, #393f3f);
-  box-shadow: inset 0 -1px #2e3232, inset 0 1px rgba(238, 238, 236, 0.1); }
+  box-shadow: inset 0 -1px #2d3232, inset 0 1px rgba(238, 238, 236, 0.1); }
   .titlebar:backdrop,
   .header-bar:backdrop {
-    border-color: #1f2222;
+    border-color: #1e2222;
     background-color: #393f3f;
     background-image: none;
     box-shadow: inset 0 1px rgba(238, 238, 236, 0.1); }
@@ -1606,18 +1567,18 @@ GtkComboBox {
     .titlebar .header-bar-separator:backdrop, .titlebar > GtkBox > .separator.vertical:backdrop,
     .header-bar .header-bar-separator:backdrop,
     .header-bar > GtkBox > .separator.vertical:backdrop {
-      border-image: linear-gradient(to bottom, rgba(31, 34, 34, 0.5)) 0 1/1px 1px; }
+      border-image: linear-gradient(to bottom, rgba(30, 34, 34, 0.5)) 0 1/1px 1px; }
   .titlebar.selection-mode,
   .header-bar.selection-mode {
     color: #ffffff;
     text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
     border-color: #0f2b48;
     background-image: linear-gradient(to bottom, #256ab1, #215d9c);
-    box-shadow: inset 0 -1px #1b4c7f, inset 0 1px rgba(43, 100, 160, 0.55); }
+    box-shadow: inset 0 -1px #1a4b7e, inset 0 1px rgba(43, 100, 160, 0.55); }
     .titlebar.selection-mode:backdrop,
     .header-bar.selection-mode:backdrop {
       background-image: linear-gradient(to bottom, #215d9c);
-      box-shadow: inset 0 1px rgba(48, 104, 162, 0.46); }
+      box-shadow: inset 0 1px rgba(48, 103, 161, 0.46); }
     .titlebar.selection-mode .button,
     .header-bar.selection-mode .button {
       color: #ffffff;
@@ -1663,7 +1624,7 @@ GtkComboBox {
       .header-bar.selection-mode .button.flat:backdrop,
       .header-bar.selection-mode .sidebar-button.button:backdrop,
       .header-bar.selection-mode .titlebutton.button:backdrop {
-        color: #d3dfeb;
+        color: #d2deeb;
         border-color: #0b1e33;
         background-image: linear-gradient(to bottom, #215d9c);
         text-shadow: none;
@@ -1682,7 +1643,7 @@ GtkComboBox {
         .header-bar.selection-mode .button.flat:backdrop:checked,
         .header-bar.selection-mode .sidebar-button.button:backdrop:checked,
         .header-bar.selection-mode .titlebutton.button:backdrop:checked {
-          color: #d1dae3;
+          color: #d0d9e2;
           border-color: #0b1e33;
           background-image: linear-gradient(to bottom, #184472);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0);
@@ -1693,9 +1654,9 @@ GtkComboBox {
         .header-bar.selection-mode .button.flat:backdrop:insensitive,
         .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive,
         .header-bar.selection-mode .titlebutton.button:backdrop:insensitive {
-          color: #6f91b4;
+          color: #6f90b2;
           border-color: #0b1e33;
-          background-image: linear-gradient(to bottom, #22558b);
+          background-image: linear-gradient(to bottom, #22558a);
           text-shadow: none;
           icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0);
@@ -1720,9 +1681,9 @@ GtkComboBox {
         .header-bar.selection-mode .button.flat:backdrop:insensitive:checked,
         .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive:checked,
         .header-bar.selection-mode .titlebutton.button:backdrop:insensitive:checked {
-          color: #6c88a7;
+          color: #6c88a5;
           border-color: #0b1e33;
-          background-image: linear-gradient(to bottom, #1d4877);
+          background-image: linear-gradient(to bottom, #1d4876);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0);
           border-color: #0f2b48; }
           .titlebar.selection-mode .button:backdrop:insensitive:active > .label, .titlebar.selection-mode 
.header-bar .button.titlebutton:backdrop:insensitive:active > .label, .titlebar.selection-mode 
.button:backdrop:insensitive:checked > .label, .titlebar.selection-mode .header-bar 
.button.titlebutton:backdrop:insensitive:checked > .label, .titlebar.selection-mode 
.button.flat:backdrop:insensitive:active > .label, .titlebar.selection-mode 
.sidebar-button.button:backdrop:insensitive:active > .label, .titlebar.selection-mode .header-bar 
.titlebutton.button:backdrop:insensitive:active > .label,
@@ -1762,9 +1723,9 @@ GtkComboBox {
         icon-shadow: none; }
       .titlebar.selection-mode .button:insensitive,
       .header-bar.selection-mode .button:insensitive {
-        color: #91aac5;
+        color: #90aac4;
         border-color: #0b1e33;
-        background-image: linear-gradient(to bottom, #22558b);
+        background-image: linear-gradient(to bottom, #22558a);
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0.55); }
@@ -1775,9 +1736,9 @@ GtkComboBox {
         .titlebar.selection-mode .button:insensitive:active, .titlebar.selection-mode 
.button:insensitive:checked,
         .header-bar.selection-mode .button:insensitive:active,
         .header-bar.selection-mode .button:insensitive:checked {
-          color: #a5b6c9;
+          color: #a4b5c8;
           border-color: #0b1e33;
-          background-image: linear-gradient(to bottom, #1b4470, #1d4877);
+          background-image: linear-gradient(to bottom, #1b436f, #1d4876);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0.55); }
           .titlebar.selection-mode .button:insensitive:active > .label, .titlebar.selection-mode .header-bar 
.button.titlebutton:insensitive:active > .label, .titlebar.selection-mode .button:insensitive:checked > 
.label, .titlebar.selection-mode .header-bar .button.titlebutton:insensitive:checked > .label,
           .header-bar.selection-mode .button:insensitive:active > .label,
@@ -1817,9 +1778,9 @@ GtkComboBox {
           border-color: #0f2b48; }
         .titlebar.selection-mode .button.suggested-action:insensitive,
         .header-bar.selection-mode .button.suggested-action:insensitive {
-          color: #949796;
+          color: #939695;
           border-color: #1c1f1f;
-          background-image: linear-gradient(to bottom, #333636);
+          background-image: linear-gradient(to bottom, #323636);
           text-shadow: none;
           icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0.55);
@@ -1830,8 +1791,8 @@ GtkComboBox {
             color: inherit; }
         .titlebar.selection-mode .button.suggested-action:backdrop,
         .header-bar.selection-mode .button.suggested-action:backdrop {
-          color: #949796;
-          border-color: #1f2222;
+          color: #939695;
+          border-color: #1e2222;
           background-image: linear-gradient(to bottom, #393f3f);
           text-shadow: none;
           icon-shadow: none;
@@ -1840,8 +1801,8 @@ GtkComboBox {
         .titlebar.selection-mode .button.suggested-action:backdrop:insensitive,
         .header-bar.selection-mode .button.suggested-action:backdrop:insensitive {
           color: #5d6767;
-          border-color: #1f2222;
-          background-image: linear-gradient(to bottom, #333636);
+          border-color: #1e2222;
+          background-image: linear-gradient(to bottom, #323636);
           text-shadow: none;
           icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0);
@@ -1913,33 +1874,33 @@ GtkTreeView.view {
   -GtkTreeView-tree-line-width: 1;
   -GtkTreeView-tree-line-pattern: '';
   -GtkTreeView-expander-size: 16;
-  border-left-color: #8c8c8b;
+  border-left-color: #8b8b8a;
   border-top-color: #393f3f; }
   GtkTreeView.view:selected {
     border-radius: 0; }
   GtkTreeView.view:selected, GtkTreeView.view:backdrop:selected {
-    border-left-color: #90aece;
+    border-left-color: #90aecd;
     border-top-color: rgba(238, 238, 236, 0.1); }
   GtkTreeView.view:insensitive {
-    color: #949796; }
+    color: #939695; }
     GtkTreeView.view:insensitive:selected {
-      color: #7a9ec4; }
+      color: #799dc3; }
       GtkTreeView.view:insensitive:selected:backdrop {
-        color: #648eba; }
+        color: #638db9; }
     GtkTreeView.view:insensitive:backdrop {
       color: #5d6767; }
   GtkTreeView.view.separator:backdrop {
     color: rgba(0, 0, 0, 0.1); }
   GtkTreeView.view:backdrop {
-    border-left-color: #676b6b;
+    border-left-color: #666a6a;
     border-top: #393f3f; }
   GtkTreeView.view.dnd {
     border-style: solid none;
     border-width: 1px;
-    border-color: #88a6c4; }
+    border-color: #87a5c4; }
   GtkTreeView.view.expander {
     -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
-    color: #b3b3b2; }
+    color: #b2b2b1; }
     GtkTreeView.view.expander:dir(rtl) {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
     GtkTreeView.view.expander:hover {
@@ -1953,7 +1914,7 @@ GtkTreeView.view {
     GtkTreeView.view.expander:checked {
       -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
     GtkTreeView.view.expander:backdrop {
-      color: #757776; }
+      color: #747675; }
   GtkTreeView.view.progressbar {
     border: 1px solid #0f2b48;
     border-radius: 4px;
@@ -1978,7 +1939,7 @@ GtkTreeView.view {
 column-header .button, column-header .header-bar .button.titlebutton, .header-bar column-header 
.button.titlebutton,
 column-header .titlebar .button.titlebutton,
 .titlebar column-header .button.titlebutton {
-  color: #8c8c8b;
+  color: #8b8b8a;
   background-color: #292929;
   font-weight: bold;
   text-shadow: none;
@@ -1986,7 +1947,7 @@ column-header .titlebar .button.titlebutton,
   column-header .button:hover, column-header .header-bar .button.titlebutton:hover, .header-bar 
column-header .button.titlebutton:hover,
   column-header .titlebar .button.titlebutton:hover,
   .titlebar column-header .button.titlebutton:hover {
-    color: #bdbdbc;
+    color: #bcbcbb;
     box-shadow: none;
     transition: none; }
   column-header .button:active, column-header .header-bar .button.titlebutton:active, .header-bar 
column-header .button.titlebutton:active,
@@ -2027,7 +1988,7 @@ column-header .titlebar .button.titlebutton,
   .titlebar column-header .button.titlebutton:backdrop {
     border-color: #393f3f;
     border-style: none solid solid none;
-    color: #676b6b;
+    color: #666a6a;
     background-image: none;
     background-color: #2c2c2c; }
     column-header .button:backdrop:insensitive {
@@ -2049,7 +2010,7 @@ column-header .titlebar .button.titlebutton,
       box-shadow: inset 0 -3px #215d9c;
       color: #4a90d9; }
     .menubar > .menuitem:insensitive {
-      color: #949796;
+      color: #939695;
       box-shadow: none; }
 
 .menu {
@@ -2066,11 +2027,11 @@ column-header .titlebar .button.titlebutton,
       color: #ffffff;
       background-color: #215d9c; }
     .menu .menuitem:insensitive {
-      color: #949796; }
+      color: #939695; }
       .menu .menuitem:insensitive:backdrop {
         color: #5d6767; }
     .menu .menuitem:backdrop, .menu .menuitem:backdrop:hover {
-      color: #949796;
+      color: #939695;
       background-color: #2c2c2c; }
     .menu .menuitem.arrow {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
@@ -2081,11 +2042,11 @@ column-header .titlebar .button.titlebutton,
     border-style: none;
     border-radius: 0; }
     .menu.button.top {
-      border-bottom: 1px solid #3d3d3d; }
+      border-bottom: 1px solid #3c3c3c; }
     .menu.button.bottom {
-      border-top: 1px solid #3d3d3d; }
+      border-top: 1px solid #3c3c3c; }
     .menu.button:hover {
-      background-color: #3d3d3d; }
+      background-color: #3c3c3c; }
     .menu.button:insensitive {
       color: transparent;
       background-color: transparent;
@@ -2153,7 +2114,7 @@ column-header .titlebar .button.titlebutton,
     .notebook.frame.left {
       border-left-width: 0; }
     .notebook.frame:backdrop {
-      border-color: #1f2222; }
+      border-color: #1e2222; }
   .notebook.header {
     background-color: #303535; }
     .notebook.header.frame {
@@ -2167,25 +2128,25 @@ column-header .titlebar .button.titlebutton,
       .notebook.header.frame.left {
         border-right-width: 0; }
       .notebook.header.frame:backdrop {
-        border-color: #1f2222; }
+        border-color: #1e2222; }
     .notebook.header.top {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 -1px #1c1f1f; }
       .notebook.header.top:backdrop {
-        box-shadow: inset 0 -1px #1f2222; }
+        box-shadow: inset 0 -1px #1e2222; }
     .notebook.header.bottom {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 1px #1c1f1f; }
       .notebook.header.bottom:backdrop {
-        box-shadow: inset 0 1px #1f2222; }
+        box-shadow: inset 0 1px #1e2222; }
     .notebook.header.right {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 1px 0 #1c1f1f; }
       .notebook.header.right:backdrop {
-        box-shadow: inset 1px 0 #1f2222; }
+        box-shadow: inset 1px 0 #1e2222; }
     .notebook.header.left {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset -1px 0 #1c1f1f; }
       .notebook.header.left:backdrop {
-        box-shadow: inset -1px 0 #1f2222; }
+        box-shadow: inset -1px 0 #1e2222; }
     .notebook.header:backdrop {
-      background-color: #303535;
+      background-color: #2f3434;
       box-shadow: none; }
   .notebook tab {
     border-width: 0;
@@ -2262,7 +2223,7 @@ column-header .titlebar .button.titlebutton,
         .notebook tab.reorderable-page.top:active:hover, .notebook 
tab.reorderable-page.top.active-page:hover {
           background-color: rgba(57, 63, 63, 0.7); }
         .notebook tab.reorderable-page.top:active:backdrop, .notebook 
tab.reorderable-page.top.active-page:backdrop {
-          border-color: #1f2222;
+          border-color: #1e2222;
           background-color: #393f3f;
           border-bottom-color: #215d9c; }
       .notebook tab.reorderable-page.top:backdrop {
@@ -2281,7 +2242,7 @@ column-header .titlebar .button.titlebutton,
         .notebook tab.reorderable-page.bottom:active:hover, .notebook 
tab.reorderable-page.bottom.active-page:hover {
           background-color: rgba(57, 63, 63, 0.7); }
         .notebook tab.reorderable-page.bottom:active:backdrop, .notebook 
tab.reorderable-page.bottom.active-page:backdrop {
-          border-color: #1f2222;
+          border-color: #1e2222;
           background-color: #393f3f;
           border-top-color: #215d9c; }
       .notebook tab.reorderable-page.bottom:backdrop {
@@ -2300,7 +2261,7 @@ column-header .titlebar .button.titlebutton,
         .notebook tab.reorderable-page.left:active:hover, .notebook 
tab.reorderable-page.left.active-page:hover {
           background-color: rgba(57, 63, 63, 0.7); }
         .notebook tab.reorderable-page.left:active:backdrop, .notebook 
tab.reorderable-page.left.active-page:backdrop {
-          border-color: #1f2222;
+          border-color: #1e2222;
           background-color: #393f3f;
           border-right-color: #215d9c; }
       .notebook tab.reorderable-page.left:backdrop {
@@ -2319,7 +2280,7 @@ column-header .titlebar .button.titlebutton,
         .notebook tab.reorderable-page.right:active:hover, .notebook 
tab.reorderable-page.right.active-page:hover {
           background-color: rgba(57, 63, 63, 0.7); }
         .notebook tab.reorderable-page.right:active:backdrop, .notebook 
tab.reorderable-page.right.active-page:backdrop {
-          border-color: #1f2222;
+          border-color: #1e2222;
           background-color: #393f3f;
           border-left-color: #215d9c; }
       .notebook tab.reorderable-page.right:backdrop {
@@ -2328,17 +2289,17 @@ column-header .titlebar .button.titlebutton,
     .notebook tab .label {
       padding: 0 2px;
       font-weight: bold;
-      color: #949796; }
+      color: #939695; }
       .notebook tab .label:backdrop, .notebook tab .label.prelight-page:backdrop {
-        color: #797f7f; }
+        color: #787e7e; }
     .notebook tab .prelight-page .label, .notebook tab .label.prelight-page {
-      color: #c1c3c1; }
+      color: #c0c2c0; }
       .notebook tab .prelight-page .label:backdrop, .notebook tab .label.prelight-page:backdrop {
-        color: #797f7f; }
+        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: #949796; }
+        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 {
@@ -2367,22 +2328,22 @@ column-header .titlebar .button.titlebutton,
         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(148, 151, 150, 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,
       .titlebar .notebook tab .button.titlebutton > GtkImage {
         padding: 2px; }
   .notebook.arrow {
-    color: #949796; }
+    color: #939695; }
     .notebook.arrow:hover {
-      color: #c1c3c1; }
+      color: #c0c2c0; }
     .notebook.arrow:active {
       color: #eeeeec; }
     .notebook.arrow:insensitive {
-      color: rgba(148, 151, 150, 0.3); }
+      color: rgba(147, 150, 149, 0.3); }
     .notebook.arrow:backdrop {
-      color: rgba(148, 151, 150, 0.4); }
+      color: rgba(147, 150, 149, 0.4); }
       .notebook.arrow:backdrop:insensitive {
         color: #5d6767; }
 
@@ -2425,15 +2386,15 @@ column-header .titlebar .button.titlebutton,
     border: 1px none #1c1f1f; }
     .scrollbar .trough:backdrop {
       background-color: #323737;
-      border-color: #1f2222; }
+      border-color: #1e2222; }
   .scrollbar .slider {
-    background-color: #a6a8a7; }
+    background-color: #a5a8a6; }
     .scrollbar .slider:hover {
-      background-color: #cacbc9; }
+      background-color: #c9cbc9; }
     .scrollbar .slider:prelight:active {
       background-color: #2a76c6; }
     .scrollbar .slider:backdrop {
-      background-color: #5d6262; }
+      background-color: #5d6161; }
     .scrollbar .slider:insensitive {
       background-color: transparent; }
   .scrollbar .slider {
@@ -2473,7 +2434,7 @@ column-header .titlebar .button.titlebutton,
     border-image-slice: 0 1 0 0; }
   .scrollbars-junction:backdrop,
   .scrollbars-junction.frame:backdrop {
-    border-image-source: linear-gradient(to bottom, #1f2222 1px, transparent 1px);
+    border-image-source: linear-gradient(to bottom, #1e2222 1px, transparent 1px);
     background-color: #323737; }
 
 /**********
@@ -2499,16 +2460,16 @@ GtkSwitch {
       box-shadow: 0 1px rgba(238, 238, 236, 0.1);
       text-shadow: 0 1px rgba(15, 43, 72, 0.5), 0 0 2px rgba(255, 255, 255, 0.6); }
     GtkSwitch.trough:insensitive {
-      color: #949796;
+      color: #939695;
       border-color: #1c1f1f;
       background-image: none;
-      background-color: #333636;
+      background-color: #323636;
       box-shadow: 0 1px rgba(238, 238, 236, 0.1);
       text-shadow: none; }
     GtkSwitch.trough:backdrop {
-      color: #949796;
-      border-color: #1f2222;
-      background-image: linear-gradient(to bottom, #303535);
+      color: #939695;
+      border-color: #1e2222;
+      background-image: linear-gradient(to bottom, #2f3434);
       box-shadow: none;
       text-shadow: none; }
       GtkSwitch.trough:backdrop:active {
@@ -2517,9 +2478,9 @@ GtkSwitch {
         box-shadow: none; }
       GtkSwitch.trough:backdrop:insensitive {
         color: #5d6767;
-        border-color: #1f2222;
+        border-color: #1e2222;
         background-image: none;
-        background-color: #333636; }
+        background-color: #323636; }
   GtkSwitch.slider {
     border: 1px solid;
     border-radius: 3px;
@@ -2530,7 +2491,7 @@ GtkSwitch {
     text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px rgba(57, 63, 63, 0.6), inset 0 -1px 
#2b2f2f; }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px rgba(57, 63, 63, 0.6), inset 0 -1px 
#2a2f2f; }
     GtkSwitch.slider:hover {
       color: #eeeeec;
       outline-color: rgba(238, 238, 236, 0.3);
@@ -2539,21 +2500,21 @@ GtkSwitch {
       text-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px rgba(57, 63, 63, 0.6), inset 0 -1px 
#2b2f2f; }
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px rgba(57, 63, 63, 0.6), inset 0 -1px 
#2a2f2f; }
     GtkSwitch.slider:active {
       border: 1px solid #0f2b48; }
     GtkSwitch.slider:insensitive {
-      color: #949796;
+      color: #939695;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #333636);
+      background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       GtkSwitch.slider:insensitive > .label {
         color: inherit; }
     GtkSwitch.slider:backdrop {
-      color: #949796;
-      border-color: #1f2222;
+      color: #939695;
+      border-color: #1e2222;
       background-image: linear-gradient(to bottom, #393f3f);
       text-shadow: none;
       icon-shadow: none;
@@ -2563,8 +2524,8 @@ GtkSwitch {
         border-color: #0f2b48; }
       GtkSwitch.slider:backdrop:insensitive {
         color: #5d6767;
-        border-color: #1f2222;
-        background-image: linear-gradient(to bottom, #333636);
+        border-color: #1e2222;
+        background-image: linear-gradient(to bottom, #323636);
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
@@ -2703,7 +2664,7 @@ GtkSwitch {
 
 .menu .menuitem.check {
   -gtk-icon-source: -gtk-icontheme("checkbox-symbolic");
-  color: #a6a8a7;
+  color: #a5a8a6;
   icon-shadow: none; }
   .menu .menuitem.check:active, .menu .menuitem.check:checked {
     -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); }
@@ -2712,7 +2673,7 @@ GtkSwitch {
   .menu .menuitem.check:hover {
     color: #ffffff; }
   .menu .menuitem.check:insensitive {
-    color: #676b6b; }
+    color: #666a6a; }
 
 .radio {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark 2 
png"));
@@ -2842,7 +2803,7 @@ GtkSwitch {
 
 .menu .menuitem.radio {
   -gtk-icon-source: -gtk-icontheme("radio-symbolic");
-  color: #a6a8a7;
+  color: #a5a8a6;
   icon-shadow: none; }
   .menu .menuitem.radio:active, .menu .menuitem.radio:checked {
     -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); }
@@ -2851,7 +2812,7 @@ GtkSwitch {
   .menu .menuitem.radio:hover {
     color: #ffffff; }
   .menu .menuitem.radio:insensitive {
-    color: #676b6b; }
+    color: #666a6a; }
 
 .view.check, .view.radio,
 .list-row .check, list-row .radio {
@@ -2910,7 +2871,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   padding: 1px 2px 4px;
   outline-offset: 0; }
   GtkCheckButton.text-button:insensitive, GtkCheckButton.text-button:insensitive:active, 
GtkCheckButton.text-button:insensitive:inconsistent, GtkRadioButton.text-button:insensitive, 
GtkRadioButton.text-button:insensitive:active, GtkRadioButton.text-button:insensitive:inconsistent {
-    color: #949796; }
+    color: #939695; }
     GtkCheckButton.text-button:insensitive:backdrop, GtkCheckButton.text-button:insensitive:active:backdrop, 
GtkCheckButton.text-button:insensitive:inconsistent:backdrop, 
GtkRadioButton.text-button:insensitive:backdrop, GtkRadioButton.text-button:insensitive:active:backdrop, 
GtkRadioButton.text-button:insensitive:inconsistent:backdrop {
       color: #5d6767; }
 
@@ -2948,7 +2909,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     border: 1px solid;
     border-radius: 50%;
     border-color: #151717;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px #393f3f, inset 0 -1px #2b2f2f; }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px #393f3f, inset 0 -1px #2a2f2f; }
     .scale.slider:hover,
     .scale.scale-has-marks-above.scale-has-marks-below.slider:hover,
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:hover {
@@ -2967,22 +2928,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:insensitive {
       border-style: solid;
       border-radius: 50%;
-      background-image: linear-gradient(to bottom, #333636);
+      background-image: linear-gradient(to bottom, #323636);
       box-shadow: none; }
     .scale.slider:backdrop,
     .scale.scale-has-marks-above.scale-has-marks-below.slider:backdrop,
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:backdrop {
       border-style: solid;
       border-radius: 50%;
-      border-color: #181a1a;
+      border-color: #171a1a;
       background-image: linear-gradient(to bottom, #393f3f);
       box-shadow: none; }
     .scale.slider:backdrop:insensitive,
     .scale.scale-has-marks-above.scale-has-marks-below.slider:backdrop:insensitive,
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:backdrop:insensitive {
       color: #5d6767;
-      border-color: #1f2222;
-      background-image: linear-gradient(to bottom, #333636);
+      border-color: #1e2222;
+      background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
@@ -3069,21 +3030,21 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.vertical:insensitive {
       border-color: #1c1f1f;
       background-image: none;
-      background-color: #333636;
+      background-color: #323636;
       box-shadow: 0 1px rgba(238, 238, 236, 0.1); }
     .scale.trough:backdrop,
     .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: #1f2222;
-      background-color: #2b2f2f;
+      border-color: #1e2222;
+      background-color: #2a2f2f;
       box-shadow: none; }
     .scale.trough:backdrop:insensitive, .scale.trough .highlight:backdrop:insensitive,
     .scale.scale-has-marks-above.scale-has-marks-below.trough:backdrop:insensitive,
     .scale.scale-has-marks-above.scale-has-marks-below.trough .highlight: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 .highlight:backdrop:insensitive {
-      border-color: #1f2222;
-      background-color: #333636; }
+      border-color: #1e2222;
+      background-color: #323636; }
     .osd .scale.trough, .osd
     .scale.scale-has-marks-above.scale-has-marks-below.trough, .osd
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough {
@@ -3368,10 +3329,10 @@ GtkProgressBar {
   GtkProgressBar.trough {
     border: 1px solid #1c1f1f;
     border-radius: 3px;
-    background-color: #2f3434; }
+    background-color: #2e3333; }
     GtkProgressBar.trough:backdrop {
-      border-color: #1f2222;
-      background-color: #303535;
+      border-color: #1e2222;
+      background-color: #2f3434;
       box-shadow: 0 1px rgba(255, 255, 255, 0); }
     GtkProgressBar.trough.osd {
       border-style: none;
@@ -3426,15 +3387,15 @@ GtkProgressBar {
     padding: 2px;
     border-radius: 3px;
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
     color: white;
     border-color: #1c1f1f;
     box-shadow: inset 0 0 0 1px rgba(33, 93, 156, 0), 0 1px rgba(238, 238, 236, 0.1); }
     .level-bar.trough:backdrop {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
-      color: #d5d5d5;
-      border-color: #1f2222;
+      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+      color: #d4d4d4;
+      border-color: #1e2222;
       background-image: linear-gradient(to bottom, #2c2c2c);
       box-shadow: 0 1px rgba(238, 238, 236, 0); }
   .level-bar.fill-block {
@@ -3464,7 +3425,7 @@ GtkProgressBar {
       border-color: rgba(238, 238, 236, 0.1);
       box-shadow: none; }
       .level-bar.fill-block.empty-fill-block:backdrop {
-        border-color: rgba(148, 151, 150, 0.15); }
+        border-color: rgba(147, 150, 149, 0.15); }
 
 /**********
  * Frames *
@@ -3475,7 +3436,7 @@ GtkProgressBar {
   .frame.flat {
     border-style: none; }
   .frame:backdrop {
-    border-color: #1f2222; }
+    border-color: #1e2222; }
   .frame.action-bar {
     padding: 6px;
     border-width: 1px 0 0; }
@@ -3496,14 +3457,14 @@ GtkScrolledWindow GtkViewport.frame {
   border-color: #1c1f1f; }
   .list:backdrop, .list-row:backdrop {
     background-color: #2c2c2c;
-    border-color: #1f2222; }
+    border-color: #1e2222; }
 
 .list-row,
 .grid-child {
   padding: 2px; }
 
 .list-row.activatable:hover {
-  background-color: #333333; }
+  background-color: #323232; }
 .list-row.activatable:active {
   box-shadow: inset 0 2px 2px -2px rgba(0, 0, 0, 0.2); }
 .list-row.activatable:backdrop:hover {
@@ -3511,7 +3472,7 @@ GtkScrolledWindow GtkViewport.frame {
 .list-row.activatable:selected:active {
   box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); }
 .list-row.activatable:selected:hover {
-  background-color: #366ca4; }
+  background-color: #356ba4; }
 .list-row.activatable:selected:backdrop {
   background-color: #215d9c; }
 
@@ -3552,8 +3513,8 @@ GtkScrolledWindow GtkViewport.frame {
   .list-row:selected .button:backdrop, .list-row:selected .button.flat:backdrop, .list-row:selected 
.sidebar-button.button:backdrop, .list-row:selected .header-bar .titlebutton.button:backdrop, .header-bar 
.list-row:selected .titlebutton.button:backdrop,
   .list-row:selected .titlebar .titlebutton.button:backdrop,
   .titlebar .list-row:selected .titlebutton.button:backdrop {
-    color: #949796;
-    border-color: #1f2222;
+    color: #939695;
+    border-color: #1e2222;
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     icon-shadow: none;
@@ -3563,16 +3524,16 @@ GtkScrolledWindow GtkViewport.frame {
     .titlebar .list-row:selected .titlebutton.button:backdrop:active, .list-row:selected 
.button.flat:backdrop:checked, .list-row:selected .sidebar-button.button:backdrop:checked, .list-row:selected 
.header-bar .titlebutton.button:backdrop:checked, .header-bar .list-row:selected 
.titlebutton.button:backdrop:checked,
     .list-row:selected .titlebar .titlebutton.button:backdrop:checked,
     .titlebar .list-row:selected .titlebutton.button:backdrop:checked {
-      color: #949796;
-      border-color: #1f2222;
-      background-image: linear-gradient(to bottom, #303535);
+      color: #939695;
+      border-color: #1e2222;
+      background-image: linear-gradient(to bottom, #2f3434);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     .list-row:selected .button:backdrop:insensitive, .list-row:selected .button.flat:backdrop:insensitive, 
.list-row:selected .sidebar-button.button:backdrop:insensitive, .list-row:selected .header-bar 
.titlebutton.button:backdrop:insensitive, .header-bar .list-row:selected 
.titlebutton.button:backdrop:insensitive,
     .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive,
     .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive {
       color: #5d6767;
-      border-color: #1f2222;
-      background-image: linear-gradient(to bottom, #333636);
+      border-color: #1e2222;
+      background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -3587,8 +3548,8 @@ GtkScrolledWindow GtkViewport.frame {
       .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive:checked,
       .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:checked {
         color: #5d6767;
-        border-color: #1f2222;
-        background-image: linear-gradient(to bottom, #272929);
+        border-color: #1e2222;
+        background-image: linear-gradient(to bottom, #262929);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
         .list-row:selected .button:backdrop:insensitive:active > .label, .list-row:selected .header-bar 
.button.titlebutton:backdrop:insensitive:active > .label,
         .list-row:selected .titlebar .button.titlebutton:backdrop:insensitive:active > .label, 
.list-row:selected .button:backdrop:insensitive:checked > .label, .list-row:selected .header-bar 
.button.titlebutton:backdrop:insensitive:checked > .label,
@@ -3607,11 +3568,11 @@ GtkScrolledWindow GtkViewport.frame {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
     text-shadow: none;
     icon-shadow: none;
-    color: #949796; }
+    color: #939695; }
   .list-row:selected .button:insensitive {
-    color: #949796;
+    color: #939695;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #333636);
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -3619,9 +3580,9 @@ GtkScrolledWindow GtkViewport.frame {
     .list-row:selected .titlebar .button.titlebutton:insensitive > .label {
       color: inherit; }
     .list-row:selected .button:insensitive:active, .list-row:selected .button:insensitive:checked {
-      color: #949796;
+      color: #939695;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #313434, #333636);
+      background-image: linear-gradient(to bottom, #2f3333, #323636);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       .list-row:selected .button:insensitive:active > .label, .list-row:selected .header-bar 
.button.titlebutton:insensitive:active > .label,
       .list-row:selected .titlebar .button.titlebutton:insensitive:active > .label, .list-row:selected 
.button:insensitive:checked > .label, .list-row:selected .header-bar .button.titlebutton:insensitive:checked 
.label,
@@ -3696,9 +3657,9 @@ GtkScrolledWindow GtkViewport.frame {
     .app-notification .button:insensitive, .app-notification .button:backdrop:insensitive,
     .app-notification.frame .button:insensitive,
     .app-notification.frame .button:backdrop:insensitive {
-      color: #878a89;
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -3744,18 +3705,18 @@ GtkCalendar {
       color: #eeeeec; }
     GtkCalendar.button:backdrop, .header-bar GtkCalendar.button.titlebutton:backdrop,
     .titlebar GtkCalendar.button.titlebutton:backdrop {
-      color: rgba(148, 151, 150, 0.45); }
+      color: rgba(147, 150, 149, 0.45); }
     GtkCalendar.button:insensitive, .header-bar GtkCalendar.button.titlebutton:insensitive,
     .titlebar GtkCalendar.button.titlebutton:insensitive {
-      color: rgba(148, 151, 150, 0.45); }
+      color: rgba(147, 150, 149, 0.45); }
   GtkCalendar:inconsistent, GtkCalendar:inconsistent:backdrop {
     color: alpha(currentColor,0.55); }
   GtkCalendar.highlight, GtkCalendar.highlight:backdrop {
     font-size: smaller;
     color: #eeeeec; }
   GtkCalendar:backdrop {
-    color: #d5d5d5;
-    border-color: #1f2222; }
+    color: #d4d4d4;
+    border-color: #1e2222; }
 
 /***********
  * Dialogs *
@@ -3796,9 +3757,9 @@ GtkCalendar {
     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); }
   .message-dialog.csd .dialog-action-area .button:insensitive {
-    color: #949796;
+    color: #939695;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #333636);
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -3806,16 +3767,16 @@ GtkCalendar {
     .message-dialog.csd .dialog-action-area .titlebar .button.titlebutton:insensitive > .label {
       color: inherit; }
   .message-dialog.csd .dialog-action-area .button:backdrop {
-    color: #949796;
-    border-color: #1f2222;
+    color: #939695;
+    border-color: #1e2222;
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   .message-dialog.csd .dialog-action-area .button:backdrop:insensitive {
     color: #5d6767;
-    border-color: #1f2222;
-    background-image: linear-gradient(to bottom, #333636);
+    border-color: #1e2222;
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -3847,7 +3808,7 @@ GtkCalendar {
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
       box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
     .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop {
-      color: #d3dfeb;
+      color: #d2deeb;
       border-color: #0b1e33;
       background-image: linear-gradient(to bottom, #215d9c);
       text-shadow: none;
@@ -3855,8 +3816,8 @@ GtkCalendar {
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive {
         color: #5d6767;
-        border-color: #1f2222;
-        background-image: linear-gradient(to bottom, #333636);
+        border-color: #1e2222;
+        background-image: linear-gradient(to bottom, #323636);
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -3864,9 +3825,9 @@ GtkCalendar {
         .message-dialog.csd .dialog-action-area .titlebar 
.suggested-action.button.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
     .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive {
-      color: #949796;
+      color: #939695;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #333636);
+      background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -3898,7 +3859,7 @@ GtkCalendar {
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.72078);
       box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
     .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop {
-      color: #f7cfcf;
+      color: #f6cfcf;
       border-color: #5e0707;
       background-image: linear-gradient(to bottom, #d51010);
       text-shadow: none;
@@ -3906,8 +3867,8 @@ GtkCalendar {
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive {
         color: #5d6767;
-        border-color: #1f2222;
-        background-image: linear-gradient(to bottom, #333636);
+        border-color: #1e2222;
+        background-image: linear-gradient(to bottom, #323636);
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -3915,9 +3876,9 @@ GtkCalendar {
         .message-dialog.csd .dialog-action-area .titlebar 
.destructive-action.button.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
     .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive {
-      color: #949796;
+      color: #939695;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #333636);
+      background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -3946,7 +3907,7 @@ GtkFileChooserDialog .search-bar {
 GtkFileChooserDialog .dialog-action-box {
   border-top: 1px solid #1c1f1f; }
   GtkFileChooserDialog .dialog-action-box:backdrop {
-    border-top-color: #1f2222; }
+    border-top-color: #1e2222; }
 
 /***********
  * Sidebar *
@@ -3977,7 +3938,7 @@ GtkPlacesSidebar.sidebar .sidebar-placeholder-row {
 GtkPlacesSidebar.sidebar .sidebar-new-bookmark-row {
   background-color: #262a2a; }
 .list-row.button:hover {
-  background-color: #4b5150; }
+  background-color: #4b5050; }
 .sidebar-button.button, .header-bar .sidebar-button.button.titlebutton,
 .titlebar .sidebar-button.button.titlebutton {
   border-radius: 100%;
@@ -4019,7 +3980,7 @@ GtkPaned {
   GtkPaned .pane-separator {
     background-color: #1c1f1f; }
     GtkPaned .pane-separator:backdrop {
-      background-color: #1f2222; }
+      background-color: #1e2222; }
 
 GtkPaned.wide {
   -GtkPaned-handle-size: 5;
@@ -4032,7 +3993,7 @@ GtkPaned.wide {
   GtkPaned.wide.vertical .pane-separator {
     border-style: solid none; }
   GtkPaned.wide .pane-separator:backdrop {
-    border-color: #1f2222; }
+    border-color: #1e2222; }
 
 /**************
  * GtkInfoBar *
@@ -4099,9 +4060,9 @@ GtkInfoBar {
     .question .button:insensitive,
     .warning .button:insensitive,
     .error .button:insensitive {
-      color: #91aac5;
+      color: #90aac4;
       border-color: #0b1e33;
-      background-image: linear-gradient(to bottom, #22558b);
+      background-image: linear-gradient(to bottom, #22558a);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -4121,7 +4082,7 @@ GtkInfoBar {
     .question .button:backdrop,
     .warning .button:backdrop,
     .error .button:backdrop {
-      color: #d3dfeb;
+      color: #d2deeb;
       border-color: #0b1e33;
       background-image: linear-gradient(to bottom, #215d9c);
       text-shadow: none;
@@ -4132,9 +4093,9 @@ GtkInfoBar {
       .question .button:backdrop:insensitive,
       .warning .button:backdrop:insensitive,
       .error .button:backdrop:insensitive {
-        color: #6f91b4;
+        color: #6f90b2;
         border-color: #0b1e33;
-        background-image: linear-gradient(to bottom, #22558b);
+        background-image: linear-gradient(to bottom, #22558a);
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
@@ -4275,8 +4236,8 @@ 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: #949796;
-      border-color: #1f2222;
+      color: #939695;
+      border-color: #1e2222;
       background-image: linear-gradient(to bottom, #393f3f);
       text-shadow: none;
       icon-shadow: none;
@@ -4336,7 +4297,7 @@ GtkColorSwatch {
     border-radius: 0;
     margin: 4px;
     background-color: #393f3f;
-    border: solid 1px #1f2222;
+    border: solid 1px #1e2222;
     box-shadow: none; }
 
 .header-bar .titlebutton.button,
@@ -4464,9 +4425,9 @@ GtkColorSwatch {
       icon-shadow: none;
       outline-color: rgba(238, 238, 236, 0.3); }
     .touch-selection .button:insensitive, .touch-selection .button:backdrop:insensitive {
-      color: #878a89;
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -4567,7 +4528,7 @@ GtkColorSwatch {
   border: none;
   box-shadow: none; }
   .overshoot.top:backdrop {
-    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#1f2222), to(rgba(31, 34, 34, 
0)));
+    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#1e2222), to(rgba(30, 34, 34, 
0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center top;
@@ -4583,7 +4544,7 @@ GtkColorSwatch {
   border: none;
   box-shadow: none; }
   .overshoot.bottom:backdrop {
-    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#1f2222), to(rgba(31, 
34, 34, 0)));
+    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#1e2222), to(rgba(30, 
34, 34, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center bottom;
@@ -4599,7 +4560,7 @@ GtkColorSwatch {
   border: none;
   box-shadow: none; }
   .overshoot.left:backdrop {
-    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#1f2222), to(rgba(31, 34, 
34, 0)));
+    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#1e2222), to(rgba(30, 34, 
34, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: left center;
@@ -4615,7 +4576,7 @@ GtkColorSwatch {
   border: none;
   box-shadow: none; }
   .overshoot.right:backdrop {
-    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#1f2222), to(rgba(31, 34, 
34, 0)));
+    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#1e2222), to(rgba(30, 34, 
34, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: right center;
@@ -4679,16 +4640,16 @@ text/foreground color of selections */
 @define-color theme_selected_fg_color #ffffff;
 /*
 base background color of insensitive widgets */
- define-color insensitive_bg_color #333636;
+ define-color insensitive_bg_color #323636;
 /*
 text foreground color of insensitive widgets */
- define-color insensitive_fg_color #949796;
+ define-color insensitive_fg_color #939695;
 /*
 insensitive text widgets and the like base background color */
 @define-color insensitive_base_color #292929;
 /*
 widget text/foreground color on backdrop windows */
- define-color theme_unfocused_fg_color #949796;
+ define-color theme_unfocused_fg_color #939695;
 /*
 text color for entries, views and content in general on backdrop windows */
 @define-color theme_unfocused_text_color white;
@@ -4709,7 +4670,7 @@ widgets main borders color */
 @define-color borders #1c1f1f;
 /*
 widgets main borders color on backdrop windows */
- define-color unfocused_borders #1f2222;
+ define-color unfocused_borders #1e2222;
 /*
 these are pretty self explicative */
 @define-color warning_color #f57900;
@@ -4719,7 +4680,7 @@ these are pretty self explicative */
 these colors are exported for the window manager and shouldn't be used in applications,
 read if you used those and something break with a version upgrade you're on your own... */
 @define-color wm_title shade(#eeeeec, 1.8);
- define-color wm_unfocused_title #949796;
+ define-color wm_unfocused_title #939695;
 @define-color wm_highlight transparent;
 @define-color wm_borders_edge rgba(238, 238, 236, 0.1);
 @define-color wm_bg_a shade(#393f3f, 1.2);
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index ee9aeb7..49c6974 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -36,7 +36,7 @@
   .background:backdrop {
     text-shadow: none;
     icon-shadow: none;
-    color: #8e9192;
+    color: #8d9091;
     background-color: #ededed; }
 
 /*
@@ -55,11 +55,11 @@
     background-color: white;
     color: #2e3436; }
   .gtkstyle-fallback:active {
-    background-color: #d4d4d4;
+    background-color: lightgray;
     color: #2e3436; }
   .gtkstyle-fallback:insensitive {
     background-color: #f4f4f4;
-    color: #8e9192; }
+    color: #8d9091; }
   .gtkstyle-fallback:selected {
     background-color: #4a90d9;
     color: #ffffff; }
@@ -68,7 +68,7 @@
   color: black;
   background-color: #ffffff; }
   .view:backdrop {
-    color: #333333;
+    color: #323232;
     background-color: white; }
   .view:selected, GtkCalendar:selected {
     border-radius: 3px; }
@@ -80,9 +80,9 @@
 .label.separator {
   color: #2e3436; }
   .label.separator:backdrop {
-    color: #8e9192; }
+    color: #8d9091; }
 .label:insensitive {
-  color: #8e9192; }
+  color: #8d9091; }
   .label:insensitive:backdrop {
     color: #c7c7c7; }
 
@@ -100,13 +100,13 @@ GtkAssistant .sidebar {
     border-left: 1px solid #a1a1a1; }
   GtkAssistant .sidebar:backdrop {
     background-color: white;
-    border-color: darkgray; }
+    border-color: #a8a8a8; }
 GtkAssistant.csd .sidebar {
   border-top-style: none; }
 GtkAssistant .sidebar .label {
   padding: 6px 12px; }
 GtkAssistant .sidebar .label.highlight {
-  background-color: #c7c8c8; }
+  background-color: #c6c8c8; }
 
 GtkTextView {
   background-color: #f6f6f6; }
@@ -183,22 +183,22 @@ GtkTextView {
   .entry:insensitive {
     background-color: transparent;
     background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
-    color: #8e9192;
+    color: #8d9091;
     border-color: #a1a1a1;
     background-image: linear-gradient(to bottom, #f4f4f4);
     box-shadow: 0 1px white; }
   .entry:backdrop {
     background-color: transparent;
     background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
-    color: #333333;
-    border-color: darkgray;
+    color: #323232;
+    border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, white);
     box-shadow: 0 1px rgba(255, 255, 255, 0); }
   .entry:backdrop:insensitive {
     background-color: transparent;
     background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
     color: #c7c7c7;
-    border-color: darkgray;
+    border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #f4f4f4);
     box-shadow: 0 1px rgba(255, 255, 255, 0); }
   .entry.progressbar {
@@ -235,13 +235,13 @@ GtkTextView {
     .entry.warning:selected, .entry.warning:selected:focus {
       background-color: #f57900; }
   .entry.image {
-    color: #585d5e; }
+    color: #575c5e; }
     .entry.image:hover {
       color: #2e3436; }
     .entry.image:active {
       color: #4a90d9; }
     .entry.image:backdrop {
-      color: #a5a7a8; }
+      color: #a3a6a7; }
   .osd .entry {
     background-color: transparent;
     background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
@@ -275,9 +275,9 @@ GtkTextView {
     .osd .entry:insensitive {
       background-color: transparent;
       background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
-      color: #878a89;
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -288,10 +288,10 @@ GtkTextView {
 .linked.vertical > .entry:focus:not(:last-child) {
   box-shadow: inset 0 0 0 1px #4a90d9; }
 .linked.vertical > .entry:not(:insensitive) + .entry:not(:insensitive) {
-  border-top-color: #e3e3e3;
+  border-top-color: #e2e2e2;
   background-image: linear-gradient(to bottom, #ffffff); }
   .linked.vertical > .entry:not(:insensitive) + .entry:not(:insensitive):backdrop {
-    border-top-color: #e5e5e5;
+    border-top-color: #e4e4e4;
     background-image: linear-gradient(to bottom, white); }
 .linked.vertical > .entry + .entry:focus:not(:last-child) {
   border-top-color: #4a90d9;
@@ -365,8 +365,8 @@ GtkTextView {
   .button:backdrop, .header-bar .button.titlebutton:backdrop,
   .titlebar .button.titlebutton:backdrop, .button.flat:backdrop, .sidebar-button.button:backdrop, 
.header-bar .titlebutton.button:backdrop,
   .titlebar .titlebutton.button:backdrop {
-    color: #8e9192;
-    border-color: darkgray;
+    color: #8d9091;
+    border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #ededed);
     text-shadow: none;
     icon-shadow: none;
@@ -375,14 +375,14 @@ GtkTextView {
     .button:backdrop:active, .button:backdrop:checked, .button.flat:backdrop:active, 
.sidebar-button.button:backdrop:active, .header-bar .titlebutton.button:backdrop:active,
     .titlebar .titlebutton.button:backdrop:active, .button.flat:backdrop:checked, 
.sidebar-button.button:backdrop:checked, .header-bar .titlebutton.button:backdrop:checked,
     .titlebar .titlebutton.button:backdrop:checked {
-      color: #8e9192;
-      border-color: darkgray;
-      background-image: linear-gradient(to bottom, #d5d5d5);
+      color: #8d9091;
+      border-color: #a8a8a8;
+      background-image: linear-gradient(to bottom, #d4d4d4);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
     .button:backdrop:insensitive, .button.flat:backdrop:insensitive, 
.sidebar-button.button:backdrop:insensitive, .header-bar .titlebutton.button:backdrop:insensitive,
     .titlebar .titlebutton.button:backdrop:insensitive {
       color: #c7c7c7;
-      border-color: darkgray;
+      border-color: #a8a8a8;
       background-image: linear-gradient(to bottom, #f4f4f4);
       text-shadow: none;
       icon-shadow: none;
@@ -395,7 +395,7 @@ GtkTextView {
     .titlebar .titlebutton.button:backdrop:insensitive:active, .button.flat:backdrop:insensitive:checked, 
.sidebar-button.button:backdrop:insensitive:checked, .header-bar 
.titlebutton.button:backdrop:insensitive:checked,
     .titlebar .titlebutton.button:backdrop:insensitive:checked {
       color: #c7c7c7;
-      border-color: darkgray;
+      border-color: #a8a8a8;
       background-image: linear-gradient(to bottom, #e7e7e7);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
       .button:backdrop:insensitive:active > .label, .header-bar 
.button.titlebutton:backdrop:insensitive:active > .label,
@@ -416,7 +416,7 @@ GtkTextView {
     icon-shadow: none; }
   .button:insensitive, .header-bar .button.titlebutton:insensitive,
   .titlebar .button.titlebutton:insensitive {
-    color: #8e9192;
+    color: #8d9091;
     border-color: #a1a1a1;
     background-image: linear-gradient(to bottom, #f4f4f4);
     text-shadow: none;
@@ -426,9 +426,9 @@ GtkTextView {
     .titlebar .button.titlebutton:insensitive > .label {
       color: inherit; }
     .button:insensitive:active, .button:insensitive:checked {
-      color: #8e9192;
+      color: #8d9091;
       border-color: #a1a1a1;
-      background-image: linear-gradient(to bottom, #ececec, #f4f4f4);
+      background-image: linear-gradient(to bottom, #ebebeb, #f4f4f4);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
       .button:insensitive:active > .label, .header-bar .button.titlebutton:insensitive:active > .label,
       .titlebar .button.titlebutton:insensitive:active > .label, .button:insensitive:checked > .label, 
.header-bar .button.titlebutton:insensitive:checked > .label,
@@ -476,9 +476,9 @@ GtkTextView {
       border: none;
       box-shadow: none; }
     .button.osd:insensitive, .button.osd:backdrop:insensitive {
-      color: #878a89;
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -539,9 +539,9 @@ GtkTextView {
       icon-shadow: none;
       outline-color: rgba(238, 238, 236, 0.3); }
     .osd .button:insensitive, .osd .button:backdrop:insensitive {
-      color: #878a89;
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -583,9 +583,9 @@ GtkTextView {
       .osd .button.flat:insensitive, .osd .sidebar-button.button:insensitive, .osd .header-bar 
.titlebutton.button:insensitive, .header-bar .osd .titlebutton.button:insensitive,
       .osd .titlebar .titlebutton.button:insensitive,
       .titlebar .osd .titlebutton.button:insensitive {
-        color: #878a89;
+        color: #878989;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -654,7 +654,7 @@ GtkTextView {
       box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px white; }
     .button.suggested-action:backdrop, .button.suggested-action.flat:backdrop, 
.suggested-action.sidebar-button.button:backdrop, .header-bar .suggested-action.titlebutton.button:backdrop,
     .titlebar .suggested-action.titlebutton.button:backdrop {
-      color: #dbe9f7;
+      color: #dae8f7;
       border-color: #4a90d9;
       background-image: linear-gradient(to bottom, #4a90d9);
       text-shadow: none;
@@ -663,14 +663,14 @@ GtkTextView {
       .button.suggested-action:backdrop:active, .button.suggested-action:backdrop:checked, 
.button.suggested-action.flat:backdrop:active, .suggested-action.sidebar-button.button:backdrop:active, 
.header-bar .suggested-action.titlebutton.button:backdrop:active,
       .titlebar .suggested-action.titlebutton.button:backdrop:active, 
.button.suggested-action.flat:backdrop:checked, .suggested-action.sidebar-button.button:backdrop:checked, 
.header-bar .suggested-action.titlebutton.button:backdrop:checked,
       .titlebar .suggested-action.titlebutton.button:backdrop:checked {
-        color: #d4e4f4;
+        color: #d4e3f3;
         border-color: #2a76c6;
         background-image: linear-gradient(to bottom, #2a76c6);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
       .button.suggested-action:backdrop:insensitive, .button.suggested-action.flat:backdrop:insensitive, 
.suggested-action.sidebar-button.button:backdrop:insensitive, .header-bar 
.suggested-action.titlebutton.button:backdrop:insensitive,
       .titlebar .suggested-action.titlebutton.button:backdrop:insensitive {
         color: #c7c7c7;
-        border-color: darkgray;
+        border-color: #a8a8a8;
         background-image: linear-gradient(to bottom, #f4f4f4);
         text-shadow: none;
         icon-shadow: none;
@@ -682,9 +682,9 @@ GtkTextView {
         .button.suggested-action:backdrop:insensitive:active, 
.button.suggested-action:backdrop:insensitive:checked, 
.button.suggested-action.flat:backdrop:insensitive:active, 
.suggested-action.sidebar-button.button:backdrop:insensitive:active, .header-bar 
.suggested-action.titlebutton.button:backdrop:insensitive:active,
         .titlebar .suggested-action.titlebutton.button:backdrop:insensitive:active, 
.button.suggested-action.flat:backdrop:insensitive:checked, 
.suggested-action.sidebar-button.button:backdrop:insensitive:checked, .header-bar 
.suggested-action.titlebutton.button:backdrop:insensitive:checked,
         .titlebar .suggested-action.titlebutton.button:backdrop:insensitive:checked {
-          color: #8db9e8;
-          border-color: #5094db;
-          background-image: linear-gradient(to bottom, #5094db);
+          color: #8db8e6;
+          border-color: #5093da;
+          background-image: linear-gradient(to bottom, #5093da);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
           .button.suggested-action:backdrop:insensitive:active > .label, .header-bar 
.suggested-action.button.titlebutton:backdrop:insensitive:active > .label,
           .titlebar .suggested-action.button.titlebutton:backdrop:insensitive:active > .label, 
.button.suggested-action:backdrop:insensitive:checked > .label, .header-bar 
.suggested-action.button.titlebutton:backdrop:insensitive:checked > .label,
@@ -704,7 +704,7 @@ GtkTextView {
       icon-shadow: none;
       color: rgba(74, 144, 217, 0.8); }
     .button.suggested-action:insensitive {
-      color: #8e9192;
+      color: #8d9091;
       border-color: #a1a1a1;
       background-image: linear-gradient(to bottom, #f4f4f4);
       text-shadow: none;
@@ -714,9 +714,9 @@ GtkTextView {
       .titlebar .suggested-action.button.titlebutton:insensitive > .label {
         color: inherit; }
       .button.suggested-action:insensitive:active, .button.suggested-action:insensitive:checked {
-        color: #b9d4f1;
+        color: #b9d3f0;
         border-color: #1c5187;
-        background-image: linear-gradient(to bottom, #4b8dd3, #5094db);
+        background-image: linear-gradient(to bottom, #4a8cd1, #5093da);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
         .button.suggested-action:insensitive:active > .label, .header-bar 
.suggested-action.button.titlebutton:insensitive:active > .label,
         .titlebar .suggested-action.button.titlebutton:insensitive:active > .label, 
.button.suggested-action:insensitive:checked > .label, .header-bar 
.suggested-action.button.titlebutton:insensitive:checked > .label,
@@ -750,9 +750,9 @@ GtkTextView {
         icon-shadow: none;
         outline-color: rgba(238, 238, 236, 0.3); }
       .osd .button.suggested-action:insensitive, .osd .button.suggested-action:backdrop:insensitive {
-        color: #878a89;
+        color: #878989;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -801,7 +801,7 @@ GtkTextView {
       box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px white; }
     .button.destructive-action:backdrop, .button.destructive-action.flat:backdrop, 
.destructive-action.sidebar-button.button:backdrop, .header-bar 
.destructive-action.titlebutton.button:backdrop,
     .titlebar .destructive-action.titlebutton.button:backdrop {
-      color: #fcd4d4;
+      color: #fbd4d4;
       border-color: #ef2929;
       background-image: linear-gradient(to bottom, #ef2929);
       text-shadow: none;
@@ -810,14 +810,14 @@ GtkTextView {
       .button.destructive-action:backdrop:active, .button.destructive-action:backdrop:checked, 
.button.destructive-action.flat:backdrop:active, .destructive-action.sidebar-button.button:backdrop:active, 
.header-bar .destructive-action.titlebutton.button:backdrop:active,
       .titlebar .destructive-action.titlebutton.button:backdrop:active, 
.button.destructive-action.flat:backdrop:checked, .destructive-action.sidebar-button.button:backdrop:checked, 
.header-bar .destructive-action.titlebutton.button:backdrop:checked,
       .titlebar .destructive-action.titlebutton.button:backdrop:checked {
-        color: #f7cfcf;
+        color: #f6cfcf;
         border-color: #d51010;
         background-image: linear-gradient(to bottom, #d51010);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
       .button.destructive-action:backdrop:insensitive, .button.destructive-action.flat:backdrop:insensitive, 
.destructive-action.sidebar-button.button:backdrop:insensitive, .header-bar 
.destructive-action.titlebutton.button:backdrop:insensitive,
       .titlebar .destructive-action.titlebutton.button:backdrop:insensitive {
         color: #c7c7c7;
-        border-color: darkgray;
+        border-color: #a8a8a8;
         background-image: linear-gradient(to bottom, #f4f4f4);
         text-shadow: none;
         icon-shadow: none;
@@ -829,7 +829,7 @@ GtkTextView {
         .button.destructive-action:backdrop:insensitive:active, 
.button.destructive-action:backdrop:insensitive:checked, 
.button.destructive-action.flat:backdrop:insensitive:active, 
.destructive-action.sidebar-button.button:backdrop:insensitive:active, .header-bar 
.destructive-action.titlebutton.button:backdrop:insensitive:active,
         .titlebar .destructive-action.titlebutton.button:backdrop:insensitive:active, 
.button.destructive-action.flat:backdrop:insensitive:checked, 
.destructive-action.sidebar-button.button:backdrop:insensitive:checked, .header-bar 
.destructive-action.titlebutton.button:backdrop:insensitive:checked,
         .titlebar .destructive-action.titlebutton.button:backdrop:insensitive:checked {
-          color: #f57979;
+          color: #f47979;
           border-color: #ef3131;
           background-image: linear-gradient(to bottom, #ef3131);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
@@ -851,7 +851,7 @@ GtkTextView {
       icon-shadow: none;
       color: rgba(239, 41, 41, 0.8); }
     .button.destructive-action:insensitive {
-      color: #8e9192;
+      color: #8d9091;
       border-color: #a1a1a1;
       background-image: linear-gradient(to bottom, #f4f4f4);
       text-shadow: none;
@@ -861,7 +861,7 @@ GtkTextView {
       .titlebar .destructive-action.button.titlebutton:insensitive > .label {
         color: inherit; }
       .button.destructive-action:insensitive:active, .button.destructive-action:insensitive:checked {
-        color: #f9adad;
+        color: #f8acac;
         border-color: #8e0b0b;
         background-image: linear-gradient(to bottom, #e52d2d, #ef3131);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
@@ -897,9 +897,9 @@ GtkTextView {
         icon-shadow: none;
         outline-color: rgba(238, 238, 236, 0.3); }
       .osd .button.destructive-action:insensitive, .osd .button.destructive-action:backdrop:insensitive {
-        color: #878a89;
+        color: #878989;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -1007,11 +1007,7 @@ GtkTextView {
     box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px white; }
   .inline-toolbar GtkToolButton > .button:insensitive, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:insensitive,
   .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:insensitive {
-<<<<<<< HEAD
-    color: #8e9192;
-=======
     color: #8d9091;
->>>>>>> Adwaita, HighContrast: day names in GtkCalendar
     border-color: #a1a1a1;
     background-image: linear-gradient(to bottom, #f4f4f4);
     text-shadow: none;
@@ -1022,25 +1018,16 @@ GtkTextView {
   .inline-toolbar GtkToolButton > .button:insensitive:active, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:insensitive:active,
   .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:insensitive:active, .inline-toolbar 
GtkToolButton > .button:insensitive:checked, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:insensitive:checked,
   .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:insensitive:checked {
-<<<<<<< HEAD
-    color: #8e9192;
-=======
     color: #8d9091;
->>>>>>> Adwaita, HighContrast: day names in GtkCalendar
     border-color: #a1a1a1;
-    background-image: linear-gradient(to bottom, #ececec, #f4f4f4);
+    background-image: linear-gradient(to bottom, #ebebeb, #f4f4f4);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
     .inline-toolbar GtkToolButton > .button:insensitive:active > .label, .inline-toolbar GtkToolButton > 
.button:insensitive:checked > .label {
       color: inherit; }
   .inline-toolbar GtkToolButton > .button:backdrop, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:backdrop,
   .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop {
-<<<<<<< HEAD
-    color: #8e9192;
-    border-color: darkgray;
-=======
     color: #8d9091;
     border-color: #a8a8a8;
->>>>>>> Adwaita, HighContrast: day names in GtkCalendar
     background-image: linear-gradient(to bottom, #ededed);
     text-shadow: none;
     icon-shadow: none;
@@ -1048,20 +1035,14 @@ GtkTextView {
   .inline-toolbar GtkToolButton > .button:backdrop:active, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:backdrop:active,
   .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop:active, .inline-toolbar 
GtkToolButton > .button:backdrop:checked, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:backdrop:checked,
   .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop:checked {
-<<<<<<< HEAD
-    color: #8e9192;
-    border-color: darkgray;
-    background-image: linear-gradient(to bottom, #d5d5d5);
-=======
     color: #8d9091;
     border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #d4d4d4);
->>>>>>> Adwaita, HighContrast: day names in GtkCalendar
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
   .inline-toolbar GtkToolButton > .button:backdrop:insensitive, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:backdrop:insensitive,
   .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop:insensitive {
     color: #c7c7c7;
-    border-color: darkgray;
+    border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #f4f4f4);
     text-shadow: none;
     icon-shadow: none;
@@ -1072,7 +1053,7 @@ GtkTextView {
   .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop:insensitive:active, .inline-toolbar 
GtkToolButton > .button:backdrop:insensitive:checked, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:backdrop:insensitive:checked,
   .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop:insensitive:checked {
     color: #c7c7c7;
-    border-color: darkgray;
+    border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #e7e7e7);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
     .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active > .label, .inline-toolbar 
GtkToolButton > .button:backdrop:insensitive:checked > .label {
@@ -1161,18 +1142,12 @@ GtkTextView {
   border-style: solid; }
 
 .linked.vertical > .entry, .linked.vertical > .button, .header-bar .linked.vertical > .button.titlebutton,
-<<<<<<< HEAD
 .titlebar .linked.vertical > .button.titlebutton, .linked.vertical > .button:hover, .linked.vertical > 
.button:active, .linked.vertical > .button:checked, .linked.vertical > .button:backdrop, .linked.vertical > 
GtkComboBoxText > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox > .the-button-in-the-combobox {
-=======
-.titlebar .linked.vertical > .button.titlebutton, .linked.vertical > .button:hover, .linked.vertical > 
.button:active, .linked.vertical > .button:checked, .linked.vertical > .button:backdrop, .linked.vertical > 
GtkComboBoxText > .button,
-.linked.vertical > GtkComboBox > .button {
->>>>>>> Adwaita, HighContrast: day names in GtkCalendar
   border-style: solid solid none solid;
   border-radius: 0; }
 
 .linked.vertical > .entry:first-child, .linked.vertical > .button:first-child, .header-bar .linked.vertical 
.button.titlebutton:first-child,
-<<<<<<< HEAD
 .titlebar .linked.vertical > .button.titlebutton:first-child, .linked.vertical > GtkComboBoxText:first-child 
.the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox {
   border-top-left-radius: 3px;
@@ -1180,26 +1155,12 @@ GtkTextView {
 .linked.vertical > .entry:last-child, .linked.vertical > .button:last-child, .header-bar .linked.vertical > 
.button.titlebutton:last-child,
 .titlebar .linked.vertical > .button.titlebutton:last-child, .linked.vertical > GtkComboBoxText:last-child > 
.the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox {
-=======
-.titlebar .linked.vertical > .button.titlebutton:first-child, .linked.vertical > GtkComboBoxText:first-child 
.button,
-.linked.vertical > GtkComboBox:first-child > .button {
-  border-top-left-radius: 3px;
-  border-top-right-radius: 3px; }
-.linked.vertical > .entry:last-child, .linked.vertical > .button:last-child, .header-bar .linked.vertical > 
.button.titlebutton:last-child,
-.titlebar .linked.vertical > .button.titlebutton:last-child, .linked.vertical > GtkComboBoxText:last-child > 
.button,
-.linked.vertical > GtkComboBox:last-child > .button {
->>>>>>> Adwaita, HighContrast: day names in GtkCalendar
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border-style: solid; }
 .linked.vertical > .entry:only-child, .linked.vertical > .button:only-child, .header-bar .linked.vertical > 
.button.titlebutton:only-child,
-<<<<<<< HEAD
 .titlebar .linked.vertical > .button.titlebutton:only-child, .linked.vertical > GtkComboBoxText:only-child > 
.the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox {
-=======
-.titlebar .linked.vertical > .button.titlebutton:only-child, .linked.vertical > GtkComboBoxText:only-child > 
.button,
-.linked.vertical > GtkComboBox:only-child > .button {
->>>>>>> Adwaita, HighContrast: day names in GtkCalendar
   border-radius: 3px;
   border-style: solid; }
 
@@ -1245,7 +1206,7 @@ GtkTextView {
   outline-offset: -1px; }
   .menuitem.button.flat:hover, .menuitem.sidebar-button.button:hover, .header-bar 
.menuitem.titlebutton.button:hover,
   .titlebar .menuitem.titlebutton.button:hover {
-    background-color: #dadbdb; }
+    background-color: #d9dada; }
 
 GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton,
 .titlebar GtkColorButton.button.titlebutton {
@@ -1267,21 +1228,21 @@ GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton,
   .titlebar .button.titlebutton:visited {
     color: #215d9c; }
     *:selected *:link:visited, *:selected .button:visited {
-      color: #b7d3f0; }
+      color: #b6d2ef; }
   *:link:hover, .button:hover:link, .button:hover:visited {
     color: #4a90d9; }
     *:selected *:link:hover, *:selected .button:hover:link, *:selected .button:hover:visited {
-      color: #edf4fb; }
+      color: #ecf3fb; }
   *:link:active, .button:active:link, .button:active:visited {
     color: #2a76c6; }
     *:selected *:link:active, *:selected .button:active:link, *:selected .button:active:visited {
-      color: #dbe9f7; }
+      color: #dae8f7; }
   *:link:backdrop, .button:backdrop:link, .button:backdrop:visited, *:link:backdrop:hover, 
.button:backdrop:hover:link, .button:backdrop:hover:visited, *:link:backdrop:hover:selected, 
.button:backdrop:hover:selected:link, .button:backdrop:hover:selected:visited, .titlebar.selection-mode 
.subtitle:backdrop:hover:link,
   .header-bar.selection-mode .subtitle:backdrop:hover:link {
     color: #4a90d9; }
   *:link:selected, .button:selected:link, .button:selected:visited, .titlebar.selection-mode .subtitle:link,
   .header-bar.selection-mode .subtitle:link, *:selected *:link, *:selected .button:link, *:selected 
.button:visited {
-    color: #dbe9f7; }
+    color: #dae8f7; }
 
 .button:link, .header-bar .button.titlebutton:link,
 .titlebar .button.titlebutton:link, .button:visited, .header-bar .button.titlebutton:visited,
@@ -1303,7 +1264,7 @@ GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton,
   background-image: none;
   border-style: none none none solid;
   border-color: rgba(161, 161, 161, 0.3);
-  color: #43484a;
+  color: #42484a;
   border-radius: 0;
   box-shadow: none; }
   .spinbutton .button:dir(rtl) {
@@ -1312,13 +1273,13 @@ GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton,
     color: #2e3436;
     background-color: rgba(46, 52, 54, 0.05); }
   .spinbutton .button:insensitive {
-    color: rgba(142, 145, 146, 0.3); }
+    color: rgba(141, 144, 145, 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 {
-    color: #999c9d;
-    border-color: rgba(169, 169, 169, 0.3);
+    color: #989b9c;
+    border-color: rgba(168, 168, 168, 0.3);
     background-color: transparent; }
   .spinbutton .button:backdrop:insensitive {
     background-image: none;
@@ -1371,7 +1332,7 @@ GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton,
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     icon-shadow: none;
-    color: #878a89;
+    color: #878989;
     border-color: rgba(0, 0, 0, 0.5);
     icon-shadow: none;
     box-shadow: none; }
@@ -1407,7 +1368,7 @@ GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton,
       icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
       box-shadow: inset 0 1px white; }
     .spinbutton.vertical .button:first-child:insensitive, .spinbutton.vertical:dir(rtl) 
.button:first-child:insensitive {
-      color: #8e9192;
+      color: #8d9091;
       border-color: #a1a1a1;
       background-image: linear-gradient(to bottom, #f4f4f4);
       text-shadow: none;
@@ -1418,8 +1379,8 @@ GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton,
       .spinbutton.vertical:dir(rtl) .titlebar .button.titlebutton:first-child:insensitive > .label {
         color: inherit; }
     .spinbutton.vertical .button:first-child:backdrop, .spinbutton.vertical:dir(rtl) 
.button:first-child:backdrop {
-      color: #8e9192;
-      border-color: darkgray;
+      color: #8d9091;
+      border-color: #a8a8a8;
       background-image: linear-gradient(to bottom, #ededed);
       text-shadow: none;
       icon-shadow: none;
@@ -1449,7 +1410,7 @@ GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton,
       icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
       box-shadow: inset 0 1px white, 0 1px white; }
     .spinbutton.vertical .button:last-child:insensitive, .spinbutton.vertical:dir(rtl) 
.button:last-child:insensitive {
-      color: #8e9192;
+      color: #8d9091;
       border-color: #a1a1a1;
       background-image: linear-gradient(to bottom, #f4f4f4);
       text-shadow: none;
@@ -1460,15 +1421,15 @@ GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton,
       .spinbutton.vertical:dir(rtl) .titlebar .button.titlebutton:last-child:insensitive > .label {
         color: inherit; }
     .spinbutton.vertical .button:last-child:backdrop, .spinbutton.vertical:dir(rtl) 
.button:last-child:backdrop {
-      color: #8e9192;
-      border-color: darkgray;
+      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); }
   .spinbutton.vertical .button:backdrop:insensitive, .spinbutton.vertical:dir(rtl) 
.button:backdrop:insensitive {
     color: #c7c7c7;
-    border-color: darkgray;
+    border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #f4f4f4);
     text-shadow: none;
     icon-shadow: none;
@@ -1507,11 +1468,11 @@ GtkComboBox {
     padding-top: 3px;
     padding-bottom: 4px; }
   GtkComboBox:insensitive {
-    color: #8e9192;
+    color: #8d9091;
     text-shadow: none;
     icon-shadow: none; }
   GtkComboBox:backdrop {
-    color: #8e9192;
+    color: #8d9091;
     text-shadow: none;
     icon-shadow: none; }
   GtkComboBox:backdrop:insensitive {
@@ -1563,8 +1524,8 @@ GtkComboBox {
   background-color: #d6d6d6;
   box-shadow: inset 0 2px 3px -1px #b6b6b6, 0 1px white; }
   .inline-toolbar:backdrop, .search-bar:backdrop, .location-bar:backdrop {
-    border-color: darkgray;
-    background-color: #d5d5d5;
+    border-color: #a8a8a8;
+    background-color: #d4d4d4;
     box-shadow: none; }
 
 /***************
@@ -1579,10 +1540,10 @@ GtkComboBox {
   border-radius: 7px 7px 0 0;
   background-color: transparent;
   background-image: linear-gradient(to bottom, #f7f7f7, #ededed);
-  box-shadow: inset 0 -1px #dadada, inset 0 1px white; }
+  box-shadow: inset 0 -1px #d9d9d9, inset 0 1px white; }
   .titlebar:backdrop,
   .header-bar:backdrop {
-    border-color: darkgray;
+    border-color: #a8a8a8;
     background-color: #ededed;
     background-image: none;
     box-shadow: inset 0 1px white; }
@@ -1606,18 +1567,18 @@ GtkComboBox {
     .titlebar .header-bar-separator:backdrop, .titlebar > GtkBox > .separator.vertical:backdrop,
     .header-bar .header-bar-separator:backdrop,
     .header-bar > GtkBox > .separator.vertical:backdrop {
-      border-image: linear-gradient(to bottom, rgba(169, 169, 169, 0.5)) 0 1/1px 1px; }
+      border-image: linear-gradient(to bottom, rgba(168, 168, 168, 0.5)) 0 1/1px 1px; }
   .titlebar.selection-mode,
   .header-bar.selection-mode {
     color: #ffffff;
     text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
     border-color: #184472;
     background-image: linear-gradient(to bottom, #5f9ddd, #4a90d9);
-    box-shadow: inset 0 -1px #3975b5, inset 0 1px #a5c8ec; }
+    box-shadow: inset 0 -1px #3875b4, inset 0 1px #a4c7ec; }
     .titlebar.selection-mode:backdrop,
     .header-bar.selection-mode:backdrop {
       background-image: linear-gradient(to bottom, #4a90d9);
-      box-shadow: inset 0 1px #b7d3f0; }
+      box-shadow: inset 0 1px #b6d2ef; }
     .titlebar.selection-mode .button,
     .header-bar.selection-mode .button {
       color: #ffffff;
@@ -1626,7 +1587,7 @@ GtkComboBox {
       background-image: linear-gradient(to bottom, #5f9ddd, #4a90d9 40%, #3583d5);
       text-shadow: 0 -1px rgba(0, 0, 0, 0.54353);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.54353);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 1px #a5c8ec; }
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 1px #a4c7ec; }
       .titlebar.selection-mode .button.flat, .titlebar.selection-mode .sidebar-button.button,
       .titlebar.selection-mode .titlebutton.button,
       .header-bar.selection-mode .button.flat,
@@ -1646,7 +1607,7 @@ GtkComboBox {
         background-image: linear-gradient(to bottom, #85b4e5, #5b9add 40%, #4a90d9);
         text-shadow: 0 -1px rgba(0, 0, 0, 0.51153);
         icon-shadow: 0 -1px rgba(0, 0, 0, 0.51153);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 1px #a5c8ec; }
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 1px #a4c7ec; }
       .titlebar.selection-mode .button:active, .titlebar.selection-mode .button:checked,
       .header-bar.selection-mode .button:active,
       .header-bar.selection-mode .button:checked {
@@ -1656,19 +1617,19 @@ GtkComboBox {
         background-image: linear-gradient(to bottom, #2b79cb, #2e7fd3 40%, #3583d5);
         text-shadow: 0 -1px rgba(0, 0, 0, 0.62353);
         icon-shadow: 0 -1px rgba(0, 0, 0, 0.62353);
-        box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px #a5c8ec; 
}
+        box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px #a4c7ec; 
}
       .titlebar.selection-mode .button:backdrop, .titlebar.selection-mode .button.flat:backdrop, 
.titlebar.selection-mode .sidebar-button.button:backdrop,
       .titlebar.selection-mode .titlebutton.button:backdrop,
       .header-bar.selection-mode .button:backdrop,
       .header-bar.selection-mode .button.flat:backdrop,
       .header-bar.selection-mode .sidebar-button.button:backdrop,
       .header-bar.selection-mode .titlebutton.button:backdrop {
-        color: #dbe9f7;
+        color: #dae8f7;
         border-color: #4a90d9;
         background-image: linear-gradient(to bottom, #4a90d9);
         text-shadow: none;
         icon-shadow: none;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(165, 200, 236, 0);
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(164, 199, 236, 0);
         -gtk-image-effect: none;
         border-color: #184472; }
         .titlebar.selection-mode .button:backdrop:active, .titlebar.selection-mode .button:backdrop:checked, 
.titlebar.selection-mode .button.flat:backdrop:active, .titlebar.selection-mode 
.sidebar-button.button:backdrop:active,
@@ -1682,10 +1643,10 @@ GtkComboBox {
         .header-bar.selection-mode .button.flat:backdrop:checked,
         .header-bar.selection-mode .sidebar-button.button:backdrop:checked,
         .header-bar.selection-mode .titlebutton.button:backdrop:checked {
-          color: #d4e4f4;
+          color: #d4e3f3;
           border-color: #2a76c6;
           background-image: linear-gradient(to bottom, #2a76c6);
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(165, 200, 236, 0);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(164, 199, 236, 0);
           border-color: #184472; }
         .titlebar.selection-mode .button:backdrop:insensitive, .titlebar.selection-mode 
.button.flat:backdrop:insensitive, .titlebar.selection-mode .sidebar-button.button:backdrop:insensitive,
         .titlebar.selection-mode .titlebutton.button:backdrop:insensitive,
@@ -1693,12 +1654,12 @@ GtkComboBox {
         .header-bar.selection-mode .button.flat:backdrop:insensitive,
         .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive,
         .header-bar.selection-mode .titlebutton.button:backdrop:insensitive {
-          color: #9bc2ea;
-          border-color: #65a1df;
-          background-image: linear-gradient(to bottom, #65a1df);
+          color: #9ac1e9;
+          border-color: #65a0de;
+          background-image: linear-gradient(to bottom, #65a0de);
           text-shadow: none;
           icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(165, 200, 236, 0);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(164, 199, 236, 0);
           border-color: #184472; }
           .titlebar.selection-mode .button:backdrop:insensitive > .label, .titlebar.selection-mode 
.header-bar .button.titlebutton:backdrop:insensitive > .label, .titlebar.selection-mode 
.button.flat:backdrop:insensitive > .label, .titlebar.selection-mode 
.sidebar-button.button:backdrop:insensitive > .label, .titlebar.selection-mode .header-bar 
.titlebutton.button:backdrop:insensitive > .label,
           .titlebar.selection-mode .titlebutton.button:backdrop:insensitive > .label,
@@ -1720,10 +1681,10 @@ GtkComboBox {
         .header-bar.selection-mode .button.flat:backdrop:insensitive:checked,
         .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive:checked,
         .header-bar.selection-mode .titlebutton.button:backdrop:insensitive:checked {
-          color: #8db9e8;
-          border-color: #5094db;
-          background-image: linear-gradient(to bottom, #5094db);
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(165, 200, 236, 0);
+          color: #8db8e6;
+          border-color: #5093da;
+          background-image: linear-gradient(to bottom, #5093da);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(164, 199, 236, 0);
           border-color: #184472; }
           .titlebar.selection-mode .button:backdrop:insensitive:active > .label, .titlebar.selection-mode 
.header-bar .button.titlebutton:backdrop:insensitive:active > .label, .titlebar.selection-mode 
.button:backdrop:insensitive:checked > .label, .titlebar.selection-mode .header-bar 
.button.titlebutton:backdrop:insensitive:checked > .label, .titlebar.selection-mode 
.button.flat:backdrop:insensitive:active > .label, .titlebar.selection-mode 
.sidebar-button.button:backdrop:insensitive:active > .label, .titlebar.selection-mode .header-bar 
.titlebutton.button:backdrop:insensitive:active > .label,
           .titlebar.selection-mode .titlebutton.button:backdrop:insensitive:active > .label, 
.titlebar.selection-mode .button.flat:backdrop:insensitive:checked > .label, .titlebar.selection-mode 
.sidebar-button.button:backdrop:insensitive:checked > .label, .titlebar.selection-mode .header-bar 
.titlebutton.button:backdrop:insensitive:checked > .label,
@@ -1762,16 +1723,12 @@ GtkComboBox {
         icon-shadow: none; }
       .titlebar.selection-mode .button:insensitive,
       .header-bar.selection-mode .button:insensitive {
-        color: #b2d0ef;
+        color: #b2cfee;
         border-color: #1c5187;
-        background-image: linear-gradient(to bottom, #65a1df);
+        background-image: linear-gradient(to bottom, #65a0de);
         text-shadow: none;
         icon-shadow: none;
-<<<<<<< HEAD
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px #a5c8ec; }
-=======
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px #a4c7ec; }
->>>>>>> Adwaita, HighContrast: day names in GtkCalendar
         .titlebar.selection-mode .button:insensitive > .label, .titlebar.selection-mode .header-bar 
.button.titlebutton:insensitive > .label,
         .header-bar.selection-mode .button:insensitive > .label,
         .header-bar.selection-mode .titlebar .button.titlebutton:insensitive > .label {
@@ -1779,15 +1736,10 @@ GtkComboBox {
         .titlebar.selection-mode .button:insensitive:active, .titlebar.selection-mode 
.button:insensitive:checked,
         .header-bar.selection-mode .button:insensitive:active,
         .header-bar.selection-mode .button:insensitive:checked {
-          color: #b9d4f1;
+          color: #b9d3f0;
           border-color: #1c5187;
-<<<<<<< HEAD
-          background-image: linear-gradient(to bottom, #4b8dd3, #5094db);
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px #a5c8ec; }
-=======
           background-image: linear-gradient(to bottom, #4a8cd1, #5093da);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px #a4c7ec; }
->>>>>>> Adwaita, HighContrast: day names in GtkCalendar
           .titlebar.selection-mode .button:insensitive:active > .label, .titlebar.selection-mode .header-bar 
.button.titlebutton:insensitive:active > .label, .titlebar.selection-mode .button:insensitive:checked > 
.label, .titlebar.selection-mode .header-bar .button.titlebutton:insensitive:checked > .label,
           .header-bar.selection-mode .button:insensitive:active > .label,
           .header-bar.selection-mode .titlebar .button.titlebutton:insensitive:active > .label,
@@ -1802,7 +1754,7 @@ GtkComboBox {
         background-image: linear-gradient(to bottom, #fafafa, #ededed 40%, #e0e0e0);
         text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
         icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
-        box-shadow: inset 0 1px white, 0 1px #a5c8ec;
+        box-shadow: inset 0 1px white, 0 1px #a4c7ec;
         border-color: #184472; }
         .titlebar.selection-mode .button.suggested-action:hover,
         .header-bar.selection-mode .button.suggested-action:hover {
@@ -1812,7 +1764,7 @@ GtkComboBox {
           background-image: linear-gradient(to bottom, white, #f7f7f7 40%, #ededed);
           text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
           icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
-          box-shadow: inset 0 1px white, 0 1px #a5c8ec;
+          box-shadow: inset 0 1px white, 0 1px #a4c7ec;
           border-color: #184472; }
         .titlebar.selection-mode .button.suggested-action:active,
         .header-bar.selection-mode .button.suggested-action:active {
@@ -1822,16 +1774,16 @@ GtkComboBox {
           background-image: linear-gradient(to bottom, #d6d6d6, gainsboro 40%, #e0e0e0);
           text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
           icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
-          box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px 
#a5c8ec;
+          box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px 
#a4c7ec;
           border-color: #184472; }
         .titlebar.selection-mode .button.suggested-action:insensitive,
         .header-bar.selection-mode .button.suggested-action:insensitive {
-          color: #8e9192;
+          color: #8d9091;
           border-color: #a1a1a1;
           background-image: linear-gradient(to bottom, #f4f4f4);
           text-shadow: none;
           icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px #a5c8ec;
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px #a4c7ec;
           border-color: #184472; }
           .titlebar.selection-mode .button.suggested-action:insensitive > .label, .titlebar.selection-mode 
.header-bar .suggested-action.button.titlebutton:insensitive > .label,
           .header-bar.selection-mode .button.suggested-action:insensitive > .label,
@@ -1839,21 +1791,21 @@ GtkComboBox {
             color: inherit; }
         .titlebar.selection-mode .button.suggested-action:backdrop,
         .header-bar.selection-mode .button.suggested-action:backdrop {
-          color: #8e9192;
-          border-color: darkgray;
+          color: #8d9091;
+          border-color: #a8a8a8;
           background-image: linear-gradient(to bottom, #ededed);
           text-shadow: none;
           icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(165, 200, 236, 0);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(164, 199, 236, 0);
           border-color: #184472; }
         .titlebar.selection-mode .button.suggested-action:backdrop:insensitive,
         .header-bar.selection-mode .button.suggested-action:backdrop:insensitive {
           color: #c7c7c7;
-          border-color: darkgray;
+          border-color: #a8a8a8;
           background-image: linear-gradient(to bottom, #f4f4f4);
           text-shadow: none;
           icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(165, 200, 236, 0);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(164, 199, 236, 0);
           border-color: #184472; }
           .titlebar.selection-mode .button.suggested-action:backdrop:insensitive > .label, 
.titlebar.selection-mode .header-bar .suggested-action.button.titlebutton:backdrop:insensitive > .label,
           .header-bar.selection-mode .button.suggested-action:backdrop:insensitive > .label,
@@ -1922,15 +1874,15 @@ GtkTreeView.view {
   -GtkTreeView-tree-line-width: 1;
   -GtkTreeView-tree-line-pattern: '';
   -GtkTreeView-expander-size: 16;
-  border-left-color: #979a9b;
+  border-left-color: #96999a;
   border-top-color: #ededed; }
   GtkTreeView.view:selected {
     border-radius: 0; }
   GtkTreeView.view:selected, GtkTreeView.view:backdrop:selected {
-    border-left-color: #a5c8ec;
+    border-left-color: #a4c7ec;
     border-top-color: rgba(46, 52, 54, 0.1); }
   GtkTreeView.view:insensitive {
-    color: #8e9192; }
+    color: #8d9091; }
     GtkTreeView.view:insensitive:selected {
       color: #92bce8; }
       GtkTreeView.view:insensitive:selected:backdrop {
@@ -1940,29 +1892,29 @@ GtkTreeView.view {
   GtkTreeView.view.separator:backdrop {
     color: rgba(0, 0, 0, 0.1); }
   GtkTreeView.view:backdrop {
-    border-left-color: #bebfc0;
+    border-left-color: #bdbebf;
     border-top: #ededed; }
   GtkTreeView.view.dnd {
     border-style: solid none;
     border-width: 1px;
-    border-color: #3c6288; }
+    border-color: #3c6287; }
   GtkTreeView.view.expander {
     -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
-    color: #6d7172; }
+    color: #6c7072; }
     GtkTreeView.view.expander:dir(rtl) {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
     GtkTreeView.view.expander:hover {
       color: #2e3436; }
     GtkTreeView.view.expander:selected {
-      color: #c9def4; }
+      color: #c8ddf3; }
       GtkTreeView.view.expander:selected:hover {
         color: #ffffff; }
       GtkTreeView.view.expander:selected:backdrop {
-        color: #c9def4; }
+        color: #c8ddf3; }
     GtkTreeView.view.expander:checked {
       -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
     GtkTreeView.view.expander:backdrop {
-      color: #b0b2b3; }
+      color: #afb1b2; }
   GtkTreeView.view.progressbar {
     color: #ffffff;
     border: 1px solid #184472;
@@ -1993,7 +1945,7 @@ GtkTreeView.view {
 column-header .button, column-header .header-bar .button.titlebutton, .header-bar column-header 
.button.titlebutton,
 column-header .titlebar .button.titlebutton,
 .titlebar column-header .button.titlebutton {
-  color: #979a9b;
+  color: #96999a;
   background-color: #ffffff;
   font-weight: bold;
   text-shadow: none;
@@ -2001,7 +1953,7 @@ column-header .titlebar .button.titlebutton,
   column-header .button:hover, column-header .header-bar .button.titlebutton:hover, .header-bar 
column-header .button.titlebutton:hover,
   column-header .titlebar .button.titlebutton:hover,
   .titlebar column-header .button.titlebutton:hover {
-    color: #636769;
+    color: #626668;
     box-shadow: none;
     transition: none; }
   column-header .button:active, column-header .header-bar .button.titlebutton:active, .header-bar 
column-header .button.titlebutton:active,
@@ -2042,7 +1994,7 @@ column-header .titlebar .button.titlebutton,
   .titlebar column-header .button.titlebutton:backdrop {
     border-color: #ededed;
     border-style: none solid solid none;
-    color: #bebfc0;
+    color: #bdbebf;
     background-image: none;
     background-color: white; }
     column-header .button:backdrop:insensitive {
@@ -2064,7 +2016,7 @@ column-header .titlebar .button.titlebutton,
       box-shadow: inset 0 -3px #4a90d9;
       color: #2a76c6; }
     .menubar > .menuitem:insensitive {
-      color: #8e9192;
+      color: #8d9091;
       box-shadow: none; }
 
 .menu {
@@ -2081,11 +2033,11 @@ column-header .titlebar .button.titlebutton,
       color: #ffffff;
       background-color: #4a90d9; }
     .menu .menuitem:insensitive {
-      color: #8e9192; }
+      color: #8d9091; }
       .menu .menuitem:insensitive:backdrop {
         color: #c7c7c7; }
     .menu .menuitem:backdrop, .menu .menuitem:backdrop:hover {
-      color: #8e9192;
+      color: #8d9091;
       background-color: white; }
     .menu .menuitem.arrow {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
@@ -2096,11 +2048,11 @@ column-header .titlebar .button.titlebutton,
     border-style: none;
     border-radius: 0; }
     .menu.button.top {
-      border-bottom: 1px solid #eaebeb; }
+      border-bottom: 1px solid #eaeaea; }
     .menu.button.bottom {
-      border-top: 1px solid #eaebeb; }
+      border-top: 1px solid #eaeaea; }
     .menu.button:hover {
-      background-color: #eaebeb; }
+      background-color: #eaeaea; }
     .menu.button:insensitive {
       color: transparent;
       background-color: transparent;
@@ -2168,7 +2120,7 @@ column-header .titlebar .button.titlebutton,
     .notebook.frame.left {
       border-left-width: 0; }
     .notebook.frame:backdrop {
-      border-color: darkgray; }
+      border-color: #a8a8a8; }
   .notebook.header {
     background-color: #d6d6d6; }
     .notebook.header.frame {
@@ -2182,25 +2134,25 @@ column-header .titlebar .button.titlebutton,
       .notebook.header.frame.left {
         border-right-width: 0; }
       .notebook.header.frame:backdrop {
-        border-color: darkgray; }
+        border-color: #a8a8a8; }
     .notebook.header.top {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 -1px #a1a1a1; }
       .notebook.header.top:backdrop {
-        box-shadow: inset 0 -1px darkgray; }
+        box-shadow: inset 0 -1px #a8a8a8; }
     .notebook.header.bottom {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 1px #a1a1a1; }
       .notebook.header.bottom:backdrop {
-        box-shadow: inset 0 1px darkgray; }
+        box-shadow: inset 0 1px #a8a8a8; }
     .notebook.header.right {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 1px 0 #a1a1a1; }
       .notebook.header.right:backdrop {
-        box-shadow: inset 1px 0 darkgray; }
+        box-shadow: inset 1px 0 #a8a8a8; }
     .notebook.header.left {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset -1px 0 #a1a1a1; }
       .notebook.header.left:backdrop {
-        box-shadow: inset -1px 0 darkgray; }
+        box-shadow: inset -1px 0 #a8a8a8; }
     .notebook.header:backdrop {
-      background-color: #d5d5d5;
+      background-color: #d4d4d4;
       box-shadow: none; }
   .notebook tab {
     border-width: 0;
@@ -2277,7 +2229,7 @@ column-header .titlebar .button.titlebutton,
         .notebook tab.reorderable-page.top:active:hover, .notebook 
tab.reorderable-page.top.active-page:hover {
           background-color: rgba(237, 237, 237, 0.7); }
         .notebook tab.reorderable-page.top:active:backdrop, .notebook 
tab.reorderable-page.top.active-page:backdrop {
-          border-color: darkgray;
+          border-color: #a8a8a8;
           background-color: #ededed;
           border-bottom-color: #4a90d9; }
       .notebook tab.reorderable-page.top:backdrop {
@@ -2296,7 +2248,7 @@ column-header .titlebar .button.titlebutton,
         .notebook tab.reorderable-page.bottom:active:hover, .notebook 
tab.reorderable-page.bottom.active-page:hover {
           background-color: rgba(237, 237, 237, 0.7); }
         .notebook tab.reorderable-page.bottom:active:backdrop, .notebook 
tab.reorderable-page.bottom.active-page:backdrop {
-          border-color: darkgray;
+          border-color: #a8a8a8;
           background-color: #ededed;
           border-top-color: #4a90d9; }
       .notebook tab.reorderable-page.bottom:backdrop {
@@ -2315,7 +2267,7 @@ column-header .titlebar .button.titlebutton,
         .notebook tab.reorderable-page.left:active:hover, .notebook 
tab.reorderable-page.left.active-page:hover {
           background-color: rgba(237, 237, 237, 0.7); }
         .notebook tab.reorderable-page.left:active:backdrop, .notebook 
tab.reorderable-page.left.active-page:backdrop {
-          border-color: darkgray;
+          border-color: #a8a8a8;
           background-color: #ededed;
           border-right-color: #4a90d9; }
       .notebook tab.reorderable-page.left:backdrop {
@@ -2334,7 +2286,7 @@ column-header .titlebar .button.titlebutton,
         .notebook tab.reorderable-page.right:active:hover, .notebook 
tab.reorderable-page.right.active-page:hover {
           background-color: rgba(237, 237, 237, 0.7); }
         .notebook tab.reorderable-page.right:active:backdrop, .notebook 
tab.reorderable-page.right.active-page:backdrop {
-          border-color: darkgray;
+          border-color: #a8a8a8;
           background-color: #ededed;
           border-left-color: #4a90d9; }
       .notebook tab.reorderable-page.right:backdrop {
@@ -2343,17 +2295,17 @@ column-header .titlebar .button.titlebutton,
     .notebook tab .label {
       padding: 0 2px;
       font-weight: bold;
-      color: #8e9192; }
+      color: #8d9091; }
       .notebook tab .label:backdrop, .notebook tab .label.prelight-page:backdrop {
-        color: #abacad; }
+        color: #aaabac; }
     .notebook tab .prelight-page .label, .notebook tab .label.prelight-page {
-      color: #5e6364; }
+      color: #5d6263; }
       .notebook tab .prelight-page .label:backdrop, .notebook tab .label.prelight-page:backdrop {
-        color: #abacad; }
+        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: #8e9192; }
+        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 {
@@ -2382,22 +2334,22 @@ column-header .titlebar .button.titlebutton,
         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(142, 145, 146, 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,
       .titlebar .notebook tab .button.titlebutton > GtkImage {
         padding: 2px; }
   .notebook.arrow {
-    color: #8e9192; }
+    color: #8d9091; }
     .notebook.arrow:hover {
-      color: #5e6364; }
+      color: #5d6263; }
     .notebook.arrow:active {
       color: #2e3436; }
     .notebook.arrow:insensitive {
-      color: rgba(142, 145, 146, 0.3); }
+      color: rgba(141, 144, 145, 0.3); }
     .notebook.arrow:backdrop {
-      color: rgba(142, 145, 146, 0.4); }
+      color: rgba(141, 144, 145, 0.4); }
       .notebook.arrow:backdrop:insensitive {
         color: #c7c7c7; }
 
@@ -2440,15 +2392,15 @@ column-header .titlebar .button.titlebutton,
     border: 1px none #a1a1a1; }
     .scrollbar .trough:backdrop {
       background-color: #e5e5e5;
-      border-color: darkgray; }
+      border-color: #a8a8a8; }
   .scrollbar .slider {
     background-color: #7a7e7f; }
     .scrollbar .slider:hover {
-      background-color: #54595b; }
+      background-color: #54595a; }
     .scrollbar .slider:prelight:active {
       background-color: #2a76c6; }
     .scrollbar .slider:backdrop {
-      background-color: #c7c8c9; }
+      background-color: #c6c7c8; }
     .scrollbar .slider:insensitive {
       background-color: transparent; }
   .scrollbar .slider {
@@ -2488,7 +2440,7 @@ column-header .titlebar .button.titlebutton,
     border-image-slice: 0 1 0 0; }
   .scrollbars-junction:backdrop,
   .scrollbars-junction.frame:backdrop {
-    border-image-source: linear-gradient(to bottom, darkgray 1px, transparent 1px);
+    border-image-source: linear-gradient(to bottom, #a8a8a8 1px, transparent 1px);
     background-color: #e5e5e5; }
 
 /**********
@@ -2505,7 +2457,7 @@ GtkSwitch {
     border: 1px solid #a1a1a1;
     border-radius: 3px;
     color: #2e3436;
-    background-image: linear-gradient(to bottom, #cfcfcf);
+    background-image: linear-gradient(to bottom, #cecece);
     text-shadow: 0 1px rgba(0, 0, 0, 0.1); }
     GtkSwitch.trough:active {
       background-image: linear-gradient(to bottom, #4a90d9 2px, #63a0de);
@@ -2514,16 +2466,16 @@ GtkSwitch {
       box-shadow: 0 1px white;
       text-shadow: 0 1px rgba(24, 68, 114, 0.5), 0 0 2px rgba(255, 255, 255, 0.6); }
     GtkSwitch.trough:insensitive {
-      color: #8e9192;
+      color: #8d9091;
       border-color: #a1a1a1;
       background-image: none;
       background-color: #f4f4f4;
       box-shadow: 0 1px white;
       text-shadow: none; }
     GtkSwitch.trough:backdrop {
-      color: #8e9192;
-      border-color: darkgray;
-      background-image: linear-gradient(to bottom, #d5d5d5);
+      color: #8d9091;
+      border-color: #a8a8a8;
+      background-image: linear-gradient(to bottom, #d4d4d4);
       box-shadow: none;
       text-shadow: none; }
       GtkSwitch.trough:backdrop:active {
@@ -2533,7 +2485,7 @@ GtkSwitch {
         box-shadow: none; }
       GtkSwitch.trough:backdrop:insensitive {
         color: #c7c7c7;
-        border-color: darkgray;
+        border-color: #a8a8a8;
         background-image: none;
         background-color: #f4f4f4; }
   GtkSwitch.slider {
@@ -2559,7 +2511,7 @@ GtkSwitch {
     GtkSwitch.slider:active {
       border: 1px solid #184472; }
     GtkSwitch.slider:insensitive {
-      color: #8e9192;
+      color: #8d9091;
       border-color: #a1a1a1;
       background-image: linear-gradient(to bottom, #f4f4f4);
       text-shadow: none;
@@ -2568,8 +2520,8 @@ GtkSwitch {
       GtkSwitch.slider:insensitive > .label {
         color: inherit; }
     GtkSwitch.slider:backdrop {
-      color: #8e9192;
-      border-color: darkgray;
+      color: #8d9091;
+      border-color: #a8a8a8;
       background-image: linear-gradient(to bottom, #ededed);
       text-shadow: none;
       icon-shadow: none;
@@ -2579,7 +2531,7 @@ GtkSwitch {
         border-color: #4a90d9; }
       GtkSwitch.slider:backdrop:insensitive {
         color: #c7c7c7;
-        border-color: darkgray;
+        border-color: #a8a8a8;
         background-image: linear-gradient(to bottom, #f4f4f4);
         text-shadow: none;
         icon-shadow: none;
@@ -2811,7 +2763,7 @@ GtkSwitch {
   .menu .menuitem.check:hover {
     color: #ffffff; }
   .menu .menuitem.check:insensitive {
-    color: #bebfc0; }
+    color: #bdbebf; }
 
 .radio {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked.png"), url("assets/radio-unchecked 2 png"));
@@ -3022,7 +2974,7 @@ GtkSwitch {
   .menu .menuitem.radio:hover {
     color: #ffffff; }
   .menu .menuitem.radio:insensitive {
-    color: #bebfc0; }
+    color: #bdbebf; }
 
 .view.check, .view.radio,
 .list-row .check, list-row .radio {
@@ -3081,7 +3033,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   padding: 1px 2px 4px;
   outline-offset: 0; }
   GtkCheckButton.text-button:insensitive, GtkCheckButton.text-button:insensitive:active, 
GtkCheckButton.text-button:insensitive:inconsistent, GtkRadioButton.text-button:insensitive, 
GtkRadioButton.text-button:insensitive:active, GtkRadioButton.text-button:insensitive:inconsistent {
-    color: #8e9192; }
+    color: #8d9091; }
     GtkCheckButton.text-button:insensitive:backdrop, GtkCheckButton.text-button:insensitive:active:backdrop, 
GtkCheckButton.text-button:insensitive:inconsistent:backdrop, 
GtkRadioButton.text-button:insensitive:backdrop, GtkRadioButton.text-button:insensitive:active:backdrop, 
GtkRadioButton.text-button:insensitive:inconsistent:backdrop {
       color: #c7c7c7; }
 
@@ -3145,14 +3097,14 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:backdrop {
       border-style: solid;
       border-radius: 50%;
-      border-color: #a1a1a1;
+      border-color: #a0a0a0;
       background-image: linear-gradient(to bottom, #ededed);
       box-shadow: none; }
     .scale.slider:backdrop:insensitive,
     .scale.scale-has-marks-above.scale-has-marks-below.slider:backdrop:insensitive,
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:backdrop:insensitive {
       color: #c7c7c7;
-      border-color: darkgray;
+      border-color: #a8a8a8;
       background-image: linear-gradient(to bottom, #f4f4f4);
       text-shadow: none;
       icon-shadow: none;
@@ -3215,7 +3167,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     margin: 10px;
     border: 1px solid #a1a1a1;
     border-radius: 3px;
-    background-color: #cfcfcf;
+    background-color: #cecece;
     box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1), 0 1px white; }
     .scale.trough.highlight,
     .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight,
@@ -3245,7 +3197,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     .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: darkgray;
+      border-color: #a8a8a8;
       background-color: #c7c7c7;
       box-shadow: none; }
     .scale.trough:backdrop:insensitive, .scale.trough .highlight:backdrop:insensitive,
@@ -3253,7 +3205,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     .scale.scale-has-marks-above.scale-has-marks-below.trough .highlight: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 .highlight:backdrop:insensitive {
-      border-color: darkgray;
+      border-color: #a8a8a8;
       background-color: #f4f4f4; }
     .osd .scale.trough, .osd
     .scale.scale-has-marks-above.scale-has-marks-below.trough, .osd
@@ -3541,8 +3493,8 @@ GtkProgressBar {
     border-radius: 3px;
     background-color: #d2d2d2; }
     GtkProgressBar.trough:backdrop {
-      border-color: darkgray;
-      background-color: #d5d5d5;
+      border-color: #a8a8a8;
+      background-color: #d4d4d4;
       box-shadow: 0 1px rgba(255, 255, 255, 0); }
     GtkProgressBar.trough.osd {
       border-style: none;
@@ -3604,8 +3556,8 @@ GtkProgressBar {
     .level-bar.trough:backdrop {
       background-color: transparent;
       background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
-      color: #333333;
-      border-color: darkgray;
+      color: #323232;
+      border-color: #a8a8a8;
       background-image: linear-gradient(to bottom, white);
       box-shadow: 0 1px rgba(255, 255, 255, 0); }
   .level-bar.fill-block {
@@ -3635,7 +3587,7 @@ GtkProgressBar {
       border-color: rgba(46, 52, 54, 0.2);
       box-shadow: none; }
       .level-bar.fill-block.empty-fill-block:backdrop {
-        border-color: rgba(142, 145, 146, 0.15); }
+        border-color: rgba(141, 144, 145, 0.15); }
 
 /**********
  * Frames *
@@ -3646,7 +3598,7 @@ GtkProgressBar {
   .frame.flat {
     border-style: none; }
   .frame:backdrop {
-    border-color: darkgray; }
+    border-color: #a8a8a8; }
   .frame.action-bar {
     padding: 6px;
     border-width: 1px 0 0; }
@@ -3667,14 +3619,14 @@ GtkScrolledWindow GtkViewport.frame {
   border-color: #a1a1a1; }
   .list:backdrop, .list-row:backdrop {
     background-color: white;
-    border-color: darkgray; }
+    border-color: #a8a8a8; }
 
 .list-row,
 .grid-child {
   padding: 2px; }
 
 .list-row.activatable:hover {
-  background-color: whitesmoke; }
+  background-color: #f4f4f4; }
 .list-row.activatable:active {
   box-shadow: inset 0 2px 2px -2px rgba(0, 0, 0, 0.2); }
 .list-row.activatable:backdrop:hover {
@@ -3682,7 +3634,7 @@ GtkScrolledWindow GtkViewport.frame {
 .list-row.activatable:selected:active {
   box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); }
 .list-row.activatable:selected:hover {
-  background-color: #4787c9; }
+  background-color: #4786c8; }
 .list-row.activatable:selected:backdrop {
   background-color: #4a90d9; }
 
@@ -3726,8 +3678,8 @@ GtkScrolledWindow GtkViewport.frame {
   .list-row:selected .button:backdrop, .list-row:selected .button.flat:backdrop, .list-row:selected 
.sidebar-button.button:backdrop, .list-row:selected .header-bar .titlebutton.button:backdrop, .header-bar 
.list-row:selected .titlebutton.button:backdrop,
   .list-row:selected .titlebar .titlebutton.button:backdrop,
   .titlebar .list-row:selected .titlebutton.button:backdrop {
-    color: #8e9192;
-    border-color: darkgray;
+    color: #8d9091;
+    border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #ededed);
     text-shadow: none;
     icon-shadow: none;
@@ -3738,16 +3690,16 @@ GtkScrolledWindow GtkViewport.frame {
     .titlebar .list-row:selected .titlebutton.button:backdrop:active, .list-row:selected 
.button.flat:backdrop:checked, .list-row:selected .sidebar-button.button:backdrop:checked, .list-row:selected 
.header-bar .titlebutton.button:backdrop:checked, .header-bar .list-row:selected 
.titlebutton.button:backdrop:checked,
     .list-row:selected .titlebar .titlebutton.button:backdrop:checked,
     .titlebar .list-row:selected .titlebutton.button:backdrop:checked {
-      color: #8e9192;
-      border-color: darkgray;
-      background-image: linear-gradient(to bottom, #d5d5d5);
+      color: #8d9091;
+      border-color: #a8a8a8;
+      background-image: linear-gradient(to bottom, #d4d4d4);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       border-color: #184472; }
     .list-row:selected .button:backdrop:insensitive, .list-row:selected .button.flat:backdrop:insensitive, 
.list-row:selected .sidebar-button.button:backdrop:insensitive, .list-row:selected .header-bar 
.titlebutton.button:backdrop:insensitive, .header-bar .list-row:selected 
.titlebutton.button:backdrop:insensitive,
     .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive,
     .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive {
       color: #c7c7c7;
-      border-color: darkgray;
+      border-color: #a8a8a8;
       background-image: linear-gradient(to bottom, #f4f4f4);
       text-shadow: none;
       icon-shadow: none;
@@ -3764,7 +3716,7 @@ GtkScrolledWindow GtkViewport.frame {
       .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive:checked,
       .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:checked {
         color: #c7c7c7;
-        border-color: darkgray;
+        border-color: #a8a8a8;
         background-image: linear-gradient(to bottom, #e7e7e7);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         border-color: #184472; }
@@ -3787,7 +3739,7 @@ GtkScrolledWindow GtkViewport.frame {
     icon-shadow: none;
     color: white; }
   .list-row:selected .button:insensitive {
-    color: #8e9192;
+    color: #8d9091;
     border-color: #a1a1a1;
     background-image: linear-gradient(to bottom, #f4f4f4);
     text-shadow: none;
@@ -3798,9 +3750,9 @@ GtkScrolledWindow GtkViewport.frame {
     .list-row:selected .titlebar .button.titlebutton:insensitive > .label {
       color: inherit; }
     .list-row:selected .button:insensitive:active, .list-row:selected .button:insensitive:checked {
-      color: #8e9192;
+      color: #8d9091;
       border-color: #a1a1a1;
-      background-image: linear-gradient(to bottom, #ececec, #f4f4f4);
+      background-image: linear-gradient(to bottom, #ebebeb, #f4f4f4);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       .list-row:selected .button:insensitive:active > .label, .list-row:selected .header-bar 
.button.titlebutton:insensitive:active > .label,
       .list-row:selected .titlebar .button.titlebutton:insensitive:active > .label, .list-row:selected 
.button:insensitive:checked > .label, .list-row:selected .header-bar .button.titlebutton:insensitive:checked 
.label,
@@ -3875,9 +3827,9 @@ GtkScrolledWindow GtkViewport.frame {
     .app-notification .button:insensitive, .app-notification .button:backdrop:insensitive,
     .app-notification.frame .button:insensitive,
     .app-notification.frame .button:backdrop:insensitive {
-      color: #878a89;
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -3923,27 +3875,18 @@ GtkCalendar {
       color: #2e3436; }
     GtkCalendar.button:backdrop, .header-bar GtkCalendar.button.titlebutton:backdrop,
     .titlebar GtkCalendar.button.titlebutton:backdrop {
-      color: rgba(142, 145, 146, 0.45); }
+      color: rgba(141, 144, 145, 0.45); }
     GtkCalendar.button:insensitive, .header-bar GtkCalendar.button.titlebutton:insensitive,
     .titlebar GtkCalendar.button.titlebutton:insensitive {
-<<<<<<< HEAD
-      color: rgba(142, 145, 146, 0.45); }
-  GtkCalendar:inconsistent, GtkCalendar:inconsistent:backdrop {
-    color: alpha(currentColor,0.55); }
-  GtkCalendar.highlight, GtkCalendar.highlight:backdrop {
-    color: #2e3436;
-    background: #a1a1a1; }
-=======
       color: rgba(141, 144, 145, 0.45); }
   GtkCalendar:inconsistent, GtkCalendar:inconsistent:backdrop {
     color: alpha(currentColor,0.55); }
   GtkCalendar.highlight, GtkCalendar.highlight:backdrop {
     font-size: smaller;
     color: #2e3436; }
->>>>>>> Adwaita, HighContrast: day names in GtkCalendar
   GtkCalendar:backdrop {
-    color: #333333;
-    border-color: darkgray; }
+    color: #323232;
+    border-color: #a8a8a8; }
 
 /***********
  * Dialogs *
@@ -3986,7 +3929,7 @@ GtkCalendar {
     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); }
   .message-dialog.csd .dialog-action-area .button:insensitive {
-    color: #8e9192;
+    color: #8d9091;
     border-color: #a1a1a1;
     background-image: linear-gradient(to bottom, #f4f4f4);
     text-shadow: none;
@@ -3996,15 +3939,15 @@ GtkCalendar {
     .message-dialog.csd .dialog-action-area .titlebar .button.titlebutton:insensitive > .label {
       color: inherit; }
   .message-dialog.csd .dialog-action-area .button:backdrop {
-    color: #8e9192;
-    border-color: darkgray;
+    color: #8d9091;
+    border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #ededed);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   .message-dialog.csd .dialog-action-area .button:backdrop:insensitive {
     color: #c7c7c7;
-    border-color: darkgray;
+    border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #f4f4f4);
     text-shadow: none;
     icon-shadow: none;
@@ -4037,7 +3980,7 @@ GtkCalendar {
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.62353);
       box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
     .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop {
-      color: #dbe9f7;
+      color: #dae8f7;
       border-color: #4a90d9;
       background-image: linear-gradient(to bottom, #4a90d9);
       text-shadow: none;
@@ -4045,7 +3988,7 @@ GtkCalendar {
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive {
         color: #c7c7c7;
-        border-color: darkgray;
+        border-color: #a8a8a8;
         background-image: linear-gradient(to bottom, #f4f4f4);
         text-shadow: none;
         icon-shadow: none;
@@ -4054,7 +3997,7 @@ GtkCalendar {
         .message-dialog.csd .dialog-action-area .titlebar 
.suggested-action.button.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
     .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive {
-      color: #8e9192;
+      color: #8d9091;
       border-color: #a1a1a1;
       background-image: linear-gradient(to bottom, #f4f4f4);
       text-shadow: none;
@@ -4088,7 +4031,7 @@ GtkCalendar {
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
       box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
     .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop {
-      color: #fcd4d4;
+      color: #fbd4d4;
       border-color: #ef2929;
       background-image: linear-gradient(to bottom, #ef2929);
       text-shadow: none;
@@ -4096,7 +4039,7 @@ GtkCalendar {
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive {
         color: #c7c7c7;
-        border-color: darkgray;
+        border-color: #a8a8a8;
         background-image: linear-gradient(to bottom, #f4f4f4);
         text-shadow: none;
         icon-shadow: none;
@@ -4105,7 +4048,7 @@ GtkCalendar {
         .message-dialog.csd .dialog-action-area .titlebar 
.destructive-action.button.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
     .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive {
-      color: #8e9192;
+      color: #8d9091;
       border-color: #a1a1a1;
       background-image: linear-gradient(to bottom, #f4f4f4);
       text-shadow: none;
@@ -4136,7 +4079,7 @@ GtkFileChooserDialog .search-bar {
 GtkFileChooserDialog .dialog-action-box {
   border-top: 1px solid #a1a1a1; }
   GtkFileChooserDialog .dialog-action-box:backdrop {
-    border-top-color: darkgray; }
+    border-top-color: #a8a8a8; }
 
 /***********
  * Sidebar *
@@ -4167,7 +4110,7 @@ GtkPlacesSidebar.sidebar .sidebar-placeholder-row {
 GtkPlacesSidebar.sidebar .sidebar-new-bookmark-row {
   background-color: #d9d9d9; }
 .list-row.button:hover {
-  background-color: #dadbdb; }
+  background-color: #d9dada; }
 .sidebar-button.button, .header-bar .sidebar-button.button.titlebutton,
 .titlebar .sidebar-button.button.titlebutton {
   border-radius: 100%;
@@ -4209,7 +4152,7 @@ GtkPaned {
   GtkPaned .pane-separator {
     background-color: #a1a1a1; }
     GtkPaned .pane-separator:backdrop {
-      background-color: darkgray; }
+      background-color: #a8a8a8; }
 
 GtkPaned.wide {
   -GtkPaned-handle-size: 5;
@@ -4222,7 +4165,7 @@ GtkPaned.wide {
   GtkPaned.wide.vertical .pane-separator {
     border-style: solid none; }
   GtkPaned.wide .pane-separator:backdrop {
-    border-color: darkgray; }
+    border-color: #a8a8a8; }
 
 /**************
  * GtkInfoBar *
@@ -4289,9 +4232,9 @@ GtkInfoBar {
     .question .button:insensitive,
     .warning .button:insensitive,
     .error .button:insensitive {
-      color: #b2d0ef;
+      color: #b2cfee;
       border-color: #1c5187;
-      background-image: linear-gradient(to bottom, #65a1df);
+      background-image: linear-gradient(to bottom, #65a0de);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -4311,7 +4254,7 @@ GtkInfoBar {
     .question .button:backdrop,
     .warning .button:backdrop,
     .error .button:backdrop {
-      color: #dbe9f7;
+      color: #dae8f7;
       border-color: #4a90d9;
       background-image: linear-gradient(to bottom, #4a90d9);
       text-shadow: none;
@@ -4322,9 +4265,9 @@ GtkInfoBar {
       .question .button:backdrop:insensitive,
       .warning .button:backdrop:insensitive,
       .error .button:backdrop:insensitive {
-        color: #9bc2ea;
-        border-color: #65a1df;
-        background-image: linear-gradient(to bottom, #65a1df);
+        color: #9ac1e9;
+        border-color: #65a0de;
+        background-image: linear-gradient(to bottom, #65a0de);
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
@@ -4465,8 +4408,8 @@ 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: #8e9192;
-      border-color: darkgray;
+      color: #8d9091;
+      border-color: #a8a8a8;
       background-image: linear-gradient(to bottom, #ededed);
       text-shadow: none;
       icon-shadow: none;
@@ -4526,7 +4469,7 @@ GtkColorSwatch {
     border-radius: 0;
     margin: 4px;
     background-color: #ededed;
-    border: solid 1px darkgray;
+    border: solid 1px #a8a8a8;
     box-shadow: none; }
 
 .header-bar .titlebutton.button,
@@ -4655,9 +4598,9 @@ GtkColorSwatch {
       icon-shadow: none;
       outline-color: rgba(238, 238, 236, 0.3); }
     .touch-selection .button:insensitive, .touch-selection .button:backdrop:insensitive {
-      color: #878a89;
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -4758,7 +4701,7 @@ GtkColorSwatch {
   border: none;
   box-shadow: none; }
   .overshoot.top:backdrop {
-    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(darkgray), to(rgba(169, 169, 
169, 0)));
+    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#a8a8a8), to(rgba(168, 168, 
168, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center top;
@@ -4774,7 +4717,7 @@ GtkColorSwatch {
   border: none;
   box-shadow: none; }
   .overshoot.bottom:backdrop {
-    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(darkgray), to(rgba(169, 
169, 169, 0)));
+    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#a8a8a8), to(rgba(168, 
168, 168, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center bottom;
@@ -4790,7 +4733,7 @@ GtkColorSwatch {
   border: none;
   box-shadow: none; }
   .overshoot.left:backdrop {
-    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(darkgray), to(rgba(169, 
169, 169, 0)));
+    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#a8a8a8), to(rgba(168, 168, 
168, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: left center;
@@ -4806,7 +4749,7 @@ GtkColorSwatch {
   border: none;
   box-shadow: none; }
   .overshoot.right:backdrop {
-    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(darkgray), to(rgba(169, 
169, 169, 0)));
+    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#a8a8a8), to(rgba(168, 
168, 168, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: right center;
@@ -4873,13 +4816,13 @@ base background color of insensitive widgets */
 @define-color insensitive_bg_color #f4f4f4;
 /*
 text foreground color of insensitive widgets */
- define-color insensitive_fg_color #8e9192;
+ define-color insensitive_fg_color #8d9091;
 /*
 insensitive text widgets and the like base background color */
 @define-color insensitive_base_color #ffffff;
 /*
 widget text/foreground color on backdrop windows */
- define-color theme_unfocused_fg_color #8e9192;
+ define-color theme_unfocused_fg_color #8d9091;
 /*
 text color for entries, views and content in general on backdrop windows */
 @define-color theme_unfocused_text_color black;
@@ -4900,7 +4843,7 @@ widgets main borders color */
 @define-color borders #a1a1a1;
 /*
 widgets main borders color on backdrop windows */
- define-color unfocused_borders darkgray;
+ define-color unfocused_borders #a8a8a8;
 /*
 these are pretty self explicative */
 @define-color warning_color #f57900;
@@ -4910,7 +4853,7 @@ these are pretty self explicative */
 these colors are exported for the window manager and shouldn't be used in applications,
 read if you used those and something break with a version upgrade you're on your own... */
 @define-color wm_title shade(#2e3436, 1.8);
- define-color wm_unfocused_title #8e9192;
+ define-color wm_unfocused_title #8d9091;
 @define-color wm_highlight white;
 @define-color wm_borders_edge white;
 @define-color wm_bg_a shade(#ededed, 1.2);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]