Merge pull request #37 from NiceandGently/master

update Menta GTK-2/3 to latest Zukwito update from 2013.03.29 to support GTK3-3.8

11 files changed, 302 insertions, 50 deletions

diff --git a/desktop-themes/Menta/gtk-2.0/gtkrc b/desktop-themes/Menta/gtk-2.0/gtkrc
index 8c488da4..f8ff9629 100644
--- a/desktop-themes/Menta/gtk-2.0/gtkrc
+++ b/desktop-themes/Menta/gtk-2.0/gtkrc
@@ -9,12 +9,12 @@
 

 # NOTE: Uncommenting means to delete the "#" at the beginning of a line. Commenting means to add a "#" at the beginning of a line. The "#" tells the theme wether to ignore the specified line or not.

 

-# These are the defined colors for the theme, you can change them in GNOME's appearance preferences.

+# These are the defined colors for the theme, you can change them in MATE's appearance preferences.

 gtk_color_scheme = "bg_color:#dcdcdc\nselected_bg_color:#accd8a\nbase_color:#f7f7f7" # Background, base.

 gtk_color_scheme = "fg_color:#2c2c2c\nselected_fg_color:#f5f5f5\ntext_color:#2c2c2c" # Foreground, text.

 gtk_color_scheme = "tooltip_bg_color:#F5F5B5\ntooltip_fg_color:#000000" # Tooltips.

 gtk_color_scheme = "link_color:#08c" # Hyperlinks

-gtk_color_scheme = "bg_color_dark:#383838\ntext_color_dark:#FFF" # Dark colors

+gtk_color_scheme = "bg_color_dark:#3f3f3f\ntext_color_dark:#FFF" # Dark colors

 

 ### EXTERNAL FILES ###

 # This includes the file that handles the panels with a light grey background.

