Merge lp:~andrewsomething/gnome-themes/gnome-themes-ubuntu into lp:~ubuntu-desktop/gnome-themes/gnome-themes-ubuntu

[Andrew Starr-Bochicchio]

[Andrew Starr-Bochicchio (andrewsomething)]

nome-themes-ubuntu (0.6) lucid; urgency=low

  [ Loïc Minier ]
  * Fix find snippet dropping -x bits to not touch the upstream files (only
    the installed one) and reverse logic to clear the bits of all files except
    *.sh files (only file needing +x in this package).

  [ Andrew Starr-Bochicchio ]
  * Update Dust{-Sand} to r10 from lp:~dusttheme-dev/dusttheme/0.4
   - gnome-panel clock should not be bold (LP: #439191).
   - Text overlaps with icon in window title bar (LP: #371743).
  * Update New Wave to version 0.8.2 (LP:508851).
   - Nautilus focus ring is not visible (LP: #390601).
   - Thumbnails corrupted in Appearance Preferences (LP: #416030).

 -- Andrew Starr-Bochicchio <email address hidden> Sun, 17 Jan 2010 14:21:20 -0500

[lp:~andrewsomething/gnome-themes/gnome-themes-ubuntu]

29. By Andrew Starr-Bochicchio on 2010-02-26

Update Dust{-Sand} to lp:~dusttheme-dev/dusttheme/0.5

30. By Andrew Starr-Bochicchio on 2010-02-26

debian/control: Bump Standards-Version to 3.8.4

31. By Andrew Starr-Bochicchio on 2010-03-01

Close LP: #529811 in changelog.

=== added directory 'Dust Sand/gtk-2.0/gtk-2.0'
=== added file 'Dust Sand/gtk-2.0/gtk-2.0/blank.png'
Binary files Dust Sand/gtk-2.0/gtk-2.0/blank.png	1970-01-01 00:00:00 +0000 and Dust Sand/gtk-2.0/gtk-2.0/blank.png	2010-03-01 02:27:14 +0000 differ
=== added file 'Dust Sand/gtk-2.0/gtk-2.0/gtkrc'
--- Dust Sand/gtk-2.0/gtk-2.0/gtkrc	1970-01-01 00:00:00 +0000
+++ Dust Sand/gtk-2.0/gtk-2.0/gtkrc	2010-03-01 02:27:14 +0000
@@ -0,0 +1,798 @@
+# Dust theme
+# (c) 2010 Rico Sta. Cruz, Kido Mariano, James Schriver
+# Licensed under the GPL.
+# Requires Murrine GTK Engine v0.91.0
+
+gtk_color_scheme = "fg_color:#323232\nbg_color:#D9D4CC\nbase_color:#fff\ntext_color:#323232\nselected_bg_color:#75645B\nselected_fg_color:#fff\ntooltip_bg_color:#ebeab8\ntooltip_fg_color:#323232"
+
+style "default"
+{
+	xthickness = 1
+	ythickness = 1
+
+	GtkScrolledWindow ::scrollbar-spacing = 0
+	GtkScrolledWindow ::scrollbar-within-bevel = 0
+	
+	GtkButton::child-displacement-x = 1
+	GtkButton::child-displacement-y = 1
+	GtkButton::default-border = { 0, 0, 0, 0 }
+
+	GtkCheckButton::indicator-size = 14
+
+	GtkPaned::handle-size = 6
+
+	GtkRange::trough-border = 1
+	GtkRange::slider-width = 12
+	GtkRange::stepper-size = 12
+        GtkRange::trough-under-steppers = 1
+
+	GtkScale::slider-length = 18
+	GtkScale::trough-side-details = 1
+
+	GtkScrollbar::min-slider-length = 30
+	GtkMenuBar::internal-padding = 0
+	GtkExpander::expander-size = 15
+	GtkToolbar::internal-padding = 1
+	GtkTreeView::expander-size = 15
+	GtkTreeView::vertical-separator = 0
+
+	GtkMenu::horizontal-padding = 0
+	GtkMenu::vertical-padding = 0
+
+	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
+
+        GtkEntry::progress-border = { 2, 2, 2, 2 }
+
+	fg[NORMAL]        = @fg_color
+	fg[PRELIGHT]      = @fg_color
+	fg[SELECTED]      = @selected_fg_color
+	fg[ACTIVE]        = @fg_color
+	fg[INSENSITIVE]   = darker (@bg_color)
+
+	bg[NORMAL]        = @bg_color
+	bg[PRELIGHT]      = shade (1.02, @bg_color)
+	bg[SELECTED]	  = @selected_bg_color
+	bg[INSENSITIVE]   = @bg_color
+	bg[ACTIVE]        = shade (0.9, @bg_color)
+
+	base[NORMAL]      = @base_color
+	base[PRELIGHT]    = shade (0.95, @bg_color)
+	base[ACTIVE]      = mix (0.7, @selected_bg_color, @bg_color)
+	base[SELECTED]    = @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] = darker (@bg_color)
+
+engine "murrine" 
+	{
+		animation           = TRUE  # FALSE = disabled, TRUE = enabled
+		arrowstyle          = 1
+		border_shades       = { 1.2, 1.0 } # gradient to draw on border
+#		border_colors       = { "#E6DDD5", "#E6DDD5" } 
+		colorize_scrollbar  = TRUE  # FALSE = disabled, TRUE = enabled
+		comboboxstyle       = 0 # colorize the GtkComboBox below the arrow.
+		contrast            = .85  # 0.8 for less contrast, more than 1.0 for more contrast on borders
+		#focus_color         = @selected_bg_color
+		glazestyle          = 5     # 0 = flat, 1 = curved, 2 = concave, 3 = top-curved, 4 = beryl
+		glow_shade          = 1.20  # sets glow amount for buttons or widgets
+		glowstyle           = 0     # 0 = top, 1 = bottom, 2 = top and bottom, 3 = center (vertical), 4 = center (horizontal) 
+		gradient_shades     = { 1.13, 1.02, 1.00, 1.02 } # default: {1.1,1.0,1.0,1.1}
+		highlight_shade     = 1.0   # set highlight amount for buttons or widgets
+		lightborder_shade   = 1.2   # sets lightborder amount for buttons or widgets
+		lightborderstyle    = 1     # 0 = lightborder on top side, 1 = lightborder on all sides
+		listviewheaderstyle = 1     # 0 = flat, 1 = glassy, 2 = raised
+		listviewstyle       = 0     # 0 = nothing, 1 = dotted
+		menubaritemstyle    = 1     # 0 = menuitem look, 1 = button look
+		menubarstyle        = 0     # 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
+		prelight_shade      = 1.25 #to select the shade level used in the scrollbar's slider, GtkComboBox with comboboxstyle = 1 and in the prelight state with gradient_colors.
+ 		progressbarstyle    = 0     # 0 = no stripes, 1 = diagonal stripes, 2 = vertical stripes 
+		reliefstyle	    = 4     # 0 = flat, 1 = inset, 2 = shadow, = 3 for a gradient on shadow, = 4 for a stronger shadow.
+		rgba		    = FALSE # FALSE = disabled, TRUE = enabled
+		roundness           = 2     # 0 = squared, 1 = old default, more will increase roundness
+		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 	    = { 0.8, 2.2 }
+		sliderstyle         = 0     # 0 = nothing added, 1 = handles
+		spinbuttonstyle     = 1
+		stepperstyle        = 1     # 0 = standard, 1 = integrated stepper handles, 2 = squared steppers with a rounded slider
+		#textstyle 	    = 1
+		trough_shades       = { 0.98, 1.08 } # draw gradient on trough of GtkScrollbar and GtkProgressbar
+		toolbarstyle	    = 2     # 0 = flat, 1 = glassy, 2 = gradient
+	}
+}
+
+style "wide"
+{
+	xthickness = 2
+	ythickness = 2
+}
+
+style "wider"
+{
+	xthickness = 3
+	ythickness = 3
+}
+
+style "dark"
+{
+	bg[NORMAL]	= @bg_color
+	bg[SELECTED]    = shade(0.9,@selected_bg_color)
+	bg[PRELIGHT]    = shade (0.5, @selected_bg_color)
+	bg[ACTIVE]	= mix (0.5, @selected_bg_color, "#343330")
+	bg[INSENSITIVE] = "#302F2C"
+	
+	fg[NORMAL] = mix (0.7,  '#ffffef', @fg_color)
+	fg[PRELIGHT] = mix (0.8,  '#ffffef', @fg_color)
+	fg[SELECTED] = mix (0.8,  '#ffffef', @fg_color)
+	fg[ACTIVE] = mix (0.8,  '#ffffef', @fg_color)
+	fg[INSENSITIVE] = @fg_color
+	
+}
+
+style "button" = "wider"
+{	
+	bg[NORMAL]   = shade (1.10, @bg_color)
+	bg[PRELIGHT] = mix(0.82,shade (1.1, @bg_color),@selected_bg_color)
+	bg[ACTIVE]   = shade (0.85, @bg_color)
+	
+	engine "murrine"
+	{
+		border_shades       = { .9, .7} # draw a gradient on the border.
+		border_colors       = { "#D9D4CC", "#D9D4CC" } 
+		contrast = 1.0
+		lightborder_shade = 1.06
+	}
+}
+
+style "entry" {
+	xthickness = 3
+	ythickness = 3
+
+	bg[SELECTED] = mix (0.4, @selected_bg_color, @base_color)
+	fg[SELECTED] = @text_color
+
+	engine "murrine" {
+		focus_color = shade (0.65, @selected_bg_color)
+	}
+}
+
+style "toolbar-item" = "wide"
+{
+	bg[NORMAL]   = "#AFA99F" #shade(0.88,@bg_color)
+	bg[PRELIGHT] = "#EFE9DF" #shade(1.1,@bg_color)
+	bg[ACTIVE]   = "#CFC9BF" #shade(0.6,@bg_color)
+	bg[SELECTED]     = "#AFA99F" #shade(0.88,@bg_color)
+	bg[INSENSITIVE]  = "#AFA99F" #shade(0.88,@bg_color)
+		
+	engine "murrine"{
+	}
+	
+}
+
+style "toolbar" = "toolbar-item"
+{
+	engine "pixmap"
+	{
+		image {
+	  		function = BOX
+	  		file = "toolbar_light.png"
+	  		border = {1,1,1,1}
+	  	}
+	  	image {
+		      function				= HANDLE
+		      overlay_file			= "handlebox.png"
+		      overlay_stretch 			= FALSE
+		      orientation			= HORIZONTAL
+		}
+        	image {
+		      function				= HANDLE
+		      overlay_file			= "handlebox.png"
+		      overlay_stretch 			= FALSE
+		      orientation			= VERTICAL
+		}
+		image
+		{
+		       function        			= VLINE
+		       recolorable        		= TRUE
+		       file                		= "blank.png"
+		}
+		image
+		{
+		      function            		= HLINE
+		      recolorable        		= TRUE
+		      file                		= "blank.png"
+		}
+    }
+}
+
+
+style "toolbar-sep" = "toolbar-item"
+{
+    xthickness = 2
+}
+
+style "dark-toolbar" = "dark"
+{	
+	xthickness = 2
+	ythickness = 2
+  	bg[NORMAL] = "#343330"
+	bg[PRELIGHT] =  shade (0.65, @selected_bg_color)
+	bg[SELECTED] =  shade (0.35, @bg_color)
+	bg[ACTIVE] =  shade (0.35, @bg_color)
+
+	engine "murrine"
+	{
+		border_shades = {1.4, 1.2} # draw a gradient on the border.
+		border_colors = { "#343330", "#343330" }
+		glowstyle = 0
+		gradient_shades = {1.1,1.0,1.0,0.7} 
+	    	highlight_shade = 1.0
+	    	lightborder_shade   = 1.0
+	    	reliefstyle = 4     # 0 = flat, 1 = inset, 2 = shadow, = 3 for a gradient on shadow, = 4 for a stronger shadow.
+	}
+}
+
+style "dark-toolbar-sep" = "dark-toolbar"
+ { xthickness = 2 }
+
+
+style "pixmap-dark-toolbar" = "dark-toolbar"
+{
+	# To-do: make the toolbar recolorable, possibly without using pixmaps
+	# We only like this because of the top line, anyway.
+	engine "pixmap"{
+		image {
+	  		function = BOX
+	  		file = "toolbar_o.png"
+	  		border = {1,1,1,1}
+	  	}
+	  	image
+		{
+		      function				= HANDLE
+		      overlay_file			= "handlebox.png"
+		      overlay_stretch 	= FALSE
+		      orientation			= HORIZONTAL
+    		}
+    		image
+		{
+		      function				= HANDLE
+		      overlay_file			= "handlebox.png"
+		      overlay_stretch 	= FALSE
+		      orientation			= VERTICAL
+    		}
+    		image
+		{
+		       function        = VLINE
+		       recolorable        = TRUE
+		       file                = "blank.png"
+		}
+		image
+		{
+		      function            = HLINE
+		      recolorable        = TRUE
+		      file                = "blank.png"
+		}
+	}
+}
+
+style "notebook" = "wider"
+{
+	bg[NORMAL] = shade (1.0615, @bg_color)	
+	bg[ACTIVE] = shade (0.85, @bg_color)		
+
+  	engine "murrine" 
+  	{
+		contrast = 1.0
+    		lightborder_shade = 1.1
+   		highlight_shade	= 1.01
+  	}
+}
+
+style "panel" 
+{
+  	bg_pixmap[NORMAL] = "panel-bg-dark.png"        # Tint top/bottom panel background
+  	bg[NORMAL] = "#2D2519"                          # Default top/bottom panel background 8796N Black Metal
+  	bg[PRELIGHT] = shade(1.0, @selected_bg_color)      # panel prelight
+  	bg[ACTIVE] = @selected_bg_color                    # bottom panel active background
+  	bg[SELECTED] = @selected_bg_color               # Active window desktop lower panel background [ ] [ ] (orange)
+  	bg[INSENSITIVE] = shade(0.90, @selected_bg_color)  #
+
+  	fg[NORMAL] = @selected_fg_color                 # Default text
+  	fg[PRELIGHT] = @selected_fg_color               # Prelight
+  	fg[ACTIVE] = @selected_fg_color                 # Bottom panel active text
+  	fg[SELECTED]  = @fg_color                       # Bottom panel selected window
+}
+
+style "murrine-PanelGtkMenubar" 
+{
+	bg[NORMAL] = "#2D2519"                    # top desktop panel menu background color
+	bg[SELECTED] = darker(@selected_bg_color)    # selected item background
+	fg[NORMAL] = @bg_color    		  # default panel text !
+	fg[PRELIGHT] = @base_color                # text after dropdown menu
+
+  	font_name = "Bold"
+
+  	engine "murrine"
+  		{
+    		# Panel Menubar Tab
+    		contrast = 0.75
+    		glazestyle = 3  # 0 = flat highlight, 1 = curved highlight, 2 = concave style, 3 = top curved highlight, 4 = beryl highlight
+    		glow_shade = 1.5 # Data type: Real; default = 1.0, Range 0-2, precision 0.1
+		glowstyle = 0 # 0 = Top glow, 1 = Bottom glow, 2 = Top and Bottom glow, 3 = Horizontal glow, 4 = Centered glow
+    		roundness = 2
+  		}
+}
+
+widget "*clock-applet-button*" style "dark-toolbar"
+
+style "menu" = "dark"
+{
+	xthickness = 0
+	ythickness = 0
+
+	#Keep it this dark since OOo likes it
+	bg[NORMAL] = "#343330"
+	text[NORMAL] = @bg_color
+	text[PRELIGHT]	= @selected_fg_color
+}
+
+style "menu-item" = "dark"
+{
+	xthickness = 0
+	ythickness = 3
+	engine "murrine"
+	{
+		border_shades = { 1.0, .8} # draw a gradient on the border.
+		border_colors = { "#795145", "#795145" } 
+		glowstyle = 0
+	    	gradient_shades = {1.1,1.0,1.0,0.7}
+	    	highlight_shade = 1.0
+	    	lightborder_shade   = 1.0
+	    	
+	}
+}
+
+style "separator-menu-item"
+{
+	GtkSeparatorMenuItem::horizontal-padding = 2
+	GtkWidget::wide-separators = 1
+	GtkWidget::separator-width = 1
+	GtkWidget::separator-height = 2
+	xthickness = 4
+	ythickness = 0
+	bg[NORMAL] = "#444"
+}
+
+# Based on the default style so that the colors from the button
+# style are overriden again.
+style "treeview-header" = "default"
+{
+	xthickness = 2
+	ythickness = 1
+
+	bg[NORMAL] = shade(0.9, @bg_color)
+        bg[PRELIGHT] = shade(1.0, @bg_color)
+        bg[ACTIVE] = shade(0.8, @bg_color)
+    
+        GtkWidget::focus-line-width = 0
+}
+
+style "tooltips"
+{
+	xthickness = 4
+	ythickness = 4
+
+	bg[NORMAL] = @tooltip_bg_color
+	fg[NORMAL] = @tooltip_fg_color
+}
+
+style "progressbar"
+{
+	xthickness = 0
+	ythickness = 0
+
+	fg[PRELIGHT] = @selected_fg_color
+
+}
+
+style "pixmap-statusbar"
+{
+	ythickness = 3
+	xthickness = 3
+
+    engine "pixmap"
+    {
+        image
+        {
+            function = RESIZE_GRIP
+            recolorable = TRUE
+            detail = "statusbar"
+            overlay_file = "statusgrip.png"
+            overlay_border = {0,0,0,0}
+            overlay_stretch = TRUE
+        }
+        image
+	{
+	   function			= SHADOW
+	   shadow			= IN
+	   file				= "blank.png"
+	}
+	image
+	{
+	   function			= SHADOW
+	   shadow			= OUT
+	   file				= "blank.png"
+	}
+	image
+	{
+	   function		= SHADOW
+	   shadow			= ETCHED_IN
+	   file				= "blank.png"	
+	}
+	image
+	{
+	   function		= SHADOW
+	   shadow			= ETCHED_OUT
+	   file				= "blank.png"
+	}
+    }
+}
+
+style "comboboxentry" = "wider"
+{
+}
+
+style "spinbutton"
+{
+}
+
+style "scale"
+{
+	bg[PRELIGHT] = shade(0.9,@bg_color)
+	engine "murrine"{
+	    roundness = 2
+	    contrast = 1.1
+	    highlight_shade = 1.2
+	    lightborder_shade   = 1.1
+	    gradient_shades = {1.0,0.85,0.8,1.0}
+	    reliefstyle = 2
+	}
+}
+
+style "menubar" = "dark"
+{
+	# Static dark color so continuity doesn't break with toolbars
+	# when color changes
+	bg[NORMAL] = "#343330"
+	engine "pixmap"
+	{
+		image {
+	  		function = BOX
+	  		file = "menubar.png"
+	  		#border = {1,1,1,1}
+	  		stretch = TRUE
+	  	}
+	  	image {
+		      function				= HANDLE
+		      overlay_file			= "handlebox.png"
+		      overlay_stretch 	= FALSE
+		      orientation			= HORIZONTAL
+		}
+        	image {
+		      function				= HANDLE
+		      overlay_file			= "handlebox.png"
+		      overlay_stretch 	= FALSE
+		      orientation			= VERTICAL
+		}
+    }
+}
+
+style "frame"
+{
+	#Uncomment for dark statusbars. Breaks some apps. (FIXME: Doesn't work)
+	#bg[ACTIVE] = shade(0.2,@bg_color)
+	#fg[NORMAL] = mix (1.5, @fg_color, '#ffffff')
+	#fg[PRELIGHT] = mix (1.4, @fg_color, '#ffffff')
+}
+
+style "frame-title" = "frame"
+{
+	fg[NORMAL] = lighter (@fg_color)
+}
+
+# SZ07: This is added to tell the theme how to color checkmarks and radio items that are not in menus.
+style "radiocheck"
+{
+	text[NORMAL]	= @selected_fg_color	# Color for selected checks/radio items.
+	text[PRELIGHT]	= @selected_fg_color	# Color for selected checks/radio items on prelight.
+	
+	engine "murrine"
+	{
+	    	roundness = 2
+	    	contrast = 1.03
+	    	highlight_shade = 1.0
+	    	lightborder_shade = 1.0
+	    	gradient_shades = {1.1,1.0,1.0,0.9}
+	    	reliefstyle = 2 
+	}
+}
+
+style "scrollbar"
+{
+	engine "murrine"
+	{
+		border_shades       = { .7, .7} # draw a gradient on the border.
+		border_colors       = { "#D9D4CC", "#D9D4CC" } 
+		glazestyle          = 4     # 0 = flat, 1 = curved, 2 = concave, 3 = top-curved, 4 = beryl
+		glow_shade          = 1.1   # sets glow amount for buttons or widgets
+		glowstyle           = 4     # 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.3   # sets lightborder amount for buttons or widgets
+		roundness = 4
+	}
+
+
+	bg[SELECTED] = shade (0.6, @bg_color)
+}
+
+style "hscrollbar"
+{
+}
+
+style "vscrollbar"
+{
+}
+
+style "nautilus-location"
+{
+	bg[NORMAL] = mix(0.60, @bg_color, @selected_bg_color)
+}
+
+#########################################
+# Matches
+#########################################
+
+# default style is applied to every widget
+class "GtkWidget"    style "default"
+
+# Increase the x/ythickness in some widgets
+class "GtkRange"     style "default"
+class "GtkFrame"     style "frame"
+class "GtkSeparator" style "wide"
+class "GtkEntry"     style "entry"
+class "GtkStatusbar" style "pixmap-statusbar"
+class "GtkMenuBar"   style:highest "menubar"
+class "GtkRadioButton"	style "radiocheck"	# SZ07: Added for the checkmarks/radio
+class "GtkCheckButton"	style "radiocheck"	# SZ07: Added for the checkmarks/radio
+
+# Toolbar default: dark
+#class "*HandleBox" style "pixmap-dark-toolbar"
+#class "GtkToolbar"   style "pixmap-dark-toolbar" 
+#widget_class "*HandleBox" style "pixmap-dark-toolbar"
+#widget_class "*<GtkToolbar>.*"   style "dark-toolbar"
+
+# Toolbar default: light
+class "*HandleBox" style "toolbar"
+class "GtkToolbar"   style "toolbar" 
+widget_class "*HandleBox" style "toolbar"
+widget_class "*<GtkToolbar>.*"   style "toolbar-item"
+
+#
+# Toolbar exceptions:
+# Browser-type and viewer-type applications get a dark toolbar.
+# Everything below the toolbar for these apps are the content. This will make
+# a separation on function (toolbar) and content (client area).
+#
+
+# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
+style "text-is-fg-color-workaround"
+{
+	text[NORMAL]      = @fg_color
+	text[PRELIGHT]    = @fg_color
+	text[SELECTED]    = @selected_fg_color
+	text[ACTIVE]      = @fg_color
+	text[INSENSITIVE] = darker (@bg_color)
+}
+widget_class "*.<GtkComboBox>.<GtkCellView>"   style "text-is-fg-color-workaround"
+
+style "text-is-fg-color-workaround-dark"
+{
+	#Make it work with this theme!
+	text[NORMAL] = mix (1.5, @fg_color, '#ffffff')
+	text[PRELIGHT] = mix (1.4, @fg_color, '#ffffff')
+}
+
+#  Nautilus toolbar
+widget_class "*Nautilus*Toolbar*" style "pixmap-dark-toolbar"
+widget_class "*Nautilus*Tool*GtkButton" style "dark-toolbar"
+widget_class "*Nautilus*Tool*.*.*" style "dark-toolbar"
+widget_class "*Nautilus*Tool*GtkToggleButton" style "dark-toolbar"
+widget_class "*Nautilus*Tool*Separator*" style "dark-toolbar-sep"
+widget_class "*Nautilus*Tool*.<GtkComboBox>.<GtkCellView>"   style "text-is-fg-color-workaround-dark"
+
+# Evince/EOG
+widget_class "*EggEditable*Toolbar*" style "pixmap-dark-toolbar"
+widget_class "*EggEditable*Toolbar*.*.*.*" style "dark-toolbar"
+widget_class "*EggEditable*Tool*.<GtkComboBox>.<GtkCellView>"   style "text-is-fg-color-workaround-dark"
+
+widget "*fullscreen-toolbar" style "pixmap-dark-toolbar"
+widget "*fullscreen-toolbar.*" style "dark-toolbar"
+widget "*fullscreen-toolbar*.GtkComboBox.GtkCellView"   style "text-is-fg-color-workaround-dark"
+
+# Epiphany
+widget_class "*EphyToolbar*" style "pixmap-dark-toolbar"
+widget_class "*EphyToolbar*.*.*.*" style "dark-toolbar"
+widget_class "*EphyTool*.<GtkComboBox>.<GtkCellView>"   style "text-is-fg-color-workaround-dark"
+ 
+# Brasero
+widget_class "*rasero*Toolbar*"   style "pixmap-dark-toolbar" 
+widget_class "*rasero*Toolbar*.*"   style "dark-toolbar" 
+widget_class "*rasero*Toolbar*.<GtkComboBox>.<GtkCellView>"   style "text-is-fg-color-workaround-dark"
+
+#gThumb
+widget_class "*Gth*Toolbar*"   style "pixmap-dark-toolbar" 
+widget_class "*Gth*Toolbar*.*"   style "dark-toolbar" 
+widget_class "*Gth*Toolbar*.<GtkComboBox>.<GtkCellView>"   style "text-is-fg-color-workaround-dark"
+widget_class "*GthFull*"   style "pixmap-dark-toolbar" #Doesn't work
+
+#Totem
+widget "*totem*" style "dark"
+style "totem-sidebar-workaround" {
+	text[NORMAL] = mix (0.7,  '#ffffef', @fg_color)
+	text[PRELIGHT] = mix (0.8,  '#ffffef', @fg_color)
+}
+widget "*tmw_main_pane.EvSidebar.*GtkComboBox.*"	style "totem-sidebar-workaround"
+
+class "GtkSpinButton"  style "spinbutton"
+class "GtkScale"       style "scale"
+class "GtkVScale"      style "scale"
+class "GtkHScale"      style "scale"
+class "GtkScrollbar"   style "scrollbar"
+class "GtkVScrollbar"  style "vscrollbar"
+class "GtkHScrollbar"  style "hscrollbar"
+class "GtkButton"      style "button"
+
+# 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.
+
+widget_class "*<GtkNotebook>*<GtkEventBox>"     style "notebook"
+widget_class "*<GtkNotebook>*<GtkDrawingArea>"  style "notebook"
+widget_class "*<GtkNotebook>*<GtkLayout>"       style "notebook"
+widget_class "*<GtkNotebook>"    	             style "notebook"
+
+widget_class "*<GtkComboBoxEntry>*" style "comboboxentry"
+widget_class "*<GtkCombo>*"         style "comboboxentry"
+
+widget_class "*<GtkMenuBar>.*"		style "menu-item"
+widget_class "*<GtkMenu>*"              style "menu"
+widget_class "*<GtkMenuItem>"          style "menu-item"
+widget_class "*<GtkSeparatorMenuItem>*" style "separator-menu-item"
+widget_class "*<GtkCheckMenuItem>*" style "radiocheck"
+widget_class "*<GtkRadioMenuItem>*" style "radiocheck"
+
+widget_class "*<GtkFrame>"  style "frame"
+widget_class "*.<GtkFrame>.<GtkLabel>" style "frame-title"
+
+widget_class "*<GtkStatusbar>*"  style "wider"
+widget_class "*<GtkProgressBar>"       style "progressbar"
+
+# Treeview header
+widget_class "*.<GtkTreeView>.<GtkButton>" style "treeview-header"
+widget_class "*.<GtkCTree>.<GtkButton>"    style "treeview-header"
+widget_class "*.<GtkList>.<GtkButton>"     style "treeview-header"
+widget_class "*.<GtkCList>.<GtkButton>"    style "treeview-header"
+
+#Panel
+widget "*PanelWidget*" style "panel"
+widget "*PanelApplet*" style "panel"
+widget "*fast-user-switch*" style "panel" # Workaround for Fast User Switch applet
+class "PanelApp*" style "panel"
+class "PanelToplevel*" style "panel"
+
+# The panel menubar
+widget_class "*Panel*<GtkMenuBar>*" style:highest "murrine-PanelGtkMenubar"
+
+#XFCE panel
+widget_class "*notif*"		style "panel"
+widget_class "*Notif*"		style "panel"
+widget_class "*Tray*"		style "panel"
+widget_class "*tray*"		style "panel"
+widget "*Xfce*Panel*"		style "panel"
+class "*Xfce*Panel*"		style "panel"
+
+widget "gtk-tooltip*" style "tooltips"
+
+###################################################
+# Special cases and work arounds
+###################################################
+
+# Nautilus sidebar
+widget_class "*NautilusSidePane.GtkFrame"	style "pixmap-statusbar"
+
+# Workarounds for Evolution
+widget_class "*.ETable.ECanvas"    style "treeview-header"
+widget_class "*.ETree.ECanvas"    style "treeview-header"
+
+# Monodevelop uses an OptionPanel widget, which incidentally is dark in our theme.
+# Undo it:
+widget "*OptionPanel*"		style "button"
+widget "*optionPanel*"		style "button"
+
+# 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 "nautilus-location"
+
+style "menuitem-text-is-fg-color-workaround" 
+{
+	#text[NORMAL]        = @fg_color
+	#text[PRELIGHT]      = @selected_fg_color
+	#text[SELECTED]      = @selected_fg_color
+	#text[ACTIVE]        = @fg_color
+	#text[INSENSITIVE]   = darker (@bg_color)
+	#Make it work with this theme!
+	text[NORMAL] = mix (1.5, @fg_color, '#ffffff')
+	text[PRELIGHT] = mix (1.4, @fg_color, '#ffffff')
+}
+widget "*.gtk-combobox-popup-menu.*"   style "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
+# base color set.
+style "fg-is-text-color-workaround"
+{
+	fg[NORMAL]      = @text_color
+	fg[PRELIGHT]    = @text_color
+	fg[ACTIVE]      = @selected_fg_color
+	fg[SELECTED]    = @selected_fg_color
+	fg[INSENSITIVE] = darker (@bg_color)
+}
+widget_class "*<GtkListItem>*" style "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 "fg-is-text-color-workaround"
+
+style "evo-new-button-workaround" 
+{
+	engine "murrine"
+	{
+		toolbarstyle = 0
+	}
+}
+
+widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "evo-new-button-workaround"
+
+#Rhythmbox toolbar near the search entry. Use default + wide so that it doesn't turn dark.
+style "rhythmbox-header" = "default"
+{
+	xthickness = 3
+	ythickness = 3
+	engine "murrine" {
+	}
+}
+widget "*RBSourceHeader*"	style:highest "rhythmbox-header"
+widget "*HeaderToolbar*"	style:highest "rhythmbox-header"
+widget "*FooterToolbar*"	style:highest "rhythmbox-header"
+
+widget "*swt*toolbar*"	style "default"
+
+# RSC: Fix for CPU frequency applet
+style "applet-text" = "panel"
+{
+	fg[NORMAL] = @bg_color
+}
+
+widget_class "*CPUFreqApplet*" style:highest "applet-text"
+
+# Firefox specific things:
+#widget "MozillaGtkWidget*Menu*"	style "default"
+widget "MozillaGtkWidget*Tool*"	style "toolbar-item"

=== added file 'Dust Sand/gtk-2.0/gtk-2.0/handlebox.png'
Binary files Dust Sand/gtk-2.0/gtk-2.0/handlebox.png	1970-01-01 00:00:00 +0000 and Dust Sand/gtk-2.0/gtk-2.0/handlebox.png	2010-03-01 02:27:14 +0000 differ
=== added file 'Dust Sand/gtk-2.0/gtk-2.0/menubar.png'
Binary files Dust Sand/gtk-2.0/gtk-2.0/menubar.png	1970-01-01 00:00:00 +0000 and Dust Sand/gtk-2.0/gtk-2.0/menubar.png	2010-03-01 02:27:14 +0000 differ
=== added file 'Dust Sand/gtk-2.0/gtk-2.0/panel-bg-dark.png'
Binary files Dust Sand/gtk-2.0/gtk-2.0/panel-bg-dark.png	1970-01-01 00:00:00 +0000 and Dust Sand/gtk-2.0/gtk-2.0/panel-bg-dark.png	2010-03-01 02:27:14 +0000 differ
=== added file 'Dust Sand/gtk-2.0/gtk-2.0/statusgrip.png'
Binary files Dust Sand/gtk-2.0/gtk-2.0/statusgrip.png	1970-01-01 00:00:00 +0000 and Dust Sand/gtk-2.0/gtk-2.0/statusgrip.png	2010-03-01 02:27:14 +0000 differ
=== added file 'Dust Sand/gtk-2.0/gtk-2.0/toolbar_light.png'
Binary files Dust Sand/gtk-2.0/gtk-2.0/toolbar_light.png	1970-01-01 00:00:00 +0000 and Dust Sand/gtk-2.0/gtk-2.0/toolbar_light.png	2010-03-01 02:27:14 +0000 differ
=== added file 'Dust Sand/gtk-2.0/gtk-2.0/toolbar_o.png'
Binary files Dust Sand/gtk-2.0/gtk-2.0/toolbar_o.png	1970-01-01 00:00:00 +0000 and Dust Sand/gtk-2.0/gtk-2.0/toolbar_o.png	2010-03-01 02:27:14 +0000 differ
=== modified file 'Dust Sand/gtk-2.0/gtkrc'
--- Dust Sand/gtk-2.0/gtkrc	2009-08-08 02:09:42 +0000
+++ Dust Sand/gtk-2.0/gtkrc	2010-03-01 02:27:14 +0000
@@ -1,16 +1,16 @@
-# Dust theme
-# by Rico Sta. Cruz and Ricardo (Kido) Mariano III
+# Dust Sand theme
+# (c) 2010 Rico Sta. Cruz, Kido Mariano, James Schriver
+# Licensed under the GPL.
+# Requires Murrine GTK Engine v0.91.0
 
 gtk_color_scheme = "fg_color:#323232\nbg_color:#C1BDB5\nbase_color:#fff\ntext_color:#323232\nselected_bg_color:#B99573\nselected_fg_color:#fff\ntooltip_bg_color:#ebeab8\ntooltip_fg_color:#323232"
 
-include "scrollbars/scrollbar.rc"
-
 style "default"
 {
 	xthickness = 1
 	ythickness = 1
 
-	GtkScrolledWindow ::scrollbar-spacing = 0
+	GtkScrolledWindow ::scrollbar-spacing = 1
 	GtkScrolledWindow ::scrollbar-within-bevel = 0
 	
 	GtkButton::child-displacement-x = 1
@@ -21,9 +21,9 @@
 
 	GtkPaned::handle-size = 6
 
-	GtkRange::trough-border = 1
-	GtkRange::slider-width = 12
-	GtkRange::stepper-size = 12
+	GtkRange::trough-border = 2
+	GtkRange::slider-width = 13
+	GtkRange::stepper-size = 14
         GtkRange::trough-under-steppers = 1
 
 	GtkScale::slider-length = 18
@@ -71,33 +71,42 @@
 	text[SELECTED]    = @selected_fg_color
 	text[INSENSITIVE] = darker (@bg_color)
 
-	engine "murrine" {
-		#options
+engine "murrine" 
+	{
 		animation           = TRUE  # FALSE = disabled, TRUE = enabled
-		colorize_scrollbar  = FALSE # FALSE = disabled, TRUE = enabled
-		contrast            = 0.8  # 0.8 for less contrast, more than 1.0 for more contrast on borders
-		glazestyle          = 0     # 0 = flat highlight, 1 = curved highlight, 2 = concave style, 3 = top curved highlight, 4 = beryl highlight
-                glow_shade          = 1.2
-		glowstyle           = 2     # 0 = top, 1 = bottom, 2 = top and bottom, 3 = horizontal, 4 = centered glow
-		gradient_shades     = {1.1,1.0,1.0,0.87}
-		gradients           = TRUE
-		highlight_shade     = 1.0
-		lightborder_shade   = 1.1
+		arrowstyle          = 1
+		border_shades       = { 1.2, 1.0 } # gradient to draw on border
+#		border_colors       = { "#E6DDD5", "#E6DDD5" } 
+		colorize_scrollbar  = TRUE  # FALSE = disabled, TRUE = enabled
+		comboboxstyle       = 0 # colorize the GtkComboBox below the arrow.
+		contrast            = .85  # 0.8 for less contrast, more than 1.0 for more contrast on borders
+		#focus_color         = @selected_bg_color
+		glazestyle          = 5     # 0 = flat, 1 = curved, 2 = concave, 3 = top-curved, 4 = beryl
+		glow_shade          = 1.20  # sets glow amount for buttons or widgets
+		glowstyle           = 0     # 0 = top, 1 = bottom, 2 = top and bottom, 3 = center (vertical), 4 = center (horizontal) 
+		gradient_shades     = { 1.13, 1.02, 1.00, 1.02 } # default: {1.1,1.0,1.0,1.1}
+		highlight_shade     = 1.0   # set highlight amount for buttons or widgets
+		lightborder_shade   = 1.2   # sets lightborder amount for buttons or widgets
 		lightborderstyle    = 1     # 0 = lightborder on top side, 1 = lightborder on all sides
 		listviewheaderstyle = 1     # 0 = flat, 1 = glassy, 2 = raised
-		listviewstyle       = 1     # 0 = nothing, 1 = dotted
-		menubaritemstyle    = 0     # 0 = menuitem look, 1 = button look
-		menubarstyle        = 2     # 0 = flat, 1 = glassy, 2 = gradient, 3 = striped
+		listviewstyle       = 0     # 0 = nothing, 1 = dotted
+		menubaritemstyle    = 1     # 0 = menuitem look, 1 = button look
+		menubarstyle        = 0     # 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
-                progressbarstyle    = 1     # 0 = flat, 1 = striped, 2 = blocks
-		reliefstyle	    = 2     # 0 = flat, 1 = inset, 2 = shadow
-		rgba		    = FALSE  # FALSE = disabled, TRUE = enabled
+		prelight_shade      = 1.25 #to select the shade level used in the scrollbar's slider, GtkComboBox with comboboxstyle = 1 and in the prelight state with gradient_colors.
+ 		progressbarstyle    = 0     # 0 = no stripes, 1 = diagonal stripes, 2 = vertical stripes 
+		reliefstyle	    = 4     # 0 = flat, 1 = inset, 2 = shadow, = 3 for a gradient on shadow, = 4 for a stronger shadow.
+		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
+		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 	    = { 0.8, 2.2 }
 		sliderstyle         = 0     # 0 = nothing added, 1 = handles
-		stepperstyle        = 1     # 0 = standard, 1 = integrated stepper handles, 2 = unknown
-		toolbarstyle	    = 1     # 0 = flat, 1 = glassy, 2 = gradient                
+		spinbuttonstyle     = 1
+		stepperstyle        = 1     # 0 = standard, 1 = integrated stepper handles, 2 = squared steppers with a rounded slider
+		#textstyle 	    = 1
+		trough_shades       = { 0.98, 1.08 } # draw gradient on trough of GtkScrollbar and GtkProgressbar
+		toolbarstyle	    = 2     # 0 = flat, 1 = glassy, 2 = gradient
 	}
 }
 
@@ -114,13 +123,18 @@
 }
 
 style "button" = "wider"
-{
-	bg[NORMAL]   = shade (1.2, @bg_color)
-	bg[PRELIGHT] = shade (0.9, @bg_color) #mix(0.82,shade (1.3, @bg_color),@selected_bg_color)
+{	
+	bg[NORMAL]   = shade (1.10, @bg_color)
+	bg[PRELIGHT] = shade(1.05, "#dcd8d5")
 	bg[ACTIVE]   = shade (0.85, @bg_color)
 	
-	engine "murrine"{
-		contrast = 1.5
+	engine "murrine"
+	{
+		border_shades       = { .8, .5} # draw a gradient on the border.
+		#border_colors       = { "#C1BDB5", "#D9D4CC" } 
+		border_colors	    = { @bg_color, @bg_color}
+		contrast = 1.4
+		lightborder_shade = 1.06
 	}
 }
 
@@ -155,26 +169,26 @@
 	  	image {
 		      function				= HANDLE
 		      overlay_file			= "handlebox.png"
-		      overlay_stretch 	= FALSE
+		      overlay_stretch 			= FALSE
 		      orientation			= HORIZONTAL
 		}
         	image {
 		      function				= HANDLE
 		      overlay_file			= "handlebox.png"
-		      overlay_stretch 	= FALSE
+		      overlay_stretch 			= FALSE
 		      orientation			= VERTICAL
 		}
-		image
-		{
-		       function        = VLINE
-		       recolorable        = TRUE
-		       file                = "blank.png"
-		}
-		image
-		{
-		      function            = HLINE
-		      recolorable        = TRUE
-		      file                = "blank.png"
+		image
+		{
+		       function        			= VLINE
+		       recolorable        		= TRUE
+		       file                		= "blank.png"
+		}
+		image
+		{
+		      function            		= HLINE
+		      recolorable        		= TRUE
+		      file                		= "blank.png"
 		}
     }
 }
@@ -200,21 +214,17 @@
     bg[NORMAL] = shade(0.5, @bg_color)
 }
 
-style "notebook-bg" = "wider"
+style "notebook" = "wider"
 {
-	bg[NORMAL] = shade (1.05, @bg_color)
-	bg[SELECTED]   = shade (1.05, @bg_color)
-	bg[ACTIVE] = shade(0.75,@bg_color)
-}
+	bg[NORMAL] = shade (1.0615, @bg_color)	
+	bg[ACTIVE] = shade (0.85, @bg_color)		
 
-style "notebook" = "notebook-bg"
-{
-	engine "murrine"{
-	    contrast = 1.1
-	    highlight_shade = 1.2
-	    lightborder_shade   = 1.1
-	    gradient_shades = {1.0,0.85,0.8,1.0}
-	}
+  	engine "murrine" 
+  	{
+		contrast = 1.0
+    		lightborder_shade = 1.1
+   		highlight_shade	= 1.01
+  	}
 }
 
 style "panel" {
@@ -261,15 +271,10 @@
 	ythickness = 1
 
 	bg[NORMAL] = shade(0.9, @bg_color)
-	bg[PRELIGHT] = shade(1.0, @bg_color)
-	bg[ACTIVE] = shade(0.8, @bg_color)
+        bg[PRELIGHT] = shade(1.0, @bg_color)
+        bg[ACTIVE] = shade(0.8, @bg_color)
     
-	engine "murrine"{
-	    contrast = 1.1
-	    highlight_shade = 1.2
-	    lightborder_shade   = 1.1
-	    gradient_shades = {0.9,0.87,0.85,0.9}
-	}
+        GtkWidget::focus-line-width = 0
 }
 
 style "tooltips"
@@ -332,7 +337,7 @@
     }
 }
 
-style "comboboxentry" 
+style "comboboxentry"  = "wider"
 {
 }
 
@@ -404,15 +409,45 @@
 {
 	text[NORMAL]	= @selected_fg_color	# Color for selected checks/radio items.
 	text[PRELIGHT]	= @selected_fg_color	# Color for selected checks/radio items on prelight.
-	engine "murrine"{
-	    roundness = 2
-	    contrast = 1.03
-	    highlight_shade = 1.0
-	    lightborder_shade   = 1.0
-	    gradient_shades = {1.1,1.0,1.0,0.9}
-	    reliefstyle	    = 2 
-	}
-}
+	
+	engine "murrine"
+	{
+	    	roundness = 2
+	    	contrast = 1.03
+	    	highlight_shade = 1.0
+	    	lightborder_shade = 1.0
+	    	gradient_shades = {1.1,1.0,1.0,0.9}
+	    	reliefstyle = 2 
+	}
+}
+
+style "scrollbar"
+{
+	engine "murrine"
+	{
+		border_shades       = { .5, .5} # draw a gradient on the border.
+		border_colors       = { "#D9D4CC", "#D9D4CC" } 
+		glazestyle          = 3     # 0 = flat, 1 = curved, 2 = concave, 3 = top-curved, 4 = beryl
+		glow_shade          = 1.1   # sets glow amount for buttons or widgets
+		glowstyle           = 4     # 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.1   # set highlight amount for buttons or widgets
+		lightborder_shade   = 1.3   # sets lightborder amount for buttons or widgets
+		roundness = 5
+	}
+
+
+	bg[SELECTED] = shade (0.6, @bg_color)
+}
+
+style "hscrollbar"
+{
+}
+
+style "vscrollbar"
+{
+}
+
 #########################################
 # Matches
 #########################################
