- (gtk3) fixed menubar (again, sigh!)

- (gtk2) removed unnecessary rc dependencies
- (gtk2) removed unnecessary bitmaps (temporary)
- (gtk2) replaced some clearlooks controls with murrine
- (gtk2 / gtk3) changed paddings
- (gtk2 / gtk3) changed base colours
- (gtk2 / gtk3) updated light themes base
- (gtk2 / gtk3) ...and thousands small changes more!

usr/share/themes/Lubuntu-default/gtk-2.0/apps/banshee.rc

@@ -0,0 +1,23 @@
+# ==============================================================================
+# BANSHEE SPECIFIC SETTINGS
+# ==============================================================================
+
+style "banshee_scrollbar" {
+	engine "murrine" {
+		roundness = 20
+	}
+}
+
+widget    "__gtksharp_1*SeekSlider*"    style "scale"
+widget    "__gtksharp_1*Player*croll*"      style "banshee_scrollbar"
+
+widget_class    "__gtksharp_1*<GtkToolbar>*"    style "default"
+widget_class    "__gtksharp_1*<GtkButton>*"     style "button"
+#widget_class    "__gtksharp_1*<GtkScale>*"      style "scale"
+
+
+
+
+
+
+

usr/share/themes/Lubuntu-default/gtk-2.0/apps/ff.rc

@@ -0,0 +1,33 @@
+# ==============================================================================
+# FIREFOX SPECIFIC SETTINGS
+# ==============================================================================
+
+style "ff-default" {
+	GtkCheckButton::indicator-size = 14
+
+	engine "murrine" {
+		reliefstyle = 0
+	}
+}
+
+style	"ff-statusbar" {
+}
+
+#widget	"MozillaGtkWidget*Toolbar*"		style	"theme-toolbar"
+#widget	"MozillaGtkWidget*Statusbar*"	style	"ff-statusbar"
+
+widget	"MozillaGtkWidget*"	style	"ff-default"
+
+# ------------------------------------------------------------------------------
+# Some Firefox (3.0/3.5) GTK widgets hierarchy (maybe useful for someone)
+# ------------------------------------------------------------------------------
+
+# Top toolbars (and maybe others)
+#widget	"MozillaGtkWidget.GtkFixed.GtkHandleBox.GtkToolbar"	style	"theme-dark-toolbar"
+
+# Findbar entry, gecko (all html) entry
+#widget	"MozillaGtkWidget.GtkFixed.GtkEntry"	style	"theme-dark-entry"
+
+# ALL buttons
+#widget	"MozillaGtkWidget.GtkFixed.GtkButton"	style	"theme-dark-button"
+

usr/share/themes/Lubuntu-default/gtk-2.0/apps/gnome-terminal.rc

@@ -0,0 +1,42 @@
+# ==============================================================================
+# GNOME TERMINAL SPECIFIC SETTINGS
+# ==============================================================================
+
+style "terminal_menubar"
+{
+	engine "murrine" {
+	}
+}
+
+style "terminal_notebook"
+{
+	engine "murrine" {
+		contrast = 1.0
+	}
+}
+
+style "terminal_scrollbar" = "scrollbar"
+{
+	engine "murrine" {
+	}
+}
+
+style "terminal_screen"
+{
+	text[NORMAL] = "#ffffff"
+	base[NORMAL] = "#300a24"
+
+	TerminalScreen::background-darkness = 0.95
+}
+
+#widget "*TerminalWindow*"                               style "terminal_window"
+#widget "*TerminalWindow.*.*enu?ar"                     style "terminal_menubar"
+widget "*TerminalWindow.*.GtkNotebook*"                 style "terminal_notebook"
+#widget "*TerminalWindow.*.GtkNotebook.*.GtkVScrollbar*" style "terminal_scrollbar"
+#widget "*TerminalWindow.*.GtkNotebook*utton*"           style "terminal_button"
+widget "*TerminalWindow.*.TerminalScreen*"              style "terminal_screen"
+
+
+
+
+

usr/share/themes/Lubuntu-default/gtk-2.0/apps/nautilus.rc

@@ -0,0 +1,11 @@
+# ==============================================================================
+# NAUTILUS SPECIFIC SETTINGS
+# ==============================================================================
+
+style "nautilus_info_pane" {
+	bg[NORMAL] = @bg_color
+}
+
+widget_class "*Nautilus*<GtkNotebook>*<GtkEventBox>" style "nautilus_info_pane"
+widget_class "*Nautilus*<GtkButton>" style "notebook_button"
+widget_class "*Nautilus*<GtkButton>*<GtkLabel>" style "notebook_button"

usr/share/themes/Lubuntu-default/gtk-2.0/button.rc

@@ -1,54 +0,0 @@
-########################################################################
-# Button
-########################################################################
-
-style "button"
-{
-	engine "pixmap" 
-    {
-### Button ### 
-
-## Normal
-		image {	function = BOX
-			state = NORMAL
-			file = "images/button.png"
-			border = {4, 4, 4, 4}
-			stretch = TRUE	}
-## Prelight
-		image {	function = BOX
-			state = PRELIGHT
-			file = "images/button-sel.png"
-			border = {4, 4, 4, 4}
-			stretch = TRUE	}
-
-## Insensitive
-		image {	function = BOX
-			state = INSENSITIVE
-			file = "images/button-ins.png"
-			border = {4, 4, 4, 4}
-			stretch = TRUE	}
-
-## Active
-		image {	function = BOX
-			state = ACTIVE
-			file = "images/button-pressed.png"
-			border = {4, 4, 4, 4}
-			stretch = TRUE	}
-
-### Focus ###
-		image {	function = FOCUS
-			state = NORMAL
-			file = "images/button.png"
-			border = {4, 4, 4, 4}
-			stretch = TRUE	}
-    }
-}
-
-style "spinbutton" {
-	engine "clearlooks" {
-		hint = "spinbutton"
-	}
-}
-
-class "GtkSpinButton" style "spinbutton"
-class "GtkButton*" style "button"

usr/share/themes/Lubuntu-default/gtk-2.0/checkbox.rc

