refinements

1 files changed, 180 insertions, 130 deletions

diff --git a/common/gtk-3.0/3.14/gtk-contained-solid.css b/common/gtk-3.0/3.14/gtk-contained-solid.css
index 66a2eaf..b32485b 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid.css
@@ -33,7 +33,7 @@
  ***************/
 .background {
   color: #5c616c;
-  background-color: rgba(249, 250, 251, 0.999); }
+  background-color: rgba(245, 246, 247, 0.999); }
 
 /*
    These wildcard seems unavoidable, need to investigate.
@@ -45,16 +45,16 @@
   -gtk-image-effect: dim; }
 
 .gtkstyle-fallback {
-  background-color: #f9fafb;
+  background-color: #F5F6F7;
   color: #5c616c; }
   .gtkstyle-fallback:prelight {
     background-color: white;
     color: #5c616c; }
   .gtkstyle-fallback:active {
-    background-color: #dae1e7;
+    background-color: #d9dde0;
     color: #5c616c; }
   .gtkstyle-fallback:insensitive {
-    background-color: #fcfdfd;
+    background-color: #fbfbfb;
     color: rgba(92, 97, 108, 0.55); }
   .gtkstyle-fallback:selected {
     background-color: #5294E2;
@@ -83,11 +83,11 @@ GtkLabel:insensitive {
 
 GtkAssistant .sidebar {
   background-color: #ffffff;
-  border-top: 1px solid #dde3e9; }
+  border-top: 1px solid #dcdfe3; }
   GtkAssistant .sidebar:dir(ltr) {
-    border-right: 1px solid #dde3e9; }
+    border-right: 1px solid #dcdfe3; }
   GtkAssistant .sidebar:dir(rtl) {
-    border-left: 1px solid #dde3e9; }
+    border-left: 1px solid #dcdfe3; }
 GtkAssistant.csd .sidebar {
   border-top-style: none; }
 GtkAssistant .sidebar GtkLabel {
@@ -97,7 +97,7 @@ GtkAssistant .sidebar GtkLabel.highlight {
   color: #ffffff; }
 
 GtkTextView {
-  background-color: #fcfcfd; }
+  background-color: #fafafb; }
 
 GtkFlowBox .grid-child {
   padding: 3px;
@@ -216,20 +216,20 @@ GtkFlowBox .grid-child {
     .entry.image:active {
       color: #5294E2; }
   .linked.vertical > .entry {
-    border-bottom-color: #f4f6f8;
+    border-bottom-color: #f4f5f6;
     box-shadow: none; }
     .linked.vertical > .entry:focus {
       border-color: #5294E2;
       box-shadow: 0 -1px 0 0 #5294E2; }
     .linked.vertical > .entry:insensitive {
-      border-bottom-color: #f4f6f8; }
+      border-bottom-color: #f4f5f6; }
     .linked.vertical > .entry:first-child {
-      border-bottom-color: #f4f6f8; }
+      border-bottom-color: #f4f5f6; }
       .linked.vertical > .entry:first-child:focus {
         border-bottom-color: #5294E2;
         box-shadow: none; }
       .linked.vertical > .entry:first-child:insensitive {
-        border-bottom-color: #f4f6f8; }
+        border-bottom-color: #f4f5f6; }
     .linked.vertical > .entry:last-child {
       border-bottom-color: rgba(0, 0, 0, 0.14); }
       .linked.vertical > .entry:last-child:focus {
@@ -254,14 +254,14 @@ GtkFlowBox .grid-child {
   color: #5c616c;
   outline-color: rgba(92, 97, 108, 0.3);
   border-color: #cfd6e6;
-  background-color: #fcfdfd; }
+  background-color: #f8f9f9; }
   .header-bar .button {
     padding: 6px 11px; }
   .button.flat {
     border-color: transparent;
     background-color: transparent;
     background-image: none;
-    background-color: rgba(249, 250, 251, 0);
+    background-color: rgba(245, 246, 247, 0);
     transition: none; }
     .button.flat:hover {
       transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
@@ -272,7 +272,7 @@ GtkFlowBox .grid-child {
     color: #5c616c;
     outline-color: rgba(92, 97, 108, 0.3);
     border-color: #5294E2;
-    background-color: #fcfdfd;
+    background-color: #f8f9f9;
     -gtk-image-effect: highlight; }
   .button:active, .button:checked {
     color: #ffffff;
@@ -287,7 +287,7 @@ GtkFlowBox .grid-child {
   .button:insensitive {
     color: rgba(92, 97, 108, 0.55);
     border-color: rgba(207, 214, 230, 0.55);
-    background-color: rgba(252, 253, 253, 0.55); }
+    background-color: rgba(248, 249, 249, 0.55); }
     .button:insensitive > GtkLabel {
       color: inherit; }
     .button:insensitive:active, .button:insensitive:checked {
@@ -476,12 +476,12 @@ GtkFlowBox .grid-child {
   color: #5c616c;
   outline-color: rgba(92, 97, 108, 0.3);
   border-color: #cfd6e6;
-  background-color: #fcfdfd; }
+  background-color: #f8f9f9; }
   .inline-toolbar GtkToolButton > .button:hover {
     color: #5c616c;
     outline-color: rgba(92, 97, 108, 0.3);
     border-color: #5294E2;
-    background-color: #fcfdfd; }
+    background-color: #f8f9f9; }
   .inline-toolbar GtkToolButton > .button:active, .inline-toolbar GtkToolButton > .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
@@ -490,7 +490,7 @@ GtkFlowBox .grid-child {
   .inline-toolbar GtkToolButton > .button:insensitive {
     color: rgba(92, 97, 108, 0.55);
     border-color: rgba(207, 214, 230, 0.55);
-    background-color: rgba(252, 253, 253, 0.55); }
+    background-color: rgba(248, 249, 249, 0.55); }
     .inline-toolbar GtkToolButton > .button:insensitive > GtkLabel {
       color: inherit; }
   .inline-toolbar GtkToolButton > .button:insensitive:active, .inline-toolbar GtkToolButton > .button:insensitive:checked {
@@ -594,7 +594,7 @@ GtkFlowBox .grid-child {
   outline-offset: -1px;
   border-radius: 2px; }
   .menuitem.button.flat:hover {
-    background-color: #f1f2f3; }
+    background-color: #edeef0; }
 
 /*********
  * Links *
@@ -623,7 +623,7 @@ GtkFlowBox .grid-child {
   border-radius: 3px; }
   .spinbutton .button {
     background-image: none;
-    border: 1px solid rgba(221, 227, 233, 0.6);
+    border: 1px solid rgba(220, 223, 227, 0.6);
     border-style: none none none solid;
     color: #646873;
     border-radius: 0;
@@ -643,7 +643,7 @@ GtkFlowBox .grid-child {
     color: #5c616c;
     outline-color: rgba(92, 97, 108, 0.3);
     border-color: #cfd6e6;
-    background-color: #fcfdfd; }
+    background-color: #f8f9f9; }
     .spinbutton.vertical .button:first-child:active, .spinbutton.vertical:dir(rtl) .button:first-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
@@ -653,18 +653,18 @@ GtkFlowBox .grid-child {
       color: #5c616c;
       outline-color: rgba(92, 97, 108, 0.3);
       border-color: #5294E2;
-      background-color: #fcfdfd; }
+      background-color: #f8f9f9; }
     .spinbutton.vertical .button:first-child:insensitive, .spinbutton.vertical:dir(rtl) .button:first-child:insensitive {
       color: rgba(92, 97, 108, 0.55);
       border-color: rgba(207, 214, 230, 0.55);
-      background-color: rgba(252, 253, 253, 0.55); }
+      background-color: rgba(248, 249, 249, 0.55); }
       .spinbutton.vertical .button:first-child:insensitive > GtkLabel, .spinbutton.vertical:dir(rtl) .button:first-child:insensitive > GtkLabel {
         color: inherit; }
   .spinbutton.vertical .button:last-child, .spinbutton.vertical:dir(rtl) .button:last-child {
     color: #5c616c;
     outline-color: rgba(92, 97, 108, 0.3);
     border-color: #cfd6e6;
-    background-color: #fcfdfd; }
+    background-color: #f8f9f9; }
     .spinbutton.vertical .button:last-child:active, .spinbutton.vertical:dir(rtl) .button:last-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
@@ -674,11 +674,11 @@ GtkFlowBox .grid-child {
       color: #5c616c;
       outline-color: rgba(92, 97, 108, 0.3);
       border-color: #5294E2;
-      background-color: #fcfdfd; }
+      background-color: #f8f9f9; }
     .spinbutton.vertical .button:last-child:insensitive, .spinbutton.vertical:dir(rtl) .button:last-child:insensitive {
       color: rgba(92, 97, 108, 0.55);
       border-color: rgba(207, 214, 230, 0.55);
-      background-color: rgba(252, 253, 253, 0.55); }
+      background-color: rgba(248, 249, 249, 0.55); }
       .spinbutton.vertical .button:last-child:insensitive > GtkLabel, .spinbutton.vertical:dir(rtl) .button:last-child:insensitive > GtkLabel {
         color: inherit; }
   .spinbutton.vertical.entry, .spinbutton.vertical:dir(rtl).entry {
@@ -737,7 +737,7 @@ GtkComboBox {
 .toolbar, .inline-toolbar {
   -GtkWidget-window-dragging: true;
   padding: 4px;
-  background-color: #f9fafb; }
+  background-color: #F5F6F7; }
   .osd .toolbar, .osd .inline-toolbar, .toolbar.osd, .osd.inline-toolbar {
     padding: 7px;
     border: none;
@@ -755,22 +755,22 @@ GtkComboBox {
     background-color: #eff0f2; }
 
 .inline-toolbar {
-  background-color: #f0f2f5;
+  background-color: #eceef0;
   border-style: solid;
-  border-color: #dde3e9;
+  border-color: #dcdfe3;
   border-width: 0 1px 1px;
   padding: 3px;
   border-radius: 0  0 3px 3px; }
 
 .search-bar {
-  background-color: #f9fafb;
+  background-color: #F5F6F7;
   border-style: solid;
-  border-color: #dde3e9;
+  border-color: #dcdfe3;
   border-width: 0 0 1px;
   padding: 3px; }
 
 .action-bar {
-  background-color: #f0f2f5; }
+  background-color: #eceef0; }
 
 /***************
  * Header bars *
@@ -918,7 +918,7 @@ GtkComboBox {
     color: rgba(82, 93, 118, 0.8);
     outline-color: rgba(82, 93, 118, 0.1);
     border-color: rgba(82, 93, 118, 0.1);
-    background-color: rgba(252, 253, 253, 0.9); }
+    background-color: rgba(248, 249, 249, 0.9); }
   .primary-toolbar .button:active, .header-bar .button:active, .primary-toolbar .button:checked, .header-bar .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
@@ -945,7 +945,7 @@ GtkComboBox {
   color: rgba(82, 93, 118, 0.8);
   outline-color: rgba(82, 93, 118, 0.1);
   border-color: rgba(82, 93, 118, 0.1);
-  background-color: rgba(252, 253, 253, 0.9); }
+  background-color: rgba(248, 249, 249, 0.9); }
   .primary-toolbar .linked.stack-switcher > .button:hover, .header-bar .linked.stack-switcher > .button:hover,
   .primary-toolbar .linked.path-bar > .button:hover,
   .header-bar .linked.path-bar > .button:hover {
@@ -1150,7 +1150,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   column-header .button:active {
     background-color: #ffffff; }
   column-header .button:insensitive {
-    border-color: #f9fafb;
+    border-color: #F5F6F7;
     background-image: none; }
 
 /*********
@@ -1179,7 +1179,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   padding: 0;
   border-radius: 0;
   background-color: #ffffff;
-  border: 1px solid #dde3e9; }
+  border: 1px solid #dcdfe3; }
   .csd .menu, .csd .popup {
     padding: 4px 0px;
     border-radius: 3px;
@@ -1222,7 +1222,7 @@ column-header .button, column-header .button:hover, column-header .button:active
 .popover {
   margin: 10px;
   padding: 2px;
-  border: 1px solid #ced6de;
+  border: 1px solid #cdd2d7;
   border-radius: 3px;
   background-clip: border-box;
   background-color: #ffffff;
@@ -1265,7 +1265,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   -GtkWidget-focus-line-width: 0;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
   .notebook.frame {
-    border: 1px solid #dde3e9; }
+    border: 1px solid #dcdfe3; }
     .notebook.frame.top {
       border-top-width: 0; }
     .notebook.frame.bottom {
@@ -1275,9 +1275,9 @@ column-header .button, column-header .button:hover, column-header .button:active
     .notebook.frame.left {
       border-left-width: 0; }
   .notebook.header {
-    background-color: #ffffff; }
+    background-color: #fafafb; }
     .notebook.header.frame {
-      border: 1px solid #dde3e9; }
+      border: 1px solid #dcdfe3; }
       .notebook.header.frame.top {
         border-bottom-width: 0; }
       .notebook.header.frame.bottom {
@@ -1287,13 +1287,13 @@ column-header .button, column-header .button:hover, column-header .button:active
       .notebook.header.frame.left {
         border-right-width: 0; }
     .notebook.header.top {
-      box-shadow: inset 0 -1px #edf0f3; }
+      box-shadow: inset 0 -1px #eaecee; }
     .notebook.header.bottom {
-      box-shadow: inset 0 1px #edf0f3; }
+      box-shadow: inset 0 1px #eaecee; }
     .notebook.header.right {
-      box-shadow: inset 1px 0 #edf0f3; }
+      box-shadow: inset 1px 0 #eaecee; }
     .notebook.header.left {
-      box-shadow: inset -1px 0 #edf0f3; }
+      box-shadow: inset -1px 0 #eaecee; }
   .notebook tab {
     border-width: 0;
     border-style: solid;
@@ -1311,59 +1311,59 @@ column-header .button, column-header .button:hover, column-header .button:active
     .notebook tab.reorderable-page.top, .notebook tab.top {
       border-color: transparent; }
       .notebook tab.reorderable-page.top:hover, .notebook tab.reorderable-page.top.prelight-page, .notebook tab.top:hover, .notebook tab.top.prelight-page {
-        border-color: rgba(221, 227, 233, 0.5);
+        border-color: rgba(220, 223, 227, 0.5);
         border-width: 1px;
         border-top-width: 0;
-        background-color: rgba(249, 250, 251, 0.2); }
+        background-color: rgba(245, 246, 247, 0.2); }
       .notebook tab.reorderable-page.top:active, .notebook tab.reorderable-page.top.active-page, .notebook tab.reorderable-page.top.active-page:hover, .notebook tab.top:active, .notebook tab.top.active-page, .notebook tab.top.active-page:hover {
         border-width: 1px;
         border-top-width: 0;
-        border-color: #dde3e9;
-        background-color: rgba(0, 0, 0, 0.02); }
+        border-color: #dcdfe3;
+        background-color: rgba(0, 0, 0, 0.035); }
         .notebook tab.reorderable-page.top:active:hover, .notebook tab.reorderable-page.top.active-page:hover, .notebook tab.reorderable-page.top.active-page:hover:hover, .notebook tab.top:active:hover, .notebook tab.top.active-page:hover, .notebook tab.top.active-page:hover:hover {
-          background-color: rgba(0, 0, 0, 0.02); }
+          background-color: rgba(0, 0, 0, 0.035); }
     .notebook tab.reorderable-page.bottom, .notebook tab.bottom {
       border-color: transparent; }
       .notebook tab.reorderable-page.bottom:hover, .notebook tab.reorderable-page.bottom.prelight-page, .notebook tab.bottom:hover, .notebook tab.bottom.prelight-page {
-        border-color: rgba(221, 227, 233, 0.5);
+        border-color: rgba(220, 223, 227, 0.5);
         border-width: 1px;
         border-bottom-width: 0;
-        background-color: rgba(249, 250, 251, 0.2); }
+        background-color: rgba(245, 246, 247, 0.2); }
       .notebook tab.reorderable-page.bottom:active, .notebook tab.reorderable-page.bottom.active-page, .notebook tab.reorderable-page.bottom.active-page:hover, .notebook tab.bottom:active, .notebook tab.bottom.active-page, .notebook tab.bottom.active-page:hover {
         border-width: 1px;
         border-bottom-width: 0;
-        border-color: #dde3e9;
-        background-color: rgba(0, 0, 0, 0.02); }
+        border-color: #dcdfe3;
+        background-color: rgba(0, 0, 0, 0.035); }
         .notebook tab.reorderable-page.bottom:active:hover, .notebook tab.reorderable-page.bottom.active-page:hover, .notebook tab.reorderable-page.bottom.active-page:hover:hover, .notebook tab.bottom:active:hover, .notebook tab.bottom.active-page:hover, .notebook tab.bottom.active-page:hover:hover {
-          background-color: rgba(0, 0, 0, 0.02); }
+          background-color: rgba(0, 0, 0, 0.035); }
     .notebook tab.reorderable-page.right, .notebook tab.right {
       border-color: transparent; }
       .notebook tab.reorderable-page.right:hover, .notebook tab.reorderable-page.right.prelight-page, .notebook tab.right:hover, .notebook tab.right.prelight-page {
-        border-color: rgba(221, 227, 233, 0.5);
+        border-color: rgba(220, 223, 227, 0.5);
         border-width: 1px;
         border-right-width: 0;
-        background-color: rgba(249, 250, 251, 0.2); }
+        background-color: rgba(245, 246, 247, 0.2); }
       .notebook tab.reorderable-page.right:active, .notebook tab.reorderable-page.right.active-page, .notebook tab.reorderable-page.right.active-page:hover, .notebook tab.right:active, .notebook tab.right.active-page, .notebook tab.right.active-page:hover {
         border-width: 1px;
         border-right-width: 0;
-        border-color: #dde3e9;
-        background-color: rgba(0, 0, 0, 0.02); }
+        border-color: #dcdfe3;
+        background-color: rgba(0, 0, 0, 0.035); }
         .notebook tab.reorderable-page.right:active:hover, .notebook tab.reorderable-page.right.active-page:hover, .notebook tab.reorderable-page.right.active-page:hover:hover, .notebook tab.right:active:hover, .notebook tab.right.active-page:hover, .notebook tab.right.active-page:hover:hover {
-          background-color: rgba(0, 0, 0, 0.02); }
+          background-color: rgba(0, 0, 0, 0.035); }
     .notebook tab.reorderable-page.left, .notebook tab.left {
       border-color: transparent; }
       .notebook tab.reorderable-page.left:hover, .notebook tab.reorderable-page.left.prelight-page, .notebook tab.left:hover, .notebook tab.left.prelight-page {
-        border-color: rgba(221, 227, 233, 0.5);
+        border-color: rgba(220, 223, 227, 0.5);
         border-width: 1px;
         border-left-width: 0;
-        background-color: rgba(249, 250, 251, 0.2); }
+        background-color: rgba(245, 246, 247, 0.2); }
       .notebook tab.reorderable-page.left:active, .notebook tab.reorderable-page.left.active-page, .notebook tab.reorderable-page.left.active-page:hover, .notebook tab.left:active, .notebook tab.left.active-page, .notebook tab.left.active-page:hover {
         border-width: 1px;
         border-left-width: 0;
-        border-color: #dde3e9;
-        background-color: rgba(0, 0, 0, 0.02); }
+        border-color: #dcdfe3;
+        background-color: rgba(0, 0, 0, 0.035); }
         .notebook tab.reorderable-page.left:active:hover, .notebook tab.reorderable-page.left.active-page:hover, .notebook tab.reorderable-page.left.active-page:hover:hover, .notebook tab.left:active:hover, .notebook tab.left.active-page:hover, .notebook tab.left.active-page:hover:hover {
-          background-color: rgba(0, 0, 0, 0.02); }
+          background-color: rgba(0, 0, 0, 0.035); }
     .notebook tab GtkLabel {
       padding: 0 2px;
       color: rgba(92, 97, 108, 0.55); }
@@ -1373,7 +1373,7 @@ column-header .button, column-header .button:hover, column-header .button:active
       color: #5c616c; }
     .notebook tab .button {
       padding: 0;
-      color: #92969e; }
+      color: #91959c; }
       .notebook tab .button:hover {
         color: #ff4d4d; }
       .notebook tab .button:active {
@@ -1408,9 +1408,9 @@ column-header .button, column-header .button:hover, column-header .button:active
   .scrollbar.slider {
     border-radius: 20px;
     border: 3px solid transparent;
-    background-color: #babcc1; }
+    background-color: #b7babf; }
     .scrollbar.slider:hover {
-      background-color: #8b8e96; }
+      background-color: #898d95; }
     .scrollbar.slider:prelight:active {
       background-color: #5294E2; }
     .scrollbar.slider.fine-tune {
@@ -1431,7 +1431,8 @@ column-header .button, column-header .button:hover, column-header .button:active
  **********/
 GtkSwitch {
   font: 1;
-  -GtkSwitch-slider-width: 41; }
+  -GtkSwitch-slider-width: 41;
+  outline-color: transparent; }
   GtkSwitch.trough, GtkSwitch.slider {
     background-size: 52px 24px;
     background-repeat: no-repeat;
@@ -1447,39 +1448,83 @@ GtkSwitch {
 GtkSwitch.trough {
   background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); }
 
+.list-row:selected GtkSwitch.trough {
+  background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); }
+
+.header-bar GtkSwitch.trough,
+.primary-toolbar GtkSwitch.trough {
+  background-image: -gtk-scaled(url("assets/switch-header.png"), url("assets/switch-header@2.png")); }
+
 GtkSwitch.trough:active {
   background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); }
 