@@ -72,8 +72,8 @@ style "murrine-default" {
 	GtkRange	::stepper_spacing		= 0

 	GtkRange	::trough-under-steppers		= 0

 

-	GtkScale	::slider-length			= 14

-	GtkScale	::slider-width			= 14

+	GtkScale	::slider-length			= 16

+	GtkScale	::slider-width			= 16

 

 	GtkMenuBar	::internal-padding		= 0

 	GtkExpander	::expander-size			= 16

@@ -95,8 +95,8 @@ style "murrine-default" {
 	GtkEntry	::state-hint			= 0

 	GtkEntry	::progress-border		= { 2, 2, 2, 2 }

 

-	GtkProgressBar	::min-horizontal-bar-height	= 10

-	GtkProgressBar	::min-vertical-bar-width	= 10

+	GtkProgressBar	::min-horizontal-bar-height	= 16

+	GtkProgressBar	::min-vertical-bar-width	= 16

 	

 	#GtkToolbar	::shadow-type = GTK_SHADOW_NONE # Makes toolbars flat and unified.

 	#GtkMenuBar	::shadow-type = GTK_SHADOW_NONE # Makes menus flat and unified.

@@ -138,7 +138,7 @@ style "murrine-default" {
 	engine "murrine" {

 		animation		= FALSE

 		arrowstyle		= 1			# 0 = normal arrows, 1 = filled arrows		

-		border_shades		= {1.0, 0.7}		# gradient to draw on border		

+		border_shades		= {1.0, 0.8}		# gradient to draw on border		

 		colorize_scrollbar	= FALSE		

 		comboboxstyle		= 0			# 0 = normal combobox, 1 = colorized combobox below arrow		

 		contrast		= 0.4 			# 0.8 for less contrast, more than 1.0 for more contrast on borders

@@ -146,8 +146,8 @@ style "murrine-default" {
 		focus_color		= @selected_bg_color

 		focusstyle		= 3

 		glazestyle		= 1			# 0 = flat highlight, 1 = curved highlight, 2 = concave style, 3 = top curved highlight, 4 = beryl highlight

-		gradient_shades		= {1.1,1.1,0.95,0.95}	# Sets the gradients on the widgets.

-		glowstyle		= 4			# 0,1,2,3,4

+		gradient_shades		= {1.1,1.1,0.94,0.94}	# Sets the gradients on the widgets.

+		glowstyle		= 0			# 0,1,2,3,4

 		glow_shade		= 1.1

 		highlight_shade		= 1.0			# set highlight amount for buttons or widgets

 		lightborder_shade	= 1.1			# sets lightborder amount for buttons or widgets

@@ -166,7 +166,7 @@ style "murrine-default" {
 		separatorstyle		= 1			# 0 = Hard seperators 1 = Smooth seperators

 		sliderstyle		= 0			# 0 = nothing added, 1 = handles

 		stepperstyle		= 1			# 0 = standard, 1 = integrated stepper handles, 2 = unknown

-		progressbarstyle	= 0			# 0 = nothing, 1 = stripes, 2 = lines

+		progressbarstyle	= 1			# 0 = nothing, 1 = stripes, 2 = lines

 		shadow_shades		= {0.5, 0.0}		# gradient for shadows.		

 		textstyle		= 0			# 0 = normal text, 1 = inset		

 		toolbarstyle		= 2			# 0 = flat, 1 = glassy, 2 = gradient		

@@ -225,7 +225,9 @@ style "murrine-button" = "murrine-wider" {
   	engine "murrine" {

 		contrast		= .8

 		lightborder_shade	= 1.9

-		roundness		= 1

+		roundness		= 2

+		border_shades		= {0.95, 0.8}

+		shadow_shades		= {1.0, 0.1}

 	}

 }

 

@@ -244,6 +246,7 @@ style "murrine-notebook" = "murrine-notebook-bg" {
 		gradient_shades		= {1.28,1.28,0.87,0.87}

 		focusstyle		= 2

 		lightborder_shade	= 1.16

+		roundness		= 4

 	}

 }

 

@@ -361,7 +364,7 @@ style "murrine-progressbar" = "murrine-thin" {
 		trough_shades		= { 1.06, 1.16}

 		gradient_shades		= {0.95,0.95,1.1,1.1}

 		border_shades		= { 1.1, 1.1 }

-		roundness		= 0

+		roundness		= 20

 	}

 }

 

@@ -390,6 +393,111 @@ style "murrine-scale" = "murrine-wider" {
 	}

 }

 

+style "pixmap-scale" {

+	engine "pixmap" {

+	image

+		{

+			function	= BOX

+			detail		= "trough"

+			file		= "widgets/Scale/trough-horizontal.png"

+			border		= { 2, 2, 0, 0 }

+			stretch		= TRUE

+			orientation	= HORIZONTAL

+		}

+	image

+		{

+			function	= BOX

+			detail		= "trough"

+			file		= "widgets/Scale/trough-vertical.png"

+			border		= { 0, 0, 2, 2 }

+			stretch		= TRUE

+			orientation	= VERTICAL

+		}

+

+# Horizontal

+

+	image

+		{

+			function	= SLIDER

+			state           = NORMAL

+			file		= "widgets/Others/null.png"

+			border		= { 0, 0, 0, 0 }

+			stretch		= FALSE

+			overlay_file	= "widgets/Scale/slider.png"

+			overlay_stretch	= FALSE

+			orientation	= HORIZONTAL

+		}

+	image

+		{

+			function	= SLIDER

+			state           = PRELIGHT

+			file		= "widgets/Others/null.png"

+			border		= { 0, 0, 0, 0 }

+			stretch		= FALSE

+			overlay_file	= "widgets/Scale/slider-hover.png"

+			overlay_stretch	= FALSE

+			orientation	= HORIZONTAL

+		}

+	image

+		{

+			function	= SLIDER

+			state           = INSENSITIVE

+			file		= "widgets/Others/null.png"

+			border		= { 0, 0, 0, 0 }

+			stretch		= FALSE

+			overlay_file	= "widgets/Scale/slider-ins.png"

+			overlay_stretch	= FALSE

+			orientation	= HORIZONTAL

+		}

+

+# Vertical

+

+	image

+		{

+			function	= SLIDER

+			state           = NORMAL

+			file		= "widgets/Others/null.png"

+			border		= { 0, 0, 0, 0 }

+			stretch		= FALSE

+			overlay_file	= "widgets/Scale/slider.png"

+			overlay_stretch	= FALSE

+			orientation	= VERTICAL

+		}

+	image

+		{

+			function	= SLIDER

+			state           = PRELIGHT

+			file		= "widgets/Others/null.png"

+			border		= { 0, 0, 0, 0 }

+			stretch		= FALSE

+			overlay_file	= "widgets/Scale/slider-hover.png"

+			overlay_stretch	= FALSE

+			orientation	= VERTICAL

+		}

+	image

+		{

+			function	= SLIDER

+			state           = INSENSITIVE

+			file		= "widgets/Others/null.png"

+			border		= { 0, 0, 0, 0 }

+			stretch		= FALSE

+			overlay_file	= "widgets/Scale/slider-ins.png"

+			overlay_stretch	= FALSE

+			orientation	= VERTICAL

+		}

+

+# Function below removes ugly boxes

+	image

+		{

+			function	= BOX

+			file        	= "widgets/Others/null.png"

+			border      	= { 3, 3, 3, 3 }

+			stretch         = TRUE

+		}

+

+	}

+}

+

 style "murrine-scrollbar" {

 	bg[NORMAL]	= shade (0.90, @bg_color)

 	bg[SELECTED]	= shade (0.6, @base_color)

@@ -484,9 +592,9 @@ class "GtkIconView"	style "murrine-default"
 class "GtkToolbar"	style "murrine-toolbar"

 

 class "GtkSpinButton"	style "murrine-spinbutton"

-class "GtkScale"	style "murrine-scale"

-class "GtkVScale"	style "murrine-scale"

-class "GtkHScale"	style "murrine-scale"

+class "GtkScale"	style "pixmap-scale"

+class "GtkVScale"	style "pixmap-scale"

+class "GtkHScale"	style "pixmap-scale"

 

 class "GtkScrollbar"	style "murrine-scrollbar"

 class "GtkVScrollbar"	style "murrine-scrollbar"

diff --git a/desktop-themes/Menta/gtk-2.0/widgets/Makefile.am b/desktop-themes/Menta/gtk-2.0/widgets/Makefile.am
index 74355a23..75239e33 100644
--- a/desktop-themes/Menta/gtk-2.0/widgets/Makefile.am
+++ b/desktop-themes/Menta/gtk-2.0/widgets/Makefile.am
@@ -12,9 +12,11 @@ EXTRA_DIST = $(theme_DATA)
 SUBDIRS = \
 	Panel \
 	Null \
-	Others
+	Others \
+	Scale
 
 DIST_SUBDIRS = \
 	Panel \
 	Null \
-	Others
+	Others \
+	Scale
diff --git a/desktop-themes/Menta/gtk-2.0/widgets/Scale/Makefile.am b/desktop-themes/Menta/gtk-2.0/widgets/Scale/Makefile.am
new file mode 100644
index 00000000..5032ef78
--- /dev/null
+++ b/desktop-themes/Menta/gtk-2.0/widgets/Scale/Makefile.am
@@ -0,0 +1,12 @@
+
+themedir = $(datadir)/themes/Menta/gtk-2.0/widgets/Scale
+
+theme_DATA = \
+	slider.png \
+	slider-hover.png \
+	slider-ins.png \
+	trough-horizontal.png \
+	trough-vertical.png
+
+EXTRA_DIST = $(theme_DATA)
+
diff --git a/desktop-themes/Menta/gtk-2.0/widgets/Scale/slider-hover.png b/desktop-themes/Menta/gtk-2.0/widgets/Scale/slider-hover.png
new file mode 100644
index 00000000..72c5437b
--- /dev/null
+++ b/desktop-themes/Menta/gtk-2.0/widgets/Scale/slider-hover.png
diff --git a/desktop-themes/Menta/gtk-2.0/widgets/Scale/slider-ins.png b/desktop-themes/Menta/gtk-2.0/widgets/Scale/slider-ins.png
new file mode 100644
index 00000000..f31f5c90
--- /dev/null
+++ b/desktop-themes/Menta/gtk-2.0/widgets/Scale/slider-ins.png
diff --git a/desktop-themes/Menta/gtk-2.0/widgets/Scale/slider.png b/desktop-themes/Menta/gtk-2.0/widgets/Scale/slider.png
new file mode 100644
index 00000000..3fdda2c9
--- /dev/null
+++ b/desktop-themes/Menta/gtk-2.0/widgets/Scale/slider.png
diff --git a/desktop-themes/Menta/gtk-2.0/widgets/Scale/trough-horizontal.png b/desktop-themes/Menta/gtk-2.0/widgets/Scale/trough-horizontal.png
new file mode 100644
index 00000000..2de30503
--- /dev/null
+++ b/desktop-themes/Menta/gtk-2.0/widgets/Scale/trough-horizontal.png
diff --git a/desktop-themes/Menta/gtk-2.0/widgets/Scale/trough-vertical.png b/desktop-themes/Menta/gtk-2.0/widgets/Scale/trough-vertical.png
new file mode 100644
index 00000000..333de7cc
--- /dev/null
+++ b/desktop-themes/Menta/gtk-2.0/widgets/Scale/trough-vertical.png
diff --git a/desktop-themes/Menta/gtk-2.0/widgets/panel-black.rc b/desktop-themes/Menta/gtk-2.0/widgets/panel-black.rc
index ffe8155c..aed20d83 100644
--- a/desktop-themes/Menta/gtk-2.0/widgets/panel-black.rc
+++ b/desktop-themes/Menta/gtk-2.0/widgets/panel-black.rc
@@ -6,12 +6,34 @@ style "theme-panel"
 # Disable (comment out) for normal panel backgrounds or to get a transparancy panel.
 	bg_pixmap[NORMAL] = "/Panel/panel-bg-black.png"
 
-	fg[NORMAL]	= "#F7F7F7"
-	fg[PRELIGHT]	= "#2C5C31"
-	fg[ACTIVE]	= "#F7F7F7"
-	text[NORMAL]	= "#F7F7F7"
-	text[PRELIGHT]	= "#2C5C31"
-	text[ACTIVE]	= "#F7F7F7"
+	base[NORMAL]		= @bg_color
+	base[PRELIGHT]		= shade (1.06, @bg_color)
+	base[INSENSITIVE]	= @bg_color
+	bg[NORMAL]			= @bg_color_dark
+	bg[PRELIGHT]		= shade (1.20, @bg_color_dark)
+	bg[SELECTED]		= shade (0.90, @selected_bg_color)
+	bg[INSENSITIVE]		= @bg_color_dark
+	bg[ACTIVE]			= shade (0.8, @bg_color_dark)
+	fg[NORMAL]			= "#F7F7F7"
+	fg[PRELIGHT]		= "#2C5C31"
+	fg[SELECTED]		= @selected_fg_color
+	fg[ACTIVE]			= "#F7F7F7"
+	fg[INSENSITIVE]		= "#f0f0f0"
+	text[NORMAL]		= "#F7F7F7"
+	text[PRELIGHT]		= "#2C5C31"
+	text[ACTIVE]		= "#F7F7F7"
+	text[SELECTED]		= @selected_fg_color
+	text[INSENSITIVE]	= "#f0f0f0"
+ 	
+	engine "murrine" {
+	}
+}
+
+style "theme-panel-buttons"
+{
+# Disable (comment out) for normal panel backgrounds or to get a transparancy panel.
+	bg_pixmap[NORMAL] = "/Panel/panel-bg-black.png"
+
 	
 	engine "pixmap" {
 		image {
@@ -105,8 +127,11 @@ widget "*indicator-applet*"		style "theme-panel"
 class "PanelApp*"			style "theme-panel"
 class "PanelToplevel*"			style "theme-panel"
 widget_class "*PanelToplevel*"		style "theme-panel"
-widget_class "*notif*"			style "theme-panel"
-widget_class "*Notif*"			style "theme-panel"
+widget_class "*PanelFrame*" 		style "theme-panel"
+widget_class "*PanelAppletFrame*" 	style "theme-panel"
+widget_class "*PanelWidget*.*"		style "theme-panel"
+#widget_class "*notif*"			style "theme-panel"
+#widget_class "*Notif*"			style "theme-panel"
 widget_class "*Tray*"			style "theme-panel" 
 widget_class "*tray*"			style "theme-panel"
 widget_class "*computertemp*"		style "theme-panel"
@@ -121,10 +146,20 @@ widget_class "*Notif*Brasero*"	style "theme-panel-light"
 widget "*Xfce*Panel*"	style "theme-panel"
 class "*Xfce*Panel*"	style "theme-panel"
 
+# Panel buttons
+widget_class "*Panel*GtkToggleButton"	style:highest "theme-panel-buttons"
+#widget_class "*Panel*GtkButton"	style:highest "theme-panel-buttons"
+
+# XFCE panel buttons
+widget "*Xfce*Panel*Button*"	style:highest "theme-panel-buttons"
+class "*Xfce*Panel*Button*"	style:highest "theme-panel-buttons"
+widget_class "*LauncherPlugin*"	style:highest "theme-panel-buttons"
+widget_class "*ActionsPlugin*"	style:highest "theme-panel-buttons"
+
 # lxpanel and fbpanel
-widget "*.tclock.*"		style "theme-panel"
-widget "*.taskbar.*"		style "theme-panel"
-widget_class "*GtkBgbox*"	style "theme-panel"
+widget "*.tclock.*"		style "theme-panel-buttons"
+widget "*.taskbar.*"		style "theme-panel-buttons"
+widget_class "*GtkBgbox*"	style "theme-panel-buttons"
 
 # Make sure panel text color doesn't change
 widget_class "*Panel*MenuBar*"		style "theme-main-menu-text"
@@ -159,3 +194,12 @@ engine "pixmap" {
 }
 
 widget_class "*PanelToplevel*" style "panel-arrow-remove"
+
+# Fix xfce-notifyd button
+style "xfce-notifyd-button" {
+	fg[NORMAL]	= @text_color
+	fg[PRELIGHT]	= @text_color
+	fg[ACTIVE]	= @text_color
+}
+
+widget_class "XfceNotifyWindow.*.GtkButton*" style "xfce-notifyd-button"
diff --git a/desktop-themes/Menta/gtk-2.0/widgets/panel-dark-grey.rc b/desktop-themes/Menta/gtk-2.0/widgets/panel-dark-grey.rc
index 5d0ccad2..e614c21b 100644
--- a/desktop-themes/Menta/gtk-2.0/widgets/panel-dark-grey.rc
+++ b/desktop-themes/Menta/gtk-2.0/widgets/panel-dark-grey.rc
@@ -6,12 +6,33 @@ style "theme-panel"
 # Disable (comment out) for normal panel backgrounds or to get a transparancy panel.
 	bg_pixmap[NORMAL] = "/Panel/panel-bg-dark-grey.png"
 
-	fg[NORMAL]	= "#F7F7F7"
-	fg[PRELIGHT]	= "#2C5C31"
-	fg[ACTIVE]	= "#F7F7F7"
-	text[NORMAL]	= "#F7F7F7"
-	text[PRELIGHT]	= "#2C5C31"
-	text[ACTIVE]	= "#F7F7F7"
+	base[NORMAL]		= @bg_color
+	base[PRELIGHT]		= shade (1.06, @bg_color)
+	base[INSENSITIVE]	= @bg_color
+	bg[NORMAL]			= "#80867A"
+	bg[PRELIGHT]		= shade (1.20, "#80867A")
+	bg[SELECTED]		= shade (0.90, @selected_bg_color)
+	bg[INSENSITIVE]		= "#80867A"
+	bg[ACTIVE]			= shade (0.8, "#80867A")
+	fg[NORMAL]			= "#F7F7F7"
+	fg[PRELIGHT]		= "#2C5C31"
+	fg[SELECTED]		= @selected_fg_color
+	fg[ACTIVE]			= "#F7F7F7"
+	fg[INSENSITIVE]		= "#f0f0f0"
+	text[NORMAL]		= "#F7F7F7"
+	text[PRELIGHT]		= "#2C5C31"
+	text[ACTIVE]		= "#F7F7F7"
+	text[SELECTED]		= @selected_fg_color
+	text[INSENSITIVE]	= "#f0f0f0"
+	
+	engine "murrine" {
+	}
+}
+
+style "theme-panel-buttons"
+{
+# Disable (comment out) for normal panel backgrounds or to get a transparancy panel.
+	bg_pixmap[NORMAL] = "/Panel/panel-bg-dark-grey.png"
 	
 	engine "pixmap" {
 		image {
@@ -105,8 +126,11 @@ widget "*indicator-applet*"		style "theme-panel"
 class "PanelApp*"			style "theme-panel"
 class "PanelToplevel*"			style "theme-panel"
 widget_class "*PanelToplevel*"		style "theme-panel"
-widget_class "*notif*"			style "theme-panel"
-widget_class "*Notif*"			style "theme-panel"
+widget_class "*PanelFrame*" 		style "theme-panel"
+widget_class "*PanelAppletFrame*" 	style "theme-panel"
+widget_class "*PanelWidget*.*"		style "theme-panel"
+#widget_class "*notif*"			style "theme-panel"
+#widget_class "*Notif*"			style "theme-panel"
 widget_class "*Tray*"			style "theme-panel" 
 widget_class "*tray*"			style "theme-panel"
 widget_class "*computertemp*"		style "theme-panel"
@@ -121,10 +145,20 @@ widget_class "*Notif*Brasero*"	style "theme-panel-light"
 widget "*Xfce*Panel*"	style "theme-panel"
 class "*Xfce*Panel*"	style "theme-panel"
 
+# Panel buttons
+widget_class "*Panel*GtkToggleButton"	style:highest "theme-panel-buttons"
+#widget_class "*Panel*GtkButton"	style:highest "theme-panel-buttons"
+
+# XFCE panel buttons
+widget "*Xfce*Panel*Button*"	style:highest "theme-panel-buttons"
+class "*Xfce*Panel*Button*"	style:highest "theme-panel-buttons"
+widget_class "*LauncherPlugin*"	style:highest "theme-panel-buttons"
+widget_class "*ActionsPlugin*"	style:highest "theme-panel-buttons"
+
 # lxpanel and fbpanel
-widget "*.tclock.*"		style "theme-panel"
-widget "*.taskbar.*"		style "theme-panel"
-widget_class "*GtkBgbox*"	style "theme-panel"
+widget "*.tclock.*"		style "theme-panel-buttons"
+widget "*.taskbar.*"		style "theme-panel-buttons"
+widget_class "*GtkBgbox*"	style "theme-panel-buttons"
 
 # Make sure panel text color doesn't change
 widget_class "*Panel*MenuBar*"		style "theme-main-menu-text"
@@ -159,3 +193,12 @@ engine "pixmap" {
 }
 
 widget_class "*PanelToplevel*" style "panel-arrow-remove"
+
+# Fix xfce-notifyd button
+style "xfce-notifyd-button" {
+	fg[NORMAL]	= @text_color
+	fg[PRELIGHT]	= @text_color
+	fg[ACTIVE]	= @text_color
+}
+
+widget_class "XfceNotifyWindow.*.GtkButton*" style "xfce-notifyd-button"
diff --git a/desktop-themes/Menta/gtk-2.0/widgets/panel.rc b/desktop-themes/Menta/gtk-2.0/widgets/panel.rc
index a199a171..08a0b9a1 100644
--- a/desktop-themes/Menta/gtk-2.0/widgets/panel.rc
+++ b/desktop-themes/Menta/gtk-2.0/widgets/panel.rc
@@ -6,12 +6,33 @@ style "theme-panel"
 # Disable (comment out) for normal panel backgrounds or to get a transparancy panel.
 	bg_pixmap[NORMAL] = "/Panel/panel-bg.png"
 
-	fg[NORMAL]	= "#000000"
-	fg[PRELIGHT]	= "#ffffff"
-	fg[ACTIVE]	= "#000000"
-	text[NORMAL]	= "#000000"
-	text[PRELIGHT]	= "#ffffff"
-	text[ACTIVE]	= "#000000"
+	base[NORMAL]		= @bg_color
+	base[PRELIGHT]		= shade (1.06, @bg_color)
+	base[INSENSITIVE]	= @bg_color
+	bg[NORMAL]			= @bg_color
+	bg[PRELIGHT]		= shade (1.20, @bg_color)
+	bg[SELECTED]		= shade (0.90, @selected_bg_color)
+	bg[INSENSITIVE]		= @bg_color_dark
+	bg[ACTIVE]			= shade (0.8, @bg_color)
+	fg[NORMAL]			= "#000000"
+	fg[PRELIGHT]		= "#000000"
+	fg[SELECTED]		= @selected_fg_color
+	fg[ACTIVE]			= "#ffffff"
+	fg[INSENSITIVE]		= "#f0f0f0"
+	text[NORMAL]		= "#000000"
+	text[PRELIGHT]		= "#000000"
+	text[ACTIVE]		= "#ffffff"
+	text[SELECTED]		= @selected_fg_color
+	text[INSENSITIVE]	= "#f0f0f0"
+ 	
+	engine "murrine" {
+	}
+}
+
+style "theme-panel-buttons"
+{
+# Disable (comment out) for normal panel backgrounds or to get a transparancy panel.
+	bg_pixmap[NORMAL] = "/Panel/panel-bg.png"
 	
 	engine "pixmap" {
 		image {
@@ -105,8 +126,11 @@ widget "*indicator-applet*"		style "theme-panel"
 class "PanelApp*"			style "theme-panel"
 class "PanelToplevel*"			style "theme-panel"
 widget_class "*PanelToplevel*"		style "theme-panel"
-widget_class "*notif*"			style "theme-panel"
-widget_class "*Notif*"			style "theme-panel"
+widget_class "*PanelFrame*" 		style "theme-panel"
+widget_class "*PanelAppletFrame*" 	style "theme-panel"
+widget_class "*PanelWidget*.*"		style "theme-panel"
+#widget_class "*notif*"			style "theme-panel"
+#widget_class "*Notif*"			style "theme-panel"
 widget_class "*Tray*"			style "theme-panel" 
 widget_class "*tray*"			style "theme-panel"
 widget_class "*computertemp*"		style "theme-panel"
@@ -121,10 +145,20 @@ widget_class "*Notif*Brasero*"	style "theme-panel-light"
 widget "*Xfce*Panel*"	style "theme-panel"
 class "*Xfce*Panel*"	style "theme-panel"
 
+# Panel buttons
+widget_class "*Panel*GtkToggleButton"	style:highest "theme-panel-buttons"
+#widget_class "*Panel*GtkButton"	style:highest "theme-panel-buttons"
+
+# XFCE panel buttons
+widget "*Xfce*Panel*Button*"	style:highest "theme-panel-buttons"
+class "*Xfce*Panel*Button*"	style:highest "theme-panel-buttons"
+widget_class "*LauncherPlugin*"	style:highest "theme-panel-buttons"
+widget_class "*ActionsPlugin*"	style:highest "theme-panel-buttons"
+
 # lxpanel and fbpanel
-widget "*.tclock.*"		style "theme-panel"
-widget "*.taskbar.*"		style "theme-panel"
-widget_class "*GtkBgbox*"	style "theme-panel"
+widget "*.tclock.*"		style "theme-panel-buttons"
+widget "*.taskbar.*"		style "theme-panel-buttons"
+widget_class "*GtkBgbox*"	style "theme-panel-buttons"
 
 # Make sure panel text color doesn't change
 widget_class "*Panel*MenuBar*"		style "theme-main-menu-text"
@@ -159,3 +193,12 @@ engine "pixmap" {
 }
 
 widget_class "*PanelToplevel*" style "panel-arrow-remove"
+
+# Fix xfce-notifyd button
+style "xfce-notifyd-button" {
+	fg[NORMAL]	= @text_color
+	fg[PRELIGHT]	= @text_color
+	fg[ACTIVE]	= @text_color
+}
+
+widget_class "XfceNotifyWindow.*.GtkButton*" style "xfce-notifyd-button"