@@ -1,163 +0,0 @@
-########################################################################
-# Check boxes
-########################################################################
-
-style "check_box"
-{
-### Check box ###
-	engine "pixmap" 
-	{
-		## Normal
-		image 	{
-			function = CHECK
-			state = NORMAL
-			shadow = OUT
-			overlay_file = "images/c_box.png"
-			overlay_stretch = FALSE	}
-
-		image 	{
-			function = CHECK
-			state = NORMAL
-			shadow = IN
-			overlay_file = "images/c_box-pressed.png"
-			overlay_stretch = FALSE	}
-		
-		image 	{
-			function = OPTION
-			state = NORMAL
-			shadow = OUT
-			overlay_file = "images/c_box.png"
-			overlay_stretch = FALSE	}
-
-		image 	{
-			function = OPTION
-			state = NORMAL
-			shadow = IN
-			overlay_file = "images/c_box-pressed.png"
-			overlay_stretch = FALSE	}
-		
-		## Prelight
-		image 	{
-			function = CHECK
-			state = PRELIGHT
-			shadow = OUT
-			overlay_file = "images/c_box-sel.png"
-			overlay_stretch = FALSE	}
-
-		image 	{
-			function = CHECK
-			state = PRELIGHT
-			shadow = IN
-			overlay_file = "images/c_box-pressed-sel.png"
-			overlay_stretch = FALSE	}
-		
-		image 	{
-			function = OPTION
-			state = PRELIGHT
-			shadow = OUT
-			overlay_file = "images/c_box-sel.png"
-			overlay_stretch = FALSE	}
-
-		image 	{
-			function = OPTION
-			state = PRELIGHT
-			shadow = IN
-			overlay_file = "images/c_box-pressed-sel.png"
-			overlay_stretch = FALSE	}
-		
-		## Insensitive
-		image 	{
-			function = CHECK
-			state = INSENSITIVE
-			shadow = OUT
-			overlay_file = "images/c_box-ins.png"
-			overlay_stretch = FALSE	}
-
-		image 	{
-			function = CHECK
-			state = INSENSITIVE
-			shadow = IN
-			overlay_file = "images/c_box-pressed-ins.png"
-			overlay_stretch = FALSE	}
-		
-		image 	{
-			function = OPTION
-			state = INSENSITIVE
-			shadow = OUT
-			overlay_file = "images/c_box-ins.png"
-			overlay_stretch = FALSE	}
-
-		image 	{
-			function = OPTION
-			state = INSENSITIVE
-			shadow = IN
-			overlay_file = "images/c_box-pressed-ins.png"
-			overlay_stretch = FALSE	}
-		
-		## Active
-		image 	{
-			function = CHECK
-			state = ACTIVE
-			shadow = OUT
-			overlay_file = "images/c_box-active.png"
-			overlay_stretch = FALSE	}
-
-		image 	{
-			function = CHECK
-			state = ACTIVE
-			shadow = IN
-			overlay_file = "images/c_box-pressed-active.png"
-			overlay_stretch = FALSE	}
-		
-		image 	{
-			function = OPTION
-			state = ACTIVE
-			shadow = OUT
-			overlay_file = "images/c_box-active.png"
-			overlay_stretch = FALSE
-		}
-
-		image 	{
-			function = OPTION
-			state = ACTIVE
-			shadow = IN
-			overlay_file = "images/c_box-pressed-active.png"
-			overlay_stretch = FALSE	}
-	}
-}
-
-class "GtkCheckButton*" style "check_box"
-class "GtkCheckMenuItem*" style "check_box"
-
-style "check_box_tree"
-{
-### Check box ###
-	engine "pixmap" 
-	{
-		image 	{
-			function = CHECK
-			shadow = OUT
-			overlay_file = "images/c_box.png"
-			overlay_stretch = FALSE	}
-
-		image 	{
-			function = CHECK
-			shadow = IN
-			overlay_file = "images/c_box-pressed.png"
-			overlay_stretch = FALSE	}
-		
-		image 	{
-			function = OPTION
-			shadow = OUT
-			overlay_file = "images/c_box.png"
-			overlay_stretch = FALSE	}
-
-		image 	{
-			function = OPTION
-			shadow = IN
-			overlay_file = "images/c_box-pressed.png"
-			overlay_stretch = FALSE	}
-	}
-}
-
-class "GtkTreeView*" style "check_box_tree"

usr/share/themes/Lubuntu-default/gtk-2.0/gtkrc

@@ -4,27 +4,11 @@ gtk_color_scheme = "base_color:#ffffff"
 gtk_color_scheme = "text_color:#333333"
 gtk_color_scheme = "selected_bg_color:#8FB2CF"
 gtk_color_scheme = "selected_fg_color:#ffffff"
-gtk_color_scheme = "tooltip_bg_color:#343330"
+gtk_color_scheme = "tooltip_bg_color:#303334"
 gtk_color_scheme = "tooltip_fg_color:#E6E6E6"
+gtk_color_scheme = "link_color:#148add"
 
-include "scrollbar.rc"
+gtk-icon-sizes = "panel-menu=22,22:gtk-button=16,16"
-include "panel.rc"
-include "button.rc"
-include "arrow.rc"
-include "scale.rc"
-include "checkbox.rc"
-include "radio.rc" 
-include "notebook.rc"
-include "progressbar.rc"
-include "entry.rc"
-include "statusbar.rc"
-include "toolbar.rc"
-include "menubar.rc"
-include "pcmanfm.rc"
-include "chromium.rc"
-include "xfce4-notifyd.rc"
-
-gtk-icon-sizes = "gtk-button=16,16"
 gtk-auto-mnemonics = 1
 gtk-font-name = "Ubuntu 9"
 gtk-icon-theme-name = "lubuntu"
