diff --git a/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc b/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc
index 3a866db869..19f7a38e56 100755
--- a/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc
+++ b/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc
@@ -7,7 +7,6 @@ style "msw-default"
   GtkWidget::interior_focus = 1
   GtkOptionMenu::indicator_size = { 9, 5 }
   GtkOptionMenu::indicator_spacing = { 7, 5, 2, 2 }
-  GtkMenuBar::shadow-type = etched-in
   GtkToolbar::shadow-type = etched-in
   GtkHandleBox::shadow-type = etched-in
   GtkSpinButton::shadow-type = in
diff --git a/modules/engines/ms-windows/msw_style.c b/modules/engines/ms-windows/msw_style.c
index e0050af158..80a5c3d737 100755
--- a/modules/engines/ms-windows/msw_style.c
+++ b/modules/engines/ms-windows/msw_style.c
@@ -633,6 +633,7 @@ setup_msw_rc_style(void)
 	     "style \"msw-menu-bar\" = \"msw-menu\"\n"
 	     "{\n"
 	     "bg[NORMAL] = { %d, %d, %d }\n"
+	     "GtkMenuBar::shadow-type = etched-in\n"
 	     "}widget_class \"*MenuBar*\" style \"msw-menu-bar\"\n",
 	     btn_face.red,
 	     btn_face.green,
diff --git a/modules/engines/ms-windows/msw_theme_main.c b/modules/engines/ms-windows/msw_theme_main.c
index ea399bec99..e1baf905be 100755
--- a/modules/engines/ms-windows/msw_theme_main.c
+++ b/modules/engines/ms-windows/msw_theme_main.c
@@ -32,7 +32,7 @@
 #endif
 
 static GModule * this_module = NULL;
-static void (*msw_reset_rc_styles) (GtkSettings * settings) = NULL;
+static void (*msw_rc_reset_styles) (GtkSettings * settings) = NULL;
 
 static GdkFilterReturn
 global_filter_func (void     *xevent,
@@ -47,13 +47,13 @@ global_filter_func (void     *xevent,
     case WM_THEMECHANGED:
     case WM_SYSCOLORCHANGE:
 
-      if(msw_reset_rc_styles != NULL) {
-	xp_theme_reset ();
-	msw_style_init ();
+      if(msw_rc_reset_styles != NULL) {
+	  	xp_theme_reset ();
+	  	msw_style_init ();
 
-	/* force all gtkwidgets to redraw */
-	(*msw_reset_rc_styles) (gtk_settings_get_default());
-      }
+	  	/* force all gtkwidgets to redraw */
+		(*msw_rc_reset_styles) (gtk_settings_get_default());
+	  }
 
       return GDK_FILTER_REMOVE;
 
@@ -81,7 +81,7 @@ theme_init (GTypeModule *module)
 
     if(this_module)
       g_module_symbol (this_module, "gtk_rc_reset_styles",
-		       (gpointer *)(&msw_reset_rc_styles));
+		       (gpointer *)(&msw_rc_reset_styles));
   }
 
   msw_style_init ();
@@ -109,8 +109,7 @@ theme_create_rc_style (void)
  * is loaded and checks to see if we are compatible with the
  * version of GTK+ that loads us.
  */
-G_MODULE_EXPORT const gchar* g_module_check_init (GModule *module);
-const gchar*
+G_MODULE_EXPORT const gchar*
 g_module_check_init (GModule *module)
 {
   return gtk_check_version (2,0,0);