8 files changed, 562 insertions, 468 deletions
diff --git a/common/gtk-3.0/3.16/_applications.scss b/common/gtk-3.0/3.16/_applications.scss
index dc5b3cb..2d89bed 100644
--- a/common/gtk-3.0/3.16/_applications.scss
+++ b/common/gtk-3.0/3.16/_applications.scss
@@ -31,34 +31,37 @@ TerminalWindow {
     background-color: transparent;
   }
 
-  .notebook tab.reorderable-page,
-  .notebook tab.reorderable-page:hover {
-    padding-top: 4px;
-    padding-bottom: 4px;
-  }
-
   .notebook {
 
     &.header.top {
       box-shadow: inset 0  1px opacify($header_border, 1),
-                  inset 0 -1px if($variant == 'light', lighten($borders_color, 5%), lighten($borders_color, 1%));
+                  inset 0 -1px $borders_color;
     }
 
-    tab {
-      .active-page GtkLabel {
-        color: $header_fg;
-
-        &:backdrop { color: transparentize($header_fg, 0.3); }
-      }
-
-      &.reorderable-page.top:active,
-      &.reorderable-page.top:active:hover {
-        background-color: opacify($header_bg, 1);
-        border-color: opacify($header_border, 1);
-
-        &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
+/*    tab {
+      &.reorderable-page.top, &.top {
+        border-width: 1px;
+        border-color: transparent;
+        box-shadow: none;
+        &:hover, &.prelight-page {
+          border-color: transparentize($borders_color, 0.5);
+          border-width: 1px;
+          border-top-width: 0;
+          background-color: transparentize($bg_color,0.8);
+          box-shadow: none;
+        }
+        &:active, &.active-page, &.active-page:hover {
+          border-width: 1px;
+          border-top-width: 0;
+          border-color: $header_border;
+          background-color: opacify($header_bg, 1);
+          box-shadow: none;
+
+          &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
+        }
       }
     }
+*/
   }
 
   .scrollbar {
@@ -105,6 +108,7 @@ NautilusNotebook.notebook {
 NautilusQueryEditor .search-bar.toolbar {
   padding: 5px;
   box-shadow: none;
+  background-color: $base_color;
 }
 
 .nautilus-circular-button {
@@ -717,7 +721,7 @@ PantheonTerminalPantheonTerminalWindow.background {
 
     &.header.top {
       box-shadow: inset 0  1px opacify($header_border, 1),
-                  inset 0 -1px if($variant == 'light', lighten($borders_color, 5%), lighten($borders_color, 1%));
+                  inset 0 -1px $borders_color;
     }
   }
 }
diff --git a/common/gtk-3.0/3.16/_common.scss b/common/gtk-3.0/3.16/_common.scss
index b60279a..5a38722 100644
--- a/common/gtk-3.0/3.16/_common.scss
+++ b/common/gtk-3.0/3.16/_common.scss
@@ -1615,11 +1615,11 @@ column-header.button.dnd { // for treeview-like derive widgets
   // ...
   // Abandon all hope — Ye Who Enter Here
   padding: 0;
-  background-color: darken($base_color, 0.5%);
-  -GtkNotebook-initial-gap: 10;
+  background-color: $base_color;
+  -GtkNotebook-initial-gap: 4;
   -GtkNotebook-arrow-spacing: 5;
   -GtkNotebook-tab-curvature: 0;
-  -GtkNotebook-tab-overlap: -8;
+  -GtkNotebook-tab-overlap: 1;
   -GtkNotebook-has-tab-gap: false;
   -GtkWidget-focus-padding: 0;
   -GtkWidget-focus-line-width: 0;
@@ -1636,18 +1636,18 @@ column-header.button.dnd { // for treeview-like derive widgets
   &.header {
     // FIXME: double borders in some case, can't fix it w/o a class tho
     // FIXME: doesn't work on dark var
-    background-color: mix($base_color, $bg_color, 50%);
+    background-color: $bg_color;
 
     // this is the shading of the header behind the tabs
     &.frame {
-      border: 1px solid $borders_color;
+      border: 0px solid $borders_color;
       &.top { border-bottom-width: 0; }
       &.bottom { border-top-width: 0; }
       &.right { border-left-width: 0; }
       &.left { border-right-width: 0; }
     }
 
-    $_header_border: if($variant == 'light', lighten($borders_color, 5%), $borders_color);
+    $_header_border: $borders_color;
     &.top {
       box-shadow: inset 0 -1px $_header_border; // border
     }
@@ -1670,17 +1670,14 @@ column-header.button.dnd { // for treeview-like derive widgets
 
     outline-offset: 0;
 
-    //vertical tab sizing
-    $vt_vpadding: 5px;
-    $vt_hpadding: 20px;
-    // horizontal tab sizing
-    $ht_vpadding: 5px;
-    $ht_hpadding: 20px;
+    // tab sizing
+    $vpadding: 4px;
+    $hpadding: 15px;
 
     //FIXME: we get double border in some cases, not considering the broken
     //notebook content frame...
-    &.top, &.bottom { padding: $vt_vpadding $vt_hpadding; }
-    &.left, &.right { padding: $ht_vpadding $ht_hpadding; }
+    &.top, &.bottom { padding: $vpadding $hpadding; }
+    &.left, &.right { padding: $vpadding $hpadding; }
 
     &.reorderable-page {
       &.top, &.bottom {
@@ -1696,19 +1693,58 @@ column-header.button.dnd { // for treeview-like derive widgets
     }
     @each $_tab in (top, bottom, right, left) {
       &.reorderable-page.#{$_tab}, &.#{$_tab} {
+
+        @if $_tab==top or $_tab==bottom {
+          padding-#{$_tab}: $vpadding + 2;
+        }
+        @else if $_tab==left or $_tab==right {
+          padding-#{$_tab}: $hpadding + 2;
+        }
+
+        @if $_tab==top { border-radius: 3.5px 2px 0 0; }
+        @else if $_tab==bottom { border-radius: 0 0 2px 3.5px; }
+        @else if $_tab==left { border-radius: 3.5px 0 0 3.5px; }
+        @else if $_tab==right { border-radius: 0 3.5px 3.5px 0; }
+
+        border-width: 0;
+        border-#{$_tab}-width: 2px;
         border-color: transparent;
+        background-color: transparentize($base_color, 1);
+
         &:hover, &.prelight-page {
-          border-color: transparentize($borders_color, 0.5);
-          border-width: 1px;
-          border-#{$_tab}-width: 0;
-          background-color: transparentize($bg_color,0.8);
+          background-color: transparentize($base_color, 0.5);
+          box-shadow: inset 0 1px $borders_color,
+                      inset 0 -1px $borders_color,
+                      inset 1px 0 $borders_color,
+                      inset -1px 0 $borders_color;
         }
         &:active, &.active-page, &.active-page:hover {
-          border-width: 1px;
-          border-#{$_tab}-width: 0;
-          border-color: $borders_color;
-          background-color: if($variant == 'light', transparentize(black, 0.965), transparentize(black, 0.85));
-          &:hover { background-color: if($variant == 'light', transparentize(black, 0.965), transparentize(black, 0.85)); }
+          background-color: $base_color;
+
+          @if $_tab==top {
+            box-shadow: inset 0 1px $borders_color,
+                        inset 0 -1px $base_color,
+                        inset 1px 0 $borders_color,
+                        inset -1px 0 $borders_color;
+          }
+          @else if $_tab==bottom {
+            box-shadow: inset 0 -1px $base_color,
+                        inset 0 -1px $borders_color,
+                        inset 1px 0 $borders_color,
+                        inset -1px 0 $borders_color;
+          }
+          @else if $_tab==left {
+            box-shadow: inset 0 1px $borders_color,
+                        inset 0 -1px $borders_color,
+                        inset 1px 0 $borders_color,
+                        inset -1px 0 $base_color;
+          }
+          @else if $_tab==right {
+            box-shadow: inset 0 1px $borders_color,
+                        inset 0 -1px $borders_color,
+                        inset 1px 0 $base_color,
+                        inset -1px 0 $borders_color;
+          }
         }
       }
     }
diff --git a/common/gtk-3.0/3.16/gtk-contained-dark.css b/common/gtk-3.0/3.16/gtk-contained-dark.css
index 6a38c09..715df3c 100644
--- a/common/gtk-3.0/3.16/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-dark.css
@@ -1276,11 +1276,11 @@ column-header .button, column-header .button:hover, column-header .button:active
  *****************/
 .notebook {
   padding: 0;
-  background-color: #373b44;
-  -GtkNotebook-initial-gap: 10;
+  background-color: #383C45;
+  -GtkNotebook-initial-gap: 4;
   -GtkNotebook-arrow-spacing: 5;
   -GtkNotebook-tab-curvature: 0;
-  -GtkNotebook-tab-overlap: -8;
+  -GtkNotebook-tab-overlap: 1;
   -GtkNotebook-has-tab-gap: false;
   -GtkWidget-focus-padding: 0;
   -GtkWidget-focus-line-width: 0;
@@ -1296,9 +1296,9 @@ column-header .button, column-header .button:hover, column-header .button:active
     .notebook.frame.left {
       border-left-width: 0; }
   .notebook.header {
-    background-color: #3e424b; }
+    background-color: #444852; }
     .notebook.header.frame {
-      border: 1px solid #2d3036; }
+      border: 0px solid #2d3036; }
       .notebook.header.frame.top {
         border-bottom-width: 0; }
       .notebook.header.frame.bottom {
@@ -1323,68 +1323,64 @@ column-header .button, column-header .button:hover, column-header .button:active
     outline-color: transparent;
     outline-offset: 0; }
     .notebook tab.top, .notebook tab.bottom {
-      padding: 5px 20px; }
+      padding: 4px 15px; }
     .notebook tab.left, .notebook tab.right {
-      padding: 5px 20px; }
+      padding: 4px 15px; }
     .notebook tab.reorderable-page.top, .notebook tab.reorderable-page.bottom {
       padding-left: 12px;
       padding-right: 12px; }
     .notebook tab.reorderable-page.top, .notebook tab.top {
-      border-color: transparent; }
+      padding-top: 6px;
+      border-radius: 3.5px 2px 0 0;
+      border-width: 0;
+      border-top-width: 2px;
+      border-color: transparent;
+      background-color: rgba(56, 60, 69, 0); }
       .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(45, 48, 54, 0.5);
-        border-width: 1px;
-        border-top-width: 0;
-        background-color: rgba(68, 72, 82, 0.2); }
+        background-color: rgba(56, 60, 69, 0.5);
+        box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; }
       .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: #2d3036;
-        background-color: rgba(0, 0, 0, 0.15); }
-        .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.15); }
+        background-color: #383C45;
+        box-shadow: inset 0 1px #2d3036, inset 0 -1px #383C45, inset 1px 0 #2d3036, inset -1px 0 #2d3036; }
     .notebook tab.reorderable-page.bottom, .notebook tab.bottom {
-      border-color: transparent; }
+      padding-bottom: 6px;
+      border-radius: 0 0 2px 3.5px;
+      border-width: 0;
+      border-bottom-width: 2px;
+      border-color: transparent;
+      background-color: rgba(56, 60, 69, 0); }
       .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(45, 48, 54, 0.5);
-        border-width: 1px;
-        border-bottom-width: 0;
-        background-color: rgba(68, 72, 82, 0.2); }
+        background-color: rgba(56, 60, 69, 0.5);
+        box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; }
       .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: #2d3036;
-        background-color: rgba(0, 0, 0, 0.15); }
-        .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.15); }
+        background-color: #383C45;
+        box-shadow: inset 0 -1px #383C45, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; }
     .notebook tab.reorderable-page.right, .notebook tab.right {
-      border-color: transparent; }
+      padding-right: 17px;
+      border-radius: 0 3.5px 3.5px 0;
+      border-width: 0;
+      border-right-width: 2px;
+      border-color: transparent;
+      background-color: rgba(56, 60, 69, 0); }
       .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(45, 48, 54, 0.5);
