re-sync gtk2 with light themes

usr/share/themes/Lubuntu-dark-panel/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-dark-panel/gtk-2.0/apps/ff.rc

@@ -10,9 +10,6 @@ style "ff-default" {
 	}
 }
 
-style	"ff-statusbar" {
-}
-
 #widget	"MozillaGtkWidget*Toolbar*"		style	"theme-toolbar"
 #widget	"MozillaGtkWidget*Statusbar*"	style	"ff-statusbar"
 

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

@@ -24,7 +24,7 @@ style "terminal_scrollbar" = "scrollbar"
 style "terminal_screen"
 {
 	text[NORMAL] = "#ffffff"
-	base[NORMAL] = "#300a24"
+	base[NORMAL] = "#300A24"
 
 	TerminalScreen::background-darkness = 0.95
 }

usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/lubuntu_menu.rc

@@ -0,0 +1,36 @@
+style "dark"
+{
+	bg[NORMAL]   = "#e0e0e0"
+	bg[PRELIGHT] = shade (1.05, "#e0e0e0")
+	bg[SELECTED] = @selected_bg_color
+	bg[ACTIVE]   = shade (0.95, "#e0e0e0")
+	bg[INSENSITIVE]   = "#e0e0e0"
+}
+
+style "menubar" = "dark" {
+	# those two lines were added to fix firefox's menubar item text
+	bg[SELECTED] = "#8FB2CF"
+	fg[SELECTED] = @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 "menubar_item" = "menu_item" {
+	bg[PRELIGHT] = "#8FB2CF"
+	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
+	}
+}

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

@@ -169,108 +169,6 @@ style "nautilus-mode-button"
 
 }
 