+.list-row:selected GtkSwitch.trough:active {
+  background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); }
+
+.header-bar GtkSwitch.trough:active,
+.primary-toolbar GtkSwitch.trough:active {
+  background-image: -gtk-scaled(url("assets/switch-active-header.png"), url("assets/switch-active-header@2.png")); }
+
 GtkSwitch.trough:insensitive {
   background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); }
 
-GtkSwitch.trough:active:insensitive {
-  background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); }
+.list-row:selected GtkSwitch.trough:insensitive {
+  background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); }
 
-.header-bar GtkSwitch.trough {
-  background-image: -gtk-scaled(url("assets/switch-header.png"), url("assets/switch-header@2.png")); }
+.header-bar GtkSwitch.trough:insensitive,
+.primary-toolbar GtkSwitch.trough:insensitive {
+  background-image: -gtk-scaled(url("assets/switch-insensitive-header.png"), url("assets/switch-insensitive-header@2.png")); }
 
-.header-bar GtkSwitch.trough:active {
-  background-image: -gtk-scaled(url("assets/switch-active-header.png"), url("assets/switch-active-header@2.png")); }
+GtkSwitch.trough:active:insensitive {
+  background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); }
 
-.header-bar GtkSwitch.trough:insensitive {
-  background-image: -gtk-scaled(url("assets/switch-insensitive-header.png"), url("assets/switch-insensitive-header@2.png")); }
+.list-row:selected GtkSwitch.trough:active:insensitive {
+  background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); }
 
