Merge lp:~psyke83/ubuntustudio-look/UbuntuStudio into lp:~ubuntustudio-dev/ubuntustudio-look/ubuntustudio-look.broken

[Conn O Griofa]

[Conn O Griofa (psyke83)]

Updated GTK theme with new Murrine GIT engine options, tweaked appearance, added name to AUTHORS file.

[lp:~psyke83/ubuntustudio-look/UbuntuStudio]

113. By Conn O Griofa on 2010-02-08

Fix bug #452664 (thanks to Dashua)

114. By Conn O Griofa on 2010-02-08

Minor tweak to trough gradient, added updated debian changelog

115. By Conn O Griofa on 2010-02-08

Added LP #452664 note to changelog

116. By Conn O Griofa on 2010-02-18

Tweaked insensitive text, base[ACTIVE] colours

=== modified file 'AUTHORS'
--- AUTHORS	2009-01-25 16:53:19 +0000
+++ AUTHORS	2010-02-18 01:39:11 +0000
@@ -10,3 +10,4 @@
         3rd.foundation <[e-mail]> - ubuntustudio-brushes.jpg
         Ola Harstrom <[e-mail]>- ubuntustudio-olis.jpg
         Alexis Younes <[e-mail]>- ubuntustudio-ayo.png
+	Conn O'Griofa <[e-mail]> - GTK/Metacity theme

