diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css
index 973b244..fabb351 100644
--- a/gtk-3.0/gtk-widgets.css
+++ b/gtk-3.0/gtk-widgets.css
@@ -1137,7 +1137,7 @@ GtkModelButton.button:selected {
  ************/
 .notebook {
     padding: 0;
-    border-width: 1px;
+    border-width: 1px 0 0 0;
     border-style: solid;
     border-color: shade(@theme_base_color, 0.7);
     border-radius: 0;
@@ -1185,67 +1185,101 @@ GtkModelButton.button:selected {
 }
 
 .notebook tab {
-    padding: 4px;
-    border-style: none;
-    background-color: shade(@theme_base_color, 0.85);
-    background-image: none;
-}
-
-.notebook tab:hover {
-    background-color: shade(@theme_base_color, 0.95);
+    padding: 4px 6px;
+    border-style: solid;
+    border-width: 1px;
+    border-color: transparent;
+    background-color: transparent;
     background-image: none;
 }
 
 .notebook tab:active {
-    background-color: shade(@theme_base_color, 0.85);
+    background-color: transparent;
     background-image: none;
 }
 
 .notebook tab.top {
+    border-bottom-width: 2px;
     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 {
-    box-shadow:inset 0 -2px @theme_selected_bg_color;
+    border-bottom-color: @theme_selected_bg_color;
 }
 
 .notebook tab.right {
+    border-left-width: 2px;
     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 {
-    box-shadow:inset 2px 0 @theme_selected_bg_color;
+    border-left-color: @theme_selected_bg_color;
 }
 
 .notebook tab.bottom {
+    border-top-width: 2px;
     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 {
-    box-shadow:inset 0 2px @theme_selected_bg_color;
+    border-top-color: @theme_selected_bg_color;
 }
 
 .notebook tab.left {
+    border-right-width: 2px;
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
 }
 
+.notebook tab.left:hover {
+    border-right-color: alpha(@theme_selected_bg_color, 0.3);
+}
+
 .notebook tab.left:active {
-    box-shadow:inset -2px 0 @theme_selected_bg_color;
+    border-right-color: @theme_selected_bg_color;
 }
 
 .notebook tab GtkLabel {
     color: mix(@theme_text_color, @theme_base_color, 0.3);
 }
 
+.notebook .prelight-page,
+.notebook .prelight-page GtkLabel {
+    color: mix (@theme_text_color, @theme_base_color, 0.15);
+}
+
 .notebook .active-page,
-.notebook tab .active-page GtkLabel {
+.notebook .active-page GtkLabel {
     color: @theme_text_color;
 }
 
+.notebook tab.reorderable-page:hover {
+    background-color: shade(@theme_base_color, 0.85);
+    border-left: 1px solid shade(@theme_base_color, 0.7);
+    border-right: 1px solid shade(@theme_base_color, 0.7);
+}
+
+.notebook tab.reorderable-page:active {
+    background-color: shade(@theme_base_color, 0.90);
+    border-left: 1px solid shade(@theme_base_color, 0.75);
+    border-right: 1px solid shade(@theme_base_color, 0.75);
+}
+
 /* close button styling */
 .notebook tab .button,
 .notebook tab .button:active,
@@ -2947,6 +2981,19 @@ GtkViewport.frame {
     padding: 4px;
 }
 
+/***********
+ * dialogs *
+ ***********/
+GtkMessageDialog,
+.prompt {
+    -GtkDialog-content-area-border: 0;
+    -GtkDialog-action-area-border: 0;
+    -GtkDialog-button-spacing: 0;
+
+    margin: 0;
+    padding: 0;
+}
+
 /********************
  * various choosers *
  ********************/