diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css
index 622b5d523..7a1334a76 100644
--- a/gtk-3.0/gtk-widgets.css
+++ b/gtk-3.0/gtk-widgets.css
@@ -1242,118 +1242,129 @@ GtkModelButton.button:selected {
  ************/
 .notebook {
     padding: 0;
-    border-width: 1px 0 0 0;
+    border-width: 1px;
     border-style: solid;
-    border-color: shade(@theme_base_color, 0.7);
+    border-color: shade(@theme_bg_color, 0.7);
     border-radius: 0;
-    background-color: @theme_base_color;
+    background-color: @theme_bg_color;
     background-image: none;
     background-clip: border-box;
 
-    -GtkNotebook-initial-gap: 10;
+    -GtkNotebook-initial-gap: 0;
     -GtkNotebook-arrow-spacing: 5;
     -GtkNotebook-tab-curvature: 0;
     -GtkNotebook-tab-overlap: 1;
-    -GtkNotebook-has-tab-gap: false;
+    -GtkNotebook-has-tab-gap: true;
 }
-
 .notebook.frame {
-    border-width: 1px;
+    border-color: shade(@theme_bg_color, 0.75);
 }
 
 .notebook.header {
-    border-width: 0;
-    background-color: shade(@theme_base_color, 0.85);
+    background-color: @theme_bg_color;
 }
 
 .notebook.header.frame {
-    border-color: shade(@theme_base_color, 0.75);
-}
-
-.notebook.header.frame.top {
-    border-width: 1px 1px 0 1px;
-}
-
-.notebook.header.frame.right {
-    border-width: 1px 1px 1px 0;
-}
-
-.notebook.header.frame.bottom {
-    border-width: 0 1px 1px 1px;
+    border-color: @theme_bg_color;
 }
-
-.notebook.header.frame.left {
-    border-width: 1px 0 1px 1px;
-}
-
 .notebook GtkViewport {
-    border-width: 0;
-    background-color: @theme_base_color;
-    color: @theme_text_color;
+    background-color: @theme_bg_color;
+    color: @theme_fg_color;
 }
 
 .notebook tab {
-    padding: 4px 6px;
-    border-style: solid;
-    border-width: 1px;
-    border-color: transparent;
-    background-color: transparent;
+    padding: 4px;
+    border-color: shade(@theme_bg_color, 0.65);
+    border-radius: 0;
+    background-color: shade(@theme_bg_color, 0.75);
     background-image: none;
 }
 
 .notebook tab:active {
-    background-color: transparent;
-    background-image: none;
+    border-color: shade(@theme_bg_color, 0.55);
+    background-color: @theme_bg_color;
+}
+
+.notebook tab GtkLabel {
+    color: @theme_fg_color;
 }
 
 .notebook tab.top {
-    border-bottom-width: 2px;
+    border-width: 1px 1px 0 1px;
     border-bottom-right-radius: 0;
     border-bottom-left-radius: 0;
 }
 
-.notebook tab.top:hover {
-    border-bottom-color: alpha(@theme_selected_bg_color, 0.3);
-}
-
 .notebook tab.top:active {
-    border-bottom-color: @theme_selected_bg_color;
+    border-width: 3px 1px 0 1px;
+    border-top-color: @theme_selected_bg_color;
+    background-image: -gtk-gradient (
+       linear,
+       center top,
+       center bottom,
+       from (shade(@theme_bg_color, 1.1)),
+       color-stop (0.3, @theme_bg_color),
+       to (@theme_bg_color)
+    );
 }
 
 .notebook tab.right {
-    border-left-width: 2px;
+    border-width: 1px 1px 1px 0;
     border-bottom-left-radius: 0;
     border-top-left-radius: 0;
 }
 
-.notebook tab.right:hover {
-    border-left-color: alpha(@theme_selected_bg_color, 0.3);
-}
-
 .notebook tab.right:active {
-    border-left-color: @theme_selected_bg_color;
+    border-width: 1px 3px 1px 0;
+    border-right-color: @theme_selected_bg_color;
+    background-image: -gtk-gradient (
+       linear,
+       right center,
+       left center,
+       from (shade(@theme_bg_color, 1.1)),
+       color-stop (0.2, @theme_bg_color),
+       to (@theme_bg_color)
+    );
 }
 
 .notebook tab.bottom {
-    border-top-width: 2px;
+    border-width: 0 1px 1px 1px;
     border-top-right-radius: 0;
     border-top-left-radius: 0;
 }
 
-.notebook tab.bottom:hover {
-    border-top-color: alpha(@theme_selected_bg_color, 0.3);
-}
-
 .notebook tab.bottom:active {
-    border-top-color: @theme_selected_bg_color;
+    border-width: 0 1px 3px 1px;
+    border-bottom-color: @theme_selected_bg_color;
+    background-image: -gtk-gradient (
+       linear,
+       center bottom,
+       center top,
+       from (shade(@theme_bg_color, 1.1)),
+       color-stop (0.3, @theme_bg_color),
+       to (@theme_bg_color)
+    );
 }
 
 .notebook tab.left {
-    border-right-width: 2px;
+    border-width: 1px 0 1px 1px;
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
 }
 
+.notebook tab.left:active {
+    border-width: 1px 0 1px 3px;
+    border-left-color: @theme_selected_bg_color;
+    background-image: -gtk-gradient (
+       linear,
+       left center,
+       right center,
+       from (shade(@theme_bg_color, 1.1)),
+       color-stop (0.2, @theme_bg_color),
+       to (@theme_bg_color)
+    );
+}
+
 .notebook tab.left:hover {
     border-right-color: alpha(@theme_selected_bg_color, 0.3);
 }
@@ -1363,34 +1374,34 @@ GtkModelButton.button:selected {
 }
 
 .notebook tab GtkLabel {
-    color: mix(@theme_text_color, @theme_base_color, 0.3);
+    color: @theme_fg_color;
 }
 
 .notebook .prelight-page,
 .notebook .prelight-page GtkLabel {
-    color: mix (@theme_text_color, @theme_base_color, 0.15);
+    color: mix (@theme_fg_color, @theme_bg_color, 0.15);
 }
 
 .notebook .active-page,
 .notebook .active-page GtkLabel {
-    color: @theme_text_color;
+    color: @theme_fg_color;
 }
 
 .notebook tab.reorderable-page:hover {
-    background-color: shade(@theme_base_color, 0.85);
+    background-color: shade(@theme_bg_color, 0.85);
     border-left: 0;
     border-right: 0;
     /* using box shadows instead of borders due to slanted edges */
     box-shadow: inset 0 3px alpha(black, 0.03), inset 0 2px alpha(black, 0.03), inset 0 1px alpha(black, 0.03),
-                inset 1px 0 shade(@theme_base_color, 0.7), inset -1px 0 shade(@theme_base_color, 0.7);
+                inset 1px 0 shade(@theme_bg_color, 0.7), inset -1px 0 shade(@theme_bg_color, 0.7);
 }
 
 .notebook tab.reorderable-page:active {
-    background-color: shade(@theme_base_color, 0.90);
+    background-color: shade(@theme_bg_color, 0.90);
     border-left: 0;
     border-right: 0;
     box-shadow: inset 0 3px alpha(black, 0.03), inset 0 2px alpha(black, 0.03), inset 0 1px alpha(black, 0.03),
-                inset 1px 0 shade(@theme_base_color, 0.75), inset -1px 0 shade(@theme_base_color, 0.75);
+                inset 1px 0 shade(@theme_bg_color, 0.75), inset -1px 0 shade(@theme_bg_color, 0.75);
 }
 
 /* close button styling */
@@ -1404,18 +1415,18 @@ GtkModelButton.button:selected {
     border-color: transparent;
     background-image: none;
     background-color: transparent;
-    color: mix(@theme_text_color, @theme_base_color, 0.5);
+    color: mix(@theme_tg_color, @theme_bg_color, 0.5);
 }
 
 .notebook tab .button:hover {
-    color: @theme_text_color;
-    border-color: shade(@theme_base_color, 0.8);
+    color: @theme_fg_color;
+    border-color: shade(@theme_bg_color, 0.8);
 }
 
 .notebook tab .button:active,
 .notebook tab .button:active:hover {
-    border-color: shade(@theme_base_color, 0.7);
-    background-color: shade(@theme_base_color, 0.95);
+    border-color: shade(@theme_bg_color, 0.7);
+    background-color: shade(@theme_bg_color, 0.95);
 }
 
 /******************