@@ -32,37 +16,78 @@ gtk-icon-theme-name = "lubuntu"
 style "default" {
 	xthickness = 1
 	ythickness = 1
-	GtkMenu::horizontal-padding = 0
+
-	GtkMenu::vertical-padding = 0
+	#######################
-	GtkMenuBar::window-dragging = 1
+	# Style Properties
-	GtkMenuBar::internal-padding = 0
+	#######################
-	GtkMenuBar::window-dragging = 1
-	GtkMenuBar::shadow-type = GTK_SHADOW_NONE
 	GtkButton::child-displacement-x = 1
 	GtkButton::child-displacement-y = 1
 	GtkButton::default-border = { 0, 0, 0, 0 }
-	GtkButton::image-spacing = 4
+
-	GtkToolButton::icon-spacing = 4
+	GtkCheckButton::indicator-size = 16
-	GtkCheckButton::indicator-size = 14
+
-	GtkPaned::handle-size = 3
+	GtkPaned::handle-size = 6
-	GtkRange::trough-border = 1
+
+	GtkRange::trough-border = 0
 	GtkRange::slider-width = 14
-	GtkRange::stepper-size = 14
+	GtkRange::stepper-size = 13
-	GtkExpander::expander-size = 16
+	GtkRange::trough-under-steppers = 1
-	GtkTreeView::expander-size = 14
+
-	GtkTreeView::vertical-separator = 2
+	GtkScale::trough-border = 0
+	GtkScale::slider-width = 23
+	GtkScale::slider-length = 14
+	GtkScale::trough-side-details = 1
+
+	GtkScrollbar    		::has-backward-stepper		= 0  
+	GtkScrollbar			::has-forward-stepper		= 1
+	GtkScrollbar			::min-slider-length			= 30
+	GtkScrollbar			::slider-width				= 9
+	GtkScrollbar			::trough-border				= 3
+	GtkScrollbar			::activate-slider 			= FALSE
+	GtkScrollbar			::trough-side-details		= FALSE
+	GtkScrollbar			::stepper-size              = 1
+	
+	GtkScrolledWindow		::scrollbar-spacing			= 0
+	GtkScrolledWindow		::scrollbars-within-bevel	= 1
+	
+	GtkMenuBar::internal-padding = 0
+	GtkMenuBar::shadow-type = GTK_SHADOW_NONE
+	GtkExpander::expander-size = 11
+	GtkToolbar::internal-padding = 1
+	GtkToolbar::shadow-type = GTK_SHADOW_NONE
+	GtkTreeView::expander-size = 7
+	GtkTreeView::vertical-separator = 0
+#	GtkTreeView::odd-row-color = shade (0.96, @base_color)
+	GtkNotebook::tab-overlap = -1
+
+	GtkMenu::horizontal-padding = 0
+	GtkMenu::vertical-padding = 3
+
 	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::state-hint = 0
+
 	GtkEntry::progress-border = { 2, 2, 2, 2 }
-	GtkNotebook::tab-overlap = -1
-	GtkFrame::shadow-type = GTK_SHADOW_NONE
-	GtkScrolledWindow::scrollbars-within-bevel = 1
-	GtkScrolledWindow ::scrollbar-spacing = 1
 
+	GtkProgressBar::min-horizontal-bar-height = 14
+	GtkProgressBar::min-vertical-bar-width = 14
+	
+	GtkImage::x-ayatana-indicator-dynamic = 1
+	GtkMenuBar::window-dragging = 1
+
+	GtkWidget::link-color = @link_color
+	GtkWidget::visited-link-color = @text_color
+
+	####################
+	# Color Definitions
+	####################
 	bg[NORMAL]        = @bg_color
 	bg[PRELIGHT]      = shade (1.02, @bg_color)
 	bg[SELECTED]      = @selected_bg_color
-	bg[INSENSITIVE]   = @bg_color
+	bg[INSENSITIVE]   = shade (0.95, @bg_color)
 	bg[ACTIVE]        = shade (0.9, @bg_color)
 
 	fg[NORMAL]        = @fg_color
@@ -74,14 +99,14 @@ style "default" {
 	text[NORMAL]      = @text_color
 	text[PRELIGHT]    = @text_color
 	text[SELECTED]    = @selected_fg_color
-	text[INSENSITIVE] = darker (@bg_color)
+	text[INSENSITIVE] = shade (0.8, @bg_color)
-	text[ACTIVE]      = @selected_fg_color
+	text[ACTIVE]      = darker (@text_color)
 
 	base[NORMAL]      = @base_color
-	base[PRELIGHT]    = shade (0.95, @selected_bg_color)
+	base[PRELIGHT]    = shade (0.98, @bg_color)
 	base[SELECTED]    = @selected_bg_color
-	base[INSENSITIVE] = @selected_bg_color
+	base[INSENSITIVE] = shade (0.97, @bg_color)
-	base[ACTIVE]      = shade (0.9, @selected_bg_color)
+	base[ACTIVE]      = shade (0.94, @bg_color)
 
 	engine "murrine" {
 		contrast = 0.6
@@ -91,11 +116,12 @@ style "default" {
 		glazestyle = 0
 		default_button_color = shade (1.1, @selected_bg_color)
 		gradient_shades = {1.1, 1.0, 1.0, 0.9}
-		roundness = 4
+		roundness = 3
 		lightborder_shade = 1.26
 		lightborderstyle = 1
 		listviewstyle = 2
 		progressbarstyle = 0
+		colorize_scrollbar	= TRUE
 		menubaritemstyle = 1
 		menubarstyle = 1
 		menustyle = 0
@@ -103,21 +129,19 @@ style "default" {
 		handlestyle = 1
 		sliderstyle = 3
 		scrollbarstyle = 0
-		stepperstyle = 1
+		stepperstyle = 3
 		#rgba = TRUE
+		#trough_shades		= {0.98, 1.06}
 	}
 }
 
-class "GtkWidget" style "default"
+style "dark"
-
-style "scrolledwindow"	{
-    xthickness = 0
-    ythickness = 0
-    GtkScrolledWindow ::scrollbars-within-bevel = 0
-    GtkScrolledWindow ::scrollbar-spacing = 0
-    engine "clearlooks"
 {
-    }
+	bg[NORMAL]   = @bg_color
+	bg[PRELIGHT] = shade (1.05, @bg_color)
+	bg[SELECTED] = @selected_bg_color
+	bg[ACTIVE]   = shade (0.95, @bg_color)
+	bg[INSENSITIVE]   = @bg_color
 }
 
 style "wide" {
@@ -130,10 +154,258 @@ style "wider" {
 	ythickness = 3
 }
 
+style "entry" {
+	xthickness = 3
+	ythickness = 3
+
+	engine "murrine" {
+	}
+}
+
+style "vscale" {
+}
 
-style "comboboxentry" {
+style "hscale" {
-	engine "clearlooks" {
+}
-		hint = "comboboxentry"
+
+style "button" {
+
+	xthickness = 3
+	ythickness = 3
+
+	bg[NORMAL] = shade (1.03, @bg_color)
+	bg[PRELIGHT] = shade (1.06, @bg_color)
+	bg[ACTIVE] = shade (0.96, @bg_color)
+	bg[INSENSITIVE] = @bg_color
+	fg[INSENSITIVE] = "#9c9c9c"
+
+	engine "murrine" {
+		#contrast = 1.0
+		textstyle = 1
+		border_shades = {1.01, 0.8}
+		reliefstyle = 0
+		shadow_shades = {1.0, 1.1}
+		glowstyle = 5
+		glow_shade = 1.02
+		lightborder_shade = 1.32
+#		lightborderstyle = 0
+		#text_shade = 1.04
+	}
+}
+
+style "notebook_button" = "button" {
+}
+
+style "spinbutton" = "notebook_button" {
+	xthickness = 4
+
+	engine "murrine" {
+	}
+}
+
+style "scrollbar" {
+	bg[SELECTED]		= shade (0.70, @base_color)			# color indicador
+	bg[NORMAL]			= shade (0.90, @bg_color)			# color borde indicador
+
+    # color flechas (stepper)	
+    fg[NORMAL]          = shade (1.00, @base_color)
+	fg[PRELIGHT]		= shade (1.00, @base_color)
+	fg[ACTIVE]		    = shade (1.00, @base_color)
+    fg[SELECTED]        = shade (1.00, @base_color)
+    fg[INSENSITIVE]     = shade (1.00, @base_color)
+	
+	engine "murrine" {
+        roundness               = 10
+        gradient_shades			= {1.0,1.0,1.0,1.0}
+        highlight_shade			= 1.0
+        glow_shade              = 1.0
+        #reliefstyle             = 0
+        prelight_shade          = .75
+        gradient_colors         = FALSE
+        lightborder_shade       = 1.0
+        lightborderstyle        = 0
+        trough_shades           = {1.05, 1.13}
+        border_shades           = {1.32, 1.32}
+        contrast                = 0.00
+	}
+}
+
+style "hscrollbar" {
+}
+
+style "vscrollbar" {
+}
+
+style "overlay_scrollbar"
+{
+	bg[SELECTED] = shade (1.0, @selected_bg_color)
+	bg[INSENSITIVE] = shade (0.85, @bg_color)
+	bg[ACTIVE] = shade (0.6, @bg_color)
+}
+
+style "scale" = "button" {
+	bg[NORMAL] = @bg_color
+	bg[PRELIGHT] = shade (1.06, @bg_color)
+	bg[ACTIVE] = shade (0.94, @bg_color)
+
+	engine "murrine" {
+		contrast = 0.6
+		border_shades = {0.9, 0.8}
+		roundness = 5
+		lightborder_shade = 1.32
+		gradient_shades = {1.1, 1.0, 1.0, 0.8}
+		handlestyle = 2
+		trough_border_shades = {0.9, 1.4}
+		glow_shade = 1.0
+#		reliefstyle = 2
+#		shadow_shades = { 1.0, 0.9 }
+	}
+}
+
+style "notebook_bg" {
+	bg[NORMAL] = shade (1.02, @bg_color)
+	bg[ACTIVE] = shade (0.97, @bg_color)
+	fg[ACTIVE] = mix (0.8, @fg_color, shade (0.97, @bg_color))
+}
+
+# The color is changed by the notebook_bg style, this style
+# changes the x/ythickness
+style "notebook" {
+	xthickness = 2
+	ythickness = 2
+	
+	engine "murrine" {
+		roundness = 3
+		contrast = 0.8
+		focusstyle = 2
+		lightborder_shade = 1.16
+		gradient_shades = {1.1, 1.0, 1.0, 0.68}
+	}
+}
+
+style "statusbar" {
+	engine "murrine" {
+		contrast = 1.2
+	}
+}
+
+style "comboboxentry" = "notebook_button" {
+	xthickness = 3
+	ythickness = 3
+	
+	engine "murrine" {
+		textstyle = 1
+		glowstyle = 5
+		glow_shade = 1.02
+	}
+}
+
+style "menubar" = "dark" {
+	# those two lines were added to fix firefox's menubar item text
+	bg[SELECTED] = @bg_color
+	fg[SELECTED] = @fg_color
+
+	engine "murrine" {
+		textstyle = 1
+		text_shade = 1.23
+		gradient_shades = {1.0, 1.0, 1.0, 1.0}
+		lightborder_shade = 1.0
+	}
+}
+
+style "toolbar" {
+	engine "murrine" {
+		textstyle = 1
+		text_shade = 1.32
+		lightborder_shade = 1.0
+	}
+}
+
+style "toolbar-button" = "notebook_button" {
+	engine "murrine" {
+	}
+}
+
+style "menu" {
+	xthickness = 0
+	ythickness = 0
+
+	engine "murrine"
+	{
+		reliefstyle = 0
+		roundness = 0
+	}
+}
+
+style "menu_item" = "menu" {
+	xthickness = 2
+	ythickness = 3
+
+	fg[PRELIGHT] = @selected_fg_color
+
+	engine "murrine"
+	{
+		glowstyle = 5
+		glow_shade = 1.1
+#		lightborder_shade = 1.0
+#		border_shades = { 1.5, 1.3 }
+		roundness = 0
+	}
+}
+
+style "menubar_item" = "menu_item" {
+	bg[PRELIGHT] = @selected_bg_color
+	fg[PRELIGHT] = @selected_fg_color
+
+	engine "murrine" {
+		gradient_shades = {1.00, 1.0, 1.0, 1.0}
+#		glowstyle = 5
+		border_shades = { 1.0, 1.0 }
+		glow_shade = 1.00
+		lightborderstyle = 3
+		lightborder_shade = 1.2
+		roundness = 4
+	}
+}
+
+style "scale_menu_item" = "scale" {
+	engine "murrine" {
+		roundness = 20
+		lightborder_shade = 1.32
+		reliefstyle = 0
+	}
+}
+
+# This style is there to modify the separator menu items. The goals are:
+# 1. Get a specific height.
+# 2. The line should go to the edges (ie. no border at the left/right)
+style "separator_menu_item" {
+	xthickness = 1
+	ythickness = 0
+
+	GtkSeparatorMenuItem::horizontal-padding = 0
+	GtkWidget::wide-separators = 1
+	GtkWidget::separator-width = 1
+	GtkWidget::separator-height = 7
+
+	engine "murrine" {
+		contrast = 0.5
+		separatorstyle = 0
+	}
+}
+
+style "separator_tool_item" {
+	xthickness = 0
+	ythickness = 1
+
+	GtkVSeparator::vertical-padding = 0
+	GtkWidget::wide-separators = 1
+	GtkWidget::separator-width = 7
+	GtkWidget::separator-height = 1
+
+	engine "murrine" {
+		contrast = 0.5
+		separatorstyle = 0
 	}
 }
 
@@ -141,14 +413,287 @@ style "frame_title" {
 	fg[NORMAL] = lighter (@fg_color)
 }
 
+style "treeview" {
+	engine "murrine"
+	{
+		roundness = 2
+		lightborder_shade = 1.1
+		gradient_shades = {1.04, 1.0, 1.0, 0.96}
+	}
+}
+
+style "progressbar" {
+	xthickness = 1
+	ythickness = 1
+
+	bg[ACTIVE] = shade (0.94, @bg_color)
+	#bg[SELECTED] = "#cdcdcd"
+	fg[PRELIGHT] = @selected_fg_color
+
+	engine "murrine" {
+		#trough_shades = {0.98, 1.02}
+		roundness = 8
+		lightborderstyle = 1
+		lightborder_shade = 1.26
+		border_shades = {0.95, 0.85}
+		gradient_shades = {1.1, 1.0, 1.0, 0.9}
+		trough_border_shades = {0.9, 1.4}
+	}
+}
+
+style "progressbar_menu_item" = "progressbar" {
+	engine "murrine" {
+		roundness = 0
+	}
+}
+
+# This style is based on the default style, so that the colors from the button
+# style are overriden again.
+style "treeview_header" = "notebook_button" {
+	xthickness = 2
+	ythickness = 1
+
+	engine "murrine" {
+		glazestyle = 1
+		contrast = 0.8
+		lightborder_shade = 1.16
+		textstyle = 1
+		glow_shade = 1.0
+	}
+}
+
+style "treeview_header_scrolled" = "treeview_header" {
+}
+
+style "scrolledwindow" {
+	engine "murrine" {
+		contrast = 0.6
+	}
+}
+
+style "radiocheck"  = "button" {
+	text[NORMAL] = shade (0.535, @selected_bg_color)
+	text[PRELIGHT] = shade(1.06, shade (0.535, @selected_bg_color))
+	bg[NORMAL]   = shade (0.92, @bg_color)
+	bg[PRELIGHT] = mix (0.2, @selected_bg_color, shade(1.1, @bg_color))
+	fg[INSENSITIVE] = darker (@bg_color)
+	fg[ACTIVE] = @fg_color
+
+	engine "murrine" {
+		reliefstyle = 3
+		gradient_shades = {1.2, 1.0, 1.0, 0.9}
+		shadow_shades = {0.6, 0.5}
+		textstyle = 0
+	}
+}
 
 style "tooltips" {
 	xthickness = 4
 	ythickness = 4
+
 	bg[NORMAL]        = @tooltip_bg_color
 	fg[NORMAL]        = @tooltip_fg_color
+	bg[SELECTED]      = "#000000"
+
+	engine "murrine" {
+		rgba = TRUE
+	}
 }
 
-widget "gtk-tooltip*" style "tooltips"
+style "infobar" {
+	engine "murrine" {
+	}
+}
+
+style "nautilus_location" {
+	bg[NORMAL]  = mix (0.60, shade (1.05, @bg_color), @selected_bg_color)
+}
+
+style "calendar" {
+	xthickness = 0
+	ythickness = 0
+
+	engine "murrine" {
+		roundness = 0
+	}
+}
+
+style "calendar_menu_item" = "calendar" {
+#	base[NORMAL] = "#c5bfb7"
+}
+
+style "soundfix"
+{
+}
+
+# Wrokaround style for places where the text color is used instead of the fg color.
+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)
+}
+
+# Workaround style for menus where the text color is used instead of the fg color.
+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]   = @fg_color
+}
+
+# Workaround style for places where the fg color is used instead of the text color.
+style "fg_is_text_color_workaround" {
+	fg[NORMAL]        = @text_color
+	fg[PRELIGHT]      = @text_color
+	fg[SELECTED]      = @selected_fg_color
+	fg[ACTIVE]        = @selected_fg_color
+	fg[INSENSITIVE]   = darker (@bg_color)
+}
+
+# Style to set the toolbar to use a flat style. This is because the "New" button in
+# Evolution is not drawn transparent. So if there is a gradient in the background it will
+# look really wrong.
+# See http://bugzilla.gnome.org/show_bug.cgi?id=446953.
+style "evo_new_button_workaround" {
+}
+
+###############################################################################
+# The following part of the gtkrc applies the different styles to the widgets.
+###############################################################################
+
+# The default style is applied to every widget
+class "GtkWidget" style "default"
+
+class "GtkSeparator" style "wide"
+class "GtkFrame" style "wide"
+class "GtkCalendar" style "wide"
+class "GtkEntry" style "entry"
+
+class "GtkSpinButton" style "spinbutton"
+class "GtkScale" style "scale"
+class "GtkVScale" style "vscale"
+class "GtkHScale" style "hscale"
+class "GtkScrollbar" style "scrollbar"
+class "GtkHScrollbar" style "hscrollbar"
+class "GtkVScrollbar" style "vscrollbar"
+class "GtkCalendar" style "calendar"
+class "GtkInfoBar" style "infobar"
+
+# General matching follows. The order is choosen so that the right styles override
+# each other. EG. progressbar needs to be more important than the menu match.
+widget_class "*<GtkNotebook>" style "notebook_bg"
+# This is not perfect, it could be done better.
+# (That is modify *every* widget in the notebook, and change those back that
+# we really don't want changed)
+widget_class "*<GtkNotebook>*<GtkEventBox>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkLayout>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkLabel>" style "notebook_bg"
+
+widget_class "*<GtkToolbar>*" style "toolbar"
+widget_class "*<GtkScrolledWindow>*" style "scrolledwindow"
+
+widget_class "*<GtkButton>" style "button"
+widget_class "*<GtkButton>*<GtkLabel>" style "button"
+widget_class "*<GtkToolbar>.*.<GtkButton>*" style "notebook_button"
+widget_class "*<GtkNotebook>" style "notebook"
+widget_class "*<GtkStatusbar>" style "statusbar"
+widget_class "*<GtkSpinButton>*" style "spinbutton"
+widget_class "*<GtkNotebook>*<GtkButton>" style "notebook_button"
+widget_class "*<GtkNotebook>*<GtkButton>*<GtkLabel>" style "notebook_button"
+widget_class "*<GtkRadioButton>*" style "radiocheck"
+widget_class "*<GtkCheckButton>*" style "radiocheck"
+
 widget_class "*<GtkComboBoxEntry>*" style "comboboxentry"
 widget_class "*<GtkCombo>*" style "comboboxentry"
+
+widget_class "*<GtkMenuBar>*" style "menubar"
+widget_class "*<GtkMenu>*" style "menu"
+widget_class "*<GtkMenuItem>*" style "menu_item"
+widget_class "*<GtkSeparatorMenuItem>*" style "separator_menu_item"
+widget_class "*<GtkSeparatorToolItem>*" style "separator_tool_item"
+widget_class "*<GtkMenuBar>*<GtkMenuItem>*" style "menubar_item"
+
+widget_class "*.<GtkFrame>.<GtkLabel>" style "frame_title"
+widget_class "*.<GtkTreeView>*" style "treeview"
+
+widget_class "*<GtkProgress>" style "progressbar"
+widget_class "*<GtkMenuItem>.*.<GtkProgressBar>" style "progressbar_menu_item"
+widget_class "*<GtkMenuItem>.*.<GtkScale>" style "scale_menu_item"
+widget_class "*<GtkMenuItem>.*.<GtkCalendar>" style "calendar_menu_item"
+
+# Treeview headers (and similar stock GTK+ widgets)
+widget_class "*.<GtkScrolledWindow>*<GtkTreeView>*" style "treeview_header_scrolled"
+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"
+widget_class "*.<GtkTreeView>.<GtkButton>.*<GtkLabel>" style "treeview_header"
+widget_class "*.<GtkCTree>.<GtkButton>.*<GtkLabel>" style "treeview_header"
+widget_class "*.<GtkList>.<GtkButton>.*<GtkLabel>" style "treeview_header"
+widget_class "*.<GtkCList>.<GtkButton>.*<GtkLabel>" style "treeview_header"
+
+# Overlay scrollbar
+widget_class "*<OsScrollbar>" style "overlay_scrollbar"
+widget_class "*<OsThumb>" style "overlay_scrollbar"
+
+# The window of the tooltip is called "gtk-tooltip"
+##################################################################
+# FIXME:
+# This will not work if one embeds eg. a button into the tooltip.
+# As far as I can tell right now we will need to rework the theme
+# quite a bit to get this working correctly.
+# (It will involve setting different priorities, etc.)
+##################################################################
+widget "gtk-tooltip*" style "tooltips"
+
+##########################################################################
+# Following are special cases and workarounds for issues in applications.
+##########################################################################
+
+# Workaround for the evolution ETable (bug #527532)
+widget_class "*.ETable.ECanvas" style "treeview_header"
+# Workaround for the evolution ETree
+widget_class "*.ETree.ECanvas" style "treeview_header"
+
+# 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"
+
+# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
+# Note that this work around assumes that the combobox is _not_ in appears-as-list mode.
+widget_class "*.<GtkComboBox>.<GtkCellView>" style "text_is_fg_color_workaround"
+# This is the part of the workaround that fixes the menus
+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.
+widget_class "*<GtkListItem>*" style "fg_is_text_color_workaround"
+# GtkCList also uses the fg color to draw text on top of the base colors.
+widget_class "*<GtkCList>" style "fg_is_text_color_workaround"
+# Nautilus when renaming files, and maybe other places.
+widget_class "*<EelEditableLabel>" style "fg_is_text_color_workaround"
+# Work around for ubuntu's lucid sound indicator
+widget "ido-offscreen-scale" style "soundfix"
+# Thickness for indicator menu items
+widget "*IdoEntryMenuItem*" style "wide"
+
+# See the documentation of the style.
+widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "evo_new_button_workaround"
+
+# Includes
+include "apps/ff.rc"
+include "apps/chromium.rc"
+include "apps/gnome-terminal.rc"
+include "apps/nautilus.rc"
+include "lxpanel.rc"
+include "arrow.rc"
+#include "notebook.rc" ' This needs revision
+include "entry.rc"
+include "statusbar.rc"
+include "toolbar.rc"
+include "pcmanfm.rc"
+include "xfce4-notifyd.rc"

usr/share/themes/Lubuntu-default/gtk-2.0/menubar.rc

@@ -1,65 +0,0 @@
-style "menubar" {
-	engine "clearlooks" {
-		hint = "menubar"
-	}
-}
-
-style "menu" {
-	xthickness = 2
-	ythickness = 3
-	bg[NORMAL] = @bg_color
-	engine "clearlooks" {
-		radius = 0.0
-	}
-}
-
-style "menu_item" {
-	xthickness = 2
-	ythickness = 3
-	fg[PRELIGHT]      = @selected_fg_color
-	engine "clearlooks" {
-		hint = "menubar"
-	}
-}
-
-style "separator_menu_item" {
-	xthickness = 1
-	ythickness = 0
-	GtkSeparatorMenuItem::horizontal-padding = 0
-	GtkWidget::wide-separators = 0
-	GtkWidget::separator-width = 1
-	GtkWidget::separator-height = 7
-}
-
-# Wrokaroudn style for places where the text color is used instead of the fg color.
-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)
-}
-
-# Workaround style for menus where the text color is used instead of the fg color.
-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)
-}
-
-# Workaround style for places where the fg color is used instead of the text color.
-style "fg_is_text_color_workaround" {
-
-	fg[NORMAL]        = @text_color
-	fg[PRELIGHT]      = @text_color
-	fg[INSENSITIVE]   = darker (@bg_color)
-}
-
-widget_class "*<GtkMenuBar>*" style "menubar"
-widget_class "*<GtkMenu>*" style "menu"
-widget_class "*<GtkMenuItem>*" style "menu_item"
-widget_class "*<GtkSeparatorMenuItem>*" style "separator_menu_item"

