diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc
index 980482d..1421d51 100644
--- a/gtk-2.0/gtkrc
+++ b/gtk-2.0/gtkrc
@@ -105,16 +105,16 @@ style "murrine-default" {
 	bg[ACTIVE] = shade (0.9, @bg_color)
 
 	base[NORMAL] = @base_color
-	base[PRELIGHT] = shade (0.95, @bg_color)
+	base[PRELIGHT] = shade (0.95, @base_color)
 	base[ACTIVE] = @selected_bg_color
 	base[SELECTED] = @selected_bg_color
-	base[INSENSITIVE] = @bg_color
+	base[INSENSITIVE] = shade (0.85, @base_color)
 
 	text[NORMAL] = @text_color
 	text[PRELIGHT] = @text_color
 	text[ACTIVE] = @selected_fg_color
 	text[SELECTED] = @selected_fg_color
-	text[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
+	text[INSENSITIVE] = mix (0.5, @base_color, @text_color)
 
 	engine "murrine" {
 		animation = FALSE
@@ -180,7 +180,8 @@ style "murrine-notebook" = "murrine-notebook-bg" {
 style "murrine-button" = "murrine-wider" {
 	bg[NORMAL] = shade (1.08, @bg_color)
 	bg[PRELIGHT] = shade (1.10, @bg_color)
-	bg[ACTIVE] = shade (0.80, @bg_color)
+	bg[INSENSITIVE] = shade (0.85, @bg_color)
+	bg[ACTIVE] = shade (0.95, @bg_color)
 
   	engine "murrine" {
 	}
@@ -285,10 +286,8 @@ style "murrine-radiocheck" = "murrine-default" {
 }
 
 style "murrine-entry" = "murrine-wider" {
-	bg[SELECTED] = mix (0.5, @selected_bg_color, @base_color)
 
 	engine "murrine" {
-		border_shades = { 1.2, 1.2 }
 	}
 }
 
@@ -414,8 +413,8 @@ style "murrine-toolbutton" = "murrine-button" {
 	bg[NORMAL] = shade (1.08, @toolbar_bg_color)
 	bg[PRELIGHT] = shade (1.10, @toolbar_bg_color)
 	bg[SELECTED] = @selected_bg_color
-	bg[INSENSITIVE] = @toolbar_bg_color
-	bg[ACTIVE] = shade (0.80, @toolbar_bg_color)
+	bg[INSENSITIVE] = shade (0.85, @toolbar_bg_color)
+	bg[ACTIVE] = shade (0.95, @toolbar_bg_color)
 
 	fg[NORMAL] = @toolbar_fg_color
 	fg[PRELIGHT] = @toolbar_fg_color
@@ -500,9 +499,6 @@ widget "*gimmie*" style "bold-panel-item"
 style "xfce-header" {
 	bg[NORMAL]	 = shade (0.9, @bg_color)
 	base[NORMAL]	 = shade (1.18, @bg_color)
-	engine "murrine" {
-		textstyle = 1
-	}
 }
 
 style "xfdesktop-windowlist" {
@@ -521,10 +517,11 @@ style "xfdesktop-icon-view" {
     XfdesktopIconView::selected-shadow-x-offset = -1
     XfdesktopIconView::shadow-y-offset = -1
     XfdesktopIconView::selected-shadow-y-offset = -1
+
     fg[NORMAL] = @selected_fg_color
     fg[ACTIVE] = @selected_fg_color
-    engine "murrine"
-    {
+
+    engine "murrine" {
 	textstyle = 0
 	text_shade = 0.05
     }
@@ -539,8 +536,7 @@ style "xfwm-tabwin" {
 }
 
 style "xfsm-logout" {
-	engine "murrine"
-        {
+	engine "murrine" {
 			highlight_shade = 1.0
         }	
 }