=== modified file 'debian/changelog'
--- debian/changelog	2009-08-26 12:20:17 +0000
+++ debian/changelog	2010-02-18 01:39:11 +0000
@@ -1,3 +1,15 @@
+ubuntustudio-look (0.37) UNRELEASED; urgency=low
+
+  * Theme refresh based on latest Human gtkrc (0.40 unreleased)
+  * Documented new Murrine GIT engine options
+  * Various tweaks to widget outline shadow/gradient
+  * Various tweaks to widget shadings
+  * Enabled filled arrow widgets
+  * Changed tabs (notebook) to use Clearlooks engine
+  * Added fix for Firefox GTKEntry problem (LP #452664)
+
+ -- Conn O Griofa <[e-mail]>  Mon, 08 Feb 2010 13:52:46 +0000
+
 ubuntustudio-look (0.36) karmic; urgency=low
 
   * debian/control: Remove ubuntustudio-gdm-theme as a dependency of

=== modified file 'ubuntustudio-theme/gtk-2.0/gtkrc'
--- ubuntustudio-theme/gtk-2.0/gtkrc	2009-03-23 15:10:20 +0000
+++ ubuntustudio-theme/gtk-2.0/gtkrc	2010-02-18 01:39:11 +0000
@@ -1,88 +1,100 @@
 # UbuntuStudio Colorscheme
 #
 # Authors:
-# Conn O'Griofa  <[e-mail]>
-# Cory Kontros   <[e-mail]>
+# Conn O'Griofa <[e-mail]>
+# Cory Kontros <[e-mail]>
+# Kenneth Wimer <[e-mail]>
 #
 # Feel free to modify and share!
 
 gtk_color_scheme = "fg_color:#CCC\nbg_color:#525252\nbase_color:#FFF\ntext_color:#000\nselected_bg_color:#009BF9\nselected_fg_color:#FFF\ntooltip_bg_color:#F5F5B5\ntooltip_fg_color:#000000"
 
-gtk-icon-sizes = "panel-menu=22,22"
+gtk-icon-sizes = "panel-menu=24,24:gtk-button=16,16"
 
 style "murrine-default"
 {
 	########
 	# Style Properties
 	########
+	GtkButton      ::child-displacement-x = 1
+	GtkButton      ::child-displacement-y = 1
 	GtkButton      ::default-border       = { 0, 0, 0, 0 }
-	GtkRange       ::trough-border        = 0
+	GtkCheckButton ::indicator-size       = 14
+
 	GtkPaned       ::handle-size          = 6
-	GtkRange       ::slider-width         = 15
-	GtkRange       ::stepper-size         = 15
-
+
+	GtkRange       ::trough-border        = 2
+	GtkRange       ::slider-width         = 14
+	GtkRange       ::stepper-size         = 14
+
+	GtkScale       ::slider-length        = 20
+	GtkScale       ::trough-side-details  = 1
 	GtkScrollbar   ::min-slider-length    = 30
-	GtkCheckButton ::indicator-size       = 14
+
 	GtkMenuBar     ::internal-padding     = 0
+	GtkExpander    ::expander-size        = 16
+	GtkToolbar     ::internal-padding     = 1
 	GtkTreeView    ::expander-size        = 14
-	GtkExpander    ::expander-size        = 16
-	GtkScale       ::slider-length        = 24
-
-	GtkScrollbar::has-forward-stepper = 1
-	GtkScrollbar::has-backward-stepper = 0
-	GtkScrollbar::has-secondary-forward-stepper = 0
-	GtkScrollbar::has-secondary-backward-stepper = 1
-
-	GtkToolbar     ::internal-padding     = 0
 	GtkTreeView    ::vertical-separator   = 0
+
 	GtkMenu        ::horizontal-padding   = 0
 	GtkMenu        ::vertical-padding     = 0
-        #GtkNotebook    ::tab-overlap          = -1
-	GtkScale       ::trough-side-details  = 0 # Restores sliders
-	#GtkButton      ::child-displacement-x = 1
-	#GtkButton      ::child-displacement-y = 1
 
 	# Glow the tasklist by changing the color, instead of overlaying it with a rectangle
 	#WnckTasklist   ::fade-overlay-rect    = 0
 
+	# The following line hints to gecko (and possibly other appliations)
+	# that the entry should be drawn transparently on the canvas.
+	# Without this, gecko will fill in the background of the entry.
+	GtkEntry::honors-transparent-bg-hint = 1
+
+	#GtkWidget      ::link-color           = @fg_color
+	#GtkWidget      ::visited-link-color   = shade (0.2, @fg_color)
+
 	xthickness = 1
 	ythickness = 1
 
-	fg[NORMAL]        = @fg_color 		    # Metacity and mouseover, Most text
-	fg[PRELIGHT]      = @selected_fg_color      # Text when mouseover
-	fg[ACTIVE]        = @fg_color               # Text when mouseclicking button, Tabs, Active window list
-	fg[SELECTED]      = @selected_fg_color      # Metacity X when window selected
-	fg[INSENSITIVE]   = shade (0.22, @ fg_color) # Insensitive Text
-
-	bg[NORMAL]        = @bg_color               # Normal Background, inactive Metacity bar, buttons
-	bg[PRELIGHT]      = shade (1.30, @bg_color) # Mouseover buttons
-	bg[ACTIVE]        = shade (0.90, @bg_color) # Mouseclicking, Tabs, active window list
-	bg[SELECTED]	  = @selected_bg_color      # Metacity Bar
-	bg[INSENSITIVE]   = @bg_color               # Insensitive buttons
-
-
-	base[NORMAL]      = @base_color             # Background, most
-	base[PRELIGHT]    = shade (0.95, @bg_color) # Mouseover menu
-	base[ACTIVE]      = shade (0.90, @bg_color) # Menu active item in inactive window
-	base[SELECTED]    = @selected_bg_color      # Menu active item in active window
-	base[INSENSITIVE] = @bg_color               # Background, insensitive
-
-	text[NORMAL]      = @text_color             # Text in window
-	text[PRELIGHT]    = @text_color             # Text on Mouseover
-	text[ACTIVE]      = @selected_fg_color	    # Active text in inactive window
-	text[SELECTED]    = @selected_fg_color      # Active text in active window
-	text[INSENSITIVE] = shade (0.22, @ fg_color) # Insensitive text
+	fg[NORMAL]        = @fg_color
+	fg[PRELIGHT]      = @fg_color
+	fg[ACTIVE]        = @fg_color
+	fg[SELECTED]      = @selected_fg_color
+	fg[INSENSITIVE]   = shade (1.6, @bg_color)
+
+	bg[NORMAL]        = @bg_color
+	bg[PRELIGHT]      = shade (1.1, @bg_color)
+	bg[ACTIVE]        = shade (0.78, @bg_color)
+	bg[SELECTED]	  = @selected_bg_color
+	bg[INSENSITIVE]   = @bg_color
+
+	base[NORMAL]      = @base_color
+	base[PRELIGHT]    = shade (0.95, @bg_color)
+	base[ACTIVE]      = shade (0.9, @selected_bg_color)
+	base[SELECTED]    = shade (1.05, @selected_bg_color)
+	base[INSENSITIVE] = @bg_color
+
+	text[NORMAL]      = @text_color
+	text[PRELIGHT]    = @text_color
+	text[ACTIVE]      = @selected_fg_color
+	text[SELECTED]    = @selected_fg_color
+	text[INSENSITIVE] = shade (1.6, @bg_color)
 
 	engine "murrine" 
 	{
 		animation           = TRUE  # FALSE = disabled, TRUE = enabled
+		arrowstyle          = 1     # 0 = normal arrows, 1 = filled arrows
+		#border_colors      = { "#ffffff", "#ffffff" } # colors used on borders of many widgets
+		border_shades       = { 1.5, 0.8 } # gradient to draw on border
+		#gradient_colors    = { "#ffffff", "#ffffff", "#ffffff", "#ffffff" } # colors used on gradient of many widgets
+		comboboxstyle       = 0     # 0 = normal combobox, 1 = colorized combobox below arrow
 		colorize_scrollbar  = TRUE  # FALSE = disabled, TRUE = enabled
-		contrast            = 1.03  # 0.8 for less contrast, more than 1.0 for more contrast on borders
-		glazestyle          = 3     # 0 = flat highlight, 1 = curved highlight, 2 = concave style, 3 = top curved highlight, 4 = beryl highlight
-		gradient_shades     = {1.20,1.05,1.20,1.02} # default: {1.1,1.0,1.0,1.1}
-		gradients           = TRUE  # FALSE = disabled, TRUE = enabled
-		highlight_shade     = 1.04  # set highlight amount for buttons or widgets
-		lightborder_shade   = 1.2   # sets lightborder amount for buttons or widgets
+		contrast            = 1.0   # 0.8 for less contrast, more than 1.0 for more contrast on borders
+		focus_color         = shade (1.0, @selected_bg_color)
+		glazestyle          = 0     # 0 = flat, 1 = curved, 2 = concave, 3 = top-curved, 4 = beryl
+		glow_shade          = 1.2   # sets glow amount for buttons or widgets
+		glowstyle           = 2     # 0 = top, 1 = bottom, 2 = top and bottom, 3 = center (vertical), 4 = center (horizontal) 
+		gradient_shades     = {1.02,1.01,0.96,0.95} # default: {1.1,1.0,1.0,1.1}
+		highlight_shade     = 1.05   # set highlight amount for buttons or widgets
+		lightborder_shade   = 1.4   # sets lightborder amount for buttons or widgets
 		lightborderstyle    = 0     # 0 = lightborder on top side, 1 = lightborder on all sides
 		listviewheaderstyle = 1     # 0 = flat, 1 = glassy, 2 = raised
 		listviewstyle       = 1     # 0 = nothing, 1 = dotted
@@ -90,14 +102,19 @@
 		menubarstyle        = 2     # 0 = flat, 1 = glassy, 2 = gradient, 3 = striped
 		menuitemstyle       = 1     # 0 = flat, 1 = glassy, 2 = striped
 		menustyle           = 0     # 0 = no vertical menu stripe, 1 = display vertical menu stripe
-		reliefstyle	    = 2     # 0 = flat, 1 = inset, 2 = shadow
+		prelight_shade      = 1.1  # shade level for scrollbar's slider, comboboxstyle(1), and prelight state with gradient_colors
+		progressbarstyle    = 1     # 0 = no stripes, 1 = diagonal stripes, 2 = vertical stripes 
+		reliefstyle	    = 4     # 0 = flat, 1 = inset, 2 = shadow, 3 = shadow with gradient, 4 = stronger shadow with gradient
 		rgba		    = FALSE # FALSE = disabled, TRUE = enabled
 		roundness           = 2     # 0 = squared, 1 = old default, more will increase roundness
-		scrollbarstyle      = 2     # 0 = nothing, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles
-		sliderstyle         = 1     # 0 = nothing added, 1 = handles
-		stepperstyle        = 0     # 0 = standard, 1 = integrated stepper handles, 2 = unknown
-		#style		    = MURRINE # engine style options: CANDIDO, CLEARLOOKS, MIST, MURRINE, NODOKA
+		scrollbarstyle      = 0     # 0 = nothing, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles
+		shadow_shades       = { 2.0, 1.0 } # draw gradient on shadow of some widgets
+		sliderstyle         = 0     # 0 = nothing added, 1 = handles
+		spinbuttonstyle     = 0     # 0 = no seperator, 1 = with separator
+		stepperstyle        = 1     # 0 = standard, 1 = integrated stepper handles, 2 = squared steppers with round slider
+		textstyle           = 0     # 0 = normal text, 1 = inset
 		toolbarstyle	    = 2     # 0 = flat, 1 = glassy, 2 = gradient
+		trough_shades       = { 1.0, 1.2 } # draw gradient on trough of GtkScrollbar and GtkProgressbar
 	}
 }
 
@@ -113,30 +130,18 @@
 	ythickness = 3
 }
 