usr/share/themes/Lubuntu-default/gtk-2.0/progressbar.rc

@@ -1,66 +0,0 @@
-########################################################################
-# Progressbar
-########################################################################
-
-style "progressbar" {
-	GtkProgressBar ::shadow-type = GTK_SHADOW_NONE
-	bg[NORMAL] = "#C8C8C8"
-	bg[SELECTED] = @selected_bg_color
-	engine "pixmap" {
-		image {	function = BOX
-			detail = "trough"
-			file = "images/progressbar-trough-horiz.png"
-			border = {9, 9, 9, 9}
-			stretch	= TRUE
-			orientation = HORIZONTAL }
-		image {	function = BOX
-			detail = "trough"
-			file = "images/progressbar-trough-vert.png"
-			border = {9, 9, 9, 9}
-			stretch = TRUE
-			orientation = VERTICAL }
-		image { function = SHADOW
-			shadow = IN
-			file = "images/progressbar-trough-tree.png"
-			border = {9, 9, 9, 9}
-			stretch	= TRUE }		
-		image { function = BOX
-			detail = "bar"
-			file = "images/progressbar-horiz.png"
-			border = {8, 8, 8, 8}
-			stretch	= TRUE
-			orientation = HORIZONTAL }
-		image { function = BOX
-			detail = "bar"
-			file = "images/progressbar-vert.png"
-			border = {8, 8, 8, 8}
-			stretch = TRUE
-			orientation = VERTICAL }
-		image { function = BOX
-			state = SELECTED
-			border = {2, 2, 2, 2}
-			file = "images/progressbar-horiz.png"
-			stretch	= TRUE }
-	}
-}
-
-style "progressbar_tree" {
-	GtkProgressBar ::shadow-type = GTK_SHADOW_NONE
-	bg[NORMAL] = "#C8C8C8"
-	bg[SELECTED] = @selected_bg_color
-	engine "pixmap" {
-		image {	function = SHADOW
-			shadow = IN
-			file = "images/progressbar-trough-tree.png"
-			border = {9, 9, 9, 9}
-			stretch	= TRUE	}
-		image {	function = BOX
-			state = SELECTED
-			border = {2, 2, 2, 2}
-			file = "images/progressbar-tree.png"
-			stretch	= TRUE	}
-	}
-}
-
-class "GtkTreeView*" style "progressbar_tree"
-class "GtkProgressBar*" style "progressbar"

