- gtk 3.20 compatibility

- re-merge with ubuntu themes (version 14.04+16.10.20160720.laney1-0ubuntu1)

changelog

@@ -1,8 +1,3 @@
-- improve rc files
+- gtk 3.20 compatibility
-- fix gnome / gtk3 scrollbars
+- re-merge with ubuntu themes (version 14.04+16.10.20160720.laney1-0ubuntu1)
-- fix progress bars
-- add more icons
-- more icon resolutions
-- re-merge with ubuntu themes
-- overall re-compress
 

src/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"
+
+
+
+
+
+
+

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

@@ -1,15 +1,39 @@
+# ==============================================================================
+# CHROMIUM SPECIFIC SETTINGS
+# ==============================================================================
+
+style "chromium_toolbar_button" {
+	engine "murrine" {
+		roundness = 3
+		textstyle = 0
+	}
+}
+
 style "chrome-gtk-frame"
 {
-    ChromeGtkFrame::frame-color = "#dcdcdc"
+  ChromeGtkFrame::frame-color = "#dfd7cf"
-    ChromeGtkFrame::inactive-frame-color = "#dcdcdc"
+  ChromeGtkFrame::inactive-frame-color = "#dfd7cf"
+
+  ChromeGtkFrame::frame-gradient-size = 16
+  ChromeGtkFrame::frame-gradient-color = shade (0.97, @bg_color)
 
-    ChromeGtkFrame::incognito-frame-color = "#dcdcdc"
+  ChromeGtkFrame::incognito-frame-color = "#dfd7cf"
-    ChromeGtkFrame::incognito-inactive-frame-color = "#dcdcdc"
+  ChromeGtkFrame::incognito-inactive-frame-color = "#dfd7cf"
 
-    ChromeGtkFrame::scrollbar-trough-color = "#dcdcdc"
+  ChromeGtkFrame::incognito-frame-gradient-size = 16
-    ChromeGtkFrame::scrollbar-slider-normal-color = "#b0b0b0"
+  ChromeGtkFrame::incognito-frame-gradient-color = shade (0.97, @bg_color)
-    ChromeGtkFrame::scrollbar-slider-prelight-color = "#777777"
 
+  ChromeGtkFrame::scrollbar-trough-color = shade (0.912, @bg_color)
+  ChromeGtkFrame::scrollbar-slider-prelight-color = shade (1.04, @bg_color)
+  ChromeGtkFrame::scrollbar-slider-normal-color = @bg_color
 }
 
 class "ChromeGtkFrame" style "chrome-gtk-frame"
+
+widget_class "*Chrom*Button*" style "chromium_toolbar_button"
+
+
+
+
+
+

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

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

src/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
 }

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

@@ -0,0 +1,357 @@
+########################################################################
+# Entry
+########################################################################
+
+style "entry"
+{
+	GtkWidget::interior_focus = 0
+  GtkEntry::inner-border = {1, 1, 1, 1}
+	
+	engine "pixmap"
+	{
+### Entry ###
+		image
+		{
+			function = SHADOW
+			detail = "entry"
+			file = "images/entry.png"
+			border = {2, 2, 2, 2}
+			stretch	= TRUE
+		}
+		
+### Focus ###
+		image
+    	{
+			function = FOCUS
+			detail = "entry"
+			file = "images/entry-active.png"
+			border = {2, 2, 2, 2}
+			stretch	= TRUE
+    	}
+	}
+}
+
+class "GtkEntry*" style "entry"
+
+########################################################################
+# Panel
+########################################################################
+
+style "theme-panel"
+{
+	xthickness = 4
+	ythickness = 0
+	bg_pixmap[NORMAL] = "images/panel-bg.png"
+
+	fg[NORMAL]	= "#000000"
+	fg[PRELIGHT]	= "#ffffff"
+	fg[ACTIVE]	= "#f5f5f5"
+	text[NORMAL]	= "#000000"
+	text[PRELIGHT]	= "#ffffff"
+	text[ACTIVE]	= "#f5f5f5"
+	
+	engine "pixmap" {
+		image {
+			function	= BOX
+			recolorable	= TRUE
+			state		= NORMAL
+		}
+		image {
+			function	= BOX
+			recolorable	= TRUE
+			state		= PRELIGHT
+			file		= "images/panel-button-hover.png"
+			border		= { 4, 4, 1, 1 }
+			stretch		= TRUE
+		}
+		image {
+			function	= BOX
+			recolorable	= TRUE
+			state		= ACTIVE
+			file		= "images/panel-button-active.png"
+			border		= { 4, 4, 1, 1 }
+			stretch		= TRUE
+		}
+		image {
+			function	= BOX
+			recolorable	= TRUE
+			state		= SELECTED
+			file		= "images/panel-button-active.png"
+			border		= { 4, 4, 1, 1 }
+			stretch		= TRUE
+		}
+		image {
+			function	= BOX
+			recolorable	= TRUE
+			state		= INSENSITIVE
+		}
+		image {
+			function	= ARROW
+			recolorable	= TRUE
+			arrow_direction	= DOWN
+		}
+	}
+}
+
+style "theme-panel-light"
+{
+	xthickness = 1
+	ythickness = 0
+
+	fg[NORMAL] = @fg_color
+}
+
+style "theme-panel-text"
+{
+	fg[NORMAL]	= "#000000"
+	fg[PRELIGHT]	= "#333333"
+	fg[ACTIVE]	= "#f5f5f5"
+	text[NORMAL]	= "#f5f5f5"
+	text[PRELIGHT]	= "#ffffff"
+	text[ACTIVE]	= "#f5f5f5"
+}
+
+style "theme-main-menu-text" = "theme-panel-text"
+{
+	fg[PRELIGHT]	= "#ffffff"
+	text[PRELIGHT]	= "#ffffff"
+}
+
+style "theme-panel-handle" 
+{
+	engine "pixmap" {    
+		image {
+			function = HANDLE
+		}    
+		image {
+			function = HANDLE
+		}
+	}
+}
+
+widget "*PanelWidget*"			style "theme-panel"
+widget "*PanelApplet*"			style "theme-panel"
+widget "*fast-user-switch*"		style "theme-panel"
+widget "*CPUFreq*Applet*"		style "theme-panel"
+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 "*Tray*"			style "theme-panel" 
+widget_class "*tray*"			style "theme-panel"
+widget_class "*computertemp*"		style "theme-panel"
+widget_class "*Applet*Tomboy*"		style "theme-panel"
+widget_class "*Applet*Netstatus*"	style "theme-panel"
+
+# Fixes for tooltip text in some apps.
+widget_class "*Notif*Beagle*"	style "theme-panel-light"
+widget_class "*Notif*Brasero*"	style "theme-panel-light"
+
+# XFCE panel theming.
+widget "*Xfce*Panel*"	style "theme-panel"
+class "*Xfce*Panel*"	style "theme-panel"
+
+# lxpanel and fbpanel
+widget "*.tclock.*"		style "theme-panel"
+widget "*.taskbar.*"		style "theme-panel"
+widget_class "*GtkBgbox*"	style "theme-panel"
+
+# Make sure panel text color doesn't change
+widget_class "*Panel*MenuBar*"		style "theme-main-menu-text"
+widget_class "*Panel*<GtkMenuBar>*"	style "theme-main-menu-text"
+widget "*.clock-applet-button.*"	style "theme-panel-text"
+widget "*PanelApplet*"			style "theme-panel-text"
+
+# Hide ugly handle
+class "PanelAppletFrame" style:highest "theme-panel-handle"
+
+# The following removes the arrows from the panel
+
+style "panel-arrow-remove" {
+engine "pixmap" {
+	image {
+		function	= ARROW
+		recolorable	= TRUE
+		overlay_file	= "images/arrow-blank.png"
+		overlay_border	= {2,2,2,2}
+		overlay_stretch	= FALSE
+		arrow_direction	= UP
+		}
+	image {
+		function	= ARROW
+		recolorable	= TRUE
+		overlay_file	= "images/arrow-blank.png"
+		overlay_border	= {2,2,2,2}
+		overlay_stretch	= FALSE
+		arrow_direction	= DOWN
+		}
+	}
+}
+
+widget_class "*PanelToplevel*" style "panel-arrow-remove"
+
+########################################################################
+# Menu
+########################################################################
+
+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
+	}
+}
+
+########################################################################
+# Scrollbar
+########################################################################
+
+style "default" {
+
+	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 		= 0
+	GtkScrollbar		::trough-side-details		= 0
+	GtkScrollbar		::stepper-size          	= 1
+	
+	GtkScrolledWindow	::scrollbar-spacing		= 0
+	GtkScrolledWindow	::scrollbars-within-bevel	= 1
+
+}
+
+style "scrollbar" {
+	bg[SELECTED]	= shade (0.70, @base_color)		# color indicador
+	bg[NORMAL]	= shade (0.90, @bg_color)		# color borde indicador
+
+	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
+	colorize_scrollbar	= TRUE
+	scrollbarstyle = 0
+	}
+}
+
+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 }
+	}
+}
+
+########################################################################
+# Toolbar
+########################################################################
+
+##########################################################################
+# Toolbar
+##########################################################################
+
+style "toolbar" {
+	engine "pixmap"
+	{
+		image 
+		{
+	  		function = BOX
+			recolorable = TRUE
+	  		file = "images/toolbar.png"
+	  		border 	= {1,1,1,1}
+        	stretch = TRUE
+		}
+		
+		image 
+		{
+			function = HANDLE
+		    overlay_file = "images/handle-horiz.png"
+		    overlay_stretch = FALSE
+		    orientation	= HORIZONTAL
+		}
+        	
+        image 
+        {
+			function = HANDLE
+		    overlay_file = "images/handle-vert.png"
+		    overlay_stretch = FALSE
+		    orientation	= VERTICAL
+		}
+	}
+}
+
+class "*Toolbar*" style "toolbar"
+class "*Handle*" style "toolbar"
+class "*Paned*" style "toolbar"
+

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

@@ -1,35 +0,0 @@
-########################################################################
-# Entry
-########################################################################
-
-style "entry"
-{
-	GtkWidget::interior_focus = 0
-  GtkEntry::inner-border = {1, 1, 1, 1}
-	
-	engine "pixmap"
-	{
-### Entry ###
-		image
-		{
-			function = SHADOW
-			detail = "entry"
-			file = "images/entry.png"
-			border = {2, 2, 2, 2}
-			stretch	= TRUE
-		}
-		
-### Focus ###
-		image
-    	{
-			function = FOCUS
-			detail = "entry"
-			file = "images/entry-active.png"
-			border = {2, 2, 2, 2}
-			stretch	= TRUE
-    	}
-	}
-}
-
-class "GtkEntry*" style "entry"
-

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