-style "murrine-darker"
-{
-	fg[NORMAL] = shade (0.1, @fg_color)
-	fg[ACTIVE] = shade (0.1, @fg_color) 
-}
-
 style "murrine-button" = "murrine-wider"
 {
-	bg[NORMAL]      = shade (0.94, @bg_color)
-	bg[ACTIVE]      = shade (0.73, @bg_color)
-	bg[SELECTED]    = shade (0.7, @selected_bg_color)
-	bg[INSENSITIVE] = shade (0.97, @bg_color)
+	bg[SELECTED] = shade (1.0, @selected_bg_color) # pre-selected buttons, keep same as focus colour
 }
 
 style "murrine-notebook"
 {
-	bg[ACTIVE] = shade (0.7, @bg_color)
-	bg[NORMAL] = shade (0.88, @bg_color)
+	bg[NORMAL] = shade (1.15, @bg_color)
+	bg[ACTIVE] = shade (1.03, @bg_color)
 
 	engine "clearlooks" 
 	{
-		#contrast        = 1.3
-		#highlight_shade = 1.2
-		#roundness       = 3
 	}
 }
 
@@ -146,40 +151,32 @@
 
 style "murrine-menu" = "murrine-wider"
 {
-	bg[NORMAL]   = shade (1.3, @bg_color)
+	bg[NORMAL]   = shade (1.1, @bg_color)
+	fg[PRELIGHT] = @selected_fg_color
 }
 
 style "murrine-menubar"
 {
 	bg[NORMAL]= shade (0.75, @bg_color)
+	fg[PRELIGHT] = @selected_fg_color
 }
 
 style "murrine-menu-item" = "murrine-wider"
 {
-	bg[PRELIGHT] = shade (1.3, @bg_color)
-
-	engine "murrine" 
-	{
-		roundness = 2
-	}
+	bg[PRELIGHT] = shade (1.02, @selected_bg_color)
+	bg[SELECTED] = shade (1.02, @selected_bg_color)
 }
 
 style "murrine-separator-menu-item"
 {
-        ythickness = 1
-}
-
-style "murrine-treeview" = "murrine-default"
-{
-	fg[NORMAL]   = shade (0.5, @bg_color)
-	fg[PRELIGHT] = shade (0.5, @bg_color)
-	bg[NORMAL]   = shade (1.5, @bg_color)
-}
-
-style "murrine-treeview-header"
-{
-	bg[NORMAL]      = shade (0.95, @bg_color)
-	bg[INSENSITIVE] = shade (0.88, @bg_color)
+}
+
+style "murrine-treeview"
+{
+}
+
+style "murrine-treeview-header" = "murrine-default"
+{
 }
 
 style "murrine-frame-title"