@@ -427,6 +462,8 @@
 class "GtkEntry"     style "entry"
 class "GtkStatusbar" style "pixmap-statusbar"
 class "GtkMenuBar"   style:highest "menubar"
+class "GtkRadioButton"	style "radiocheck"	# SZ07: Added for the checkmarks/radio
+class "GtkCheckButton"	style "radiocheck"	# SZ07: Added for the checkmarks/radio
 
 class "*HandleBox" style "toolbar"
 class "GtkToolbar"   style "toolbar" 
@@ -455,20 +492,21 @@
 class "GtkScale"       style "scale"
 class "GtkVScale"      style "scale"
 class "GtkHScale"      style "scale"
-#class "GtkScrollbar"   style "scrollbar"
+class "GtkScrollbar"   style "scrollbar"
+class "GtkVScrollbar"  style "vscrollbar"
+class "GtkHScrollbar"  style "hscrollbar"
 class "GtkButton"      style "button"
 
-class "GtkRadioButton"	style:highest "radiocheck"	# SZ07: Added for the checkmarks/radio
-class "GtkCheckButton"	style:highest "radiocheck"	# SZ07: Added for the checkmarks/radio
-
-# 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.
-
-widget_class "*<GtkNotebook>*<GtkEventBox>"     style "notebook-bg"
-widget_class "*<GtkNotebook>*<GtkDrawingArea>"  style "notebook-bg"
-widget_class "*<GtkNotebook>*<GtkLayout>"       style "notebook-bg"
+# 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.
+
+# 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.
+
+widget_class "*<GtkNotebook>*<GtkEventBox>"     style "notebook"
+widget_class "*<GtkNotebook>*<GtkDrawingArea>"  style "notebook"
+widget_class "*<GtkNotebook>*<GtkLayout>"       style "notebook"
 widget_class "*<GtkNotebook>"    style "notebook"
-
 widget_class "*<GtkComboBoxEntry>*" style "comboboxentry"
 widget_class "*<GtkCombo>*"         style "comboboxentry"
 
@@ -507,25 +545,6 @@
 widget "*Xfce*Panel*"		style "panel"
 class "*Xfce*Panel*"		style "panel"
 
-# The following lines make panel-menu-applet, slab-main-menu and gimmie applet's text bold. The radius value sets the roundness value of the selected menu-item.
-style "bold-panel-menu"
-{
-	font_name = "Bold"
-
-	engine "murrine" {
-	roundness = 2
-	}
-}
-
-style "bold-panel-slab"
-{
-	font_name = "Bold"
-}
-widget "*Panel*slab-main-menu-panel-button*" style "bold-panel-slab"
-widget "*gimmie*" style "bold-panel-slab"
-widget "*Panel*MenuBar*" style "bold-panel-menu"
-widget "*Panel*Clock*" style "bold-panel-menu"
-
 widget "gtk-tooltip*" style "tooltips"
 
 ###################################################