-style "nautilus-breadcrumbs"
-{
-	xthickness = 3
-	ythickness = 0
-	
-	GtkButton::child-displacement-y		= 0
-	GtkButton::inner-border			= { 0, 8, 0, 0}
-
-	engine "pixmap"
-	{	
-		image
-		{
-			function        	= BOX
-			shadow			= OUT
-			recolorable     	= TRUE
-			state			= PRELIGHT
-			file			= "/nautilus/breadcrumb_prelight.png"
-			border			= { 3, 13, 3, 3 }
-			stretch         	= TRUE
-		}		
-
-		image
-		{
-			function        	= BOX
-			recolorable     	= TRUE
-			shadow			= IN
-			state			= PRELIGHT
-			file			= "/nautilus/breadcrumb_prelight.png"
-			border			= { 3, 13, 3, 3 }
-			stretch         	= TRUE
-		}
-	  
-		image
-		{
-			function        	= BOX
-			recolorable     	= TRUE
-			state			= NORMAL
-			file			= "/nautilus/breadcrumb_normal.png"
-			border			= { 3, 13, 3, 3 }
-			stretch         	= TRUE
-		}
-		
-		image
-		{
-			function        	= BOX
-			recolorable     	= TRUE
-			state			= PRELIGHT
-			file			= "/nautilus/breadcrumb_prelight.png"
-			border			= { 3, 13, 3, 3 }
-			stretch         	= TRUE
-		}
-	
-
-		image
-		{
-			function        	= BOX
-			recolorable     	= TRUE
-			state			= ACTIVE
-			file			= "/nautilus/breadcrumb_prelight.png"
-			border			= { 3, 13, 3, 3 }
-			stretch         	= TRUE
-		}  
-
-		image
-		{
-			function        	= BOX
-			recolorable     	= TRUE
-			state				= INSENSITIVE
-			file				= "/nautilus/breadcrumb_normal.png"
-			border				= { 3, 13, 3, 3 }
-			stretch         	= TRUE
-		} 
-
-		image
-		{
-			function        	= BOX
-			recolorable     	= TRUE
-			state				= SELECTED
-			file				= "/nautilus/breadcrumb_prelight.png"
-			border				= { 3, 13, 3, 3 }
-			stretch         	= TRUE
-		}
-	}
-}
-
-style "nautilus-left-slider"
-{
-	xthickness = 0
-	ythickness = 0
-	
-	engine "pixmap"
-	{
-		image {
-			function 		= BOX
-			file			= "/nautilus/left_slider_normal.png"
-			border			= { 3, 3, 3, 3 }
-			stretch			= TRUE
-		}
-	}
-
-}
-
 style "nautilus-right-slider"
 {	
 	xthickness = 0

usr/share/themes/Lubuntu-dark-panel/gtk-2.0/assets/statusbar.rc

@@ -1,35 +0,0 @@
-########################################################################
-# Statusbar
-########################################################################
-
-style "statusbar" {
-	GtkStatusbar::shadow_type = GTK_SHADOW_NONE
-	engine "pixmap"
-	{
-		image
-		{
-			function = RESIZE_GRIP
-			detail = "statusbar"
-			overlay_file = "images/resizer.png"
-			overlay_stretch	= FALSE
-		}
-
-		image
-		{
-			function = SHADOW
-            file = "images/null.png"
-		}
-	}
-}
-
-style "smaller-text"
-{
-	font_name = "8"
-}
-
-widget_class "*<GtkStatusbar>*" style "statusbar"
-widget_class "*Statusbar*" style "smaller-text"
-widget_class "*ToolButton*" style "smaller-text"
-class "GtkStatusbar*" style "statusbar"
-widget_class "*GtkStatusbar*.<GtkFrame>*" style "statusbar"
-

usr/share/themes/Lubuntu-dark-panel/gtk-2.0/gtkrc

@@ -1,19 +1,11 @@
-gtk_color_scheme = "fg_color:#333333"
-gtk_color_scheme = "bg_color:#e0e0e0"
-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:#303334"
-gtk_color_scheme = "tooltip_fg_color:#E6E6E6"
-gtk_color_scheme = "link_color:#148add"
+gtk-color-scheme = "base_color:#ffffff\nfg_color:#4c4c4c\ntooltip_fg_color:#ffffff\nselected_bg_color:#8FB2CF\nselected_fg_color:#FFFFFF\ntext_color:#3C3C3C\nbg_color:#F2F1F0\ntooltip_bg_color:#000000\nlink_color:#148add"
 gtk_color_scheme = "sidepane_color:#dae0e6"
 gtk_color_scheme = "sidebar_color:#dae0e6"
 
 gtk-icon-sizes = "panel-menu=22,22:gtk-button=16,16"
+
 gtk-auto-mnemonics = 1
-gtk-font-name = "Ubuntu 9"
-gtk-icon-theme-name = "Lubuntu-dark-panel"
+gtk-alternative-sort-arrows = 1
 
 style "default" {
 	xthickness = 1
@@ -25,30 +17,26 @@ style "default" {
 	GtkButton::child-displacement-x = 1
 	GtkButton::child-displacement-y = 1
 	GtkButton::default-border = { 0, 0, 0, 0 }
+
 	GtkCheckButton::indicator-size = 16
+
 	GtkPaned::handle-size = 6
+
 	GtkRange::trough-border = 0
 	GtkRange::slider-width = 14
 	GtkRange::stepper-size = 13
-	GtkRange::resize-grip = 13
 	GtkRange::trough-under-steppers = 1
+
 	GtkScale::trough-border = 0
 	GtkScale::slider-width = 23
 	GtkScale::slider-length = 14
-	GtkScale::trough-side-details = 0
+	GtkScale::trough-side-details = 1
+
+	GtkScrollbar::activate-slider = 1
+	GtkScrollbar::trough-border = 0
+	GtkScrollbar::slider-width = 13
+	GtkScrollbar::min-slider-length = 31
 
-	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		= 0
-	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
@@ -120,27 +108,26 @@ style "default" {
 		lightborderstyle = 1
 		listviewstyle = 2
 		progressbarstyle = 0
-		colorize_scrollbar	= TRUE
+		colorize_scrollbar = FALSE
 		menubaritemstyle = 1
 		menubarstyle = 1
 		menustyle = 0
 		focusstyle = 3
 		handlestyle = 1
 		sliderstyle = 3
-		scrollbarstyle = 0
+		scrollbarstyle = 2
 		stepperstyle = 3
-		#rgba = TRUE
-		#trough_shades		= {0.98, 1.06}
+#		rgba = TRUE
 	}
 }
 
 style "dark"
 {
-	bg[NORMAL]   = @bg_color
-	bg[PRELIGHT] = shade (1.05, @bg_color)
+	bg[NORMAL]   = "#dfd7cf"
+	bg[PRELIGHT] = shade (1.05, "#dfd7cf")
 	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE]   = shade (0.95, @bg_color)
-	bg[INSENSITIVE]   = @bg_color
+	bg[ACTIVE]   = shade (0.95, "#dfd7cf")
+	bg[INSENSITIVE]   = "#dfd7cf"
 }
 
 style "wide" {
@@ -202,30 +189,25 @@ style "spinbutton" = "notebook_button" {
 	}
 }
 
-style "scrollbar" {
-	bg[SELECTED]		= shade (0.70, @base_color)			# color indicador
-	bg[NORMAL]			= shade (0.90, @bg_color)			# color borde indicador
+style "scrollbar" = "button" {
+	xthickness = 2
+	ythickness = 2
 
-    # 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
+	bg[NORMAL] = @bg_color
+	bg[PRELIGHT] = shade (1.04, @bg_color)
+	bg[ACTIVE] = shade (0.96, @bg_color)
+
+	engine "murrine"
+	{
+		border_shades = {0.95, 0.90}
+		roundness = 20
+		contrast = 1.0
+		trough_shades = {0.92, 0.98}
+		lightborder_shade = 1.3
+		glowstyle = 5
+		glow_shade = 1.02
+		gradient_shades = {1.2, 1.0, 1.0, 0.86}
+		trough_border_shades = {0.9, 0.98}
 	}
 }
 
@@ -301,7 +283,7 @@ style "comboboxentry" = "notebook_button" {
 
 style "menubar" = "dark" {
 	# those two lines were added to fix firefox's menubar item text
-	bg[SELECTED] = @bg_color
+	bg[SELECTED] = "#ece7e2"
 	fg[SELECTED] = @fg_color
 
 	engine "murrine" {
@@ -328,7 +310,7 @@ style "toolbar-button" = "notebook_button" {
 style "menu" {
 	xthickness = 0
 	ythickness = 0
-	bg[NORMAL] = @base_color
+
 	engine "murrine"
 	{
 		reliefstyle = 0
@@ -353,8 +335,8 @@ style "menu_item" = "menu" {
 }
 
 style "menubar_item" = "menu_item" {
-	bg[PRELIGHT] = @selected_bg_color
-	fg[PRELIGHT] = @selected_fg_color
+	bg[PRELIGHT] = "#ece7e2"
+	fg[PRELIGHT] = @fg_color
 
 	engine "murrine" {
 		gradient_shades = {1.00, 1.0, 1.0, 1.0}
@@ -540,7 +522,7 @@ style "menuitem_text_is_fg_color_workaround" {
 	text[PRELIGHT]      = @selected_fg_color
 	text[SELECTED]      = @selected_fg_color
 	text[ACTIVE]        = @fg_color
-	text[INSENSITIVE]   = @fg_color
+	text[INSENSITIVE]   = "#99958b"
 }
 
 # Workaround style for places where the fg color is used instead of the text color.
@@ -684,14 +666,20 @@ widget "*IdoEntryMenuItem*" style "wide"
 widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "evo_new_button_workaround"
 
 # Includes
-include "assets/ff.rc"
-include "assets/chromium.rc"
-include "assets/gnome-terminal.rc"
-#include "assets/nautilus.rc"
-include "assets/lxpanel.rc"
-include "assets/entry.rc"
-include "assets/statusbar.rc"
-include "assets/toolbar.rc"
-include "assets/pcmanfm.rc"
-include "assets/xfce4-notifyd.rc"
-include "assets/thunar.rc"
+#include "apps/banshee.rc"
+include "apps/chromium.rc"
+include "apps/ff.rc"
+include "apps/gnome-terminal.rc"
+include "apps/nautilus.rc"
+
+# Lubuntu specific
+include "apps/lubuntu_lxpanel.rc"
+include "apps/lubuntu_toolbar.rc"
+include "apps/lubuntu_entry.rc"
+include "apps/lubuntu_menu.rc"
+include "apps/pcmanfm.rc"
+
+# XFCE specific
+include "apps/xfce4-notify.rc"
+include "apps/thunar.rc"
+

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

@@ -10,9 +10,6 @@ style "ff-default" {
 	}
 }
 
-style	"ff-statusbar" {
-}
-
 #widget	"MozillaGtkWidget*Toolbar*"		style	"theme-toolbar"
 #widget	"MozillaGtkWidget*Statusbar*"	style	"ff-statusbar"
 

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

@@ -24,7 +24,7 @@ style "terminal_scrollbar" = "scrollbar"
 style "terminal_screen"
 {
 	text[NORMAL] = "#ffffff"
-	base[NORMAL] = "#300a24"
+	base[NORMAL] = "#300A24"
 
 	TerminalScreen::background-darkness = 0.95
 }

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

@@ -2,7 +2,7 @@ style "theme-panel"
 {
 	xthickness = 4
 	ythickness = 0
-	#bg_pixmap[NORMAL] = "images/panel-bg.png"
+	bg_pixmap[NORMAL] = "images/panel-bg.png"
 
 	fg[NORMAL]	= "#000000"
 	fg[PRELIGHT]	= "#ffffff"

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

@@ -0,0 +1,36 @@
+style "dark"
+{
+	bg[NORMAL]   = "#e0e0e0"
+	bg[PRELIGHT] = shade (1.05, "#e0e0e0")
+	bg[SELECTED] = @selected_bg_color
+	bg[ACTIVE]   = shade (0.95, "#e0e0e0")
+	bg[INSENSITIVE]   = "#e0e0e0"
+}
+
+style "menubar" = "dark" {
+	# those two lines were added to fix firefox's menubar item text
+	bg[SELECTED] = "#8FB2CF"
+	fg[SELECTED] = @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 "menubar_item" = "menu_item" {
+	bg[PRELIGHT] = "#8FB2CF"
+	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
+	}
+}

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

@@ -169,108 +169,6 @@ style "nautilus-mode-button"
 
 }
 
-style "nautilus-breadcrumbs"
-{
-	xthickness = 3
-	ythickness = 0
-	
-	GtkButton::child-displacement-y		= 0
-	GtkButton::inner-border			= { 0, 8, 0, 0}
-
-	engine "pixmap"
-	{	
-		image
-		{
-			function        	= BOX
-			shadow			= OUT
-			recolorable     	= TRUE
-			state			= PRELIGHT
-			file			= "/nautilus/breadcrumb_prelight.png"
-			border			= { 3, 13, 3, 3 }
-			stretch         	= TRUE
-		}		
-
-		image
-		{
-			function        	= BOX
-			recolorable     	= TRUE
-			shadow			= IN
-			state			= PRELIGHT
-			file			= "/nautilus/breadcrumb_prelight.png"
-			border			= { 3, 13, 3, 3 }
-			stretch         	= TRUE
-		}
-	  
-		image
-		{
-			function        	= BOX
-			recolorable     	= TRUE
-			state			= NORMAL
-			file			= "/nautilus/breadcrumb_normal.png"
-			border			= { 3, 13, 3, 3 }
-			stretch         	= TRUE
-		}
-		
-		image
-		{
-			function        	= BOX
-			recolorable     	= TRUE
-			state			= PRELIGHT
-			file			= "/nautilus/breadcrumb_prelight.png"
-			border			= { 3, 13, 3, 3 }
-			stretch         	= TRUE
-		}
-	
-
-		image
-		{
-			function        	= BOX
-			recolorable     	= TRUE
-			state			= ACTIVE
-			file			= "/nautilus/breadcrumb_prelight.png"
-			border			= { 3, 13, 3, 3 }
-			stretch         	= TRUE
-		}  
-
-		image
-		{
-			function        	= BOX
-			recolorable     	= TRUE
-			state				= INSENSITIVE
-			file				= "/nautilus/breadcrumb_normal.png"
-			border				= { 3, 13, 3, 3 }
-			stretch         	= TRUE
-		} 
-
-		image
-		{
-			function        	= BOX
-			recolorable     	= TRUE
-			state				= SELECTED
-			file				= "/nautilus/breadcrumb_prelight.png"
-			border				= { 3, 13, 3, 3 }
-			stretch         	= TRUE
-		}
-	}
-}
-
-style "nautilus-left-slider"
-{
-	xthickness = 0
-	ythickness = 0
-	
-	engine "pixmap"
-	{
-		image {
-			function 		= BOX
-			file			= "/nautilus/left_slider_normal.png"
-			border			= { 3, 3, 3, 3 }
-			stretch			= TRUE
-		}
-	}
-
-}
-
 style "nautilus-right-slider"
 {	
 	xthickness = 0

usr/share/themes/Lubuntu-default/gtk-2.0/assets/statusbar.rc

@@ -1,35 +0,0 @@
-########################################################################
-# Statusbar
-########################################################################
-
-style "statusbar" {
-	GtkStatusbar::shadow_type = GTK_SHADOW_NONE
-	engine "pixmap"
-	{
-		image
-		{
-			function = RESIZE_GRIP
-			detail = "statusbar"
-			overlay_file = "images/resizer.png"
-			overlay_stretch	= FALSE
-		}
-
-		image
-		{
-			function = SHADOW
-            file = "images/null.png"
-		}
-	}
-}
-
-style "smaller-text"
-{
-	font_name = "8"
-}
-
-widget_class "*<GtkStatusbar>*" style "statusbar"
-widget_class "*Statusbar*" style "smaller-text"
-widget_class "*ToolButton*" style "smaller-text"
-class "GtkStatusbar*" style "statusbar"
-widget_class "*GtkStatusbar*.<GtkFrame>*" style "statusbar"
-

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

@@ -1,19 +1,11 @@
-gtk_color_scheme = "fg_color:#333333"
-gtk_color_scheme = "bg_color:#e0e0e0"
-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:#303334"
-gtk_color_scheme = "tooltip_fg_color:#E6E6E6"
-gtk_color_scheme = "link_color:#148add"
+gtk-color-scheme = "base_color:#ffffff\nfg_color:#4c4c4c\ntooltip_fg_color:#ffffff\nselected_bg_color:#8FB2CF\nselected_fg_color:#FFFFFF\ntext_color:#3C3C3C\nbg_color:#F2F1F0\ntooltip_bg_color:#000000\nlink_color:#148add"
 gtk_color_scheme = "sidepane_color:#dae0e6"
 gtk_color_scheme = "sidebar_color:#dae0e6"
 
 gtk-icon-sizes = "panel-menu=22,22:gtk-button=16,16"
+
 gtk-auto-mnemonics = 1
-gtk-font-name = "Ubuntu 9"
-gtk-icon-theme-name = "Lubuntu"
+gtk-alternative-sort-arrows = 1
 
 style "default" {
 	xthickness = 1
@@ -25,30 +17,26 @@ style "default" {
 	GtkButton::child-displacement-x = 1
 	GtkButton::child-displacement-y = 1
 	GtkButton::default-border = { 0, 0, 0, 0 }
+
 	GtkCheckButton::indicator-size = 16
+
 	GtkPaned::handle-size = 6
+
 	GtkRange::trough-border = 0
 	GtkRange::slider-width = 14
 	GtkRange::stepper-size = 13
-	GtkRange::resize-grip = 13
 	GtkRange::trough-under-steppers = 1
+
 	GtkScale::trough-border = 0
 	GtkScale::slider-width = 23
 	GtkScale::slider-length = 14
-	GtkScale::trough-side-details = 0
+	GtkScale::trough-side-details = 1
+
+	GtkScrollbar::activate-slider = 1
+	GtkScrollbar::trough-border = 0
+	GtkScrollbar::slider-width = 13
+	GtkScrollbar::min-slider-length = 31
 
-	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		= 0
-	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
@@ -120,27 +108,26 @@ style "default" {
 		lightborderstyle = 1
 		listviewstyle = 2
 		progressbarstyle = 0
-		colorize_scrollbar	= TRUE
+		colorize_scrollbar = FALSE
 		menubaritemstyle = 1
 		menubarstyle = 1
 		menustyle = 0
 		focusstyle = 3
 		handlestyle = 1
 		sliderstyle = 3
-		scrollbarstyle = 0
+		scrollbarstyle = 2
 		stepperstyle = 3
-		#rgba = TRUE
-		#trough_shades		= {0.98, 1.06}
+#		rgba = TRUE
 	}
 }
 
 style "dark"
 {
-	bg[NORMAL]   = @bg_color
-	bg[PRELIGHT] = shade (1.05, @bg_color)
+	bg[NORMAL]   = "#dfd7cf"
+	bg[PRELIGHT] = shade (1.05, "#dfd7cf")
 	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE]   = shade (0.95, @bg_color)
-	bg[INSENSITIVE]   = @bg_color
+	bg[ACTIVE]   = shade (0.95, "#dfd7cf")
+	bg[INSENSITIVE]   = "#dfd7cf"
 }
 
 style "wide" {
@@ -202,30 +189,25 @@ style "spinbutton" = "notebook_button" {
 	}
 }
 
-style "scrollbar" {
-	bg[SELECTED]		= shade (0.70, @base_color)			# color indicador
-	bg[NORMAL]			= shade (0.90, @bg_color)			# color borde indicador
+style "scrollbar" = "button" {
+	xthickness = 2
+	ythickness = 2
 
-    # 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
+	bg[NORMAL] = @bg_color
+	bg[PRELIGHT] = shade (1.04, @bg_color)
+	bg[ACTIVE] = shade (0.96, @bg_color)
+
+	engine "murrine"
+	{
+		border_shades = {0.95, 0.90}
+		roundness = 20
+		contrast = 1.0
+		trough_shades = {0.92, 0.98}
+		lightborder_shade = 1.3
+		glowstyle = 5
+		glow_shade = 1.02
+		gradient_shades = {1.2, 1.0, 1.0, 0.86}
+		trough_border_shades = {0.9, 0.98}
 	}
 }
 
@@ -301,7 +283,7 @@ style "comboboxentry" = "notebook_button" {
 
 style "menubar" = "dark" {
 	# those two lines were added to fix firefox's menubar item text
-	bg[SELECTED] = @bg_color
+	bg[SELECTED] = "#ece7e2"
 	fg[SELECTED] = @fg_color
 
 	engine "murrine" {
@@ -328,7 +310,7 @@ style "toolbar-button" = "notebook_button" {
 style "menu" {
 	xthickness = 0
 	ythickness = 0
-	bg[NORMAL] = @base_color
+
 	engine "murrine"
 	{
 		reliefstyle = 0
@@ -353,8 +335,8 @@ style "menu_item" = "menu" {
 }
 
 style "menubar_item" = "menu_item" {
-	bg[PRELIGHT] = @selected_bg_color
-	fg[PRELIGHT] = @selected_fg_color
+	bg[PRELIGHT] = "#ece7e2"
+	fg[PRELIGHT] = @fg_color
 
 	engine "murrine" {
 		gradient_shades = {1.00, 1.0, 1.0, 1.0}
@@ -540,7 +522,7 @@ style "menuitem_text_is_fg_color_workaround" {
 	text[PRELIGHT]      = @selected_fg_color
 	text[SELECTED]      = @selected_fg_color
 	text[ACTIVE]        = @fg_color
-	text[INSENSITIVE]   = @fg_color
+	text[INSENSITIVE]   = "#99958b"
 }
 
 # Workaround style for places where the fg color is used instead of the text color.
@@ -684,14 +666,20 @@ widget "*IdoEntryMenuItem*" style "wide"
 widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "evo_new_button_workaround"
 
 # Includes
-include "assets/ff.rc"
-include "assets/chromium.rc"
-include "assets/gnome-terminal.rc"
-#include "assets/nautilus.rc"
-include "assets/lxpanel.rc"
-include "assets/entry.rc"
-include "assets/statusbar.rc"
-include "assets/toolbar.rc"
-include "assets/pcmanfm.rc"
-include "assets/xfce4-notifyd.rc"
-include "assets/thunar.rc"
+#include "apps/banshee.rc"
+include "apps/chromium.rc"
+include "apps/ff.rc"
+include "apps/gnome-terminal.rc"
+include "apps/nautilus.rc"
+
+# Lubuntu specific
+include "apps/lubuntu_lxpanel.rc"
+include "apps/lubuntu_toolbar.rc"
+include "apps/lubuntu_entry.rc"
+include "apps/lubuntu_menu.rc"
+include "apps/pcmanfm.rc"
+
+# XFCE specific
+include "apps/xfce4-notify.rc"
+include "apps/thunar.rc"
+