usr/share/themes/Lubuntu-default/gtk-2.0/radio.rc

@@ -1,163 +0,0 @@
-########################################################################
-# Radio buttons 
-########################################################################
-
-style "radio_button"
-{
-### Radio ###
-	engine "pixmap" 
-	{
-		## Normal
-		image 	{
-			function = CHECK
-			state = NORMAL
-			shadow = OUT
-			overlay_file = "images/radio.png"
-			overlay_stretch = FALSE	}
-
-		image 	{
-			function = CHECK
-			state = NORMAL
-			shadow = IN
-			overlay_file = "images/radio-pressed.png"
-			overlay_stretch = FALSE	}
-		
-		image 	{
-			function = OPTION
-			state = NORMAL
-			shadow = OUT
-			overlay_file = "images/radio.png"
-			overlay_stretch = FALSE	}
-
-		image 	{
-			function = OPTION
-			state = NORMAL
-			shadow = IN
-			overlay_file = "images/radio-pressed.png"
-			overlay_stretch = FALSE	}
-		
-		## Prelight
-		image 	{
-			function = CHECK
-			state = PRELIGHT
-			shadow = OUT
-			overlay_file = "images/radio-sel.png"
-			overlay_stretch = FALSE	}
-
-		image 	{
-			function = CHECK
-			state = PRELIGHT
-			shadow = IN
-			overlay_file = "images/radio-pressed-sel.png"
-			overlay_stretch = FALSE	}
-		
-		image 	{
-			function = OPTION
-			state = PRELIGHT
-			shadow = OUT
-			overlay_file = "images/radio-sel.png"
-			overlay_stretch = FALSE	}
-
-		image 	{
-			function = OPTION
-			state = PRELIGHT
-			shadow = IN
-			overlay_file = "images/radio-pressed-sel.png"
-			overlay_stretch = FALSE	}
-		
-		## Insensitive
-		image 	{
-			function = CHECK
-			state = INSENSITIVE
-			shadow = OUT
-			overlay_file = "images/radio-ins.png"
-			overlay_stretch = FALSE	}
-
-		image 	{
-			function = CHECK
-			state = INSENSITIVE
-			shadow = IN
-			overlay_file = "images/radio-pressed-ins.png"
-			overlay_stretch = FALSE	}
-		
-		image 	{
-			function = OPTION
-			state = INSENSITIVE
-			shadow = OUT
-			overlay_file = "images/radio-ins.png"
-			overlay_stretch = FALSE	}
-
-		image 	{
-			function = OPTION
-			state = INSENSITIVE
-			shadow = IN
-			overlay_file = "images/radio-pressed-ins.png"
-			overlay_stretch = FALSE	}
-		
-		## Active
-		image 	{
-			function = CHECK
-			state = ACTIVE
-			shadow = OUT
-			overlay_file = "images/radio-active.png"
-			overlay_stretch = FALSE	}
-
-		image 	{
-			function = CHECK
-			state = ACTIVE
-			shadow = IN
-			overlay_file = "images/radio-pressed-active.png"
-			overlay_stretch = FALSE	}
-		
-		image 	{
-			function = OPTION
-			state = ACTIVE
-			shadow = OUT
-			overlay_file = "images/radio-active.png"
-			overlay_stretch = FALSE	}
-
-		image 	{
-			function = OPTION
-			state = ACTIVE
-			shadow = IN
-			overlay_file = "images/radio-pressed-active.png"
-			overlay_stretch = FALSE	}
-	}
-}
-
-class "GtkRadio*" style "radio_button"
-class "GtkRadioMenuItem*" style "radio_button"
-
-style "radio_button_tree"
-{
-### Radio button ###	
-	engine "pixmap" 
-	{
-		image 	{
-			function = CHECK
-			shadow = OUT
-			overlay_file = "images/radio.png"
-			overlay_stretch = FALSE	}
-
-		image 	{
-			function = CHECK
-			shadow = IN
-			overlay_file = "images/radio-pressed.png"
-			overlay_stretch = FALSE	}
-		
-		image 	{
-			function = OPTION
-			shadow = OUT
-			overlay_file = "images/radio.png"
-			overlay_stretch = FALSE	}
-
-		image 	{
-			function = OPTION
-			shadow = IN
-			overlay_file = "images/radio-pressed.png"
-			overlay_stretch = FALSE	}
-	}
-}
-
-class "GtkTreeView*" style "radio_button_tree"
-