@@ -194,10 +191,7 @@
 
 style "murrine-progressbar"
 {
-	engine "murrine" 
-	{
-		contrast = 1.5
-	}
+	fg[PRELIGHT] = @selected_fg_color
 }
 
 style "murrine-statusbar"
@@ -214,13 +208,7 @@
 
 style "murrine-scale"
 {
-	GtkScale       ::slider-length        = 22
-	GtkRange       ::slider-width         = 13
-
-	engine "murrine" 
-	{
-		contrast = 1.5
-	}
+	GtkRange        ::slider-width = 13
 }
 
 style "murrine-hscale"
@@ -233,10 +221,7 @@
 
 style "murrine-scrollbar"
 {
-	engine "murrine" 
-	{
-		contrast = 2.0
-	}
+	bg[SELECTED] = mix (0.9, @selected_bg_color, @bg_color)
 }
 
 style "murrine-hscrollbar"
@@ -250,29 +235,17 @@
 style "murrine-nautilus-location"
 {
 	bg[NORMAL] = @selected_bg_color
-	fg[NORMAL] = @bg_color          # text on mouseover
 }
 
 style "metacity-frame"
 {
-	#bg[NORMAL] = shade (0.75, @bg_color) # ensure this matches "murrine-menubar"
-}
-
-style "murrine-qt"
-{
-	fg[NORMAL] = @text_color
 }
 
 style "murrine-radiocheck"
 {
-	bg[SELECTED]   = @selected_bg_color
-	text[NORMAL]   = @selected_fg_color # text in window
-	text[PRELIGHT] = @selected_fg_color # text on mouseover
-}
-
-style "murrine-invisible"
-{
-	fg[PRELIGHT] = @fg_color # text on mouseover
+	text[NORMAL]   = @selected_fg_color
+	text[PRELIGHT] = @selected_fg_color
+	bg[SELECTED] = @selected_bg_color # HACK: override button selection colour
 }
 
 style "murrine-panel"