@@ -580,7 +599,7 @@
 
 style "evo-new-button-workaround" 
 {
-	engine "clearlooks"
+	engine "murrine"
 	{
 		toolbarstyle = 0
 	}
@@ -593,7 +612,7 @@
 {
 	xthickness = 3
 	ythickness = 3
-	engine "clearlooks" {
+	engine "murrine" {
 	}
 }
 widget "*RBSourceHeader*"	style:highest "rhythmbox-header"

=== removed symlink 'Dust Sand/gtk-2.0/scrollbars'
=== target was '../../Dust/gtk-2.0/scrollbars/'
=== modified file 'Dust Sand/metacity-1/metacity-theme-1.xml'
--- Dust Sand/metacity-1/metacity-theme-1.xml	2009-08-08 02:09:42 +0000
+++ Dust Sand/metacity-1/metacity-theme-1.xml	2010-03-01 02:27:14 +0000
@@ -242,19 +242,19 @@
 
 <!-- menu icon -->
 <draw_ops name="button_menu_normal">
-<icon x="6" y="2" width="mini_icon_width" height="mini_icon_height"/>
+<icon x="2" y="2" width="mini_icon_width" height="mini_icon_height"/>
 </draw_ops>
 <draw_ops name="button_menu_prelight">
-<icon x="6" y="2" width="mini_icon_width" height="mini_icon_height"/>
+<icon x="2" y="2" width="mini_icon_width" height="mini_icon_height"/>
 </draw_ops>
 <draw_ops name="button_menu_inactive_prelight">
-<icon x="6" y="2" width="mini_icon_width" height="mini_icon_height" alpha="0.3"/>
+<icon x="2" y="2" width="mini_icon_width" height="mini_icon_height" alpha="0.3"/>
 </draw_ops>
 <draw_ops name="button_menu_pressed">
-<icon x="6" y="2" width="mini_icon_width" height="mini_icon_height"/>
+<icon x="2" y="2" width="mini_icon_width" height="mini_icon_height"/>
 </draw_ops>
 <draw_ops name="button_menu_inactive">
-<icon x="6" y="2" width="mini_icon_width" height="mini_icon_height" alpha="0.3"/>
+<icon x="2" y="2" width="mini_icon_width" height="mini_icon_height" alpha="0.3"/>
 </draw_ops>
 
 

=== modified file 'Dust/gtk-2.0/gtkrc'
--- Dust/gtk-2.0/gtkrc	2009-10-10 08:32:48 +0000
+++ Dust/gtk-2.0/gtkrc	2010-03-01 02:27:14 +0000
@@ -1,17 +1,18 @@
 # Dust theme
-# (c) 2009 Rico Sta. Cruz, Kido Mariano, James Schriver
+# (c) 2010 Rico Sta. Cruz, Kido Mariano, James Schriver
 # Licensed under the GPL.
-
-gtk_color_scheme = "fg_color:#323232\nbg_color:#D9D4CC\nbase_color:#fff\ntext_color:#323232\nselected_bg_color:#996B5C\nselected_fg_color:#fff\ntooltip_bg_color:#ebeab8\ntooltip_fg_color:#323232"
-
-include "scrollbars/scrollbar.rc"
+# Requires Murrine GTK Engine v0.91.0
+
+gtk_color_scheme = "fg_color:#323232\nbg_color:#D9D4CC\nbase_color:#fff\ntext_color:#323232\nselected_bg_color:#75645B\nselected_fg_color:#fff\ntooltip_bg_color:#ebeab8\ntooltip_fg_color:#323232"
 
 style "default"
 {
 	xthickness = 1
 	ythickness = 1
 
-	GtkScrolledWindow ::scrollbar-spacing = 0
+	GtkWidget::link-color = "#3399ff"
+	
+	GtkScrolledWindow ::scrollbar-spacing = 1
 	GtkScrolledWindow ::scrollbar-within-bevel = 0
 	
 	GtkButton::child-displacement-x = 1
@@ -22,9 +23,9 @@
 
 	GtkPaned::handle-size = 6
 
-	GtkRange::trough-border = 1
-	GtkRange::slider-width = 12
-	GtkRange::stepper-size = 12
+	GtkRange::trough-border = 2
+	GtkRange::slider-width = 13
+	GtkRange::stepper-size = 14
         GtkRange::trough-under-steppers = 1
 
 	GtkScale::slider-length = 18
@@ -72,33 +73,42 @@
 	text[SELECTED]    = @selected_fg_color
 	text[INSENSITIVE] = darker (@bg_color)
 
-	engine "murrine" {
-		#options
+engine "murrine" 
+	{
 		animation           = TRUE  # FALSE = disabled, TRUE = enabled
-		colorize_scrollbar  = FALSE # FALSE = disabled, TRUE = enabled
-		contrast            = 0.8  # 0.8 for less contrast, more than 1.0 for more contrast on borders
-		glazestyle          = 0     # 0 = flat highlight, 1 = curved highlight, 2 = concave style, 3 = top curved highlight, 4 = beryl highlight
-                glow_shade          = 1.2
-		glowstyle           = 2     # 0 = top, 1 = bottom, 2 = top and bottom, 3 = horizontal, 4 = centered glow
-		gradient_shades     = {1.1,1.0,1.0,0.87}
-		gradients           = TRUE
-		highlight_shade     = 1.0
-		lightborder_shade   = 1.1
+		arrowstyle          = 1
+		border_shades       = { 1.2, 1.0 } # gradient to draw on border
+#		border_colors       = { "#E6DDD5", "#E6DDD5" } 
+		colorize_scrollbar  = TRUE  # FALSE = disabled, TRUE = enabled
+		comboboxstyle       = 0 # colorize the GtkComboBox below the arrow.
+		contrast            = .85  # 0.8 for less contrast, more than 1.0 for more contrast on borders
+		#focus_color         = @selected_bg_color
+		glazestyle          = 5     # 0 = flat, 1 = curved, 2 = concave, 3 = top-curved, 4 = beryl
+		glow_shade          = 1.20  # sets glow amount for buttons or widgets
+		glowstyle           = 0     # 0 = top, 1 = bottom, 2 = top and bottom, 3 = center (vertical), 4 = center (horizontal) 
+		gradient_shades     = { 1.13, 1.02, 1.00, 1.02 } # default: {1.1,1.0,1.0,1.1}
+		highlight_shade     = 1.0   # set highlight amount for buttons or widgets
+		lightborder_shade   = 1.2   # sets lightborder amount for buttons or widgets
 		lightborderstyle    = 1     # 0 = lightborder on top side, 1 = lightborder on all sides
 		listviewheaderstyle = 1     # 0 = flat, 1 = glassy, 2 = raised
-		listviewstyle       = 1     # 0 = nothing, 1 = dotted
-		menubaritemstyle    = 0     # 0 = menuitem look, 1 = button look
-		menubarstyle        = 2     # 0 = flat, 1 = glassy, 2 = gradient, 3 = striped
+		listviewstyle       = 0     # 0 = nothing, 1 = dotted
+		menubaritemstyle    = 1     # 0 = menuitem look, 1 = button look
+		menubarstyle        = 0     # 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
-                progressbarstyle    = 1     # 0 = flat, 1 = striped, 2 = blocks
-		reliefstyle	    = 2     # 0 = flat, 1 = inset, 2 = shadow
-		rgba		    = FALSE  # FALSE = disabled, TRUE = enabled
+		prelight_shade      = 1.25 #to select the shade level used in the scrollbar's slider, GtkComboBox with comboboxstyle = 1 and in the prelight state with gradient_colors.
+ 		progressbarstyle    = 0     # 0 = no stripes, 1 = diagonal stripes, 2 = vertical stripes 
+		reliefstyle	    = 4     # 0 = flat, 1 = inset, 2 = shadow, = 3 for a gradient on shadow, = 4 for a stronger shadow.
+		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
+		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 	    = { 0.8, 2.2 }
 		sliderstyle         = 0     # 0 = nothing added, 1 = handles
-		stepperstyle        = 1     # 0 = standard, 1 = integrated stepper handles, 2 = unknown
-		toolbarstyle	    = 1     # 0 = flat, 1 = glassy, 2 = gradient                
+		spinbuttonstyle     = 1
+		stepperstyle        = 1     # 0 = standard, 1 = integrated stepper handles, 2 = squared steppers with a rounded slider
+		#textstyle 	    = 1
+		trough_shades       = { 0.98, 1.08 } # draw gradient on trough of GtkScrollbar and GtkProgressbar
+		toolbarstyle	    = 1     # 0 = flat, 1 = glassy, 2 = gradient
 	}
 }
 
@@ -131,12 +141,18 @@
 }
 
 style "button" = "wider"
-{
-	bg[NORMAL]   = shade (1.15, @bg_color)
-	bg[PRELIGHT] = shade (1.03, @bg_color) #mix(0.82,shade (1.1, @bg_color),@selected_bg_color)
+{	
+	bg[NORMAL]   = shade (1.10, @bg_color)
+	bg[PRELIGHT] = mix(0.82,shade (1.1, @bg_color),@selected_bg_color)
 	bg[ACTIVE]   = shade (0.85, @bg_color)
-	engine "murrine"{
-		contrast = 1.5
+	
+	engine "murrine"
+	{
+		border_shades       = { .8, .5} # draw a gradient on the border.
+		#border_colors       = { "#D9D4CC", "#D9D4CC" } 
+		border_colors	    = { @bg_color, @bg_color}
+		contrast = 1.4
+		lightborder_shade = 1.06
 	}
 }
 
@@ -152,7 +168,7 @@
 	}
 }
 
-style "toolbar-item" = "wide"
+style "toolbar-item" = "button"
 {
 	bg[NORMAL]   = "#AFA99F" #shade(0.88,@bg_color)
 	bg[PRELIGHT] = "#EFE9DF" #shade(1.1,@bg_color)
@@ -167,37 +183,11 @@
 
 style "toolbar" = "toolbar-item"
 {
-	engine "pixmap"
-	{
-		image {
-	  		function = BOX
-	  		file = "toolbar_light.png"
-	  		border = {1,1,1,1}
-	  	}
-	  	image {
-		      function				= HANDLE
-		      overlay_file			= "handlebox.png"
-		      overlay_stretch 	= FALSE
-		      orientation			= HORIZONTAL
-		}
-        	image {
-		      function				= HANDLE
-		      overlay_file			= "handlebox.png"
-		      overlay_stretch 	= FALSE
-		      orientation			= VERTICAL
-		}
-		image
-		{
-		       function        = VLINE
-		       recolorable        = TRUE
-		       file                = "blank.png"
-		}
-		image
-		{
-		      function            = HLINE
-		      recolorable        = TRUE
-		      file                = "blank.png"
-		}
+    xthickness = 1
+    ythickness = 1
+    engine "murrine"{
+	gradient_shades     = { 1.00, 0.94, 0.94, 0.85 }
+	contrast	    = 1.15
     }
 }
 
@@ -209,14 +199,23 @@
 
 style "dark-toolbar" = "dark"
 {	
-	xthickness = 2
-	ythickness = 2
+	xthickness = 3
+	ythickness = 3
   	bg[NORMAL] = "#343330"
-	bg[PRELIGHT] =  mix (0.25, @selected_bg_color, "#343330")
-	bg[SELECTED] =  mix (0.25, @selected_bg_color, "#343330")#shade(0.2,@bg_color))
-	bg[ACTIVE] =  mix (0.5, @selected_bg_color, "#343330")
-	
-	engine "murrine"{
+	bg[PRELIGHT] =  shade (0.65, @selected_bg_color)
+	bg[SELECTED] =  shade (0.35, @bg_color)
+	bg[ACTIVE] =  shade (0.35, @bg_color)
+
+	engine "murrine"
+	{
+		border_shades = {1.3, 1.1} # draw a gradient on the border.
+		border_colors = { "#343330", "#343330" }
+		glowstyle = 4
+		gradient_shades = {1.05,1.0,1.0,0.9} 
+	    	highlight_shade = 1.1
+	    	lightborder_shade   = 1.05
+	    	reliefstyle = 4     # 0 = flat, 1 = inset, 2 = shadow, = 3 for a gradient on shadow, = 4 for a stronger shadow.
+	    	contrast = 1.4
 	}
 }
 
@@ -226,6 +225,8 @@
 
 style "pixmap-dark-toolbar" = "dark-toolbar"
 {
+	xthickness = 1
+	ythickness = 1
 	# To-do: make the toolbar recolorable, possibly without using pixmaps
 	# We only like this because of the top line, anyway.
 	engine "pixmap"{
@@ -248,42 +249,73 @@
 		      overlay_stretch 	= FALSE
 		      orientation			= VERTICAL
     		}
-    		image
-		{
-		       function        = VLINE
-		       recolorable        = TRUE
-		       file                = "blank.png"
-		}
-		image
-		{
-		      function            = HLINE
-		      recolorable        = TRUE
-		      file                = "blank.png"
-		}
-	}
-}
-
-style "notebook-bg" = "wider"
-{
-	bg[NORMAL] = shade (1.05, @bg_color)
-	bg[ACTIVE] = shade(0.75,@bg_color)
-}
-
-style "notebook" = "notebook-bg"
-{
-	engine "murrine"{
-	    contrast = 1.1
-	    highlight_shade = 1.2
-	    lightborder_shade   = 1.1
-	    gradient_shades = {1.0,0.85,0.8,1.0}
-	}
-}
-
-style "panel" = "dark" {
-	bg[NORMAL] = "#2C2B29"
-	engine "murrine" {
-	}
-}
+    		image
+		{
+		       function        = VLINE
+		       recolorable        = TRUE
+		       file                = "blank.png"
+		}
+		image
+		{
+		      function            = HLINE
+		      recolorable        = TRUE
+		      file                = "blank.png"
+		}
+	}
+}
+
+style "notebook" = "wider"
+{
+	bg[NORMAL] = shade (1.0615, @bg_color)	
+	bg[ACTIVE] = shade (0.85, @bg_color)		
+
+  	engine "murrine" 
+  	{
+		contrast = 1.0
+    		lightborder_shade = 1.1
+   		highlight_shade	= 1.01
+  	}
+}
+
+style "panel" 
+{
+  	#bg_pixmap[NORMAL] = "panel-bg-dark.png"        # Tint top/bottom panel background
+  	#bg[NORMAL] = "#2D2519"                          # Default top/bottom panel background 8796N Black Metal
+  	bg[NORMAL] = "#343330"
+  	bg[PRELIGHT] = shade(1.0, @selected_bg_color)      # panel prelight
+  	bg[ACTIVE] = @selected_bg_color                    # bottom panel active background
+  	bg[SELECTED] = @selected_bg_color               # Active window desktop lower panel background [ ] [ ] (orange)
+  	bg[INSENSITIVE] = shade(0.90, @selected_bg_color)  #
+
+  	fg[NORMAL] = @selected_fg_color                 # Default text
+  	fg[PRELIGHT] = @selected_fg_color               # Prelight
+  	fg[ACTIVE] = @selected_fg_color                 # Bottom panel active text
+  	fg[SELECTED]  = @fg_color                       # Bottom panel selected window
+  	
+}
+
+style "murrine-PanelGtkMenubar" 
+{
+	#bg[NORMAL] = "#2D2519"                    # top desktop panel menu background color
+	bg[NORMAL] = "#343330"
+	bg[SELECTED] = darker(@selected_bg_color)    # selected item background
+	fg[NORMAL] = @bg_color    		  # default panel text !
+	fg[PRELIGHT] = @base_color                # text after dropdown menu
+
+  	#font_name = "Bold"
+
+  	engine "murrine"
+  		{
+    		# Panel Menubar Tab
+    		contrast = 0.75
+    		glazestyle = 3  # 0 = flat highlight, 1 = curved highlight, 2 = concave style, 3 = top curved highlight, 4 = beryl highlight
+    		glow_shade = 1.5 # Data type: Real; default = 1.0, Range 0-2, precision 0.1
+		glowstyle = 0 # 0 = Top glow, 1 = Bottom glow, 2 = Top and Bottom glow, 3 = Horizontal glow, 4 = Centered glow
+    		#roundness = 2
+  		}
+}
+
+widget "*clock-applet-button*" style "dark-toolbar"
 
 style "menu" = "dark"
 {
@@ -291,7 +323,7 @@
 	ythickness = 0
 
 	#Keep it this dark since OOo likes it
-	bg[NORMAL] = "#302F2C"
+	bg[NORMAL] = "#343330"
 	text[NORMAL] = @bg_color
 	text[PRELIGHT]	= @selected_fg_color
 }
@@ -300,12 +332,15 @@
 {
 	xthickness = 0
 	ythickness = 3
-	engine "murrine" {
-	    glowstyle = 0
-	    roundness = 0
-	    highlight_shade = 1.0
-	    lightborder_shade   = 1.0
-	    gradient_shades = {1.1,1.0,1.0,0.7}
+	engine "murrine"
+	{
+		border_shades = { 1.0, .8} # draw a gradient on the border.
+		border_colors = { "#795145", "#795145" } 
+		glowstyle = 0
+	    	gradient_shades = {1.1,1.0,1.0,0.7}
+	    	highlight_shade = 1.0
+	    	lightborder_shade   = 1.0
+	    	roundness = 0
 	}
 }
 
@@ -324,19 +359,14 @@
 # style are overriden again.
 style "treeview-header" = "default"
 {
-	xthickness = 1
+	xthickness = 2
 	ythickness = 1
 
-    bg[NORMAL] = shade(0.9, @bg_color)
-    bg[PRELIGHT] = shade(1.0, @bg_color)
-    bg[ACTIVE] = shade(0.8, @bg_color)
+	bg[NORMAL] = shade(0.9, @bg_color)
+        bg[PRELIGHT] = shade(1.0, @bg_color)
+        bg[ACTIVE] = shade(0.8, @bg_color)
     
-	engine "murrine"{
-	    contrast = 1.1
-	    highlight_shade = 1.2
-	    lightborder_shade   = 1.1
-	    gradient_shades = {0.9,0.87,0.85,0.9}
-	}
+        GtkWidget::focus-line-width = 0
 }
 
 style "tooltips"
@@ -400,7 +430,7 @@
     }
 }
 
-style "comboboxentry" 
+style "comboboxentry" = "wider"
 {
 }
 
@@ -426,6 +456,8 @@
 	# Static dark color so continuity doesn't break with toolbars
 	# when color changes
 	bg[NORMAL] = "#343330"
+	text[NORMAL] = @bg_color               # Menubar text (OOo)              # Menubar text (OOo)
+	
 	engine "pixmap"
 	{
 		image {
@@ -467,14 +499,43 @@
 {
 	text[NORMAL]	= @selected_fg_color	# Color for selected checks/radio items.
 	text[PRELIGHT]	= @selected_fg_color	# Color for selected checks/radio items on prelight.
-	engine "murrine"{
-	    roundness = 2
-	    contrast = 1.03
-	    highlight_shade = 1.0
-	    lightborder_shade   = 1.0
-	    gradient_shades = {1.1,1.0,1.0,0.9}
-	    reliefstyle	    = 2 
-	}
+	
+	engine "murrine"
+	{
+	    	roundness = 2
+	    	contrast = 1.03
+	    	highlight_shade = 1.0
+	    	lightborder_shade = 1.0
+	    	gradient_shades = {1.1,1.0,1.0,0.9}
+	    	reliefstyle = 2 
+	}
+}
+
+style "scrollbar"
+{
+	engine "murrine"
+	{
+		border_shades       = { .5, .5} # draw a gradient on the border.
+		border_colors       = { "#D9D4CC", "#D9D4CC" } 
+		glazestyle          = 3     # 0 = flat, 1 = curved, 2 = concave, 3 = top-curved, 4 = beryl
+		glow_shade          = 1.1   # sets glow amount for buttons or widgets
+		glowstyle           = 4     # 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.1   # set highlight amount for buttons or widgets
+		lightborder_shade   = 1.3   # sets lightborder amount for buttons or widgets
+		roundness = 5
+	}
+
+
+	bg[SELECTED] = shade (0.6, @bg_color)
+}
+
+style "hscrollbar"
+{
+}
+
+style "vscrollbar"
+{
 }
 
 style "nautilus-location"
@@ -496,8 +557,8 @@
 class "GtkEntry"     style "entry"
 class "GtkStatusbar" style "pixmap-statusbar"
 class "GtkMenuBar"   style:highest "menubar"
-class "GtkRadioButton"	style:highest "radiocheck"	# SZ07: Added for the checkmarks/radio
-class "GtkCheckButton"	style:highest "radiocheck"	# SZ07: Added for the checkmarks/radio
+class "GtkRadioButton"	style "radiocheck"	# SZ07: Added for the checkmarks/radio
+class "GtkCheckButton"	style "radiocheck"	# SZ07: Added for the checkmarks/radio
 
 # Toolbar default: dark
 #class "*HandleBox" style "pixmap-dark-toolbar"
@@ -571,26 +632,36 @@
 
 #Totem
 widget "*totem*" style "dark"
-style "totem-sidebar-workaround" {
+style "totem-dark" {
 	text[NORMAL] = mix (0.7,  '#ffffef', @fg_color)
 	text[PRELIGHT] = mix (0.8,  '#ffffef', @fg_color)
+	engine "murrine"
+	{
+		border_colors = { "#343330", "#343330" }
+	}
 }
-widget "*tmw_main_pane.EvSidebar.*GtkComboBox.*"	style "totem-sidebar-workaround"
+widget "*tmw_main_pane.EvSidebar.*GtkComboBox.*"	style "totem-dark"
+widget "*tmw_main_pane*GtkButton*"	style "totem-dark" #Doesn't work
+widget "*tmw_main_pane*GtkToolButton"	style "totem-dark"
+widget "*tmw_main_pane*GtkToggleButton"	style "totem-dark"
+
 
 class "GtkSpinButton"  style "spinbutton"
 class "GtkScale"       style "scale"
 class "GtkVScale"      style "scale"
 class "GtkHScale"      style "scale"
-#class "GtkScrollbar"   style "scrollbar"
+class "GtkScrollbar"   style "scrollbar"
+class "GtkVScrollbar"  style "vscrollbar"
+class "GtkHScrollbar"  style "hscrollbar"
 class "GtkButton"      style "button"
 
 # 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.
 
-widget_class "*<GtkNotebook>*<GtkEventBox>"     style "notebook-bg"
-widget_class "*<GtkNotebook>*<GtkDrawingArea>"  style "notebook-bg"
-widget_class "*<GtkNotebook>*<GtkLayout>"       style "notebook-bg"
-widget_class "*<GtkNotebook>"    style "notebook"
+widget_class "*<GtkNotebook>*<GtkEventBox>"     style "notebook"
+widget_class "*<GtkNotebook>*<GtkDrawingArea>"  style "notebook"
+widget_class "*<GtkNotebook>*<GtkLayout>"       style "notebook"
+widget_class "*<GtkNotebook>"    	             style "notebook"
 
 widget_class "*<GtkComboBoxEntry>*" style "comboboxentry"
 widget_class "*<GtkCombo>*"         style "comboboxentry"
@@ -599,6 +670,8 @@
 widget_class "*<GtkMenu>*"              style "menu"
 widget_class "*<GtkMenuItem>"          style "menu-item"
 widget_class "*<GtkSeparatorMenuItem>*" style "separator-menu-item"
+widget_class "*<GtkCheckMenuItem>*" style "radiocheck"
+widget_class "*<GtkRadioMenuItem>*" style "radiocheck"
 
 widget_class "*<GtkFrame>"  style "frame"
 widget_class "*.<GtkFrame>.<GtkLabel>" style "frame-title"
@@ -612,15 +685,15 @@
 widget_class "*.<GtkList>.<GtkButton>"     style "treeview-header"
 widget_class "*.<GtkCList>.<GtkButton>"    style "treeview-header"
 
-# Panel stuff
-widget "*PanelWidget*" 					style "panel"
-widget "*PanelApplet*" 					style "panel"
-widget "*fast-user-switch*"				style "panel" # Workaround for Fast User Switch applet
-class "PanelApp*" 					style "panel"
-class "PanelToplevel*" 					style "panel"
-widget_class "*Panel*<GtkMenuBar>*"           		style:highest "panel" # The panel menubar
-widget "*TomboyTray*"					style "panel" # Workaround for Tomboy
-widget "*TomboyApplet*"					style "panel"
+#Panel
+widget "*PanelWidget*" style "panel"
+widget "*PanelApplet*" style "panel"
+widget "*fast-user-switch*" style "panel" # Workaround for Fast User Switch applet
+class "PanelApp*" style "panel"
+class "PanelToplevel*" style "panel"
+
+# The panel menubar
+widget_class "*Panel*<GtkMenuBar>*" style:highest "murrine-PanelGtkMenubar"
 
 #XFCE panel
 widget_class "*notif*"		style "panel"
@@ -630,25 +703,6 @@
 widget "*Xfce*Panel*"		style "panel"
 class "*Xfce*Panel*"		style "panel"
 
-# The following lines make panel-menu-applet, slab-main-menu and gimmie applet's text bold. The radius value sets the roundness value of the selected menu-item.
-style "bold-panel-menu"
-{
-	font_name = "Bold"
-
-	engine "murrine" {
-	roundness = 2
-	}
-}
-
-style "bold-panel-slab"
-{
-	font_name = "Bold"
-}
-widget "*Panel*slab-main-menu-panel-button*" style "bold-panel-slab"
-widget "*gimmie*" style "bold-panel-slab"
-widget "*Panel*MenuBar*" style "bold-panel-menu"
-widget "*Panel*Clock*" style "bold-panel-menu"
-
 widget "gtk-tooltip*" style "tooltips"
 
 ###################################################
@@ -733,23 +787,5 @@
 widget_class "*CPUFreqApplet*" style:highest "applet-text"
 
 # Firefox specific things:
-#widget "MozillaGtkWidget*Frame*"	style "default"
+#widget "MozillaGtkWidget*Menu*"	style "default"
 widget "MozillaGtkWidget*Tool*"	style "toolbar-item"
-
-style "dialog" = "dark"
-{
-    bg[NORMAL] = mix(0.4, @selected_bg_color, shade(0.7, @bg_color))
-    fg[NORMAL] = shade(0.5, @fg_color)
-    text[NORMAL] = shade(0.5, @text_color)
-}
-style "dialog-button" = "dark"
-{
-    bg[NORMAL] = shade(0.15, @bg_color)
-    bg[PRELIGHT] = shade(0.18, @bg_color)
-}
-
-# Dialog boxes...?
-# widget_class "*Dialog*" style "dialog"
-# widget_class "*Dialog*.*" style "dialog"
-# widget_class "*Dialog*.*Button*" style "dialog-button"
-

=== added file 'Dust/gtk-2.0/panel-bg-dark.png'
Binary files Dust/gtk-2.0/panel-bg-dark.png	1970-01-01 00:00:00 +0000 and Dust/gtk-2.0/panel-bg-dark.png	2010-03-01 02:27:14 +0000 differ
=== removed directory 'Dust/gtk-2.0/scrollbars'
=== removed file 'Dust/gtk-2.0/scrollbars/scrollbar.rc'
--- Dust/gtk-2.0/scrollbars/scrollbar.rc	2009-08-08 02:07:09 +0000
+++ Dust/gtk-2.0/scrollbars/scrollbar.rc	1970-01-01 00:00:00 +0000
@@ -1,330 +0,0 @@
-################################################################################
-# SCROLLBAR
-################################################################################
-
-style "scrollbar"
-{
-	# The values I set here have to do with the relative size of three graphic elements
-    # I have used: the slider, the arrow box, and the trough. They all have the same width
-    # of 15 pixels, but gtk wants to put in some spacing between them. It seems like it
-    # places the sliders inside the trough with a default 1 pixel border on either side of the slider,
-    # so that the trough has its width stretched by an additional two pixels(?). Setting the
-    # trough border makes the arrow box sit on top of the trough squarely, by making sure that
-    # the trough stays the same width as the arrowbox(?). I could be totally wrong here.
-    GtkRange::trough_border = 0
-    GtkRange::slider_width = 17
-
-    # This sets the size of the steppers (arrow buttons on the end of the scrollbar). 
-    # The image I am using is 15x15 pixels, and if I dont set this a one pixel line 
-    # gets cut off of the top of the "up" stepper.
-    GtkRange::stepper_size = 17
-
-    # Set a minimum length for the slider. Since I set the border on the slider 
-    # image to 15 pixels on either end of the slider I want the min length to be 
-    # at least 30 pixels to avoid an ugly slider when gtk wants to make it smaller 
-    # than 30 pixels.
-    GtkScrollbar::min_slider_length = 30
-
-	engine "pixmap" 
-	{
-		# Horizontal slider background
-		image 
-		{
-            function        = BOX
-            recolorable     = TRUE
-            detail          = "trough"
-            file            = "scrollbars/trough-scrollbar-horiz.png"
-            border          = { 30, 30, 0, 0 }
-            stretch         = TRUE
-            orientation     = HORIZONTAL
-        }
-	    
-	    # Vertical slider background
-	    image 
-		{
-            function        = BOX
-            recolorable     = TRUE
-            detail          = "trough"
-            file            = "scrollbars/trough-scrollbar-vert.png"
-            border          = { 0, 0, 30, 30 }
-            stretch         = TRUE
-            orientation     = VERTICAL
-        }
-
-		# Normal horizontal slider
-	    image 
-		{
-	        function        = SLIDER
-	        recolorable     = TRUE
-	        state           = NORMAL
-	        file            = "scrollbars/slider-horiz.png"
-	        border          = { 15, 15, 6, 6 }
-	        stretch         = TRUE
-	        orientation     = HORIZONTAL
-	    }
-		
-		# Horizontal slider (active)
-		image 
-		{
-	        function        = SLIDER
-	        recolorable     = TRUE
-	        state           = ACTIVE
-	        file            = "scrollbars/slider-horiz-prelight.png"
-	        border          = { 15, 15, 6, 6 }
-	        stretch         = TRUE
-	        orientation     = HORIZONTAL
-		}
-
-		# Horizontal slider (mouse over)
-	    image 
-		{
-	        function        = SLIDER 
-	        recolorable     = TRUE
-	        state           = PRELIGHT
-	        file            = "scrollbars/slider-horiz-prelight.png"
-	        border          = { 15, 15, 6, 6 }
-	        stretch         = TRUE
-	        orientation     = HORIZONTAL
-	    }
-	    
-	    # Horizontal slider (Insesitive)
-		image 
-		{
-	        function        = SLIDER 
-	        recolorable     = TRUE
-	        state           = INSENSITIVE
-	        file            = "scrollbars/slider-horiz.png"
-	        border          = { 15, 15, 6, 6 }
-	        stretch         = TRUE
-	        orientation     = HORIZONTAL
-	    }
-
-	    # Normal vertical slider
-	    image 
-		{
-	        function        = SLIDER
-	        recolorable     = TRUE
-	        state           = NORMAL
-	        file            = "scrollbars/slider-vert.png"
-	        border          = { 6, 6, 15, 15 }
-	        stretch         = TRUE
-	        orientation     = VERTICAL
-		}
-		
-		# Vertical slider (Active)
-		image 
-		{
-	        function        = SLIDER
-	        recolorable     = TRUE
-	        state           = ACTIVE
-	        file            = "scrollbars/slider-vert.png"
-	        border          = { 6, 6, 15, 15 }
-	        stretch         = TRUE
-	        orientation     = VERTICAL
-		}
-
-		# Vertical slider (mouse over)
-	    image 
-		{
-	        function        = SLIDER 
-	        recolorable     = TRUE
-	        state           = PRELIGHT
-	        file            = "scrollbars/slider-vert-prelight.png"
-	        border          = { 6, 6, 15, 15 }
-	        stretch         = TRUE
-	        orientation     = VERTICAL
-	    }
-	    
-	    # Vertical slider (Insesitive)
-		image 
-		{
-	        function        = SLIDER 
-	        recolorable     = TRUE
-	        state           = INSENSITIVE
-	        file            = "scrollbars/slider-vert-prelight.png"
-	        border          = { 6, 6, 15, 15 }
-	        stretch         = TRUE
-	        orientation     = VERTICAL
-	    }
-
-################################################################################
-# SCROLLBAR STEPPERS
-################################################################################
-
-	# Up
-    image 
-    {
-      function			= STEPPER
-      recolorable		= TRUE
-      state				= NORMAL
-      file				= "scrollbars/stepper-up.png"
-      #border			= { 2, 2, 2, 2 }
-      stretch			= TRUE
-      arrow_direction	= UP
-    }
- 	image 
-    {
-      function			= STEPPER
-      recolorable		= TRUE
-      state				= PRELIGHT
-      file				= "scrollbars/stepper-up.png"
-      #border			= { 12, 2, 2, 9 }
-      stretch			= TRUE
-      arrow_direction	= UP
-    }
- image 
-    {
-      function			= STEPPER
-      recolorable		= TRUE
-      state				= ACTIVE
-      file				= "scrollbars/stepper-up.png"
-      #border			= { 12, 2, 2, 9 }
-      stretch			= TRUE
-      arrow_direction	= UP
-    }
- image 
-    {
-      function			= STEPPER
-      recolorable		= TRUE
-      state				= INSENSITIVE
-      file				= "scrollbars/stepper-up.png"
-      #border			= { 12, 2, 2, 9 }
-      stretch			= TRUE
-      arrow_direction	= UP
-    }
-
- ######### DOWN ############
-
-
-    image 
-    {
-      function			= STEPPER
-      recolorable		= TRUE
-      state				= NORMAL
-      file				= "scrollbars/stepper-down.png"
-      #border			= { 12, 2, 10, 2 }
-      stretch			= TRUE
-      arrow_direction	= DOWN
-    }
- image 
-    {
-      function			= STEPPER
-      recolorable		= TRUE
-      state				= PRELIGHT
-      file				= "scrollbars/stepper-down.png"
-      #border			= { 12, 2, 10, 2 }
-      stretch			= TRUE
-      arrow_direction	= DOWN
-    }
- image 
-    {
-      function			= STEPPER
-      recolorable		= TRUE
-      state				= ACTIVE
-      file				= "scrollbars/stepper-down.png"
-      #border			= { 12, 2, 10, 2 }
-      stretch			= TRUE
-      arrow_direction	= DOWN
-    }
- image 
-    {
-      function			= STEPPER
-      recolorable		= TRUE
-      state				= INSENSITIVE
-      file				= "scrollbars/stepper-down.png"
-      #border			= { 12, 2, 10, 2 }
-      stretch			= TRUE
-      arrow_direction	= DOWN
-    }
-
-############ RIGHT ################
-
-    image 
-    {
-      function			= STEPPER
-      recolorable		= TRUE
-      state				= NORMAL
-      file				= "scrollbars/stepper-right.png"
-      #border			= { 2, 9, 2, 13 }
-      stretch			= TRUE
-      arrow_direction	= RIGHT
-    }
- image 
-    {
-      function			= STEPPER
-      recolorable		= TRUE
-      state				= PRELIGHT
-      file				= "scrollbars/stepper-right.png"
-      #border			= { 2, 9, 2, 13 }
-      stretch			= TRUE
-      arrow_direction	= RIGHT
-    }
- image 
-    {
-      function			= STEPPER
-      recolorable		= TRUE
-      state				= ACTIVE
-      file				= "scrollbars/stepper-right.png"
-      #border			= { 2, 9, 2, 13 }
-      stretch			= TRUE
-      arrow_direction	= RIGHT
-    }
- image 
-    {
-      function			= STEPPER
-      recolorable		= TRUE
-      state				= INSENSITIVE
-      file				= "scrollbars/stepper-right.png"
-      #border			= { 2, 9, 2, 13 }
-      stretch			= TRUE
-      arrow_direction	= RIGHT
-    }
-
-############### LEFT ###################
-
-
-    image 
-    {
-      function			= STEPPER
-      recolorable		= TRUE
-      state				= NORMAL
-      file				= "scrollbars/stepper-left.png"
-      #border			= { 2, 9, 2, 13 }
-      stretch			= TRUE
-      arrow_direction	= LEFT
-    }
-  image 
-    {
-      function			= STEPPER
-      recolorable		= TRUE
-      state				= PRELIGHT
-      file				= "scrollbars/stepper-left.png"
-      #border			= { 2, 9, 2, 13 }
-      stretch			= TRUE
-      arrow_direction	= LEFT
-    }
-  image 
-    {
-      function			= STEPPER
-      recolorable		= TRUE
-      state				= ACTIVE
-      file				= "scrollbars/stepper-left.png"
-      #border			= { 2, 9, 2, 13 }
-      stretch			= TRUE
-      arrow_direction	= LEFT
-    }
-  image 
-    {
-      function			= STEPPER
-      recolorable		= TRUE
-      state				= INSENSITIVE
-      file				= "scrollbars/stepper-left.png"
-      #border			= { 2, 9, 2, 13 }
-      stretch			= TRUE
-      arrow_direction	= LEFT
-    }
-  	}
-}
-class "GtkScrollbar"       		style "scrollbar"
-class "GtkHScrollbar"       	style "scrollbar"
-class "GtkVScrollbar"       	style "scrollbar"

=== removed file 'Dust/gtk-2.0/scrollbars/slider-horiz-prelight.png'
Binary files Dust/gtk-2.0/scrollbars/slider-horiz-prelight.png	2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars/slider-horiz-prelight.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust/gtk-2.0/scrollbars/slider-horiz.png'
Binary files Dust/gtk-2.0/scrollbars/slider-horiz.png	2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars/slider-horiz.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust/gtk-2.0/scrollbars/slider-vert-prelight.png'
Binary files Dust/gtk-2.0/scrollbars/slider-vert-prelight.png	2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars/slider-vert-prelight.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust/gtk-2.0/scrollbars/slider-vert.png'
Binary files Dust/gtk-2.0/scrollbars/slider-vert.png	2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars/slider-vert.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust/gtk-2.0/scrollbars/stepper-down.png'
Binary files Dust/gtk-2.0/scrollbars/stepper-down.png	2009-03-11 10:22:03 +0000 and Dust/gtk-2.0/scrollbars/stepper-down.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust/gtk-2.0/scrollbars/stepper-left.png'
Binary files Dust/gtk-2.0/scrollbars/stepper-left.png	2009-03-11 10:22:03 +0000 and Dust/gtk-2.0/scrollbars/stepper-left.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust/gtk-2.0/scrollbars/stepper-right.png'
Binary files Dust/gtk-2.0/scrollbars/stepper-right.png	2009-03-11 10:22:03 +0000 and Dust/gtk-2.0/scrollbars/stepper-right.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust/gtk-2.0/scrollbars/stepper-up.png'
Binary files Dust/gtk-2.0/scrollbars/stepper-up.png	2009-03-11 10:22:03 +0000 and Dust/gtk-2.0/scrollbars/stepper-up.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust/gtk-2.0/scrollbars/trough-scrollbar-horiz.png'
Binary files Dust/gtk-2.0/scrollbars/trough-scrollbar-horiz.png	2009-03-11 10:22:03 +0000 and Dust/gtk-2.0/scrollbars/trough-scrollbar-horiz.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust/gtk-2.0/scrollbars/trough-scrollbar-vert.png'
Binary files Dust/gtk-2.0/scrollbars/trough-scrollbar-vert.png	2009-03-11 10:22:03 +0000 and Dust/gtk-2.0/scrollbars/trough-scrollbar-vert.png	1970-01-01 00:00:00 +0000 differ
=== removed directory 'Dust/gtk-2.0/scrollbars_d'
=== removed file 'Dust/gtk-2.0/scrollbars_d/scrollbar.rc'
--- Dust/gtk-2.0/scrollbars_d/scrollbar.rc	2009-08-08 02:07:09 +0000
+++ Dust/gtk-2.0/scrollbars_d/scrollbar.rc	1970-01-01 00:00:00 +0000
@@ -1,288 +0,0 @@
-############################# scROLLBAR ####################
-
-style "scrollbar" = "default"
-{
-    GtkRange::trough_border = 0
-    GtkRange::slider_width = 15
-    GtkRange::stepper_size = 19
-    
-  engine "pixmap" 
-  {
-    image 
-    {
-      function			= BOX
-      recolorable		= TRUE
-      detail				= "trough"
-      file				= "scrollbars/trough-scrollbar-horiz.png"
-      border			= { 0, 0, 5, 5 }
-      stretch			= TRUE
-      orientation		= HORIZONTAL
-    }
-    image 
-    {
-      function			= BOX
-      recolorable		= TRUE
-      detail				= "trough"
-      file				= "scrollbars/trough-scrollbar-vert.png"
-      border			= { 5, 5, 0, 0 }
-      stretch			= TRUE
-      orientation		= VERTICAL
-    }
-
-###########x SLIDERS ##################x
-
-  image 
-    {
-      function				= SLIDER
-      recolorable			= TRUE
-      state           		= NORMAL
-      file					= "scrollbars/slider-horiz.png" 
-      border				= { 5, 5, 0, 0 }
-      stretch				= TRUE
-      orientation			= HORIZONTAL
-    }
-  image 
-    {
-      function				= SLIDER
-      recolorable			= TRUE
-      state           		= ACTIVE
-      shadow				= IN
-      file					= "scrollbars/slider-horiz.png" 
-      border				= { 5, 5, 0, 0 }
-      stretch				= TRUE
-      orientation			= HORIZONTAL
-
-    }
-    image 
-    {
-      function				= SLIDER
-      recolorable			= TRUE
-      state           		= PRELIGHT
-      file					= "scrollbars/slider-horiz-prelight.png" 
-      border				= { 5, 5, 0, 0 }
-      stretch				= TRUE
-      orientation			= HORIZONTAL
-
-    }
-    image 
-    {
-      function				= SLIDER
-      recolorable			= TRUE
-      state           		= INSENSITIVE
-      file					= "scrollbars/slider-horiz-insens.png"
-      border				= { 5, 5, 0, 0 }
-      stretch				= TRUE
-      orientation			= HORIZONTAL
-
-    }
-
-#############x verticals################xx
-
- image 
-    {
-      function				= SLIDER
-      recolorable			= TRUE
-      state           		= NORMAL
-      file					= "scrollbars/slider-vert.png" 
-      border				= { 0, 0, 5, 5 }
-      stretch				= TRUE
-      orientation			= VERTICAL
-
-    }
-   image 
-    {
-      function				= SLIDER
-      recolorable			= TRUE
-      state           		= ACTIVE
-      shadow				= IN
-      file					= "scrollbars/slider-vert.png" 
-      border				= { 0, 0, 5, 5 }
-      stretch				= TRUE
-      orientation			= VERTICAL
-
-    }
-    image 
-    {
-      function				= SLIDER
-      recolorable			= TRUE
-      state           		= PRELIGHT
-      file					= "scrollbars/slider-vert-prelight.png" 
-      border				= { 0, 0, 5, 5 }
-      stretch				= TRUE
-      orientation			= VERTICAL
-
-    }
-    image 
-    {
-      function				= SLIDER
-      recolorable			= TRUE
-      state           		= INSENSITIVE
-      file					= "scrollbars/slider-vert-insens.png"
-      border				= { 0, 0, 5, 5 }
-      stretch				= TRUE
-      orientation			= VERTICAL
-
-    }
-
-###########x END SLIDERS ##################x
-
-########### Steppers ######################
-#### UP #######
-    image 
-    {
-      function				= STEPPER
-      recolorable			= TRUE
-      state					= NORMAL
-      file					= "scrollbars/stepper-up.png"
-      stretch				= TRUE
-      arrow_direction	= UP
-    }
- image 
-    {
-      function				= STEPPER
-      recolorable			= TRUE
-      state					= PRELIGHT
-      file					= "scrollbars/stepper-up-prelight.png"
-      stretch				= TRUE
-      arrow_direction	= UP
-    }
- image 
-    {
-      function				= STEPPER
-      recolorable			= TRUE
-      state					= ACTIVE
-      file					= "scrollbars/stepper-up-prelight.png"
-      stretch				= TRUE
-      arrow_direction	= UP
-    }
- image 
-    {
-      function				= STEPPER
-      recolorable			= TRUE
-      state					= INSENSITIVE
-      file					= "scrollbars/stepper-up-insens.png"
-      stretch				= TRUE
-      arrow_direction	= UP
-    }
-
- ######### DOWN ############
-
-    image 
-    {
-      function				= STEPPER
-      recolorable			= TRUE
-      state				= NORMAL
-      file				= "scrollbars/stepper-down.png"
-      stretch				= TRUE
-      arrow_direction	= DOWN
-    }
- image 
-    {
-      function				= STEPPER
-      recolorable			= TRUE
-      state				= PRELIGHT
-      file				= "scrollbars/stepper-down-prelight.png"
-      stretch				= TRUE
-      arrow_direction	= DOWN
-    }
- image 
-    {
-      function				= STEPPER
-      recolorable			= TRUE
-      state					= ACTIVE
-      file					= "scrollbars/stepper-down-prelight.png"
-      stretch				= TRUE
-      arrow_direction	= DOWN
-    }
- image 
-    {
-      function				= STEPPER
-      recolorable			= TRUE
-      state					= INSENSITIVE
-      file					= "scrollbars/stepper-down-insens.png"
-      stretch				= TRUE
-      arrow_direction	= DOWN
-    }
-
-############ RIGHT ################
-
-    image 
-    {
-      function				= STEPPER
-      recolorable			= TRUE
-      state					= NORMAL
-      file					= "scrollbars/stepper-right.png"
-      stretch				= TRUE
-      arrow_direction	= RIGHT
-    }
- image 
-    {
-      function				= STEPPER
-      recolorable			= TRUE
-      state					= PRELIGHT
-      file					= "scrollbars/stepper-right-prelight.png"
-      stretch				= TRUE
-      arrow_direction	= RIGHT
-    }
- image 
-    {
-      function				= STEPPER
-      recolorable			= TRUE
-      state					= ACTIVE
-      file					= "scrollbars/stepper-right-prelight.png"
-      stretch				= TRUE
-      arrow_direction	= RIGHT
-    }
- image 
-    {
-      function				= STEPPER
-      recolorable			= TRUE
-      state				= INSENSITIVE
-      file				= "scrollbars/stepper-right-insens.png"
-      stretch				= TRUE
-      arrow_direction	= RIGHT
-    }
-
-############### LEFT ###################
-
-    image 
-    {
-      function				= STEPPER
-      recolorable			= TRUE
-      state				= NORMAL
-      file				= "scrollbars/stepper-left.png"
-      stretch				= TRUE
-      arrow_direction	= LEFT
-    }
-  image 
-    {
-      function				= STEPPER
-      recolorable			= TRUE
-      state				= PRELIGHT
-      file				= "scrollbars/stepper-left-prelight.png"
-      stretch				= TRUE
-      arrow_direction	= LEFT
-    }
-  image 
-    {
-      function				= STEPPER
-      recolorable			= TRUE
-      state					= ACTIVE
-      file					= "scrollbars/stepper-left-prelight.png"
-      stretch				= TRUE
-      arrow_direction	= LEFT
-    }
-  image 
-    {
-      function				= STEPPER
-      recolorable			= TRUE
-      state				= INSENSITIVE
-      file				= "scrollbars/stepper-left-insens.png"
-      stretch				= TRUE
-      arrow_direction	= LEFT
-    }
-  }
-}
-class "GtkScrollbar"       	style "scrollbar"
-class "GtkHScrollbar"       	style "scrollbar"
-class "GtkVScrollbar"       	style "scrollbar"

=== removed file 'Dust/gtk-2.0/scrollbars_d/slider-horiz-insens.png'
Binary files Dust/gtk-2.0/scrollbars_d/slider-horiz-insens.png	2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/slider-horiz-insens.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust/gtk-2.0/scrollbars_d/slider-horiz-prelight.png'
Binary files Dust/gtk-2.0/scrollbars_d/slider-horiz-prelight.png	2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/slider-horiz-prelight.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust/gtk-2.0/scrollbars_d/slider-horiz.png'
Binary files Dust/gtk-2.0/scrollbars_d/slider-horiz.png	2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/slider-horiz.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust/gtk-2.0/scrollbars_d/slider-vert-insens.png'
Binary files Dust/gtk-2.0/scrollbars_d/slider-vert-insens.png	2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/slider-vert-insens.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust/gtk-2.0/scrollbars_d/slider-vert-prelight.png'
Binary files Dust/gtk-2.0/scrollbars_d/slider-vert-prelight.png	2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/slider-vert-prelight.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust/gtk-2.0/scrollbars_d/slider-vert.png'
Binary files Dust/gtk-2.0/scrollbars_d/slider-vert.png	2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/slider-vert.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust/gtk-2.0/scrollbars_d/stepper-down-insens.png'
Binary files Dust/gtk-2.0/scrollbars_d/stepper-down-insens.png	2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/stepper-down-insens.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust/gtk-2.0/scrollbars_d/stepper-down-prelight.png'
Binary files Dust/gtk-2.0/scrollbars_d/stepper-down-prelight.png	2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/stepper-down-prelight.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust/gtk-2.0/scrollbars_d/stepper-down.png'
Binary files Dust/gtk-2.0/scrollbars_d/stepper-down.png	2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/stepper-down.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust/gtk-2.0/scrollbars_d/stepper-left-insens.png'
Binary files Dust/gtk-2.0/scrollbars_d/stepper-left-insens.png	2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/stepper-left-insens.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust/gtk-2.0/scrollbars_d/stepper-left-prelight.png'
Binary files Dust/gtk-2.0/scrollbars_d/stepper-left-prelight.png	2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/stepper-left-prelight.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust/gtk-2.0/scrollbars_d/stepper-left.png'
Binary files Dust/gtk-2.0/scrollbars_d/stepper-left.png	2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/stepper-left.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust/gtk-2.0/scrollbars_d/stepper-right-insens.png'
Binary files Dust/gtk-2.0/scrollbars_d/stepper-right-insens.png	2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/stepper-right-insens.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust/gtk-2.0/scrollbars_d/stepper-right-prelight.png'
Binary files Dust/gtk-2.0/scrollbars_d/stepper-right-prelight.png	2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/stepper-right-prelight.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust/gtk-2.0/scrollbars_d/stepper-right.png'
Binary files Dust/gtk-2.0/scrollbars_d/stepper-right.png	2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/stepper-right.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust/gtk-2.0/scrollbars_d/stepper-up-insens.png'
Binary files Dust/gtk-2.0/scrollbars_d/stepper-up-insens.png	2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/stepper-up-insens.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust/gtk-2.0/scrollbars_d/stepper-up-prelight.png'
Binary files Dust/gtk-2.0/scrollbars_d/stepper-up-prelight.png	2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/stepper-up-prelight.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust/gtk-2.0/scrollbars_d/stepper-up.png'
Binary files Dust/gtk-2.0/scrollbars_d/stepper-up.png	2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/stepper-up.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust/gtk-2.0/scrollbars_d/trough-scrollbar-horiz.png'
Binary files Dust/gtk-2.0/scrollbars_d/trough-scrollbar-horiz.png	2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/trough-scrollbar-horiz.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust/gtk-2.0/scrollbars_d/trough-scrollbar-vert-canum.png'
Binary files Dust/gtk-2.0/scrollbars_d/trough-scrollbar-vert-canum.png	2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/trough-scrollbar-vert-canum.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust/gtk-2.0/scrollbars_d/trough-scrollbar-vert.png'
Binary files Dust/gtk-2.0/scrollbars_d/trough-scrollbar-vert.png	2009-08-08 02:07:09 +0000 and Dust/gtk-2.0/scrollbars_d/trough-scrollbar-vert.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust/gtk-2.0/toolbar_light.png'
Binary files Dust/gtk-2.0/toolbar_light.png	2009-03-11 10:22:03 +0000 and Dust/gtk-2.0/toolbar_light.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'Dust/metacity-1/metacity-theme-1.xml'
--- Dust/metacity-1/metacity-theme-1.xml	2009-08-08 02:07:09 +0000
+++ Dust/metacity-1/metacity-theme-1.xml	2010-03-01 02:27:14 +0000
@@ -2,28 +2,27 @@
 
 <metacity_theme>
 <info>
-    <name>Dust</name>
+    <name>Dust Earth</name>
     <author>Kido Mariano, Rico Sta. Cruz</author>
     <copyright>GPL</copyright>
     <date>Jul 28, 2008</date>
     <description>Metacity theme</description>
-    <!-- Based on the Elegant Brit theme (though now really far away from it :P) -->
 </info>
 
 
 <!--
     General window layout (geometric stuff)
 -->
-<frame_geometry name="frame_geometry_normal" title_scale="medium" rounded_top_left="true" rounded_top_right="true">
-    <distance name="left_width" value="1"/>
-    <distance name="right_width" value="1"/>
+<frame_geometry name="frame_geometry_normal" title_scale="medium" rounded_top_left="true" rounded_top_right="true" rounded_bottom_left="true" rounded_bottom_right="true">
+    <distance name="left_width" value="6"/>
+    <distance name="right_width" value="6"/>
     <distance name="bottom_height" value="4"/>
-    <distance name="left_titlebar_edge" value="2"/>
-    <distance name="right_titlebar_edge" value="1"/>
+    <distance name="left_titlebar_edge" value="6"/>
+    <distance name="right_titlebar_edge" value="6"/>
     <distance name="button_width" value="28"/>
     <distance name="button_height" value="20"/>
     <distance name="title_vertical_pad" value="1"/>
-    <border name="title_border" left="2" right="2" top="3" bottom="3"/>
+    <border name="title_border" left="2" right="2" top="3" bottom="0"/>
     <border name="button_border" left="0" right="0" top="2" bottom="1"/>
 </frame_geometry>
 
@@ -47,13 +46,27 @@
 -->
 
 <draw_ops name="draw_title_text_normal">
-    <title x="1" y="(((height - title_height) / 2) `max` 2) + 1" color="#1F1E1B"/>
-    <title x="0" y="(((height - title_height) / 2) `max` 2)" color="#FFFFFF"/>
-</draw_ops>
-
-<draw_ops name="draw_title_text_inactive">
-    <title x="0" y="(((height - title_height) / 2) `max` 2)" color="#727262"/>
-</draw_ops>
+    <title x="1" y="(height - title_height) / 2 + 1" color="#2F2E2B"/>
+    <title x="0" y="(height - title_height) / 2" color="#FFFFFF"/>
+</draw_ops>
+
+<draw_ops name="draw_title_text_inactive">
+    <title x="0" y="(height - title_height) / 2" color="#727262"/>
+</draw_ops>
+
+<!--Centered titlebar text--><!--
+<draw_ops name="draw_title_text_normal">
+    <icon x="(width-title_width)/2" y="(height - title_height) / 2" width="mini_icon_width" height="mini_icon_height"/>
+    <title x="(width-title_width)/2 + mini_icon_width + 3" y="(height - title_height) / 2 + 1" color="#2F2E2B"/>
+    <title x="(width-title_width)/2 + mini_icon_width + 2" y="(height - title_height) / 2" color="#FFFFFF"/>
+</draw_ops>
+
+<draw_ops name="draw_title_text_inactive">
+    <icon x="(width-title_width)/2" y="(height - title_height) / 2" width="mini_icon_width" height="mini_icon_height" alpha="0.5"/>
+    <title x="(width-title_width)/2 + mini_icon_width + 2" y="(height - title_height) / 2" color="#727262"/>
+</draw_ops>-->
+
+ 
 
 <!--
     Construct titlebar from rectangles instead so we can pick up the GTK theme
@@ -61,29 +74,35 @@
 
 <draw_ops name="draw_title">
     <!-- Background gradient -->
-    <gradient type="vertical" x="0" y="0" width="width+9" height="height">
+    <gradient type="diagonal" x="0" y="0" width="width+9" height="height">
         <!--<color value="#80594D"/>-->
-        <color value="shade/gtk:bg[SELECTED]/0.7"/>
-        <!--Static colors to mach static menubar and all-->
-        <!--color value="#3F3E39" /-->
+        <color value="shade/gtk:bg[SELECTED]/0.8"/>
+        <!--Static colors to match static menubar and all-->
+        <color value="#3F3E39" />
         <color value="#3A3936" />
         <color value="#373633" />
-        <!--color value="shade/gtk:bg[NORMAL]/0.29" />
-        <color value="shade/gtk:bg[NORMAL]/0.27" />
-        <color value="shade/gtk:bg[NORMAL]/0.25" /-->
         <color value="#343330" />
-        <!--color value="shade/gtk:bg[NORMAL]/0.24" /-->
     </gradient>
     
-    <!-- Topmost dark line -->
-    <line color="shade/gtk:bg[NORMAL]/0.30" x1="0" x2="width" y1="0" y2="0"/>
+    <!-- Topmost dark line (not static is shade:0.30) -->
+    <line color="#403F3A" x1="0" x2="width" y1="0" y2="0"/>
     
     <!-- Darkening of the left arch -->
-    <line color="shade/gtk:bg[NORMAL]/0.30" x1="0" x2="4" y1="1" y2="1"/>
-    <line color="shade/gtk:bg[NORMAL]/0.30" x1="0" x2="2" y1="2" y2="2"/>
-    <line color="shade/gtk:bg[NORMAL]/0.30" x1="0" x2="1" y1="3" y2="3"/>
-    <line color="shade/gtk:bg[NORMAL]/0.30" x1="0" x2="1" y1="4" y2="4"/>
-    <line color="shade/gtk:bg[NORMAL]/0.30" x1="0" x2="0" y1="5" y2="20"/>
+    <line color="#403F3A" x1="0" x2="4" y1="1" y2="1"/>
+    <line color="#403F3A" x1="0" x2="2" y1="2" y2="2"/>
+    <line color="#403F3A" x1="0" x2="1" y1="3" y2="3"/>
+    <line color="#403F3A" x1="0" x2="1" y1="4" y2="4"/>
+    <line color="#403F3A" x1="0" x2="0" y1="5" y2="20"/>
+    
+    <!-- Sides -->
+    <gradient type="horizontal" x="0" y="0" width="6" height="height">
+        <color value="shade/gtk:bg[NORMAL]/0.5"/>
+        <color value="shade/gtk:bg[NORMAL]/0.7"/>
+    </gradient> 
+    <gradient type="horizontal" x="width-6" y="0" width="6" height="height">
+        <color value="shade/gtk:bg[NORMAL]/0.7"/>
+        <color value="shade/gtk:bg[NORMAL]/0.5"/>
+    </gradient> 
     
     <!-- Top highlight -->
     <!-- This uses <tint> (which supports alpha) instead of <line> (which doesn't) -->
@@ -100,7 +119,9 @@
     <tint color="#ffffff" alpha="0.12" x="1" y="8"  width="1" height="1"/> 
     <tint color="#ffffff" alpha="0.09" x="1" y="9"  width="1" height="1"/> 
     <tint color="#ffffff" alpha="0.06" x="1" y="10" width="1" height="1"/> 
-    <tint color="#ffffff" alpha="0.03" x="1" y="11" width="1" height="1"/> 
+    <tint color="#ffffff" alpha="0.03" x="1" y="11" width="1" height="1"/>
+    
+    <tint color="#ffffff" alpha="0.15" x="4" y="1" width="1" height="height"/>
     
     <!-- Upper-right highlight -->
     <!-- Same as above. -->
@@ -115,39 +136,51 @@
     <tint color="#ffffff" alpha="0.06" x="width-2" y="10" width="1" height="1"/> 
     <tint color="#ffffff" alpha="0.03" x="width-2" y="11" width="1" height="1"/> 
     
+    <tint color="#ffffff" alpha="0.15" x="width-5" y="1" width="1" height="height"/>
+    
 </draw_ops>
 
 <draw_ops name="draw_title_inactive">
     <!-- Background gradient -->
     <gradient type="vertical" x="0" y="0" width="width+9" height="height">
-        <color value="#393835" />
+        <color value="#3A3936" />
         <color value="#343330" />
     </gradient>
         
     <!-- Topmost dark line -->
-    <line color="shade/gtk:bg[NORMAL]/0.25" x1="1" x2="width-2" y1="0" y2="0"/>
+    <line color="#343330" x1="1" x2="width-2" y1="0" y2="0"/>
     <!-- Top highlight -->
     <tint color="#ffffff" alpha="0.2" x="5" y="1" width="width - 10" height="1"/> 
     
-    <!-- Lower-left highlight -->
-    <line color="shade/gtk:bg[NORMAL]/0.33" x1="3" x2 ="4" y1="2" y2="2" />
-    <line color="shade/gtk:bg[NORMAL]/0.32" x1="2" x2 ="2" y1="3" y2="4" />
-    
-    <!-- Lower-left higlight fade -->
-    <gradient type="vertical" x="1" y="5" width="1" height="title_height - 4">
-        <color value="shade/gtk:bg[NORMAL]/0.30"/>
-        <color value="shade/gtk:bg[NORMAL]/0.25"/>
-    </gradient> 
+     <!-- Sides -->
+    <gradient type="horizontal" x="0" y="0" width="6" height="height">
+        <color value="shade/gtk:bg[NORMAL]/0.5"/>
+        <color value="shade/gtk:bg[NORMAL]/0.7"/>
+    </gradient> 
+    <gradient type="horizontal" x="width-6" y="0" width="6" height="height">
+        <color value="shade/gtk:bg[NORMAL]/0.7"/>
+        <color value="shade/gtk:bg[NORMAL]/0.5"/>
+    </gradient> 
+    
+    <!-- Upper left highlight -->
+    <!--line color="#464542" x1="3" x2 ="4" y1="2" y2="2" />
+    <line color="#444340" x1="2" x2 ="2" y1="3" y2="4" /-->
+    
+    <!-- Upper left higlight fade -->
+    <!--gradient type="vertical" x="1" y="5" width="1" height="title_height - 4">
+        <color value="#403F3A"/>
+        <color value="#343330"/>
+    </gradient--> 
     
     <!-- Upper right highlight -->
-    <line color="shade/gtk:bg[NORMAL]/0.30" x1="width-5" x2 ="width-4" y1="2" y2="2" />
-    <line color="shade/gtk:bg[NORMAL]/0.30" x1="width-3" x2 ="width-3" y1="3" y2="4" />
+    <!--line color="#403F3A" x1="width-5" x2 ="width-4" y1="2" y2="2" />
+    <line color="#403F3A" x1="width-3" x2 ="width-3" y1="3" y2="4" /-->
     
-    <!-- Lower-left higlight fade -->
-    <gradient type="vertical" x="width-2" y="5" width="1" height="title_height - 4">
-        <color value="shade/gtk:bg[NORMAL]/0.30"/>
-        <color value="shade/gtk:bg[NORMAL]/0.25"/>
-    </gradient> 
+    <!-- Upper right higlight fade -->
+    <!--gradient type="vertical" x="width-2" y="5" width="1" height="title_height - 4">
+        <color value="#403F3A"/>
+        <color value="#343330"/>
+    </gradient--> 
 </draw_ops>
 
 <draw_ops name="draw_title_maximized">
@@ -155,15 +188,10 @@
     <gradient type="vertical" x="0" y="0" width="width+9" height="height">
         <!--<color value="#80594D"/>-->
         <color value="shade/gtk:bg[SELECTED]/0.6"/>
-        <!--Static colors to mach static menubar and all-->
-        <color value="#3F3E39" />
-        <color value="#3A3936" />
-        <color value="#373633" />
-        <!--color value="shade/gtk:bg[NORMAL]/0.29" />
+        <color value="shade/gtk:bg[NORMAL]/0.29" />
         <color value="shade/gtk:bg[NORMAL]/0.27" />
-        <color value="shade/gtk:bg[NORMAL]/0.25" /-->
-        <color value="#343330" />
-        <!--color value="shade/gtk:bg[NORMAL]/0.24" /-->
+        <color value="shade/gtk:bg[NORMAL]/0.25" />
+        <color value="shade/gtk:bg[NORMAL]/0.24" />
     </gradient>
     
     <!-- Topmost dark line -->
@@ -179,8 +207,8 @@
     <!-- Background gradient -->
     <gradient type="vertical" x="0" y="0" width="width+9" height="height">
         <!--<color value="#80594D"/>-->
-        <color value="#3A3936" />
-        <color value="#343330" />
+        <color value="shade/gtk:bg[NORMAL]/0.27" />
+        <color value="shade/gtk:bg[NORMAL]/0.24" />
     </gradient>
     
     <!-- Topmost dark line -->
@@ -196,23 +224,40 @@
     The frame around windows
 -->
 
-<draw_ops name="draw_frame">
-	<rectangle color="shade/gtk:bg[NORMAL]/0.25" x="0" y="0" width="width" height="height" filled="true"/>
-	<!-- RSC: Subtle gradient on left/right edges to match the menubar -->
-    <gradient type="vertical" x="0" y="0" width="width" height="100">
-        <color value="shade/gtk:bg[NORMAL]/0.25"/>
-        <color value="shade/gtk:bg[NORMAL]/0.15"/>
-        <color value="shade/gtk:bg[NORMAL]/0.25"/>
-    </gradient> 
-</draw_ops>
-
-<!--Borderless only: make bottom border less apparent. We can do this now since our statusbars are light.-->
+<draw_ops name="left_edge">
+    <gradient type="horizontal" x="0" y="0" width="width" height="height">
+        <color value="shade/gtk:bg[NORMAL]/0.5"/>
+        <color value="shade/gtk:bg[NORMAL]/0.7"/>
+    </gradient>
+    <tint color="#ffffff" alpha="0.15" x="width-2" y="0" width="1" height="height"/>
+</draw_ops>
+
+<draw_ops name="right_edge">
+    <gradient type="horizontal" x="0" y="0" width="width" height="height">
+        <color value="shade/gtk:bg[NORMAL]/0.7"/>
+        <color value="shade/gtk:bg[NORMAL]/0.5"/>
+    </gradient>
+    <tint color="#ffffff" alpha="0.15" x="1" y="0" width="1" height="height"/>
+</draw_ops>
+
 <draw_ops name="bottom_edge">
-    <rectangle color="shade/gtk:bg[NORMAL]/0.25" x="0" y="0" width="width" height="height" filled="true"/>
-    <gradient type="vertical" x="1" y="height-6" width="width-2" height="5">
-        <color value="shade/gtk:bg[NORMAL]/0.85"/>
+    <rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true"/>
+    
+    <!-- Sides -->
+    
+    <gradient type="horizontal" x="0" y="0" width="6" height="height">
+        <color value="shade/gtk:bg[NORMAL]/0.5"/>
+        <color value="shade/gtk:bg[NORMAL]/0.7"/>
+    </gradient> 
+    <gradient type="horizontal" x="width-6" y="0" width="6" height="height">
+        <color value="shade/gtk:bg[NORMAL]/0.7"/>
         <color value="shade/gtk:bg[NORMAL]/0.5"/>
     </gradient>
+    
+    <!-- White corner arches -->
+    
+    <tint color="#343330" alpha="0.55" x="0" y="height-1" width="width" height="1"/>
+    
 </draw_ops>
 
 
@@ -315,8 +360,8 @@
 <frame_style name="frame_style_normal_focused" geometry="frame_geometry_normal">
    <piece position="title" draw_ops="draw_title_text_normal"/>
    <piece position="titlebar" draw_ops="draw_title"/>
-   <piece position="left_edge" draw_ops="draw_frame"/>
-   <piece position="right_edge" draw_ops="draw_frame"/>
+   <piece position="left_edge" draw_ops="left_edge"/>
+   <piece position="right_edge" draw_ops="right_edge"/>
    <piece position="bottom_edge" draw_ops="bottom_edge"/>
    <button function="close" state="normal" draw_ops="button_close_normal"/>
    <button function="close" state="prelight" draw_ops="button_close_prelight"/>
@@ -335,8 +380,8 @@
 <frame_style name="frame_style_normal_unfocused" geometry="frame_geometry_normal">
    <piece position="title" draw_ops="draw_title_text_inactive"/>
    <piece position="titlebar" draw_ops="draw_title_inactive"/>
-   <piece position="left_edge" draw_ops="draw_frame"/>
-   <piece position="right_edge" draw_ops="draw_frame"/>
+   <piece position="left_edge" draw_ops="left_edge"/>
+   <piece position="right_edge" draw_ops="right_edge"/>
    <piece position="bottom_edge" draw_ops="bottom_edge"/>
    <button function="close" state="normal" draw_ops="button_close_inactive"/>
    <button function="close" state="prelight" draw_ops="button_close_inactive_prelight"/>
@@ -355,8 +400,8 @@
 <frame_style name="frame_style_maximized_focused" geometry="frame_geometry_abnormal">
    <piece position="title" draw_ops="draw_title_text_normal"/>
    <piece position="titlebar" draw_ops="draw_title_maximized"/>
-   <piece position="left_edge" draw_ops="draw_frame"/>
-   <piece position="right_edge" draw_ops="draw_frame"/>
+   <piece position="left_edge" draw_ops="left_edge"/>
+   <piece position="right_edge" draw_ops="right_edge"/>
    <piece position="bottom_edge" draw_ops="bottom_edge"/>
    <button function="close" state="normal" draw_ops="button_close_normal"/>
    <button function="close" state="prelight" draw_ops="button_close_prelight"/>
@@ -375,8 +420,8 @@
 <frame_style name="frame_style_maximized_unfocused" geometry="frame_geometry_abnormal">
    <piece position="title" draw_ops="draw_title_text_inactive"/>
    <piece position="titlebar" draw_ops="draw_title_maximized_inactive"/>
-   <piece position="left_edge" draw_ops="draw_frame"/>
-   <piece position="right_edge" draw_ops="draw_frame"/>
+   <piece position="left_edge" draw_ops="left_edge"/>
+   <piece position="right_edge" draw_ops="right_edge"/>
    <piece position="bottom_edge" draw_ops="bottom_edge"/>
    <button function="close" state="normal" draw_ops="button_close_inactive"/>
    <button function="close" state="prelight" draw_ops="button_close_prelight"/>

=== modified file 'New Wave Dark Menus/gtk-2.0/default-gtkrc'
--- New Wave Dark Menus/gtk-2.0/default-gtkrc	2009-08-08 02:20:59 +0000
+++ New Wave Dark Menus/gtk-2.0/default-gtkrc	2010-03-01 02:27:15 +0000
@@ -1,7 +1,7 @@
 #
-#==========================================
-#	 New Wave Pixmap Theme
-#==========================================
+#==================================================================
+#	               New Wave Pixmap Theme
+#==================================================================
 #
 # 
 # Based on: Ubuntu Human-Clearlooks
@@ -12,20 +12,24 @@
 # Former Authors:
 # Giuseppe Pennisi <[e-mail]>
 #
-# Feel free to modify and share!
-# Licensed under Creative Commons 3.0 Attribution-Noncommercial-Share Alike
+# Licensed under Creative Commons 3.0 Attribution-Share Alike
+
+# You MUST attribute the derivative themes as:
+# "Based on the New Wave theme created by Anton Kerezov (dilomo)"
+# as well as provide a link to the original.
+#==================================================================
 #
 #---NWC-START---#
-# Version: 0.8.1 [29/07/09]
+# Version: 0.8.2 [12/12/2009]
 
 
 # Default color values used in Appearance Manager
-gtk_color_scheme = "fg_color: #101010\nbg_color: #E5E5E5\nbase_color: #FFFFFF\ntext_color: #1A1A1A\nselected_bg_color: #FF8F4C\nselected_fg_color: #1A1A1A\ntooltip_bg_color:#FFE6C4\ntooltip_fg_color:#330606"
-# so that we can use pulsation on windows that need attention
-gtk-enable-animations = 1   
-# This value has to be less than 990 for Rhythmbox to work (tooltips updating in 1sec intervals)
+gtk_color_scheme = "fg_color: #1A1A1A\nbg_color: #E5E5E5\nbase_color: #FFFFFF\ntext_color: #171717\nselected_bg_color:#FFB886\nselected_fg_color:  #1D1D1D\ntooltip_bg_color:#FFE6C4\ntooltip_fg_color:#452222"
+gtk-enable-animations = 1  # so that we can use pulsation on windows that need attention
+# This value has to be less than 990 for Rhythmbox to work (tooltips updating in 1 sec. intervals)
 gtk-tooltip-timeout = 970
 
+
 #---NWC-END---#
 
 #=========================================================
@@ -35,7 +39,7 @@
 {
 	xthickness = 1
 	ythickness = 1
-
+	
         #=========================================================
         # General Style Properties
         #=========================================================
@@ -68,7 +72,7 @@
 	# These lines enable the New Wave Configurator to modify them. Do not remove or change!
 	
 	GtkScrollbar   ::has-backward-stepper = 1
-	GtkScrollbar   ::has-forward-stepper  = 1
+	GtkScrollbar   ::has-forward-stepper = 1
 	GtkScrollbar   ::has-secondary-backward-stepper = 0
 	GtkScrollbar   ::has-secondary-forward-stepper = 0
 	#---NWC-END---#
@@ -83,6 +87,7 @@
 	GtkMenu        ::vertical-padding     = 1
 	GtkMenu        ::horizontal-offset    = -1
 	
+	
 	GtkExpander    ::expander-size        = 16
 	
 	GtkToolbar     ::internal-padding     = 2
@@ -98,14 +103,31 @@
 	
 	GtkProgressBar ::shadow-type          = GTK_SHADOW_NONE
 	
+	
+	#benzea: dilomo: BOX
+	#benzea: and the detail string is one of a couple
+
+	#benzea:     "infobar-info",
+	#benzea:     "infobar-warning",
+	#benzea:     "infobar-question",
+	#benzea:     "infobar-error",
+	#benzea:     "infobar"
+	
 	#---NWC-START---#
+	#Values used in the New Wave Configurator
+	
 	GtkWidget	::cursor-aspect-ratio = 0.05
-	
+
 	# This is the pulsating rect that appears on newly launched apps	
 	WnckTasklist   ::fade-overlay-rect    = 1
 	WnckTasklist   ::fade-opacity	      = 0.6
 	
-	NautilusIconContainer::highlight_alpha= 145
+	NautilusIconContainer::highlight_alpha= 120
+	
+	# The rect. when you drag the mouse to select several files
+	NautilusIconContainer::selection_box_color = "#EF9D6E"
+	NautilusIconContainer::selection_box_alpha = 60
+	
 	#---NWC-END---#
 
 	fg[NORMAL]        = @fg_color
@@ -116,14 +138,14 @@
 
 	bg[NORMAL]        = @bg_color
 	bg[PRELIGHT]      = shade (1.02, @bg_color)
-	bg[SELECTED]	  = mix (0.25, @fg_color, @selected_bg_color)
+	bg[SELECTED]	  = @selected_bg_color #mix (0.25, @fg_color, @selected_bg_color)
 	bg[INSENSITIVE]   = @bg_color
 	bg[ACTIVE]        = shade (0.9, @bg_color)
 
 	base[NORMAL]      = @base_color
 	base[PRELIGHT]    = shade (0.95, @bg_color)
 	base[ACTIVE]      = shade (0.90, @bg_color)
-	base[SELECTED]    = mix(0.50, shade (1.05,@selected_bg_color), @tooltip_bg_color)
+	base[SELECTED]    = @selected_bg_color #mix(0.50, shade (1.05,@selected_bg_color), @tooltip_bg_color)
 	base[INSENSITIVE] = @bg_color
 
 	text[NORMAL]      = @text_color
@@ -132,9 +154,76 @@
 	text[SELECTED]    = @selected_fg_color
 	text[INSENSITIVE] = darker (@bg_color)
 	
+	# Colors for the GtkInfobar themeing if you 
+	# don't want to theme them with images
+	
+	#color["error_bg_color"] = "black"
+	#color["error_fg_color"] = "white"
+	
+	#color["info_bg_color"] = "#9EDDFF"
+	#color["info_fg_color"] = "#ffffff"
+	
+	#color["warning_bg_color"] = "black"
+	#color["warning_fg_color"] = "white"
+	
+	#color["question_bg_color"] = "black"
+	#color["question_fg_color"] = "white"
+	
+	#color["other_bg_color"] = "black"
+	#color["other_fg_color"] = "white"
+	
 	
 	engine "pixmap"
 	{
+	# Info Bar
+	
+	image
+	{
+		function		= BOX
+		recolorable		= TRUE
+		detail 			= "infobar-info"
+		file			= "Images/Others/nautilus-infobar-overlay.png"
+		border			= { 2, 2, 2, 3}
+		stretch			= TRUE
+	}
+	
+	image
+	{
+		function		= BOX
+		recolorable		= TRUE
+		detail 			= "infobar-warning"
+		file			= "Images/Others/nautilus-infobar-overlay-warning.png"
+		border			= { 2, 2, 2, 3}
+		stretch			= TRUE
+	}
+	image
+	{
+		function		= BOX
+		recolorable		= TRUE
+		detail 			= "infobar-error"
+		file			= "Images/Others/nautilus-infobar-overlay-error.png"
+		border			= { 2, 2, 2, 3}
+		stretch			= TRUE
+	}
+	image
+	{
+		function		= BOX
+		recolorable		= TRUE
+		detail 			= "infobar-question"
+		file			= "Images/Others/nautilus-infobar-overlay-question.png"
+		border			= { 2, 2, 2, 3}
+		stretch			= TRUE
+	}
+	
+	image
+	{
+		function		= BOX
+		recolorable		= TRUE
+		detail 			= "infobar"
+		file			= "Images/Others/nautilus-infobar-overlay.png"
+		border			= { 2, 2, 2, 3}
+		stretch			= TRUE
+	}
 	
 	# Shadows 
 	
@@ -184,7 +273,7 @@
 		shadow			= IN 
 		recolorable		= TRUE
 		file			= "Images/Frame-Gap/frame-in.png"
-		border			={ 4, 4, 4,3}
+		border			={ 3, 3, 3, 3}
 		stretch			= TRUE
 		gap_start_file		= "Images/Frame-Gap/frame-gapstart-in.png"
 		gap_start_border	= { 4, 0, 4, 0}
@@ -201,12 +290,12 @@
 		shadow			= OUT
 		recolorable		= TRUE
 		file			= "Images/Frame-Gap/frame-out.png"
-		border			= { 4, 4, 4, 4}
+		border			= { 4, 4, 3, 4}
 		stretch			= TRUE
 		gap_start_file		= "Images/Frame-Gap/frame-gapstart-out.png"
-		gap_start_border	= { 4, 0, 4, 0}
+		gap_start_border	= { 3, 0, 2, 0}
 		gap_end_file		= "Images/Frame-Gap/frame-gapend-out.png"
-		gap_end_border		= { 0, 4, 4, 0}
+		gap_end_border		= { 0, 3, 2, 0}
 		gap_side		= TOP
 	}
 	
@@ -281,7 +370,7 @@
       	  	orientation		= HORIZONTAL
     	}
     	
-    	## vertical handle
+    	## Vertical handle
     	image
     	{
     	  	function		= HANDLE
@@ -334,17 +423,17 @@
       		function		= HLINE
      		recolorable		= TRUE
       		file			= "Images/Lines/line-h.png"
-      		#border			= { 1, 1, 0, 1 }
+      		border			= { 12, 12, 0, 1 }
       		stretch			= TRUE
       }
 	
-      #@author:dilomo@  focus image used on buttons any derivatives (check box, combo and so on) Now obsolate!
+      #@author:dilomo@  Focus image used on button's derivatives (check box, combo and so on)
       image
       {
     	  	function		= FOCUS
   		recolorable		= TRUE
    	 	file			= "Images/Others/focus.png"
-    		border			= { 2, 2, 2, 2 }
+    		border			= { 6, 6, 6, 6 }
     	 	stretch			= TRUE
       }
    	        
@@ -866,7 +955,8 @@
 	ythickness = 3
 }
 
-
+style "empty"
+{}
 
 
 #=========================================================
@@ -876,45 +966,154 @@
 #=========================================================
 
 
-
+# @author:dilomo@ This has to fix the Appearance manager crash
 style "newwave-window" = "newwave-wide"
-{	
-  engine "pixmap"
-  {
- 	image
-	{
-		function = FLAT_BOX
-                file = "Images/Others/null.png"
-                border = {2, 2, 2, 2}
-                detail = "base"
-		#stretch = TRUE
-
-	}
-  }
+{
+   bg_pixmap[NORMAL] = "Images/Others/null.png"
 }
 
-# Fix issues with Gedit in the statusbar
-style "newwave-frame" #= "newwave-wide"
+
+style "newwave-frame" = "newwave-wide"
 {	
-#  engine "pixmap"
+ # engine "pixmap"
  # {
  #	image
 #	{
 #		function = SHADOW
  #               file = "Images/Others/frame.png"
- #               border = {1, 1, 1, 1}
+ ##               border = {1, 1, 1, 1}
 #		stretch = TRUE
-#
+
 #	}
  # }
 }
 
+
+# Fix ugly frames with Gedit in the statusbar
+style "newwave-frame-gedit"
+{	
+  engine "pixmap"
+  {
+ 	image
+	{
+
+		function = SHADOW
+                file = "Images/Others/null.png"
+                #border = {1, 1, 1, 1}
+		#stretch = TRUE
+
+	}
+  }
+}
+
+style "newwave-frame-panel"
+{	
+  engine "pixmap"
+  {
+ 	image
+	{
+
+		function = SHADOW
+                file = "Images/Shadows/shadow-etched-out-panel.png"
+                border = {2, 2, 2, 2}
+		#stretch = TRUE
+
+	}
+  }
+}
+
+# Cool but the selected state is rather ugly and cannot be themed properly
+style "newwave-desktop-icon"
+{
+#1 for activate
+NautilusIconContainer::frame_text = 1
+NautilusIconContainer::light_info_color = "#DADADA"
+NautilusIconContainer::dark_info_color = "#101010"
+NautilusIconContainer::prelight_icon_render_mode = 1
+NautilusIconContainer::activate_prelight_icon_label = 1
+
+base[NORMAL] = "black"
+base[PRELIGHT] = "black"
+base[SELECTED] = "black" #"#7C3320"
+base[ACTIVE] = "white"
+
+text[NORMAL] = "white"
+text[PRELIGHT] = "white"
+text[SELECTED] = "white"
+NautilusIconContainer::normal_alpha = 60
+NautilusIconContainer::prelight_alpha = 80
+NautilusIconContainer::highlight_alpha = 90
+}
+
+style "newwave-desktop-icon-focus"
+{
+ engine "pixmap"
+  {
+  image
+      {
+    	  	function		= FOCUS
+  		recolorable		= TRUE
+   	 	file			= "Images/Others/focus.png"
+    		border			= { 2, 2, 2, 2 }
+    	 	stretch			= TRUE
+      }
+     }
+}
+
+#widget_class "*DesktopIcon*" style "newwave-desktop-icon"
+
+
+#=========================================================
+# Icon View
+#=========================================================
+
+# Theme the iconview selected items
+style "newwave-iconview"
+{
+	#GtkIconView::selection-box-color	= "black"
+	#GtkIconView::selection-box-alpha 	= 60
+	
+ engine "pixmap"
+  {
+  image
+      {
+    	  	function		= FLAT_BOX
+  		recolorable		= TRUE
+   	 	file			= "Images/Others/iconview-item.png"
+    		border			= {3, 3, 3, 3 }
+    	 	stretch			= TRUE
+      }
+
+   }
+}
+
+widget_class "*IconView" style "newwave-iconview"
+
+
+
+#=========================================================
+# Assistant (Wizard windows)
+#=========================================================
+
+# Theme properly the assistant 
+style "newwave-assistant"
+{
+	bg[SELECTED] ="#9A9A9A"#"#484848"
+	fg[SELECTED] ="#F3F3F3"# "#ECECEC"
+}
+
+widget_class "*Assistant*" style "newwave-assistant"
+
+
+
 #=========================================================
 # Buttons
 #=========================================================
 
 style "newwave-button" = "newwave-wider"
 { 
+	#xthickness = 4
+	#ythickness = 4
 
 	bg[NORMAL]        = shade (0.98, @bg_color)
 	bg[PRELIGHT]      = shade (1.04, @bg_color)
@@ -931,12 +1130,12 @@
 	GtkButton::child_displacement_y = 1
 	
 	# Increase because focus padding is zero
-	GtkButton::inner-border =  {2, 2, 2, 2}
+	GtkButton::inner-border =  {2, 2,2, 2}
 	
 	# Use to show glow around default buttons
 	GtkButton::default-border = { 3, 3, 3, 3}
 	GtkButton::default-outside-border = { 3, 3, 3, 3}
-
+	#GtkWidget::draw-border = {3,3,3,3}
  
 	engine "pixmap"
 	{
@@ -959,8 +1158,9 @@
 		function		= BOX
 		state			= NORMAL
 		shadow			= OUT
+
 		file			= "Images/Buttons/button-normal.png"		
-		border			={ 4, 4, 4, 4 }
+		border			= {4, 4, 4, 4}
 		stretch			= TRUE
 	}
 
@@ -969,6 +1169,7 @@
 	{
 		function		= BOX
 		state			= NORMAL
+		#shadow			= IN
 		detail			= "buttondefault"
 		file			= "Images/Buttons/button-default.png"		
 		border			={ 4, 4, 4, 4 }
@@ -981,7 +1182,7 @@
 		function		= BOX
 		state			= ACTIVE
 		file			= "Images/Buttons/button-pressed.png"
-		border			= { 4, 4, 4, 4 }
+		border			={4, 4, 4, 4}
 		stretch			= TRUE
 	}
 	
@@ -995,7 +1196,7 @@
 		recolorable		= TRUE
 		shadow			= IN
 		file			= "Images/Buttons/button-pressed-prelight.png"
-		border			= { 4, 4, 4, 4 }
+		border			= {4, 4, 4, 4}
 		stretch			= TRUE
 	}
 	#@author:dilomo@ prelight used on normal buttons
@@ -1006,7 +1207,7 @@
 		recolorable		= TRUE
 		shadow			= OUT
 		file			= "Images/Buttons/button-prelight.png"
-		border			= { 4, 4, 4, 4 }
+		border			= {4, 4, 4, 4}
 		stretch			= TRUE
 	}
 	
@@ -1016,7 +1217,7 @@
 		state			= INSENSITIVE
 		shadow			= IN
 		file			= "Images/Buttons/button-insensitive-in.png"	
-		border			= { 4, 4, 4, 4 }
+		border			= {4, 4, 4, 4}
 		stretch			= TRUE
 	}
 
@@ -1026,14 +1227,23 @@
 		state			= INSENSITIVE
 		shadow			= OUT
 		file			= "Images/Buttons/button-insensitive.png"	
-		border			= { 4, 4, 4, 4 }
+		border			= {4, 4, 4, 4}
+		stretch			= TRUE
+	}
+	image 
+	{
+		function		= BOX
+		state			= INSENSITIVE
+		#shadow			= IN
+		detail			= "buttondefault"
+		file			= "Images/Buttons/button-default-insensitive.png"		
+		border			={4, 4, 4, 4}
 		stretch			= TRUE
 	}
 	
 		
     }
 }