-.header-bar GtkSwitch.trough:active:insensitive {
+.header-bar GtkSwitch.trough:active:insensitive,
+.primary-toolbar GtkSwitch.trough:active:insensitive {
   background-image: -gtk-scaled(url("assets/switch-active-insensitive-header.png"), url("assets/switch-active-insensitive-header@2.png")); }
 
 .list-row:selected GtkSwitch.trough {
+  background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); }
+
+.list-row:selected GtkSwitch.trough {
   background-image: -gtk-scaled(url("assets/switch-selected.png"), url("assets/switch-selected@2.png")); }
 
+.header-bar GtkSwitch.trough,
+.primary-toolbar GtkSwitch.trough {
+  background-image: -gtk-scaled(url("assets/switch-header.png"), url("assets/switch-header@2.png")); }
+
+.list-row:selected GtkSwitch.trough:active {
+  background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); }
+
 .list-row:selected GtkSwitch.trough:active {
   background-image: -gtk-scaled(url("assets/switch-active-selected.png"), url("assets/switch-active-selected@2.png")); }
 
+.header-bar GtkSwitch.trough:active,
+.primary-toolbar GtkSwitch.trough:active {
+  background-image: -gtk-scaled(url("assets/switch-active-header.png"), url("assets/switch-active-header@2.png")); }
+
+.list-row:selected GtkSwitch.trough:insensitive {
+  background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); }
+
 .list-row:selected GtkSwitch.trough:insensitive {
   background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"), url("assets/switch-insensitive-selected@2.png")); }
 
+.header-bar GtkSwitch.trough:insensitive,
+.primary-toolbar GtkSwitch.trough:insensitive {
+  background-image: -gtk-scaled(url("assets/switch-insensitive-header.png"), url("assets/switch-insensitive-header@2.png")); }
+
+.list-row:selected GtkSwitch.trough:active:insensitive {
+  background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); }
+
 .list-row:selected GtkSwitch.trough:active:insensitive {
   background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"), url("assets/switch-active-insensitive-selected@2.png")); }
 
+.header-bar GtkSwitch.trough:active:insensitive,
+.primary-toolbar GtkSwitch.trough:active:insensitive {
+  background-image: -gtk-scaled(url("assets/switch-active-insensitive-header.png"), url("assets/switch-active-insensitive-header@2.png")); }
+
 /*************************
  * Check and Radio items *
  *************************/
@@ -1607,8 +1652,8 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
       background-image: linear-gradient(to bottom, #5294E2);
       border-color: #5294E2; }
     .scale.slider:insensitive {
-      background-image: linear-gradient(to bottom, #fcfcfd);
-      border-color: #9dc1ed; }
+      background-image: linear-gradient(to bottom, #fafafb);
+      border-color: #9bc0eb; }
     .scale.slider:active {
       background-image: linear-gradient(to bottom, #2679db);
       border-color: #2679db; }
@@ -1725,7 +1770,7 @@ GtkLevelBar.vertical {
  * Frames *
  **********/
 .frame {
-  border: 1px solid #dde3e9;
+  border: 1px solid #dcdfe3;
   padding: 0; }
   .frame.flat {
     border-style: none; }
@@ -1746,7 +1791,7 @@ GtkScrolledWindow GtkViewport.frame {
  *********/
 .list, .list-row {
   background-color: #ffffff;
-  border-color: #dde3e9; }
+  border-color: #dcdfe3; }
 
 .list-row,
 .grid-child {
@@ -1833,7 +1878,7 @@ GtkExpander {
  * Calendar *
  ***********/
 GtkCalendar {
-  border: 1px solid #dde3e9;
+  border: 1px solid #dcdfe3;
   border-radius: 3px;
   padding: 2px; }
   GtkCalendar:selected {
@@ -1885,18 +1930,18 @@ GtkCalendar {
     border-bottom-left-radius: 3px; }
 
 GtkFileChooserDialog .search-bar {
-  background-color: #f9fafb;
-  border-color: #dde3e9;
+  background-color: #F5F6F7;
+  border-color: #dcdfe3;
   box-shadow: none; }
 GtkFileChooserDialog .dialog-action-box {
-  border-top: 1px solid #dde3e9; }
+  border-top: 1px solid #dcdfe3; }
 
 /***********
  * Sidebar *
  ***********/
 .sidebar {
   border: none;
-  background-color: #f9fafb; }
+  background-color: #F5F6F7; }
   .sidebar .scrollbar.trough {
     background-color: transparent;
     border-width: 2px;
@@ -1926,7 +1971,7 @@ GtkPaned {
     margin-left: 8px; }
 
 .pane-separator {
-  background-image: linear-gradient(to bottom, #dde3e9); }
+  background-image: linear-gradient(to bottom, #dcdfe3); }
 
 /**************
  * GtkInfoBar *
@@ -2027,13 +2072,13 @@ GtkColorSwatch {
       border-color: rgba(255, 255, 255, 0.5); }
 
 GtkColorChooserWidget #add-color-button {
-  border-color: #ebeef2;
-  background-color: #ebeef2;
-  color: #f9fafb;
+  border-color: #e8eaed;
+  background-color: #e8eaed;
+  color: #F5F6F7;
   box-shadow: none; }
   GtkColorChooserWidget #add-color-button:hover {
-    border-color: #dde3e9;
-    background-color: #dde3e9; }
+    border-color: #dcdfe3;
+    background-color: #dcdfe3; }
 
 GtkColorButton.button {
   padding: 4px; }
@@ -2049,7 +2094,7 @@ GtkColorButton.button {
     color: #5c616c;
     outline-color: rgba(92, 97, 108, 0.3);
     border-color: #5294E2;
-    background-color: #fcfdfd; }
+    background-color: #f8f9f9; }
 
 GtkVolumeButton.button {
   padding: 8px; }
@@ -2421,7 +2466,7 @@ TerminalWindow .notebook tab.reorderable-page:hover {
   padding-top: 4px;
   padding-bottom: 4px; }
 TerminalWindow .notebook.header.top {
-  box-shadow: inset 0 1px #d4d5db, inset 0 -1px #edf0f3; }
+  box-shadow: inset 0 1px #d4d5db, inset 0 -1px #eaecee; }
 TerminalWindow .notebook tab .active-page GtkLabel {
   color: rgba(82, 93, 118, 0.8); }
   TerminalWindow .notebook tab .active-page GtkLabel:backdrop {
@@ -2466,13 +2511,13 @@ NemoWindow .sidebar .frame {
   border-width: 0; }
 
 NemoWindow GtkSeparator.separator.horizontal, NemoWindow GtkPlacesSidebar.sidebar GtkSeparator.horizontal.view.separator, GtkPlacesSidebar.sidebar NemoWindow GtkSeparator.horizontal.view.separator {
-  color: #dde3e9; }
+  color: #dcdfe3; }
 
 NemoWindow .primary-toolbar NemoPathBar.linked > .button {
   color: rgba(82, 93, 118, 0.8);
   outline-color: rgba(82, 93, 118, 0.1);
   border-color: rgba(82, 93, 118, 0.1);
-  background-color: rgba(252, 253, 253, 0.9); }
+  background-color: rgba(248, 249, 249, 0.9); }
   NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover {
     border-color: #5294E2; }
   NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked {
@@ -2485,7 +2530,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked > .button {
   color: #d4d5db; }
 
 .open-document-selector-listbox-row {
-  border-bottom: 1px solid #eaedf1;
+  border-bottom: 1px solid #e7e9ec;
   padding: 6px 6px 6px 12px; }
   .open-document-selector-listbox-row .path-label {
     font-size: smaller;
@@ -2503,7 +2548,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked > .button {
   .gedit-document-panel .list-row .button GtkImage {
     color: inherit; }
 .gedit-document-panel .prelight-row .button {
-  color: #92969e; }
+  color: #91959c; }
 .gedit-document-panel .list-row .button:hover,
 .gedit-document-panel .prelight-row .button:hover {
   color: #ff4d4d; }
@@ -2519,13 +2564,13 @@ NemoWindow .primary-toolbar NemoPathBar.linked > .button {
   color: #5c616c; }
 
 .gedit-document-panel-dragged-row {
-  border: 1px solid #dde3e9;
-  background-color: #dae1e7;
+  border: 1px solid #dcdfe3;
+  background-color: #d9dde0;
   color: #5c616c; }
 
 GeditStatusbar {
-  border-top: 1px solid #dde3e9;
-  background-color: #f9fafb; }
+  border-top: 1px solid #dcdfe3;
+  background-color: #F5F6F7; }
 
 GeditStatusMenuButton.button.flat,
 GeditStatusMenuButton:prelight.button.flat,
@@ -2534,7 +2579,7 @@ GeditStatusMenuButton:checked.button.flat {
   border-radius: 0; }
 
 GeditFileBrowserWidget .toolbar, GeditFileBrowserWidget .inline-toolbar {
-  border-bottom: 1px solid #dde3e9; }
+  border-bottom: 1px solid #dcdfe3; }
 
 .gedit-search-entry-occurrences-tag, .gb-search-entry-occurrences-tag {
   color: rgba(92, 97, 108, 0.6);
@@ -2542,9 +2587,9 @@ GeditFileBrowserWidget .toolbar, GeditFileBrowserWidget .inline-toolbar {
   padding: 2px; }
 
 GeditViewFrame .gedit-search-slider, GbEditorFrame .gb-search-slider {
-  background-color: white;
+  background-color: #fbfbfc;
   padding: 6px;
-  border-color: #dde3e9;
+  border-color: #dcdfe3;
   border-radius: 0 0 2px 2px;
   border-width: 0 1px 1px 1px;
   border-style: solid; }
@@ -2552,7 +2597,7 @@ GeditViewFrame .gedit-search-slider, GbEditorFrame .gb-search-slider {
 GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr),
 GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
   border-color: rgba(82, 93, 118, 0.1);
-  background-color: rgba(252, 253, 253, 0.9); }
+  background-color: rgba(248, 249, 249, 0.9); }
   GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover,
   GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover {
     border-color: #5294E2; }
@@ -2584,7 +2629,7 @@ GdTaggedEntry {
 .preferences.sidebar GtkViewport {
   border: none; }
 .preferences.sidebar GtkListBox {
-  background-color: #f9fafb; }
+  background-color: #F5F6F7; }
 .preferences.sidebar GtkListBoxRow {
   padding: 10px; }
 
@@ -2620,10 +2665,10 @@ GbSearchDisplayGroup GtkListBox .list-row, GbDocumentStack .button {
 
 GbViewStack GtkBox.header.notebook,
 GbEditorWorkspace > GtkPaned > GtkBox > GtkBox.header.notebook {
-  border-bottom: 1px solid #dde3e9; }
+  border-bottom: 1px solid #dcdfe3; }
 
 GbViewStack.focused GtkBox.header.notebook {
-  background-color: #f9fafb; }
+  background-color: #F5F6F7; }
   GbViewStack.focused GtkBox.header.notebook .button.dim-label, GbViewStack.focused GtkBox.header.notebook GtkLabel.button.separator, GbViewStack.focused GtkBox.header.notebook .header-bar .button.subtitle, .header-bar GbViewStack.focused GtkBox.header.notebook .button.subtitle {
     opacity: 1; }
 
@@ -2864,7 +2909,7 @@ MarlinViewWindow *:selected:focus {
 PantheonTerminalPantheonTerminalWindow.background {
   background-color: transparent; }
   PantheonTerminalPantheonTerminalWindow.background .notebook.header.top {
-    box-shadow: inset 0 1px #d4d5db, inset 0 -1px #edf0f3; }
+    box-shadow: inset 0 1px #d4d5db, inset 0 -1px #eaecee; }
 
 SwitchboardCategoryView .view:selected,
 SwitchboardCategoryView .view:selected:focus {
@@ -2924,8 +2969,8 @@ GraniteWidgetsThinPaned {
   background-color: transparent;
   background-image: none;
   margin: 0;
-  border-left: 1px solid #dde3e9;
-  border-right: 1px solid #dde3e9; }
+  border-left: 1px solid #dcdfe3;
+  border-right: 1px solid #dcdfe3; }
 
 GraniteWidgetsPopOver .frame,
 GraniteWidgetsStaticNotebook .frame {
@@ -2937,7 +2982,7 @@ GraniteWidgetsStaticNotebook .frame {
 
 .secondary-toolbar.toolbar, .secondary-toolbar.inline-toolbar {
   padding: 3px;
-  border-bottom: 1px solid #dde3e9; }
+  border-bottom: 1px solid #dcdfe3; }
   .secondary-toolbar.toolbar .button, .secondary-toolbar.inline-toolbar .button {
     padding: 0 3px 0 3px; }
 
@@ -2945,8 +2990,8 @@ GraniteWidgetsStaticNotebook .frame {
   padding: 5px;
   border-width: 1px 0 0 0;
   border-style: solid;
-  border-color: #dde3e9;
-  background-color: #f9fafb; }
+  border-color: #dcdfe3;
+  background-color: #F5F6F7; }
   .bottom-toolbar.toolbar .button, .bottom-toolbar.inline-toolbar .button {
     padding: 2px 3px 2px 3px; }
 
@@ -2956,7 +3001,7 @@ GraniteWidgetsStaticNotebook .frame {
 
 .source-list,
 .source-list.view {
-  background-color: #f9fafb;
+  background-color: #F5F6F7;
   color: #5c616c;
   -gtk-icon-style: regular; }
 
@@ -2978,7 +3023,7 @@ GraniteWidgetsStaticNotebook .frame {
 .source-list .scrollbar.trough {
   border-image: none;
   border-color: transparent;
-  background-color: #f9fafb;
+  background-color: #F5F6F7;
   background-image: none; }
 
 .source-list.badge,
@@ -3017,7 +3062,7 @@ GraniteWidgetsWelcome {
   background-color: #ffffff; }
 
 GraniteWidgetsWelcome GtkLabel {
-  color: #aaadb3;
+  color: #a8abb1;
   font: open sans 11;
   text-shadow: none; }
 
@@ -3056,7 +3101,7 @@ GraniteWidgetsPopOver * {
 
 .h4,
 .category-label {
-  color: #8b8e96;
+  color: #898d95;
   font-weight: 600;
   text-shadow: 0 1px rgba(255, 255, 255, 0.6); }
 
@@ -3071,10 +3116,10 @@ GtkListBox .h4 {
   color: #d4d5db; }
 
 GtkFileChooserDialog .dialog-action-box {
-  background-color: #f9fafb; }
+  background-color: #F5F6F7; }
 
 NemoWindow GtkEventBox {
-  background-color: #f9fafb; }
+  background-color: #F5F6F7; }
 
 GtkFileChooserDialog *,
 NautilusWindow *,
@@ -3249,17 +3294,22 @@ MarlinViewWindow .pane-separator {
   background-color: #3c4049; }
 
 GtkFileChooserDialog GtkPaned > .vertical > .horizontal {
-  background-color: #f9fafb; }
+  background-color: #F5F6F7; }
 
 GeditWindow.background.csd {
   background-color: transparent; }
   GeditWindow.background.csd .pane-separator,
   GeditWindow.background.csd .pane-separator:hover {
     background-color: #3c4049; }
-  GeditWindow.background.csd .titlebar .pane-separator {
+  GeditWindow.background.csd .titlebar .pane-separator, GeditWindow.background.csd.maximized .titlebar .pane-separator,
+  GeditWindow.background.csd .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized .titlebar .pane-separator:backdrop {
     background-color: #d4d5db; }
   GeditWindow.background.csd .titlebar {
     background-color: transparent; }
+  GeditWindow.background.csd.maximized .titlebar {
+    background-color: #e7e8eb; }
+    GeditWindow.background.csd.maximized .titlebar:backdrop {
+      background-color: #eff0f2; }
   GeditWindow.background.csd .gedit-titlebar-left.titlebar,
   GeditWindow.background.csd .gedit-titlebar-right.titlebar {
     background-color: #e7e8eb; }
@@ -3377,25 +3427,25 @@ GtkFileChooserDialog .action-bar.frame {
 /* GTK NAMED COLORS */
 @define-color theme_fg_color #5c616c;
 @define-color theme_text_color #5c616c;
-@define-color theme_bg_color #f9fafb;
+@define-color theme_bg_color #F5F6F7;
 @define-color theme_base_color #ffffff;
 @define-color theme_selected_bg_color #5294E2;
 @define-color theme_selected_fg_color #ffffff;
 @define-color fg_color #5c616c;
 @define-color text_color #5c616c;
-@define-color bg_color #f9fafb;
+@define-color bg_color #F5F6F7;
 @define-color base_color #ffffff;
 @define-color selected_bg_color #5294E2;
 @define-color selected_fg_color #ffffff;
-@define-color insensitive_bg_color #fcfdfd;
+@define-color insensitive_bg_color #fbfbfb;
 @define-color insensitive_fg_color rgba(92, 97, 108, 0.55);
 @define-color insensitive_base_color #ffffff;
 @define-color theme_unfocused_fg_color #5c616c;
 @define-color theme_unfocused_text_color #5c616c;
-@define-color theme_unfocused_bg_color #f9fafb;
+@define-color theme_unfocused_bg_color #F5F6F7;
 @define-color theme_unfocused_base_color #ffffff;
-@define-color borders #dde3e9;
-@define-color unfocused_borders #dde3e9;
+@define-color borders #dcdfe3;
+@define-color unfocused_borders #dcdfe3;
 @define-color warning_color #F27835;
 @define-color error_color #FC4138;
 @define-color success_color #73d216;