@@ -284,33 +257,31 @@
 # Matches
 #########################################
 
-# Theme radio buttons and checkmarks
-class "GtkRadio*"                        	style:highest "murrine-radiocheck"
-class "GtkCheck*"                           	style:highest "murrine-radiocheck"
-
-# Keep proper colour for Metacity
-class "MetaFrames" 				style "metacity-frame"
-
 # Theme default style is applied to every widget
-class "GtkWidget"    				style "murrine-default"
+class "GtkWidget"    					style "murrine-default"
 
 # Increase the x/ythickness in some widgets
-class "GtkToolbar"   				style "murrine-default" 
-class "GtkRange"     				style "murrine-wide"
-class "GtkFrame"     				style "murrine-wide"
-class "GtkSeparator" 				style "murrine-wide"
-class "GtkEntry"     				style "murrine-wider"
-
-class "GtkSpinButton"  				style "murrine-spinbutton"
-class "GtkScale"       				style "murrine-scale"
-class "GtkVScale"      				style "murrine-vscale"
-class "GtkHScale"      				style "murrine-hscale"
-class "GtkScrollbar"   				style "murrine-scrollbar"
-class "GtkVScrollbar"  				style "murrine-vscrollbar"
-class "GtkHScrollbar"  				style "murrine-hscrollbar"
-
-class "GtkWindow"    			    	style "murrine-qt"        # DARK: workaround for misbehaving QT applications
-class "GtkInvisible"     			style "murrine-invisible" # DARK: workaround for Firefox white text hover effect
+class "GtkToolbar"   					style "murrine-default" 
+class "GtkRange"     					style "murrine-wide"
+class "GtkFrame"     					style "murrine-wide"
+class "GtkSeparator" 					style "murrine-wide"
+class "GtkEntry"     					style "murrine-wider"
+
+class "GtkSpinButton"  					style "murrine-spinbutton"
+class "GtkScale"       					style "murrine-scale"
+class "GtkVScale"      					style "murrine-vscale"
+class "GtkHScale"      					style "murrine-hscale"
+class "GtkScrollbar"   					style "murrine-scrollbar"
+class "GtkVScrollbar"  					style "murrine-vscrollbar"
+class "GtkHScrollbar"  					style "murrine-hscrollbar"
+
+class "GtkRadio*"                        		style:highest "murrine-radiocheck" # HACK: override button selection colour
+class "GtkCheck*"                           		style:highest "murrine-radiocheck" # HACK: override button selection colour
+
+# Use this to customize Metacity colours (causes issues with KDE/gtk-window-decorator)
+class "MetaFrames" 					style "metacity-frame"
+#class "GtkWindow"    			    		style "metacity-frame"
+
 
 # General matching following, the order is choosen so that the right styles override each other
 # eg. progressbar needs to be more important then the menu match.