-
 #=========================================================
 # Progressbar
 #=========================================================
@@ -1041,7 +1251,12 @@
 {
   xthickness            		= 1
   ythickness            		= 1
-
+  
+  fg[NORMAL] = "#555555"
+  fg[ACTIVE] = "#555555"
+  fg[SELECTED] = "#555555"
+  fg[PRELIGHT] = "#360000"
+  
   engine "pixmap" 
   {
 	image
@@ -1333,8 +1548,6 @@
             overlay_stretch 		= FALSE
         }
 
-
-
 	# Overlay image
   	image 
 	{
@@ -2012,7 +2225,7 @@
         }
 
 
-	# Steppers - right
+	# Steppers OO - right
         #=============================
         image 
         {
@@ -2063,7 +2276,7 @@
         }
 
         
-        # Steppers - left
+        # Steppers OO - left
         #=============================
         image 
         {
@@ -2149,7 +2362,6 @@
 }
 class "GtkScrolledWindow" style "newwave-scrolledwindow"
 
-
 #=========================================================
 # Toolbar
 #=========================================================
@@ -2157,7 +2369,7 @@
 {
         xthickness            			= 2
         ythickness            			= 3
-  
+	
 	engine "pixmap"
 	{
 
@@ -2178,6 +2390,8 @@
 			stretch		= TRUE
     		}
  	}
+ 	
+ 	
 }
 style "newwave-toolbar-handle"
 {
@@ -2272,6 +2486,7 @@
 
 style "newwave-toolbuttons" = "newwave-button"
 {
+        
 engine "pixmap" {
       
 
@@ -2551,7 +2766,7 @@
  GtkSpinButton::page-size		 	= 0
  GtkWidget::interior_focus			= 0
  GtkWidget::internal-padding 			= 3
- GtkSpinButton::shadow-type			= GTK_SHADOW_IN
+ #GtkEntry::inner-border        = {0, 0, 1, 1}
   
   engine "pixmap"
   {
@@ -2668,33 +2883,25 @@
 
     # Spin - entry (textbox)
     #=============================
-    image
+    
+	image
 	{
 		function		= FOCUS
 		recolorable		= TRUE
+		detail			= "entry"
 		file			= "Images/Spin/text-entry-focus.png"
 		border			= { 2, 2, 3, 3}
 		stretch			= TRUE
 	}	
     
-    image
-	{
-		function	        = BOX
-		recolorable	        = TRUE
-		shadow		        = IN
-		state		        = NORMAL
-		detail		        = "entry"
-		file		        = "Images/Spin/text-entry.png"
-		border		        = { 2 , 2 ,3 ,3 }
-		stretch		        = TRUE
-	}
+      
 
-    image
+        image
 	{
 		function		= SHADOW
+		shadow			= IN
 		state			= NORMAL
-		shadow			= IN
-		recolorable		= TRUE
+		recolorable		= FALSE
 		detail			= "entry"
 		file			= "Images/Spin/text-entry.png"
 		border			= { 2, 2, 2, 2}
@@ -2714,6 +2921,7 @@
 {
   # Makes the button of the combo to have interior focus
   GtkButton::interior_focus			= 0
+  GtkButton::inner-border = {1, 1, 1, 1}
 
   engine "pixmap"
   {
@@ -2899,9 +3107,7 @@
   #@author:dilomo@ Disable outer focus glow because it look ugly in comboboxes and spins
   GtkWidget::interior_focus	= 0
   GtkEntry::inner-border        = {2, 2, 1, 1}
-  
 
-  
   engine "pixmap"
   {
     
@@ -2983,6 +3189,8 @@
 
 style "newwave-panel-entry" = "newwave-entry"
 {
+	#base[NORMAL] = "#CECECE"
+	
   engine "pixmap"
   {
     
@@ -3054,9 +3262,228 @@
     }  
  }
 }
-# Match the entries that might appear in the gnome panel as well as the dictionary applet
-widget_class "*Panel*Entry*" style :highest "newwave-panel-entry"
-widget_class "*GdictApp*Entry*" style :highest "newwave-panel-entry"
+
+style "newwave-panel-entry-blue" = "newwave-entry"
+{
+  engine "pixmap"
+  {
+    
+    # i'm unsure about these
+    image
+    {
+      function			= BOX
+      recolorable		= TRUE
+      shadow			= IN
+      state			= NORMAL
+      file			= "Images/Shadows/entry-shadow-in-panel-blue.png"
+      border			= { 3,3,4,3 }
+      stretch			= TRUE
+    }	
+    image
+    {
+     function			= BOX
+      recolorable		= TRUE
+      shadow			= OUT
+      state			= NORMAL
+      file			= "Images/Shadows/entry-shadow-in-panel-blue.png" 
+      border			= { 3,3,4,3 }
+      stretch			= TRUE
+    }
+    image	
+    {
+      function			= BOX
+      recolorable		= TRUE
+      shadow			= OUT
+      state			= ACTIVE
+      file			= "Images/Shadows/entry-focus-panel-blue.png"
+      border			= { 2,2,2,2 }
+      stretch			= TRUE
+    }
+    image	
+    {
+      function			= BOX
+      recolorable		= TRUE
+      shadow			= IN
+      state			= INSENSITIVE
+      file			= "Images/Shadows/entry-focus-panel-blue.png"
+      border			= { 2,2,2,2 }
+      stretch			= TRUE
+    }
+    
+    
+    # Glow image when selected
+    image
+    {
+      function			= FOCUS
+      recolorable		= TRUE
+      detail			= "entry"
+      file			= "Images/Shadows/entry-focus-panel-blue.png"
+      border			= {3, 3, 4, 3}
+      stretch			= TRUE
+    }	
+
+    # the actual textbox in normal state
+    image
+    {
+     	function		= SHADOW
+    	detail			= "entry"
+    	shadow			= IN
+	state			= NORMAL
+    	recolorable		= FALSE
+    	file			= "Images/Shadows/entry-shadow-in-panel-blue.png"
+    	border			= { 2,2,2,2 }
+    	stretch			= TRUE
+    }  
+ }
+}
+
+style "newwave-panel-entry-nopixmap" = "newwave-entry"
+{ # Nopixmap isn't really the lack of image but just to match with the panel theme name
+  engine "pixmap"
+  {
+    
+    # i'm unsure about these
+    image
+    {
+      function			= BOX
+      recolorable		= TRUE
+      shadow			= IN
+      state			= NORMAL
+      file			= "Images/Shadows/entry-shadow-in-panel-nopixmap.png"
+      border			= { 3,3,4,3 }
+      stretch			= TRUE
+    }	
+    image
+    {
+     function			= BOX
+      recolorable		= TRUE
+      shadow			= OUT
+      state			= NORMAL
+      file			= "Images/Shadows/entry-shadow-in-panel-nopixmap.png" 
+      border			= { 3,3,4,3 }
+      stretch			= TRUE
+    }
+    image	
+    {
+      function			= BOX
+      recolorable		= TRUE
+      shadow			= OUT
+      state			= ACTIVE
+      file			= "Images/Shadows/entry-focus-panel-nopixmap.png"
+      border			= { 2,2,2,2 }
+      stretch			= TRUE
+    }
+    image	
+    {
+      function			= BOX
+      recolorable		= TRUE
+      shadow			= IN
+      state			= INSENSITIVE
+      file			= "Images/Shadows/entry-focus-panel-nopixmap.png"
+      border			= { 2,2,2,2 }
+      stretch			= TRUE
+    }
+    
+    
+    # Glow image when selected
+    image
+    {
+      function			= FOCUS
+      recolorable		= TRUE
+      detail			= "entry"
+      file			= "Images/Shadows/entry-focus-panel-nopixmap.png"
+      border			= {3, 3, 4, 3}
+      stretch			= TRUE
+    }	
+
+    # the actual textbox in normal state
+    image
+    {
+     	function		= SHADOW
+    	detail			= "entry"
+    	shadow			= IN
+	state			= NORMAL
+    	recolorable		= FALSE
+    	file			= "Images/Shadows/entry-shadow-in-panel-nopixmap.png"
+    	border			= { 2,2,2,2 }
+    	stretch			= TRUE
+    }  
+ }
+}
+
+style "newwave-panel-entry-noir" = "newwave-entry"
+{ # Nopixmap isn't really the lack of image but just to match with the panel theme name
+  engine "pixmap"
+  {
+    
+    # i'm unsure about these
+    image
+    {
+      function			= BOX
+      recolorable		= TRUE
+      shadow			= IN
+      state			= NORMAL
+      file			= "Images/Shadows/entry-shadow-in-panel-noir.png"
+      border			= { 3,3,4,3 }
+      stretch			= TRUE
+    }	
+    image
+    {
+     function			= BOX
+      recolorable		= TRUE
+      shadow			= OUT
+      state			= NORMAL
+      file			= "Images/Shadows/entry-shadow-in-panel-noir.png" 
+      border			= { 3,3,4,3 }
+      stretch			= TRUE
+    }
+    image	
+    {
+      function			= BOX
+      recolorable		= TRUE
+      shadow			= OUT
+      state			= ACTIVE
+      file			= "Images/Shadows/entry-focus-panel-noir.png"
+      border			= { 2,2,2,2 }
+      stretch			= TRUE
+    }
+    image	
+    {
+      function			= BOX
+      recolorable		= TRUE
+      shadow			= IN
+      state			= INSENSITIVE
+      file			= "Images/Shadows/entry-focus-panel-noir.png"
+      border			= { 2,2,2,2 }
+      stretch			= TRUE
+    }
+    
+    
+    # Glow image when selected
+    image
+    {
+      function			= FOCUS
+      recolorable		= TRUE
+      detail			= "entry"
+      file			= "Images/Shadows/entry-focus-panel-noir.png"
+      border			= {3, 3, 4, 3}
+      stretch			= TRUE
+    }	
+
+    # the actual textbox in normal state
+    image
+    {
+     	function		= SHADOW
+    	detail			= "entry"
+    	shadow			= IN
+	state			= NORMAL
+    	recolorable		= FALSE
+    	file			= "Images/Shadows/entry-shadow-in-panel-noir.png"
+    	border			= { 2,2,2,2 }
+    	stretch			= TRUE
+    }  
+ }
+}
 
 #=========================================================
 # Task list
@@ -3430,6 +3857,16 @@
 			file            = "Images/Tree/selected-active.png"
 			stretch		= TRUE
 		}
+		
+		image
+		{
+			function	= SHADOW
+			shadow		= IN
+			recolorable	= TRUE
+			file		= "Images/Tree/shadow-in.png"
+			border		= { 2, 2, 3, 2}
+			stretch		= TRUE
+		}
 	}
 }
 
@@ -3667,7 +4104,7 @@
 		recolorable		= TRUE
 		detail                  = "tab"
 		file			= "Images/Tabs/tab-top-active.png"
-		border		        = { 3, 3, 5, 1}
+		border		        = { 3, 3,10, 1}
 		stretch		        = TRUE
 		gap_side		= BOTTOM
 	}
@@ -3824,6 +4261,13 @@
         ythickness = 0
         
 	bg[NORMAL] = @bg_color
+	
+	fg[NORMAL] = "#404040"
+	fg[PRELIGHT] = "#262626"
+	fg[INSENSITIVE] = "#4D4D4D"
+	text[NORMAL] = "#404040"
+	text[PRELIGHT] = "#262626"
+	text[INSENSITIVE] = "#4D4D4D"
 	#fg[ACTIVE] = shade (0.8, @bg_color)
 	#text[NORMAL] = shade (0.8, @bg_color)
 	
@@ -3853,7 +4297,7 @@
 	#}
 }
 
-style "newwave-hscale"
+style "newwave-hscale" = "newwave-scale"
 {
 	#engine "clearlooks"
 	#{
@@ -3861,7 +4305,7 @@
 	#}
 }
 
-style "newwave-vscale"
+style "newwave-vscale" = "newwave-scale"
 {
 	#engine "clearlooks"
 	#{
@@ -4022,7 +4466,7 @@
 #---NWC-START---#
 
 #widget_class "*Fix*MenuBar*"           	style :highest "newwave-menubar-light"
-
+#1A1A1A
 #---NWC-END---#
 
 style "newwave-menu-notop" 
@@ -4030,12 +4474,12 @@
         xthickness = 1
         ythickness = 3  
 	
-	bg[NORMAL] = "#F7F7F7"
-        
-        base[NORMAL] = "#F7F7F7"
-        
-        fg[NORMAL] = shade(0.3, "#696969")
-        fg[PRELIGHT] =  @text_color
+	bg[NORMAL] = "#F2F2F2"
+        
+        base[NORMAL] = "#F2F2F2" #"#F7F7F7"
+        
+        fg[NORMAL] = "#171717" #shade(0.3, "#696969")
+        fg[PRELIGHT] = "#141414"
         fg[ACTIVE] =  @text_color
         fg[SELECTED] =  @text_color
         
@@ -4342,15 +4786,62 @@
 	#@autho:gp@ Improve consistency between metacity-frame and application active in taskbar.
 	bg[ACTIVE] = shade(1.02, "#696969")     #bg[ACTIVE] = shade(2.5, "#424242")
 	#@autho:gp@ Improve consistency between active-menu-item and menu-background.
-	bg[SELECTED] = shade ( 1.60, @bg_color) #bg[SELECTED] = shade(3.2, "#424242")
+	bg[SELECTED] =  "#989594" #bg[SELECTED] = shade(3.2, "#424242")
 	
 	bg_pixmap[NORMAL] = "Images/Panel/PanelBarLong.png"
  	
 }
 
-style "panel-nopixmap" = "panel"
+style "panel-nopixmap" = "newwave-default"
 {   
- 	bg_pixmap[NORMAL] = "Images/Others/null.png"
+ 	fg[NORMAL] = shade(0.97, @bg_color) #mix(0.70, lighter(@selected_bg_color), @bg_color)
+	fg[PRELIGHT] =@text_color # lighter(mix(0.90, lighter(@selected_bg_color), @bg_color))
+	#@autho:gp@ Improve consistency between metacity-frame and application active in taskbar.
+	fg[ACTIVE] = @base_color   # @text_color # lighter(mix(0.50, lighter(@selected_bg_color), @bg_color))
+	
+  	# @author:dilomo@
+  	#dark color from v0.1 :  "#4C4D4E"
+  	#dark color from v0.1.1 :  "#424242"  	
+	bg[NORMAL] = "#3a3a3a" #This is dark gray
+	# @author:gp@ Same color as item selected of taskbar menu.
+	bg[PRELIGHT] = shade ( 1.60, @bg_color) #shade(3.0, "#424242") 
+	#@autho:gp@ Improve consistency between metacity-frame and application active in taskbar.
+	bg[ACTIVE] = shade(1.02, "#696969")     #bg[ACTIVE] = shade(2.5, "#424242")
+	#@autho:gp@ Improve consistency between active-menu-item and menu-background.
+	bg[SELECTED] = "#989594" #bg[SELECTED] = shade(3.2, "#424242")
+}
+
+# Extra panel themes for the New Wave Configurator
+style "panel-light" = "panel"
+{
+	fg[NORMAL] = "#2B2B2B"
+	fg[PRELIGHT] = "#000000"
+	fg[ACTIVE] =  @fg_color
+	
+	bg[NORMAL] = "#E8E8E8"
+	bg[INSENSITIVE] = "#E8E8E8"
+	bg[ACTIVE] = "#E8E8E8"
+	bg[SELECTED] = "#E8E8E8"
+	bg[PRELIGHT] = "#E8E8E8"
+	
+	bg_pixmap[NORMAL] = "Images/Panel/PanelBarLongLight.png"
+}
+
+style "panel-black" = "panel"
+{
+	fg[NORMAL] = "#BFBFBF"
+	fg[PRELIGHT] = "#000000"
+	
+	bg[NORMAL] = "#212121"
+	bg[INSENSITIVE] = "#212121"
+}
+
+style "panel-blue" = "panel"
+{
+	fg[NORMAL] = shade(0.97, @bg_color) 
+	
+	bg[NORMAL] = "#3D6490"
+	bg[SELECTED] = "#99A4AB"
 }
 
 #=========================================================
@@ -4444,6 +4935,10 @@
 {
 	bg[NORMAL] = "#E5D0C3"
 	bg[INSENSITIVE] ="#E5D0C3"
+	
+	fg[NORMAL] = "#2F2F2F"
+	text[NORMAL] = "#2F2F2F"
+	text[PRELIGHT] = "#292929"
 	engine "pixmap" {
       
 		image
@@ -4471,6 +4966,7 @@
 		}
 	}
 }
+# Not used
 style "newwave-nautilus-location-text"
 {
 	bg[NORMAL] = mix(0.70, shade (1.05,"#696969"), @bg_color)
@@ -4510,18 +5006,17 @@
 	bg[NORMAL] = "#696969"
 }
 
-# @author:dilomo@ This has to fix the Appearance manager crash
-#style "newwave-window"
+style "newwave-radiocheck" = "newwave-default"
+{
+	text[PRELIGHT]	= @base_color # Text on Mouseover
+}
+
+
+#style "newwave-infobar"
 #{
-#        bg_pixmap[NORMAL] = "Images/Others/null.png"
+#error_bg_color = "#000000"
 #}
-
-style "newwave-radiocheck" = "newwave-default"
-{
-	text[PRELIGHT]	= @base_color # Text on Mouseover
-}
-
-
+#class "GtkInfoBar" style "newwave-infobar"
 
 
 #=========================================================
@@ -4556,7 +5051,7 @@
 class "GtkOldEditable" 					style "newwave-entry"
 class "GtkToolbar"   					style "newwave-toolbar" 
 class "GtkRange"     					style "newwave-range"
-class "GtkSpinButton"  					style : highest "newwave-spinbutton"
+class "GtkSpinButton"  					style "newwave-spinbutton"
 class "GtkScale"       					style "newwave-scale"
 class "GtkVScale"      					style "newwave-vscale"
 class "GtkHScale"      					style "newwave-hscale"
@@ -4586,11 +5081,11 @@
 widget_class "*<GtkButton>"      			style "newwave-button"
 widget_class "*<GtkLinkButton>"  			style : highest "newwave-toolbuttons"
 widget_class "*<GtkNotebook>"    			style "newwave-notebook"
-widget_class "*<GtkStatusbar>*"  			style "newwave-statusbar"
+# : highest needed for nautilus and other apps to have all gray text
+widget_class "*<GtkStatusbar>*"  			style : highest "newwave-statusbar" 
 
 
 widget_class "*<GtkComboBoxEntry>*"			style "newwave-comboboxentry"
-# TODO : compat testing
 widget_class "*<GtkCombo>*"         			style "newwave-comboboxentry"
 widget_class "*<GtkMenu>*"              		style "newwave-menu"
 class "*GtkMenubar*.<GtkMenu>" 				style : highest "newwave-menu-notop"
@@ -4609,9 +5104,8 @@
 widget_class "*GtkMenuToolButton*"      		style : highest "newwave-toolbuttons"
 widget_class "*GtkToolbar*Button"			style : highest "newwave-toolbuttons"
 
-widget_class "<SpinButton>"  				style : highest "newwave-spinbutton"
-widget_class "*GtkSpinButton*.*Entry*"  		style : highest "newwave-spinbutton"
-
+widget_class "*<SpinButton>*"  				style : highest "newwave-spinbutton"
+widget_class "*<GtkSpinButton>*"  		        style : highest "newwave-spinbutton"
 
 
 # @author:dilomo@ Here "*<GtkMenu>.<GtkMenuItem>*" GtkMenu is used 
@@ -4623,7 +5117,11 @@
 widget_class "*<GtkSeparatorMenuItem>*" 		style "newwave-separator-menu-item"
 
 widget_class "*.<GtkFrame>.<GtkLabel>" 			style "newwave-frame-title"
-widget_class "*.<GtkFrame>.*"				style "newwave-frame"
+widget_class "*.<GtkFrame>*"				style "newwave-frame"
+widget_class "*Gedit*.<GtkFrame>*"     			style "newwave-frame-gedit"
+# make frame of system monitor look better
+widget_class "*PanelApplet*.<GtkFrame>*" 		style "newwave-frame-panel"
+widget_class "*Gedit*.*Notify*"     			style "newwave-tooltips"
 widget_class "*.<GtkTreeView>*"        			style "newwave-treeview"
 widget_class "*.GtkFrame.GtkScrolledWindow.GtkTreeView" style "newwave-treeview"
 
@@ -4668,7 +5166,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 "newwave-nautilus-location"
-widget "*.nautilus-extra-view-widget" 			style : highest "newwave-nautilus-location"
+widget "*.nautilus-extra-view-widget" 		style : highest "newwave-nautilus-location"
 
 #widget_class "*MozillaGtkWidget*MenuBar*"	        style :highest "newwave-menubar"#-mozilla"
 #widget "MozillaGtkWidget*Menu*"	                style :highest "newwave-menu-item-mozilla"
@@ -4730,6 +5228,17 @@
  }
 }
 
