--- /usr/share/themes/Ambiant-MATE/gtk-2.0/gtkrc	2014-11-11 13:24:45.000000000 +0000
+++ /usr/share/themes/Ambiant-MATE-dark/gtk-2.0/gtkrc	2014-12-25 09:11:11.996618655 +0000
@@ -1,4 +1,5 @@
 gtk-color-scheme = "base_color:#ffffff\nfg_color:#4c4c4c\ntooltip_fg_color:#ffffff\nselected_bg_color:#87A752\nselected_fg_color:#FFFFFF\ntext_color:#3C3C3C\nbg_color:#F2F1F0\ntooltip_bg_color:#000000\nlink_color:#A7BB85"
+gtk-color-scheme = "bg_color_dark:#3B3C37\nfg_color_dark:#dfdbd2"
 
 gtk-icon-sizes = "panel-menu=22,22:gtk-button=16,16"
 
@@ -39,7 +40,8 @@ style "default" {
 	GtkMenuBar::shadow-type = GTK_SHADOW_NONE
 	GtkExpander::expander-size = 11
 	GtkToolbar::internal-padding = 1
-	GtkToolbar::shadow-type = GTK_SHADOW_NONE
+# We don't get the dark toolbars with this
+#	GtkToolbar::shadow-type = GTK_SHADOW_NONE
 	GtkTreeView::expander-size = 7
 	GtkTreeView::vertical-separator = 0
 #	GtkTreeView::odd-row-color = shade (0.96, @base_color)
@@ -61,7 +63,10 @@ style "default" {
 	GtkProgressBar::min-vertical-bar-width = 14
 	
 	GtkImage::x-ayatana-indicator-dynamic = 1
+
 	GtkMenuBar::window-dragging = 1
+	# Support drag by toolbars too (Ubuntu 14.10 and up)
+	GtkToolbar::window-dragging = 1
 
 	GtkWidget::link-color = @link_color
 	GtkWidget::visited-link-color = @text_color
@@ -121,8 +126,6 @@ style "default" {
 
 style "dark"
 {
-	color["bg_color_dark"] 	= "#3c3b37"
-	color["fg_color_dark"] 	= "#dfdbd2"
 	color["selected_fg_color_dark"] = "#ffffff"
 
 	fg[NORMAL]        = @fg_color_dark
@@ -340,6 +343,88 @@ style "toolbar-button" = "notebook_butto
 	}
 }
 
+style "dark_toolbar_bg" = "dark"
+{
+	xthickness = 2
+	ythickness = 2
+
+	engine "murrine"
+	{
+		contrast            = 0.9
+		border_shades       = {1.0, 0.5}
+		toolbarstyle        = 1
+		textstyle           = 1
+		gradient_shades     = {1.0, 1.0, 1.0, 0.95}
+		lightborderstyle    = 0
+		lightborder_shade   = 1.23
+	}
+}
+
+style "dark_toolbar" = "dark_toolbar_bg"
+{
+	GtkButton::child-displacement-y	= 0
+
+	engine "murrine"
+	{
+		contrast            = 1.1
+		gradient_shades     = {1.13, 1.03, 0.95, 0.90}
+		border_shades       = {0.7, 0.5}
+		lightborderstyle    = 0
+		lightborder_shade   = 1.1
+		reliefstyle         = 5
+		focusstyle          = 0
+		roundness           = 2
+	}
+}
+
+style "dark_toolbar_combo" = "dark_toolbar"
+{
+	xthickness = 3
+	ythickness = 3
+
+	engine "murrine"
+	{
+		contrast            = 1.0
+		border_shades       = {0.98, 0.72}
+		glowstyle           = 4
+		glow_shade          = 1.13
+		lightborderstyle    = 0
+		lightborder_shade   = 1.23
+		gradient_shades     = {1.32, 1.25, 1.11, 0.89}
+		reliefstyle         = 5
+	}
+}
+
+style "dark_toolbar_scale" = "scale"
+{
+	bg[NORMAL]      = shade (0.90, @bg_color)
+	bg[ACTIVE]      = shade (0.87, @bg_color_dark)
+	bg[PRELIGHT]    = shade (0.95, @bg_color)
+	bg[INSENSITIVE] = shade (0.80, @bg_color_dark)
+
+	engine "murrine"
+	{
+		contrast              = 0.9
+		lightborderstyle      = 0
+		lightborder_shade     = 1.34
+		trough_border_shades  = {0.65, 0.95}
+		trough_shades         = {0.90, 1.04}
+	}
+}
+
+style "dark_toolbar_entry" = "entry"
+{
+	text[NORMAL]      = @text_color
+	text[PRELIGHT]    = @text_color
+	text[SELECTED]    = @selected_fg_color
+	text[INSENSITIVE] = shade (0.8, @bg_color)
+	text[ACTIVE]      = darker (@text_color)
+
+	engine "murrine" {
+	}
+}
+
+
 style "menu" = "dark" {
 	xthickness = 0
 	ythickness = 0
@@ -723,6 +808,33 @@ widget "*IdoEntryMenuItem*" style "wide"
 # See the documentation of the style.
 widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "evo_new_button_workaround"
 
+##########################################################################
+# The following applies the dark style to selected toolbars
+##########################################################################
+
+# Give widgets called "toolbar" the dark style:
+#  - caja calls it Toolbar
+#  - pluma and others call it ToolBar
+#  - pcmanfm calls it toolbar
+widget "*.?ool?ar"                  style "dark_toolbar_bg"
+widget "*.?ool?ar.*"                style "dark_toolbar"
+widget "*.?ool?ar.*<GtkScale>"      style "dark_toolbar_scale"
+widget "*.?ool?ar.*Entry*"          style "dark_toolbar_entry"
+widget "*.?ool?ar.*Combo*"          style "dark_toolbar_combo"
+
+# Eye of MATE needs special treatment ...
+widget_class "*EomWindow*<GtkToolbar>"		style "dark_toolbar_bg"
+widget_class "*EomWindow*<GtkToolbar>.*" 	style "dark_toolbar"
+
+# ... as does Atril ...
+widget_class "*EvWindow*<GtkToolbar>"			style "dark_toolbar_bg"
+widget_class "*EvWindow*<GtkToolbar>.*" 		style "dark_toolbar"
+widget_class "*EvWindow*<GtkToolbar>*<GtkEntry>"        style "dark_toolbar_entry"
+
+# TODO ...
+#  - Mate disk usage analyser
+
+
 # Includes
 #include "apps/banshee.rc"
 include "apps/chromium.rc"