@@ -318,39 +289,39 @@
 # This is not perfect, it could be done better
 # (That is modify *every* widget in the notebook, and change those back that
 # we really don't want changed)
-
-widget_class "*<GtkNotebook>*<GtkEventBox>"     style "murrine-notebook"
-widget_class "*<GtkNotebook>*<GtkDrawingArea>"  style "murrine-notebook"
-widget_class "*<GtkNotebook>*<GtkLayout>"       style "murrine-notebook"
-
-widget_class "*<GtkButton>"      		style "murrine-button"
-widget_class "*<GtkNotebook>"    		style "murrine-notebook"
-widget_class "*<GtkStatusbar>*"  		style "murrine-statusbar"
-
-widget_class "*<GtkComboBoxEntry>*"		style "murrine-comboboxentry"
-widget_class "*<GtkCombo>*"         		style "murrine-comboboxentry"
-
-widget_class "*<GtkMenuBar>*"           	style "murrine-menubar"
-widget_class "*<GtkMenu>*"              	style "murrine-menu"
-widget_class "*<GtkMenuItem>*"          	style "murrine-menu-item"
-widget_class "*<GtkSeparatorMenuItem>*" 	style "murrine-separator-menu-item"
-
-widget_class "*.<GtkFrame>.<GtkLabel>" 		style "murrine-frame-title"
-widget_class "*.<GtkTreeView>*"        		style "murrine-treeview"
-
-widget_class "*<GtkProgressBar>"       		style "murrine-progressbar"
+widget_class "*<GtkNotebook>*<GtkEventBox>"     	style "murrine-notebook"
+widget_class "*<GtkNotebook>*<GtkDrawingArea>"		style "murrine-notebook"
+widget_class "*<GtkNotebook>*<GtkLayout>"       	style "murrine-notebook"
+widget_class "*<GtkNotebook>*<GtkViewport>"		style "murrine-notebook"
+widget_class "*<GtkNotebook>*<GtkScrolledWindow>"	style "murrine-notebook"
+
+widget_class "*<GtkButton>"      			style "murrine-button"
+widget_class "*<GtkNotebook>"    			style "murrine-notebook"
+widget_class "*<GtkStatusbar>*"  			style "murrine-statusbar"
+
+widget_class "*<GtkComboBoxEntry>*"			style "murrine-comboboxentry"
+widget_class "*<GtkCombo>*"         			style "murrine-comboboxentry"
+
+widget_class "*<GtkMenuBar>*"           		style "murrine-menubar"
+widget_class "*<GtkMenu>*"              		style "murrine-menu"
+widget_class "*<GtkMenuItem>*"          		style "murrine-menu-item"
+widget_class "*<GtkSeparatorMenuItem>*" 		style "murrine-separator-menu-item"
+
+widget_class "*.<GtkFrame>.<GtkLabel>" 			style "murrine-frame-title"
+widget_class "*.<GtkTreeView>*"        			style "murrine-treeview"
+
+widget_class "*<GtkProgress>"				style "murrine-progressbar"
+widget_class "*<GtkProgressBar>"       			style "murrine-progressbar"
 
 # Treeview header