usr/share/themes/Lubuntu-default/gtk-2.0/scale.rc

@@ -1,87 +0,0 @@
-########################################################################
-# Scale
-########################################################################
-
-style "scale"
-{
-	GtkRange::slider_width = 16
-	engine "pixmap"
-	{
-		image	{
-			function = BOX
-			detail = "trough"
-			file = "images/scale-trough-horiz.png"
-			border = {19, 19, 5, 6}
-			stretch	= TRUE
-			orientation	= HORIZONTAL	}
-
-		image	{
-			function = BOX
-			detail = "trough"
-			file = "images/scale-trough-vert.png"
-			border = {5, 6, 19, 19}
-			stretch	= TRUE
-			orientation	= VERTICAL	}
-
-		image	{
-			function = SLIDER
-			state = NORMAL
-			overlay_file = "images/scale-slider.png"
-			overlay_stretch	= FALSE
-			orientation	= HORIZONTAL	}
-
-		image	{
-			function = SLIDER
-			state = NORMAL
-			overlay_file = "images/scale-slider.png"
-			overlay_stretch	= FALSE
-			orientation	= VERTICAL	}
-		
-		image	{
-			function = SLIDER
-			state = PRELIGHT
-			overlay_file = "images/scale-slider-sel.png"
-			overlay_stretch	= FALSE
-			orientation	= HORIZONTAL	}
-
-		image	{
-			function = SLIDER
-			state = PRELIGHT
-			overlay_file = "images/scale-slider-sel.png"
-			overlay_stretch	= FALSE
-			orientation	= VERTICAL	}
-		
-		image	{
-			function = SLIDER
-			state = INSENSITIVE
-			overlay_file = "images/scale-slider.png"
-			overlay_stretch	= FALSE
-			orientation	= HORIZONTAL	}
-
-		image	{
-			function = SLIDER
-			state = INSENSITIVE
-			overlay_file = "images/scale-slider.png"
-			overlay_stretch	= FALSE
-			orientation	= VERTICAL	}
-		
-		image 	{
-			function = FOCUS
-			file = "images/null.png"	} 
-	}
-}
-
-style "vscale" {
-	engine "clearlooks" {
-		hint = "vscale"
-	}
-}
-
-style "hscale" {
-	engine "clearlooks" {
-		hint = "hscale"
-	}
-}
-
-class "GtkRange*" style "scale"
-