-        border-width: 1px;
-        border-right-width: 0;
-        background-color: rgba(68, 72, 82, 0.2); }
+        background-color: rgba(56, 60, 69, 0.5);
+        box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; }
       .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: #2d3036;
-        background-color: rgba(0, 0, 0, 0.15); }
-        .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.15); }
+        background-color: #383C45;
+        box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #383C45, inset -1px 0 #2d3036; }
     .notebook tab.reorderable-page.left, .notebook tab.left {
-      border-color: transparent; }
+      padding-left: 17px;
+      border-radius: 3.5px 0 0 3.5px;
+      border-width: 0;
+      border-left-width: 2px;
+      border-color: transparent;
+      background-color: rgba(56, 60, 69, 0); }
       .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(45, 48, 54, 0.5);
-        border-width: 1px;
-        border-left-width: 0;
-        background-color: rgba(68, 72, 82, 0.2); }
+        background-color: rgba(56, 60, 69, 0.5);
+        box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; }
       .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: #2d3036;
-        background-color: rgba(0, 0, 0, 0.15); }
-        .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.15); }
+        background-color: #383C45;
+        box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #383C45; }
     .notebook tab GtkLabel {
       padding: 0 2px;
       color: rgba(211, 218, 227, 0.45); }
@@ -2378,21 +2374,33 @@ SushiFontWidget {
 
 TerminalWindow .background {
   background-color: transparent; }
-TerminalWindow .notebook tab.reorderable-page,
-TerminalWindow .notebook tab.reorderable-page:hover {
-  padding-top: 4px;
-  padding-bottom: 4px; }
-TerminalWindow .notebook.header.top {
-  box-shadow: inset 0 1px #24272d, inset 0 -1px #2f3239; }
-TerminalWindow .notebook tab .active-page GtkLabel {
-  color: rgba(207, 218, 231, 0.8); }
-  TerminalWindow .notebook tab .active-page GtkLabel:backdrop {
-    color: rgba(207, 218, 231, 0.5); }
-TerminalWindow .notebook tab.reorderable-page.top:active, TerminalWindow .notebook tab.reorderable-page.top:active:hover {
-  background-color: #2f343b;
-  border-color: #24272d; }
-  TerminalWindow .notebook tab.reorderable-page.top:active:backdrop, TerminalWindow .notebook tab.reorderable-page.top:active:hover:backdrop {
-    background-color: #32383f; }
+TerminalWindow .notebook {
+  /*    tab {
+        &.reorderable-page.top, &.top {
+          border-width: 1px;
+          border-color: transparent;
+          box-shadow: none;
+          &:hover, &.prelight-page {
+            border-color: transparentize($borders_color, 0.5);
+            border-width: 1px;
+            border-top-width: 0;
+            background-color: transparentize($bg_color,0.8);
+            box-shadow: none;
+          }
+          &:active, &.active-page, &.active-page:hover {
+            border-width: 1px;
+            border-top-width: 0;
+            border-color: $header_border;
+            background-color: opacify($header_bg, 1);
+            box-shadow: none;
+  
+            &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
+          }
+        }
+      }
+  */ }
+  TerminalWindow .notebook.header.top {
+    box-shadow: inset 0 1px #24272d, inset 0 -1px #2d3036; }
 TerminalWindow .scrollbar.vertical .slider {
   margin-left: 3px; }
 TerminalWindow .scrollbar.trough {
@@ -2430,7 +2438,8 @@ NautilusNotebook.notebook {
 
 NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline-toolbar {
   padding: 5px;
-  box-shadow: none; }
+  box-shadow: none;
+  background-color: #383C45; }
 
 .nautilus-circular-button {
   border-radius: 50%;
@@ -2905,7 +2914,7 @@ WingpanelWidgetsIndicatorPopover.popover {
 PantheonTerminalPantheonTerminalWindow.background {
   background-color: transparent; }
   PantheonTerminalPantheonTerminalWindow.background .notebook.header.top {
-    box-shadow: inset 0 1px #24272d, inset 0 -1px #2f3239; }
+    box-shadow: inset 0 1px #24272d, inset 0 -1px #2d3036; }
 
 SwitchboardCategoryView .view:selected,
 SwitchboardCategoryView .view:selected:focus {
diff --git a/common/gtk-3.0/3.16/gtk-contained-darker.css b/common/gtk-3.0/3.16/gtk-contained-darker.css
index fb7dd43..a4f6013 100644
--- a/common/gtk-3.0/3.16/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.16/gtk-contained-darker.css
@@ -1277,11 +1277,11 @@ column-header .button, column-header .button:hover, column-header .button:active
  *****************/
 .notebook {
   padding: 0;
-  background-color: #fefefe;
-  -GtkNotebook-initial-gap: 10;
+  background-color: #ffffff;
+  -GtkNotebook-initial-gap: 4;
   -GtkNotebook-arrow-spacing: 5;
   -GtkNotebook-tab-curvature: 0;
-  -GtkNotebook-tab-overlap: -8;
+  -GtkNotebook-tab-overlap: 1;
   -GtkNotebook-has-tab-gap: false;
   -GtkWidget-focus-padding: 0;
   -GtkWidget-focus-line-width: 0;
@@ -1297,9 +1297,9 @@ column-header .button, column-header .button:hover, column-header .button:active
     .notebook.frame.left {
       border-left-width: 0; }
   .notebook.header {
-    background-color: #fafafb; }
+    background-color: #F5F6F7; }
     .notebook.header.frame {
-      border: 1px solid #dcdfe3; }
+      border: 0px solid #dcdfe3; }
       .notebook.header.frame.top {
         border-bottom-width: 0; }
       .notebook.header.frame.bottom {
@@ -1309,13 +1309,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 #eaecee; }
+      box-shadow: inset 0 -1px #dcdfe3; }
     .notebook.header.bottom {
-      box-shadow: inset 0 1px #eaecee; }
+      box-shadow: inset 0 1px #dcdfe3; }
     .notebook.header.right {
-      box-shadow: inset 1px 0 #eaecee; }
+      box-shadow: inset 1px 0 #dcdfe3; }
     .notebook.header.left {
-      box-shadow: inset -1px 0 #eaecee; }
+      box-shadow: inset -1px 0 #dcdfe3; }
   .notebook tab {
     border-width: 0;
     border-style: solid;
@@ -1324,68 +1324,64 @@ column-header .button, column-header .button:hover, column-header .button:active
     outline-color: transparent;
     outline-offset: 0; }
     .notebook tab.top, .notebook tab.bottom {
-      padding: 5px 20px; }
+      padding: 4px 15px; }
     .notebook tab.left, .notebook tab.right {
-      padding: 5px 20px; }
+      padding: 4px 15px; }
     .notebook tab.reorderable-page.top, .notebook tab.reorderable-page.bottom {
       padding-left: 12px;
       padding-right: 12px; }
     .notebook tab.reorderable-page.top, .notebook tab.top {
-      border-color: transparent; }
+      padding-top: 6px;
+      border-radius: 3.5px 2px 0 0;
+      border-width: 0;
+      border-top-width: 2px;
+      border-color: transparent;
+      background-color: rgba(255, 255, 255, 0); }
       .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(220, 223, 227, 0.5);
-        border-width: 1px;
-        border-top-width: 0;
-        background-color: rgba(245, 246, 247, 0.2); }
+        background-color: rgba(255, 255, 255, 0.5);
+        box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; }
       .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: #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.035); }
+        background-color: #ffffff;
+        box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #ffffff, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; }
     .notebook tab.reorderable-page.bottom, .notebook tab.bottom {
-      border-color: transparent; }
+      padding-bottom: 6px;
+      border-radius: 0 0 2px 3.5px;
+      border-width: 0;
+      border-bottom-width: 2px;
+      border-color: transparent;
+      background-color: rgba(255, 255, 255, 0); }
       .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(220, 223, 227, 0.5);
-        border-width: 1px;
-        border-bottom-width: 0;
-        background-color: rgba(245, 246, 247, 0.2); }
+        background-color: rgba(255, 255, 255, 0.5);
+        box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; }
       .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: #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.035); }
+        background-color: #ffffff;
+        box-shadow: inset 0 -1px #ffffff, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; }
     .notebook tab.reorderable-page.right, .notebook tab.right {
-      border-color: transparent; }
+      padding-right: 17px;
+      border-radius: 0 3.5px 3.5px 0;
+      border-width: 0;
+      border-right-width: 2px;
+      border-color: transparent;
+      background-color: rgba(255, 255, 255, 0); }
       .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(220, 223, 227, 0.5);
-        border-width: 1px;
-        border-right-width: 0;
-        background-color: rgba(245, 246, 247, 0.2); }
+        background-color: rgba(255, 255, 255, 0.5);
+        box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; }
       .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: #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.035); }
+        background-color: #ffffff;
+        box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #ffffff, inset -1px 0 #dcdfe3; }
     .notebook tab.reorderable-page.left, .notebook tab.left {
-      border-color: transparent; }
+      padding-left: 17px;
+      border-radius: 3.5px 0 0 3.5px;
+      border-width: 0;
+      border-left-width: 2px;
+      border-color: transparent;
+      background-color: rgba(255, 255, 255, 0); }
       .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(220, 223, 227, 0.5);
-        border-width: 1px;
-        border-left-width: 0;
-        background-color: rgba(245, 246, 247, 0.2); }
+        background-color: rgba(255, 255, 255, 0.5);
+        box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; }
       .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: #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.035); }
+        background-color: #ffffff;
+        box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #ffffff; }
     .notebook tab GtkLabel {
       padding: 0 2px;
       color: rgba(92, 97, 108, 0.55); }
@@ -2379,21 +2375,33 @@ SushiFontWidget {
 
 TerminalWindow .background {
   background-color: transparent; }
-TerminalWindow .notebook tab.reorderable-page,
-TerminalWindow .notebook tab.reorderable-page:hover {
-  padding-top: 4px;
-  padding-bottom: 4px; }
-TerminalWindow .notebook.header.top {
-  box-shadow: inset 0 1px #1f2227, inset 0 -1px #eaecee; }
-TerminalWindow .notebook tab .active-page GtkLabel {
-  color: rgba(207, 218, 231, 0.8); }
-  TerminalWindow .notebook tab .active-page GtkLabel:backdrop {
-    color: rgba(207, 218, 231, 0.5); }
-TerminalWindow .notebook tab.reorderable-page.top:active, TerminalWindow .notebook tab.reorderable-page.top:active:hover {
-  background-color: #2f343b;
-  border-color: #1f2227; }
-  TerminalWindow .notebook tab.reorderable-page.top:active:backdrop, TerminalWindow .notebook tab.reorderable-page.top:active:hover:backdrop {
-    background-color: #32383f; }
+TerminalWindow .notebook {
+  /*    tab {
+        &.reorderable-page.top, &.top {
+          border-width: 1px;
+          border-color: transparent;
+          box-shadow: none;
+          &:hover, &.prelight-page {
+            border-color: transparentize($borders_color, 0.5);
+            border-width: 1px;
+            border-top-width: 0;
+            background-color: transparentize($bg_color,0.8);
+            box-shadow: none;
+          }
+          &:active, &.active-page, &.active-page:hover {
+            border-width: 1px;
+            border-top-width: 0;
+            border-color: $header_border;
+            background-color: opacify($header_bg, 1);
+            box-shadow: none;
+  
+            &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
+          }
+        }
+      }
+  */ }
+  TerminalWindow .notebook.header.top {
+    box-shadow: inset 0 1px #1f2227, inset 0 -1px #dcdfe3; }
 TerminalWindow .scrollbar.vertical .slider {
   margin-left: 3px; }
 TerminalWindow .scrollbar.trough {
@@ -2431,7 +2439,8 @@ NautilusNotebook.notebook {
 
 NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline-toolbar {
   padding: 5px;
-  box-shadow: none; }
+  box-shadow: none;
+  background-color: #ffffff; }
 
 .nautilus-circular-button {
   border-radius: 50%;
@@ -2906,7 +2915,7 @@ WingpanelWidgetsIndicatorPopover.popover {
 PantheonTerminalPantheonTerminalWindow.background {
   background-color: transparent; }
   PantheonTerminalPantheonTerminalWindow.background .notebook.header.top {
-    box-shadow: inset 0 1px #1f2227, inset 0 -1px #eaecee; }
+    box-shadow: inset 0 1px #1f2227, inset 0 -1px #dcdfe3; }
 
 SwitchboardCategoryView .view:selected,
 SwitchboardCategoryView .view:selected:focus {
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
index f42002a..866c82c 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
@@ -1276,11 +1276,11 @@ column-header .button, column-header .button:hover, column-header .button:active
  *****************/
 .notebook {
   padding: 0;
-  background-color: #373b44;
-  -GtkNotebook-initial-gap: 10;
+  background-color: #383C45;
+  -GtkNotebook-initial-gap: 4;
   -GtkNotebook-arrow-spacing: 5;
   -GtkNotebook-tab-curvature: 0;
-  -GtkNotebook-tab-overlap: -8;
+  -GtkNotebook-tab-overlap: 1;
   -GtkNotebook-has-tab-gap: false;
   -GtkWidget-focus-padding: 0;
   -GtkWidget-focus-line-width: 0;
@@ -1296,9 +1296,9 @@ column-header .button, column-header .button:hover, column-header .button:active
     .notebook.frame.left {
       border-left-width: 0; }
   .notebook.header {
-    background-color: #3e424b; }
+    background-color: #444852; }
     .notebook.header.frame {
-      border: 1px solid #2d3036; }
+      border: 0px solid #2d3036; }
       .notebook.header.frame.top {
         border-bottom-width: 0; }
       .notebook.header.frame.bottom {
@@ -1323,68 +1323,64 @@ column-header .button, column-header .button:hover, column-header .button:active
     outline-color: transparent;
     outline-offset: 0; }
     .notebook tab.top, .notebook tab.bottom {
-      padding: 5px 20px; }
+      padding: 4px 15px; }
     .notebook tab.left, .notebook tab.right {
-      padding: 5px 20px; }
+      padding: 4px 15px; }
     .notebook tab.reorderable-page.top, .notebook tab.reorderable-page.bottom {
       padding-left: 12px;
       padding-right: 12px; }
     .notebook tab.reorderable-page.top, .notebook tab.top {
-      border-color: transparent; }
+      padding-top: 6px;
+      border-radius: 3.5px 2px 0 0;
+      border-width: 0;
+      border-top-width: 2px;
+      border-color: transparent;
+      background-color: rgba(56, 60, 69, 0); }
       .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(45, 48, 54, 0.5);
-        border-width: 1px;
-        border-top-width: 0;
-        background-color: rgba(68, 72, 82, 0.2); }
+        background-color: rgba(56, 60, 69, 0.5);
+        box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; }
       .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: #2d3036;
-        background-color: rgba(0, 0, 0, 0.15); }
-        .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.15); }
+        background-color: #383C45;
+        box-shadow: inset 0 1px #2d3036, inset 0 -1px #383C45, inset 1px 0 #2d3036, inset -1px 0 #2d3036; }
     .notebook tab.reorderable-page.bottom, .notebook tab.bottom {
-      border-color: transparent; }
+      padding-bottom: 6px;
+      border-radius: 0 0 2px 3.5px;
+      border-width: 0;
+      border-bottom-width: 2px;
+      border-color: transparent;
+      background-color: rgba(56, 60, 69, 0); }
       .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(45, 48, 54, 0.5);
-        border-width: 1px;
-        border-bottom-width: 0;
-        background-color: rgba(68, 72, 82, 0.2); }
+        background-color: rgba(56, 60, 69, 0.5);
+        box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; }
       .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: #2d3036;
-        background-color: rgba(0, 0, 0, 0.15); }
-        .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.15); }
+        background-color: #383C45;
+        box-shadow: inset 0 -1px #383C45, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; }
     .notebook tab.reorderable-page.right, .notebook tab.right {
-      border-color: transparent; }
+      padding-right: 17px;
+      border-radius: 0 3.5px 3.5px 0;
+      border-width: 0;
+      border-right-width: 2px;
+      border-color: transparent;
+      background-color: rgba(56, 60, 69, 0); }
       .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(45, 48, 54, 0.5);
-        border-width: 1px;
-        border-right-width: 0;
-        background-color: rgba(68, 72, 82, 0.2); }
+        background-color: rgba(56, 60, 69, 0.5);
+        box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; }
       .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: #2d3036;
-        background-color: rgba(0, 0, 0, 0.15); }
-        .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.15); }
+        background-color: #383C45;
+        box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #383C45, inset -1px 0 #2d3036; }
     .notebook tab.reorderable-page.left, .notebook tab.left {
-      border-color: transparent; }
+      padding-left: 17px;
+      border-radius: 3.5px 0 0 3.5px;
+      border-width: 0;
+      border-left-width: 2px;
+      border-color: transparent;
+      background-color: rgba(56, 60, 69, 0); }
       .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(45, 48, 54, 0.5);