+style "nautilus-splitter"
+{
+
+	bg[NORMAL]	= "#ffffff"
+	bg[PRELIGHT]	= "#ECECEC"
+	engine "mist" {}
+}
+
+#widget	"NautilusNavigationWindow.*.NautilusHorizontalSplitter"	style "nautilus-splitter"
+
+
 style "newwave-nautilus-sidebar-handles"
 {
   engine "pixmap"
@@ -4777,6 +5286,7 @@
 }
 
 widget_class "NautilusNavigationWindow.GtkTable.NautilusHorizontalSplitter.NautilusSidePane.GtkNotebook.*" style "newwave-nautilus-sidebar"
+widget_class "NautilusNavigationWindow.GtkTable.NautilusHorizontalSplitter.NautilusSidePane.*" style "newwave-nautilus-sidebar"
 #widget_class "NautilusNavigationWindow.GtkTable.NautilusHorizontalSplitter.NautilusSidePane.*" style "newwave-nautilus-sidebar-handles"
 widget_class "NautilusNavigationWindow.GtkTable.NautilusHorizontalSplitter.NautilusSidePane.GtkNotebook.*Tree*" style "newwave-treeview-nautilus-sidebar"
 
@@ -4785,7 +5295,8 @@
 {
   #bg[NORMAL] = "##FFE68D"
   #base[NORMAL] = "#FF9E9E"
-  bg_pixmap[NORMAL] = "Images/MenuMenubar/combomenu.png"
+  #bg_pixmap
+  
 }
 #widget_class "NautilusNavigationWindow.GtkTable.NautilusHorizontalSplitter.*FM*View.*" style "newwave-nautilus-filemanager"
 