-widget_class "*.<GtkTreeView>.<GtkButton>" 	style "murrine-treeview-header"
-widget_class "*.<GtkCTree>.<GtkButton>"    	style "murrine-treeview-header"
-widget_class "*.<GtkList>.<GtkButton>"     	style "murrine-treeview-header"
-widget_class "*.<GtkCList>.<GtkButton>"    	style "murrine-treeview-header"
-widget_class "*.<GtkTreeView>*<GtkLabel>*"	style "murrine-default"         # DARK: ensure GtkTreeView header text is light
-widget_class "*.<GtkTreeView>*<GtkArrow>*"	style:highest "murrine-default" # DARK: ensure GtkArrows are light 
+widget_class "*.<GtkTreeView>.<GtkButton>" 		style "murrine-treeview-header"
+widget_class "*.<GtkCTree>.<GtkButton>"    		style "murrine-treeview-header"
+widget_class "*.<GtkList>.<GtkButton>"     		style "murrine-treeview-header"
+widget_class "*.<GtkCList>.<GtkButton>"    		style "murrine-treeview-header"
 
 # Workarounds for Evolution
-widget_class "*.ETable.ECanvas"    		style "murrine-treeview-header"
-widget_class "*.ETree.ECanvas"    		style "murrine-treeview-header"
+widget_class "*.ETable.ECanvas"    			style "murrine-treeview-header"
+widget_class "*.ETree.ECanvas"    			style "murrine-treeview-header"
 
 # The window of the tooltip is called "gtk-tooltip"
 ################################
@@ -360,7 +331,7 @@
 # quite a bit to get this working correctly.
 # (It will involve setting different priorities, etc.)
 ################################
-widget "gtk-tooltip*" 				style "murrine-tooltips"
+widget "gtk-tooltip*" 					style "murrine-tooltips"
 
 ###################################################
 # Special cases and work arounds
@@ -368,8 +339,7 @@
 
 # Special case the nautilus-extra-view-widget
 # ToDo: A more generic approach for all applications that have a widget like this.
-widget "*.nautilus-extra-view-widget" 		style : highest "murrine-nautilus-location"
-widget "*auti*IconView*"			style : highest "murrine-darker"            # DARK: use black text for rename in Nautilus Icon View
+widget "*.nautilus-extra-view-widget" 			style : highest "murrine-nautilus-location"
 
 # Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
 # Note that the work around assumes that the combobox is _not_ in
@@ -380,23 +350,23 @@
 style "murrine-combobox-text-color-workaround"
 {
 	text[NORMAL]      = @fg_color
-	text[PRELIGHT]    = @selected_fg_color
+	text[PRELIGHT]    = @fg_color
+	text[ACTIVE]      = @fg_color
 	text[SELECTED]    = @selected_fg_color
-	text[ACTIVE]      = @fg_color
-	text[INSENSITIVE] = shade (0.22, @ fg_color)
+	text[INSENSITIVE] = shade (1.6, @bg_color)
 }