-        border-width: 1px;
-        border-left-width: 0;
-        background-color: rgba(68, 72, 82, 0.2); }
+        background-color: rgba(56, 60, 69, 0.5);
+        box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; }
       .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: #2d3036;
-        background-color: rgba(0, 0, 0, 0.15); }
-        .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.15); }
+        background-color: #383C45;
+        box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #383C45; }
     .notebook tab GtkLabel {
       padding: 0 2px;
       color: rgba(211, 218, 227, 0.45); }
@@ -2378,21 +2374,33 @@ SushiFontWidget {
 
 TerminalWindow .background {
   background-color: transparent; }
-TerminalWindow .notebook tab.reorderable-page,
-TerminalWindow .notebook tab.reorderable-page:hover {
-  padding-top: 4px;
-  padding-bottom: 4px; }
-TerminalWindow .notebook.header.top {
-  box-shadow: inset 0 1px #24272d, inset 0 -1px #2f3239; }
-TerminalWindow .notebook tab .active-page GtkLabel {
-  color: rgba(207, 218, 231, 0.8); }
-  TerminalWindow .notebook tab .active-page GtkLabel:backdrop {
-    color: rgba(207, 218, 231, 0.5); }
-TerminalWindow .notebook tab.reorderable-page.top:active, TerminalWindow .notebook tab.reorderable-page.top:active:hover {
-  background-color: #2f343b;
-  border-color: #24272d; }
-  TerminalWindow .notebook tab.reorderable-page.top:active:backdrop, TerminalWindow .notebook tab.reorderable-page.top:active:hover:backdrop {
-    background-color: #32383f; }
+TerminalWindow .notebook {
+  /*    tab {
+        &.reorderable-page.top, &.top {
+          border-width: 1px;
+          border-color: transparent;
+          box-shadow: none;
+          &:hover, &.prelight-page {
+            border-color: transparentize($borders_color, 0.5);
+            border-width: 1px;
+            border-top-width: 0;
+            background-color: transparentize($bg_color,0.8);
+            box-shadow: none;
+          }
+          &:active, &.active-page, &.active-page:hover {
+            border-width: 1px;
+            border-top-width: 0;
+            border-color: $header_border;
+            background-color: opacify($header_bg, 1);
+            box-shadow: none;
+  
+            &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
+          }
+        }
+      }
+  */ }
+  TerminalWindow .notebook.header.top {
+    box-shadow: inset 0 1px #24272d, inset 0 -1px #2d3036; }
 TerminalWindow .scrollbar.vertical .slider {
   margin-left: 3px; }
 TerminalWindow .scrollbar.trough {
@@ -2430,7 +2438,8 @@ NautilusNotebook.notebook {
 
 NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline-toolbar {
   padding: 5px;
-  box-shadow: none; }
+  box-shadow: none;
+  background-color: #383C45; }
 
 .nautilus-circular-button {
   border-radius: 50%;
@@ -2905,7 +2914,7 @@ WingpanelWidgetsIndicatorPopover.popover {
 PantheonTerminalPantheonTerminalWindow.background {
   background-color: transparent; }
   PantheonTerminalPantheonTerminalWindow.background .notebook.header.top {
-    box-shadow: inset 0 1px #24272d, inset 0 -1px #2f3239; }
+    box-shadow: inset 0 1px #24272d, inset 0 -1px #2d3036; }
 
 SwitchboardCategoryView .view:selected,
 SwitchboardCategoryView .view:selected:focus {
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
index 5eb7f19..5907ea6 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
@@ -1277,11 +1277,11 @@ column-header .button, column-header .button:hover, column-header .button:active
  *****************/
 .notebook {
   padding: 0;
-  background-color: #fefefe;
-  -GtkNotebook-initial-gap: 10;
+  background-color: #ffffff;
+  -GtkNotebook-initial-gap: 4;
   -GtkNotebook-arrow-spacing: 5;
   -GtkNotebook-tab-curvature: 0;
-  -GtkNotebook-tab-overlap: -8;
+  -GtkNotebook-tab-overlap: 1;
   -GtkNotebook-has-tab-gap: false;
   -GtkWidget-focus-padding: 0;
   -GtkWidget-focus-line-width: 0;
@@ -1297,9 +1297,9 @@ column-header .button, column-header .button:hover, column-header .button:active
     .notebook.frame.left {
       border-left-width: 0; }
   .notebook.header {
-    background-color: #fafafb; }
+    background-color: #F5F6F7; }
     .notebook.header.frame {
-      border: 1px solid #dcdfe3; }
+      border: 0px solid #dcdfe3; }
       .notebook.header.frame.top {
         border-bottom-width: 0; }
       .notebook.header.frame.bottom {
@@ -1309,13 +1309,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 #eaecee; }
+      box-shadow: inset 0 -1px #dcdfe3; }
     .notebook.header.bottom {
-      box-shadow: inset 0 1px #eaecee; }
+      box-shadow: inset 0 1px #dcdfe3; }
     .notebook.header.right {
-      box-shadow: inset 1px 0 #eaecee; }
+      box-shadow: inset 1px 0 #dcdfe3; }
     .notebook.header.left {
-      box-shadow: inset -1px 0 #eaecee; }
+      box-shadow: inset -1px 0 #dcdfe3; }
   .notebook tab {
     border-width: 0;
     border-style: solid;
@@ -1324,68 +1324,64 @@ column-header .button, column-header .button:hover, column-header .button:active
     outline-color: transparent;
     outline-offset: 0; }
     .notebook tab.top, .notebook tab.bottom {
-      padding: 5px 20px; }
+      padding: 4px 15px; }
     .notebook tab.left, .notebook tab.right {
-      padding: 5px 20px; }
+      padding: 4px 15px; }
     .notebook tab.reorderable-page.top, .notebook tab.reorderable-page.bottom {
       padding-left: 12px;
       padding-right: 12px; }
     .notebook tab.reorderable-page.top, .notebook tab.top {
-      border-color: transparent; }
+      padding-top: 6px;
+      border-radius: 3.5px 2px 0 0;
+      border-width: 0;
+      border-top-width: 2px;
+      border-color: transparent;
+      background-color: rgba(255, 255, 255, 0); }
       .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(220, 223, 227, 0.5);
-        border-width: 1px;
-        border-top-width: 0;
-        background-color: rgba(245, 246, 247, 0.2); }
+        background-color: rgba(255, 255, 255, 0.5);
+        box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; }
       .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: #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.035); }
+        background-color: #ffffff;
+        box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #ffffff, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; }
     .notebook tab.reorderable-page.bottom, .notebook tab.bottom {
-      border-color: transparent; }
+      padding-bottom: 6px;
+      border-radius: 0 0 2px 3.5px;
+      border-width: 0;
+      border-bottom-width: 2px;
+      border-color: transparent;
+      background-color: rgba(255, 255, 255, 0); }
       .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(220, 223, 227, 0.5);
-        border-width: 1px;
-        border-bottom-width: 0;
-        background-color: rgba(245, 246, 247, 0.2); }
+        background-color: rgba(255, 255, 255, 0.5);
+        box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; }
       .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: #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.035); }
+        background-color: #ffffff;
+        box-shadow: inset 0 -1px #ffffff, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; }
     .notebook tab.reorderable-page.right, .notebook tab.right {
-      border-color: transparent; }
+      padding-right: 17px;
+      border-radius: 0 3.5px 3.5px 0;
+      border-width: 0;
+      border-right-width: 2px;
+      border-color: transparent;
+      background-color: rgba(255, 255, 255, 0); }
       .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(220, 223, 227, 0.5);
-        border-width: 1px;
-        border-right-width: 0;
-        background-color: rgba(245, 246, 247, 0.2); }
+        background-color: rgba(255, 255, 255, 0.5);
+        box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; }
       .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: #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.035); }
+        background-color: #ffffff;
+        box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #ffffff, inset -1px 0 #dcdfe3; }
     .notebook tab.reorderable-page.left, .notebook tab.left {
-      border-color: transparent; }
+      padding-left: 17px;
+      border-radius: 3.5px 0 0 3.5px;
+      border-width: 0;
+      border-left-width: 2px;
+      border-color: transparent;
+      background-color: rgba(255, 255, 255, 0); }
       .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(220, 223, 227, 0.5);
-        border-width: 1px;
-        border-left-width: 0;
-        background-color: rgba(245, 246, 247, 0.2); }
+        background-color: rgba(255, 255, 255, 0.5);
+        box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; }
       .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: #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.035); }
+        background-color: #ffffff;
+        box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #ffffff; }
     .notebook tab GtkLabel {
       padding: 0 2px;
       color: rgba(92, 97, 108, 0.55); }
@@ -2379,21 +2375,33 @@ SushiFontWidget {
 
 TerminalWindow .background {
   background-color: transparent; }
-TerminalWindow .notebook tab.reorderable-page,
-TerminalWindow .notebook tab.reorderable-page:hover {
-  padding-top: 4px;
-  padding-bottom: 4px; }
-TerminalWindow .notebook.header.top {
-  box-shadow: inset 0 1px #1f2227, inset 0 -1px #eaecee; }
-TerminalWindow .notebook tab .active-page GtkLabel {
-  color: rgba(207, 218, 231, 0.8); }
-  TerminalWindow .notebook tab .active-page GtkLabel:backdrop {
-    color: rgba(207, 218, 231, 0.5); }
-TerminalWindow .notebook tab.reorderable-page.top:active, TerminalWindow .notebook tab.reorderable-page.top:active:hover {
-  background-color: #2f343b;
-  border-color: #1f2227; }
-  TerminalWindow .notebook tab.reorderable-page.top:active:backdrop, TerminalWindow .notebook tab.reorderable-page.top:active:hover:backdrop {
-    background-color: #32383f; }
+TerminalWindow .notebook {
+  /*    tab {
+        &.reorderable-page.top, &.top {
+          border-width: 1px;
+          border-color: transparent;
+          box-shadow: none;
+          &:hover, &.prelight-page {
+            border-color: transparentize($borders_color, 0.5);
+            border-width: 1px;
+            border-top-width: 0;
+            background-color: transparentize($bg_color,0.8);
+            box-shadow: none;
+          }
+          &:active, &.active-page, &.active-page:hover {
+            border-width: 1px;
+            border-top-width: 0;
+            border-color: $header_border;
+            background-color: opacify($header_bg, 1);
+            box-shadow: none;
+  
+            &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
+          }
+        }
+      }
+  */ }
+  TerminalWindow .notebook.header.top {
+    box-shadow: inset 0 1px #1f2227, inset 0 -1px #dcdfe3; }
 TerminalWindow .scrollbar.vertical .slider {
   margin-left: 3px; }
 TerminalWindow .scrollbar.trough {
@@ -2431,7 +2439,8 @@ NautilusNotebook.notebook {
 
 NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline-toolbar {
   padding: 5px;
-  box-shadow: none; }
+  box-shadow: none;
+  background-color: #ffffff; }
 
 .nautilus-circular-button {
   border-radius: 50%;
@@ -2906,7 +2915,7 @@ WingpanelWidgetsIndicatorPopover.popover {
 PantheonTerminalPantheonTerminalWindow.background {
   background-color: transparent; }
   PantheonTerminalPantheonTerminalWindow.background .notebook.header.top {
-    box-shadow: inset 0 1px #1f2227, inset 0 -1px #eaecee; }
+    box-shadow: inset 0 1px #1f2227, inset 0 -1px #dcdfe3; }
 
 SwitchboardCategoryView .view:selected,
 SwitchboardCategoryView .view:selected:focus {
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid.css b/common/gtk-3.0/3.16/gtk-contained-solid.css
index 9dfda59..06290ec 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid.css
@@ -1276,11 +1276,11 @@ column-header .button, column-header .button:hover, column-header .button:active
  *****************/
 .notebook {
   padding: 0;
-  background-color: #fefefe;
-  -GtkNotebook-initial-gap: 10;
+  background-color: #ffffff;
+  -GtkNotebook-initial-gap: 4;
   -GtkNotebook-arrow-spacing: 5;
   -GtkNotebook-tab-curvature: 0;
-  -GtkNotebook-tab-overlap: -8;
+  -GtkNotebook-tab-overlap: 1;
   -GtkNotebook-has-tab-gap: false;
   -GtkWidget-focus-padding: 0;
   -GtkWidget-focus-line-width: 0;
@@ -1296,9 +1296,9 @@ column-header .button, column-header .button:hover, column-header .button:active
     .notebook.frame.left {
       border-left-width: 0; }
   .notebook.header {
-    background-color: #fafafb; }
+    background-color: #F5F6F7; }
     .notebook.header.frame {
-      border: 1px solid #dcdfe3; }
+      border: 0px solid #dcdfe3; }
       .notebook.header.frame.top {
         border-bottom-width: 0; }
       .notebook.header.frame.bottom {
@@ -1308,13 +1308,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 #eaecee; }
+      box-shadow: inset 0 -1px #dcdfe3; }
     .notebook.header.bottom {
-      box-shadow: inset 0 1px #eaecee; }
+      box-shadow: inset 0 1px #dcdfe3; }
     .notebook.header.right {
-      box-shadow: inset 1px 0 #eaecee; }
+      box-shadow: inset 1px 0 #dcdfe3; }
     .notebook.header.left {
-      box-shadow: inset -1px 0 #eaecee; }
+      box-shadow: inset -1px 0 #dcdfe3; }
   .notebook tab {
     border-width: 0;
     border-style: solid;
@@ -1323,68 +1323,64 @@ column-header .button, column-header .button:hover, column-header .button:active
     outline-color: transparent;
     outline-offset: 0; }
     .notebook tab.top, .notebook tab.bottom {
-      padding: 5px 20px; }
+      padding: 4px 15px; }
     .notebook tab.left, .notebook tab.right {
-      padding: 5px 20px; }
+      padding: 4px 15px; }
     .notebook tab.reorderable-page.top, .notebook tab.reorderable-page.bottom {
       padding-left: 12px;
       padding-right: 12px; }
     .notebook tab.reorderable-page.top, .notebook tab.top {
-      border-color: transparent; }
+      padding-top: 6px;
+      border-radius: 3.5px 2px 0 0;
+      border-width: 0;
+      border-top-width: 2px;
+      border-color: transparent;
+      background-color: rgba(255, 255, 255, 0); }
       .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(220, 223, 227, 0.5);
-        border-width: 1px;
-        border-top-width: 0;
-        background-color: rgba(245, 246, 247, 0.2); }
+        background-color: rgba(255, 255, 255, 0.5);
+        box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; }
       .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: #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.035); }
+        background-color: #ffffff;
+        box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #ffffff, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; }
     .notebook tab.reorderable-page.bottom, .notebook tab.bottom {
-      border-color: transparent; }
+      padding-bottom: 6px;
+      border-radius: 0 0 2px 3.5px;
+      border-width: 0;
+      border-bottom-width: 2px;
+      border-color: transparent;
+      background-color: rgba(255, 255, 255, 0); }
       .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(220, 223, 227, 0.5);
-        border-width: 1px;
-        border-bottom-width: 0;
-        background-color: rgba(245, 246, 247, 0.2); }
+        background-color: rgba(255, 255, 255, 0.5);
+        box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; }
       .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: #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.035); }
+        background-color: #ffffff;
+        box-shadow: inset 0 -1px #ffffff, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; }
     .notebook tab.reorderable-page.right, .notebook tab.right {
-      border-color: transparent; }
+      padding-right: 17px;
+      border-radius: 0 3.5px 3.5px 0;
+      border-width: 0;
+      border-right-width: 2px;
+      border-color: transparent;
+      background-color: rgba(255, 255, 255, 0); }
       .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(220, 223, 227, 0.5);
-        border-width: 1px;
-        border-right-width: 0;
-        background-color: rgba(245, 246, 247, 0.2); }
+        background-color: rgba(255, 255, 255, 0.5);
+        box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; }
       .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: #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.035); }
+        background-color: #ffffff;
+        box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #ffffff, inset -1px 0 #dcdfe3; }
     .notebook tab.reorderable-page.left, .notebook tab.left {
-      border-color: transparent; }
+      padding-left: 17px;
+      border-radius: 3.5px 0 0 3.5px;
+      border-width: 0;
+      border-left-width: 2px;
+      border-color: transparent;
+      background-color: rgba(255, 255, 255, 0); }
       .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(220, 223, 227, 0.5);
-        border-width: 1px;
-        border-left-width: 0;
-        background-color: rgba(245, 246, 247, 0.2); }
+        background-color: rgba(255, 255, 255, 0.5);
+        box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; }
       .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: #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.035); }
+        background-color: #ffffff;
+        box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #ffffff; }
     .notebook tab GtkLabel {
       padding: 0 2px;
       color: rgba(92, 97, 108, 0.55); }
@@ -2378,21 +2374,33 @@ SushiFontWidget {
 
 TerminalWindow .background {
   background-color: transparent; }
-TerminalWindow .notebook tab.reorderable-page,
-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 #eaecee; }
-TerminalWindow .notebook tab .active-page GtkLabel {
-  color: rgba(82, 93, 118, 0.8); }
-  TerminalWindow .notebook tab .active-page GtkLabel:backdrop {
-    color: rgba(82, 93, 118, 0.5); }
-TerminalWindow .notebook tab.reorderable-page.top:active, TerminalWindow .notebook tab.reorderable-page.top:active:hover {
-  background-color: #e7e8eb;
-  border-color: #d4d5db; }
-  TerminalWindow .notebook tab.reorderable-page.top:active:backdrop, TerminalWindow .notebook tab.reorderable-page.top:active:hover:backdrop {
-    background-color: #eff0f2; }
+TerminalWindow .notebook {
+  /*    tab {
+        &.reorderable-page.top, &.top {
+          border-width: 1px;
+          border-color: transparent;
+          box-shadow: none;
+          &:hover, &.prelight-page {
+            border-color: transparentize($borders_color, 0.5);
+            border-width: 1px;
+            border-top-width: 0;
+            background-color: transparentize($bg_color,0.8);
+            box-shadow: none;
+          }
+          &:active, &.active-page, &.active-page:hover {
+            border-width: 1px;
+            border-top-width: 0;
+            border-color: $header_border;
+            background-color: opacify($header_bg, 1);
+            box-shadow: none;
+  
+            &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
+          }
+        }
+      }
+  */ }
+  TerminalWindow .notebook.header.top {
+    box-shadow: inset 0 1px #d4d5db, inset 0 -1px #dcdfe3; }
 TerminalWindow .scrollbar.vertical .slider {
   margin-left: 3px; }
 TerminalWindow .scrollbar.trough {
@@ -2430,7 +2438,8 @@ NautilusNotebook.notebook {
 
 NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline-toolbar {
   padding: 5px;
-  box-shadow: none; }
+  box-shadow: none;
+  background-color: #ffffff; }
 
 .nautilus-circular-button {
   border-radius: 50%;
@@ -2905,7 +2914,7 @@ WingpanelWidgetsIndicatorPopover.popover {
 PantheonTerminalPantheonTerminalWindow.background {
   background-color: transparent; }
   PantheonTerminalPantheonTerminalWindow.background .notebook.header.top {
-    box-shadow: inset 0 1px #d4d5db, inset 0 -1px #eaecee; }
+    box-shadow: inset 0 1px #d4d5db, inset 0 -1px #dcdfe3; }
 
 SwitchboardCategoryView .view:selected,
 SwitchboardCategoryView .view:selected:focus {
diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css
index d9711bc..213ba89 100644
--- a/common/gtk-3.0/3.16/gtk-contained.css
+++ b/common/gtk-3.0/3.16/gtk-contained.css
@@ -1276,11 +1276,11 @@ column-header .button, column-header .button:hover, column-header .button:active
  *****************/
 .notebook {
   padding: 0;
-  background-color: #fefefe;
-  -GtkNotebook-initial-gap: 10;
+  background-color: #ffffff;
+  -GtkNotebook-initial-gap: 4;
   -GtkNotebook-arrow-spacing: 5;
   -GtkNotebook-tab-curvature: 0;
-  -GtkNotebook-tab-overlap: -8;
+  -GtkNotebook-tab-overlap: 1;
   -GtkNotebook-has-tab-gap: false;
   -GtkWidget-focus-padding: 0;
   -GtkWidget-focus-line-width: 0;
@@ -1296,9 +1296,9 @@ column-header .button, column-header .button:hover, column-header .button:active
     .notebook.frame.left {
       border-left-width: 0; }
   .notebook.header {
-    background-color: #fafafb; }
+    background-color: #F5F6F7; }
     .notebook.header.frame {
-      border: 1px solid #dcdfe3; }
+      border: 0px solid #dcdfe3; }
       .notebook.header.frame.top {
         border-bottom-width: 0; }
       .notebook.header.frame.bottom {
@@ -1308,13 +1308,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 #eaecee; }
+      box-shadow: inset 0 -1px #dcdfe3; }
     .notebook.header.bottom {
-      box-shadow: inset 0 1px #eaecee; }
+      box-shadow: inset 0 1px #dcdfe3; }
     .notebook.header.right {
-      box-shadow: inset 1px 0 #eaecee; }
+      box-shadow: inset 1px 0 #dcdfe3; }
     .notebook.header.left {
-      box-shadow: inset -1px 0 #eaecee; }
+      box-shadow: inset -1px 0 #dcdfe3; }
   .notebook tab {
     border-width: 0;
     border-style: solid;
@@ -1323,68 +1323,64 @@ column-header .button, column-header .button:hover, column-header .button:active
     outline-color: transparent;
     outline-offset: 0; }
     .notebook tab.top, .notebook tab.bottom {
-      padding: 5px 20px; }
+      padding: 4px 15px; }
     .notebook tab.left, .notebook tab.right {
-      padding: 5px 20px; }
+      padding: 4px 15px; }
     .notebook tab.reorderable-page.top, .notebook tab.reorderable-page.bottom {
       padding-left: 12px;
       padding-right: 12px; }
     .notebook tab.reorderable-page.top, .notebook tab.top {
-      border-color: transparent; }
+      padding-top: 6px;
+      border-radius: 3.5px 2px 0 0;
+      border-width: 0;
+      border-top-width: 2px;
+      border-color: transparent;
+      background-color: rgba(255, 255, 255, 0); }
       .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(220, 223, 227, 0.5);
-        border-width: 1px;
-        border-top-width: 0;
-        background-color: rgba(245, 246, 247, 0.2); }
+        background-color: rgba(255, 255, 255, 0.5);
+        box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; }
       .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: #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.035); }
+        background-color: #ffffff;
+        box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #ffffff, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; }
     .notebook tab.reorderable-page.bottom, .notebook tab.bottom {
-      border-color: transparent; }
+      padding-bottom: 6px;
+      border-radius: 0 0 2px 3.5px;
+      border-width: 0;
+      border-bottom-width: 2px;
+      border-color: transparent;
+      background-color: rgba(255, 255, 255, 0); }
       .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(220, 223, 227, 0.5);
-        border-width: 1px;
-        border-bottom-width: 0;
-        background-color: rgba(245, 246, 247, 0.2); }
+        background-color: rgba(255, 255, 255, 0.5);
+        box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; }
       .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: #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.035); }
+        background-color: #ffffff;
+        box-shadow: inset 0 -1px #ffffff, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; }
     .notebook tab.reorderable-page.right, .notebook tab.right {
-      border-color: transparent; }
+      padding-right: 17px;
+      border-radius: 0 3.5px 3.5px 0;
+      border-width: 0;
+      border-right-width: 2px;
+      border-color: transparent;
+      background-color: rgba(255, 255, 255, 0); }
       .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(220, 223, 227, 0.5);
-        border-width: 1px;
-        border-right-width: 0;
-        background-color: rgba(245, 246, 247, 0.2); }
+        background-color: rgba(255, 255, 255, 0.5);
+        box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; }
       .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: #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.035); }
+        background-color: #ffffff;
+        box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #ffffff, inset -1px 0 #dcdfe3; }
     .notebook tab.reorderable-page.left, .notebook tab.left {
-      border-color: transparent; }
+      padding-left: 17px;
+      border-radius: 3.5px 0 0 3.5px;
+      border-width: 0;
+      border-left-width: 2px;
+      border-color: transparent;
+      background-color: rgba(255, 255, 255, 0); }
       .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(220, 223, 227, 0.5);
-        border-width: 1px;
-        border-left-width: 0;
-        background-color: rgba(245, 246, 247, 0.2); }
+        background-color: rgba(255, 255, 255, 0.5);
+        box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; }
       .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: #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.035); }
+        background-color: #ffffff;
+        box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #ffffff; }
     .notebook tab GtkLabel {
       padding: 0 2px;
       color: rgba(92, 97, 108, 0.55); }
@@ -2378,21 +2374,33 @@ SushiFontWidget {
 
 TerminalWindow .background {
   background-color: transparent; }
-TerminalWindow .notebook tab.reorderable-page,
-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 #eaecee; }
-TerminalWindow .notebook tab .active-page GtkLabel {
-  color: rgba(82, 93, 118, 0.8); }
-  TerminalWindow .notebook tab .active-page GtkLabel:backdrop {
-    color: rgba(82, 93, 118, 0.5); }
-TerminalWindow .notebook tab.reorderable-page.top:active, TerminalWindow .notebook tab.reorderable-page.top:active:hover {
-  background-color: #e7e8eb;
-  border-color: #d4d5db; }
-  TerminalWindow .notebook tab.reorderable-page.top:active:backdrop, TerminalWindow .notebook tab.reorderable-page.top:active:hover:backdrop {
-    background-color: #eff0f2; }
+TerminalWindow .notebook {
+  /*    tab {
+        &.reorderable-page.top, &.top {
+          border-width: 1px;
+          border-color: transparent;
+          box-shadow: none;
+          &:hover, &.prelight-page {
+            border-color: transparentize($borders_color, 0.5);
+            border-width: 1px;
+            border-top-width: 0;
+            background-color: transparentize($bg_color,0.8);
+            box-shadow: none;
+          }
+          &:active, &.active-page, &.active-page:hover {
+            border-width: 1px;
+            border-top-width: 0;
+            border-color: $header_border;
+            background-color: opacify($header_bg, 1);
+            box-shadow: none;
+  
+            &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
+          }
+        }
+      }
+  */ }
+  TerminalWindow .notebook.header.top {
+    box-shadow: inset 0 1px #d4d5db, inset 0 -1px #dcdfe3; }
 TerminalWindow .scrollbar.vertical .slider {
   margin-left: 3px; }
 TerminalWindow .scrollbar.trough {
@@ -2430,7 +2438,8 @@ NautilusNotebook.notebook {
 
 NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline-toolbar {
   padding: 5px;
-  box-shadow: none; }
+  box-shadow: none;
+  background-color: #ffffff; }
 
 .nautilus-circular-button {
   border-radius: 50%;
@@ -2905,7 +2914,7 @@ WingpanelWidgetsIndicatorPopover.popover {
 PantheonTerminalPantheonTerminalWindow.background {
   background-color: transparent; }
   PantheonTerminalPantheonTerminalWindow.background .notebook.header.top {
-    box-shadow: inset 0 1px #d4d5db, inset 0 -1px #eaecee; }
+    box-shadow: inset 0 1px #d4d5db, inset 0 -1px #dcdfe3; }
 
 SwitchboardCategoryView .view:selected,
 SwitchboardCategoryView .view:selected:focus {