@@ -4855,7 +5366,6 @@
 widget "*.gtk-combobox-popup-menu"  style :highest  "newwave-popupmenu-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
 # base color set.
@@ -4968,10 +5478,12 @@
 #=========================================================
 # Panel Matches 
 #=========================================================
-
-
-
-class "*Mail*" 			        style "panel"
+#---NWC-START---#
+# Match the entries that might appear in the gnome panel as well as the dictionary applet
+widget_class "*Panel*Entry*" style "newwave-panel-entry"
+widget_class "*GdictApp*Entry*" style "newwave-panel-entry"
+
+class "*Panel*Mail*" 			style "panel"
 class "*Tray*" 				style "panel"
 class "*tray*" 				style "panel"
 widget_class "*Tray*" 			style "panel"
@@ -4986,7 +5498,8 @@
 widget "*PanelApplet*" 			style "panel"
 class  "PanelApp*" 			style "panel"
 class  "PanelToplevel*" 		style "panel"
-widget_class "*Mail*" 			style "panel"
+# use this to fix Evolution proiblem
+widget_class "*Panel*Mail*" 		style "panel"
 widget_class "*Netstatus*" 		style "panel"
 widget_class "*Tomboy*Tray*" 		style "panel"
 widget "*fast-user-switch*" 		style "panel"