@@ -1,154 +0,0 @@
-style "theme-panel"
-{
-	xthickness = 4
-	ythickness = 0
-	bg_pixmap[NORMAL] = "images/panel-bg.png"
-
-	fg[NORMAL]	= "#000000"
-	fg[PRELIGHT]	= "#ffffff"
-	fg[ACTIVE]	= "#f5f5f5"
-	text[NORMAL]	= "#000000"
-	text[PRELIGHT]	= "#ffffff"
-	text[ACTIVE]	= "#f5f5f5"
-	
-	engine "pixmap" {
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= NORMAL
-		}
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= PRELIGHT
-			file		= "images/panel-button-hover.png"
-			border		= { 4, 4, 1, 1 }
-			stretch		= TRUE
-		}
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= ACTIVE
-			file		= "images/panel-button-active.png"
-			border		= { 4, 4, 1, 1 }
-			stretch		= TRUE
-		}
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= SELECTED
-			file		= "images/panel-button-active.png"
-			border		= { 4, 4, 1, 1 }
-			stretch		= TRUE
-		}
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= INSENSITIVE
-		}
-		image {
-			function	= ARROW
-			recolorable	= TRUE
-			arrow_direction	= DOWN
-		}
-	}
-}
-
-style "theme-panel-light"
-{
-	xthickness = 1
-	ythickness = 0
-
-	fg[NORMAL] = @fg_color
-}
-
-style "theme-panel-text"
-{
-	fg[NORMAL]	= "#000000"
-	fg[PRELIGHT]	= "#333333"
-	fg[ACTIVE]	= "#f5f5f5"
-	text[NORMAL]	= "#f5f5f5"
-	text[PRELIGHT]	= "#ffffff"
-	text[ACTIVE]	= "#f5f5f5"
-}
-
-style "theme-main-menu-text" = "theme-panel-text"
-{
-	fg[PRELIGHT]	= "#ffffff"
-	text[PRELIGHT]	= "#ffffff"
-}
-
-style "theme-panel-handle" 
-{
-	engine "pixmap" {    
-		image {
-			function = HANDLE
-		}    
-		image {
-			function = HANDLE
-		}
-	}
-}
-
-widget "*PanelWidget*"			style "theme-panel"
-widget "*PanelApplet*"			style "theme-panel"
-widget "*fast-user-switch*"		style "theme-panel"
-widget "*CPUFreq*Applet*"		style "theme-panel"
-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 "*Tray*"			style "theme-panel" 
-widget_class "*tray*"			style "theme-panel"
-widget_class "*computertemp*"		style "theme-panel"
-widget_class "*Applet*Tomboy*"		style "theme-panel"
-widget_class "*Applet*Netstatus*"	style "theme-panel"
-
-# Fixes for tooltip text in some apps.
-widget_class "*Notif*Beagle*"	style "theme-panel-light"
-widget_class "*Notif*Brasero*"	style "theme-panel-light"
-
-# XFCE panel theming.
-widget "*Xfce*Panel*"	style "theme-panel"
-class "*Xfce*Panel*"	style "theme-panel"
-
-# lxpanel and fbpanel
-widget "*.tclock.*"		style "theme-panel"
-widget "*.taskbar.*"		style "theme-panel"
-widget_class "*GtkBgbox*"	style "theme-panel"
-
-# Make sure panel text color doesn't change
-widget_class "*Panel*MenuBar*"		style "theme-main-menu-text"
-widget_class "*Panel*<GtkMenuBar>*"	style "theme-main-menu-text"
-widget "*.clock-applet-button.*"	style "theme-panel-text"
-widget "*PanelApplet*"			style "theme-panel-text"
-
-# Hide ugly handle
-class "PanelAppletFrame" style:highest "theme-panel-handle"
-
-# The following removes the arrows from the panel
-
-style "panel-arrow-remove" {
-engine "pixmap" {
-	image {
-		function	= ARROW
-		recolorable	= TRUE
-		overlay_file	= "images/arrow-blank.png"
-		overlay_border	= {2,2,2,2}
-		overlay_stretch	= FALSE
-		arrow_direction	= UP
-		}
-	image {
-		function	= ARROW
-		recolorable	= TRUE
-		overlay_file	= "images/arrow-blank.png"
-		overlay_border	= {2,2,2,2}
-		overlay_stretch	= FALSE
-		arrow_direction	= DOWN
-		}
-	}
-}
-
-widget_class "*PanelToplevel*" style "panel-arrow-remove"

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

@@ -1,36 +0,0 @@
-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
-	}
-}

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

@@ -1,75 +0,0 @@
-style "default" {
-
-	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 		= 0
-	GtkScrollbar		::trough-side-details		= 0
-	GtkScrollbar		::stepper-size          	= 1
-	
-	GtkScrolledWindow	::scrollbar-spacing		= 0
-	GtkScrolledWindow	::scrollbars-within-bevel	= 1
-
-}
-
-style "scrollbar" {
-	bg[SELECTED]	= shade (0.70, @base_color)		# color indicador
-	bg[NORMAL]	= shade (0.90, @bg_color)		# color borde indicador
-
-	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
-	colorize_scrollbar	= TRUE
-	scrollbarstyle = 0
-	}
-}
-
-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 }
-	}
-}

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

@@ -1,38 +0,0 @@
-##########################################################################
-# Toolbar
-##########################################################################
-
-style "toolbar" {
-	engine "pixmap"
-	{
-		image 
-		{
-	  		function = BOX
-			recolorable = TRUE
-	  		file = "images/toolbar.png"
-	  		border 	= {1,1,1,1}
-        	stretch = TRUE
-		}
-		
-		image 
-		{
-			function = HANDLE
-		    overlay_file = "images/handle-horiz.png"
-		    overlay_stretch = FALSE
-		    orientation	= HORIZONTAL
-		}
-        	
-        image 
-        {
-			function = HANDLE
-		    overlay_file = "images/handle-vert.png"
-		    overlay_stretch = FALSE
-		    orientation	= VERTICAL
-		}
-	}
-}
-
-class "*Toolbar*" style "toolbar"
-class "*Handle*" style "toolbar"
-class "*Paned*" style "toolbar"
-

src/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"

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

@@ -666,16 +666,14 @@ widget "*IdoEntryMenuItem*" style "wide"
 widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "evo_new_button_workaround"
 
 # Includes
+#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.rc"
-include "apps/lubuntu_toolbar.rc"
-include "apps/lubuntu_entry.rc"
-include "apps/lubuntu_menu.rc"
-include "apps/lubuntu_scrollbar.rc"
 include "apps/pcmanfm.rc"
 
 # XFCE specific

src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/baobab.css

@@ -1,25 +0,0 @@
-
-BaobabWindow GtkGrid {
-    background-color: @bg_color;
-}
-
-BaobabLocationList GtkGrid {
-    background-color: transparent;
-}
-
-.baobab-toolbar.toolbar {
-    border-color: shade (@bg_color, 0.9);
-    border-style: solid;
-    border-width: 0 0 1px 0;
-    border-radius: 0;
-}
-
-.cell.baobab-level-cell,
-.cell.baobab-level-cell:hover,
-.cell.baobab-level-cell:selected,
-.cell.baobab-level-cell:selected:hover {
-    border-color: alpha (black, 0.06);
-    border-width: 1px;
-    border-style: solid;
-    background-color: @base_color;
-}

src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/calendar.css

@@ -0,0 +1,8 @@
+/* Make the calendar focus ring appear around the selected day */
+calendar-view  {
+    outline-style: dashed;
+    outline-color: @selected_bg_color;
+    outline-width: 2px;
+    -gtk-outline-radius: 8px;
+    outline-offset: -4px;
+}

src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/gedit.css

@@ -62,7 +62,7 @@ GeditFileBrowserWidget .toolbar  {
 
 /* Things from Adwaita start here...*/
 
-GeditOpenDocumentSelector .open-document-selector-treeview:prelight {
+GeditOpenDocumentSelector .open-document-selector-treeview:hover {
     background-color: alpha(@selected_bg_color, 0.4);
 }
 
@@ -99,19 +99,19 @@ GeditOpenDocumentSelector .open-document-selector-treeview:prelight {
     border-color: transparent;
     border-width: 1px;
     padding: 1px;
-    icon-shadow: none;
+    -gtk-icon-shadow: none;
 }
 
-.gedit-document-panel .prelight-row .button  {
+.gedit-document-panel .hover-row .button  {
     color: black;
     border-color: transparent;
 }
 
-.gedit-document-panel .prelight-row:selected .button {
+.gedit-document-panel .hover-row:selected .button {
     color:  white;
 }
 
-.gedit-document-panel .prelight-row .button:backdrop {
+.gedit-document-panel .hover-row .button:backdrop {
     color: black;
 }
 
@@ -145,26 +145,25 @@ GeditStatusbar .button.flat {
 }
 
 
-.notebook GeditCloseButton.button:prelight{
+.notebook GeditCloseButton.button:hover{
     border-color: shade(@bg_color,0.65);
 }
 
-.notebook GeditTabLabel.active-page GeditCloseButton.button:prelight{
+.notebook GeditTabLabel.active-page GeditCloseButton.button:hover{
     border-color: darker(@bg_color);
 }
 
-.notebook GeditCloseButton:backdrop.button:prelight{
+.notebook GeditCloseButton:backdrop.button:hover{
     border-color: shade(@bg_color,0.75);
     border-image: none;
     border-style: solid;
     background-color: transparent;
 }
 
-.notebook GeditTabLabel.active-page GeditCloseButton:backdrop.button:prelight{
+.notebook GeditTabLabel.active-page GeditCloseButton:backdrop.button:hover{
     border-color: shade(@bg_color,0.85);
     border-image: none;
     border-style: solid;
     background-color: transparent;
 }
 
-

src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/gnome-panel.css

@@ -14,8 +14,8 @@ PanelWidget,
 PanelApplet,
 PanelToplevel {
     background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (shade (@dark_bg_color, 1.15)),
+                                     from (shade (@dark_bg_color, 1.5)),
-                                     to (shade (@dark_bg_color, 0.95)));
+                                     to (shade (@dark_bg_color, 1.05)));
 }
 
 PanelApplet {
@@ -26,8 +26,8 @@ PanelSeparator:backdrop,
 PanelSeparator {
     border-width: 0;
     background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (shade (@dark_bg_color, 1.15)),
+                                     from (shade (@dark_bg_color, 1.5)),
-                                     to (shade (@dark_bg_color, 0.95)));
+                                     to (shade (@dark_bg_color, 1.05)));
 
     color: @dark_fg_color;
 }
@@ -39,57 +39,76 @@ PanelMenuBar.menubar,
 PanelMenuBar.menubar.menuitem {
     -PanelMenuBar-icon-visible: true;
     background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (shade (@dark_bg_color, 1.15)),
+                                     from (shade (@dark_bg_color, 1.5)),
-                                     to (shade (@dark_bg_color, 0.95)));
+                                     to (shade (@dark_bg_color, 1.05)));
 }
 
 PanelAppletFrame { 
     background-color: @dark_bg_color;
     background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (shade (@dark_bg_color, 1.15)),
+                                     from (shade (@dark_bg_color, 1.5)),
-                                     to (shade (@dark_bg_color, 0.95)));
+                                     to (shade (@dark_bg_color, 1.05)));
     border-width: 0;
 }
 
 PanelApplet .button:backdrop,
 PanelApplet .button {
-    -GtkButton-inner-border: 2;
-
     border-image: none;
     background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (shade (@dark_bg_color, 1.15)),
+                                     from (shade (@dark_bg_color, 1.5)),
-                                     to (shade (@dark_bg_color, 0.95)));    
+                                     to (shade (@dark_bg_color, 1.05)));
-    border-color: alpha (shade (@dark_bg_color, 0.9), 0.6);
+    border-color: alpha (shade (@dark_bg_color, 1.0), 0.6);
-    border-left-color: alpha (shade (@dark_bg_color, 1.2), 0.6);
+    border-left-color: alpha (shade (@dark_bg_color, 1.5), 0.3);
     border-radius: 0;
     border-width: 0 1px 0 1px;
 
+    color: @dark_fg_color;
     text-shadow: none;
 }
 
-PanelApplet .button:active:prelight:backdrop,
+PanelApplet .button:active:hover:backdrop,
-PanelApplet .button:active:prelight,
+PanelApplet .button:active:hover,
 PanelApplet .button:active:backdrop,
 PanelApplet .button:active {
     border-image: none;
     background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (shade (@dark_bg_color, 0.7)),
+                                     from (shade (@dark_bg_color, 0.85)),
-                                     to (shade (@dark_bg_color, 0.8))); 
+                                     to (shade (@dark_bg_color, 1.0))); 
-    border-color: shade (@dark_bg_color, 0.7);
+    border-color: shade (@dark_bg_color, 0.9);
 }
 
