diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css
index 0a3a634..ff1e1ba 100644
--- a/gtk-3.0/gtk-widgets.css
+++ b/gtk-3.0/gtk-widgets.css
@@ -70,33 +70,13 @@
  * base states *
  ***************/
 GtkWindow {
-    color: @theme_fg_color;
+    color: @fg_color;
 }
 
 * {
-    background-color: @theme_bg_color;
+    /* inherit the color from parent by default */
     color: inherit;
-}
-
-*:insensitive,
-*:insensitive:insensitive {
-    color: mix(@theme_fg_color, @theme_bg_color, 0.5);
-}
-
-*:active {
-    background-color: shade(@theme_bg_color, 0.85);
-}
-
-*:active:hover:insensitive {
-}
-
-*:active:insensitive {
-}
-
-*:hover {
-}
-
-*:hover:insensitive {
+    background-color: @bg_color;
 }
 
 *:selected,
@@ -105,11 +85,58 @@ GtkWindow {
     color: @theme_selected_fg_color;
 }
 
+*:active {
+    background-color: shade(@theme_bg_color, 0.85);
+}
+
+*:insensitive,
+*:insensitive:insensitive {
+    color: mix(@theme_fg_color, @theme_bg_color, 0.5);
+}
+
 .background {
     color: @theme_fg_color;
     background-color: @theme_bg_color;
 }
 
+.background.client-decorated {
+    background-color: transparent;
+}
+
+.background.window-content {
+    background-color: @theme_bg_color;
+}
+
+GtkClutterOffscreen {
+    background-color: @theme_bg_color;
+    color: @theme_fg_color;
+}
+
+.gtkstyle-fallback {
+    background-color: @theme_bg_color;
+    color: @theme_fg_color;
+}
+
+.gtkstyle-fallback:prelight {
+    background-color: shade(@theme_bg_color, 1.1);
+    color: @theme_fg_color;
+}
+
+.gtkstyle-fallback:active {
+    background-color: shade(@theme_bg_color, 0.9);
+    color: @theme_fg_color;
+}
+
+.gtkstyle-fallback:insensitive {
+    background-color: shade(shade(@theme_bg_color, 0.95), 1.05);
+    color: mix(@theme_fg_color, @theme_bg_color, 0.5);
+}
+
+.gtkstyle-fallback:selected {
+    background-color: @theme_selected_bg_color;
+    color: @theme_selected_fg_color;
+}
+
 /******************
  * common effects *
  ******************/
@@ -174,14 +201,6 @@ GtkAssistant .sidebar {
     color: mix(@theme_fg_color, @theme_bg_color, 0.1);
 }
 
-/**************
- * background *
- **************/
-.background {
-    border-width: 0;
-    background-color: @theme_bg_color;
-}
-
 /**********
  * button *
  **********/
@@ -717,34 +736,6 @@ GtkInfoBar {
     color: @error_fg_color;
 }
 
-/************
- * gtkstyle *
- ************/
-.gtkstyle-fallback {
-    background-color: @theme_bg_color;
-    color: @theme_fg_color;
-}
-
-.gtkstyle-fallback:prelight {
-    background-color: shade(@theme_bg_color, 1.1);
-    color: @theme_fg_color;
-}
-
-.gtkstyle-fallback:active {
-    background-color: shade(@theme_bg_color, 0.9);
-    color: @theme_fg_color;
-}
-
-.gtkstyle-fallback:insensitive {
-    background-color: shade(shade(@theme_bg_color, 0.95), 1.05);
-    color: mix(@theme_fg_color, @theme_bg_color, 0.5);
-}
-
-.gtkstyle-fallback:selected {
-    background-color: @theme_selected_bg_color;
-    color: @theme_selected_fg_color;
-}
-
 /*******************
  * symbolic images *
  *******************/
@@ -881,7 +872,9 @@ GtkComboBox .menu {
 .menubar.menuitem,
 .menubar .menuitem {
     padding: 3px 5px;
-    border-style: none;
+    border-style: solid;
+    border-width: 1px;
+    border-color: transparent;
     background-color: @menubar_bg_color;
     background-image: none;
     color: @menubar_fg_color;
@@ -913,7 +906,9 @@ GtkTreeMenu .menuitem * {
 .menuitem,
 .menu .menuitem {
     padding: 3px;
-    border-style: none;
+    border-style: solid;
+    border-width: 1px;
+    border-color: transparent;
     border-radius: 0;
     background-color: @menu_bg_color;
     background-image: none;
@@ -923,7 +918,6 @@ GtkTreeMenu .menuitem * {
 .menu .menuitem:active,
 .menu .menuitem:hover {
     border-color: shade(@theme_selected_bg_color, 0.9);
-    border-radius: 0;
     background-color: @theme_selected_bg_color;
     background-image: none;
 }
@@ -1394,6 +1388,8 @@ GtkScrolledWindow GtkViewport.frame {
     -GtkMenuItem-horizontal-padding: 0;
     -GtkWidget-separator-height: 1;
 
+    padding: 0;
+
     border-image: -gtk-gradient(linear,
                      left top, left bottom,
                      from (shade(@menu_bg_color, 0.9)),