@@ -5001,7 +5514,7 @@
 #(TODO:) Fixed with larger image but if the drawer is 
 #bigger than the image the ugly repeating will appear
 #
-#widget_class "*DrawerApplet*"		style "panel-nopixmap"
+#widget_class "*DrawerApplet*"		style "panel"
 
 widget_class "*Panel*GtkToggleButton" 		        style "newwave-panelbuttons"
 widget        "*.tasklist-button" 			style "newwave-panelbuttons"
@@ -5009,7 +5522,7 @@
 widget_class "*Xfce*Panel*.GtkToggleButton" 	        style "newwave-panelbuttons"
 widget_class "*Xfce*NetkTasklist*GtkToggleButton"      style "newwave-panelbuttons"
 
-
 # @author:dilomo@ Only testing this as it is alpha software. 
 #widget "*.globalmenu-applet-eventbox"                  style : highest "panel"
 
+#---NWC-END---#

=== modified file 'New Wave/gtk-2.0/Images/Buttons/button-prelight.png'
Binary files New Wave/gtk-2.0/Images/Buttons/button-prelight.png	2009-08-08 02:13:58 +0000 and New Wave/gtk-2.0/Images/Buttons/button-prelight.png	2010-03-01 02:27:14 +0000 differ
=== modified file 'New Wave/gtk-2.0/Images/Lines/line-h.png'
Binary files New Wave/gtk-2.0/Images/Lines/line-h.png	2009-08-08 02:13:58 +0000 and New Wave/gtk-2.0/Images/Lines/line-h.png	2010-03-01 02:27:14 +0000 differ
=== modified file 'New Wave/gtk-2.0/Images/MenuMenubar/menuitem.png'
Binary files New Wave/gtk-2.0/Images/MenuMenubar/menuitem.png	2009-08-08 02:13:58 +0000 and New Wave/gtk-2.0/Images/MenuMenubar/menuitem.png	2010-03-01 02:27:14 +0000 differ
=== modified file 'New Wave/gtk-2.0/Images/Others/focus.png'
Binary files New Wave/gtk-2.0/Images/Others/focus.png	2009-08-08 02:13:58 +0000 and New Wave/gtk-2.0/Images/Others/focus.png	2010-03-01 02:27:14 +0000 differ
=== added file 'New Wave/gtk-2.0/Images/Others/frame-panel.png'
Binary files New Wave/gtk-2.0/Images/Others/frame-panel.png	1970-01-01 00:00:00 +0000 and New Wave/gtk-2.0/Images/Others/frame-panel.png	2010-03-01 02:27:14 +0000 differ
=== added file 'New Wave/gtk-2.0/Images/Others/iconview-item.png'
Binary files New Wave/gtk-2.0/Images/Others/iconview-item.png	1970-01-01 00:00:00 +0000 and New Wave/gtk-2.0/Images/Others/iconview-item.png	2010-03-01 02:27:14 +0000 differ
=== added file 'New Wave/gtk-2.0/Images/Others/nautilus-infobar-overlay-error.png'
Binary files New Wave/gtk-2.0/Images/Others/nautilus-infobar-overlay-error.png	1970-01-01 00:00:00 +0000 and New Wave/gtk-2.0/Images/Others/nautilus-infobar-overlay-error.png	2010-03-01 02:27:14 +0000 differ
=== added file 'New Wave/gtk-2.0/Images/Others/nautilus-infobar-overlay-question.png'
Binary files New Wave/gtk-2.0/Images/Others/nautilus-infobar-overlay-question.png	1970-01-01 00:00:00 +0000 and New Wave/gtk-2.0/Images/Others/nautilus-infobar-overlay-question.png	2010-03-01 02:27:14 +0000 differ
=== added file 'New Wave/gtk-2.0/Images/Others/nautilus-infobar-overlay-warning.png'
Binary files New Wave/gtk-2.0/Images/Others/nautilus-infobar-overlay-warning.png	1970-01-01 00:00:00 +0000 and New Wave/gtk-2.0/Images/Others/nautilus-infobar-overlay-warning.png	2010-03-01 02:27:14 +0000 differ
=== added file 'New Wave/gtk-2.0/Images/Others/nautilus-infobar-overlay.png'
Binary files New Wave/gtk-2.0/Images/Others/nautilus-infobar-overlay.png	1970-01-01 00:00:00 +0000 and New Wave/gtk-2.0/Images/Others/nautilus-infobar-overlay.png	2010-03-01 02:27:14 +0000 differ
=== added file 'New Wave/gtk-2.0/Images/Others/windowbg.png'
Binary files New Wave/gtk-2.0/Images/Others/windowbg.png	1970-01-01 00:00:00 +0000 and New Wave/gtk-2.0/Images/Others/windowbg.png	2010-03-01 02:27:14 +0000 differ
=== added file 'New Wave/gtk-2.0/Images/Others/windtop.png'
Binary files New Wave/gtk-2.0/Images/Others/windtop.png	1970-01-01 00:00:00 +0000 and New Wave/gtk-2.0/Images/Others/windtop.png	2010-03-01 02:27:14 +0000 differ
=== added file 'New Wave/gtk-2.0/Images/Panel/PanelBarLongLight.png'
Binary files New Wave/gtk-2.0/Images/Panel/PanelBarLongLight.png	1970-01-01 00:00:00 +0000 and New Wave/gtk-2.0/Images/Panel/PanelBarLongLight.png	2010-03-01 02:27:14 +0000 differ
=== modified file 'New Wave/gtk-2.0/Images/Panel/p-active-prelight.png'
Binary files New Wave/gtk-2.0/Images/Panel/p-active-prelight.png	2009-08-08 02:13:58 +0000 and New Wave/gtk-2.0/Images/Panel/p-active-prelight.png	2010-03-01 02:27:14 +0000 differ
=== modified file 'New Wave/gtk-2.0/Images/Panel/p-active.png'
Binary files New Wave/gtk-2.0/Images/Panel/p-active.png	2009-08-08 02:13:58 +0000 and New Wave/gtk-2.0/Images/Panel/p-active.png	2010-03-01 02:27:14 +0000 differ
=== modified file 'New Wave/gtk-2.0/Images/Panel/p-prelight.png'
Binary files New Wave/gtk-2.0/Images/Panel/p-prelight.png	2009-08-08 02:13:58 +0000 and New Wave/gtk-2.0/Images/Panel/p-prelight.png	2010-03-01 02:27:14 +0000 differ
=== modified file 'New Wave/gtk-2.0/Images/ProgressBar/over-progressbar-horiz.png'
Binary files New Wave/gtk-2.0/Images/ProgressBar/over-progressbar-horiz.png	2009-08-08 02:13:58 +0000 and New Wave/gtk-2.0/Images/ProgressBar/over-progressbar-horiz.png	2010-03-01 02:27:14 +0000 differ
=== added file 'New Wave/gtk-2.0/Images/Scrollbars/shadow-in-gcalctool.png'
Binary files New Wave/gtk-2.0/Images/Scrollbars/shadow-in-gcalctool.png	1970-01-01 00:00:00 +0000 and New Wave/gtk-2.0/Images/Scrollbars/shadow-in-gcalctool.png	2010-03-01 02:27:14 +0000 differ
=== added file 'New Wave/gtk-2.0/Images/Shadows/entry-focus-panel-blue.png'
Binary files New Wave/gtk-2.0/Images/Shadows/entry-focus-panel-blue.png	1970-01-01 00:00:00 +0000 and New Wave/gtk-2.0/Images/Shadows/entry-focus-panel-blue.png	2010-03-01 02:27:14 +0000 differ
=== added file 'New Wave/gtk-2.0/Images/Shadows/entry-focus-panel-noir.png'
Binary files New Wave/gtk-2.0/Images/Shadows/entry-focus-panel-noir.png	1970-01-01 00:00:00 +0000 and New Wave/gtk-2.0/Images/Shadows/entry-focus-panel-noir.png	2010-03-01 02:27:14 +0000 differ
=== added file 'New Wave/gtk-2.0/Images/Shadows/entry-focus-panel-nopixmap.png'
Binary files New Wave/gtk-2.0/Images/Shadows/entry-focus-panel-nopixmap.png	1970-01-01 00:00:00 +0000 and New Wave/gtk-2.0/Images/Shadows/entry-focus-panel-nopixmap.png	2010-03-01 02:27:14 +0000 differ
=== modified file 'New Wave/gtk-2.0/Images/Shadows/entry-focus-panel.png'
Binary files New Wave/gtk-2.0/Images/Shadows/entry-focus-panel.png	2009-08-08 02:13:58 +0000 and New Wave/gtk-2.0/Images/Shadows/entry-focus-panel.png	2010-03-01 02:27:14 +0000 differ
=== added file 'New Wave/gtk-2.0/Images/Shadows/entry-shadow-in-panel-blue.png'
Binary files New Wave/gtk-2.0/Images/Shadows/entry-shadow-in-panel-blue.png	1970-01-01 00:00:00 +0000 and New Wave/gtk-2.0/Images/Shadows/entry-shadow-in-panel-blue.png	2010-03-01 02:27:15 +0000 differ
=== added file 'New Wave/gtk-2.0/Images/Shadows/entry-shadow-in-panel-noir.png'
Binary files New Wave/gtk-2.0/Images/Shadows/entry-shadow-in-panel-noir.png	1970-01-01 00:00:00 +0000 and New Wave/gtk-2.0/Images/Shadows/entry-shadow-in-panel-noir.png	2010-03-01 02:27:15 +0000 differ
=== added file 'New Wave/gtk-2.0/Images/Shadows/entry-shadow-in-panel-nopixmap.png'
Binary files New Wave/gtk-2.0/Images/Shadows/entry-shadow-in-panel-nopixmap.png	1970-01-01 00:00:00 +0000 and New Wave/gtk-2.0/Images/Shadows/entry-shadow-in-panel-nopixmap.png	2010-03-01 02:27:15 +0000 differ
=== modified file 'New Wave/gtk-2.0/Images/Shadows/entry-shadow-in-panel.png'
Binary files New Wave/gtk-2.0/Images/Shadows/entry-shadow-in-panel.png	2009-08-08 02:13:58 +0000 and New Wave/gtk-2.0/Images/Shadows/entry-shadow-in-panel.png	2010-03-01 02:27:15 +0000 differ
=== modified file 'New Wave/gtk-2.0/Images/Shadows/entry-shadow-in.png'
Binary files New Wave/gtk-2.0/Images/Shadows/entry-shadow-in.png	2009-08-08 02:13:58 +0000 and New Wave/gtk-2.0/Images/Shadows/entry-shadow-in.png	2010-03-01 02:27:15 +0000 differ
=== added file 'New Wave/gtk-2.0/Images/Shadows/shadow-etched-out-panel.png'
Binary files New Wave/gtk-2.0/Images/Shadows/shadow-etched-out-panel.png	1970-01-01 00:00:00 +0000 and New Wave/gtk-2.0/Images/Shadows/shadow-etched-out-panel.png	2010-03-01 02:27:15 +0000 differ
=== modified file 'New Wave/gtk-2.0/Images/Spin/spin-down-bg.png'
Binary files New Wave/gtk-2.0/Images/Spin/spin-down-bg.png	2009-08-08 02:13:58 +0000 and New Wave/gtk-2.0/Images/Spin/spin-down-bg.png	2010-03-01 02:27:15 +0000 differ
=== modified file 'New Wave/gtk-2.0/Images/Spin/spin-up-bg.png'
Binary files New Wave/gtk-2.0/Images/Spin/spin-up-bg.png	2009-08-08 02:13:58 +0000 and New Wave/gtk-2.0/Images/Spin/spin-up-bg.png	2010-03-01 02:27:15 +0000 differ
=== modified file 'New Wave/gtk-2.0/Images/Spin/text-entry.png' (properties changed: +x to -x)
Binary files New Wave/gtk-2.0/Images/Spin/text-entry.png	2009-08-08 02:13:58 +0000 and New Wave/gtk-2.0/Images/Spin/text-entry.png	2010-03-01 02:27:15 +0000 differ
=== modified file 'New Wave/gtk-2.0/Images/Tabs/tab-top-active.png'
Binary files New Wave/gtk-2.0/Images/Tabs/tab-top-active.png	2009-08-08 02:13:58 +0000 and New Wave/gtk-2.0/Images/Tabs/tab-top-active.png	2010-03-01 02:27:15 +0000 differ
=== modified file 'New Wave/gtk-2.0/Images/Tree/selected-active.png'
Binary files New Wave/gtk-2.0/Images/Tree/selected-active.png	2009-08-08 02:13:58 +0000 and New Wave/gtk-2.0/Images/Tree/selected-active.png	2010-03-01 02:27:15 +0000 differ
=== added file 'New Wave/gtk-2.0/Images/Tree/shadow-in.png'
Binary files New Wave/gtk-2.0/Images/Tree/shadow-in.png	1970-01-01 00:00:00 +0000 and New Wave/gtk-2.0/Images/Tree/shadow-in.png	2010-03-01 02:27:15 +0000 differ
=== modified file 'New Wave/gtk-2.0/gtkrc'
--- New Wave/gtk-2.0/gtkrc	2009-08-08 02:13:58 +0000
+++ New Wave/gtk-2.0/gtkrc	2010-03-01 02:27:14 +0000
@@ -1,7 +1,7 @@
 #