usr/share/themes/Lubuntu-default/gtk-2.0/scrollbar.rc

@@ -1,43 +0,0 @@
-########################################################################
-# Scrollbar
-########################################################################
-
-style "scrollbar" {
-
-	GtkScrollbar		::has-backward-stepper              = 0  
-	GtkScrollbar		::has-forward-stepper               = 0
-	GtkScrollbar		::min-slider-length                 = 30
-	GtkScrollbar		::slider-width                      = 10
-	GtkScrollbar		::trough-border                     = 1
-
-	xthickness = 2
-	ythickness = 2
-
-	bg[SELECTED]	= "#aaaaaa"
-	bg[ACTIVE]		= "#b5b5b5"
-
-	engine "murrine" {
-		roundness			= 16
-		gradient_shades		= {1.0,1.0,1.0,1.0}
-		highlight_shade		= 1.0
-		glow_shade			= 1.0
-		reliefstyle			= 0
-		gradient_colors		= FALSE
-    	lightborder_shade	= 1.0
-		lightborderstyle	= 0
-		trough_shades	    = { 1.3, 1.3}
-		border_shades		= { 2.0, 2.0}
-		contrast			= 0.0
-		colorize_scrollbar	= TRUE
-	}
-}
-
-style "hscrollbar" {
-}
-
-style "vscrollbar" {
-}
-
-class "GtkScrollbar*" style "scrollbar"
-class "GtkHScrollbar" style "hscrollbar"
-class "GtkVScrollbar" style "vscrollbar"