-widget_class "*.<GtkComboBox>.<GtkCellView>"	style "murrine-combobox-text-color-workaround"
+widget_class "*.<GtkComboBox>.<GtkCellView>"		style "murrine-combobox-text-color-workaround"
 
 style "murrine-menuitem-text-is-fg-color-workaround"
 {
-	text[NORMAL]      = @fg_color
-	text[PRELIGHT]    = @selected_fg_color # should be identical to fg[PRELIGHT]
-	text[SELECTED]    = @selected_fg_color
-	text[ACTIVE]      = @fg_color
-	text[INSENSITIVE] = shade (0.22, @ fg_color)
+	text[NORMAL]        = @fg_color
+	text[PRELIGHT]      = @selected_fg_color
+	text[ACTIVE]        = @fg_color
+	text[SELECTED]      = @selected_fg_color
+	text[INSENSITIVE]   = shade (1.6, @bg_color)
 }
 
-widget "*.gtk-combobox-popup-menu.*"   		style "murrine-menuitem-text-is-fg-color-workaround"
+widget "*.gtk-combobox-popup-menu.*"   			style "murrine-menuitem-text-is-fg-color-workaround"
 
 # Work around the usage of GtkLabel inside GtkListItems to display text.
 # This breaks because the label is shown on a background that is based on the
@@ -407,14 +377,14 @@
 	fg[PRELIGHT]    = @text_color
 	fg[ACTIVE]      = @selected_fg_color
 	fg[SELECTED]    = @selected_fg_color
-	fg[INSENSITIVE] = shade (0.22, @ fg_color)
+	fg[INSENSITIVE] = shade (1.6, @bg_color)
 }
 
-widget_class "*<GtkListItem>*" 			style "murrine-fg-is-text-color-workaround"
+widget_class "*<GtkListItem>*" 				style "murrine-fg-is-text-color-workaround"
 
 # The same problem also exists for GtkCList and GtkCTree
 # Only match GtkCList and not the parent widgets, because that would also change the headers.
-widget_class "*<GtkCList>" 			style "murrine-fg-is-text-color-workaround"
+widget_class "*<GtkCList>" 				style "murrine-fg-is-text-color-workaround"
 
 style "murrine-evo-new-button-workaround"
 {
@@ -424,18 +394,15 @@
 		toolbarstyle = 0
 	}
 }
+
 widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "murrine-evo-new-button-workaround"
 
 # Theme panel elements
-widget "*PanelWidget*" 				style "murrine-panel"
-widget "*PanelApplet*" 				style "murrine-panel"
-widget "*fast-user-switch*"			style "murrine-panel"
-class "PanelApp*" 				style "murrine-panel"
-class "PanelToplevel*" 				style "murrine-panel"
-widget_class "*Mail*" 				style "murrine-panel"
-widget_class "*notif*" 				style "murrine-panel"
-widget_class "*Notif*" 				style "murrine-panel"
-
-# DARK: Override Gedit's erroneous MessageArea colours
-widget_class "*GeditWindow.GtkVBox.GtkHPaned.GtkVPaned.GeditNotebook.GeditTab.GeditMessageArea*GtkButton*" style:highest "murrine-default"
-widget_class "*GeditWindow.GtkVBox.GtkHPaned.GtkVPaned.GeditNotebook.GeditTab.GeditMessageArea*" style "murrine-qt"
+widget "*PanelWidget*" 					style "murrine-panel"
+widget "*PanelApplet*" 					style "murrine-panel"
+widget "*fast-user-switch*"				style "murrine-panel" # workaround for Fast User Switch applet
+class "PanelApp*" 					style "murrine-panel"
+class "PanelToplevel*" 					style "murrine-panel"
+widget_class "*Mail*" 					style "murrine-panel"
+widget_class "*notif*" 					style "murrine-panel"
+widget_class "*Notif*" 					style "murrine-panel"