-PanelApplet .button:prelight:backdrop,
+PanelApplet .button:hover:backdrop,
-PanelApplet .button:prelight {
+PanelApplet .button:hover {
     border-image: none;
     background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (shade (@dark_bg_color, 1.3)),
+                                     from (shade (@dark_bg_color, 1.7)),
+                                     to (shade (@dark_bg_color, 1.25)));
+    border-color: alpha (shade (@dark_bg_color, 1.0), 0.6);
+    border-left-color: alpha (shade (@dark_bg_color, 1.5), 0.4);
+}
+
+PanelApplet .button:checked {
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@dark_bg_color, 0.95)),
                                      to (shade (@dark_bg_color, 1.1)));
-    border-color: alpha (shade (@dark_bg_color, 0.9), 0.6);
+}
-    border-left-color: alpha (shade (@dark_bg_color, 1.2), 0.8);
+
+PanelApplet .button:checked:hover {
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@dark_bg_color, 1.15)),
+                                     to (shade (@dark_bg_color, 1.3)));
+}
+
+PanelApplet .button:checked:hover:active {
+    border-image: none;
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@dark_bg_color, 0.75)),
+                                     to (shade (@dark_bg_color, 0.9))); 
+    border-color: shade (@dark_bg_color, 0.8);
 }
 
 ClockBox {
-    text-shadow: 0 1px shade (@dark_bg_color, 1.08);
+    text-shadow: 0 -1px shade (@dark_bg_color, 0.6);
 }
 
 WnckPager, WnckTasklist {

src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/gnome-terminal.css

@@ -1,23 +1,76 @@
 /* gnome-terminal */
 @define-color terminal_bg #300a24;
 
-TerminalScreen {
+vte-terminal.terminal-screen {
     -TerminalScreen-background-darkness: 0.95;
     background-color: @terminal_bg;
     color: #fff;
 }
 
-TerminalScreenContainer .scrollbar:hover:not(.slider),
+terminal-screen-container scrollbar:hover,
-TerminalScreenContainer .scrollbar.dragging:not(.slider) {
+terminal-screen-container scrollbar:active {
     background-color: alpha(@scrollbar_track_color, 0.4);
+    border-radius: 1px;
 }
 
-/* Since .hovering class is not working here, we always use the same radius */
+terminal-screen-container {
-TerminalScreenContainer .scrollbar.slider.hovering,
+    background-color: transparent;
-TerminalScreenContainer .scrollbar.slider.dragging {
-    border-radius: 1px;
 }
 
-TerminalScreenContainer .scrollbar {
+notebook.terminal-notebook header {
+    background-color: @dark_bg_color;
+    border: none;
+}
+
+
+notebook.terminal-notebook header.top tab,
+notebook.terminal-notebook header.top tab:hover {
+    background-color: shade(@bg_color, 0.75);
+    border-width: 1px 1px 0px 1px;
+    border-radius:  8px 8px 0px 0px;
+    border-image: none;
+    border-style: solid;
+    border-color: @dark_bg_color;
+}
+
+notebook.terminal-notebook header.top tab:checked {
+    background-color: shade(@bg_color, 1.2);
+}
+
+notebook.terminal-notebook tab button,
+notebook.terminal-notebook tab button:hover {
     background-color: transparent;
+    padding: 1px;
+}
+
+notebook.terminal-notebook > header > box,
+notebook.terminal-notebook > header > box:hover {
+    padding-left: 5px;
+}
+
+notebook.terminal-notebook > header > box button,
+notebook.terminal-notebook > header > box button:hover,
+notebook.terminal-notebook > header > box button:hover:backdrop {
+    background: inherit;
+    border: inherit;
+    padding: inherit;
+}
+
+notebook.terminal-notebook > header > box > box > button:not(:last-child):hover,
+notebook.terminal-notebook > header > box > box > button:not(:last-child):hover:backdrop,
+notebook.terminal-notebook > header > box > box > button:not(:last-child) {
+    padding-right: 5px;
+}
+
+notebook.terminal-notebook > header > box button:hover,
+notebook.terminal-notebook > header > box button:hover:backdrop {
+    color: shade (@bg_color, 0.9);
+}
+
+notebook.terminal-notebook > header > box button {
+    color: shade (@bg_color, 0.7);
+}
+
+notebook.terminal-notebook > header > box button:backdrop {
+    color: shade (@bg_color, 0.4);
 }

src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/nautilus.css

@@ -26,18 +26,18 @@
 }
 
 .nautilus-desktop.nautilus-canvas-item:active,
-.nautilus-desktop.nautilus-canvas-item:prelight,
+.nautilus-desktop.nautilus-canvas-item:hover,
 .nautilus-desktop.nautilus-canvas-item:selected {
     text-shadow: none;
 }
 
 .nautilus-desktop.nautilus-canvas-item:selected:backdrop {
-    color: @theme_unfocused_selected_fg_color;
+    color: @theme_unfocus_selected_fg_color;
 }
 
 .nautilus-circular-button {
   border-radius: 20px;
-  outline-radius: 20px;
+  -gtk-outline-radius: 20px;
 }
 
 /* Toolbar */
@@ -79,8 +79,8 @@
 }
 
 .floating-bar:backdrop {
-  background-color: @theme_unfocused_base_color;
+  background-color: @theme_unfocus_base_color;
-  border-color: @unfocused_borders;
+  border-color: @unfocus_borders;
 }
 
 .floating-bar .button {

src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/unity-greeter.css

@@ -1,14 +1,14 @@
-.lightdm.menu {
+.lightdm menu {
     background-image: none;
     background-color: alpha (black, 0.6);
-    border-color: alpha (white, 0.2);
+    border: none;
-    border-radius: 4px;
+    border-radius: 0px;
     padding: 1px;
 
     color: white;
 }
 
-.lightdm-combo .menu {
+.lightdm-combo menu {
     background-color: shade (@dark_bg_color, 1.08);
     border-radius: 0px;
     padding: 0px;
@@ -16,23 +16,33 @@
     color: white;
 }
 
-.lightdm.menu .menuitem *,
+.lightdm menu menuitem *,
-.lightdm.menu .menuitem.check:active,
+.lightdm menu menuitem.check:active,
-.lightdm.menu .menuitem.radio:active {
+.lightdm menu menuitem.radio:active {
     color: white;
 }
 
-.lightdm.menubar {
+.lightdm menu menuitem *:disabled {
+    color: inherit;
+    text-shadow: inherit;
+}
+
+.lightdm menu separator {
+    border: inherit;
+    background-color: alpha(black, 0.05);
+    border-color: alpha(black, 0.07);
+}
+
+.lightdm menubar {
     background-image: none;
     background-color: alpha (black, 0.5);
 }
 
-.lightdm-combo.combobox-entry .button,
+.lightdm-combo cell,
-.lightdm-combo .cell,
+.lightdm-combo button,
-.lightdm-combo .button,
+.lightdm-combo entry,
-.lightdm-combo .entry,
+.lightdm button,
-.lightdm.button,
+.lightdm entry {
-.lightdm.entry {
     background-image: none;
     background-color: alpha (black, 0.3);
     border-color: alpha (white, 0.6);
@@ -43,20 +53,20 @@
     text-shadow: none;
 }
 
-.lightdm.button,
+.lightdm button,
-.lightdm.button:hover,
+.lightdm button:hover,
-.lightdm.button:active,
+.lightdm button:active,
-.lightdm.button:active:focused,
+.lightdm button:active:focus,
-.lightdm.entry,
+.lightdm entry,
-.lightdm.entry:hover,
+.lightdm entry:hover,
-.lightdm.entry:active,
+.lightdm entry:active,
-.lightdm.entry:active:focused {
+.lightdm entry:active:focus {
     background-image: none;
     border-image: none;
 }
 
-.lightdm.button:focused,
+.lightdm button:focus,
-.lightdm.entry:focused {
+.lightdm entry:focus {
     border-color: alpha (white, 0.9);
     border-width: 1px;
     border-style: solid;
@@ -64,7 +74,7 @@
     color: white;
 }
 
-.lightdm.entry:selected {
+.lightdm entry:selected {
     background-color: alpha (white, 0.2);
 }
 
@@ -72,7 +82,7 @@
     to { -gtk-icon-transform: rotate(1turn); }
 }
 
-.lightdm.entry:active {
+.lightdm entry:active {
     -gtk-icon-source: -gtk-icontheme("process-working-symbolic");
     animation: dashentry_spinner 1s infinite linear;
 }

src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/unity.css

@@ -1,131 +0,0 @@
-/* Decorations */
-
-UnityDecoration {
-    -UnityDecoration-extents: 28px 0 0 0;
-    -UnityDecoration-input-extents: 10px;
-
-    -UnityDecoration-shadow-offset-x: 1px;
-    -UnityDecoration-shadow-offset-y: 5px;
-    -UnityDecoration-active-shadow-color: rgba (0, 0, 0, 0.78);
-    -UnityDecoration-active-shadow-radius: 30px;
-    -UnityDecoration-inactive-shadow-color: rgba (0, 0, 0, 0.3);
-    -UnityDecoration-inactive-shadow-radius: 25px;
-
-    -UnityDecoration-glow-size: 10px;
-    -UnityDecoration-glow-color: rgb (221, 72, 20);
-
-    -UnityDecoration-title-indent: 10px;
-    -UnityDecoration-title-fade: 35px;
-    -UnityDecoration-title-alignment: 0.0;
-}
-
-UnityDecoration.top {
-    border: 1px solid rgba (85, 40, 0, 0.04); /* shade (@dark_bg_color) (shade (#edebe6, 1.06) */
-    border-bottom-width: 0;
-    border-radius: 6px 6px 0 0;
-    padding: 1px 6px 0 6px;
-
-    box-shadow: inset 0 0 transparent, inset 0 0 transparent,
-                inset 0 1px shade (#edebe6, 1.065), inset 0 0 transparent;
-
-    background-color: transparent;
-    background-clip: border-box;
-    background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (shade (#edebe6, 1.06)),
-                                     to (@dark_bg_color));
-
-    color: shade (@dark_bg_color, 0.4);
-    text-shadow: 1px 0 shade (@dark_bg_color, 1.06), -1px 0 shade (@dark_bg_color, 1.06),
-                 0 1px shade (@dark_bg_color, 1.06), 0 -1px shade (@dark_bg_color, 1.06);
-}
-
-UnityDecoration.top:backdrop {
-    border: 1px solid rgba (110, 27, 0, 0.04); /* shade @dark_bg_color - shade (#edebe6, 0.96) */
-    border-bottom-width: 0;
-    background-color: transparent;
-    background-clip: border-box;
-    background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (shade (#edebe6, 0.96)),
-                                     to (@dark_bg_color));
-    box-shadow: inset 0 0 transparent, inset 0 0 transparent,
-                inset 0 1px shade (#edebe6, 0.97), inset 0 0 transparent;
-
-    color: #a39e9a;
-    text-shadow: 1px 0 1px shade (@dark_bg_color, 1.08), -1px 0 1px shade (@dark_bg_color, 1.08),
-                 0 1px 1px shade (@dark_bg_color, 1.08), 0 -1px 1px shade (@dark_bg_color, 1.08);
-}
-
-UnityDecoration.left,
-UnityDecoration.right {
-    background-color: shade (@bg_color, 0.7);
-    background-size: 1px 70px;
-    background-repeat: repeat-x;
-
-    /* start color: mix of the top border color and bg-image gradient end */
-    background-image: -gtk-gradient (linear, left top, left bottom,
-                                     color-stop (0, #a89686),
-                                     color-stop (0.5, #a89686),
-                                     color-stop (1, shade (@bg_color, 0.7)));
-}
-
-UnityDecoration.left:backdrop,
-UnityDecoration.right:backdrop {
-    /* start color: mix of the top border color and bg-image gradient end */
-    background-image: -gtk-gradient (linear, left top, left bottom,
-                                     color-stop (0, #b5a395),
-                                     color-stop (0.5, #b5a395),
-                                     color-stop (1, shade (@bg_color, 0.7)));
-}
-
-UnityDecoration.bottom {
-    background-image: none;
-    background-color: shade (@bg_color, 0.7);
-}
-
-/* Panel Style */
-
-UnityPanelWidget,
-.unity-panel {
-    background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (shade (#edebe6, 1.06)),
-                                     to (@dark_bg_color));
-    border-top-color: shade (#edebe6, 1.08);
-    border-style: solid;
-    border-width: 1px 0 0 0;
-
-    color: shade (@dark_bg_color, 0.4);
-    text-shadow: 1px 0 shade (@dark_bg_color, 1.06), -1px 0 shade (@dark_bg_color, 1.06),
-                 0 1px shade (@dark_bg_color, 1.06), 0 -1px shade (@dark_bg_color, 1.06);
-}
-
-UnityPanelWidget:backdrop,
-.unity-panel:backdrop {
-    color: #a39e9a;
-}
-
-.unity-panel.menubar,
-.unity-panel .menubar {
-}
-
-.unity-panel.menuitem,
-.unity-panel .menuitem {
-    border-width: 1px 1px 0 1px;
-    icon-shadow: 0 -1px shade (@dark_bg_color, 1.06);
-}
-
-.unity-panel.menubar.menuitem:hover,
-.unity-panel.menubar .menuitem *:hover {
-    background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (shade (@dark_bg_color, 1.5)),
-                                     to (shade (@dark_bg_color, 1.02)));
-}
-
-@keyframes playbackmenuitem_spinner {
-    to { -gtk-icon-transform: rotate(1turn); }
-}
-
-.menu IdoPlaybackMenuItem.menuitem:active {
-    -gtk-icon-source: -gtk-icontheme("process-working-symbolic");
-    animation: playbackmenuitem_spinner 1s infinite linear;
-    color: @selected_bg_color;
-}

src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-main.css

@@ -55,23 +55,27 @@
 
 @define-color scrollbar_track_color mix(@base_color, black, 0.1); /* #e6e6e6 */
 
+@define-color progressbar_fill_a shade(@theme_selected_bg_color, 1.07);
+@define-color progressbar_fill_b shade(mix(@theme_selected_bg_color, @selected_bg_color, 0.10), 0.91);
+@define-color button_border_active shade(@theme_selected_bg_color, 0.95);
+@define-color progressbar_backdrop_fill_a shade(@backdrop_selected_bg_color, 1.07);
+@define-color progressbar_backdrop_fill_b shade(mix(@backdrop_selected_bg_color, grey, 0.10), 0.91);
+@define-color button_border_backdrop_active shade(@backdrop_selected_bg_color, 0.95);
+
 @import url("gtk-widgets-borders.css");
 @import url("gtk-widgets-borders-radiance.css");
 @import url("gtk-widgets-assets.css");
 @import url("gtk-widgets-assets-radiance.css");
 @import url("gtk-widgets.css");
 @import url("gtk-widgets-radiance.css");
-@import url("apps/geary.css");
 @import url("apps/unity.css");
 @import url("apps/unity-greeter.css");
-@import url("apps/baobab.css");
 @import url("apps/gedit.css");
 @import url("apps/nautilus.css");
 @import url("apps/gnome-panel.css");
 @import url("apps/gnome-terminal.css");
-@import url("apps/gnome-system-log.css");
-@import url("apps/glade.css");
 @import url("apps/software-center.css");
+@import url("apps/calendar.css");
 @import url("public-colors.css");
 
 @import url("gtk-lubuntu.css");

src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-assets-radiance.css

@@ -1,23 +1,23 @@
-.menu .check {
+menu check {
     -gtk-icon-source: url("assets/check-menuitem-unselected.png");
 }
 
-.menu .radio {
+menu radio {
     -gtk-icon-source: url("assets/check-menuitem-unselected.png");
 }
 
-.menu .check:checked {
+menu check:checked {
     -gtk-icon-source: url("assets/check-menuitem-dark.png");
 }
 
-.menu .check:checked:insensitive {
+menu check:checked:disabled {
     -gtk-icon-source: url("assets/check-menuitem-insensitive-dark.png");
 }
 
-.menu .radio:checked {
+menu radio:checked {
     -gtk-icon-source: url("assets/radio-menuitem-dark.png");
 }
 
-.menu .radio:checked:insensitive {
+menu radio:checked:disabled {
     -gtk-icon-source: url("assets/radio-menuitem-insensitive-dark.png");
 }

src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-assets.css

@@ -12,551 +12,563 @@
  *************************/
 
 /* draw regular check and radio items using our SVG assets */
-.check {
+check {
     -gtk-icon-source: url("assets/check-unselected.png");
 }
 
-.check:hover {
+check:hover {
     -gtk-icon-source: url("assets/check-unselected-hover.png");
 }
 
-.check row,
+check row,
-.check row:selected,
+check row:selected,
-.check row:selected:focus {
+check row:selected:focus {
     -gtk-icon-source: url("assets/check-unselected-alt.png");
 }
 
-.check row:hover,
+check row:hover,
-.check row:selected:hover,
+check row:selected:hover,
-.check row:selected:focus:hover {
+check row:selected:focus:hover {
     -gtk-icon-source: url("assets/check-unselected-hover-alt.png");
 }
 
-.check:insensitive {
+check:disabled {
     -gtk-icon-source: url("assets/check-unselected-disabled.png");
 }
 
-.check row:insensitive {
+check row:disabled {
     background-color: transparent;
 }
 
-.check row:insensitive,
+check row:disabled,
-.check row:selected:insensitive,
+check row:selected:disabled,
-.check row:selected:focus:insensitive {
+check row:selected:focus:disabled {
     background-color: transparent;
     -gtk-icon-source: url("assets/check-unselected-disabled-alt.png");
 }
 
-.check:backdrop {
+check:backdrop {
     -gtk-icon-source: url("assets/backdrop-check-unselected.png");
 }
 
-.check:hover:backdrop {
+check:hover:backdrop {
     -gtk-icon-source: url("assets/backdrop-check-unselected-hover.png");
 }
 
-.check row:backdrop,
+check row:backdrop,
-.check row:selected:backdrop {
+check row:selected:backdrop {
     -gtk-icon-source: url("assets/backdrop-check-unselected-alt.png");
 }
 
-.check row:hover:backdrop,
+check row:hover:backdrop,
-.check row:selected:hover:backdrop {
+check row:selected:hover:backdrop {
     -gtk-icon-source: url("assets/backdrop-check-unselected-hover-alt.png");
 }
 
-.check:insensitive:backdrop {
+check:disabled:backdrop {
     -gtk-icon-source: url("assets/backdrop-check-unselected-disabled.png");
 }
 
-.check row:selected:insensitive:backdrop {
+check row:selected:disabled:backdrop {
     -gtk-icon-source: url("assets/backdrop-check-unselected-disabled-alt.png");
 }
 
-.check:checked {
+check:checked {
     -gtk-icon-source: url("assets/check-selected.png");
 }
 
-.check:checked:hover {
+check:checked:hover {
     -gtk-icon-source: url("assets/check-selected-hover.png");
 }
 
-.check row:checked,
+check row:checked,
-.check row:selected:checked,
+check row:selected:checked,
-.check row:selected:focus:checked {
+check row:selected:focus:checked {
     -gtk-icon-source: url("assets/check-selected-alt.png");
 }
 
-.check row:checked:hover,
+check row:checked:hover,
-.check row:selected:checked:hover,
+check row:selected:checked:hover,
-.check row:selected:checked:focus:hover {
+check row:selected:checked:focus:hover {
     -gtk-icon-source: url("assets/check-selected-hover-alt.png");
 }
 
-.check:checked:insensitive {
+check:checked:disabled {
     -gtk-icon-source: url("assets/check-selected-disabled.png");
 }
 
-.check row:checked:insensitive,
+check row:checked:disabled,
-.check row:selected:checked:insensitive,
+check row:selected:checked:disabled,
-.check row:selected:focus:checked:insensitive {
+check row:selected:focus:checked:disabled {
     -gtk-icon-source: url("assets/check-selected-disabled-alt.png");
 }
 
-.check:checked:backdrop {
+check:checked:backdrop {
     -gtk-icon-source: url("assets/backdrop-check-selected.png");
 }
 
-.check:checked:backdrop {
+check:checked:backdrop {
     -gtk-icon-source: url("assets/backdrop-check-selected-hover.png");
 }
 
-.check row:checked:backdrop,
+check row:checked:backdrop,
-.check row:selected:checked:backdrop {
+check row:selected:checked:backdrop {
     -gtk-icon-source: url("assets/backdrop-check-selected-alt.png");
 }
 
-.check row:checked:hover:backdrop,
+check row:checked:hover:backdrop,
-.check row:selected:checked:hover:backdrop {
+check row:selected:checked:hover:backdrop {
     -gtk-icon-source: url("assets/backdrop-check-selected-hover-alt.png");
 }
 
-.check:checked:insensitive:backdrop {
+check:checked:disabled:backdrop {
     -gtk-icon-source: url("assets/backdrop-check-selected-disabled.png");
 }
 
-.check row:selected:checked:insensitive:backdrop {
+check row:selected:checked:disabled:backdrop {
     -gtk-icon-source: url("assets/backdrop-check-selected-disabled-alt.png");
 }
 
-.check:inconsistent {
+check:indeterminate {
     -gtk-icon-source: url("assets/check-mixed.png");
 }
 
-.check:inconsistent:hover {
+check:indeterminate:hover {
     -gtk-icon-source: url("assets/check-mixed-hover.png");
 }
 
-.check row:inconsistent,
+check row:indeterminate,
-.check row:selected:inconsistent,
+check row:selected:indeterminate,
-.check row:selected:focus:inconsistent {
+check row:selected:focus:indeterminate {
     -gtk-icon-source: url("assets/check-mixed-alt.png");
 }
 
-.check row:inconsistent:hover,
+check row:indeterminate:hover,
-.check row:selected:inconsistent:hover,
+check row:selected:indeterminate:hover,
-.check row:selected:focus:inconsistent:hover {
+check row:selected:focus:indeterminate:hover {
     -gtk-icon-source: url("assets/check-mixed-hover-alt.png");
 }
 
-.check:inconsistent:insensitive {
+check:indeterminate:disabled {
     -gtk-icon-source: url("assets/check-mixed-disabled.png");
 }
 
-.check row:inconsistent:insensitive,
+check row:indeterminate:disabled,
-.check row:selected:inconsistent:insensitive,
+check row:selected:indeterminate:disabled,
-.check row:selected:focus:inconsistent:insensitive {
+check row:selected:focus:indeterminate:disabled {
     -gtk-icon-source: url("assets/check-mixed-disabled-alt.png");
 }
 
-.check:inconsistent:backdrop {
+check:indeterminate:backdrop {
     -gtk-icon-source: url("assets/backdrop-check-mixed.png");
 }
 
-.check:inconsistent:hover:backdrop {
+check:indeterminate:hover:backdrop {
     -gtk-icon-source: url("assets/backdrop-check-mixed-hover.png");
 }
 
-.check row:inconsistent:backdrop,
+check row:indeterminate:backdrop,
-.check row:selected:inconsistent:backdrop {
+check row:selected:indeterminate:backdrop {
     -gtk-icon-source: url("assets/backdrop-check-mixed-alt.png");
 }
 
-.check row:inconsistent:hover:backdrop,
+check row:indeterminate:hover:backdrop,
-.check row:selected:inconsistent:hover:backdrop {
+check row:selected:indeterminate:hover:backdrop {
     -gtk-icon-source: url("assets/backdrop-check-mixed-hover-alt.png");
 }
 
-.check:inconsistent:insensitive:backdrop {
+check:indeterminate:disabled:backdrop {
     -gtk-icon-source: url("assets/backdrop-check-mixed-disabled.png");
 }
 
-.check row:selected:inconsistent:insensitive:backdrop {
+check row:selected:indeterminate:disabled:backdrop {
     -gtk-icon-source: url("assets/backdrop-check-mixed-disabled-alt.png");
 }
 
-.radio {
+radio {
     -gtk-icon-source: url("assets/radio-unselected.png");
 }
 
-.radio:hover {
+radio:hover {
     -gtk-icon-source: url("assets/radio-unselected-hover.png");
 }
 
-.radio row,
+radio row,
-.radio row:selected,
+radio row:selected,
-.radio row:selected:focus {
+radio row:selected:focus {
     -gtk-icon-source: url("assets/radio-unselected-alt.png");
 }
 
-.radio row:hover,
+radio row:hover,
-.radio row:selected:hover,
+radio row:selected:hover,
-.radio row:selected:focus:hover {
+radio row:selected:focus:hover {
     -gtk-icon-source: url("assets/radio-unselected-hover-alt.png");
 }
 
-.radio:insensitive {
+radio:disabled {
     -gtk-icon-source: url("assets/radio-unselected-disabled.png");
 }
 
-.radio row:insensitive {
+radio row:disabled {
     background-color: transparent;
 }
 
-.radio row:insensitive,
+radio row:disabled,
-.radio row:selected:insensitive,
+radio row:selected:disabled,
-.radio row:selected:focus:insensitive {
+radio row:selected:focus:disabled {
     -gtk-icon-source: url("assets/radio-unselected-disabled-alt.png");
 }
 
-.radio:backdrop {
+radio:backdrop {
     -gtk-icon-source: url("assets/backdrop-radio-unselected.png");
 }
 
-.radio:hover:backdrop {
+radio:hover:backdrop {
     -gtk-icon-source: url("assets/backdrop-radio-unselected-hover.png");
 }
 
-.radio row:backdrop,
+radio row:backdrop,
-.radio row:selected:backdrop {
+radio row:selected:backdrop {
     -gtk-icon-source: url("assets/backdrop-radio-unselected-alt.png");
 }
 
-.radio row:hover:backdrop,
+radio row:hover:backdrop,
-.radio row:selected:hover:backdrop {
+radio row:selected:hover:backdrop {
     -gtk-icon-source: url("assets/backdrop-radio-unselected-hover-alt.png");
 }
 
-.radio:insensitive:backdrop {
+radio:disabled:backdrop {
     -gtk-icon-source: url("assets/backdrop-radio-unselected-disabled.png");
 }
 
-.radio row:selected:insensitive:backdrop {
+radio row:selected:disabled:backdrop {
     -gtk-icon-source: url("assets/backdrop-radio-unselected-disabled-alt.png");
 }
 
-.radio:checked {
+radio:checked {
     -gtk-icon-source: url("assets/radio-selected.png");
 }
 
-.radio:checked:hover {
+radio:checked:hover {
     -gtk-icon-source: url("assets/radio-selected-hover.png");
 }
 
-.radio row:checked,
+radio row:checked,
-.radio row:selected:checked,
+radio row:selected:checked,
-.radio row:selected:focus:checked {
+radio row:selected:focus:checked {
     -gtk-icon-source: url("assets/radio-selected-alt.png");
 }
 
-.radio row:checked:hover,
+radio row:checked:hover,
-.radio row:selected:checked:hover,
+radio row:selected:checked:hover,
-.radio row:selected:focus:checked:hover {
+radio row:selected:focus:checked:hover {
     -gtk-icon-source: url("assets/radio-selected-hover-alt.png");
 }
 
-.radio:checked:insensitive {
+radio:checked:disabled {
     -gtk-icon-source: url("assets/radio-selected-disabled.png");
 }
 
-.radio row:insensitive,
+radio row:disabled,
-.radio row:selected:checked:insensitive,
+radio row:selected:checked:disabled,
-.radio row:selected:focus:checked:insensitive {
+radio row:selected:focus:checked:disabled {
     -gtk-icon-source: url("assets/radio-selected-disabled-alt.png");
 }
 
-.radio:checked:backdrop {
+radio:checked:backdrop {
     -gtk-icon-source: url("assets/backdrop-radio-selected.png");
 }
 
-.radio:checked:hover:backdrop {
+radio:checked:hover:backdrop {
     -gtk-icon-source: url("assets/backdrop-radio-selected-hover.png");
 }
 
-.radio row:checked:backdrop,
+radio row:checked:backdrop,
-.radio row:selected:checked:backdrop {
+radio row:selected:checked:backdrop {
     -gtk-icon-source: url("assets/backdrop-radio-selected-alt.png");
 }
 
-.radio row:checked:hover:backdrop,
+radio row:checked:hover:backdrop,
-.radio row:selected:checked:hover:backdrop {
+radio row:selected:checked:hover:backdrop {
     -gtk-icon-source: url("assets/backdrop-radio-selected-hover-alt.png");
 }
 
-.radio:checked:insensitive:backdrop {
+radio:checked:disabled:backdrop {
     -gtk-icon-source: url("assets/backdrop-radio-selected-disabled.png");
 }
 
-.radio row:selected:checked:insensitive:backdrop {
+radio row:selected:checked:disabled:backdrop {
     -gtk-icon-source: url("assets/backdrop-radio-selected-disabled-alt.png");
 }
 
-.radio:inconsistent {
+radio:indeterminate {
     -gtk-icon-source: url("assets/radio-mixed.png");
 }
 
-.radio:inconsistent:hover {
+radio:indeterminate:hover {
     -gtk-icon-source: url("assets/radio-mixed-hover.png");
 }
 
-.radio row:inconsistent,
+radio row:indeterminate,
-.radio row:selected:inconsistent,
+radio row:selected:indeterminate,
-.radio row:selected:focus:inconsistent {
+radio row:selected:focus:indeterminate {
     -gtk-icon-source: url("assets/radio-mixed-alt.png");
 }
 
-.radio row:inconsistent:hover,
+radio row:indeterminate:hover,
-.radio row:selected:inconsistent:hover,
+radio row:selected:indeterminate:hover,
-.radio row:selected:focus:inconsistent:hover {
+radio row:selected:focus:indeterminate:hover {
     -gtk-icon-source: url("assets/radio-mixed-hover-alt.png");
 }
 
-.radio:inconsistent:insensitive {
+radio:indeterminate:disabled {
     -gtk-icon-source: url("assets/radio-mixed-disabled.png");
 }
 
-.radio row:inconsistent:insensitive,
+radio row:indeterminate:disabled,
-.radio row:selected:inconsistent:insensitive,
+radio row:selected:indeterminate:disabled,
-.radio row:selected:focus:inconsistent:insensitive {
+radio row:selected:focus:indeterminate:disabled {
     -gtk-icon-source: url("assets/radio-mixed-disabled-alt.png");
 }
 
-.radio:inconsistent:backdrop {
+radio:indeterminate:backdrop {
     -gtk-icon-source: url("assets/backdrop-radio-mixed.png");
 }
 
-.radio:inconsistent:hover:backdrop {
+radio:indeterminate:hover:backdrop {
     -gtk-icon-source: url("assets/backdrop-radio-mixed-hover.png");
 }
 
-.radio row:inconsistent:backdrop,
+radio row:indeterminate:backdrop,
-.radio row:selected:inconsistent:backdrop {
+radio row:selected:indeterminate:backdrop {
     -gtk-icon-source: url("assets/backdrop-radio-mixed-alt.png");
 }
 
-.radio row:inconsistent:hover:backdrop,
+radio row:indeterminate:hover:backdrop,
-.radio row:selected:inconsistent:hover:backdrop {
+radio row:selected:indeterminate:hover:backdrop {
     -gtk-icon-source: url("assets/backdrop-radio-mixed-hover-alt.png");
 }
 
-.radio:inconsistent:insensitive:backdrop {
+radio:indeterminate:disabled:backdrop {
     -gtk-icon-source: url("assets/backdrop-radio-mixed-disabled.png");
 }
 
-.radio row:selected:inconsistent:insensitive:backdrop {
+radio row:selected:indeterminate:disabled:backdrop {
     -gtk-icon-source: url("assets/backdrop-radio-mixed-disabled-alt.png");
 }
 
-.primary-toolbar .menu .check,
+.primary-toolbar menu check,
-.menubar.toolbar .menu .check,
+menubar toolbar menu check,
-.header-bar .menu .check,
+headerbar menu check,
-.menu .check {
+menu check,
+menu check:hover,
+menu check:disabled:not(:checked),
+menu check:indeterminate:not(:checked) {
     -gtk-icon-source: url("assets/check-menuitem-unselected.png");
 }
 
-.primary-toolbar .menu .radio,
+.primary-toolbar menu radio,
-.menubar.toolbar .menu .radio,
+menubar toolbar menu radio,
-.header-bar .menu .radio,
+headerbar menu radio,
-.menu .radio {
+menu radio,
+menu radio:hover,
+menu radio:disabled:not(:checked),
+menu radio:indeterminate:not(:checked) {
     -gtk-icon-source: url("assets/check-menuitem-unselected.png");
 }
 
-.primary-toolbar .menu .check:checked,
+.primary-toolbar menu check:checked,
-.menubar.toolbar .menu .check:checked,
+menubar toolbar menu check:checked,
-.header-bar .menu .check:checked,
+headerbar menu check:checked,
-.menu .check:checked {
+menu check:checked {
     -gtk-icon-source: url("assets/check-menuitem-dark.png");
 }
 
-.toolbar .menu .check:checked:hover,
+toolbar menu check:checked:hover,
-.menu .check:checked:hover {
+menu check:checked:hover {
     -gtk-icon-source: url("assets/check-menuitem.png");
 }
 
-.primary-toolbar .menu .check:checked:insensitive,
+.primary-toolbar menu check:checked:disabled,
-.menubar.toolbar .menu .check:checked:insensitive,
+menubar toolbar menu check:checked:disabled,
-.header-bar .menu .check:checked:insensitive,
+headerbar menu check:checked:disabled,
-.toolbar .menu .check:checked:hover:insensitive,
+toolbar menu check:checked:hover:disabled,
-.menu .check:checked:insensitive,
+menu check:checked:disabled,
-.menu .check:checked:hover:insensitive {
+menu check:checked:hover:disabled {
     -gtk-icon-source: url("assets/check-menuitem-insensitive.png");
 }
 
-.toolbar .menu .radio:checked:hover,
+.primary-toolbar menu radio:checked,
-.menu .radio:checked {
+menubar toolbar menu radio:checked,
+headerbar menu radio:checked,
+toolbar menu radio:checked:hover,
+menu radio:checked,
+menu radio:checked:hover {
     -gtk-icon-source: url("assets/radio-menuitem.png");
 }
 
-.primary-toolbar .menu .radio:checked:insensitive,
+.primary-toolbar menu radio:checked:disabled,
-.menubar.toolbar .menu .radio:checked:insensitive,
+menubar toolbar menu radio:checked:disabled,
-.header-bar .menu .radio:checked:insensitive,
+headerbar menu radio:checked:disabled,
-.toolbar .menu .radio:checked:hover:insensitive,
+toolbar menu radio:checked:hover:disabled,
-.menu .radio:checked:insensitive,
+menu radio:checked:disabled,
-.menu .radio:checked:hover:insensitive {
+menu radio:checked:hover:disabled {
     -gtk-icon-source: url("assets/radio-menuitem-insensitive.png");
 }
 
-.toolbar .menu .check {
+toolbar menu check {
     -gtk-icon-source: url("assets/check-menuitem-unselected.png");
 }
 
-.toolbar .menu .radio {
+toolbar menu radio {
     -gtk-icon-source: url("assets/check-menuitem-unselected.png");
 }
 
-.toolbar .menu .check:checked {
+toolbar menu check:checked {
     -gtk-icon-source: url("assets/check-menuitem-dark.png");
 }
 
-.toolbar .menu .check:checked:insensitive {
+toolbar menu check:checked:disabled {
     -gtk-icon-source: url("assets/check-menuitem-insensitive-dark.png");
 }
 
-.toolbar .menu .radio:checked {
+toolbar menu radio:checked {
     -gtk-icon-source: url("assets/radio-menuitem-dark.png");
 }
 
-.toolbar .menu .radio:checked:insensitive {
+toolbar menu radio:checked:disabled {
     -gtk-icon-source: url("assets/radio-menuitem-insensitive-dark.png");
 }
 
 /*********************
  * GtkScale's slider *
  *********************/
-.scale.slider,
+scale slider,
-.scale.slider.horizontal {
+scale.horizontal contents:only-child trough slider {
     background-image: url("assets/slider-horizontal.png");
+    background-repeat: no-repeat;
 }
 
-.scale.slider:backdrop,
+scale:backdrop slider,
-.scale.slider.horizontal:backdrop {
+scale.horizontal:backdrop slider {
      /*background-image: url("assets/slider-horizontal-disabled.png");*/
 }
 
-.scale.slider:hover,
+scale slider:hover,
-.scale.slider.horizontal:hover {
+scale.horizontal slider:hover {
     background-image: url("assets/slider-horizontal-hover.png");
+    background-repeat: no-repeat;
 }
 
-.scale.slider:focused,
+scale slider:focus,
-.scale.slider.horizontal:focused {
+scale.horizontal slider:focus {
     background-image: url("assets/slider-horizontal-focused.png");
 }
 
-.scale.slider:hover:focused,
+scale slider:hover:focus,
-.scale.slider.horizontal:hover:focused {
+scale.horizontal slider:hover:focus {
     background-image: url("assets/slider-horizontal-focused-hover.png");
 }
 
-.scale.slider:insensitive,
+scale:disabled slider,
-.scale.slider.horizontal:insensitive {
+scale.horizontal:disabled slider {
     background-image: url("assets/slider-horizontal-disabled.png");
 }
 
-.scale.slider:insensitive:backdrop,
+scale slider:disabled:backdrop,
-.scale.slider.horizontal:insensitive:backdrop {
+scale.horizontal slider:disabled:backdrop {
     /*background-image: url("assets/slider-horizontal-backdrop-disabled.png");*/
 }
 
-.scale.slider.vertical {
+scale.vertical slider {
     background-image: url("assets/slider-vertical.png");
 }
 
-.scale.slider.vertical:backdrop {
+scale:backdrop.vertical slider {
     /*background-image: url("assets/slider-vertical-backdrop.png");*/
 }
 
-.scale.slider.vertical:hover {
+scale.vertical slider:hover {
     background-image: url("assets/slider-vertical-hover.png");
 }
 
-.scale.slider.vertical:focused {
+scale.vertical slider:focus {
     background-image: url("assets/slider-vertical-focused.png");
 }
 
-.scale.slider.vertical:hover:focused {
+scale.vertical slider:hover:focus {
     background-image: url("assets/slider-vertical-focused-hover.png");
 }
 
-.scale.slider.vertical:insensitive {
+scale:disabled.vertical slider {
     background-image: url("assets/slider-vertical-disabled.png");
 }
 
-.scale.slider.vertical:insensitive:backdrop {
+scale:disabled:backdrop.vertical slider {
     /*background-image: url("assets/slider-vertical-backdrop-disabled.png");*/
 }
 
-/*.scale.scale-has-marks-above.slider.horizontal {
+/*scale scale-has-marks-above.slider.horizontal {
     background-image: url("assets/slider-up.png");
 }
 
-.scale.scale-has-marks-above.slider.horizontal:insensitive {
+scale scale-has-marks-above.slider.horizontal:disabled {
     background-image: url("assets/slider-up-disabled.png");
 }
 
-.scale.scale-has-marks-above.slider.horizontal:backdrop {
+scale scale-has-marks-above.slider.horizontal:backdrop {
     background-image: url("assets/slider-up-backdrop.png");
 }
 
-.scale.scale-has-marks-above.slider.horizontal:backdrop:insensitive {
+scale scale-has-marks-above.slider.horizontal:backdrop:disabled {
     background-image: url("assets/slider-up-backdrop-disabled.png");
 }
 
-.scale.scale-has-marks-above.slider.vertical {
+scale scale-has-marks-above.slider.vertical {
     background-image: url("assets/slider-left.png");
 }
 
-.scale.scale-has-marks-above.slider.vertical:insensitive {
+scale scale-has-marks-above.slider.vertical:disabled {
     background-image: url("assets/slider-left-disabled.png");
 }
 
-.scale.scale-has-marks-above.slider.vertical:backdrop {
+scale scale-has-marks-above.slider.vertical:backdrop {
     background-image: url("assets/slider-left-backdrop.png");
 }
 
-.scale.scale-has-marks-above.slider.vertical:backdrop:insensitive {
+scale scale-has-marks-above.slider.vertical:backdrop:disabled {
     background-image: url("assets/slider-left-backdrop-disabled.png");
 }
 
-.scale.scale-has-marks-below.slider.horizontal {
+scale scale-has-marks-below.slider.horizontal {
     background-image: url("assets/slider-down.png");
 }
 
-.scale.scale-has-marks-below.slider.horizontal:insensitive {
+scale scale-has-marks-below.slider.horizontal:disabled {
     background-image: url("assets/slider-down-disabled.png");
 }
 
-.scale.scale-has-marks-below.slider.horizontal:backdrop {
+scale scale-has-marks-below.slider.horizontal:backdrop {
     background-image: url("assets/slider-down-backdrop.png");
 }
 
-.scale.scale-has-marks-below.slider.horizontal:backdrop:insensitive {
+scale scale-has-marks-below.slider.horizontal:backdrop:disabled {
     background-image: url("assets/slider-down-backdrop-disabled.png");
 }
 
-.scale.scale-has-marks-below.slider.vertical {
+scale scale-has-marks-below.slider.vertical {
     background-image: url("assets/slider-right.png");
 }
 
-.scale.scale-has-marks-below.slider.vertical:insensitive {
+scale scale-has-marks-below.slider.vertical:disabled {
     background-image: url("assets/slider-right-disabled.png");
 }
 
-.scale.scale-has-marks-below.slider.vertical:backdrop {
+scale scale-has-marks-below.slider.vertical:backdrop {
     background-image: url("assets/slider-right-backdrop.png");
 }
 
-.scale.scale-has-marks-below.slider.vertical:backdrop:insensitive {
+scale scale-has-marks-below.slider.vertical:backdrop:disabled {
     background-image: url("assets/slider-right-backdrop-disabled.png");
 }*/
 

src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-borders-radiance.css

@@ -1,38 +1,37 @@
-
 .primary-toolbar .entry,
-.menubar.toolbar .entry,
+menubar toolbar entry,
-.header-bar .entry {
+headerbar entry {
     border-image: url("assets/radiance-entry-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }
 
-.primary-toolbar .entry:focus,
+primary-toolbar entry:focus,
-.menubar.toolbar .entry:focus,
+menubar toolbar entry:focus,
-.header-bar .entry:focus {
+headerbar entry:focus {
     border-image: url("assets/radiance-entry-toolbar-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }
 
-.primary-toolbar GtkComboBox.combobox-entry .button,
+.primary-toolbar combobox entry button,
-.primary-toolbar GtkComboBox.combobox-entry .button:focus:insensitive,
+.primary-toolbar combobox entry button:focus:disabled,
-.menubar.toolbar GtkComboBox.combobox-entry .button,
+menubar toolbar combobox entry button,
-.menubar.toolbar GtkComboBox.combobox-entry .button:focus:insensitive,
+menubar toolbar combobox entry button:focus:disabled,
-.header-bar GtkComboBox.combobox-entry .button,
+headerbar combobox entry button,
-.header-bar GtkComboBox.combobox-entry .button:focus:insensitive {
+headerbar combobox entry button:focus:disabled {
     border-image: url("assets/radiance-combobox-button-toolbar.png") 10 12 10 1 / 10px 12px 10px 1px stretch;
 }
 
-.primary-toolbar GtkComboBox.combobox-entry .button:focus,
+.primary-toolbar combobox entry button:focus,
-.menubar.toolbar GtkComboBox.combobox-entry .button:focus,
+menubar toolbar combobox entry button:focus,
-.header-bar GtkComboBox.combobox-entry .button:focus {
+headerbar combobox entry button:focus {
     border-image: url("assets/radiance-combobox-button-toolbar-focused.png") 10 12 10 1 / 10px 12px 10px 1px stretch;
 }
 
-.primary-toolbar GtkComboBox.combobox-entry .button:focus:active:focus,
+.primary-toolbar combobox entry button:focus:active:focus,
-.menubar.toolbar GtkComboBox.combobox-entry .button:focus:active:focus,
+menubar toolbar combobox entry button:focus:active:focus,
-.header-bar GtkComboBox.combobox-entry .button:focus:active:focus {
+headerbar combobox entry button:focus:active:focus {
     border-image: url("assets/radiance-combobox-button-toolbar-pressed-focused.png") 10 12 10 1 / 10px 12px 10px 1px stretch;
 }
 
-.menubar.menuitem:hover,
+menubar menuitem:hover,
 .menubar.menuitem:hover {
     border-color: #b8ab9c;
 }

src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-borders.css

@@ -1,5 +1,5 @@
 /* Borders */
-.menubar.menuitem:hover,
+menubar menuitem:hover,
 .menubar.menuitem:hover {
     border: 1px solid #2e2e2c;
     border-bottom-width: 0px;
@@ -9,52 +9,63 @@
 /*********
  * entry *
  *********/
-.entry {
+spinbutton,
+entry {
     border-radius: 8px;
     border-width: 1px;
     border-style: solid;
     border-color: transparent;
 }
 
-.entry {
+spinbutton,
+entry {
     border-image: url("assets/entry.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }
 
-.entry:backdrop {
+spinbutton:backdrop,
+entry:backdrop {
     border-image: url("assets/backdrop-entry.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }
 
-.entry:focus {
+spinbutton:focus,
+entry:focus {
     border-image: url("assets/entry-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }
 
-.entry:insensitive {
+spinbutton:disabled,
+entry:disabled {
     border-image: url("assets/entry-disabled.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }
 
-.entry:insensitive:backdrop {
+spinbutton:disabled:backdrop,
+entry:disabled:backdrop {
     border-image: url("assets/backdrop-entry-disabled.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }
 
-.primary-toolbar .entry,
+spinbutton entry,
-.menubar.toolbar .entry,
+spinbutton entry:focus,
-.header-bar .entry {
+spinbutton entry:disabled,
+spinbutton entry:disabled:backdrop,
+spinbutton entry:backdrop {
+    margin: 1px;
+    border-image: none;
+}
+
+.primary-toolbar entry,
+menubar toolbar entry,
+headerbar entry {
     border-image: url("assets/entry-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }
 
-.primary-toolbar .entry:focus,
+.primary-toolbar entry:focus,
-.menubar.toolbar .entry:focus,
+menubar toolbar entry:focus,
-.header-bar .entry:focus {
+headerbar entry:focus {
     border-image: url("assets/entry-toolbar-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }
 
-.primary-toolbar .entry.progressbar,
+.primary-toolbar entry progress,
-.primary-toolbar .entry.progressbar,
+menubar toolbar entry progress,
-.menubar.toolbar .entry.progressbar,
+headerbar entry progress {
-.menubar.toolbar .entry.progressbar,
-.header-bar .entry.progressbar,
-.header-bar .entry.progressbar,
-.entry.progressbar {
     border-radius: 8px;
     border-width: 0;
 }
@@ -62,241 +73,240 @@
 /******************
  * comboboxentry *
  ******************/
-GtkComboBox.combobox-entry .entry:first-child,
+combobox entry:first-child,
-GtkComboBox.combobox-entry .button:first-child {
+combobox entry button:first-child {
     border-image-width: 10px 1px 10px 12px;
     border-radius: 8px 0 0 8px;
     border-right-width: 0;
 }
 
-GtkComboBox.combobox-entry .entry:last-child,
+combobox entry:last-child,
-GtkComboBox.combobox-entry .button:last-child {
+combobox entry button:last-child {
     border-image-width: 10px 12px 10px 1px;
     border-radius: 0 8px 8px 0;
     border-left-width: 0;
 }
 
-GtkComboBox.combobox-entry .button {
+combobox entry button {
     border-image: url("assets/combobox-button.png") 10 12 10 1 / 10px 12px 10px 1px stretch;
 }
 
-GtkComboBox.combobox-entry .button:backdrop {
+combobox entry button:backdrop {
     border-image: url("assets/backdrop-combobox-button.png") 10 12 10 1 / 10px 12px 10px 1px stretch;
 }
 
-GtkComboBox.combobox-entry .button:focus {
+combobox entry button:focus {
     border-image: url("assets/combobox-button-focused.png") 10 12 10 1 / 10px 12px 10px 1px stretch;
 }
 
-GtkComboBox.combobox-entry .button:insensitive {
+combobox entry button:disabled {
     border-image: url("assets/combobox-button-disabled.png") 10 12 10 1 / 10px 12px 10px 1px stretch;
 }
 
-GtkComboBox.combobox-entry .button:insensitive:backdrop {
+combobox entry button:disabled:backdrop {
     border-image: url("assets/backdrop-combobox-button-disabled.png") 10 12 10 1 / 10px 12px 10px 1px stretch;
 }
 
-GtkComboBox.combobox-entry .button:active:focus {
+combobox entry button:active:focus {
     border-image: url("assets/combobox-button-pressed-focused.png") 10 12 10 1 / 10px 12px 10px 1px stretch;
 }
 
-.primary-toolbar GtkComboBox.combobox-entry .button,
+.primary-toolbar combobox entry button,
-.primary-toolbar GtkComboBox.combobox-entry .button:focus:insensitive,
+.primary-toolbar combobox entry button:focus:disabled,
-.menubar.toolbar GtkComboBox.combobox-entry .button,
+menubar toolbar combobox entry button,
-.menubar.toolbar GtkComboBox.combobox-entry .button:focus:insensitive,
+menubar toolbar combobox entry button:focus:disabled,
-.header-bar GtkComboBox.combobox-entry .button,
+headerbar combobox entry button,
-.header-bar GtkComboBox.combobox-entry .button:focus:insensitive {
+headerbar combobox entry button:focus:disabled {
-    border-image: url("assets/combobox-button-toolbar.png") 10 12 10 1 / 10px 12px 10px 1px stretch;
+    border-image: url("assets/combobox-entry button-toolbar.png") 10 12 10 1 / 10px 12px 10px 1px stretch;
 }
 
-.primary-toolbar GtkComboBox.combobox-entry .button:focus,
+.primary-toolbar combobox entry button:focus,
-.menubar.toolbar GtkComboBox.combobox-entry .button:focus,
+menubar toolbar combobox entry button:focus,
-.header-bar GtkComboBox.combobox-entry .button:focus {
+headerbar combobox entry button:focus {
-    border-image: url("assets/combobox-button-toolbar-focused.png") 10 12 10 1 / 10px 12px 10px 1px stretch;
+    border-image: url("assets/combobox-entry button-toolbar-focused.png") 10 12 10 1 / 10px 12px 10px 1px stretch;
 }
 
-.primary-toolbar GtkComboBox.combobox-entry .button:focus:active:focus,
+.primary-toolbar combobox entry button:focus:active:focus,
-.menubar.toolbar GtkComboBox.combobox-entry .button:focus:active:focus,
+menubar toolbar combobox entry button:focus:active:focus,
-.header-bar GtkComboBox.combobox-entry .button:focus:active:focus {
+headerbar combobox entry button:focus:active:focus {
-    border-image: url("assets/combobox-button-toolbar-pressed-focused.png") 10 12 10 1 / 10px 12px 10px 1px stretch;
+    border-image: url("assets/combobox-entry button-toolbar-pressed-focused.png") 10 12 10 1 / 10px 12px 10px 1px stretch;
 }
 
-.primary-toolbar GtkComboBox.combobox-entry .entry:first-child,
+.primary-toolbar combobox entry:first-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:first-child,
+.primary-toolbar combobox entry button:first-child,
-.menubar.toolbar GtkComboBox.combobox-entry .entry:first-child,
+menubar toolbar combobox entry:first-child,
-.menubar.toolbar GtkComboBox.combobox-entry .button:first-child,
+menubar toolbar combobox entry button:first-child,
-.header-bar GtkComboBox.combobox-entry .entry:first-child,
+headerbar combobox entry:first-child,
-.header-bar GtkComboBox.combobox-entry .button:first-child {
+headerbar combobox entry button:first-child {
     border-image-width: 10px 0 10px 12px;
     border-radius: 8px 0 0 8px;
     border-right-width: 0;
 }
 
-.primary-toolbar GtkComboBox.combobox-entry .entry:last-child,
+.primary-toolbar combobox entry:last-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:last-child,
+.primary-toolbar combobox entry button:last-child,
-.menubar.toolbar GtkComboBox.combobox-entry .entry:last-child,
+menubar toolbar combobox entry:last-child,
-.menubar.toolbar GtkComboBox.combobox-entry .button:last-child,
+menubar toolbar combobox entry button:last-child,
-.header-bar GtkComboBox.combobox-entry .entry:last-child,
+headerbar combobox entry:last-child,
-.header-bar GtkComboBox.combobox-entry .button:last-child {
+headerbar combobox entry button:last-child {
     border-image-width: 10px 12px 10px 1px;
     border-radius: 0 8px 8px 0;
     border-left-width: 0;
 }
 
-.notebook tab.top:active {
+notebook header.top tab:checked {
     border-image: url("assets/notebook-tab-top.png") 8 10 1 10 / 8px 10px 1px 10px stretch;
 }
 
-.notebook tab.right:active {
+notebook header.right tab:checked {
     border-image: url("assets/notebook-tab-right.png") 10 8 10 1 / 10px 8px 10px 1px stretch;
 }
 
-.notebook tab.bottom:active {
+notebook header.bottom tab:checked {
     border-image: url("assets/notebook-tab-bottom.png") 1 10 8 10 / 1px 10px 8px 10px stretch;
 }
 
-.notebook tab.left:active {
+notebook header.left tab:checked {
     border-image: url("assets/notebook-tab-left.png") 10 1 10 8 / 10px 1px 10px 8px stretch;
 }
 
-/* unfocused window: generic element borders */
-.button:backdrop,
-GtkComboBox.combobox-entry .entry:backdrop,
-GtkComboBox.combobox-entry .button:backdrop,
-.entry:backdrop,
-GtkSwitch.trough:backdrop,
-.trough:backdrop {
-}
-
 .trough,
-.trough.highlight {
+trough,
+trough.highlight {
     border-radius: 4px;
     border-width: 1px;
     border-style: solid;
     border-color: transparent;
 }
 
-.trough {
+.trough,
+trough {
     border-image: url("assets/progressbar-horizontal-trough.png") 6 7 6 7 / 6px 7px 6px 7px stretch;
 }
 
-GtkSwitch.trough {
+switch {
     border-image: url("assets/switch-trough-off.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }
 
-GtkSwitch.trough:active {
+switch:checked {
     border-image: url("assets/switch-trough-on.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }
 
-.primary-toolbar GtkSwitch.trough,
+.primary-toolbar switch,
-.menubar.toolbar GtkSwitch.trough,
+menubar toolbar switch,
-.header-bar GtkSwitch.trough {
+headerbar switch {
     border-image: url("assets/switch-trough-toolbar-off.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }
 
-.primary-toolbar GtkSwitch.trough:active,
+.primary-toolbar switch:checked,
-.menubar.toolbar GtkSwitch.trough:active,
+menubar toolbar switch:checked,
-.header-bar GtkSwitch.trough:active {
+headerbar switch:checked {
     border-image: url("assets/switch-trough-toolbar-on.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }
 
 /* XXX temporary */
-GtkSwitch.trough:backdrop,
+switch:backdrop,
-GtkSwitch.trough:active:backdrop,
+switch:checked:backdrop,
-GtkSwitch.trough:insensitive,
+switch:disabled,
-GtkSwitch.trough:active:insensitive {
+switch:checked:disabled {
     border-image: url("assets/switch-trough-disabled.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }
 
-GtkSwitch.slider {
+switch slider {
     border-image: url("assets/switch-button-off.png") 9 11 9 11 / 9px 11px 9px 11px stretch;
 }
 
-GtkSwitch.slider:active {
+switch:checked slider {
     border-image: url("assets/switch-button-on.png") 9 11 9 11 / 9px 11px 9px 11px stretch;
 }
 
 /* XXX temporary */
-GtkSwitch.slider:backdrop,
+switch:backdrop slider,
-GtkSwitch.slider:insensitive {
+switch:disabled slider {
     border-image: url("assets/switch-button-off-disabled.png") 9 11 9 11 / 9px 11px 9px 11px stretch;
 }
 
 /* XXX temporary */
-GtkSwitch.slider:active:backdrop,
+switch:active:backdrop slider,
-GtkSwitch.slider:active:insensitive {
+switch:active:disabled slider {
     border-image: url("assets/switch-button-on-disabled.png") 9 11 9 11 / 9px 11px 9px 11px stretch;
 }
 
+/*
+progressbar trough progress,
 .progressbar,
-.progressbar row,
+progressbar row,
-.progressbar row:hover,
+progressbar row:hover,
-.progressbar row:selected,
+progressbar row:selected,
-.progressbar row:selected:focused {
+progressbar row:selected:focus {
     border-image: url("assets/progressbar-horizontal-fill.png") 5 6 5 6 / 5px 6px 5px 6px stretch;
 }
 
-.progressbar.vertical {
+.progressbar.vertical.trough,
+progressbar.vertical trough progress {
     border-image: url("assets/progressbar-vertical-fill.png") 6 5 6 5 / 6px 5px 6px 5px stretch;
 }
 
-.progressbar:backdrop,
+.progressbar.trough:backdrop,
-.progressbar row:backdrop,
+progressbar:backdrop trough progress,
-.progressbar row:hover:backdrop,
+progressbar row:backdrop,
-.progressbar row:selected:backdrop,
+progressbar row:hover:backdrop,
-.progressbar row:selected:focused:backdrop {
+progressbar row:selected:backdrop,
+progressbar row:selected:focus:backdrop {
     border-image: url("assets/progressbar-horizontal-fill-backdrop.png") 5 6 5 6 / 5px 6px 5px 6px stretch;
 }
 
-.progressbar.vertical:backdrop {
+.progressbar.vertical:backdrop,
+progressbar.vertical:backdrop trough progress {
     border-image: url("assets/progressbar-vertical-fill-backdrop.png") 6 5 6 5 / 6px 5px 6px 5px stretch;
 }
+*/
 
-.scale.trough {
+scale trough {
     border-image: url("assets/scale-horizontal-trough.png") 2 6 2 6 / 2px 6px 2px 6px stretch;
 }
 
-.scale.trough:insensitive {
+scale:disabled trough {
     border-image: url("assets/scale-horizontal-trough-disabled.png") 2 6 2 6 / 2px 6px 2px 6px stretch;
 }
 
-.scale.trough:backdrop {
+scale:backdrop trough {
     border-image: url("assets/scale-horizontal-trough-backdrop.png") 2 6 2 6 / 2px 6px 2px 6px stretch;
 }
 
-.scale.trough.vertical {
+scale.vertical trough {
     border-image: url("assets/scale-vertical-trough.png") 6 2 6 2 / 6px 2px 6px 2px stretch;
 }
 
-.scale.trough.vertical:insensitive {
+scale.vertical:disabled trough {
     border-image: url("assets/scale-vertical-trough-disabled.png") 6 2 6 2 / 6px 2px 6px 2px stretch;
 }
 
-.scale.trough.highlight.left {
+scale trough.highlight.left {
     border-image: url("assets/scale-horizontal-fill.png") 2 6 2 6 / 2px 6px 2px 6px stretch;
 }
 
-.scale.trough.vertical:backdrop {
+scale.vertical:backdrop trough {
     border-image: url("assets/scale-vertical-trough-backdrop.png") 6 2 6 2 / 6px 2px 6px 2px stretch;
 }
 
-.scale.trough.highlight.left:insensitive {
+scale:backdrop trough.highlight.left {
     border-image: url("assets/scale-horizontal-fill-disabled.png") 2 6 2 6 / 2px 6px 2px 6px stretch;
 }
 
-.scale.trough.highlight.left:backdrop {
+scale:backdrop trough.highlight.left {
     border-image: url("assets/scale-horizontal-fill-backdrop.png") 2 6 2 6 / 2px 6px 2px 6px stretch;
 }
 
-.scale.trough.highlight.bottom.vertical {
+scale.vertical trough.highlight.bottom {
-    border-image: url("assets/scale-vertical-fill.png") 6 2 6 2 / 6px 2px 6px 2px stretch;
+    border-image: url("assets/scale.vertical-vertical-fill.png") 6 2 6 2 / 6px 2px 6px 2px stretch;
 }
 
-.scale.trough.highlight.bottom.vertical:insensitive {
+scale.vertical:disabled trough.highlight.bottom {
-    border-image: url("assets/scale-vertical-fill-disabled.png") 6 2 6 2 / 6px 2px 6px 2px stretch;
+    border-image: url("assets/scale.vertical-vertical-fill-disabled.png") 6 2 6 2 / 6px 2px 6px 2px stretch;
 }
 
-.scale.trough.highlight.bottom.vertical:backdrop {
+scale.vertical:backdrop trough.highlight.bottom {
     border-image: url("assets/scale-vertical-fill-backdrop.png") 6 2 6 2 / 6px 2px 6px 2px stretch;
 }
 

src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-radiance.css

@@ -1,113 +1,78 @@
 /* Set up shadows and hilights for button visual separation */
-.primary-toolbar .linked .button,
+.primary-toolbar .linked button,
-.primary-toolbar .button.raised.linked,
+headerbar .linked button {
-.primary-toolbar .raised.linked .button,
-.menubar.toolbar .linked .button,
-.menubar.toolbar .button.raised.linked,
-.menubar.toolbar .raised.linked .button,
-.header-bar .linked .button,
-.header-bar .button.raised.linked,
-.header-bar .button.raised.linked .button {
     box-shadow: inset 1px 0 shade (@dark_bg_color, 1.1),
                 inset -1px 0 shade (@dark_bg_color, 0.9);
 }
 
-.primary-toolbar .linked .button:first-child,
+.primary-toolbar .linked button:first-child,
-.primary-toolbar .button.raised.linked:first-child,
+headerbar .linked button:first-child {
-.primary-toolbar .raised.linked .button:first-child,
-.menubar.toolbar .linked .button:first-child,
-.menubar.toolbar .button.raised.linked:first-child,
-.menubar.toolbar .raised.linked .button:first-child,
-.header-bar .linked .button:first-child,
-.header-bar .button.raised.linked:first-child,
-.header-bar .raised.linked .button:first-child {
     box-shadow: inset -1px 0 shade (@dark_bg_color, 0.9);
 }
 
-.primary-toolbar .linked .button:last-child,
+.primary-toolbar .linked button:active,
-.primary-toolbar .button.raised.linked:last-child,
+headerbar .linked button:active,
-.primary-toolbar .raised.linked .button:last-child,
+.primary-toolbar .linked button:disabled,
-.menubar.toolbar .linked .button:last-child,
+headerbar .linked button:disabled {
-.menubar.toolbar .button.raised.linked:last-child,
-.menubar.toolbar .raised.linked .button:last-child,
-.header-bar .linked .button:last-child,
-.header-bar .button.raised.linked:last-child,
-.header-bar .raised.linked .button:last-child {
-    box-shadow: inset 1px 0 shade (@dark_bg_color, 1.1)
-}
-
-.primary-toolbar .linked .button:active,
-.primary-toolbar .button.raised.linked:active,
-.primary-toolbar .raised.linked .button:active,
-.menubar.toolbar .linked .button:active,
-.menubar.toolbar .button.raised.linked:active,
-.menubar.toolbar .raised.linked .button:active,
-.header-bar .linked .button:active,
-.header-bar .button.raised.linked:active,
-.header-bar .raised.linked .button:active {
     box-shadow: inset 1px 0 shade (@dark_bg_color, 0.9);
 }
 
-.primary-toolbar .linked .button:insensitive,
+.primary-toolbar .linked button:active,
-.primary-toolbar .button.raised.linked:insensitive,
+headerbar .linked button:active,
-.primary-toolbar .raised.linked .button:insensitive,
+.primary-toolbar .linked button:disabled,
-.menubar.toolbar .linked .button:insensitive,
+headerbar .linked button:disabled {
-.menubar.toolbar .button.raised.linked:insensitive,
-.menubar.toolbar .raised.linked .button:insensitive,
-.header-bar .linked .button:insensitive,
-.header-bar .button.raised.linked:insensitive,
-.header-bar .raised.linked .button:insensitive {
     box-shadow: inset -1px 0 shade (@dark_bg_color, 0.9);
 }
 
-.primary-toolbar .linked .button:backdrop:last-child,
+.primary-toolbar .linked button:last-child,
-.primary-toolbar .button.raised.linked:backdrop:last-child,
+headerbar .linked button:last-child {
-.primary-toolbar .raised.linked .button:backdrop:last-child,
-.menubar.toolbar .linked .button:backdrop:last-child,
-.menubar.toolbar .button.raised.linked:backdrop:last-child,
-.menubar.toolbar .raised.linked .button:backdrop:last-child,
-.header-bar .linked .button:backdrop:last-child,
-.header-bar .button.raised.linked:backdrop:last-child,
-.header-bar .raised.linked .button:backdrop:last-child {
     box-shadow: inset 1px 0 shade (@dark_bg_color, 1.1);
 }
 
-.menubar {
+menubar {
     color: @dark_fg_color;
     text-shadow: 0 1px shade (@dark_bg_color, 1.1);
 }
 
+menubar menuitem:hover,
 .menubar.menuitem:hover,
 .menubar .menuitem:hover {
     color: @dark_fg_color;
     text-shadow: 0 1px shade (@dark_bg_color, 1.1);
 }
 
-.menuitem:hover,
+popover modelbutton:hover,
-.menu .menuitem:hover {
+popover menuitem:checked:hover,
+menuitem:hover,
+menu menuitem:hover {
     color: @selected_fg_color;
     text-shadow: 0 -1px shade (@selected_bg_color, 0.7);
 }
 
-.menuitem:insensitive,
+toolbar headerbar menu menuitem:disabled,
-.menuitem *:insensitive {
+toolbar headerbar menu menuitem *:disabled,
+toolbutton menu menuitem:disabled,
+toolbutton menu menuitem *:disabled,
+.primary-toolbar button menu menuitem:disabled,
+.primary-toolbar button menu menuitem *:disabled,
+headerbar button menu menuitem:disabled,
+headerbar button menu menuitem *:disabled,
+menuitem:disabled,
+menuitem *:disabled {
     color: mix (@fg_color, @bg_color, 0.5);
     text-shadow: 0 1px shade (@bg_color, 1.14);
 }
 
 /* for the playback menu item in the sound menu */
-.menu .spinner,
+menu spinner,
-.menu .spinner:hover {
+menu spinner:hover {
     color: @selected_bg_color;
 }
 
 /* primary-toolbar */
 .primary-toolbar,
-.primary-toolbar .toolbar,
+headerbar,
-.primary-toolbar.toolbar,
+.maximized headerbar.titlebar:not(:backdrop) {
-.menubar.toolbar,
-.header-bar,
-.maximized .titlebar.header-bar.toolbar-mode:not(:backdrop) {
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@dark_bg_color, 0.96)),
                                      to (shade (@dark_bg_color, 1.1)));
@@ -117,40 +82,29 @@
     text-shadow: 0 1px shade (@dark_bg_color, 1.1);
 }
 
-.primary-toolbar :insensitive,
+.primary-toolbar:disabled,
-.menubar.toolbar :insensitive,
+headerbar:disabled {
-.header-bar :insensitive {
     text-shadow: 0 1px shade (@dark_bg_color, 1.1);
 }
 
-.primary-toolbar GtkComboBox,
+.primary-toolbar button,
-.primary-toolbar .button *,
+headerbar button *,
-.primary-toolbar .button,
+headerbar button:disabled * {
-.menubar.toolbar GtkComboBox,
-.menubar.toolbar .button *,
-.menubar.toolbar .button,
-.header-bar GtkComboBox,
-.header-bar .button *,
-.header-bar .button {
     text-shadow: 0 1px alpha (shade (@dark_bg_color, 1.25), 0.32);
 }
 
-.primary-toolbar .raised .button,
+.primary-toolbar button:hover,
-.primary-toolbar .raised.button,
+.primary-toolbar button:active,
-.primary-toolbar .button:hover,
+.primary-toolbar button:disabled,
-.primary-toolbar .button:active,
+headerbar button:hover,
-.primary-toolbar .button:insensitive,
+headerbar button:backdrop:hover,
-.menubar.toolbar .raised .button,
+headerbar button:active,
-.menubar.toolbar .raised.button,
+headerbar button:disabled {
-.menubar.toolbar .button:hover,
-.menubar.toolbar .button:active,
-.menubar.toolbar .button:insensitive,
-.header-bar .raised .button,
-.header-bar .raised.button,
-.header-bar .button:hover,
-.header-bar .button:active,
-.header-bar .button:insensitive {
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@dark_bg_color, 1.03)),
                                      to (shade (@dark_bg_color, 0.96)));
 }
+
+.titlebar {
+    border-top-width: 0px;
+}