-#==========================================
-#	 New Wave Pixmap Theme
-#==========================================
+#==================================================================
+#	               New Wave Pixmap Theme
+#==================================================================
 #
 # 
 # Based on: Ubuntu Human-Clearlooks
@@ -12,20 +12,24 @@
 # Former Authors:
 # Giuseppe Pennisi <[e-mail]>
 #
-# Feel free to modify and share!
-# Licensed under Creative Commons 3.0 Attribution-Noncommercial-Share Alike
+# Licensed under Creative Commons 3.0 Attribution-Share Alike
+
+# You MUST attribute the derivative themes as:
+# "Based on the New Wave theme created by Anton Kerezov (dilomo)"
+# as well as provide a link to the original.
+#==================================================================
 #
 #---NWC-START---#
-# Version: 0.8.1 [29/07/09]
+# Version: 0.8.2 [12/12/2009]
 
 
 # Default color values used in Appearance Manager
-gtk_color_scheme = "fg_color: #101010\nbg_color: #E5E5E5\nbase_color: #FFFFFF\ntext_color: #1A1A1A\nselected_bg_color: #FF8F4C\nselected_fg_color: #1A1A1A\ntooltip_bg_color:#FFE6C4\ntooltip_fg_color:#330606"
-# so that we can use pulsation on windows that need attention
-gtk-enable-animations = 1   
-# This value has to be less than 990 for Rhythmbox to work (tooltips updating in 1sec intervals)
+gtk_color_scheme = "fg_color: #1A1A1A\nbg_color: #E5E5E5\nbase_color: #FFFFFF\ntext_color: #171717\nselected_bg_color:#FFB886\nselected_fg_color:  #1D1D1D\ntooltip_bg_color:#FFE6C4\ntooltip_fg_color:#452222"
+gtk-enable-animations = 1  # so that we can use pulsation on windows that need attention
+# This value has to be less than 990 for Rhythmbox to work (tooltips updating in 1 sec. intervals)
 gtk-tooltip-timeout = 970
 
+
 #---NWC-END---#
 
 #=========================================================
@@ -35,7 +39,7 @@
 {
 	xthickness = 1
 	ythickness = 1
-
+	
         #=========================================================
         # General Style Properties
         #=========================================================
@@ -68,7 +72,7 @@
 	# These lines enable the New Wave Configurator to modify them. Do not remove or change!
 	
 	GtkScrollbar   ::has-backward-stepper = 1
-	GtkScrollbar   ::has-forward-stepper  = 1
+	GtkScrollbar   ::has-forward-stepper = 1
 	GtkScrollbar   ::has-secondary-backward-stepper = 0
 	GtkScrollbar   ::has-secondary-forward-stepper = 0
 	#---NWC-END---#
@@ -83,6 +87,7 @@
 	GtkMenu        ::vertical-padding     = 1
 	GtkMenu        ::horizontal-offset    = -1
 	
+	
 	GtkExpander    ::expander-size        = 16
 	
 	GtkToolbar     ::internal-padding     = 2
@@ -98,14 +103,31 @@
 	
 	GtkProgressBar ::shadow-type          = GTK_SHADOW_NONE
 	
+	
+	#benzea: dilomo: BOX
+	#benzea: and the detail string is one of a couple
+
+	#benzea:     "infobar-info",
+	#benzea:     "infobar-warning",
+	#benzea:     "infobar-question",
+	#benzea:     "infobar-error",
+	#benzea:     "infobar"
+	
 	#---NWC-START---#
+	#Values used in the New Wave Configurator
+	
 	GtkWidget	::cursor-aspect-ratio = 0.05
-	
+
 	# This is the pulsating rect that appears on newly launched apps	
 	WnckTasklist   ::fade-overlay-rect    = 1
 	WnckTasklist   ::fade-opacity	      = 0.6
 	
-	NautilusIconContainer::highlight_alpha= 145
+	NautilusIconContainer::highlight_alpha= 120
+	
+	# The rect. when you drag the mouse to select several files
+	NautilusIconContainer::selection_box_color = "#EF9D6E"
+	NautilusIconContainer::selection_box_alpha = 60
+	
 	#---NWC-END---#
 
 	fg[NORMAL]        = @fg_color
@@ -116,14 +138,14 @@
 
 	bg[NORMAL]        = @bg_color
 	bg[PRELIGHT]      = shade (1.02, @bg_color)
-	bg[SELECTED]	  = mix (0.25, @fg_color, @selected_bg_color)
+	bg[SELECTED]	  = @selected_bg_color #mix (0.25, @fg_color, @selected_bg_color)
 	bg[INSENSITIVE]   = @bg_color
 	bg[ACTIVE]        = shade (0.9, @bg_color)
 
 	base[NORMAL]      = @base_color
 	base[PRELIGHT]    = shade (0.95, @bg_color)
 	base[ACTIVE]      = shade (0.90, @bg_color)
-	base[SELECTED]    = mix(0.50, shade (1.05,@selected_bg_color), @tooltip_bg_color)
+	base[SELECTED]    = @selected_bg_color #mix(0.50, shade (1.05,@selected_bg_color), @tooltip_bg_color)
 	base[INSENSITIVE] = @bg_color
 
 	text[NORMAL]      = @text_color
@@ -132,9 +154,76 @@
 	text[SELECTED]    = @selected_fg_color
 	text[INSENSITIVE] = darker (@bg_color)
 	
+	# Colors for the GtkInfobar themeing if you 
+	# don't want to theme them with images
+	
+	#color["error_bg_color"] = "black"
+	#color["error_fg_color"] = "white"
+	
+	#color["info_bg_color"] = "#9EDDFF"
+	#color["info_fg_color"] = "#ffffff"
+	
+	#color["warning_bg_color"] = "black"
+	#color["warning_fg_color"] = "white"
+	
+	#color["question_bg_color"] = "black"
+	#color["question_fg_color"] = "white"
+	
+	#color["other_bg_color"] = "black"
+	#color["other_fg_color"] = "white"
+	
 	
 	engine "pixmap"
 	{
+	# Info Bar
+	
+	image
+	{
+		function		= BOX
+		recolorable		= TRUE
+		detail 			= "infobar-info"
+		file			= "Images/Others/nautilus-infobar-overlay.png"
+		border			= { 2, 2, 2, 3}
+		stretch			= TRUE
+	}
+	
+	image
+	{
+		function		= BOX
+		recolorable		= TRUE
+		detail 			= "infobar-warning"
+		file			= "Images/Others/nautilus-infobar-overlay-warning.png"
+		border			= { 2, 2, 2, 3}
+		stretch			= TRUE
+	}
+	image
+	{
+		function		= BOX
+		recolorable		= TRUE
+		detail 			= "infobar-error"
+		file			= "Images/Others/nautilus-infobar-overlay-error.png"
+		border			= { 2, 2, 2, 3}
+		stretch			= TRUE
+	}
+	image
+	{
+		function		= BOX
+		recolorable		= TRUE
+		detail 			= "infobar-question"
+		file			= "Images/Others/nautilus-infobar-overlay-question.png"
+		border			= { 2, 2, 2, 3}
+		stretch			= TRUE
+	}
+	
+	image
+	{
+		function		= BOX
+		recolorable		= TRUE
+		detail 			= "infobar"
+		file			= "Images/Others/nautilus-infobar-overlay.png"
+		border			= { 2, 2, 2, 3}
+		stretch			= TRUE
+	}
 	
 	# Shadows 
 	
@@ -184,7 +273,7 @@
 		shadow			= IN 
 		recolorable		= TRUE
 		file			= "Images/Frame-Gap/frame-in.png"
-		border			={ 4, 4, 4,3}
+		border			={ 3, 3, 3, 3}
 		stretch			= TRUE
 		gap_start_file		= "Images/Frame-Gap/frame-gapstart-in.png"
 		gap_start_border	= { 4, 0, 4, 0}
@@ -201,12 +290,12 @@
 		shadow			= OUT
 		recolorable		= TRUE
 		file			= "Images/Frame-Gap/frame-out.png"
-		border			= { 4, 4, 4, 4}
+		border			= { 4, 4, 3, 4}
 		stretch			= TRUE
 		gap_start_file		= "Images/Frame-Gap/frame-gapstart-out.png"
-		gap_start_border	= { 4, 0, 4, 0}
+		gap_start_border	= { 3, 0, 2, 0}
 		gap_end_file		= "Images/Frame-Gap/frame-gapend-out.png"
-		gap_end_border		= { 0, 4, 4, 0}
+		gap_end_border		= { 0, 3, 2, 0}
 		gap_side		= TOP
 	}
 	
@@ -281,7 +370,7 @@
       	  	orientation		= HORIZONTAL
     	}
     	
-    	## vertical handle
+    	## Vertical handle
     	image
     	{
     	  	function		= HANDLE
@@ -334,17 +423,17 @@
       		function		= HLINE
      		recolorable		= TRUE
       		file			= "Images/Lines/line-h.png"
-      		#border			= { 1, 1, 0, 1 }
+      		border			= { 12, 12, 0, 1 }
       		stretch			= TRUE
       }
 	
-      #@author:dilomo@  focus image used on buttons any derivatives (check box, combo and so on) Now obsolate!
+      #@author:dilomo@  Focus image used on button's derivatives (check box, combo and so on)
       image
       {
     	  	function		= FOCUS
   		recolorable		= TRUE
    	 	file			= "Images/Others/focus.png"
-    		border			= { 2, 2, 2, 2 }
+    		border			= { 6, 6, 6, 6 }
     	 	stretch			= TRUE
       }
    	        
@@ -866,7 +955,8 @@
 	ythickness = 3
 }
 
-
+style "empty"
+{}
 
 
 #=========================================================
@@ -876,45 +966,154 @@
 #=========================================================
 
 
-
+# @author:dilomo@ This has to fix the Appearance manager crash
 style "newwave-window" = "newwave-wide"
-{	
-  engine "pixmap"
-  {
- 	image
-	{
-		function = FLAT_BOX
-                file = "Images/Others/null.png"
-                border = {2, 2, 2, 2}
-                detail = "base"
-		#stretch = TRUE
-
-	}
-  }
+{
+   bg_pixmap[NORMAL] = "Images/Others/null.png"
 }
 
-# Fix issues with Gedit in the statusbar
-style "newwave-frame" #= "newwave-wide"
+
+style "newwave-frame" = "newwave-wide"
 {	
-#  engine "pixmap"
+ # engine "pixmap"
  # {
  #	image
 #	{
 #		function = SHADOW
  #               file = "Images/Others/frame.png"
- #               border = {1, 1, 1, 1}
+ ##               border = {1, 1, 1, 1}
 #		stretch = TRUE
-#
+
 #	}
  # }
 }
 
+
+# Fix ugly frames with Gedit in the statusbar
+style "newwave-frame-gedit"
+{	
+  engine "pixmap"
+  {
+ 	image
+	{
+
+		function = SHADOW
+                file = "Images/Others/null.png"
+                #border = {1, 1, 1, 1}
+		#stretch = TRUE
+
+	}
+  }
+}
+
+style "newwave-frame-panel"
+{	
+  engine "pixmap"
+  {
+ 	image
+	{
+
+		function = SHADOW
+                file = "Images/Shadows/shadow-etched-out-panel.png"
+                border = {2, 2, 2, 2}
+		#stretch = TRUE
+
+	}
+  }
+}
+
+# Cool but the selected state is rather ugly and cannot be themed properly
+style "newwave-desktop-icon"
+{
+#1 for activate
+NautilusIconContainer::frame_text = 1
+NautilusIconContainer::light_info_color = "#DADADA"
+NautilusIconContainer::dark_info_color = "#101010"
+NautilusIconContainer::prelight_icon_render_mode = 1
+NautilusIconContainer::activate_prelight_icon_label = 1
+
+base[NORMAL] = "black"
+base[PRELIGHT] = "black"
+base[SELECTED] = "black" #"#7C3320"
+base[ACTIVE] = "white"
+
+text[NORMAL] = "white"
+text[PRELIGHT] = "white"
+text[SELECTED] = "white"
+NautilusIconContainer::normal_alpha = 60
+NautilusIconContainer::prelight_alpha = 80
+NautilusIconContainer::highlight_alpha = 90
+}
+
+style "newwave-desktop-icon-focus"
+{
+ engine "pixmap"
+  {
+  image
+      {
+    	  	function		= FOCUS
+  		recolorable		= TRUE
+   	 	file			= "Images/Others/focus.png"
+    		border			= { 2, 2, 2, 2 }
+    	 	stretch			= TRUE
+      }
+     }
+}
+
+#widget_class "*DesktopIcon*" style "newwave-desktop-icon"
+
+
+#=========================================================
+# Icon View
+#=========================================================
+
+# Theme the iconview selected items
+style "newwave-iconview"
+{
+	#GtkIconView::selection-box-color	= "black"
+	#GtkIconView::selection-box-alpha 	= 60
+	
+ engine "pixmap"
+  {
+  image
+      {
+    	  	function		= FLAT_BOX
+  		recolorable		= TRUE
+   	 	file			= "Images/Others/iconview-item.png"
+    		border			= {3, 3, 3, 3 }
+    	 	stretch			= TRUE
+      }
+
+   }
+}
+
+widget_class "*IconView" style "newwave-iconview"
+
+
+
+#=========================================================
+# Assistant (Wizard windows)
+#=========================================================
+
+# Theme properly the assistant 
+style "newwave-assistant"
+{
+	bg[SELECTED] ="#9A9A9A"#"#484848"
+	fg[SELECTED] ="#F3F3F3"# "#ECECEC"
+}
+
+widget_class "*Assistant*" style "newwave-assistant"
+
+
+
 #=========================================================
 # Buttons
 #=========================================================
 
 style "newwave-button" = "newwave-wider"
 { 
+	#xthickness = 4
+	#ythickness = 4
 
 	bg[NORMAL]        = shade (0.98, @bg_color)
 	bg[PRELIGHT]      = shade (1.04, @bg_color)
@@ -931,12 +1130,12 @@
 	GtkButton::child_displacement_y = 1
 	
 	# Increase because focus padding is zero
-	GtkButton::inner-border =  {2, 2, 2, 2}
+	GtkButton::inner-border =  {2, 2,2, 2}
 	
 	# Use to show glow around default buttons
 	GtkButton::default-border = { 3, 3, 3, 3}
 	GtkButton::default-outside-border = { 3, 3, 3, 3}
-
+	#GtkWidget::draw-border = {3,3,3,3}
  
 	engine "pixmap"
 	{
@@ -959,8 +1158,9 @@
 		function		= BOX
 		state			= NORMAL
 		shadow			= OUT
+
 		file			= "Images/Buttons/button-normal.png"		
-		border			={ 4, 4, 4, 4 }
+		border			= {4, 4, 4, 4}
 		stretch			= TRUE
 	}
 
@@ -969,6 +1169,7 @@
 	{
 		function		= BOX
 		state			= NORMAL
+		#shadow			= IN
 		detail			= "buttondefault"
 		file			= "Images/Buttons/button-default.png"		
 		border			={ 4, 4, 4, 4 }
@@ -981,7 +1182,7 @@
 		function		= BOX
 		state			= ACTIVE
 		file			= "Images/Buttons/button-pressed.png"
-		border			= { 4, 4, 4, 4 }
+		border			={4, 4, 4, 4}
 		stretch			= TRUE
 	}
 	
@@ -995,7 +1196,7 @@
 		recolorable		= TRUE
 		shadow			= IN
 		file			= "Images/Buttons/button-pressed-prelight.png"
-		border			= { 4, 4, 4, 4 }
+		border			= {4, 4, 4, 4}
 		stretch			= TRUE
 	}
 	#@author:dilomo@ prelight used on normal buttons
@@ -1006,7 +1207,7 @@
 		recolorable		= TRUE
 		shadow			= OUT
 		file			= "Images/Buttons/button-prelight.png"
-		border			= { 4, 4, 4, 4 }
+		border			= {4, 4, 4, 4}
 		stretch			= TRUE
 	}
 	
@@ -1016,7 +1217,7 @@
 		state			= INSENSITIVE
 		shadow			= IN
 		file			= "Images/Buttons/button-insensitive-in.png"	
-		border			= { 4, 4, 4, 4 }
+		border			= {4, 4, 4, 4}
 		stretch			= TRUE
 	}
 
@@ -1026,14 +1227,23 @@
 		state			= INSENSITIVE
 		shadow			= OUT
 		file			= "Images/Buttons/button-insensitive.png"	
-		border			= { 4, 4, 4, 4 }
+		border			= {4, 4, 4, 4}
+		stretch			= TRUE
+	}
+	image 
+	{
+		function		= BOX
+		state			= INSENSITIVE
+		#shadow			= IN
+		detail			= "buttondefault"
+		file			= "Images/Buttons/button-default-insensitive.png"		
+		border			={4, 4, 4, 4}
 		stretch			= TRUE
 	}
 	
 		
     }
 }
-
 #=========================================================
 # Progressbar
 #=========================================================
@@ -1041,7 +1251,12 @@
 {
   xthickness            		= 1
   ythickness            		= 1
-
+  
+  fg[NORMAL] = "#555555"
+  fg[ACTIVE] = "#555555"
+  fg[SELECTED] = "#555555"
+  fg[PRELIGHT] = "#360000"
+  
   engine "pixmap" 
   {
 	image
@@ -1333,8 +1548,6 @@
             overlay_stretch 		= FALSE
         }
 
-
-
 	# Overlay image
   	image 
 	{
@@ -2012,7 +2225,7 @@
         }
 
 
-	# Steppers - right
+	# Steppers OO - right
         #=============================
         image 
         {
@@ -2063,7 +2276,7 @@
         }
 
         
-        # Steppers - left
+        # Steppers OO - left
         #=============================
         image 
         {
@@ -2149,7 +2362,6 @@
 }
 class "GtkScrolledWindow" style "newwave-scrolledwindow"
 
-
 #=========================================================
 # Toolbar
 #=========================================================
@@ -2157,7 +2369,7 @@
 {
         xthickness            			= 2
         ythickness            			= 3
-  
+	
 	engine "pixmap"
 	{
 
@@ -2178,6 +2390,8 @@
 			stretch		= TRUE
     		}
  	}
+ 	
+ 	
 }
 style "newwave-toolbar-handle"
 {
@@ -2272,6 +2486,7 @@
 
 style "newwave-toolbuttons" = "newwave-button"
 {
+        
 engine "pixmap" {
       
 
@@ -2551,7 +2766,7 @@
  GtkSpinButton::page-size		 	= 0
  GtkWidget::interior_focus			= 0
  GtkWidget::internal-padding 			= 3
- GtkSpinButton::shadow-type			= GTK_SHADOW_IN
+ #GtkEntry::inner-border        = {0, 0, 1, 1}
   
   engine "pixmap"
   {
@@ -2668,33 +2883,25 @@
 
     # Spin - entry (textbox)
     #=============================
-    image
+    
+	image
 	{
 		function		= FOCUS
 		recolorable		= TRUE
+		detail			= "entry"
 		file			= "Images/Spin/text-entry-focus.png"
 		border			= { 2, 2, 3, 3}
 		stretch			= TRUE
 	}	
     
-    image
-	{
-		function	        = BOX
-		recolorable	        = TRUE
-		shadow		        = IN
-		state		        = NORMAL
-		detail		        = "entry"
-		file		        = "Images/Spin/text-entry.png"
-		border		        = { 2 , 2 ,3 ,3 }
-		stretch		        = TRUE
-	}
+      
 
-    image
+        image
 	{
 		function		= SHADOW
+		shadow			= IN
 		state			= NORMAL
-		shadow			= IN
-		recolorable		= TRUE
+		recolorable		= FALSE
 		detail			= "entry"
 		file			= "Images/Spin/text-entry.png"
 		border			= { 2, 2, 2, 2}
@@ -2714,6 +2921,7 @@
 {
   # Makes the button of the combo to have interior focus
   GtkButton::interior_focus			= 0
+  GtkButton::inner-border = {1, 1, 1, 1}
 
   engine "pixmap"
   {
@@ -2899,9 +3107,7 @@
   #@author:dilomo@ Disable outer focus glow because it look ugly in comboboxes and spins
   GtkWidget::interior_focus	= 0
   GtkEntry::inner-border        = {2, 2, 1, 1}
-  
 
-  
   engine "pixmap"
   {
     
@@ -2983,6 +3189,8 @@
 
 style "newwave-panel-entry" = "newwave-entry"
 {
+	#base[NORMAL] = "#CECECE"
+	
   engine "pixmap"
   {
     
@@ -3054,9 +3262,228 @@
     }  
  }
 }
-# Match the entries that might appear in the gnome panel as well as the dictionary applet
-widget_class "*Panel*Entry*" style :highest "newwave-panel-entry"
-widget_class "*GdictApp*Entry*" style :highest "newwave-panel-entry"
+
+style "newwave-panel-entry-blue" = "newwave-entry"
+{
+  engine "pixmap"
+  {
+    
+    # i'm unsure about these
+    image
+    {
+      function			= BOX
+      recolorable		= TRUE
+      shadow			= IN
+      state			= NORMAL
+      file			= "Images/Shadows/entry-shadow-in-panel-blue.png"
+      border			= { 3,3,4,3 }
+      stretch			= TRUE
+    }	
+    image
+    {
+     function			= BOX
+      recolorable		= TRUE
+      shadow			= OUT
+      state			= NORMAL
+      file			= "Images/Shadows/entry-shadow-in-panel-blue.png" 
+      border			= { 3,3,4,3 }
+      stretch			= TRUE
+    }
+    image	
+    {
+      function			= BOX
+      recolorable		= TRUE
+      shadow			= OUT
+      state			= ACTIVE
+      file			= "Images/Shadows/entry-focus-panel-blue.png"
+      border			= { 2,2,2,2 }
+      stretch			= TRUE
+    }
+    image	
+    {
+      function			= BOX
+      recolorable		= TRUE
+      shadow			= IN
+      state			= INSENSITIVE
+      file			= "Images/Shadows/entry-focus-panel-blue.png"
+      border			= { 2,2,2,2 }
+      stretch			= TRUE
+    }
+    
+    
+    # Glow image when selected
+    image
+    {
+      function			= FOCUS
+      recolorable		= TRUE
+      detail			= "entry"
+      file			= "Images/Shadows/entry-focus-panel-blue.png"
+      border			= {3, 3, 4, 3}
+      stretch			= TRUE
+    }	
+
+    # the actual textbox in normal state
+    image
+    {
+     	function		= SHADOW
+    	detail			= "entry"
+    	shadow			= IN
+	state			= NORMAL
+    	recolorable		= FALSE
+    	file			= "Images/Shadows/entry-shadow-in-panel-blue.png"
+    	border			= { 2,2,2,2 }
+    	stretch			= TRUE
+    }  
+ }
+}
+
+style "newwave-panel-entry-nopixmap" = "newwave-entry"
+{ # Nopixmap isn't really the lack of image but just to match with the panel theme name
+  engine "pixmap"
+  {
+    
+    # i'm unsure about these
+    image
+    {
+      function			= BOX
+      recolorable		= TRUE
+      shadow			= IN
+      state			= NORMAL
+      file			= "Images/Shadows/entry-shadow-in-panel-nopixmap.png"
+      border			= { 3,3,4,3 }
+      stretch			= TRUE
+    }	
+    image
+    {
+     function			= BOX
+      recolorable		= TRUE
+      shadow			= OUT
+      state			= NORMAL
+      file			= "Images/Shadows/entry-shadow-in-panel-nopixmap.png" 
+      border			= { 3,3,4,3 }
+      stretch			= TRUE
+    }
+    image	
+    {
+      function			= BOX
+      recolorable		= TRUE
+      shadow			= OUT
+      state			= ACTIVE
+      file			= "Images/Shadows/entry-focus-panel-nopixmap.png"
+      border			= { 2,2,2,2 }
+      stretch			= TRUE
+    }
+    image	
+    {
+      function			= BOX
+      recolorable		= TRUE
+      shadow			= IN
+      state			= INSENSITIVE
+      file			= "Images/Shadows/entry-focus-panel-nopixmap.png"
+      border			= { 2,2,2,2 }
+      stretch			= TRUE
+    }
+    
+    
+    # Glow image when selected
+    image
+    {
+      function			= FOCUS
+      recolorable		= TRUE
+      detail			= "entry"