diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais
index 297b3c960..4940fd79a 100644
--- a/rtdata/languages/Francais
+++ b/rtdata/languages/Francais
@@ -596,6 +596,7 @@ PREFERENCES_SHOWONLYRAW;Voir seulement les fichiers RAW
 PREFERENCES_SHTHRESHOLD;Seuil pour le dépassement de domaine inférieur
 PREFERENCES_SINGLETAB;Éditeur unique
 PREFERENCES_SINGLETABVERTAB;Éditeur unique, onglets verticaux
+PREFERENCES_SLIMUI;Interface compact
 PREFERENCES_SND_BATCHQUEUEDONE;File de traitement terminée
 PREFERENCES_SND_HELP;Saisissez un chemin de fichier ou rien du tout (pour ne pas avoir de son). Pour Windows,\nsaisissez "SystemDefault", "SystemAsterisk" etc. pour utiliser les sons systèmes.
 PREFERENCES_SND_LNGEDITPROCDONE;Traitement terminée de la zone de prévisualisation
diff --git a/rtdata/languages/default b/rtdata/languages/default
index 4d1560375..00a2f6de5 100644
--- a/rtdata/languages/default
+++ b/rtdata/languages/default
@@ -618,6 +618,7 @@ PREFERENCES_SHOWONLYRAW;Show only RAW files
 PREFERENCES_SHTHRESHOLD;Threshold for clipped shadows
 PREFERENCES_SINGLETAB;Single tab mode
 PREFERENCES_SINGLETABVERTAB;Single tab mode, vertical tabs
+PREFERENCES_SLIMUI;Slim interface
 PREFERENCES_SND_BATCHQUEUEDONE;Batch queue done
 PREFERENCES_SND_HELP;Either enter filepath or nothing (for no sound). On Windows use "SystemDefault", "SystemAsterisk" etc. for system sounds.
 PREFERENCES_SND_LNGEDITPROCDONE;Editor processing done
diff --git a/rtdata/themes/09-Gray-Orange.gtkrc b/rtdata/themes/09-Gray-Orange.gtkrc
new file mode 100644
index 000000000..58cf72cbf
--- /dev/null
+++ b/rtdata/themes/09-Gray-Orange.gtkrc
@@ -0,0 +1,510 @@
+#
+#  This file is part of RawTherapee.
+#
+#  Copyright (c) 2004-2011 Gabor Horvath <hgabor@rawtherapee.com>
+#
+#  RawTherapee is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+# 
+#  RawTherapee is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# Please keep this gtkrc in sync with the other ones from Clearlooks based themes.
+
+gtk-color-scheme = "salt_pinch:#FF8000\nbase_color:#0A0A0A\nfg_color:#757575\ntooltip_fg_color:#D2D2D2\nselected_bg_color:#B3641B\nselected_fg_color:#D0D0D0\ntext_color:#757575\nbg_color:#181818\ntooltip_bg_color:#5A5A5A"
+
+style "clearlooks-default" {
+	xthickness = 1
+	ythickness = 1
+
+	#######################
+	# Style Properties
+	#######################
+	GtkButton::child-displacement-x = 1
+	GtkButton::child-displacement-y = 1
+	GtkButton::default-border = { 0, 0, 0, 0 }
+	GtkButton::image-spacing = 4
+	GtkToolButton::icon-spacing = 4
+
+	GtkCheckButton::indicator-size = 14
+
+	GtkPaned::handle-size = 6
+
+	GtkRange::trough-border = 0
+	GtkRange::slider-width = 15
+	GtkRange::stepper-size = 15
+
+	GtkScale::slider-width = 14
+	GtkScale::slider-length = 30
+	GtkScale::trough-side-details = 0
+
+	GtkScrollbar::min-slider-length = 30
+	GtkMenuBar::internal-padding = 0
+	GtkExpander::expander-size = 18
+	GtkExpander::expander-spacing = 0
+	GtkToolbar::internal-padding = 1
+	GtkTreeView::expander-size = 12
+	GtkTreeView::vertical-separator = 0
+
+	GtkMenu::horizontal-padding = 0
+	GtkMenu::vertical-padding = 0
+
+	WnckTasklist::fade-overlay-rect = 0
+	# The following line hints to gecko (and possibly other appliations)
+	# that the entry should be drawn transparently on the canvas.
+	# Without this, gecko will fill in the background of the entry.
+	GtkEntry::honors-transparent-bg-hint = 1
+
+	GtkEntry::progress-border = { 2, 2, 2, 2 }
+
+	####################
+	# Color Definitions
+	####################
+	bg[NORMAL]        = @bg_color
+	bg[PRELIGHT]      = shade (1.02, @bg_color)
+	bg[SELECTED]      = @selected_bg_color
+	bg[INSENSITIVE]   = @bg_color
+	bg[ACTIVE]        = shade (0.9, @bg_color)
+
+	fg[NORMAL]        = @fg_color
+	fg[PRELIGHT]      = @fg_color
+	fg[SELECTED]      = @selected_fg_color
+	fg[INSENSITIVE]   = mix (0.2, @fg_color, @bg_color)
+	fg[ACTIVE]        = @fg_color
+
+	text[NORMAL]      = @text_color
+	text[PRELIGHT]    = @text_color
+	text[SELECTED]    = @selected_fg_color
+	text[INSENSITIVE] = darker (@bg_color)
+	text[ACTIVE]      = @selected_fg_color
+
+	base[NORMAL]      = @base_color
+	base[PRELIGHT]    = shade (0.95, @bg_color)
+	base[SELECTED]    = @selected_bg_color
+	base[INSENSITIVE] = @bg_color
+	base[ACTIVE]      = shade (0.9, @selected_bg_color)
+
+	engine "clearlooks" {
+		colorize_scrollbar = TRUE
+		reliefstyle = 1
+		menubarstyle = 2
+		toolbarstyle = 1
+		animation = FALSE
+		radius = 3.0
+		style = GUMMY
+
+		# Set a hint to disable backward compatibility fallbacks.
+		hint = "use-hints"
+	}
+}
+
+style "wide" {
+	xthickness = 2
+	ythickness = 2
+}
+
+style "wider" {
+	xthickness = 3
+	ythickness = 3
+}
+
+style "entry" {
+	xthickness = 3
+	ythickness = 3
+
+	bg[SELECTED] = mix (1.4, @selected_bg_color, @base_color)
+	fg[SELECTED] = @selected_fg_color
+
+	engine "clearlooks" {
+		focus_color = shade (0.65, @selected_bg_color)
+	}
+}
+
+style "paned" {
+
+	bg[PRELIGHT] = shade (0.8, @bg_color)
+
+	engine "clearlooks" {
+		hint = "paned"
+	}
+}
+
+style "HSV" {
+
+	engine "clearlooks" {
+		hint = "HSV"
+		disable_focus = TRUE
+	}
+}
+
+style "spinbutton" {
+
+	engine "clearlooks" {
+		hint = "spinbutton"
+	}
+}
+
+style "scale" {
+	xthickness = 2
+	ythickness = 2
+
+	bg[NORMAL]        = shade (1.35, @bg_color)
+	bg[PRELIGHT]      = shade (1.70, @bg_color)
+	# when GtkScale::trough-side-details = 1, bg[SELECTED] set the color of the slider background on the left of the knob
+	#bg[SELECTED]      = @bg_color
+
+	engine "clearlooks" {
+		focus_color = @selected_bg_color
+		hint = "scale"
+	}
+}
+
+style "vscale" {
+
+	engine "clearlooks" {
+		hint = "vscale"
+	}
+}
+
+style "hscale" {
+
+	engine "clearlooks" {
+		hint = "hscale"
+	}
+}
+
+style "scrollbar" {
+	xthickness = 2
+	ythickness = 2
+
+	bg[SELECTED]      = shade (1.50, @bg_color)
+
+	engine "clearlooks" {
+		hint = "scrollbar"
+	}
+}
+
+style "hscrollbar" {
+
+	engine "clearlooks" {
+		hint = "hscrollbar"
+	}
+}
+
+style "vscrollbar" {
+
+	engine "clearlooks" {
+		hint = "vscrollbar"
+	}
+}
+
+style "notebook_bg" {
+
+	bg[NORMAL]        = shade (1.02, @bg_color)
+	bg[ACTIVE]        = @base_color
+}
+
+style "button" {
+
+	bg[NORMAL]        = shade (1.35, @bg_color)
+	bg[PRELIGHT]      = shade (1.55, @bg_color)
+	bg[ACTIVE]        = shade (1.80, @bg_color)
+
+	engine "clearlooks"
+	{
+		hint	= "button"
+	}
+}
+
+# The color is changed by the notebook_bg style, this style
+# changes the x/ythickness
+style "notebook" {
+	xthickness = 3
+	ythickness = 3
+
+	bg[SELECTED]      = @salt_pinch
+}
+
+style "statusbar" {
+
+	engine "clearlooks" {
+		hint = "statusbar"
+	}
+}
+
+style "comboboxentry" {
+
+	engine "clearlooks" {
+		# Note:
+		# If you set the appears-as-list option on comboboxes in the theme,
+		# then you should set this hint on the combobox instead.
+		hint = "comboboxentry"
+	}
+}
+
+style "expander" {
+
+	fg[NORMAL]        = @salt_pinch
+	fg[PRELIGHT]      = @salt_pinch
+	fg[INSENSITIVE]   = @salt_pinch
+
+	bg[PRELIGHT]      = mix(0.5, @selected_bg_color, @bg_color)
+
+	base[NORMAL]      = @salt_pinch
+	base[PRELIGHT]    = @salt_pinch
+	base[INSENSITIVE] = @salt_pinch
+
+	engine "clearlooks" {
+		hint = "expander"
+	}
+}
+
+style "expanderLabel" {
+
+	fg[NORMAL]   = shade (1.50, @text_color)
+	fg[PRELIGHT] = @selected_fg_color
+}
+
+style "menubar" {
+
+	engine "clearlooks" {
+		hint = "menubar"
+	}
+}
+
+style "menu" {
+	xthickness = 0
+	ythickness = 0
+
+	bg[NORMAL]      = shade (0.70, @bg_color)
+
+	engine "clearlooks" {
+		radius = 0.0
+	}
+}
+
+style "menu_item" {
+	xthickness = 2
+	ythickness = 3
+
+	fg[PRELIGHT]      = @selected_fg_color
+}
+
+# This style is there to modify the separator menu items. The goals are:
+# 1. Get a specific height.
+# 2. The line should go to the edges (ie. no border at the left/right)
+style "separator_menu_item" {
+	xthickness = 1
+	ythickness = 0
+
+	GtkSeparatorMenuItem::horizontal-padding = 0
+	GtkWidget::wide-separators = 1
+	GtkWidget::separator-width = 1
+	GtkWidget::separator-height = 7
+}
+
+style "frame_title" {
+
+	fg[NORMAL]        = shade (1.50, @text_color)
+}
+
+style "treeview" {
+
+	base[ACTIVE]      = mix(0.50, @selected_bg_color, @base_color)
+
+	engine "clearlooks" {
+		hint = "treeview"
+	}
+}
+
+# The almost useless progress bar style
+style "progressbar" {
+	xthickness = 1
+	ythickness = 1
+
+	fg[PRELIGHT]      = @selected_fg_color
+
+	engine "clearlooks" {
+		# Explicitly set the radius for the progress bars inside menu items.
+		radius = 3.0
+
+		hint = "progressbar"
+	}
+}
+
+# This style is based on the clearlooks-default style, so that the colors from the button
+# style are overriden again.
+style "treeview_header" = "clearlooks-default" {
+	xthickness = 2
+	ythickness = 1
+
+	engine "clearlooks" {
+		hint = "treeview-header"
+	}
+}
+
+style "tooltips" {
+	xthickness = 4
+	ythickness = 4
+
+	bg[NORMAL]        = @tooltip_bg_color
+	fg[NORMAL]        = @tooltip_fg_color
+}
+
+style "nautilus_location" {
+
+	bg[NORMAL]        = mix (0.60, shade (1.05, @bg_color), @selected_bg_color)
+}
+
+# Wrokaroudn style for places where the text color is used instead of the fg color.
+style "text_is_fg_color_workaround" {
+
+	text[NORMAL]      = @fg_color
+	text[PRELIGHT]    = @fg_color
+	text[SELECTED]    = @selected_fg_color
+	text[ACTIVE]      = @fg_color
+	text[INSENSITIVE] = darker (@bg_color)
+}
+
+# Workaround style for menus where the text color is used instead of the fg color.
+style "menuitem_text_is_fg_color_workaround" {
+
+	text[NORMAL]      = @fg_color
+	text[PRELIGHT]    = @selected_fg_color
+	text[SELECTED]    = @selected_fg_color
+	text[ACTIVE]      = @fg_color
+	text[INSENSITIVE] = darker (@bg_color)
+}
+
+# Workaround style for places where the fg color is used instead of the text color.
+style "fg_is_text_color_workaround" {
+
+	fg[NORMAL]        = @text_color
+	fg[PRELIGHT]      = @text_color
+	fg[SELECTED]      = @selected_fg_color
+	fg[ACTIVE]        = @selected_fg_color
+	fg[INSENSITIVE]   = darker (@bg_color)
+}
+
+# Style to set the toolbar to use a flat style. This is because the "New" button in
+# Evolution is not drawn transparent. So if there is a gradient in the background it will
+# look really wrong.
+# See http://bugzilla.gnome.org/show_bug.cgi?id=446953.
+style "evo_new_button_workaround" {
+
+	engine "clearlooks" {
+		toolbarstyle = 0
+	}
+}
+
+
+###############################################################################
+# The following part of the gtkrc applies the different styles to the widgets.
+###############################################################################
+
+# The clearlooks-default style is applied to every widget
+class "GtkWidget" style "clearlooks-default"
+
+class "GtkSeparator" style "wide"
+class "GtkFrame" style "wide"
+class "GtkCalendar" style "wide"
+class "GtkCheckButton" style "wider"
+class "GtkRadioButton" style "wider"
+class "GtkEntry" style "entry"
+
+class "GtkPaned" style "paned"
+class "GtkSpinButton" style "spinbutton"
+class "GtkScale" style "scale"
+class "GtkVScale" style "vscale"
+class "GtkHScale" style "hscale"
+class "GtkScrollbar" style "scrollbar"
+class "GtkHScrollbar" style "hscrollbar"
+class "GtkVScrollbar" style "vscrollbar"
+
+class "GtkExpander" style "expander"
+class "GtkHSV" style "HSV"
+
+# General matching follows. The order is choosen so that the right styles override
+# each other. EG. progressbar needs to be more important than the menu match.
+widget_class "*<GtkNotebook>" style "notebook_bg"
+# This is not perfect, it could be done better.
+# (That is modify *every* widget in the notebook, and change those back that
+# we really don't want changed)
+widget_class "*<GtkNotebook>*<GtkEventBox>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkLayout>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkViewport>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkScrolledWindow>" style "notebook_bg"
+
+widget_class "*<GtkButton>" style "button"
+widget_class "*<GtkNotebook>" style "notebook"
+widget_class "*<GtkStatusbar>*" style "statusbar"
+
+widget_class "*<GtkComboBoxEntry>*" style "comboboxentry"
+widget_class "*<GtkCombo>*" style "comboboxentry"
+
+widget_class "*<GtkExpander>.<GtkLabel>" style "expanderLabel"
+
+widget_class "*<GtkMenuBar>*" style "menubar"
+widget_class "*<GtkMenu>*" style "menu"
+widget_class "*<GtkMenuItem>*" style "menu_item"
+widget_class "*<GtkSeparatorMenuItem>*" style "separator_menu_item"
+
+widget_class "*.<GtkFrame>.<GtkLabel>" style "frame_title"
+widget_class "*.<GtkTreeView>*" style "treeview"
+
+widget_class "*<GtkProgress>" style "progressbar"
+
+# Treeview headers (and similar stock GTK+ widgets)
+widget_class "*.<GtkTreeView>.<GtkButton>" style "treeview_header"
+widget_class "*.<GtkCTree>.<GtkButton>" style "treeview_header"
+widget_class "*.<GtkList>.<GtkButton>" style "treeview_header"
+widget_class "*.<GtkCList>.<GtkButton>" style "treeview_header"
+
+# The window of the tooltip is called "gtk-tooltip"
+##################################################################
+# FIXME:
+# This will not work if one embeds eg. a button into the tooltip.
+# As far as I can tell right now we will need to rework the theme
+# quite a bit to get this working correctly.
+# (It will involve setting different priorities, etc.)
+##################################################################
+widget "gtk-tooltip*" style "tooltips"
+
+##########################################################################
+# Following are special cases and workarounds for issues in applications.
+##########################################################################
+
+# Workaround for the evolution ETable (bug #527532)
+widget_class "*.<ETable>.<ECanvas>" style "treeview_header"
+# Workaround for the evolution ETree
+widget_class "*.<ETree>.<ECanvas>" style "treeview_header"
+
+# Special case the nautilus-extra-view-widget
+# ToDo: A more generic approach for all applications that have a widget like this.
+widget "*.nautilus-extra-view-widget" style : highest "nautilus_location"
+
+# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
+# Note that this work around assumes that the combobox is _not_ in appears-as-list mode.
+widget_class "*.<GtkComboBox>.<GtkCellView>" style "text_is_fg_color_workaround"
+# This is the part of the workaround that fixes the menus
+widget "*.gtk-combobox-popup-menu.*" style "menuitem_text_is_fg_color_workaround"
+
+# Work around the usage of GtkLabel inside GtkListItems to display text.
+# This breaks because the label is shown on a background that is based on the base color.
+widget_class "*<GtkListItem>*" style "fg_is_text_color_workaround"
+# GtkCList also uses the fg color to draw text on top of the base colors.
+widget_class "*<GtkCList>" style "fg_is_text_color_workaround"
+# Nautilus when renaming files, and maybe other places.
+widget_class "*<EelEditableLabel>" style "fg_is_text_color_workaround"
+
+# See the documentation of the style.
+widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "evo_new_button_workaround"
diff --git a/rtdata/themes/17-Gray-Red.gtkrc b/rtdata/themes/17-Gray-Red.gtkrc
new file mode 100644
index 000000000..23dd94096
--- /dev/null
+++ b/rtdata/themes/17-Gray-Red.gtkrc
@@ -0,0 +1,512 @@
+#
+#  This file is part of RawTherapee.
+#
+#  Copyright (c) 2004-2011 Gabor Horvath <hgabor@rawtherapee.com>
+#
+#  RawTherapee is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+# 
+#  RawTherapee is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# Please keep this gtkrc in sync with the other ones from Clearlooks based themes.
+
+gtk-color-scheme = "salt_pinch:#800000\nbase_color:#404040\nfg_color:#808080\ntooltip_fg_color:#D2D2D2\nselected_bg_color:#502828\nselected_fg_color:#D0D0D0\ntext_color:#A0A0A0\nbg_color:#2B2B2B\ntooltip_bg_color:#5A5A5A"
+
+style "clearlooks-default" {
+	xthickness = 1
+	ythickness = 1
+
+	#######################
+	# Style Properties
+	#######################
+	GtkButton::child-displacement-x = 1
+	GtkButton::child-displacement-y = 1
+	GtkButton::default-border = { 0, 0, 0, 0 }
+	GtkButton::image-spacing = 4
+	GtkToolButton::icon-spacing = 4
+
+	GtkCheckButton::indicator-size = 14
+
+	GtkPaned::handle-size = 6
+
+	GtkRange::trough-border = 0
+	GtkRange::slider-width = 15
+	GtkRange::stepper-size = 15
+
+	GtkScale::slider-width = 14
+	GtkScale::slider-length = 30
+	GtkScale::trough-side-details = 0
+
+	GtkScrollbar::min-slider-length = 30
+	GtkMenuBar::internal-padding = 0
+	GtkExpander::expander-size = 18
+	GtkExpander::expander-spacing = 0
+	GtkToolbar::internal-padding = 1
+	GtkTreeView::expander-size = 12
+	GtkTreeView::vertical-separator = 0
+
+	GtkMenu::horizontal-padding = 0
+	GtkMenu::vertical-padding = 0
+
+	WnckTasklist::fade-overlay-rect = 0
+	# The following line hints to gecko (and possibly other appliations)
+	# that the entry should be drawn transparently on the canvas.
+	# Without this, gecko will fill in the background of the entry.
+	GtkEntry::honors-transparent-bg-hint = 1
+
+	GtkEntry::progress-border = { 2, 2, 2, 2 }
+
+	####################
+	# Color Definitions
+	####################
+	bg[NORMAL]        = @bg_color
+	bg[PRELIGHT]      = shade (1.02, @bg_color)
+	bg[SELECTED]      = @selected_bg_color
+	bg[INSENSITIVE]   = @bg_color
+	bg[ACTIVE]        = shade (0.9, @bg_color)
+
+	fg[NORMAL]        = @fg_color
+	fg[PRELIGHT]      = @fg_color
+	fg[SELECTED]      = @selected_fg_color
+	fg[INSENSITIVE]   = mix (0.2, @fg_color, @bg_color)
+	fg[ACTIVE]        = @fg_color
+
+	text[NORMAL]      = @text_color
+	text[PRELIGHT]    = @text_color
+	text[SELECTED]    = @selected_fg_color
+	text[INSENSITIVE] = darker (@bg_color)
+	text[ACTIVE]      = @selected_fg_color
+
+	base[NORMAL]      = @base_color
+	base[PRELIGHT]    = shade (0.95, @bg_color)
+	base[SELECTED]    = @selected_bg_color
+	base[INSENSITIVE] = @bg_color
+	base[ACTIVE]      = shade (0.9, @selected_bg_color)
+
+	engine "clearlooks" {
+		colorize_scrollbar = TRUE
+		reliefstyle = 1
+		menubarstyle = 2
+		toolbarstyle = 1
+		animation = FALSE
+		radius = 3.0
+		style = GUMMY
+
+		# Set a hint to disable backward compatibility fallbacks.
+		hint = "use-hints"
+	}
+}
+
+style "wide" {
+	xthickness = 2
+	ythickness = 2
+}
+
+style "wider" {
+	xthickness = 3
+	ythickness = 3
+}
+
+style "entry" {
+	xthickness = 3
+	ythickness = 3
+
+	bg[SELECTED] = mix (1.4, @selected_bg_color, @base_color)
+	fg[SELECTED] = @selected_fg_color
+
+	engine "clearlooks" {
+		focus_color = shade (0.65, @selected_bg_color)
+	}
+}
+
+style "paned" {
+
+	bg[PRELIGHT] = shade (0.9, @bg_color)
+
+	engine "clearlooks" {
+		hint = "paned"
+	}
+}
+
+style "HSV" {
+
+	engine "clearlooks" {
+		hint = "HSV"
+		disable_focus = TRUE
+	}
+}
+
+style "spinbutton" {
+
+	engine "clearlooks" {
+		hint = "spinbutton"
+	}
+}
+
+style "scale" {
+	xthickness = 2
+	ythickness = 2
+
+	bg[NORMAL]        = shade (1.35, @bg_color)
+	bg[PRELIGHT]      = shade (1.70, @bg_color)
+	# when GtkScale::trough-side-details = 1, bg[SELECTED] set the color of the slider background on the left of the knob
+	#bg[SELECTED]      = @bg_color
+
+	engine "clearlooks" {
+		focus_color = @selected_bg_color
+		hint = "scale"
+	}
+}
+
+style "vscale" {
+
+	engine "clearlooks" {
+		hint = "vscale"
+	}
+}
+
+style "hscale" {
+
+	engine "clearlooks" {
+		hint = "hscale"
+	}
+}
+
+style "scrollbar" {
+	xthickness = 2
+	ythickness = 2
+
+	bg[SELECTED]      = shade (1.25, @bg_color)
+
+	engine "clearlooks" {
+		hint = "scrollbar"
+	}
+}
+
+style "hscrollbar" {
+
+	engine "clearlooks" {
+		hint = "hscrollbar"
+	}
+}
+
+style "vscrollbar" {
+
+	engine "clearlooks" {
+		hint = "vscrollbar"
+	}
+}
+
+style "notebook_bg" {
+
+	bg[NORMAL]        = shade (1.02, @bg_color)
+	bg[ACTIVE]        = shade (0.80, @bg_color)
+}
+
+style "button" {
+
+	bg[NORMAL]        = shade (1.25, @bg_color)
+	bg[PRELIGHT]      = shade (1.50, @bg_color)
+	bg[ACTIVE]        = shade (1.70, @bg_color)
+
+	engine "clearlooks"
+	{
+		hint	= "button"
+	}
+}
+
+# The color is changed by the notebook_bg style, this style
+# changes the x/ythickness
+style "notebook" {
+	xthickness = 3
+	ythickness = 3
+
+	bg[SELECTED]      = @salt_pinch
+}
+
+style "statusbar" {
+
+	engine "clearlooks" {
+		hint = "statusbar"
+	}
+}
+
+style "comboboxentry" {
+
+	engine "clearlooks" {
+		# Note:
+		# If you set the appears-as-list option on comboboxes in the theme,
+		# then you should set this hint on the combobox instead.
+		hint = "comboboxentry"
+	}
+}
+
+style "expander" {
+
+	fg[NORMAL]        = @salt_pinch
+	fg[PRELIGHT]      = @salt_pinch
+	fg[INSENSITIVE]   = @salt_pinch
+
+	bg[PRELIGHT]      = mix(0.75, @selected_bg_color, @bg_color)
+
+	base[NORMAL]      = @salt_pinch
+	base[PRELIGHT]    = @salt_pinch
+	base[INSENSITIVE] = @salt_pinch
+
+	engine "clearlooks" {
+		hint = "expander"
+	}
+}
+
+style "expanderLabel" {
+
+	fg[NORMAL]   = "#a0a0a0"
+	fg[PRELIGHT] = "#d0d0d0"
+}
+
+style "menubar" {
+
+	engine "clearlooks" {
+		hint = "menubar"
+	}
+}
+
+style "menu" {
+	xthickness = 0
+	ythickness = 0
+
+	bg[NORMAL]      = shade (0.70, @bg_color)
+
+	engine "clearlooks" {
+		radius = 0.0
+	}
+}
+
+style "menu_item" {
+	xthickness = 2
+	ythickness = 3
+
+	fg[PRELIGHT]      = @selected_fg_color
+}
+
+# This style is there to modify the separator menu items. The goals are:
+# 1. Get a specific height.
+# 2. The line should go to the edges (ie. no border at the left/right)
+style "separator_menu_item" {
+	xthickness = 1
+	ythickness = 0
+
+	GtkSeparatorMenuItem::horizontal-padding = 0
+	GtkWidget::wide-separators = 1
+	GtkWidget::separator-width = 1
+	GtkWidget::separator-height = 7
+}
+
+style "frame_title" {
+
+	fg[NORMAL]        = lighter (@fg_color)
+}
+
+style "treeview" {
+
+	base[ACTIVE]      = mix(0.50, @selected_bg_color, @base_color)
+
+	engine "clearlooks" {
+		hint = "treeview"
+	}
+}
+
+# The almost useless progress bar style
+style "progressbar" {
+	xthickness = 1
+	ythickness = 1
+
+	fg[PRELIGHT]      = @selected_fg_color
+
+	engine "clearlooks" {
+		# Explicitly set the radius for the progress bars inside menu items.
+		radius = 3.0
+
+		hint = "progressbar"
+	}
+}
+
+# This style is based on the clearlooks-default style, so that the colors from the button
+# style are overriden again.
+style "treeview_header" = "clearlooks-default" {
+	xthickness = 2
+	ythickness = 1
+
+	bg[NORMAL] = shade (0.80, @bg_color)
+
+	engine "clearlooks" {
+		hint = "treeview-header"
+	}
+}
+
+style "tooltips" {
+	xthickness = 4
+	ythickness = 4
+
+	bg[NORMAL]        = @tooltip_bg_color
+	fg[NORMAL]        = @tooltip_fg_color
+}
+
+style "nautilus_location" {
+
+	bg[NORMAL]        = mix (0.60, shade (1.05, @bg_color), @selected_bg_color)
+}
+
+# Wrokaroudn style for places where the text color is used instead of the fg color.
+style "text_is_fg_color_workaround" {
+
+	text[NORMAL]      = @fg_color
+	text[PRELIGHT]    = @fg_color
+	text[SELECTED]    = @selected_fg_color
+	text[ACTIVE]      = @fg_color
+	text[INSENSITIVE] = darker (@bg_color)
+}
+
+# Workaround style for menus where the text color is used instead of the fg color.
+style "menuitem_text_is_fg_color_workaround" {
+
+	text[NORMAL]      = @fg_color
+	text[PRELIGHT]    = @selected_fg_color
+	text[SELECTED]    = @selected_fg_color
+	text[ACTIVE]      = @fg_color
+	text[INSENSITIVE] = darker (@bg_color)
+}
+
+# Workaround style for places where the fg color is used instead of the text color.
+style "fg_is_text_color_workaround" {
+
+	fg[NORMAL]        = @text_color
+	fg[PRELIGHT]      = @text_color
+	fg[SELECTED]      = @selected_fg_color
+	fg[ACTIVE]        = @selected_fg_color
+	fg[INSENSITIVE]   = darker (@bg_color)
+}
+
+# Style to set the toolbar to use a flat style. This is because the "New" button in
+# Evolution is not drawn transparent. So if there is a gradient in the background it will
+# look really wrong.
+# See http://bugzilla.gnome.org/show_bug.cgi?id=446953.
+style "evo_new_button_workaround" {
+
+	engine "clearlooks" {
+		toolbarstyle = 0
+	}
+}
+
+
+###############################################################################
+# The following part of the gtkrc applies the different styles to the widgets.
+###############################################################################
+
+# The clearlooks-default style is applied to every widget
+class "GtkWidget" style "clearlooks-default"
+
+class "GtkSeparator" style "wide"
+class "GtkFrame" style "wide"
+class "GtkCalendar" style "wide"
+class "GtkCheckButton" style "wider"
+class "GtkRadioButton" style "wider"
+class "GtkEntry" style "entry"
+
+class "GtkPaned" style "paned"
+class "GtkSpinButton" style "spinbutton"
+class "GtkScale" style "scale"
+class "GtkVScale" style "vscale"
+class "GtkHScale" style "hscale"
+class "GtkScrollbar" style "scrollbar"
+class "GtkHScrollbar" style "hscrollbar"
+class "GtkVScrollbar" style "vscrollbar"
+
+class "GtkExpander" style "expander"
+class "GtkHSV" style "HSV"
+
+# General matching follows. The order is choosen so that the right styles override
+# each other. EG. progressbar needs to be more important than the menu match.
+widget_class "*<GtkNotebook>" style "notebook_bg"
+# This is not perfect, it could be done better.
+# (That is modify *every* widget in the notebook, and change those back that
+# we really don't want changed)
+widget_class "*<GtkNotebook>*<GtkEventBox>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkLayout>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkViewport>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkScrolledWindow>" style "notebook_bg"
+
+widget_class "*<GtkButton>" style "button"
+widget_class "*<GtkNotebook>" style "notebook"
+widget_class "*<GtkStatusbar>*" style "statusbar"
+
+widget_class "*<GtkComboBoxEntry>*" style "comboboxentry"
+widget_class "*<GtkCombo>*" style "comboboxentry"
+
+widget_class "*<GtkExpander>.<GtkLabel>" style "expanderLabel"
+
+widget_class "*<GtkMenuBar>*" style "menubar"
+widget_class "*<GtkMenu>*" style "menu"
+widget_class "*<GtkMenuItem>*" style "menu_item"
+widget_class "*<GtkSeparatorMenuItem>*" style "separator_menu_item"
+
+widget_class "*.<GtkFrame>.<GtkLabel>" style "frame_title"
+widget_class "*.<GtkTreeView>*" style "treeview"
+
+widget_class "*<GtkProgress>" style "progressbar"
+
+# Treeview headers (and similar stock GTK+ widgets)
+widget_class "*.<GtkTreeView>.<GtkButton>" style "treeview_header"
+widget_class "*.<GtkCTree>.<GtkButton>" style "treeview_header"
+widget_class "*.<GtkList>.<GtkButton>" style "treeview_header"
+widget_class "*.<GtkCList>.<GtkButton>" style "treeview_header"
+
+# The window of the tooltip is called "gtk-tooltip"
+##################################################################
+# FIXME:
+# This will not work if one embeds eg. a button into the tooltip.
+# As far as I can tell right now we will need to rework the theme
+# quite a bit to get this working correctly.
+# (It will involve setting different priorities, etc.)
+##################################################################
+widget "gtk-tooltip*" style "tooltips"
+
+##########################################################################
+# Following are special cases and workarounds for issues in applications.
+##########################################################################
+
+# Workaround for the evolution ETable (bug #527532)
+widget_class "*.<ETable>.<ECanvas>" style "treeview_header"
+# Workaround for the evolution ETree
+widget_class "*.<ETree>.<ECanvas>" style "treeview_header"
+
+# Special case the nautilus-extra-view-widget
+# ToDo: A more generic approach for all applications that have a widget like this.
+widget "*.nautilus-extra-view-widget" style : highest "nautilus_location"
+
+# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
+# Note that this work around assumes that the combobox is _not_ in appears-as-list mode.
+widget_class "*.<GtkComboBox>.<GtkCellView>" style "text_is_fg_color_workaround"
+# This is the part of the workaround that fixes the menus
+widget "*.gtk-combobox-popup-menu.*" style "menuitem_text_is_fg_color_workaround"
+
+# Work around the usage of GtkLabel inside GtkListItems to display text.
+# This breaks because the label is shown on a background that is based on the base color.
+widget_class "*<GtkListItem>*" style "fg_is_text_color_workaround"
+# GtkCList also uses the fg color to draw text on top of the base colors.
+widget_class "*<GtkCList>" style "fg_is_text_color_workaround"
+# Nautilus when renaming files, and maybe other places.
+widget_class "*<EelEditableLabel>" style "fg_is_text_color_workaround"
+
+# See the documentation of the style.
+widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "evo_new_button_workaround"
diff --git a/rtdata/themes/25-Gray-Purple.gtkrc b/rtdata/themes/25-Gray-Purple.gtkrc
new file mode 100644
index 000000000..8f8d0dd67
--- /dev/null
+++ b/rtdata/themes/25-Gray-Purple.gtkrc
@@ -0,0 +1,512 @@
+#
+#  This file is part of RawTherapee.
+#
+#  Copyright (c) 2004-2011 Gabor Horvath <hgabor@rawtherapee.com>
+#
+#  RawTherapee is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+# 
+#  RawTherapee is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# Please keep this gtkrc in sync with the other ones from Clearlooks based themes.
+
+gtk-color-scheme = "salt_pinch:#843382\nbase_color:#525252\nfg_color:#979797\ntooltip_fg_color:#A0A0A0\nselected_bg_color:#5D235C\nselected_fg_color:#CDCDCD\ntext_color:#A2A2A2\nbg_color:#404040\ntooltip_bg_color:#252525"
+
+style "clearlooks-default" {
+	xthickness = 1
+	ythickness = 1
+
+	#######################
+	# Style Properties
+	#######################
+	GtkButton::child-displacement-x = 1
+	GtkButton::child-displacement-y = 1
+	GtkButton::default-border = { 0, 0, 0, 0 }
+	GtkButton::image-spacing = 4
+	GtkToolButton::icon-spacing = 4
+
+	GtkCheckButton::indicator-size = 14
+
+	GtkPaned::handle-size = 6
+
+	GtkRange::trough-border = 0
+	GtkRange::slider-width = 15
+	GtkRange::stepper-size = 15
+
+	GtkScale::slider-width = 14
+	GtkScale::slider-length = 30
+	GtkScale::trough-side-details = 0
+
+	GtkScrollbar::min-slider-length = 30
+	GtkMenuBar::internal-padding = 0
+	GtkExpander::expander-size = 18
+	GtkExpander::expander-spacing = 0
+	GtkToolbar::internal-padding = 1
+	GtkTreeView::expander-size = 12
+	GtkTreeView::vertical-separator = 0
+
+	GtkMenu::horizontal-padding = 0
+	GtkMenu::vertical-padding = 0
+
+	WnckTasklist::fade-overlay-rect = 0
+	# The following line hints to gecko (and possibly other appliations)
+	# that the entry should be drawn transparently on the canvas.
+	# Without this, gecko will fill in the background of the entry.
+	GtkEntry::honors-transparent-bg-hint = 1
+
+	GtkEntry::progress-border = { 2, 2, 2, 2 }
+
+	####################
+	# Color Definitions
+	####################
+	bg[NORMAL]        = @bg_color
+	bg[PRELIGHT]      = shade (1.02, @bg_color)
+	bg[SELECTED]      = @selected_bg_color
+	bg[INSENSITIVE]   = @bg_color
+	bg[ACTIVE]        = shade (0.9, @bg_color)
+
+	fg[NORMAL]        = @fg_color
+	fg[PRELIGHT]      = @fg_color
+	fg[SELECTED]      = @selected_fg_color
+	fg[INSENSITIVE]   = mix (0.2, @fg_color, @bg_color)
+	fg[ACTIVE]        = @fg_color
+
+	text[NORMAL]      = @text_color
+	text[PRELIGHT]    = @text_color
+	text[SELECTED]    = @selected_fg_color
+	text[INSENSITIVE] = darker (@bg_color)
+	text[ACTIVE]      = @selected_fg_color
+
+	base[NORMAL]      = @base_color
+	base[PRELIGHT]    = shade (0.95, @bg_color)
+	base[SELECTED]    = @selected_bg_color
+	base[INSENSITIVE] = @bg_color
+	base[ACTIVE]      = shade (0.9, @selected_bg_color)
+
+	engine "clearlooks" {
+		colorize_scrollbar = TRUE
+		reliefstyle = 1
+		menubarstyle = 2
+		toolbarstyle = 1
+		animation = FALSE
+		radius = 3.0
+		style = GUMMY
+
+		# Set a hint to disable backward compatibility fallbacks.
+		hint = "use-hints"
+	}
+}
+
+style "wide" {
+	xthickness = 2
+	ythickness = 2
+}
+
+style "wider" {
+	xthickness = 3
+	ythickness = 3
+}
+
+style "entry" {
+	xthickness = 3
+	ythickness = 3
+
+	bg[SELECTED] = mix (1.4, @selected_bg_color, @base_color)
+	fg[SELECTED] = @selected_fg_color
+
+	engine "clearlooks" {
+		focus_color = shade (0.65, @selected_bg_color)
+	}
+}
+
+style "paned" {
+
+	bg[PRELIGHT] = shade (0.9, @bg_color)
+
+	engine "clearlooks" {
+		hint = "paned"
+	}
+}
+
+style "HSV" {
+
+	engine "clearlooks" {
+		hint = "HSV"
+		disable_focus = TRUE
+	}
+}
+
+style "spinbutton" {
+
+	engine "clearlooks" {
+		hint = "spinbutton"
+	}
+}
+
+style "scale" {
+	xthickness = 2
+	ythickness = 2
+
+	bg[NORMAL]        = shade (1.30, @bg_color)
+	bg[PRELIGHT]      = shade (1.40, @bg_color)
+	# when GtkScale::trough-side-details = 1, bg[SELECTED] set the color of the slider background on the left of the knob
+	#bg[SELECTED]      = @bg_color
+
+	engine "clearlooks" {
+		focus_color = @selected_bg_color
+		hint = "scale"
+	}
+}
+
+style "vscale" {
+
+	engine "clearlooks" {
+		hint = "vscale"
+	}
+}
+
+style "hscale" {
+
+	engine "clearlooks" {
+		hint = "hscale"
+	}
+}
+
+style "scrollbar" {
+	xthickness = 2
+	ythickness = 2
+
+	bg[SELECTED]      = shade (1.15, @bg_color)
+
+	engine "clearlooks" {
+		hint = "scrollbar"
+	}
+}
+
+style "hscrollbar" {
+
+	engine "clearlooks" {
+		hint = "hscrollbar"
+	}
+}
+
+style "vscrollbar" {
+
+	engine "clearlooks" {
+		hint = "vscrollbar"
+	}
+}
+
+style "notebook_bg" {
+
+	bg[NORMAL]        = shade (1.02, @bg_color)
+	bg[ACTIVE]        = shade (0.80, @bg_color)
+}
+
+style "button" {
+
+	bg[NORMAL]        = shade (0.93, @bg_color)
+	bg[PRELIGHT]      = shade (0.85, @bg_color)
+	bg[ACTIVE]        = shade (0.70, @bg_color)
+
+	engine "clearlooks"
+	{
+		hint	= "button"
+	}
+}
+
+# The color is changed by the notebook_bg style, this style
+# changes the x/ythickness
+style "notebook" {
+	xthickness = 3
+	ythickness = 3
+
+	bg[SELECTED]      = @salt_pinch
+}
+
+style "statusbar" {
+
+	engine "clearlooks" {
+		hint = "statusbar"
+	}
+}
+
+style "comboboxentry" {
+
+	engine "clearlooks" {
+		# Note:
+		# If you set the appears-as-list option on comboboxes in the theme,
+		# then you should set this hint on the combobox instead.
+		hint = "comboboxentry"
+	}
+}
+
+style "expander" {
+
+	fg[NORMAL]        = @salt_pinch
+	fg[PRELIGHT]      = @salt_pinch
+	fg[INSENSITIVE]   = @salt_pinch
+
+	bg[PRELIGHT]      = mix(0.75, @selected_bg_color, @bg_color)
+
+	base[NORMAL]      = @salt_pinch
+	base[PRELIGHT]    = @salt_pinch
+	base[INSENSITIVE] = @salt_pinch
+
+	engine "clearlooks" {
+		hint = "expander"
+	}
+}
+
+style "expanderLabel" {
+
+	fg[NORMAL]   = "#a0a0a0"
+	fg[PRELIGHT] = "#d0d0d0"
+}
+
+style "menubar" {
+
+	engine "clearlooks" {
+		hint = "menubar"
+	}
+}
+
+style "menu" {
+	xthickness = 0
+	ythickness = 0
+
+	bg[NORMAL]      = shade (0.70, @bg_color)
+
+	engine "clearlooks" {
+		radius = 0.0
+	}
+}
+
+style "menu_item" {
+	xthickness = 2
+	ythickness = 3
+
+	fg[PRELIGHT]      = @selected_fg_color
+}
+
+# This style is there to modify the separator menu items. The goals are:
+# 1. Get a specific height.
+# 2. The line should go to the edges (ie. no border at the left/right)
+style "separator_menu_item" {
+	xthickness = 1
+	ythickness = 0
+
+	GtkSeparatorMenuItem::horizontal-padding = 0
+	GtkWidget::wide-separators = 1
+	GtkWidget::separator-width = 1
+	GtkWidget::separator-height = 7
+}
+
+style "frame_title" {
+
+	fg[NORMAL]        = lighter (@fg_color)
+}
+
+style "treeview" {
+
+	base[ACTIVE]      = mix(0.50, @selected_bg_color, @base_color)
+
+	engine "clearlooks" {
+		hint = "treeview"
+	}
+}
+
+# The almost useless progress bar style
+style "progressbar" {
+	xthickness = 1
+	ythickness = 1
+
+	fg[PRELIGHT]      = @selected_fg_color
+
+	engine "clearlooks" {
+		# Explicitly set the radius for the progress bars inside menu items.
+		radius = 3.0
+
+		hint = "progressbar"
+	}
+}
+
+# This style is based on the clearlooks-default style, so that the colors from the button
+# style are overriden again.
+style "treeview_header" = "clearlooks-default" {
+	xthickness = 2
+	ythickness = 1
+
+	bg[NORMAL] = shade (0.80, @bg_color)
+
+	engine "clearlooks" {
+		hint = "treeview-header"
+	}
+}
+
+style "tooltips" {
+	xthickness = 4
+	ythickness = 4
+
+	bg[NORMAL]        = @tooltip_bg_color
+	fg[NORMAL]        = @tooltip_fg_color
+}
+
+style "nautilus_location" {
+
+	bg[NORMAL]        = mix (0.60, shade (1.05, @bg_color), @selected_bg_color)
+}
+
+# Wrokaroudn style for places where the text color is used instead of the fg color.
+style "text_is_fg_color_workaround" {
+
+	text[NORMAL]      = @fg_color
+	text[PRELIGHT]    = @fg_color
+	text[SELECTED]    = @selected_fg_color
+	text[ACTIVE]      = @fg_color
+	text[INSENSITIVE] = darker (@bg_color)
+}
+
+# Workaround style for menus where the text color is used instead of the fg color.
+style "menuitem_text_is_fg_color_workaround" {
+
+	text[NORMAL]      = @fg_color
+	text[PRELIGHT]    = @selected_fg_color
+	text[SELECTED]    = @selected_fg_color
+	text[ACTIVE]      = @fg_color
+	text[INSENSITIVE] = darker (@bg_color)
+}
+
+# Workaround style for places where the fg color is used instead of the text color.
+style "fg_is_text_color_workaround" {
+
+	fg[NORMAL]        = @text_color
+	fg[PRELIGHT]      = @text_color
+	fg[SELECTED]      = @selected_fg_color
+	fg[ACTIVE]        = @selected_fg_color
+	fg[INSENSITIVE]   = darker (@bg_color)
+}
+
+# Style to set the toolbar to use a flat style. This is because the "New" button in
+# Evolution is not drawn transparent. So if there is a gradient in the background it will
+# look really wrong.
+# See http://bugzilla.gnome.org/show_bug.cgi?id=446953.
+style "evo_new_button_workaround" {
+
+	engine "clearlooks" {
+		toolbarstyle = 0
+	}
+}
+
+
+###############################################################################
+# The following part of the gtkrc applies the different styles to the widgets.
+###############################################################################
+
+# The clearlooks-default style is applied to every widget
+class "GtkWidget" style "clearlooks-default"
+
+class "GtkSeparator" style "wide"
+class "GtkFrame" style "wide"
+class "GtkCalendar" style "wide"
+class "GtkCheckButton" style "wider"
+class "GtkRadioButton" style "wider"
+class "GtkEntry" style "entry"
+
+class "GtkPaned" style "paned"
+class "GtkSpinButton" style "spinbutton"
+class "GtkScale" style "scale"
+class "GtkVScale" style "vscale"
+class "GtkHScale" style "hscale"
+class "GtkScrollbar" style "scrollbar"
+class "GtkHScrollbar" style "hscrollbar"
+class "GtkVScrollbar" style "vscrollbar"
+
+class "GtkExpander" style "expander"
+class "GtkHSV" style "HSV"
+
+# General matching follows. The order is choosen so that the right styles override
+# each other. EG. progressbar needs to be more important than the menu match.
+widget_class "*<GtkNotebook>" style "notebook_bg"
+# This is not perfect, it could be done better.
+# (That is modify *every* widget in the notebook, and change those back that
+# we really don't want changed)
+widget_class "*<GtkNotebook>*<GtkEventBox>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkLayout>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkViewport>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkScrolledWindow>" style "notebook_bg"
+
+widget_class "*<GtkButton>" style "button"
+widget_class "*<GtkNotebook>" style "notebook"
+widget_class "*<GtkStatusbar>*" style "statusbar"
+
+widget_class "*<GtkComboBoxEntry>*" style "comboboxentry"
+widget_class "*<GtkCombo>*" style "comboboxentry"
+
+widget_class "*<GtkExpander>.<GtkLabel>" style "expanderLabel"
+
+widget_class "*<GtkMenuBar>*" style "menubar"
+widget_class "*<GtkMenu>*" style "menu"
+widget_class "*<GtkMenuItem>*" style "menu_item"
+widget_class "*<GtkSeparatorMenuItem>*" style "separator_menu_item"
+
+widget_class "*.<GtkFrame>.<GtkLabel>" style "frame_title"
+widget_class "*.<GtkTreeView>*" style "treeview"
+
+widget_class "*<GtkProgress>" style "progressbar"
+
+# Treeview headers (and similar stock GTK+ widgets)
+widget_class "*.<GtkTreeView>.<GtkButton>" style "treeview_header"
+widget_class "*.<GtkCTree>.<GtkButton>" style "treeview_header"
+widget_class "*.<GtkList>.<GtkButton>" style "treeview_header"
+widget_class "*.<GtkCList>.<GtkButton>" style "treeview_header"
+
+# The window of the tooltip is called "gtk-tooltip"
+##################################################################
+# FIXME:
+# This will not work if one embeds eg. a button into the tooltip.
+# As far as I can tell right now we will need to rework the theme
+# quite a bit to get this working correctly.
+# (It will involve setting different priorities, etc.)
+##################################################################
+widget "gtk-tooltip*" style "tooltips"
+
+##########################################################################
+# Following are special cases and workarounds for issues in applications.
+##########################################################################
+
+# Workaround for the evolution ETable (bug #527532)
+widget_class "*.<ETable>.<ECanvas>" style "treeview_header"
+# Workaround for the evolution ETree
+widget_class "*.<ETree>.<ECanvas>" style "treeview_header"
+
+# Special case the nautilus-extra-view-widget
+# ToDo: A more generic approach for all applications that have a widget like this.
+widget "*.nautilus-extra-view-widget" style : highest "nautilus_location"
+
+# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
+# Note that this work around assumes that the combobox is _not_ in appears-as-list mode.
+widget_class "*.<GtkComboBox>.<GtkCellView>" style "text_is_fg_color_workaround"
+# This is the part of the workaround that fixes the menus
+widget "*.gtk-combobox-popup-menu.*" style "menuitem_text_is_fg_color_workaround"
+
+# Work around the usage of GtkLabel inside GtkListItems to display text.
+# This breaks because the label is shown on a background that is based on the base color.
+widget_class "*<GtkListItem>*" style "fg_is_text_color_workaround"
+# GtkCList also uses the fg color to draw text on top of the base colors.
+widget_class "*<GtkCList>" style "fg_is_text_color_workaround"
+# Nautilus when renaming files, and maybe other places.
+widget_class "*<EelEditableLabel>" style "fg_is_text_color_workaround"
+
+# See the documentation of the style.
+widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "evo_new_button_workaround"
diff --git a/rtdata/themes/25-Gray-Red.gtkrc b/rtdata/themes/25-Gray-Red.gtkrc
new file mode 100644
index 000000000..92e74813c
--- /dev/null
+++ b/rtdata/themes/25-Gray-Red.gtkrc
@@ -0,0 +1,512 @@
+#
+#  This file is part of RawTherapee.
+#
+#  Copyright (c) 2004-2011 Gabor Horvath <hgabor@rawtherapee.com>
+#
+#  RawTherapee is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+# 
+#  RawTherapee is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# Please keep this gtkrc in sync with the other ones from Clearlooks based themes.
+
+gtk-color-scheme = "salt_pinch:#800000\nbase_color:#525252\nfg_color:#979797\ntooltip_fg_color:#A0A0A0\nselected_bg_color:#703535\nselected_fg_color:#CDCDCD\ntext_color:#A2A2A2\nbg_color:#404040\ntooltip_bg_color:#252525"
+
+style "clearlooks-default" {
+	xthickness = 1
+	ythickness = 1
+
+	#######################
+	# Style Properties
+	#######################
+	GtkButton::child-displacement-x = 1
+	GtkButton::child-displacement-y = 1
+	GtkButton::default-border = { 0, 0, 0, 0 }
+	GtkButton::image-spacing = 4
+	GtkToolButton::icon-spacing = 4
+
+	GtkCheckButton::indicator-size = 14
+
+	GtkPaned::handle-size = 6
+
+	GtkRange::trough-border = 0
+	GtkRange::slider-width = 15
+	GtkRange::stepper-size = 15
+
+	GtkScale::slider-width = 14
+	GtkScale::slider-length = 30
+	GtkScale::trough-side-details = 0
+
+	GtkScrollbar::min-slider-length = 30
+	GtkMenuBar::internal-padding = 0
+	GtkExpander::expander-size = 18
+	GtkExpander::expander-spacing = 0
+	GtkToolbar::internal-padding = 1
+	GtkTreeView::expander-size = 12
+	GtkTreeView::vertical-separator = 0
+
+	GtkMenu::horizontal-padding = 0
+	GtkMenu::vertical-padding = 0
+
+	WnckTasklist::fade-overlay-rect = 0
+	# The following line hints to gecko (and possibly other appliations)
+	# that the entry should be drawn transparently on the canvas.
+	# Without this, gecko will fill in the background of the entry.
+	GtkEntry::honors-transparent-bg-hint = 1
+
+	GtkEntry::progress-border = { 2, 2, 2, 2 }
+
+	####################
+	# Color Definitions
+	####################
+	bg[NORMAL]        = @bg_color
+	bg[PRELIGHT]      = shade (1.02, @bg_color)
+	bg[SELECTED]      = @selected_bg_color
+	bg[INSENSITIVE]   = @bg_color
+	bg[ACTIVE]        = shade (0.9, @bg_color)
+
+	fg[NORMAL]        = @fg_color
+	fg[PRELIGHT]      = @fg_color
+	fg[SELECTED]      = @selected_fg_color
+	fg[INSENSITIVE]   = mix (0.2, @fg_color, @bg_color)
+	fg[ACTIVE]        = @fg_color
+
+	text[NORMAL]      = @text_color
+	text[PRELIGHT]    = @text_color
+	text[SELECTED]    = @selected_fg_color
+	text[INSENSITIVE] = darker (@bg_color)
+	text[ACTIVE]      = @selected_fg_color
+
+	base[NORMAL]      = @base_color
+	base[PRELIGHT]    = shade (0.95, @bg_color)
+	base[SELECTED]    = @selected_bg_color
+	base[INSENSITIVE] = @bg_color
+	base[ACTIVE]      = shade (0.9, @selected_bg_color)
+
+	engine "clearlooks" {
+		colorize_scrollbar = TRUE
+		reliefstyle = 1
+		menubarstyle = 2
+		toolbarstyle = 1
+		animation = FALSE
+		radius = 3.0
+		style = GUMMY
+
+		# Set a hint to disable backward compatibility fallbacks.
+		hint = "use-hints"
+	}
+}
+
+style "wide" {
+	xthickness = 2
+	ythickness = 2
+}
+
+style "wider" {
+	xthickness = 3
+	ythickness = 3
+}
+
+style "entry" {
+	xthickness = 3
+	ythickness = 3
+
+	bg[SELECTED] = mix (1.4, @selected_bg_color, @base_color)
+	fg[SELECTED] = @selected_fg_color
+
+	engine "clearlooks" {
+		focus_color = shade (0.65, @selected_bg_color)
+	}
+}
+
+style "paned" {
+
+	bg[PRELIGHT] = shade (0.9, @bg_color)
+
+	engine "clearlooks" {
+		hint = "paned"
+	}
+}
+
+style "HSV" {
+
+	engine "clearlooks" {
+		hint = "HSV"
+		disable_focus = TRUE
+	}
+}
+
+style "spinbutton" {
+
+	engine "clearlooks" {
+		hint = "spinbutton"
+	}
+}
+
+style "scale" {
+	xthickness = 2
+	ythickness = 2
+
+	bg[NORMAL]        = shade (1.30, @bg_color)
+	bg[PRELIGHT]      = shade (1.40, @bg_color)
+	# when GtkScale::trough-side-details = 1, bg[SELECTED] set the color of the slider background on the left of the knob
+	#bg[SELECTED]      = @bg_color
+
+	engine "clearlooks" {
+		focus_color = @selected_bg_color
+		hint = "scale"
+	}
+}
+
+style "vscale" {
+
+	engine "clearlooks" {
+		hint = "vscale"
+	}
+}
+
+style "hscale" {
+
+	engine "clearlooks" {
+		hint = "hscale"
+	}
+}
+
+style "scrollbar" {
+	xthickness = 2
+	ythickness = 2
+
+	bg[SELECTED]      = shade (1.15, @bg_color)
+
+	engine "clearlooks" {
+		hint = "scrollbar"
+	}
+}
+
+style "hscrollbar" {
+
+	engine "clearlooks" {
+		hint = "hscrollbar"
+	}
+}
+
+style "vscrollbar" {
+
+	engine "clearlooks" {
+		hint = "vscrollbar"
+	}
+}
+
+style "notebook_bg" {
+
+	bg[NORMAL]        = shade (1.02, @bg_color)
+	bg[ACTIVE]        = shade (0.80, @bg_color)
+}
+
+style "button" {
+
+	bg[NORMAL]        = shade (0.93, @bg_color)
+	bg[PRELIGHT]      = shade (0.85, @bg_color)
+	bg[ACTIVE]        = shade (0.70, @bg_color)
+
+	engine "clearlooks"
+	{
+		hint	= "button"
+	}
+}
+
+# The color is changed by the notebook_bg style, this style
+# changes the x/ythickness
+style "notebook" {
+	xthickness = 3
+	ythickness = 3
+
+	bg[SELECTED]      = @salt_pinch
+}
+
+style "statusbar" {
+
+	engine "clearlooks" {
+		hint = "statusbar"
+	}
+}
+
+style "comboboxentry" {
+
+	engine "clearlooks" {
+		# Note:
+		# If you set the appears-as-list option on comboboxes in the theme,
+		# then you should set this hint on the combobox instead.
+		hint = "comboboxentry"
+	}
+}
+
+style "expander" {
+
+	fg[NORMAL]        = @salt_pinch
+	fg[PRELIGHT]      = @salt_pinch
+	fg[INSENSITIVE]   = @salt_pinch
+
+	bg[PRELIGHT]      = mix(0.75, @selected_bg_color, @bg_color)
+
+	base[NORMAL]      = @salt_pinch
+	base[PRELIGHT]    = @salt_pinch
+	base[INSENSITIVE] = @salt_pinch
+
+	engine "clearlooks" {
+		hint = "expander"
+	}
+}
+
+style "expanderLabel" {
+
+	fg[NORMAL]   = "#a0a0a0"
+	fg[PRELIGHT] = "#d0d0d0"
+}
+
+style "menubar" {
+
+	engine "clearlooks" {
+		hint = "menubar"
+	}
+}
+
+style "menu" {
+	xthickness = 0
+	ythickness = 0
+
+	bg[NORMAL]      = shade (0.70, @bg_color)
+
+	engine "clearlooks" {
+		radius = 0.0
+	}
+}
+
+style "menu_item" {
+	xthickness = 2
+	ythickness = 3
+
+	fg[PRELIGHT]      = @selected_fg_color
+}
+
+# This style is there to modify the separator menu items. The goals are:
+# 1. Get a specific height.
+# 2. The line should go to the edges (ie. no border at the left/right)
+style "separator_menu_item" {
+	xthickness = 1
+	ythickness = 0
+
+	GtkSeparatorMenuItem::horizontal-padding = 0
+	GtkWidget::wide-separators = 1
+	GtkWidget::separator-width = 1
+	GtkWidget::separator-height = 7
+}
+
+style "frame_title" {
+
+	fg[NORMAL]        = lighter (@fg_color)
+}
+
+style "treeview" {
+
+	base[ACTIVE]      = mix(0.50, @selected_bg_color, @base_color)
+
+	engine "clearlooks" {
+		hint = "treeview"
+	}
+}
+
+# The almost useless progress bar style
+style "progressbar" {
+	xthickness = 1
+	ythickness = 1
+
+	fg[PRELIGHT]      = @selected_fg_color
+
+	engine "clearlooks" {
+		# Explicitly set the radius for the progress bars inside menu items.
+		radius = 3.0
+
+		hint = "progressbar"
+	}
+}
+
+# This style is based on the clearlooks-default style, so that the colors from the button
+# style are overriden again.
+style "treeview_header" = "clearlooks-default" {
+	xthickness = 2
+	ythickness = 1
+
+	bg[NORMAL] = shade (0.80, @bg_color)
+
+	engine "clearlooks" {
+		hint = "treeview-header"
+	}
+}
+
+style "tooltips" {
+	xthickness = 4
+	ythickness = 4
+
+	bg[NORMAL]        = @tooltip_bg_color
+	fg[NORMAL]        = @tooltip_fg_color
+}
+
+style "nautilus_location" {
+
+	bg[NORMAL]        = mix (0.60, shade (1.05, @bg_color), @selected_bg_color)
+}
+
+# Wrokaroudn style for places where the text color is used instead of the fg color.
+style "text_is_fg_color_workaround" {
+
+	text[NORMAL]      = @fg_color
+	text[PRELIGHT]    = @fg_color
+	text[SELECTED]    = @selected_fg_color
+	text[ACTIVE]      = @fg_color
+	text[INSENSITIVE] = darker (@bg_color)
+}
+
+# Workaround style for menus where the text color is used instead of the fg color.
+style "menuitem_text_is_fg_color_workaround" {
+
+	text[NORMAL]      = @fg_color
+	text[PRELIGHT]    = @selected_fg_color
+	text[SELECTED]    = @selected_fg_color
+	text[ACTIVE]      = @fg_color
+	text[INSENSITIVE] = darker (@bg_color)
+}
+
+# Workaround style for places where the fg color is used instead of the text color.
+style "fg_is_text_color_workaround" {
+
+	fg[NORMAL]        = @text_color
+	fg[PRELIGHT]      = @text_color
+	fg[SELECTED]      = @selected_fg_color
+	fg[ACTIVE]        = @selected_fg_color
+	fg[INSENSITIVE]   = darker (@bg_color)
+}
+
+# Style to set the toolbar to use a flat style. This is because the "New" button in
+# Evolution is not drawn transparent. So if there is a gradient in the background it will
+# look really wrong.
+# See http://bugzilla.gnome.org/show_bug.cgi?id=446953.
+style "evo_new_button_workaround" {
+
+	engine "clearlooks" {
+		toolbarstyle = 0
+	}
+}
+
+
+###############################################################################
+# The following part of the gtkrc applies the different styles to the widgets.
+###############################################################################
+
+# The clearlooks-default style is applied to every widget
+class "GtkWidget" style "clearlooks-default"
+
+class "GtkSeparator" style "wide"
+class "GtkFrame" style "wide"
+class "GtkCalendar" style "wide"
+class "GtkCheckButton" style "wider"
+class "GtkRadioButton" style "wider"
+class "GtkEntry" style "entry"
+
+class "GtkPaned" style "paned"
+class "GtkSpinButton" style "spinbutton"
+class "GtkScale" style "scale"
+class "GtkVScale" style "vscale"
+class "GtkHScale" style "hscale"
+class "GtkScrollbar" style "scrollbar"
+class "GtkHScrollbar" style "hscrollbar"
+class "GtkVScrollbar" style "vscrollbar"
+
+class "GtkExpander" style "expander"
+class "GtkHSV" style "HSV"
+
+# General matching follows. The order is choosen so that the right styles override
+# each other. EG. progressbar needs to be more important than the menu match.
+widget_class "*<GtkNotebook>" style "notebook_bg"
+# This is not perfect, it could be done better.
+# (That is modify *every* widget in the notebook, and change those back that
+# we really don't want changed)
+widget_class "*<GtkNotebook>*<GtkEventBox>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkLayout>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkViewport>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkScrolledWindow>" style "notebook_bg"
+
+widget_class "*<GtkButton>" style "button"
+widget_class "*<GtkNotebook>" style "notebook"
+widget_class "*<GtkStatusbar>*" style "statusbar"
+
+widget_class "*<GtkComboBoxEntry>*" style "comboboxentry"
+widget_class "*<GtkCombo>*" style "comboboxentry"
+
+widget_class "*<GtkExpander>.<GtkLabel>" style "expanderLabel"
+
+widget_class "*<GtkMenuBar>*" style "menubar"
+widget_class "*<GtkMenu>*" style "menu"
+widget_class "*<GtkMenuItem>*" style "menu_item"
+widget_class "*<GtkSeparatorMenuItem>*" style "separator_menu_item"
+
+widget_class "*.<GtkFrame>.<GtkLabel>" style "frame_title"
+widget_class "*.<GtkTreeView>*" style "treeview"
+
+widget_class "*<GtkProgress>" style "progressbar"
+
+# Treeview headers (and similar stock GTK+ widgets)
+widget_class "*.<GtkTreeView>.<GtkButton>" style "treeview_header"
+widget_class "*.<GtkCTree>.<GtkButton>" style "treeview_header"
+widget_class "*.<GtkList>.<GtkButton>" style "treeview_header"
+widget_class "*.<GtkCList>.<GtkButton>" style "treeview_header"
+
+# The window of the tooltip is called "gtk-tooltip"
+##################################################################
+# FIXME:
+# This will not work if one embeds eg. a button into the tooltip.
+# As far as I can tell right now we will need to rework the theme
+# quite a bit to get this working correctly.
+# (It will involve setting different priorities, etc.)
+##################################################################
+widget "gtk-tooltip*" style "tooltips"
+
+##########################################################################
+# Following are special cases and workarounds for issues in applications.
+##########################################################################
+
+# Workaround for the evolution ETable (bug #527532)
+widget_class "*.<ETable>.<ECanvas>" style "treeview_header"
+# Workaround for the evolution ETree
+widget_class "*.<ETree>.<ECanvas>" style "treeview_header"
+
+# Special case the nautilus-extra-view-widget
+# ToDo: A more generic approach for all applications that have a widget like this.
+widget "*.nautilus-extra-view-widget" style : highest "nautilus_location"
+
+# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
+# Note that this work around assumes that the combobox is _not_ in appears-as-list mode.
+widget_class "*.<GtkComboBox>.<GtkCellView>" style "text_is_fg_color_workaround"
+# This is the part of the workaround that fixes the menus
+widget "*.gtk-combobox-popup-menu.*" style "menuitem_text_is_fg_color_workaround"
+
+# Work around the usage of GtkLabel inside GtkListItems to display text.
+# This breaks because the label is shown on a background that is based on the base color.
+widget_class "*<GtkListItem>*" style "fg_is_text_color_workaround"
+# GtkCList also uses the fg color to draw text on top of the base colors.
+widget_class "*<GtkCList>" style "fg_is_text_color_workaround"
+# Nautilus when renaming files, and maybe other places.
+widget_class "*<EelEditableLabel>" style "fg_is_text_color_workaround"
+
+# See the documentation of the style.
+widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "evo_new_button_workaround"
diff --git a/rtdata/themes/37-Gray-Red-Textured.gtkrc b/rtdata/themes/37-Gray-Red-Textured.gtkrc
new file mode 100644
index 000000000..a958edaf2
--- /dev/null
+++ b/rtdata/themes/37-Gray-Red-Textured.gtkrc
@@ -0,0 +1,864 @@
+#
+#  This file is part of RawTherapee.
+#
+#  Copyright (c) 2004-2011 Gabor Horvath <hgabor@rawtherapee.com>
+#
+#  RawTherapee is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+# 
+#  RawTherapee is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# Please keep this gtkrc in sync with the other ones from Clearlooks based themes.
+
+gtk-color-scheme = "salt_pinch:#800000\nbase_color:#707070\nfg_color:#B2B2B2\ntooltip_fg_color:#A5A5A5\nselected_bg_color:#562020\nselected_fg_color:#E2E2E2\ntext_color:#000000\nbg_color:#5F5F5F\ntooltip_bg_color:#404040"
+
+style "clearlooks-default" {
+	xthickness = 1
+	ythickness = 1
+
+	#######################
+	# Style Properties
+	#######################
+	GtkButton::child-displacement-x = 1
+	GtkButton::child-displacement-y = 1
+	GtkButton::default-border = { 0, 0, 0, 0 }
+	GtkButton::image-spacing = 4
+	GtkToolButton::icon-spacing = 4
+
+	GtkCheckButton::indicator-size = 14
+
+	GtkPaned::handle-size = 6
+
+	GtkRange::trough-border = 0
+	GtkRange::slider-width = 14
+	GtkRange::stepper-size = 10
+
+	GtkScale::slider-width = 14
+	GtkScale::slider-length = 30
+	GtkScale::trough-side-details = 0
+
+	GtkScrollbar::min-slider-length = 30
+	GtkMenuBar::internal-padding = 0
+	GtkExpander::expander-size = 18
+	GtkExpander::expander-spacing = 0
+	GtkToolbar::internal-padding = 1
+	GtkTreeView::expander-size = 12
+	GtkTreeView::vertical-separator = 0
+
+	GtkMenu::horizontal-padding = 0
+	GtkMenu::vertical-padding = 0
+
+	WnckTasklist::fade-overlay-rect = 0
+	# The following line hints to gecko (and possibly other appliations)
+	# that the entry should be drawn transparently on the canvas.
+	# Without this, gecko will fill in the background of the entry.
+	GtkEntry::honors-transparent-bg-hint = 1
+
+	GtkEntry::progress-border = { 2, 2, 2, 2 }
+
+	####################
+	# Color Definitions
+	####################
+	bg[NORMAL]        = @bg_color
+	bg[PRELIGHT]      = shade (1.02, @bg_color)
+	bg[SELECTED]      = @selected_bg_color
+	bg[INSENSITIVE]   = shade (0.95, @bg_color)
+	bg[ACTIVE]        = shade (0.7, @bg_color)
+
+	fg[NORMAL]        = @fg_color
+	fg[PRELIGHT]      = @selected_fg_color
+	fg[SELECTED]      = @selected_fg_color
+	fg[INSENSITIVE]   = mix (0.2, @fg_color, @bg_color)
+	fg[ACTIVE]        = @fg_color
+
+	text[NORMAL]      = @text_color
+	text[PRELIGHT]    = @text_color
+	text[SELECTED]    = @selected_fg_color
+	text[INSENSITIVE] = darker (@bg_color)
+	text[ACTIVE]      = @text_color
+
+	base[NORMAL]      = @base_color
+	base[PRELIGHT]    = shade (1.05, @bg_color)
+	base[SELECTED]    = @selected_bg_color
+	base[INSENSITIVE] = @bg_color
+	base[ACTIVE]      = @selected_bg_color
+
+	engine "clearlooks" {
+		colorize_scrollbar = TRUE
+		reliefstyle = 1
+		menubarstyle = 2
+		toolbarstyle = 1
+		animation = FALSE
+		radius = 3.0
+		style = GUMMY
+
+		# Set a hint to disable backward compatibility fallbacks.
+		hint = "use-hints"
+	}
+}
+
+pixmap_path "themes/gray_textured"
+
+style "wide" {
+	xthickness = 2
+	ythickness = 2
+}
+
+style "wider" {
+	xthickness = 3
+	ythickness = 3
+}
+
+style "entry" {
+	xthickness = 3
+	ythickness = 3
+
+	bg[SELECTED] = mix (0.4, @selected_bg_color, @base_color)
+	fg[SELECTED] = @text_color
+
+	engine "clearlooks" {
+		focus_color = shade (0.65, @selected_bg_color)
+	}
+}
+
+style "paned" {
+
+	bg[PRELIGHT] = shade (0.9, @bg_color)
+
+	engine "clearlooks" {
+		hint = "paned"
+	}
+}
+
+style "HSV" {
+
+	engine "clearlooks" {
+		hint = "HSV"
+		disable_focus = TRUE
+	}
+}
+
+style "spinbutton" {
+
+	engine "clearlooks" {
+		hint = "spinbutton"
+	}
+}
+
+style "scale" {
+	xthickness = 2
+	ythickness = 2
+
+	bg[NORMAL]        = shade (0.96, @bg_color)
+	bg[PRELIGHT]      = shade (1.06, @bg_color)
+	# when GtkScale::trough-side-details = 1, bg[SELECTED] set the color of the slider background on the left of the knob
+	#bg[SELECTED]      = @bg_color
+
+	engine "clearlooks" {
+		focus_color = @selected_bg_color
+		hint = "scale"
+	}
+}
+
+style "vscale" {
+
+	engine "clearlooks" {
+		hint = "vscale"
+	}
+}
+
+style "hscale" {
+
+	engine "clearlooks" {
+		hint = "hscale"
+	}
+}
+
+style "scrollbar" {
+
+	#bg[SELECTED]      = shade (1.09, @bg_color)
+
+	engine "pixmap" {
+		image
+		{
+			function			= BOX
+			detail				= "trough"
+			file				= "trough2.png"
+			border				= { 6,6,6,6 }
+			stretch				= TRUE
+			orientation			= VERTICAL
+		}
+		image
+		{
+			function			= BOX
+			detail				= "trough"
+			file				= "trough2-h.png"
+			border				= { 6,6,6,6 }
+			stretch				= TRUE
+			orientation			= HORIZONTAL
+		}
+		image
+		{
+			function			= SLIDER
+			state           	= NORMAL
+			file				= "slider-h.png" 
+			border				= { 6,6,2,2 }
+			stretch				= TRUE
+			orientation			= HORIZONTAL
+		}
+		image
+		{
+			function			= SLIDER
+			state           	= PRELIGHT
+			file				= "slider-h-pre.png" 
+			border				= { 6,6,2,2 }
+			stretch				= TRUE
+			orientation			= HORIZONTAL
+		}
+		image
+		{
+			function			= SLIDER
+			state           	= INSENSITIVE
+			file				= "slider-h-ins.png"
+			border				= { 6,6,2,2 }
+			stretch				= TRUE
+			orientation			= HORIZONTAL
+		}
+		image
+		{
+			function			= SLIDER
+			state           	= NORMAL
+			file				= "slider-v.png" 
+			border				= { 2, 2, 6, 6 }
+			stretch				= TRUE
+			orientation			= VERTICAL
+		}
+		image
+		{
+			function			= SLIDER
+			state           	= PRELIGHT
+			file				= "slider-v-pre.png" 
+			border				= { 2, 2, 6, 6 }
+			stretch				= TRUE
+			orientation			= VERTICAL
+		}
+		image
+		{
+			function			= SLIDER
+			state           	= INSENSITIVE
+			file				= "slider-v-ins.png"
+			border				= { 2,2,6,6 }
+			stretch				= TRUE
+			orientation			= VERTICAL
+		}
+		image
+		{
+			function			= STEPPER
+			state				= NORMAL
+			file				= "null.png"
+			border				= { 1,1,4,4 }
+			stretch				= TRUE
+			arrow_direction		= UP
+			overlay_file		= "arrow-up.png"
+			overlay_stretch		= FALSE
+		}
+		image
+		{
+			function			= STEPPER
+			state				= PRELIGHT
+			file				= "null.png"
+			border				= { 1,1,4,4 }
+			stretch				= TRUE
+			arrow_direction		= UP
+			overlay_file		= "arrow-up-pre.png"
+			overlay_stretch		= FALSE
+		}
+		image
+		{
+			function			= STEPPER
+			state				= ACTIVE
+			file				= "null.png"
+			border				= { 1,1,4,4 }
+			stretch				= TRUE
+			arrow_direction		= UP
+			overlay_file		= "arrow-up.png"
+			overlay_stretch		= FALSE
+		}
+		image
+		{
+			function			= STEPPER
+			state				= INSENSITIVE
+			file				= "null.png"
+			border				= { 1,1,4,4 }
+			stretch				= TRUE
+			arrow_direction		= UP
+			overlay_file		= "arrow-up-ins.png"
+			overlay_stretch		= FALSE
+		}
+		image
+		{
+			function			= STEPPER
+			state				= NORMAL
+			file				= "null.png"
+			border				= { 1,1,4,4 }
+			stretch				= TRUE
+			arrow_direction		= DOWN
+			overlay_file		= "arrow-down.png"
+			overlay_stretch		= FALSE
+		}
+		image
+		{
+			function			= STEPPER
+			state				= PRELIGHT
+			file				= "null.png"
+			border				= { 1,1,4,4 }
+			stretch				= TRUE
+			arrow_direction		= DOWN
+			overlay_file		= "arrow-down-pre.png"
+			overlay_stretch		= FALSE
+		}
+		image
+		{
+			function			= STEPPER
+			state				= ACTIVE
+			file				= "null.png"
+			border				= { 1,1,4,4 }
+			stretch				= TRUE
+			arrow_direction		= DOWN
+			overlay_file		= "arrow-down.png"
+			overlay_stretch		= FALSE
+		}
+		image
+		{
+			function			= STEPPER
+			state				= INSENSITIVE
+			file				= "null.png"
+			border				= { 1,1,4,4 }
+			stretch				= TRUE
+			arrow_direction		= DOWN
+			overlay_file		= "arrow-down-ins.png"
+			overlay_stretch		= FALSE
+		}
+		image
+		{
+			function			= STEPPER
+			state				= NORMAL
+			file				= "null.png"
+			border				= { 4,4,1,1 }
+			stretch				= TRUE
+			arrow_direction		= RIGHT
+			overlay_file		= "arrow-right.png"
+			overlay_stretch		= FALSE
+		}
+		image
+		{
+			function			= STEPPER
+			state				= PRELIGHT
+			file				= "null.png"
+			border				= { 4,4,1,1 }
+			stretch				= TRUE
+			arrow_direction		= RIGHT
+			overlay_file		= "arrow-right-pre.png"
+			overlay_stretch		= FALSE
+		}
+		image
+		{
+			function			= STEPPER
+			state				= ACTIVE
+			file				= "null.png"
+			border				= { 4,4,1,1 }
+			stretch				= TRUE
+			arrow_direction		= RIGHT
+			overlay_file		= "arrow-right.png"
+			overlay_stretch		= FALSE
+		}
+		image
+		{
+			function			= STEPPER
+			state				= INSENSITIVE
+			file				= "null.png"
+			border				= { 4,4,1,1 }
+			stretch				= TRUE
+			arrow_direction		= RIGHT
+			overlay_file		= "arrow-right-ins.png"
+			overlay_stretch		= FALSE
+		}
+		image
+		{
+			function			= STEPPER
+			state				= NORMAL
+			file				= "null.png"
+			border				= { 4,4,1,1 }
+			stretch				= TRUE
+			arrow_direction		= LEFT
+			overlay_file		= "arrow-left.png"
+			overlay_stretch		= FALSE
+		}
+		image
+		{
+			function			= STEPPER
+			state				= PRELIGHT
+			file				= "null.png"
+			border				= { 4,4,1,1 }
+			stretch				= TRUE
+			arrow_direction		= LEFT
+			overlay_file		= "arrow-left-pre.png"
+			overlay_stretch		= FALSE
+		}
+		image
+		{
+			function			= STEPPER
+			state				= ACTIVE
+			file				= "null.png"
+			border				= { 4,4,1,1 }
+			stretch				= TRUE
+			arrow_direction		= LEFT
+			overlay_file		= "arrow-left.png"
+			overlay_stretch		= FALSE
+		}
+		image
+		{
+			function			= STEPPER
+			state				= INSENSITIVE
+			file				= "null.png"
+			border				= { 4,4,1,1 }
+			stretch				= TRUE
+			arrow_direction		= LEFT
+			overlay_file		= "arrow-left-ins.png"
+			overlay_stretch		= FALSE
+		}
+	}
+}
+
+style "hscrollbar" {
+
+	engine "clearlooks" {
+		hint = "hscrollbar"
+	}
+}
+
+style "vscrollbar" {
+
+	engine "clearlooks" {
+		hint = "vscrollbar"
+	}
+}
+
+style "range" {
+
+	engine "pixmap" {
+		# image
+		# {
+		#   function		= FOCUS
+		#   file			= "null.png"
+		#   stretch			= TRUE
+		# }	
+		image 
+		{
+			function		= BOX
+			detail			= "trough"
+			file			= "pbtroughh.png"
+			border			= { 6, 6, 6, 6 }
+			stretch			= TRUE
+			orientation		= HORIZONTAL
+		}	
+		image 
+		{
+			function		= BOX
+			detail			= "trough"
+			file			= "pbtroughv.png"
+			border			= { 6, 6, 6, 6 }
+			stretch			= TRUE
+			orientation		= VERTICAL
+		}
+		image 
+		{
+			function		= SLIDER
+			state           = NORMAL
+			file			= "rangeslider.png"
+			border			= { 6, 6, 6, 6 }
+			stretch			= TRUE
+			orientation		= HORIZONTAL
+		}
+		image 
+		{
+			function		= SLIDER
+			state           = PRELIGHT
+			file			= "rangeslider-pre.png"
+			border			= { 6, 6, 6, 6 }
+			stretch			= TRUE
+			orientation		= HORIZONTAL
+		}
+		image 
+		{
+			function		= SLIDER
+			state           = ACTIVE
+			file			= "rangeslider-pre.png"
+			border			= { 6, 6, 6, 6 }
+			stretch			= TRUE
+			orientation		= HORIZONTAL
+		}
+		image 
+		{
+			function		= SLIDER
+			state           = INSENSITIVE
+			file			= "rangeslider-ins.png"
+			border			= { 6, 6, 6, 6 }
+			stretch			= TRUE
+			orientation		= HORIZONTAL
+		}
+		image 
+		{
+			function		= SLIDER
+			state           = NORMAL
+			file			= "rangeslider.png"
+			border			= { 6, 6, 6, 6 }
+			stretch			= TRUE
+			orientation		= VERTICAL
+		}
+		image 
+		{
+			function		= SLIDER
+			state           = PRELIGHT
+			file			= "rangeslider-pre.png"
+			border			= { 6, 6, 6, 6 }
+			stretch			= TRUE
+			orientation		= VERTICAL
+		}
+		image 
+		{
+			function		= SLIDER
+			state           = ACTIVE
+			file			= "rangeslider-pre.png"
+			border			= { 6, 6, 6, 6 }
+			stretch			= TRUE
+			orientation		= VERTICAL
+		}
+		image 
+		{
+			function		= SLIDER
+			state           = INSENSITIVE
+			file			= "rangeslider-ins.png"
+			border			= { 6, 6, 6, 6 }
+			stretch			= TRUE
+			orientation		= VERTICAL
+		}
+	}
+}
+
+style "notebook_bg" {
+
+	bg[NORMAL]        = @bg_color
+	bg[ACTIVE]        = shade (0.85, @bg_color)
+}
+
+style "button" {
+
+	bg[NORMAL]        = shade (0.93, @bg_color)
+	bg[PRELIGHT]      = shade (0.85, @bg_color)
+	bg[ACTIVE]        = shade (0.70, @bg_color)
+
+	engine "clearlooks"
+	{
+		hint	= "button"
+	}
+}
+
+# The color is changed by the notebook_bg style, this style
+# changes the x/ythickness
+style "notebook" {
+	xthickness = 3
+	ythickness = 3
+
+	bg[SELECTED]      = @salt_pinch
+}
+
+style "statusbar" {
+
+	engine "clearlooks" {
+		hint = "statusbar"
+	}
+}
+
+style "comboboxentry" {
+
+	engine "clearlooks" {
+		# Note:
+		# If you set the appears-as-list option on comboboxes in the theme,
+		# then you should set this hint on the combobox instead.
+		hint = "comboboxentry"
+	}
+}
+
+style "expander" {
+
+	fg[NORMAL]        = @salt_pinch
+	fg[PRELIGHT]      = @salt_pinch
+	fg[INSENSITIVE]   = @salt_pinch
+
+	bg[PRELIGHT]      = mix (0.5, @salt_pinch, @bg_color)
+
+	base[NORMAL]      = @salt_pinch
+	base[PRELIGHT]    = @salt_pinch
+	base[INSENSITIVE] = @salt_pinch
+
+	engine "clearlooks" {
+		hint = "expander"
+	}
+}
+
+style "expanderLabel" {
+
+	fg[NORMAL]        = @text_color
+	fg[PRELIGHT]      = lighter (@fg_color)
+}
+
+style "menubar" {
+
+	engine "clearlooks" {
+		hint = "menubar"
+	}
+}
+
+style "menu" {
+	xthickness = 0
+	ythickness = 0
+
+	bg[NORMAL]        = @tooltip_bg_color
+
+	engine "clearlooks" {
+		radius = 0.0
+	}
+}
+
+style "menu_item" {
+	xthickness = 2
+	ythickness = 3
+
+	fg[PRELIGHT]      = @selected_fg_color
+}
+
+# This style is there to modify the separator menu items. The goals are:
+# 1. Get a specific height.
+# 2. The line should go to the edges (ie. no border at the left/right)
+style "separator_menu_item" {
+	xthickness = 1
+	ythickness = 0
+
+	GtkSeparatorMenuItem::horizontal-padding = 0
+	GtkWidget::wide-separators = 1
+	GtkWidget::separator-width = 1
+	GtkWidget::separator-height = 7
+}
+
+style "frame_title" {
+
+	fg[NORMAL]        = lighter (@fg_color)
+}
+
+style "treeview" {
+
+	# For an unkown reason, shading 7C99AD produce a redish color, so we have to set the value manually
+	text[ACTIVE]      = @selected_fg_color
+	base[ACTIVE]      = mix(0.50, @selected_bg_color, @base_color)
+
+	engine "clearlooks" {
+		hint = "treeview"
+	}
+}
+
+# The almost useless progress bar style
+style "progressbar" {
+	xthickness = 1
+	ythickness = 1
+
+	fg[PRELIGHT]      = @selected_fg_color
+
+	engine "clearlooks" {
+		# Explicitly set the radius for the progress bars inside menu items.
+		radius = 3.0
+
+		hint = "progressbar"
+	}
+}
+
+# This style is based on the clearlooks-default style, so that the colors from the button
+# style are overriden again.
+style "treeview_header" = "clearlooks-default" {
+	xthickness = 2
+	ythickness = 1
+
+	bg[NORMAL] = shade (0.80, @bg_color)
+
+	engine "clearlooks" {
+		hint = "treeview-header"
+	}
+}
+
+style "tooltips" {
+	xthickness = 4
+	ythickness = 4
+
+	bg[NORMAL]        = @tooltip_bg_color
+	fg[NORMAL]        = @tooltip_fg_color
+}
+
+style "nautilus_location" {
+
+	bg[NORMAL]        = mix (0.60, shade (1.05, @bg_color), @selected_bg_color)
+}
+
+# Wrokaroudn style for places where the text color is used instead of the fg color.
+style "text_is_fg_color_workaround" {
+
+	text[NORMAL]      = @fg_color
+	text[PRELIGHT]    = @fg_color
+	text[SELECTED]    = @selected_fg_color
+	text[ACTIVE]      = @fg_color
+	text[INSENSITIVE] = darker (@bg_color)
+}
+
+# Workaround style for menus where the text color is used instead of the fg color.
+style "menuitem_text_is_fg_color_workaround" {
+
+	text[NORMAL]      = @fg_color
+	text[PRELIGHT]    = @selected_fg_color
+	text[SELECTED]    = @selected_fg_color
+	text[ACTIVE]      = @fg_color
+	text[INSENSITIVE] = darker (@bg_color)
+}
+
+# Workaround style for places where the fg color is used instead of the text color.
+style "fg_is_text_color_workaround" {
+
+	fg[NORMAL]        = @text_color
+	fg[PRELIGHT]      = @text_color
+	fg[SELECTED]      = @selected_fg_color
+	fg[ACTIVE]        = @selected_fg_color
+	fg[INSENSITIVE]   = darker (@bg_color)
+}
+
+# Style to set the toolbar to use a flat style. This is because the "New" button in
+# Evolution is not drawn transparent. So if there is a gradient in the background it will
+# look really wrong.
+# See http://bugzilla.gnome.org/show_bug.cgi?id=446953.
+style "evo_new_button_workaround" {
+
+	engine "clearlooks" {
+		toolbarstyle = 0
+	}
+}
+
+
+###############################################################################
+# The following part of the gtkrc applies the different styles to the widgets.
+###############################################################################
+
+# The clearlooks-default style is applied to every widget
+class "GtkWidget" style "clearlooks-default"
+
+class "GtkSeparator" style "wide"
+class "GtkFrame" style "wide"
+class "GtkCalendar" style "wide"
+class "GtkCheckButton" style "wider"
+class "GtkRadioButton" style "wider"
+class "GtkEntry" style "entry"
+
+class "GtkPaned" style "paned"
+class "GtkSpinButton" style "spinbutton"
+class "GtkRange" style "range"
+#class "GtkScale" style "scale"
+#class "GtkVScale" style "vscale"
+#class "GtkHScale" style "hscale"
+class "GtkScrollbar" style "scrollbar"
+#class "GtkHScrollbar" style "hscrollbar"
+#class "GtkVScrollbar" style "vscrollbar"
+
+class "GtkExpander" style "expander"
+class "GtkHSV" style "HSV"
+
+# General matching follows. The order is choosen so that the right styles override
+# each other. EG. progressbar needs to be more important than the menu match.
+widget_class "*<GtkNotebook>" style "notebook_bg"
+# This is not perfect, it could be done better.
+# (That is modify *every* widget in the notebook, and change those back that
+# we really don't want changed)
+widget_class "*<GtkNotebook>*<GtkEventBox>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkLayout>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkViewport>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkScrolledWindow>" style "notebook_bg"
+
+widget_class "*<GtkButton>" style "button"
+widget_class "*<GtkNotebook>" style "notebook"
+widget_class "*<GtkStatusbar>*" style "statusbar"
+
+widget_class "*<GtkComboBoxEntry>*" style "comboboxentry"
+widget_class "*<GtkCombo>*" style "comboboxentry"
+
+widget_class "*<GtkExpander>.<GtkLabel>" style "expanderLabel"
+
+widget_class "*<GtkMenuBar>*" style "menubar"
+widget_class "*<GtkMenu>*" style "menu"
+widget_class "*<GtkMenuItem>*" style "menu_item"
+widget_class "*<GtkSeparatorMenuItem>*" style "separator_menu_item"
+
+widget_class "*.<GtkFrame>.<GtkLabel>" style "frame_title"
+widget_class "*.<GtkTreeView>*" style "treeview"
+
+widget_class "*<GtkProgress>" style "progressbar"
+
+# Treeview headers (and similar stock GTK+ widgets)
+widget_class "*.<GtkTreeView>.<GtkButton>" style "treeview_header"
+widget_class "*.<GtkCTree>.<GtkButton>" style "treeview_header"
+widget_class "*.<GtkList>.<GtkButton>" style "treeview_header"
+widget_class "*.<GtkCList>.<GtkButton>" style "treeview_header"
+
+# The window of the tooltip is called "gtk-tooltip"
+##################################################################
+# FIXME:
+# This will not work if one embeds eg. a button into the tooltip.
+# As far as I can tell right now we will need to rework the theme
+# quite a bit to get this working correctly.
+# (It will involve setting different priorities, etc.)
+##################################################################
+widget "gtk-tooltip*" style "tooltips"
+
+##########################################################################
+# Following are special cases and workarounds for issues in applications.
+##########################################################################
+
+# Workaround for the evolution ETable (bug #527532)
+widget_class "*.<ETable>.<ECanvas>" style "treeview_header"
+# Workaround for the evolution ETree
+widget_class "*.<ETree>.<ECanvas>" style "treeview_header"
+
+# Special case the nautilus-extra-view-widget
+# ToDo: A more generic approach for all applications that have a widget like this.
+widget "*.nautilus-extra-view-widget" style : highest "nautilus_location"
+
+# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
+# Note that this work around assumes that the combobox is _not_ in appears-as-list mode.
+widget_class "*.<GtkComboBox>.<GtkCellView>" style "text_is_fg_color_workaround"
+# This is the part of the workaround that fixes the menus
+widget "*.gtk-combobox-popup-menu.*" style "menuitem_text_is_fg_color_workaround"
+
+# Work around the usage of GtkLabel inside GtkListItems to display text.
+# This breaks because the label is shown on a background that is based on the base color.
+widget_class "*<GtkListItem>*" style "fg_is_text_color_workaround"
+# GtkCList also uses the fg color to draw text on top of the base colors.
+widget_class "*<GtkCList>" style "fg_is_text_color_workaround"
+# Nautilus when renaming files, and maybe other places.
+widget_class "*<EelEditableLabel>" style "fg_is_text_color_workaround"
+
+# See the documentation of the style.
+widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "evo_new_button_workaround"
diff --git a/rtdata/themes/37-Gray-Red.gtkrc b/rtdata/themes/37-Gray-Red.gtkrc
new file mode 100644
index 000000000..7559e7d1e
--- /dev/null
+++ b/rtdata/themes/37-Gray-Red.gtkrc
@@ -0,0 +1,515 @@
+#
+#  This file is part of RawTherapee.
+#
+#  Copyright (c) 2004-2011 Gabor Horvath <hgabor@rawtherapee.com>
+#
+#  RawTherapee is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+# 
+#  RawTherapee is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# Please keep this gtkrc in sync with the other ones from Clearlooks based themes.
+
+gtk-color-scheme = "salt_pinch:#800000\nbase_color:#707070\nfg_color:#B2B2B2\ntooltip_fg_color:#A5A5A5\nselected_bg_color:#562020\nselected_fg_color:#E2E2E2\ntext_color:#000000\nbg_color:#5F5F5F\ntooltip_bg_color:#404040"
+
+style "clearlooks-default" {
+	xthickness = 1
+	ythickness = 1
+
+	#######################
+	# Style Properties
+	#######################
+	GtkButton::child-displacement-x = 1
+	GtkButton::child-displacement-y = 1
+	GtkButton::default-border = { 0, 0, 0, 0 }
+	GtkButton::image-spacing = 4
+	GtkToolButton::icon-spacing = 4
+
+	GtkCheckButton::indicator-size = 14
+
+	GtkPaned::handle-size = 6
+
+	GtkRange::trough-border = 0
+	GtkRange::slider-width = 15
+	GtkRange::stepper-size = 15
+
+	GtkScale::slider-width = 14
+	GtkScale::slider-length = 30
+	GtkScale::trough-side-details = 0
+
+	GtkScrollbar::min-slider-length = 30
+	GtkMenuBar::internal-padding = 0
+	GtkExpander::expander-size = 18
+	GtkExpander::expander-spacing = 0
+	GtkToolbar::internal-padding = 1
+	GtkTreeView::expander-size = 12
+	GtkTreeView::vertical-separator = 0
+
+	GtkMenu::horizontal-padding = 0
+	GtkMenu::vertical-padding = 0
+
+	WnckTasklist::fade-overlay-rect = 0
+	# The following line hints to gecko (and possibly other appliations)
+	# that the entry should be drawn transparently on the canvas.
+	# Without this, gecko will fill in the background of the entry.
+	GtkEntry::honors-transparent-bg-hint = 1
+
+	GtkEntry::progress-border = { 2, 2, 2, 2 }
+
+	####################
+	# Color Definitions
+	####################
+	bg[NORMAL]        = @bg_color
+	bg[PRELIGHT]      = shade (1.02, @bg_color)
+	bg[SELECTED]      = @selected_bg_color
+	bg[INSENSITIVE]   = shade (0.95, @bg_color)
+	bg[ACTIVE]        = shade (0.7, @bg_color)
+
+	fg[NORMAL]        = @fg_color
+	fg[PRELIGHT]      = @selected_fg_color
+	fg[SELECTED]      = @selected_fg_color
+	fg[INSENSITIVE]   = mix (0.2, @fg_color, @bg_color)
+	fg[ACTIVE]        = @fg_color
+
+	text[NORMAL]      = @text_color
+	text[PRELIGHT]    = @text_color
+	text[SELECTED]    = @selected_fg_color
+	text[INSENSITIVE] = darker (@bg_color)
+	text[ACTIVE]      = @text_color
+
+	base[NORMAL]      = @base_color
+	base[PRELIGHT]    = shade (1.05, @bg_color)
+	base[SELECTED]    = @selected_bg_color
+	base[INSENSITIVE] = @bg_color
+	base[ACTIVE]      = @selected_bg_color
+
+	engine "clearlooks" {
+		colorize_scrollbar = TRUE
+		reliefstyle = 1
+		menubarstyle = 2
+		toolbarstyle = 1
+		animation = FALSE
+		radius = 3.0
+		# style between CLASSIC, GLOSSY, INVERTED and GUMMY
+		style = GUMMY
+
+		# Set a hint to disable backward compatibility fallbacks.
+		hint = "use-hints"
+	}
+}
+
+style "wide" {
+	xthickness = 2
+	ythickness = 2
+}
+
+style "wider" {
+	xthickness = 3
+	ythickness = 3
+}
+
+style "entry" {
+	xthickness = 3
+	ythickness = 3
+
+	bg[SELECTED] = mix (0.4, @selected_bg_color, @base_color)
+	fg[SELECTED] = @text_color
+
+	engine "clearlooks" {
+		focus_color = shade (0.65, @selected_bg_color)
+	}
+}
+
+style "paned" {
+
+	bg[PRELIGHT] = shade (0.9, @bg_color)
+
+	engine "clearlooks" {
+		hint = "paned"
+	}
+}
+
+style "HSV" {
+
+	engine "clearlooks" {
+		hint = "HSV"
+		disable_focus = TRUE
+	}
+}
+
+style "spinbutton" {
+
+	engine "clearlooks" {
+		hint = "spinbutton"
+	}
+}
+
+style "scale" {
+	xthickness = 2
+	ythickness = 2
+
+	bg[NORMAL]        = shade (1.20, @bg_color)
+	bg[PRELIGHT]      = shade (1.30, @bg_color)
+	# when GtkScale::trough-side-details = 1, bg[SELECTED] set the color of the slider background on the left of the knob
+	#bg[SELECTED]      = @bg_color
+
+	engine "clearlooks" {
+		focus_color = @selected_bg_color
+		hint = "scale"
+	}
+}
+
+style "vscale" {
+
+	engine "clearlooks" {
+		hint = "vscale"
+	}
+}
+
+style "hscale" {
+
+	engine "clearlooks" {
+		hint = "hscale"
+	}
+}
+
+style "scrollbar" {
+	xthickness = 2
+	ythickness = 2
+
+	bg[SELECTED]      = shade (1.16, @bg_color)
+
+	engine "clearlooks" {
+		hint = "scrollbar"
+	}
+}
+
+style "hscrollbar" {
+
+	engine "clearlooks" {
+		hint = "hscrollbar"
+	}
+}
+
+style "vscrollbar" {
+
+	engine "clearlooks" {
+		hint = "vscrollbar"
+	}
+}
+
+style "notebook_bg" {
+
+	bg[NORMAL]        = @bg_color
+	bg[ACTIVE]        = shade (0.85, @bg_color)
+}
+
+style "button" {
+
+	bg[NORMAL]        = shade (0.93, @bg_color)
+	bg[PRELIGHT]      = shade (0.85, @bg_color)
+	bg[ACTIVE]        = shade (0.70, @bg_color)
+
+	engine "clearlooks"
+	{
+		hint	= "button"
+	}
+}
+
+# The color is changed by the notebook_bg style, this style
+# changes the x/ythickness
+style "notebook" {
+	xthickness = 3
+	ythickness = 3
+
+	bg[SELECTED]      = @salt_pinch
+}
+
+style "statusbar" {
+
+	engine "clearlooks" {
+		hint = "statusbar"
+	}
+}
+
+style "comboboxentry" {
+
+	engine "clearlooks" {
+		# Note:
+		# If you set the appears-as-list option on comboboxes in the theme,
+		# then you should set this hint on the combobox instead.
+		hint = "comboboxentry"
+	}
+}
+
+style "expander" {
+
+	fg[NORMAL]        = @salt_pinch
+	fg[PRELIGHT]      = @salt_pinch
+	fg[INSENSITIVE]   = @salt_pinch
+
+	bg[PRELIGHT]      = mix (0.5, @salt_pinch, @bg_color)
+
+	base[NORMAL]      = @salt_pinch
+	base[PRELIGHT]    = @salt_pinch
+	base[INSENSITIVE] = @salt_pinch
+
+	engine "clearlooks" {
+		hint = "expander"
+	}
+}
+
+style "expanderLabel" {
+
+	fg[NORMAL]        = @text_color
+	fg[PRELIGHT]      = lighter (@fg_color)
+}
+
+style "menubar" {
+
+	engine "clearlooks" {
+		hint = "menubar"
+	}
+}
+
+style "menu" {
+	xthickness = 0
+	ythickness = 0
+
+	bg[NORMAL]        = @tooltip_bg_color
+
+	engine "clearlooks" {
+		radius = 0.0
+	}
+}
+
+style "menu_item" {
+	xthickness = 2
+	ythickness = 3
+
+	fg[PRELIGHT]      = @selected_fg_color
+}
+
+# This style is there to modify the separator menu items. The goals are:
+# 1. Get a specific height.
+# 2. The line should go to the edges (ie. no border at the left/right)
+style "separator_menu_item" {
+	xthickness = 1
+	ythickness = 0
+
+	GtkSeparatorMenuItem::horizontal-padding = 0
+	GtkWidget::wide-separators = 1
+	GtkWidget::separator-width = 1
+	GtkWidget::separator-height = 7
+}
+
+style "frame_title" {
+
+	fg[NORMAL]        = lighter (@fg_color)
+}
+
+style "treeview" {
+
+	# For an unkown reason, shading 7C99AD produce a redish color, so we have to set the value manually
+	text[ACTIVE]      = @selected_fg_color
+	base[ACTIVE]      = mix(0.50, @selected_bg_color, @base_color)
+
+	engine "clearlooks" {
+		hint = "treeview"
+	}
+}
+
+# The almost useless progress bar style
+style "progressbar" {
+	xthickness = 1
+	ythickness = 1
+
+	fg[PRELIGHT]      = @selected_fg_color
+
+	engine "clearlooks" {
+		# Explicitly set the radius for the progress bars inside menu items.
+		radius = 3.0
+
+		hint = "progressbar"
+	}
+}
+
+# This style is based on the clearlooks-default style, so that the colors from the button
+# style are overriden again.
+style "treeview_header" = "clearlooks-default" {
+	xthickness = 2
+	ythickness = 1
+
+	bg[NORMAL] = shade (0.80, @bg_color)
+
+	engine "clearlooks" {
+		hint = "treeview-header"
+	}
+}
+
+style "tooltips" {
+	xthickness = 4
+	ythickness = 4
+
+	bg[NORMAL]        = @tooltip_bg_color
+	fg[NORMAL]        = @tooltip_fg_color
+}
+
+style "nautilus_location" {
+
+	bg[NORMAL]        = mix (0.60, shade (1.05, @bg_color), @selected_bg_color)
+}
+
+# Wrokaroudn style for places where the text color is used instead of the fg color.
+style "text_is_fg_color_workaround" {
+
+	text[NORMAL]      = @fg_color
+	text[PRELIGHT]    = @fg_color
+	text[SELECTED]    = @selected_fg_color
+	text[ACTIVE]      = @fg_color
+	text[INSENSITIVE] = darker (@bg_color)
+}
+
+# Workaround style for menus where the text color is used instead of the fg color.
+style "menuitem_text_is_fg_color_workaround" {
+
+	text[NORMAL]      = @fg_color
+	text[PRELIGHT]    = @selected_fg_color
+	text[SELECTED]    = @selected_fg_color
+	text[ACTIVE]      = @fg_color
+	text[INSENSITIVE] = darker (@bg_color)
+}
+
+# Workaround style for places where the fg color is used instead of the text color.
+style "fg_is_text_color_workaround" {
+
+	fg[NORMAL]        = @text_color
+	fg[PRELIGHT]      = @text_color
+	fg[SELECTED]      = @selected_fg_color
+	fg[ACTIVE]        = @selected_fg_color
+	fg[INSENSITIVE]   = darker (@bg_color)
+}
+
+# Style to set the toolbar to use a flat style. This is because the "New" button in
+# Evolution is not drawn transparent. So if there is a gradient in the background it will
+# look really wrong.
+# See http://bugzilla.gnome.org/show_bug.cgi?id=446953.
+style "evo_new_button_workaround" {
+
+	engine "clearlooks" {
+		toolbarstyle = 0
+	}
+}
+
+
+###############################################################################
+# The following part of the gtkrc applies the different styles to the widgets.
+###############################################################################
+
+# The clearlooks-default style is applied to every widget
+class "GtkWidget" style "clearlooks-default"
+
+class "GtkSeparator" style "wide"
+class "GtkFrame" style "wide"
+class "GtkCalendar" style "wide"
+class "GtkCheckButton" style "wider"
+class "GtkRadioButton" style "wider"
+class "GtkEntry" style "entry"
+
+class "GtkPaned" style "paned"
+class "GtkSpinButton" style "spinbutton"
+class "GtkScale" style "scale"
+class "GtkVScale" style "vscale"
+class "GtkHScale" style "hscale"
+class "GtkScrollbar" style "scrollbar"
+class "GtkHScrollbar" style "hscrollbar"
+class "GtkVScrollbar" style "vscrollbar"
+
+class "GtkExpander" style "expander"
+class "GtkHSV" style "HSV"
+
+# General matching follows. The order is choosen so that the right styles override
+# each other. EG. progressbar needs to be more important than the menu match.
+widget_class "*<GtkNotebook>" style "notebook_bg"
+# This is not perfect, it could be done better.
+# (That is modify *every* widget in the notebook, and change those back that
+# we really don't want changed)
+widget_class "*<GtkNotebook>*<GtkEventBox>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkLayout>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkViewport>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkScrolledWindow>" style "notebook_bg"
+
+widget_class "*<GtkButton>" style "button"
+widget_class "*<GtkNotebook>" style "notebook"
+widget_class "*<GtkStatusbar>*" style "statusbar"
+
+widget_class "*<GtkComboBoxEntry>*" style "comboboxentry"
+widget_class "*<GtkCombo>*" style "comboboxentry"
+
+widget_class "*<GtkExpander>.<GtkLabel>" style "expanderLabel"
+
+widget_class "*<GtkMenuBar>*" style "menubar"
+widget_class "*<GtkMenu>*" style "menu"
+widget_class "*<GtkMenuItem>*" style "menu_item"
+widget_class "*<GtkSeparatorMenuItem>*" style "separator_menu_item"
+
+widget_class "*.<GtkFrame>.<GtkLabel>" style "frame_title"
+widget_class "*.<GtkTreeView>*" style "treeview"
+
+widget_class "*<GtkProgress>" style "progressbar"
+
+# Treeview headers (and similar stock GTK+ widgets)
+widget_class "*.<GtkTreeView>.<GtkButton>" style "treeview_header"
+widget_class "*.<GtkCTree>.<GtkButton>" style "treeview_header"
+widget_class "*.<GtkList>.<GtkButton>" style "treeview_header"
+widget_class "*.<GtkCList>.<GtkButton>" style "treeview_header"
+
+# The window of the tooltip is called "gtk-tooltip"
+##################################################################
+# FIXME:
+# This will not work if one embeds eg. a button into the tooltip.
+# As far as I can tell right now we will need to rework the theme
+# quite a bit to get this working correctly.
+# (It will involve setting different priorities, etc.)
+##################################################################
+widget "gtk-tooltip*" style "tooltips"
+
+##########################################################################
+# Following are special cases and workarounds for issues in applications.
+##########################################################################
+
+# Workaround for the evolution ETable (bug #527532)
+widget_class "*.<ETable>.<ECanvas>" style "treeview_header"
+# Workaround for the evolution ETree
+widget_class "*.<ETree>.<ECanvas>" style "treeview_header"
+
+# Special case the nautilus-extra-view-widget
+# ToDo: A more generic approach for all applications that have a widget like this.
+widget "*.nautilus-extra-view-widget" style : highest "nautilus_location"
+
+# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
+# Note that this work around assumes that the combobox is _not_ in appears-as-list mode.
+widget_class "*.<GtkComboBox>.<GtkCellView>" style "text_is_fg_color_workaround"
+# This is the part of the workaround that fixes the menus
+widget "*.gtk-combobox-popup-menu.*" style "menuitem_text_is_fg_color_workaround"
+
+# Work around the usage of GtkLabel inside GtkListItems to display text.
+# This breaks because the label is shown on a background that is based on the base color.
+widget_class "*<GtkListItem>*" style "fg_is_text_color_workaround"
+# GtkCList also uses the fg color to draw text on top of the base colors.
+widget_class "*<GtkCList>" style "fg_is_text_color_workaround"
+# Nautilus when renaming files, and maybe other places.
+widget_class "*<EelEditableLabel>" style "fg_is_text_color_workaround"
+
+# See the documentation of the style.
+widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "evo_new_button_workaround"
diff --git a/rtdata/themes/63-Gray-Cyan.gtkrc b/rtdata/themes/63-Gray-Cyan.gtkrc
new file mode 100644
index 000000000..c23fa8fa8
--- /dev/null
+++ b/rtdata/themes/63-Gray-Cyan.gtkrc
@@ -0,0 +1,514 @@
+#
+#  This file is part of RawTherapee.
+#
+#  Copyright (c) 2004-2011 Gabor Horvath <hgabor@rawtherapee.com>
+#
+#  RawTherapee is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+# 
+#  RawTherapee is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# Please keep this gtkrc in sync with the other ones from Clearlooks based themes.
+
+gtk-color-scheme = "salt_pinch:#95B0DB\nbase_color:#dddddd\nfg_color:#0A0A0A\ntooltip_fg_color:#000000\nselected_bg_color:#95B0DB\nselected_fg_color:#FFFFFF\ntext_color:#000000\nbg_color:#A1A1A1\ntooltip_bg_color:#F5F5B5"
+
+style "clearlooks-default" {
+	xthickness = 1
+	ythickness = 1
+
+	#######################
+	# Style Properties
+	#######################
+	GtkButton::child-displacement-x = 1
+	GtkButton::child-displacement-y = 1
+	GtkButton::default-border = { 0, 0, 0, 0 }
+	GtkButton::image-spacing = 4
+	GtkToolButton::icon-spacing = 4
+
+	GtkCheckButton::indicator-size = 14
+
+	GtkPaned::handle-size = 6
+
+	GtkRange::trough-border = 0
+	GtkRange::slider-width = 15
+	GtkRange::stepper-size = 15
+
+	GtkScale::slider-width = 14
+	GtkScale::slider-length = 30
+	GtkScale::trough-side-details = 0
+
+	GtkScrollbar::min-slider-length = 30
+	GtkMenuBar::internal-padding = 0
+	GtkExpander::expander-size = 18
+	GtkExpander::expander-spacing = 0
+	GtkToolbar::internal-padding = 1
+	GtkTreeView::expander-size = 12
+	GtkTreeView::vertical-separator = 0
+
+	GtkMenu::horizontal-padding = 0
+	GtkMenu::vertical-padding = 0
+
+	WnckTasklist::fade-overlay-rect = 0
+	# The following line hints to gecko (and possibly other appliations)
+	# that the entry should be drawn transparently on the canvas.
+	# Without this, gecko will fill in the background of the entry.
+	GtkEntry::honors-transparent-bg-hint = 1
+
+	GtkEntry::progress-border = { 2, 2, 2, 2 }
+
+	####################
+	# Color Definitions
+	####################
+	bg[NORMAL]        = @bg_color
+	bg[PRELIGHT]      = shade (1.02, @bg_color)
+	bg[SELECTED]      = @selected_bg_color
+	bg[INSENSITIVE]   = @bg_color
+	bg[ACTIVE]        = shade (0.9, @bg_color)
+
+	fg[NORMAL]        = @fg_color
+	fg[PRELIGHT]      = @fg_color
+	fg[SELECTED]      = @selected_fg_color
+	fg[INSENSITIVE]   = mix (0.2, @fg_color, @bg_color)
+	fg[ACTIVE]        = @fg_color
+
+	text[NORMAL]      = @text_color
+	text[PRELIGHT]    = @text_color
+	text[SELECTED]    = @selected_fg_color
+	text[INSENSITIVE] = darker (@bg_color)
+	text[ACTIVE]      = @selected_fg_color
+
+	base[NORMAL]      = @base_color
+	base[PRELIGHT]    = shade (0.95, @bg_color)
+	base[SELECTED]    = @selected_bg_color
+	base[INSENSITIVE] = @bg_color
+	base[ACTIVE]      = shade (0.9, @selected_bg_color)
+
+	engine "clearlooks" {
+		colorize_scrollbar = TRUE
+		reliefstyle = 1
+		menubarstyle = 2
+		toolbarstyle = 1
+		animation          = FALSE
+		radius = 3.0
+		style = GUMMY
+
+		# Set a hint to disable backward compatibility fallbacks.
+		hint = "use-hints"
+	}
+}
+
+style "wide" {
+	xthickness = 2
+	ythickness = 2
+}
+
+style "wider" {
+	xthickness = 3
+	ythickness = 3
+}
+
+style "entry" {
+	xthickness = 3
+	ythickness = 3
+
+	bg[SELECTED] = mix (1.4, @selected_bg_color, @base_color)
+	fg[SELECTED] = @selected_fg_color
+
+	engine "clearlooks" {
+		focus_color = shade (0.65, @selected_bg_color)
+	}
+}
+
+style "paned" {
+
+	bg[PRELIGHT] = shade (0.9, @bg_color)
+
+	engine "clearlooks" {
+		hint = "paned"
+	}
+}
+
+style "HSV" {
+
+	engine "clearlooks" {
+		hint = "HSV"
+		disable_focus = TRUE
+	}
+}
+
+style "spinbutton" {
+
+	engine "clearlooks" {
+		hint = "spinbutton"
+	}
+}
+
+style "scale" {
+	xthickness = 2
+	ythickness = 2
+
+	bg[NORMAL]        = shade (1.15, @bg_color)
+	bg[PRELIGHT]      = shade (1.25, @bg_color)
+	# when GtkScale::trough-side-details = 1, bg[SELECTED] set the color of the slider background on the left of the knob
+	#bg[SELECTED]      = @bg_color
+
+	engine "clearlooks" {
+		focus_color = @selected_bg_color
+		hint = "scale"
+	}
+}
+
+style "vscale" {
+
+	engine "clearlooks" {
+		hint = "vscale"
+	}
+}
+
+style "hscale" {
+
+	engine "clearlooks" {
+		hint = "hscale"
+	}
+}
+
+style "scrollbar" {
+	xthickness = 2
+	ythickness = 2
+
+	#bg[NORMAL] = shade (1.07, @bg_color)
+
+	engine "clearlooks" {
+		hint = "scrollbar"
+	}
+}
+
+style "hscrollbar" {
+
+	engine "clearlooks" {
+		hint = "hscrollbar"
+	}
+}
+
+style "vscrollbar" {
+
+	engine "clearlooks" {
+		hint = "vscrollbar"
+	}
+}
+
+style "notebook_bg" {
+
+	bg[NORMAL]        = shade (1.05, @bg_color)
+	bg[ACTIVE]        = shade (0.92, @bg_color)
+}
+
+style "button" {
+
+	bg[NORMAL]        = shade (0.95, @bg_color)
+	bg[PRELIGHT]      = shade (1.08, @bg_color)
+	bg[ACTIVE]        = shade (0.80, @bg_color)
+
+	engine "clearlooks"
+	{
+		hint	= "button"
+		radius	= 5.0
+	}
+}
+
+# The color is changed by the notebook_bg style, this style
+# changes the x/ythickness
+style "notebook" {
+	xthickness = 3
+	ythickness = 3
+
+	bg[SELECTED]      = @salt_pinch
+}
+
+style "statusbar" {
+
+	engine "clearlooks" {
+		hint = "statusbar"
+	}
+}
+
+style "comboboxentry" {
+
+	engine "clearlooks" {
+		# Note:
+		# If you set the appears-as-list option on comboboxes in the theme,
+		# then you should set this hint on the combobox instead.
+		hint = "comboboxentry"
+	}
+}
+
+style "expander" {
+
+	fg[NORMAL]        = mix (0.6, @selected_bg_color, @text_color)
+	fg[PRELIGHT]      = mix (0.6, @selected_bg_color, @text_color)
+	fg[INSENSITIVE]   = @selected_bg_color
+
+	bg[PRELIGHT]      = mix (0.5, @selected_bg_color, @bg_color)
+
+	base[NORMAL]      = mix (0.6, @selected_bg_color, @text_color)
+	base[PRELIGHT]    = @selected_fg_color
+	base[INSENSITIVE] = @selected_bg_color
+
+	engine "clearlooks" {
+		hint = "expander"
+	}
+}
+
+style "expanderLabel" {
+
+	fg[NORMAL]   = @text_color
+	fg[PRELIGHT] = @text_color
+}
+
+style "menubar" {
+
+	engine "clearlooks" {
+		hint = "menubar"
+	}
+}
+
+style "menu" {
+	xthickness = 0
+	ythickness = 0
+
+	bg[NORMAL] = @base_color
+
+	engine "clearlooks" {
+		radius = 0.0
+	}
+}
+
+style "menu_item" {
+	xthickness = 2
+	ythickness = 3
+
+	fg[PRELIGHT] = @selected_fg_color
+}
+
+# This style is there to modify the separator menu items. The goals are:
+# 1. Get a specific height.
+# 2. The line should go to the edges (ie. no border at the left/right)
+style "separator_menu_item" {
+	xthickness = 1
+	ythickness = 0
+
+	GtkSeparatorMenuItem::horizontal-padding = 0
+	GtkWidget::wide-separators = 1
+	GtkWidget::separator-width = 1
+	GtkWidget::separator-height = 7
+}
+
+style "frame_title" {
+
+	fg[NORMAL]        = shade (1.40, @bg_color)
+}
+
+style "treeview" {
+
+	text[ACTIVE]      = @text_color
+	base[ACTIVE]      = mix(0.50, @selected_bg_color, @base_color)
+
+	engine "clearlooks" {
+		hint = "treeview"
+	}
+}
+
+# The almost useless progress bar style
+style "progressbar" {
+	xthickness = 1
+	ythickness = 1
+
+	fg[PRELIGHT]      = @selected_fg_color
+
+	engine "clearlooks" {
+		# Explicitly set the radius for the progress bars inside menu items.
+		radius = 3.0
+
+		hint = "progressbar"
+	}
+}
+
+# This style is based on the clearlooks-default style, so that the colors from the button
+# style are overriden again.
+style "treeview_header" = "clearlooks-default" {
+	xthickness = 2
+	ythickness = 1
+
+	bg[NORMAL] = shade (1.2, @bg_color)
+
+	engine "clearlooks" {
+		hint = "treeview-header"
+	}
+}
+
+style "tooltips" {
+	xthickness = 4
+	ythickness = 4
+
+	bg[NORMAL]        = @tooltip_bg_color
+	fg[NORMAL]        = @tooltip_fg_color
+}
+
+style "nautilus_location" {
+
+	bg[NORMAL]        = mix (0.60, shade (1.05, @bg_color), @selected_bg_color)
+}
+
+# Wrokaroudn style for places where the text color is used instead of the fg color.
+style "text_is_fg_color_workaround" {
+
+	text[NORMAL]      = @fg_color
+	text[PRELIGHT]    = @fg_color
+	text[SELECTED]    = @selected_fg_color
+	text[ACTIVE]      = @fg_color
+	text[INSENSITIVE] = darker (@bg_color)
+}
+
+# Workaround style for menus where the text color is used instead of the fg color.
+style "menuitem_text_is_fg_color_workaround" {
+
+	text[NORMAL]      = @fg_color
+	text[PRELIGHT]    = @selected_fg_color
+	text[SELECTED]    = @selected_fg_color
+	text[ACTIVE]      = @fg_color
+	text[INSENSITIVE] = darker (@bg_color)
+}
+
+# Workaround style for places where the fg color is used instead of the text color.
+style "fg_is_text_color_workaround" {
+
+	fg[NORMAL]        = @text_color
+	fg[PRELIGHT]      = @text_color
+	fg[SELECTED]      = @selected_fg_color
+	fg[ACTIVE]        = @selected_fg_color
+	fg[INSENSITIVE]   = darker (@bg_color)
+}
+
+# Style to set the toolbar to use a flat style. This is because the "New" button in
+# Evolution is not drawn transparent. So if there is a gradient in the background it will
+# look really wrong.
+# See http://bugzilla.gnome.org/show_bug.cgi?id=446953.
+style "evo_new_button_workaround" {
+
+	engine "clearlooks" {
+		toolbarstyle = 0
+	}
+}
+
+
+###############################################################################
+# The following part of the gtkrc applies the different styles to the widgets.
+###############################################################################
+
+# The clearlooks-default style is applied to every widget
+class "GtkWidget" style "clearlooks-default"
+
+class "GtkSeparator" style "wide"
+class "GtkFrame" style "wide"
+class "GtkCalendar" style "wide"
+class "GtkCheckButton" style "wider"
+class "GtkRadioButton" style "wider"
+class "GtkEntry" style "entry"
+
+class "GtkPaned" style "paned"
+class "GtkSpinButton" style "spinbutton"
+class "GtkScale" style "scale"
+class "GtkVScale" style "vscale"
+class "GtkHScale" style "hscale"
+class "GtkScrollbar" style "scrollbar"
+class "GtkHScrollbar" style "hscrollbar"
+class "GtkVScrollbar" style "vscrollbar"
+
+class "GtkExpander" style "expander"
+class "GtkHSV" style "HSV"
+
+# General matching follows. The order is choosen so that the right styles override
+# each other. EG. progressbar needs to be more important than the menu match.
+widget_class "*<GtkNotebook>" style "notebook_bg"
+# This is not perfect, it could be done better.
+# (That is modify *every* widget in the notebook, and change those back that
+# we really don't want changed)
+widget_class "*<GtkNotebook>*<GtkEventBox>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkLayout>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkViewport>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkScrolledWindow>" style "notebook_bg"
+
+widget_class "*<GtkButton>" style "button"
+widget_class "*<GtkNotebook>" style "notebook"
+widget_class "*<GtkStatusbar>*" style "statusbar"
+
+widget_class "*<GtkComboBoxEntry>*" style "comboboxentry"
+widget_class "*<GtkCombo>*" style "comboboxentry"
+
+widget_class "*<GtkExpander>.<GtkLabel>" style "expanderLabel"
+
+widget_class "*<GtkMenuBar>*" style "menubar"
+widget_class "*<GtkMenu>*" style "menu"
+widget_class "*<GtkMenuItem>*" style "menu_item"
+widget_class "*<GtkSeparatorMenuItem>*" style "separator_menu_item"
+
+widget_class "*.<GtkFrame>.<GtkLabel>" style "frame_title"
+widget_class "*.<GtkTreeView>*" style "treeview"
+
+widget_class "*<GtkProgress>" style "progressbar"
+
+# Treeview headers (and similar stock GTK+ widgets)
+widget_class "*.<GtkTreeView>.<GtkButton>" style "treeview_header"
+widget_class "*.<GtkCTree>.<GtkButton>" style "treeview_header"
+widget_class "*.<GtkList>.<GtkButton>" style "treeview_header"
+widget_class "*.<GtkCList>.<GtkButton>" style "treeview_header"
+
+# The window of the tooltip is called "gtk-tooltip"
+##################################################################
+# FIXME:
+# This will not work if one embeds eg. a button into the tooltip.
+# As far as I can tell right now we will need to rework the theme
+# quite a bit to get this working correctly.
+# (It will involve setting different priorities, etc.)
+##################################################################
+widget "gtk-tooltip*" style "tooltips"
+
+##########################################################################
+# Following are special cases and workarounds for issues in applications.
+##########################################################################
+
+# Workaround for the evolution ETable (bug #527532)
+widget_class "*.<ETable>.<ECanvas>" style "treeview_header"
+# Workaround for the evolution ETree
+widget_class "*.<ETree>.<ECanvas>" style "treeview_header"
+
+# Special case the nautilus-extra-view-widget
+# ToDo: A more generic approach for all applications that have a widget like this.
+widget "*.nautilus-extra-view-widget" style : highest "nautilus_location"
+
+# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
+# Note that this work around assumes that the combobox is _not_ in appears-as-list mode.
+widget_class "*.<GtkComboBox>.<GtkCellView>" style "text_is_fg_color_workaround"
+# This is the part of the workaround that fixes the menus
+widget "*.gtk-combobox-popup-menu.*" style "menuitem_text_is_fg_color_workaround"
+
+# Work around the usage of GtkLabel inside GtkListItems to display text.
+# This breaks because the label is shown on a background that is based on the base color.
+widget_class "*<GtkListItem>*" style "fg_is_text_color_workaround"
+# GtkCList also uses the fg color to draw text on top of the base colors.
+widget_class "*<GtkCList>" style "fg_is_text_color_workaround"
+# Nautilus when renaming files, and maybe other places.
+widget_class "*<EelEditableLabel>" style "fg_is_text_color_workaround"
+
+# See the documentation of the style.
+widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "evo_new_button_workaround"
diff --git a/rtdata/themes/92-Beige-DarkCyan.gtkrc b/rtdata/themes/92-Beige-DarkCyan.gtkrc
new file mode 100644
index 000000000..0a0587439
--- /dev/null
+++ b/rtdata/themes/92-Beige-DarkCyan.gtkrc
@@ -0,0 +1,501 @@
+#
+#  This file is part of RawTherapee.
+#
+#  Copyright (c) 2004-2011 Gabor Horvath <hgabor@rawtherapee.com>
+#
+#  RawTherapee is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+# 
+#  RawTherapee is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# Please keep this gtkrc in sync with the other ones from Clearlooks based themes.
+
+gtk-color-scheme = "base_color:#ffffff\nfg_color:#101010\ntooltip_fg_color:#000000\nselected_bg_color:#7C99AD\nselected_fg_color:#ffffff\ntext_color:#000000\nbg_color:#EFEBE7\ntooltip_bg_color:#FFFFBF"
+
+style "clearlooks-default" {
+	xthickness = 1
+	ythickness = 1
+
+	#######################
+	# Style Properties
+	#######################
+	GtkButton::child-displacement-x = 1
+	GtkButton::child-displacement-y = 1
+	GtkButton::default-border = { 0, 0, 0, 0 }
+	GtkButton::image-spacing = 4
+	GtkToolButton::icon-spacing = 4
+
+	GtkCheckButton::indicator-size = 14
+
+	GtkPaned::handle-size = 6
+
+	GtkRange::trough-border = 0
+	GtkRange::slider-width = 15
+	GtkRange::stepper-size = 15
+
+	GtkScale::slider-width = 14
+	GtkScale::slider-length = 30
+	GtkScale::trough-side-details = 0
+
+	GtkScrollbar::min-slider-length = 30
+	GtkMenuBar::internal-padding = 0
+	GtkExpander::expander-size = 18
+	GtkExpander::expander-spacing = 0
+	GtkToolbar::internal-padding = 1
+	GtkTreeView::expander-size = 12
+	GtkTreeView::vertical-separator = 0
+
+	GtkMenu::horizontal-padding = 0
+	GtkMenu::vertical-padding = 0
+
+	WnckTasklist::fade-overlay-rect = 0
+	# The following line hints to gecko (and possibly other appliations)
+	# that the entry should be drawn transparently on the canvas.
+	# Without this, gecko will fill in the background of the entry.
+	GtkEntry::honors-transparent-bg-hint = 1
+
+	GtkEntry::progress-border = { 2, 2, 2, 2 }
+
+	####################
+	# Color Definitions
+	####################
+	bg[NORMAL]        = @bg_color
+	bg[PRELIGHT]      = shade (1.02, @bg_color)
+	bg[SELECTED]      = @selected_bg_color
+	bg[INSENSITIVE]   = @bg_color
+	bg[ACTIVE]        = shade (0.9, @bg_color)
+
+	fg[NORMAL]        = @fg_color
+	fg[PRELIGHT]      = @fg_color
+	fg[SELECTED]      = @selected_fg_color
+	fg[INSENSITIVE]   = mix (0.2, @fg_color, @bg_color)
+	fg[ACTIVE]        = @fg_color
+
+	text[NORMAL]      = @text_color
+	text[PRELIGHT]    = @text_color
+	text[SELECTED]    = @selected_fg_color
+	text[INSENSITIVE] = darker (@bg_color)
+	text[ACTIVE]      = @selected_fg_color
+
+	base[NORMAL]      = @base_color
+	base[PRELIGHT]    = shade (0.95, @bg_color)
+	base[SELECTED]    = @selected_bg_color
+	base[INSENSITIVE] = @bg_color
+	base[ACTIVE]      = shade (0.9, @selected_bg_color)
+
+	engine "clearlooks" {
+		colorize_scrollbar = TRUE
+		reliefstyle = 1
+		menubarstyle = 2
+		toolbarstyle = 1
+		animation = FALSE
+		radius = 3.0
+		style = GUMMY
+
+		# Set a hint to disable backward compatibility fallbacks.
+		hint = "use-hints"
+	}
+}
+
+style "wide" {
+	xthickness = 2
+	ythickness = 2
+}
+
+style "wider" {
+	xthickness = 3
+	ythickness = 3
+}
+
+style "entry" {
+	xthickness = 3
+	ythickness = 3
+
+	bg[SELECTED] = mix (0.4, @selected_bg_color, @base_color)
+	fg[SELECTED] = @text_color
+
+	engine "clearlooks" {
+		focus_color = shade (0.65, @selected_bg_color)
+	}
+}
+
+style "paned" {
+
+	bg[PRELIGHT] = shade (0.9, @bg_color)
+
+	engine "clearlooks" {
+		hint = "paned"
+	}
+}
+
+style "HSV" {
+
+	engine "clearlooks" {
+		hint = "HSV"
+		disable_focus = TRUE
+	}
+}
+
+style "spinbutton" {
+
+	engine "clearlooks" {
+		hint = "spinbutton"
+	}
+}
+
+style "scale" {
+	xthickness = 2
+	ythickness = 2
+
+	bg[NORMAL]        = shade (1.15, @bg_color)
+	bg[PRELIGHT]      = shade (1.25, @bg_color)
+	# when GtkScale::trough-side-details = 1, bg[SELECTED] set the color of the slider background on the left of the knob
+	#bg[SELECTED]      = @bg_color
+
+	engine "clearlooks" {
+		focus_color = @selected_bg_color
+		hint = "scale"
+	}
+}
+
+style "vscale" {
+
+	engine "clearlooks" {
+		hint = "vscale"
+	}
+}
+
+style "hscale" {
+
+	engine "clearlooks" {
+		hint = "hscale"
+	}
+}
+
+style "scrollbar" {
+	xthickness = 2
+	ythickness = 2
+
+	#bg[SELECTED]      = shade (1.50, @bg_color)
+
+	engine "clearlooks" {
+		hint = "scrollbar"
+	}
+}
+
+style "hscrollbar" {
+
+	engine "clearlooks" {
+		hint = "hscrollbar"
+	}
+}
+
+style "vscrollbar" {
+
+	engine "clearlooks" {
+		hint = "vscrollbar"
+	}
+}
+
+style "notebook_bg" {
+
+	bg[NORMAL]        = shade (1.02, @bg_color)
+}
+
+style "button" {
+
+	bg[NORMAL]        = shade (0.96, @bg_color)
+	bg[PRELIGHT]      = shade (1.06, @bg_color)
+	bg[ACTIVE]        = shade (0.85, @bg_color)
+
+	engine "clearlooks"
+	{
+		hint	= "button"
+	}
+}
+
+# The color is changed by the notebook_bg style, this style
+# changes the x/ythickness
+style "notebook" {
+	xthickness = 3
+	ythickness = 3
+}
+
+style "statusbar" {
+
+	engine "clearlooks" {
+		hint = "statusbar"
+	}
+}
+
+style "comboboxentry" {
+
+	engine "clearlooks" {
+		# Note:
+		# If you set the appears-as-list option on comboboxes in the theme,
+		# then you should set this hint on the combobox instead.
+		hint = "comboboxentry"
+	}
+}
+
+style "expander" {
+
+	fg[NORMAL]        = @selected_bg_color
+	fg[PRELIGHT]      = @selected_bg_color
+	fg[INSENSITIVE]   = @selected_bg_color
+
+	bg[PRELIGHT]      = mix (0.20, @selected_bg_color, @bg_color)
+
+	base[NORMAL]      = @selected_bg_color
+	base[PRELIGHT]    = @selected_bg_color
+	base[INSENSITIVE] = @selected_bg_color
+
+	engine "clearlooks" {
+		hint = "expander"
+	}
+}
+
+style "menubar" {
+
+	engine "clearlooks" {
+		hint = "menubar"
+	}
+}
+
+style "menu" {
+	xthickness = 0
+	ythickness = 0
+
+	bg[NORMAL]        = shade (1.08, @bg_color)
+
+	engine "clearlooks" {
+		radius = 0.0
+	}
+}
+
+style "menu_item" {
+	xthickness = 2
+	ythickness = 3
+
+	fg[PRELIGHT]      = @selected_fg_color
+}
+
+# This style is there to modify the separator menu items. The goals are:
+# 1. Get a specific height.
+# 2. The line should go to the edges (ie. no border at the left/right)
+style "separator_menu_item" {
+	xthickness = 1
+	ythickness = 0
+
+	GtkSeparatorMenuItem::horizontal-padding = 0
+	GtkWidget::wide-separators = 1
+	GtkWidget::separator-width = 1
+	GtkWidget::separator-height = 7
+}
+
+style "frame_title" {
+
+	fg[NORMAL]        = lighter (@fg_color)
+}
+
+style "treeview" {
+
+	# For an unkown reason, shading 7C99AD produce a redish color, so we have to set the value manually
+	text[ACTIVE]      = @text_color
+	base[ACTIVE]      = mix(0.50, @selected_bg_color, @base_color)
+
+	engine "clearlooks" {
+		hint = "treeview"
+	}
+}
+
+# The almost useless progress bar style
+style "progressbar" {
+	xthickness = 1
+	ythickness = 1
+
+	fg[PRELIGHT]      = @selected_fg_color
+
+	engine "clearlooks" {
+		# Explicitly set the radius for the progress bars inside menu items.
+		radius = 3.0
+
+		hint = "progressbar"
+	}
+}
+
+# This style is based on the clearlooks-default style, so that the colors from the button
+# style are overriden again.
+style "treeview_header" = "clearlooks-default" {
+	xthickness = 2
+	ythickness = 1
+
+	engine "clearlooks" {
+		hint = "treeview-header"
+	}
+}
+
+style "tooltips" {
+	xthickness = 4
+	ythickness = 4
+
+	bg[NORMAL]        = @tooltip_bg_color
+	fg[NORMAL]        = @tooltip_fg_color
+}
+
+style "nautilus_location" {
+
+	bg[NORMAL]        = mix (0.60, shade (1.05, @bg_color), @selected_bg_color)
+}
+
+# Wrokaroudn style for places where the text color is used instead of the fg color.
+style "text_is_fg_color_workaround" {
+
+	text[NORMAL]      = @fg_color
+	text[PRELIGHT]    = @fg_color
+	text[SELECTED]    = @selected_fg_color
+	text[ACTIVE]      = @fg_color
+	text[INSENSITIVE] = darker (@bg_color)
+}
+
+# Workaround style for menus where the text color is used instead of the fg color.
+style "menuitem_text_is_fg_color_workaround" {
+
+	text[NORMAL]      = @fg_color
+	text[PRELIGHT]    = @selected_fg_color
+	text[SELECTED]    = @selected_fg_color
+	text[ACTIVE]      = @fg_color
+	text[INSENSITIVE] = darker (@bg_color)
+}
+
+# Workaround style for places where the fg color is used instead of the text color.
+style "fg_is_text_color_workaround" {
+
+	fg[NORMAL]        = @text_color
+	fg[PRELIGHT]      = @text_color
+	fg[SELECTED]      = @selected_fg_color
+	fg[ACTIVE]        = @selected_fg_color
+	fg[INSENSITIVE]   = darker (@bg_color)
+}
+
+# Style to set the toolbar to use a flat style. This is because the "New" button in
+# Evolution is not drawn transparent. So if there is a gradient in the background it will
+# look really wrong.
+# See http://bugzilla.gnome.org/show_bug.cgi?id=446953.
+style "evo_new_button_workaround" {
+
+	engine "clearlooks" {
+		toolbarstyle = 0
+	}
+}
+
+
+###############################################################################
+# The following part of the gtkrc applies the different styles to the widgets.
+###############################################################################
+
+# The clearlooks-default style is applied to every widget
+class "GtkWidget" style "clearlooks-default"
+
+class "GtkSeparator" style "wide"
+class "GtkFrame" style "wide"
+class "GtkCalendar" style "wide"
+class "GtkCheckButton" style "wider"
+class "GtkRadioButton" style "wider"
+class "GtkEntry" style "entry"
+
+class "GtkPaned" style "paned"
+class "GtkSpinButton" style "spinbutton"
+class "GtkScale" style "scale"
+class "GtkVScale" style "vscale"
+class "GtkHScale" style "hscale"
+class "GtkScrollbar" style "scrollbar"
+class "GtkHScrollbar" style "hscrollbar"
+class "GtkVScrollbar" style "vscrollbar"
+
+class "GtkExpander" style "expander"
+class "GtkHSV" style "HSV"
+
+# General matching follows. The order is choosen so that the right styles override
+# each other. EG. progressbar needs to be more important than the menu match.
+widget_class "*<GtkNotebook>" style "notebook_bg"
+# This is not perfect, it could be done better.
+# (That is modify *every* widget in the notebook, and change those back that
+# we really don't want changed)
+widget_class "*<GtkNotebook>*<GtkEventBox>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkLayout>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkViewport>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkScrolledWindow>" style "notebook_bg"
+
+widget_class "*<GtkButton>" style "button"
+widget_class "*<GtkNotebook>" style "notebook"
+widget_class "*<GtkStatusbar>*" style "statusbar"
+
+widget_class "*<GtkComboBoxEntry>*" style "comboboxentry"
+widget_class "*<GtkCombo>*" style "comboboxentry"
+
+widget_class "*<GtkMenuBar>*" style "menubar"
+widget_class "*<GtkMenu>*" style "menu"
+widget_class "*<GtkMenuItem>*" style "menu_item"
+widget_class "*<GtkSeparatorMenuItem>*" style "separator_menu_item"
+
+widget_class "*.<GtkFrame>.<GtkLabel>" style "frame_title"
+widget_class "*.<GtkTreeView>*" style "treeview"
+
+widget_class "*<GtkProgress>" style "progressbar"
+
+# Treeview headers (and similar stock GTK+ widgets)
+widget_class "*.<GtkTreeView>.<GtkButton>" style "treeview_header"
+widget_class "*.<GtkCTree>.<GtkButton>" style "treeview_header"
+widget_class "*.<GtkList>.<GtkButton>" style "treeview_header"
+widget_class "*.<GtkCList>.<GtkButton>" style "treeview_header"
+
+# The window of the tooltip is called "gtk-tooltip"
+##################################################################
+# FIXME:
+# This will not work if one embeds eg. a button into the tooltip.
+# As far as I can tell right now we will need to rework the theme
+# quite a bit to get this working correctly.
+# (It will involve setting different priorities, etc.)
+##################################################################
+widget "gtk-tooltip*" style "tooltips"
+
+##########################################################################
+# Following are special cases and workarounds for issues in applications.
+##########################################################################
+
+# Workaround for the evolution ETable (bug #527532)
+widget_class "*.<ETable>.<ECanvas>" style "treeview_header"
+# Workaround for the evolution ETree
+widget_class "*.<ETree>.<ECanvas>" style "treeview_header"
+
+# Special case the nautilus-extra-view-widget
+# ToDo: A more generic approach for all applications that have a widget like this.
+widget "*.nautilus-extra-view-widget" style : highest "nautilus_location"
+
+# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
+# Note that this work around assumes that the combobox is _not_ in appears-as-list mode.
+widget_class "*.<GtkComboBox>.<GtkCellView>" style "text_is_fg_color_workaround"
+# This is the part of the workaround that fixes the menus
+widget "*.gtk-combobox-popup-menu.*" style "menuitem_text_is_fg_color_workaround"
+
+# Work around the usage of GtkLabel inside GtkListItems to display text.
+# This breaks because the label is shown on a background that is based on the base color.
+widget_class "*<GtkListItem>*" style "fg_is_text_color_workaround"
+# GtkCList also uses the fg color to draw text on top of the base colors.
+widget_class "*<GtkCList>" style "fg_is_text_color_workaround"
+# Nautilus when renaming files, and maybe other places.
+widget_class "*<EelEditableLabel>" style "fg_is_text_color_workaround"
+
+# See the documentation of the style.
+widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "evo_new_button_workaround"
diff --git a/rtdata/themes/ClearLooks (Dark Orange) b/rtdata/themes/ClearLooks (Dark Orange)
deleted file mode 100644
index 281bd7c01..000000000
--- a/rtdata/themes/ClearLooks (Dark Orange)	
+++ /dev/null
@@ -1,217 +0,0 @@
-#
-#   This file is part of RawTherapee.
-#
-#   Copyright (c) 2004-2010 Gabor Horvath <hgabor@rawtherapee.com>
-#
-#   RawTherapee is free software: you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation, either version 3 of the License, or
-#   (at your option) any later version.
-#
-#   RawTherapee is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-
-# Color scheme contributed by Franco Gotusso based on Clearlooks-DarkCoffee by Chibi
-# and edited by bvc as Clearlooks-DarkCoffee2.  Downloaded from http://art.gnome.org/themes/gtk2/1065
-
-style "clearlooks-default" {
-
-  GtkMenuItem::selected_shadow_type = none
-  GtkWidget::interior_focus = 1
-  GtkButton::default_border = { 3, 3, 3, 3 }
-  GtkButton::default_outside_border = { 3, 3, 3, 3 }
-  GtkRange::trough_border = 2
-
-  GtkWidget::focus_padding = 1
-
-  GtkPaned::handle_size = 6
-
-  GtkRange::slider_width = 15
-  GtkRange::stepper_size = 15
-  GtkScrollbar::min_slider_length = 30
-  GtkCheckButton::indicator_size = 12
-  GtkMenuBar::internal-padding = 0
-
-  GtkTreeView::expander_size = 14
-  GtkExpander::expander_size = 16
-
-  GtkTreeView::odd_row_color = "#343434"
-
-  GtkWidget::cursor_color           = "#E3DFDC"
-  GtkWidget::secondary_cursor_color = "#E3DFDC"
-
-  xthickness = 1
-  ythickness = 1
-
-  fg[NORMAL]        = "#d2cfcc" #Main window text
-  fg[PRELIGHT]      = "#E9E9E9" #Highlighted widget text
-  fg[ACTIVE]        = "#ADA59D" #Inactive widget text
-  fg[SELECTED]      = "#E9E9E9" #?#E9E9E9
-  fg[INSENSITIVE]   = "#202020" #CAN'T TOUCH DIS -[EDIT] I did (bvc) - [EDIT] Me too :)
-
-  bg[NORMAL]        = "#181818" #Backround
-  bg[PRELIGHT]      = "#dd6003" #Highlight Widget
-  bg[ACTIVE]        = "#343434" #Selected Widget
-  bg[SELECTED]      = "#dd6003" #The box words are usually in @_@!
-  bg[INSENSITIVE]   = "#202020" #Not active buttons 
-  base[NORMAL]      = "#000000" #Text area widgets.
-  base[PRELIGHT]    = "#313131" #Check and radio button background
-  base[ACTIVE]      = "#a64a07" #Unfocused Select
-  base[SELECTED]    = "#e26000" #Selected Text area item, and that bar over the tabs.
-  base[INSENSITIVE] = "#f5f2ee" #Haven't got a clue
-
-  text[NORMAL]      = "#d2cfcc" # Text area widget text.
-  text[PRELIGHT]    = "#E9E9E9" #?
-  text[ACTIVE]      = "#ADA59D" #?
-  text[SELECTED]    = "#E9E9E9" #Selected Text area widget text.
-  text[INSENSITIVE] = "#757575" #CAN'T TOUCH DIS -[EDIT] I did (bvc)
-
-engine "clearlooks"
-   {
-    sunkenmenubar    	= 1       # 0 = disable, 1 = enable
-    menuitemstyle     	= 1       # 0 = flat, 1 = 3d-ish (button)
-    listviewitemstyle 	= 1       # 0 = flat, 1 = 3d-ish (gradient)
-    progressbarstyle  	= 0       # 0 = candy bar, 1 = flat
-  }
-}
-
-style "clearlooks-wide" = "clearlooks-default"
-{
-  xthickness = 2
-  ythickness = 2
-  bg[NORMAL]			= "#313131"
-  bg[PRELIGHT]			= "#393939"
-}
-
-style "clearlooks-button" = "clearlooks-wide"
-{
-  bg[NORMAL]			= "#313131"
-  bg[PRELIGHT]			= "#393939"
-}
-
-style "clearlooks-notebook" = "clearlooks-wide"
-{
-  bg[NORMAL] = "#202020"
-  bg[ACTIVE] = "#101010"
-}
-
-style "clearlooks-tasklist" = "clearlooks-default"
-{
-  xthickness = 5
-  ythickness = 3
-}
-
-style "clearlooks-menu" = "clearlooks-default"
-{
-  xthickness = 2
-  ythickness = 1
-  bg[NORMAL] = "#202020"
-}
-
-style "clearlooks-menu-item" = "clearlooks-default"
-{
-  xthickness = 2
-  ythickness = 3
-  fg[PRELIGHT]  	= "#E9E9E9"
-  text[PRELIGHT]	= "#E9E9E9"
-  base[PRELIGHT] 	= "#dd6003"
-  base[SELECTED]     	= "#dd6003"
-}
-
-style "clearlooks-menu-itembar" = "clearlooks-default"
-{
-  xthickness = 3
-  ythickness = 3
-}
-
-style "clearlooks-tree" = "clearlooks-default"
-{
-  xthickness = 2
-  ythickness = 2
-}
-
-style "clearlooks-frame-title" = "clearlooks-default"
-{
-  fg[NORMAL] = "#d2cfcc"
-}
-
-style "clearlooks-panel" = "clearlooks-default"
-{
-  xthickness = 3
-  ythickness = 3
-}
-
-style "clearlooks-tooltips" = "clearlooks-default"
-{
-  xthickness = 4
-  ythickness = 4
-  bg[NORMAL] = "#dd6003"
-}
-
-style "clearlooks-progressbar"	= "clearlooks-default"
-{
-  xthickness = 1
-  ythickness = 1
-   fg[PRELIGHT]  		= "#d2cfcc"
-   bg[NORMAL] 			= "#1d0d01"
-}
-
-style "clearlooks-combo" = "clearlooks-default"
-{
-  xthickness = 1
-  ythickness = 2
-  fg[NORMAL]    		= "#040404"
-  fg[PRELIGHT]    		= "#dd6003"
-  fg[ACTIVE]     		= "#d2cfcc"
-  bg[NORMAL]			= "#313131"
-  bg[PRELIGHT]			= "#393939"
-}
-
-style "clearlooks-scrollbar" = "clearlooks-default"
-{
-  fg[NORMAL]    		= "#040404"
-  fg[PRELIGHT]    		= "#d2cfcc"
-  fg[ACTIVE]     		= "#d2cfcc"
-  bg[NORMAL]			= "#313131"
-  bg[PRELIGHT]			= "#393939"
-}
-
-style "clearlooks-spin" = "clearlooks-wide"
-{
-  fg[NORMAL]    		= "#040404"
-  fg[PRELIGHT]			= "#d2cfcc"
-  fg[ACTIVE]			= "#d2cfcc"
-  bg[PRELIGHT]    		= "#313131"
-  bg[ACTIVE]     		= "#393939"
-}
-
-class "GtkWidget" style "clearlooks-default"
-class "GtkRange" style "clearlooks-wide"
-class "GtkFrame" style "clearlooks-wide"
-class "GtkSpinButton" style "clearlooks-spin"
-class "GtkStatusbar" style "clearlooks-wide"
-class "GtkMenu" style "clearlooks-menu"
-class "GtkMenuItem" style "clearlooks-menu-item"
-widget_class "*MenuItem.*" style "clearlooks-menu-item"
-class "GtkEntry" style "clearlooks-wide"
-widget_class "*.tooltips.*.GtkToggleButton" style "clearlooks-tasklist"
-widget_class "*.GtkTreeView.GtkButton" style "clearlooks-tree"
-widget_class "*.GtkCTree.GtkButton" style "clearlooks-tree"
-widget_class "*.GtkList.GtkButton" style "clearlooks-tree"
-widget_class "*.GtkCList.GtkButton" style "clearlooks-tree"
-widget_class "*.GtkFrame.GtkLabel" style "clearlooks-frame-title"
-widget_class "BasePWidget.GtkEventBox.GtkTable.GtkFrame" style "clearlooks-panel"
-widget "gtk-tooltips" style "clearlooks-tooltips"
-class "GtkNotebook" style "clearlooks-notebook"
-class "GtkProgressBar" style "clearlooks-progressbar"
-widget_class "*.GtkComboBox.GtkButton" style "clearlooks-combo"
-widget_class "*.GtkCombo.GtkButton" style "clearlooks-combo"
-class "GtkButton" style "clearlooks-button"
-class "GtkScrollbar" style "clearlooks-scrollbar"
diff --git a/rtdata/themes/Dark b/rtdata/themes/Dark
deleted file mode 100644
index a47b35b21..000000000
--- a/rtdata/themes/Dark
+++ /dev/null
@@ -1,251 +0,0 @@
-#
-#   This file is part of RawTherapee.
-#
-#   Copyright (c) 2004-2010 Gabor Horvath <hgabor@rawtherapee.com>
-#
-#   RawTherapee is free software: you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation, either version 3 of the License, or
-#   (at your option) any later version.
-#
-#   RawTherapee is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-# colour scheme (RT Dark) by Bytec ( http://bytec.vitanet.lv )
-# based on the default gtkrc for
-# rawtherapee ( http://www.rawtherapee.com )
-# which is based on Bluecurve
-# Created by Richard Stellingwerff, Emil Jacobs and Daniel Borgmann.
-
-style "clearlooks-default" {
-
-  GtkButton      ::default_border    = { 0, 0, 0, 0 }
-  GtkComboBox    ::default_border    = { 0, 0, 0, 0 }
-  GtkRange       ::trough_border     = 0
-  GtkPaned       ::handle_size       = 6
-  GtkScale       ::slider-width      = 10
-  GtkRange       ::slider_width      = 12
-  GtkRange       ::stepper_size      = 12
-  GtkScrollbar   ::min_slider_length = 30
-  GtkCheckButton ::indicator_size    = 12
-  GtkMenuBar     ::internal-padding  = 2
-  GtkTreeView    ::expander_size     = 11
-  GtkExpander    ::expander_size     = 11
-
-  xthickness = 1
-  ythickness = 1
-
-  fg[NORMAL]        = "#808080"
-  fg[PRELIGHT]      = "#d0d0d0"
-  fg[ACTIVE]        = "#808080"
-  fg[SELECTED]      = "#404040"
-  fg[INSENSITIVE]   = "#2b2b2b"
-
-  bg[NORMAL]        = "#2b2b2b"
-  bg[PRELIGHT]      = "#404040"
-  bg[ACTIVE]        = "#2b2b2b"
-  bg[SELECTED]      = "#606060"
-  bg[INSENSITIVE]   = "#2b2b2b"
-   
-  base[NORMAL]      = "#404040"
-  base[PRELIGHT]    = "#404040"
-  base[ACTIVE]      = "#404040"
-  base[SELECTED]    = "#606060"
-  base[INSENSITIVE] = "#2b2b2b"
-   
-  text[NORMAL]      = "#a0a0a0"
-  text[PRELIGHT]    = "#d0d0d0"
-  text[ACTIVE]      = "#a0a0a0"
-  text[SELECTED]    = "#101010"
-  text[INSENSITIVE] = "#101010"
-
-  engine "clearlooks"  {
-    sunkenmenubar     = 0       # 0 = disable, 1 = enable
-    menuitemstyle     = 0       # 0 = flat, 1 = 3d-ish (button)
-    listviewitemstyle = 0       # 0 = flat, 1 = 3d-ish (gradient)
-    progressbarstyle  = 1       # 0 = candy bar, 1 = flat
-    radius = 5.0
-  }
-}
-
-style "clearlooks-wide" = "clearlooks-default"
-{
-  xthickness = 1
-  ythickness = 1
-}
-
-style "clearlooks-button" = "clearlooks-default"
-{
-  bg[NORMAL] = "#353535"
-}
-
-style "clearlooks-toggle" = "clearlooks-button"
-{
-  xthickness = 1
-  ythickness = 1
-
-  bg[ACTIVE] = "#505050"
-}
-
-style "clearlooks-frame" = "clearlooks-default"
-{
-  xthickness = 4
-  ythickness = 4
-}
-
-style "clearlooks-tasklist" = "clearlooks-default"
-{
-  xthickness = 5
-  ythickness = 3
-}
-
-style "clearlooks-menu" = "clearlooks-default"
-{
-  xthickness = 2
-  ythickness = 1
-}
-
-style "clearlooks-menu-item" = "clearlooks-default"
-{
-  xthickness = 1
-  ythickness = 1
-}
-
-style "clearlooks-menu-itembar" = "clearlooks-default"
-{
-  xthickness = 1
-  ythickness = 1
-}
-
-style "clearlooks-tree" = "clearlooks-default"
-{
-  xthickness = 1
-  ythickness = 1
-}
-
-style "clearlooks-title" = "clearlooks-default"
-{
-  fg[NORMAL] = "#d0d0d0"
-}
-
-style "clearlooks-expander" = "clearlooks-default"
-{
-  fg[NORMAL]        = "#800000"
-  fg[PRELIGHT]      = "#800000"
-  fg[ACTIVE]        = "#800000"
-  fg[SELECTED]      = "#800000"
-  fg[INSENSITIVE]   = "#800000"
-
-  bg[NORMAL]        = "#700000"
-  bg[PRELIGHT]      = "#5a0000"
-  bg[ACTIVE]        = "#700000"
-  bg[SELECTED]      = "#700000"
-  bg[INSENSITIVE]   = "#700000"
-
-  base[NORMAL]      = "#800000"
-  base[PRELIGHT]    = "#800000"
-  base[ACTIVE]      = "#800000"
-  base[SELECTED]    = "#800000"
-  base[INSENSITIVE] = "#800000"
-}
-
-style "clearlooks-expander-title" = "clearlooks-default"
-{
-  fg[NORMAL]   = "#a0a0a0"
-  fg[PRELIGHT] = "#d0d0d0"
-}
-
-style "clearlooks-expander-frame" = "clearlooks-default"
-{
-  bg[NORMAL] = "#272727"
-}
-
-style "clearlooks-notebook" = "clearlooks-default"
-{
-  bg[ACTIVE] = "#202020"
-}
-
-style "clearlooks-scale" = "clearlooks-default"
-{
-  bg[NORMAL]   = "#404040"
-  bg[PRELIGHT] = "#707070"
-  bg[ACTIVE]   = "#272727"
-}
-
-style "clearlooks-panel" = "clearlooks-default"
-{
-  xthickness = 3
-  ythickness = 3
-}
-
-style "clearlooks-tooltips" = "clearlooks-default"
-{
-  xthickness = 4
-  ythickness = 4
-  bg[NORMAL] = {1.0, 1.0, 1.0}
-  fg[NORMAL] = {0.0, 0.0, 0.0}
-
-  fg[NORMAL]        = "#000000"
-  fg[PRELIGHT]      = "#000000"
-  fg[ACTIVE]        = "#000000"
-  fg[SELECTED]      = "#000000"
-  fg[INSENSITIVE]   = "#000000"
-
-  bg[NORMAL]        = "#ffffff"
-  bg[PRELIGHT]      = "#ffffff"
-  bg[ACTIVE]        = "#ffffff"
-  bg[SELECTED]      = "#ffffff"
-  bg[INSENSITIVE]   = "#ffffff"
-   
-  base[NORMAL]      = "#000000"
-  base[PRELIGHT]    = "#000000"
-  base[ACTIVE]      = "#000000"
-  base[SELECTED]    = "#000000"
-  base[INSENSITIVE] = "#000000"
-   
-  text[NORMAL]      = "#000000"
-  text[PRELIGHT]    = "#000000"
-  text[ACTIVE]      = "#000000"
-  text[SELECTED]    = "#000000"
-  text[INSENSITIVE] = "#000000"
-}
-
-style "clearlooks-progressbar" = "clearlooks-default"
-{
-  xthickness = 1
-  ythickness = 1
-  fg[PRELIGHT]  = "#000000"
-}
-
-class "GtkWidget" style "clearlooks-default"
-class "GtkTreeView" style "clearlooks-default"
-class "GtkButton" style "clearlooks-button"
-class "GtkToggleButton" style "clearlooks-toggle"
-class "GtkScale" style "clearlooks-scale"
-class "GtkStatusbar" style "clearlooks-wide"
-class "GtkMenu" style "clearlooks-menu"
-class "GtkExpander" style "clearlooks-expander"
-class "GtkFrame" style "clearlooks-frame"
-class "GtkMenuItem" style "clearlooks-menu-item"
-class "GtkNotebook" style "clearlooks-notebook"
-class "GtkEntry" style "clearlooks-wide"
-class "GtkProgressBar" style "clearlooks-progressbar"
-widget_class "*MenuItem.*" style "clearlooks-menu-item"
-widget_class "*.tooltip.*.GtkToggleButton" style "clearlooks-tasklist"
-widget "gtk-tooltip" style "clearlooks-tooltips"
-widget_class "*GtkTreeView*GtkButton" style "clearlooks-tree"
-widget_class "*GtkCTree*GtkButton" style "clearlooks-tree"
-widget_class "*GtkList*GtkButton" style "clearlooks-tree"
-widget_class "*GtkCList*GtkButton" style "clearlooks-tree"
-widget_class "*GtkFrame.GtkLabel" style "clearlooks-title"
-widget_class "*GtkExpander.GtkLabel" style "clearlooks-expander-title"
-widget_class "*GtkExpander.GtkFrame.GtkBox" style "clearlooks-expander-frame"
-widget_class "*GtkNotebook.GtkLabel" style "clearlooks-title"
-widget_class "BasePWidget.GtkEventBox.GtkTable.GtkFrame" style "clearlooks-panel"
-widget "GtkFileChoserButton" style "clearlooks-button"
diff --git a/rtdata/themes/Default b/rtdata/themes/Default
deleted file mode 100644
index 92aa17c3a..000000000
--- a/rtdata/themes/Default
+++ /dev/null
@@ -1,168 +0,0 @@
-#
-#   This file is part of RawTherapee.
-#
-#   Copyright (c) 2004-2010 Gabor Horvath <hgabor@rawtherapee.com>
-#
-#   RawTherapee is free software: you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation, either version 3 of the License, or
-#   (at your option) any later version.
-#
-#   RawTherapee is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-# colour scheme by Bytec ( http://bytec.vitanet.lv )
-# based on the default gtkrc for
-# rawtherapee ( http://www.rawtherapee.com )
-# which is based on Bluecurve
-# Created by Richard Stellingwerff, Emil Jacobs and Daniel Borgmann.
-
-style "clearlooks-default" {
-
-  GtkButton      ::default_border    = { 0, 0, 0, 0 }
-  GtkRange       ::trough_border     = 0
-  GtkPaned       ::handle_size       = 6
-  GtkRange       ::slider_width      = 12
-  GtkRange       ::stepper_size      = 12
-  GtkScrollbar   ::min_slider_length = 30
-  GtkCheckButton ::indicator_size    = 12
-  GtkMenuBar     ::internal-padding  = 0
-  GtkTreeView    ::expander_size     = 11
-  GtkExpander    ::expander_size     = 11
-
-  xthickness = 1
-  ythickness = 1
-
-  fg[NORMAL]        = "#101010"
-  fg[PRELIGHT]      = "#101010"
-  fg[ACTIVE]        = "#000000"
-  fg[SELECTED]      = "#999999"
-  fg[INSENSITIVE]   = "#808080"
-
-  bg[NORMAL]        = "#808080"
-  bg[PRELIGHT]      = "#999999"
-  bg[ACTIVE]        = "#808080"
-  bg[SELECTED]      = "#999999"
-  bg[INSENSITIVE]   = "#808080"
-   
-  base[NORMAL]      = "#999999"
-  base[PRELIGHT]    = "#999999"
-  base[ACTIVE]      = "#999999"
-  base[SELECTED]    = "#606060"
-  base[INSENSITIVE] = "#808080"
-   
-  text[NORMAL]      = "#000000"
-  text[PRELIGHT]    = "#000000"
-  text[ACTIVE]      = "#000000"
-  text[SELECTED]    = "#000000"
-  text[INSENSITIVE] = "#000000"
-
-  engine "clearlooks"  {
-    sunkenmenubar     = 1       # 0 = disable, 1 = enable
-    menuitemstyle     = 0       # 0 = flat, 1 = 3d-ish (button)
-    listviewitemstyle = 0       # 0 = flat, 1 = 3d-ish (gradient)
-    progressbarstyle  = 0       # 0 = candy bar, 1 = flat
-  }
-}
-
-style "clearlooks-wide" = "clearlooks-default"
-{
-  xthickness = 1
-  ythickness = 1
-}
-
-style "clearlooks-notebook" = "clearlooks-wide"
-{
-  bg[NORMAL] = "#808080"
-}
-
-style "clearlooks-tasklist" = "clearlooks-default"
-{
-  xthickness = 5
-  ythickness = 3
-}
-
-style "clearlooks-menu" = "clearlooks-default"
-{
-  xthickness = 2
-  ythickness = 1
-  bg[NORMAL] = "#808080"
-}
-
-style "clearlooks-menu-item" = "clearlooks-default"
-{
-  xthickness = 1
-  ythickness = 1
-}
-
-style "clearlooks-menu-itembar" = "clearlooks-default"
-{
-  xthickness = 1
-  ythickness = 1
-}
-
-style "clearlooks-tree" = "clearlooks-default"
-{
-  xthickness = 1
-  ythickness = 1
-}
-
-style "clearlooks-frame-title" = "clearlooks-default"
-{
-  fg[NORMAL] = "#404040"
-}
-
-style "clearlooks-panel" = "clearlooks-default"
-{
-  xthickness = 3
-  ythickness = 3
-}
-
-style "clearlooks-tooltips" = "clearlooks-default"
-{
-  xthickness = 4
-  ythickness = 4
-  bg[NORMAL] = { 1.0,1.0,0.75 }
-}
-
-style "clearlooks-progressbar" = "clearlooks-default"
-{
-  xthickness = 1
-  ythickness = 0
-
-  fg[PRELIGHT]  = "#000000"
-}
-
-style "clearlooks-combo" = "clearlooks-default"
-{
-  xthickness = 0
-  ythickness = 0
-}
-
-class "GtkWidget" style "clearlooks-default"
-class "GtkButton" style "clearlooks-wide"
-class "GtkRange" style "clearlooks-wide"
-class "GtkFrame" style "clearlooks-wide"
-class "GtkStatusbar" style "clearlooks-wide"
-class "GtkMenu" style "clearlooks-menu"
-class "GtkMenuItem" style "clearlooks-menu-item"
-widget_class "*MenuItem.*" style "clearlooks-menu-item"
-class "GtkEntry" style "clearlooks-wide"
-widget_class "*.tooltips.*.GtkToggleButton" style "clearlooks-tasklist"
-widget_class "*.GtkTreeView.GtkButton" style "clearlooks-tree"
-widget_class "*.GtkCTree.GtkButton" style "clearlooks-tree"
-widget_class "*.GtkList.GtkButton" style "clearlooks-tree"
-widget_class "*.GtkCList.GtkButton" style "clearlooks-tree"
-widget_class "*.GtkFrame.GtkLabel" style "clearlooks-frame-title"
-widget_class "BasePWidget.GtkEventBox.GtkTable.GtkFrame" style "clearlooks-panel"
-widget "gtk-tooltip" style "clearlooks-tooltips"
-class "GtkNotebook" style "clearlooks-notebook"
-class "GtkProgressBar" style "clearlooks-progressbar"
-widget_class "*.GtkComboBox.GtkButton" style "clearlooks-combo"
-widget_class "*.GtkCombo.GtkButton" style "clearlooks-combo"
diff --git a/rtdata/themes/Default.gtkrc b/rtdata/themes/Default.gtkrc
new file mode 100644
index 000000000..fe7c351b4
--- /dev/null
+++ b/rtdata/themes/Default.gtkrc
@@ -0,0 +1,454 @@
+#
+#  This file is part of RawTherapee.
+#
+#  Copyright (c) 2004-2011 Gabor Horvath <hgabor@rawtherapee.com>
+#
+#  RawTherapee is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+# 
+#  RawTherapee is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# Please keep this gtkrc in sync with the other ones from Clearlooks based themes.
+
+gtk-color-scheme = "base_color:#ffffff\nfg_color:#000000\ntooltip_fg_color:#000000\nselected_bg_color:#86ABD9\nselected_fg_color:#ffffff\ntext_color:#1A1A1A\nbg_color:#EDECEB\ntooltip_bg_color:#F5F5B5"
+
+style "default" {
+	xthickness = 1
+	ythickness = 1
+
+	#######################
+	# Style Properties
+	#######################
+	GtkButton::child-displacement-x = 1
+	GtkButton::child-displacement-y = 1
+	GtkButton::default-border = { 0, 0, 0, 0 }
+	GtkButton::image-spacing = 4
+	GtkToolButton::icon-spacing = 4
+
+	GtkCheckButton::indicator-size = 14
+
+	GtkPaned::handle-size = 6
+
+	GtkRange::trough-border = 0
+	GtkRange::slider-width = 15
+	GtkRange::stepper-size = 15
+
+	GtkScale::slider-length = 23
+	GtkScale::trough-side-details = 0
+
+	GtkScrollbar::min-slider-length = 30
+	GtkMenuBar::internal-padding = 0
+	GtkExpander::expander-size = 16
+	GtkToolbar::internal-padding = 1
+	GtkTreeView::expander-size = 14
+	GtkTreeView::vertical-separator = 0
+
+	GtkMenu::horizontal-padding = 0
+	GtkMenu::vertical-padding = 0
+
+	WnckTasklist::fade-overlay-rect = 0
+	# The following line hints to gecko (and possibly other appliations)
+	# that the entry should be drawn transparently on the canvas.
+	# Without this, gecko will fill in the background of the entry.
+	GtkEntry::honors-transparent-bg-hint = 1
+
+	GtkEntry::progress-border = { 2, 2, 2, 2 }
+
+	####################
+	# Color Definitions
+	####################
+	bg[NORMAL]        = @bg_color
+	bg[PRELIGHT]      = shade (1.02, @bg_color)
+	bg[SELECTED]      = @selected_bg_color
+	bg[INSENSITIVE]   = @bg_color
+	bg[ACTIVE]        = shade (0.9, @bg_color)
+
+	fg[NORMAL]        = @fg_color
+	fg[PRELIGHT]      = @fg_color
+	fg[SELECTED]      = @selected_fg_color
+	fg[INSENSITIVE]   = darker (@bg_color)
+	fg[ACTIVE]        = @fg_color
+
+	text[NORMAL]      = @text_color
+	text[PRELIGHT]    = @text_color
+	text[SELECTED]    = @selected_fg_color
+	text[INSENSITIVE] = darker (@bg_color)
+	text[ACTIVE]      = @selected_fg_color
+
+	base[NORMAL]      = @base_color
+	base[PRELIGHT]    = shade (0.95, @bg_color)
+	base[SELECTED]    = @selected_bg_color
+	base[INSENSITIVE] = @bg_color
+	base[ACTIVE]      = shade (0.9, @selected_bg_color)
+
+	engine "clearlooks" {
+		colorize_scrollbar = TRUE
+		reliefstyle = 1
+		menubarstyle = 2
+		toolbarstyle = 1
+		animation = FALSE
+		radius = 3.0
+		style = GUMMY
+
+		# Set a hint to disable backward compatibility fallbacks.
+		hint = "use-hints"
+	}
+}
+
+style "wide" {
+	xthickness = 2
+	ythickness = 2
+}
+
+style "wider" {
+	xthickness = 3
+	ythickness = 3
+}
+
+style "entry" {
+	xthickness = 3
+	ythickness = 3
+
+	bg[SELECTED] = mix (0.4, @selected_bg_color, @base_color)
+	fg[SELECTED] = @text_color
+
+	engine "clearlooks" {
+		focus_color = shade (0.65, @selected_bg_color)
+	}
+}
+
+style "HSV" {
+
+	engine "clearlooks" {
+		hint = "HSV"
+		disable_focus = TRUE
+	}
+}
+
+style "spinbutton" {
+
+	engine "clearlooks" {
+		hint = "spinbutton"
+	}
+}
+
+style "scale" {
+	xthickness = 2
+	ythickness = 2
+
+	engine "clearlooks" {
+		hint = "scale"
+	}
+}
+
+style "vscale" {
+
+	engine "clearlooks" {
+		hint = "vscale"
+	}
+}
+
+style "hscale" {
+
+	engine "clearlooks" {
+		hint = "hscale"
+	}
+}
+
+style "scrollbar" {
+	xthickness = 2
+	ythickness = 2
+
+	engine "clearlooks" {
+		hint = "scrollbar"
+	}
+}
+
+style "hscrollbar" {
+
+	engine "clearlooks" {
+		hint = "hscrollbar"
+	}
+}
+
+style "vscrollbar" {
+
+	engine "clearlooks" {
+		hint = "vscrollbar"
+	}
+}
+
+style "notebook_bg" {
+
+	bg[NORMAL]        = shade (1.02, @bg_color)
+}
+
+style "button" {
+	xthickness = 3
+	ythickness = 3
+
+	bg[NORMAL]        = shade (1.04, @bg_color)
+	bg[PRELIGHT]      = shade (1.06, @bg_color)
+	bg[ACTIVE]        = shade (0.85, @bg_color)
+}
+
+# The color is changed by the notebook_bg style, this style
+# changes the x/ythickness
+style "notebook" {
+	xthickness = 3
+	ythickness = 3
+}
+
+style "statusbar" {
+
+	engine "clearlooks" {
+		hint = "statusbar"
+	}
+}
+
+style "comboboxentry" {
+
+	engine "clearlooks" {
+		# Note:
+		# If you set the appears-as-list option on comboboxes in the theme,
+		# then you should set this hint on the combobox instead.
+		hint = "comboboxentry"
+	}
+}
+
+style "menubar" {
+
+	engine "clearlooks" {
+		hint = "menubar"
+	}
+}
+
+style "menu" {
+	xthickness = 0
+	ythickness = 0
+
+	bg[NORMAL]        = shade (1.08, @bg_color)
+
+	engine "clearlooks" {
+		radius = 0.0
+	}
+}
+
+style "menu_item" {
+	xthickness = 2
+	ythickness = 3
+
+	fg[PRELIGHT]      = @selected_fg_color
+}
+
+# This style is there to modify the separator menu items. The goals are:
+# 1. Get a specific height.
+# 2. The line should go to the edges (ie. no border at the left/right)
+style "separator_menu_item" {
+	xthickness = 1
+	ythickness = 0
+
+	GtkSeparatorMenuItem::horizontal-padding = 0
+	GtkWidget::wide-separators = 1
+	GtkWidget::separator-width = 1
+	GtkWidget::separator-height = 7
+}
+
+style "frame_title" {
+
+	fg[NORMAL]        = lighter (@fg_color)
+}
+
+style "treeview" {
+
+	engine "clearlooks" {
+		hint = "treeview"
+	}
+}
+
+# The almost useless progress bar style
+style "progressbar" {
+	xthickness = 1
+	ythickness = 1
+
+	fg[PRELIGHT]      = @selected_fg_color
+
+	engine "clearlooks" {
+		# Explicitly set the radius for the progress bars inside menu items.
+		radius = 3.0
+
+		hint = "progressbar"
+	}
+}
+
+# This style is based on the default style, so that the colors from the button
+# style are overriden again.
+style "treeview_header" = "default" {
+	xthickness = 2
+	ythickness = 1
+
+	engine "clearlooks" {
+		hint = "treeview-header"
+	}
+}
+
+style "tooltips" {
+	xthickness = 4
+	ythickness = 4
+
+	bg[NORMAL]        = @tooltip_bg_color
+	fg[NORMAL]        = @tooltip_fg_color
+}
+
+style "nautilus_location" {
+
+	bg[NORMAL]        = mix (0.60, shade (1.05, @bg_color), @selected_bg_color)
+}
+
+# Wrokaroudn style for places where the text color is used instead of the fg color.
+style "text_is_fg_color_workaround" {
+
+	text[NORMAL]      = @fg_color
+	text[PRELIGHT]    = @fg_color
+	text[SELECTED]    = @selected_fg_color
+	text[ACTIVE]      = @fg_color
+	text[INSENSITIVE] = darker (@bg_color)
+}
+
+# Workaround style for menus where the text color is used instead of the fg color.
+style "menuitem_text_is_fg_color_workaround" {
+
+	text[NORMAL]      = @fg_color
+	text[PRELIGHT]    = @selected_fg_color
+	text[SELECTED]    = @selected_fg_color
+	text[ACTIVE]      = @fg_color
+	text[INSENSITIVE] = darker (@bg_color)
+}
+
+# Workaround style for places where the fg color is used instead of the text color.
+style "fg_is_text_color_workaround" {
+
+	fg[NORMAL]        = @text_color
+	fg[PRELIGHT]      = @text_color
+	fg[SELECTED]      = @selected_fg_color
+	fg[ACTIVE]        = @selected_fg_color
+	fg[INSENSITIVE]   = darker (@bg_color)
+}
+
+# Style to set the toolbar to use a flat style. This is because the "New" button in
+# Evolution is not drawn transparent. So if there is a gradient in the background it will
+# look really wrong.
+# See http://bugzilla.gnome.org/show_bug.cgi?id=446953.
+style "evo_new_button_workaround" {
+
+	engine "clearlooks" {
+		toolbarstyle = 0
+	}
+}
+
+
+###############################################################################
+# The following part of the gtkrc applies the different styles to the widgets.
+###############################################################################
+
+# The default style is applied to every widget
+class "GtkWidget" style "default"
+
+class "GtkSeparator" style "wide"
+class "GtkFrame" style "wide"
+class "GtkCalendar" style "wide"
+class "GtkEntry" style "entry"
+
+class "GtkSpinButton" style "spinbutton"
+class "GtkScale" style "scale"
+class "GtkVScale" style "vscale"
+class "GtkHScale" style "hscale"
+class "GtkScrollbar" style "scrollbar"
+class "GtkHScrollbar" style "hscrollbar"
+class "GtkVScrollbar" style "vscrollbar"
+
+class "GtkHSV" style "HSV"
+
+# General matching follows. The order is choosen so that the right styles override
+# each other. EG. progressbar needs to be more important than the menu match.
+widget_class "*<GtkNotebook>" style "notebook_bg"
+# This is not perfect, it could be done better.
+# (That is modify *every* widget in the notebook, and change those back that
+# we really don't want changed)
+widget_class "*<GtkNotebook>*<GtkEventBox>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkLayout>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkViewport>" style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkScrolledWindow>" style "notebook_bg"
+
+widget_class "*<GtkButton>" style "button"
+widget_class "*<GtkNotebook>" style "notebook"
+widget_class "*<GtkStatusbar>*" style "statusbar"
+
+widget_class "*<GtkComboBoxEntry>*" style "comboboxentry"
+widget_class "*<GtkCombo>*" style "comboboxentry"
+
+widget_class "*<GtkMenuBar>*" style "menubar"
+widget_class "*<GtkMenu>*" style "menu"
+widget_class "*<GtkMenuItem>*" style "menu_item"
+widget_class "*<GtkSeparatorMenuItem>*" style "separator_menu_item"
+
+widget_class "*.<GtkFrame>.<GtkLabel>" style "frame_title"
+widget_class "*.<GtkTreeView>*" style "treeview"
+
+widget_class "*<GtkProgress>" style "progressbar"
+
+# Treeview headers (and similar stock GTK+ widgets)
+widget_class "*.<GtkTreeView>.<GtkButton>" style "treeview_header"
+widget_class "*.<GtkCTree>.<GtkButton>" style "treeview_header"
+widget_class "*.<GtkList>.<GtkButton>" style "treeview_header"
+widget_class "*.<GtkCList>.<GtkButton>" style "treeview_header"
+
+# The window of the tooltip is called "gtk-tooltip"
+##################################################################
+# FIXME:
+# This will not work if one embeds eg. a button into the tooltip.
+# As far as I can tell right now we will need to rework the theme
+# quite a bit to get this working correctly.
+# (It will involve setting different priorities, etc.)
+##################################################################
+widget "gtk-tooltip*" style "tooltips"
+
+##########################################################################
+# Following are special cases and workarounds for issues in applications.
+##########################################################################
+
+# Workaround for the evolution ETable (bug #527532)
+widget_class "*.<ETable>.<ECanvas>" style "treeview_header"
+# Workaround for the evolution ETree
+widget_class "*.<ETree>.<ECanvas>" style "treeview_header"
+
+# Special case the nautilus-extra-view-widget
+# ToDo: A more generic approach for all applications that have a widget like this.
+widget "*.nautilus-extra-view-widget" style : highest "nautilus_location"
+
+# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
+# Note that this work around assumes that the combobox is _not_ in appears-as-list mode.
+widget_class "*.<GtkComboBox>.<GtkCellView>" style "text_is_fg_color_workaround"
+# This is the part of the workaround that fixes the menus
+widget "*.gtk-combobox-popup-menu.*" style "menuitem_text_is_fg_color_workaround"
+
+# Work around the usage of GtkLabel inside GtkListItems to display text.
+# This breaks because the label is shown on a background that is based on the base color.
+widget_class "*<GtkListItem>*" style "fg_is_text_color_workaround"
+# GtkCList also uses the fg color to draw text on top of the base colors.
+widget_class "*<GtkCList>" style "fg_is_text_color_workaround"
+# Nautilus when renaming files, and maybe other places.
+widget_class "*<EelEditableLabel>" style "fg_is_text_color_workaround"
+
+# See the documentation of the style.
+widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "evo_new_button_workaround"
diff --git a/rtdata/themes/Focus b/rtdata/themes/Focus
deleted file mode 100644
index 27d023316..000000000
--- a/rtdata/themes/Focus
+++ /dev/null
@@ -1,172 +0,0 @@
-#
-#   This file is part of RawTherapee.
-#
-#   by Oliver Duis
-#
-#   RawTherapee is free software: you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation, either version 3 of the License, or
-#   (at your option) any later version.
-#
-#   RawTherapee is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-style "clearlooks-default" {
-
-	GtkFrame       ::shadow-type       = 2
-	
-  GtkButton      ::default_border    = { 0, 0, 0, 0 }
-
-  GtkPaned       ::handle_size       = 3
-  
-  GtkRange       ::trough_border     = 0
-  GtkRange       ::slider_width      = 8
-  GtkRange       ::stepper_size      = 12
-  
-  GtkSpinButton  ::shadow-type       = 0
-    
-  GtkScale       ::slider-width      = 9
-  GtkScale       ::slider-length     = 18
-  
-  GtkScrollbar   ::min_slider_length = 30
-  GtkScrollbar   ::slider-width      = 12
-  
-  GtkCheckButton ::indicator_size    = 12
-  
-  GtkMenuBar     ::internal-padding  = 0
-  
-  GtkTreeView    ::expander_size     = 11
-  
-  GtkExpander    ::expander_size     = 11
-  
-  GtkComboBox    ::appears-as-list   = 0
-  GtkComboBox    ::arrow-size        = 10
-  GtkComboBox    ::shadow-type       = 0
- 
-	GtkNotebook    ::tab-curvature     = 0
-	
-	
-  xthickness = 1
-  ythickness = 1
-
-  fg[NORMAL]        = "#8c8c8c"  # Menu items and selected tab
-  fg[PRELIGHT]      = "#d0d0d0"  # unkown
-  fg[ACTIVE]        = "#676767"  # Inactive tabs
-  fg[SELECTED]      = "#40d040"  # unkown
-  fg[INSENSITIVE]   = "#2d2d2d"  # Inactive menu items and scrollbar buttons
-
-  bg[NORMAL]        = "#404040"  # main background, menu seperators
-  bg[PRELIGHT]      = "#505050"  # menu and controls on focus
-  bg[ACTIVE]        = "#404040"  # Inactive tabs, scrollbar empty region
-  bg[SELECTED]      = "#606060"  # selected picture background
-  bg[INSENSITIVE]   = "#404040"  # scrollbars insensitive buttons
-   
-  base[NORMAL]      = "#484848"  # control background
-  base[PRELIGHT]    = "#4d4d4d"  # unkown
-  base[ACTIVE]      = "#606060"  # selected Tree item
-  base[SELECTED]    = "#808080"  # background selected text
-  base[INSENSITIVE] = "#404040"  # unkown
-   
-  text[NORMAL]      = "#8c8c8c"  # innercontrol text
-  text[PRELIGHT]    = "#e0e0e0"  # unkown
-  text[ACTIVE]      = "#8c8c8c"  # selected Tee item text
-  text[SELECTED]    = "#101010"  # selected image text
-  text[INSENSITIVE] = "#101010"  # unkown
-  
-  engine "clearlooks"  {
-    sunkenmenubar     = 0       # 0 = disable, 1 = enable
-    menuitemstyle     = 0       # 0 = flat, 1 = 3d-ish (button)
-    listviewitemstyle = 0       # 0 = flat, 1 = 3d-ish (gradient)
-    progressbarstyle  = 0       # 0 = candy bar, 1 = flat
-  }
-}
-
-style "clearlooks-tasklist" = "clearlooks-default"
-{
-  xthickness = 5
-  ythickness = 3
-}
-
-style "clearlooks-menu" = "clearlooks-default"
-{
-  xthickness = 2
-  ythickness = 1
-}
-
-style "clearlooks-menu-item" = "clearlooks-default"
-{
-  xthickness = 1
-  ythickness = 1
-}
-
-style "clearlooks-menu-itembar" = "clearlooks-default"
-{
-  xthickness = 1
-  ythickness = 1
-}
-
-style "clearlooks-tree" = "clearlooks-default"
-{
-  xthickness = 1
-  ythickness = 1
-}
-
-style "clearlooks-frame-title" = "clearlooks-default"
-{
-  fg[NORMAL] = "#404040"
-}
-
-style "clearlooks-panel" = "clearlooks-default"
-{
-  xthickness = 3
-  ythickness = 3
-}
-
-style "clearlooks-tooltips" = "clearlooks-default"
-{
-  xthickness = 4
-  ythickness = 4
-  bg[NORMAL] = { 1.0,1.0,0.75 }
-}
-
-style "clearlooks-progressbar" = "clearlooks-default"
-{
-  xthickness = 1
-  ythickness = 0
-
-  fg[PRELIGHT]  = "#000000"
-}
-
-style "clearlooks-combo" = "clearlooks-default"
-{
-  xthickness = 0
-  ythickness = 0
-}
-
-class "GtkWidget" style "clearlooks-default"
-class "GtkButton" style "clearlooks-default"
-class "GtkRange" style "clearlooks-default"
-class "GtkFrame" style "clearlooks-default"
-class "GtkStatusbar" style "clearlooks-default"
-class "GtkMenu" style "clearlooks-menu"
-class "GtkMenuItem" style "clearlooks-menu-item"
-widget_class "*MenuItem.*" style "clearlooks-menu-item"
-class "GtkEntry" style "clearlooks-default"
-widget_class "*.tooltips.*.GtkToggleButton" style "clearlooks-tasklist"
-widget_class "*.GtkTreeView.GtkButton" style "clearlooks-tree"
-widget_class "*.GtkCTree.GtkButton" style "clearlooks-tree"
-widget_class "*.GtkList.GtkButton" style "clearlooks-tree"
-widget_class "*.GtkCList.GtkButton" style "clearlooks-tree"
-widget_class "*.GtkFrame.GtkLabel" style "clearlooks-frame-title"
-widget_class "BasePWidget.GtkEventBox.GtkTable.GtkFrame" style "clearlooks-panel"
-widget "gtk-tooltip" style "clearlooks-tooltips"
-class "GtkNotebook" style "clearlooks-default"
-class "GtkProgressBar" style "clearlooks-progressbar"
-widget_class "*.GtkComboBox.GtkButton" style "clearlooks-combo"
-widget_class "*.GtkCombo.GtkButton" style "clearlooks-combo"
diff --git a/rtdata/themes/Gray b/rtdata/themes/Gray
deleted file mode 100644
index c43833218..000000000
--- a/rtdata/themes/Gray
+++ /dev/null
@@ -1,236 +0,0 @@
-# DarknessReturns GTK+ Theme for Clearlooks GTK Engine
-# 
-# Created for CrunchBang Linux by Philip Newborough
-# http://crunchbang.org/projects/linux/
-# Copyright (C) 2008  Philip Newborough (aka corenominal)
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-style "clearlooks-default" {
-
-    GtkButton      ::default_border    = { 0, 0, 0, 0 }
-    GtkRange       ::trough_border     = 1
-    GtkPaned       ::handle_size       = 6
-    GtkRange       ::slider_width      = 12
-    GtkRange       ::stepper_size      = 12
-    GtkScrollbar   ::min_slider_length = 30
-    GtkCheckButton ::indicator_size    = 13
-    GtkMenuBar     ::internal-padding  = 0
-    GtkTreeView    ::expander_size     = 12
-    GtkExpander    ::expander_size     = 12
-
-    xthickness = 1
-    ythickness = 1
-
-    fg[NORMAL]        = "#101010" 
-    fg[PRELIGHT]      = "#101010" 
-    fg[ACTIVE]        = "#31353A" 
-    fg[SELECTED]      = "#B2B2B2" 
-    fg[INSENSITIVE]   = "#9E9C9E" 
-
-    bg[NORMAL]        = "#A1A1A1" 
-    bg[PRELIGHT]      = "#B2B2B2" 
-    bg[ACTIVE]        = "#B2B2B2" 
-    bg[SELECTED]      = "#31353A" 
-    bg[INSENSITIVE]   = "#B2B2B2" 
-
-    base[NORMAL]      = "#B2B2B2" 
-    base[PRELIGHT]    = "#31353A"
-    base[SELECTED]    = "#31353A" 
-    base[INSENSITIVE] = "#fbf8f1" 
-    base[ACTIVE]      = "#31353A" 
-    base[PRELIGHT]    = "#729fcf"
-
-    text[NORMAL]      = "#101010"
-    text[PRELIGHT]    = "#d0d0d0"
-    text[ACTIVE]      = "#E2E2E2"
-    text[SELECTED]    = "#E2E2E2"
-    text[INSENSITIVE] = "#E2E2E2"
-
-    engine "clearlooks" {
-        menubarstyle = 0
-    }
-}
-
-style "clearlooks-wide" = "clearlooks-default" {
-    xthickness = 3
-    ythickness = 3
-}
-
-style "clearlooks-text" = "clearlooks-default" {
-    #base[SELECTED]     = "#fc9747"  # Outline?
-}
-
-style "clearlooks-toolbar" = "clearlooks-default" {
-    bg[NORMAL] = "#A1A1A1"
-}
-
-style "clearlooks-tasklist" = "clearlooks-default" {
-    xthickness = 5
-    ythickness = 3
-}
-
-style "clearlooks-menu" = "clearlooks-default" {
-    xthickness = 2
-    ythickness = 2
-    bg[NORMAL] = "#A1A1A1"
-}
-
-style "clearlooks-menu-item" = "clearlooks-default" {
-    xthickness = 1
-    ythickness = 1
-    fg[PRELIGHT] = "#ffffff"
-    text[PRELIGHT] = "#ffffff"
-    base[PRELIGHT] = "#A1A1A1"
-}
-
-style "clearlooks-menu-itembar" = "clearlooks-default" {
-    xthickness = 0
-    ythickness = 0
-}
-
-style "clearlooks-tree" = "clearlooks-default" {
-    xthickness = 2
-    ythickness = 2
-    GtkTreeView::odd_row_color = "#f7f7ff"
-    GtkTreeView::even_row_color = "#ffffff"
-}
-
-style "clearlooks-frame-title" = "clearlooks-default" {
-    fg[NORMAL] = "#2a2a2a"
-}
-
-style "clearlooks-panel" = "clearlooks-default" {
-    xthickness = 3
-    ythickness = 3
-}
-
-style "clearlooks-tooltips" = "clearlooks-default" {
-    xthickness = 4
-    ythickness = 4
-    bg[NORMAL] = { 1.0,1.0,0.75 }
-}
-
-style "clearlooks-progressbar" = "clearlooks-default" {
-    xthickness = 1
-    ythickness = 1
-    fg[PRELIGHT]  = "#ffffff"
-}
-
-style "clearlooks-combo" = "clearlooks-default" {
-    xthickness = 2
-    ythickness = 0
-}
-
-style "clearlooks-button" = "clearlooks-wide" {
-    xthickness = 1
-    ythickness = 1
-    #bg[NORMAL] = "#31353A"
-    #bg[PRELIGHT] = "#555555"
-    #bg[NORMAL] = "#31353A"
-}
-style "clearlooks-check" = "clearlooks-button" {
-}
-
-style "clearlooks-panel" = "clearlooks-default" {
-    xthickness = 3
-    ythickness = 3
-}
-
-style "clearlooks-notebook" = "clearlooks-wide" {
-    base[SELECTED]      = "#A1A1A1"
-    bg[ACTIVE]        = "#A1A1A1"
-    base[PRELIGHT]    = "#A1A1A1"
-    bg[PRELIGHT]      = "#A1A1A1"
-}
-
-style "metacity-frame" {
-  bg[SELECTED]  = "#5c82b5"
-}
-
-style "clearlooks-slab" = "clearlooks-default" {
-    bg[SELECTED] = "#84b0da"
-    bg[NORMAL] = "#fdfbf7"
-    bg[ACTIVE] = "#e9eef5"
-    fg[NORMAL] = "#6a97c5"
-    fg[INSENSITIVE] = "#5c8dbf"
-}
-
-style "clearlooks-slab-group" = "clearlooks-default" {
-    #bg[SELECTED] = "#adc09b"  # Slab group text
-}
-
-style "clearlooks-shell" = "clearlooks-default" {
-    bg[ACTIVE] = "#e9eef5"      # Left side bg color
-    fg[NORMAL] = "#5c8dbf"      # Left side text color
-    fg[INSENSITIVE] = "#bdcce1" # Left side line
-
-    base[NORMAL] = "#fdfbf7"        # Base bg color
-    text[INSENSITIVE] = "#6a97c5"   # Base text color
-}
-
-style "evolution-hack" = "clearlooks-default" {
-    bg[ACTIVE]   = "#96b9d5"
-    bg[SELECTED] = "#6798cb"
-    fg[ACTIVE]   = "#000000"
-    fg[SELECTED] = "#ffffff"
-}
-
-style "clearlooks-shell-highlight" = "clearlooks-default" {
-}
-
-style "rox" = "clearlooks-default" {
-    bg[NORMAL] = "#ffffff"
-    bg[ACTIVE] = "#ffffff"
-    fg[NORMAL] = "#000000"
-    fg[ACTIVE] = "#000000"
-}
-
-class "GtkWidget" style "clearlooks-default"
-class "GtkButton" style "clearlooks-button"
-class "GtkCombo"  style "clearlooks-button"
-class "GtkRange"  style "clearlooks-wide"
-class "GtkFrame"  style "clearlooks-wide"
-class "GtkMenu"   style "clearlooks-menu"
-class "GtkEntry"  style "clearlooks-button"
-class "GtkMenuItem"    style "clearlooks-menu-item"
-class "GtkStatusbar"   style "clearlooks-wide"
-class "GtkNotebook"    style "clearlooks-notebook"
-class "GtkProgressBar" style "clearlooks-progressbar"
-class "GtkCheckButton" style "clearlooks-check"
-class "GtkRadioButton" style "clearlooks-check"
-
-widget_class "*MenuItem.*" style "clearlooks-menu-item"
-widget_class "*.GtkComboBox.GtkButton" style "clearlooks-combo"
-widget_class "*.GtkCombo.GtkButton"    style "clearlooks-combo"
-widget_class "*.tooltips.*.GtkToggleButton" style "clearlooks-tasklist"
-widget "gtk-tooltip" style "clearlooks-tooltips"
-widget_class "*.GtkTreeView.GtkButton" style "clearlooks-tree"
-widget_class "*.GtkCTree.GtkButton" style "clearlooks-tree"
-widget_class "*.GtkList.GtkButton" style "clearlooks-tree"
-widget_class "*.GtkCList.GtkButton" style "clearlooks-tree"
-widget_class "*.GtkFrame.GtkLabel" style "clearlooks-frame-title"
-widget_class "*.GtkNotebook.*.GtkEventBox" style "clearlooks-notebook"
-widget_class "*.GtkNotebook.*.GtkViewport" style "clearlooks-notebook"
-class "MetaFrames" style "metacity-frame"
-widget_class "BasePWidget.GtkEventBox.GtkTable.GtkFrame" style "clearlooks-panel"
-class "SlabWindow" style "clearlooks-slab"
-class "ShellWindow" style "clearlooks-shell"
-widget_class "ShellWindow.*.GtkEventBox" style "clearlooks-shell-highlight"
-widget_class "*GtkCTree*" style "evolution-hack"
-widget_class "*GtkList*" style "evolution-hack"
-widget_class "*GtkCList*" style "evolution-hack"
-widget_class "*.ETree.*" style "evolution-hack"
-widget_class "*Collection*" style "rox"
-
diff --git a/rtdata/themes/Gray Textured b/rtdata/themes/Gray Textured
deleted file mode 100644
index bdaa0d8be..000000000
--- a/rtdata/themes/Gray Textured	
+++ /dev/null
@@ -1,592 +0,0 @@
-#
-#   This file is part of RawTherapee.
-#
-#   Copyright (c) 2004-2010 Gabor Horvath <hgabor@rawtherapee.com>
-#
-#   RawTherapee is free software: you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation, either version 3 of the License, or
-#   (at your option) any later version.
-#
-#   RawTherapee is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-# Textured gray theme.  Based off of GM Looks (http://art.gnome.org/themes/gtk2/1163) and 
-# Cillop Midnite (http://art.gnome.org/themes/gtk2/1317), both of which are released under the GPL.
-# Modified by Wyatt Olson.
-
-# Sneaking through the code are we.? ;)
-
-style "clearlooks-default" {
-
-	GtkRange::trough_border = 0
-	GtkRange::slider_width = 14
-	GtkRange::stepper_size = 10
-
-	
-
-	GtkMenuItem::selected_shadow_type = out
-	GtkWidget::interior_focus = 1
-	GtkButton::default_border = { 1, 1, 1, 1 }
-	GtkButton::default_outside_border = { 0, 0, 0, 0 }
-	GtkRange::trough_border = 0
-	GtkWidget::focus_padding = 1
-	GtkPaned::handle_size = 6
-	GtkRange::slider_width = 15
-	GtkRange::stepper_size = 15
-	GtkScrollbar::min_slider_length = 30
-	GtkCheckButton::indicator_size = 12
-	GtkMenuBar::internal-padding = 0
-	#GtkOptionMenu::indicator_size = { 11, 6 }
-	#GtkOptionMenu::indicator_spacing = { 4, 5, 2, 2 }
-	GtkTreeView::expander_size = 14
-	GtkExpander::expander_size = 16
-	xthickness = 1
-	ythickness = 1
-	
-	fg[NORMAL]        = "#CACAC6"
-	fg[ACTIVE]        = "#CACAC6"
-	fg[INSENSITIVE]   = "#000000"
-	fg[PRELIGHT]      = "#E2E2E2"
-	fg[SELECTED]      = "#E2E2E2"
-
-	bg[ACTIVE]        = "#484949"
-	bg[NORMAL]        = "#5f5f5f"
-	bg[INSENSITIVE]   = "#505050"
-	bg[PRELIGHT]      = "#6A6C6F"
-	bg[SELECTED]      = "#797979"
-
-	base[NORMAL]      = "#646464"
-	base[ACTIVE]      = "#797979"
-	base[INSENSITIVE] = "#5f5f5f"
-	base[PRELIGHT]    = "#686868"
-	base[SELECTED]    = "#797979"
-
-	text[NORMAL]      = "#000000"
-	text[ACTIVE]      = "#000000"
-	text[PRELIGHT]    = "#000000"
-	text[SELECTED]    = "#d7d4c9"
-	text[INSENSITIVE] = "#777777"
-
-  engine "clearlooks"
-  {
-    contrast		= 1.1
-    menubarstyle	= 2
-    animation           = TRUE
-    #menuitemstyle	= 2
-    #progressbarstyle	= 0
-    style		= CLASSIC 
-  }
-}
-
-style "clearlooks-wide" = "clearlooks-default"
-{
-  xthickness = 2
-  ythickness = 2
-}
-
-style "clearlooks-notebook" = "clearlooks-wide"
-{
-  bg[NORMAL] = "#5f5f5f"
-}
-style "clearlooks-tasklist" = "clearlooks-default"
-{
-  xthickness = 5
-  ythickness = 3
-}
-
-style "clearlooks-menu" = "clearlooks-default"
-{
-  xthickness = 2
-  ythickness = 1
-}
-
-style "clearlooks-menu-item" = "clearlooks-default"
-{
-  xthickness = 2
-  ythickness = 3
-}
-
-style "clearlooks-menu-itembar" = "clearlooks-default"
-{
-  xthickness = 3
-  ythickness = 3
-}
-style "clearlooks-tree" = "clearlooks-default"
-{
-  xthickness = 2
-  ythickness = 2
-}
-
-style "clearlooks-frame-title" = "clearlooks-default"
-{
-  fg[NORMAL] = "#FFFFFF"
-}
-
-style "clearlooks-panel" = "clearlooks-default"
-{
-  xthickness = 3
-  ythickness = 3
-}
-
-style "clearlooks-tooltips" = "clearlooks-default"
-{
-  xthickness = 4
-  ythickness = 4
-  bg[NORMAL] = "#404040"
-}
-style "clearlooks-progressbar"          = "clearlooks-default"
-{
-  xthickness = 0
-  ythickness = 0
-  fg[PRELIGHT]  = "#000000"
-}
-
-style "clearlooks-combo" = "clearlooks-default"
-{
-  xthickness = 1
-  ythickness = 2
-}
-
-style "metacity-frame"
-{
-  # Normal base color
-  #bg[NORMAL]  = "#bbbbbb"
-
-  # Unfocused title background color
-  #bg[INSENSITIVE]  = { 0.8, 0.8, 0.8 }
-
-  # Unfocused title text color
-  #fg[INSENSITIVE]  = { 1.55, 1.55, 1.55 }
-
-  # Focused icon color
-  #fg[NORMAL]  = { 0.2, 0.2, 0.2 }
-
-  # Focused title background color
-  #bg[SELECTED]  = { 0.5, 0.8, 0.5 }
-
-  # Focused title text color
-  #fg[SELECTED]  = "black"
-}
-style "clearlooks-scale" = "clearooks-button"
-{
-	GtkRange::trough-side-details = 1
-}
-
-
-
-style "scrollbar" = "clearlooks-default"
-{
-
-  engine "pixmap" 
-  {
-    image 
-   {
-   function				= BOX
-      detail				= "trough"
-      file					= "gray_textured/trough2.png"
-      border				= { 6,6,6,6 }
-      stretch				= TRUE
-      orientation			= VERTICAL
-    }
-    image 
-    {
-      function				= BOX
-      detail				= "trough"
-      file					= "gray_textured/trough2-h.png"
-      border				= { 6,6,6,6 }
-      stretch				= TRUE
-      orientation			= HORIZONTAL
-    }
-    image 
-    {
-      function			= SLIDER
-      state           		= NORMAL
-      file				= "gray_textured/slider-h.png" 
-      border			= { 6,6,2,2 }
-      stretch				= TRUE
-      orientation			= HORIZONTAL
-	
-      
-	
-    }
-    image 
-    {
-      function			= SLIDER
-      state           		= PRELIGHT
-      file				= "gray_textured/slider-h-pre.png" 
-      border			= { 6,6,2,2 }
-      stretch				= TRUE
-      orientation			= HORIZONTAL
-      
-    }
-    image 
-    {
-      function			= SLIDER
-      state           		= INSENSITIVE
-      file				= "gray_textured/slider-h-ins.png"
-      border			= { 6,6,2,2 }
-      stretch				= TRUE
-      orientation			= HORIZONTAL
-    }
-    image 
-    {
-      function			= SLIDER
-      state           		= NORMAL
-      file				= "gray_textured/slider-v.png" 
-      border			= { 2, 2, 6, 6 }
-      stretch				= TRUE
-      orientation			= VERTICAL
-	
-	
-      
-    }
-    image 
-    {
-      function			= SLIDER
-      state           		= PRELIGHT
-      file				= "gray_textured/slider-v-pre.png" 
-      border			= { 2, 2, 6, 6 }
-      stretch				= TRUE
-      orientation			= VERTICAL
-	
-	
-    }
-    image 
-    {
-      function			= SLIDER
-      state           		= INSENSITIVE
-      file				= "gray_textured/slider-v-ins.png"
-      border			= { 2,2,6,6 }
-      stretch				= TRUE
-      orientation			= VERTICAL
-	
-    }
-    image 
-    {
-      function				= STEPPER
-      state					= NORMAL
-      file					= "gray_textured/null.png"
-      border				= { 1,1,4,4 }
-      stretch				= TRUE
-      arrow_direction		= UP
-      overlay_file			= "gray_textured/arrow-up.png"
-      overlay_stretch		= FALSE
-    }
-    image 
-    {
-      function				= STEPPER
-      state					= PRELIGHT
-      file					= "gray_textured/null.png"
-      border				= { 1,1,4,4 }
-      stretch				= TRUE
-      arrow_direction		= UP
-      overlay_file			= "gray_textured/arrow-up-pre.png"
-      overlay_stretch		= FALSE
-    }
-    image
-    {
-      function				= STEPPER
-      state					= ACTIVE
-      file					= "gray_textured/null.png"
-      border				= { 1,1,4,4 }
-      stretch				= TRUE
-      arrow_direction		= UP
-      overlay_file			= "gray_textured/arrow-up.png"
-      overlay_stretch		= FALSE
-    }
-    image 
-    {
-      function				= STEPPER
-      state					= INSENSITIVE
-      file					= "gray_textured/null.png"
-      border				= { 1,1,4,4 }
-      stretch				= TRUE
-      arrow_direction		= UP
-      overlay_file			= "gray_textured/arrow-up-ins.png"
-      overlay_stretch		= FALSE
-    }
-    image 
-    {
-      function				= STEPPER
-      state					= NORMAL
-      file					= "gray_textured/null.png"
-      border				= { 1,1,4,4 }
-      stretch				= TRUE
-      arrow_direction		= DOWN
-      overlay_file			= "gray_textured/arrow-down.png"
-      overlay_stretch		= FALSE
-    }
-    image 
-    {
-      function				= STEPPER
-      state					= PRELIGHT
-      file					= "gray_textured/null.png"
-      border				= { 1,1,4,4 }
-      stretch				= TRUE
-      arrow_direction		= DOWN
-      overlay_file			= "gray_textured/arrow-down-pre.png"
-      overlay_stretch		= FALSE
-    }
-    image
-    {
-      function				= STEPPER
-      state					= ACTIVE
-      file					= "gray_textured/null.png"
-      border				= { 1,1,4,4 }
-      stretch				= TRUE
-      arrow_direction		= DOWN
-      overlay_file			= "gray_textured/arrow-down.png"
-      overlay_stretch		= FALSE
-    }
-    image 
-    {
-      function				= STEPPER
-      state					= INSENSITIVE
-      file					= "gray_textured/null.png"
-      border				= { 1,1,4,4 }
-      stretch				= TRUE
-      arrow_direction		= DOWN
-      overlay_file			= "gray_textured/arrow-down-ins.png"
-      overlay_stretch		= FALSE
-    }
-    image 
-    {
-      function				= STEPPER
-      state					= NORMAL
-      file					= "gray_textured/null.png"
-      border				= { 4,4,1,1 }
-      stretch				= TRUE
-      arrow_direction		= RIGHT
-      overlay_file			= "gray_textured/arrow-right.png"
-      overlay_stretch		= FALSE
-    }
-    image 
-    {
-      function				= STEPPER
-      state					= PRELIGHT
-      file					= "gray_textured/null.png"
-      border				= { 4,4,1,1 }
-      stretch				= TRUE
-      arrow_direction		= RIGHT
-      overlay_file			= "gray_textured/arrow-right-pre.png"
-      overlay_stretch		= FALSE
-    }
-    image
-    {
-      function				= STEPPER
-      state					= ACTIVE
-      file					= "gray_textured/null.png"
-      border				= { 4,4,1,1 }
-      stretch				= TRUE
-      arrow_direction		= RIGHT
-      overlay_file			= "gray_textured/arrow-right.png"
-      overlay_stretch		= FALSE
-    }
-    image
-    {
-      function				= STEPPER
-      state					= INSENSITIVE
-      file					= "gray_textured/null.png"
-      border				= { 4,4,1,1 }
-      stretch				= TRUE
-      arrow_direction		= RIGHT
-      overlay_file			= "gray_textured/arrow-right-ins.png"
-      overlay_stretch		= FALSE
-    }
-    image 
-    {
-      function				= STEPPER
-      state					= NORMAL
-      file					= "gray_textured/null.png"
-      border				= { 4,4,1,1 }
-      stretch				= TRUE
-      arrow_direction		= LEFT
-      overlay_file			= "gray_textured/arrow-left.png"
-      overlay_stretch		= FALSE
-    }
-   image 
-    {
-      function				= STEPPER
-      state					= PRELIGHT
-      file					= "gray_textured/null.png"
-      border				= { 4,4,1,1 }
-      stretch				= TRUE
-      arrow_direction		= LEFT
-      overlay_file			= "gray_textured/arrow-left-pre.png"
-      overlay_stretch		= FALSE
-    }
-    image 
-    {
-      function				= STEPPER
-      state					= ACTIVE
-      file					= "gray_textured/null.png"
-      border				= { 4,4,1,1 }
-      stretch				= TRUE
-      arrow_direction		= LEFT
-      overlay_file			= "gray_textured/arrow-left.png"
-      overlay_stretch		= FALSE
-    }
-    image 
-    {
-      function				= STEPPER
-      state					= INSENSITIVE
-      file					= "gray_textured/null.png"
-      border				= { 4,4,1,1 }
-      stretch				= TRUE
-      arrow_direction		= LEFT
-      overlay_file			= "gray_textured/arrow-left-ins.png"
-      overlay_stretch		= FALSE
-    }
-  }
-}
-
-
-style "range" = "clearlooks-default"
-{
-  engine "pixmap" 
-  {
-# image
-# {
-#   function			= FOCUS
-#   file				= "gray_textured/null.png"
-#   stretch				= TRUE
-# }	
-    image 
-    {
-      function			= BOX
-      detail			= "trough"
-      file				= "gray_textured/pbtroughh.png"
-      border			= { 6, 6, 6, 6 }
-      stretch			= TRUE
-      orientation		= HORIZONTAL
-    }	
-    image 
-    {
-      function			= BOX
-      detail			= "trough"
-      file				= "gray_textured/pbtroughv.png"
-      border			= { 6, 6, 6, 6 }
-      stretch			= TRUE
-      orientation		= VERTICAL
-    }
-    image 
-    {
-      function		= SLIDER
-      state           	= NORMAL
-      file			= "gray_textured/rangeslider.png"
-      border		= { 6, 6, 6, 6 }
-      stretch		= TRUE
-      orientation	= HORIZONTAL
-	
-    }
-    image 
-    {
-      function		= SLIDER
-     state           	= PRELIGHT
-      file			= "gray_textured/rangeslider-pre.png"
-      border		= { 6, 6, 6, 6 }
-      stretch		= TRUE
-      orientation	= HORIZONTAL
-	
-    }
-    image 
-    {
-      function		= SLIDER
-      state           	= ACTIVE
-      file			= "gray_textured/rangeslider-pre.png"
-      border		= { 6, 6, 6, 6 }
-      stretch		= TRUE
-      orientation	= HORIZONTAL
-	
-    }
-    image 
-    {
-      function		= SLIDER
-      state           	= INSENSITIVE
-      file			= "gray_textured/rangeslider-ins.png"
-      border		= { 6, 6, 6, 6 }
-      stretch		= TRUE
-      orientation	= HORIZONTAL
-	
-    }
-    image 
-    {
-      function		= SLIDER
-      state           	= NORMAL
-      file			= "gray_textured/rangeslider.png"
-      border		= { 6, 6, 6, 6 }
-      stretch		= TRUE
-      orientation	= VERTICAL
-	
-    }
-    image 
-    {
-      function		= SLIDER
-     state           	= PRELIGHT
-      file			= "gray_textured/rangeslider-pre.png"
-      border		= { 6, 6, 6, 6 }
-      stretch		= TRUE
-      orientation	= VERTICAL
-	
-    }
-    image 
-    {
-      function		= SLIDER
-      state           	= ACTIVE
-      file			= "gray_textured/rangeslider-pre.png"
-      border		= { 6, 6, 6, 6 }
-      stretch		= TRUE
-      orientation	= VERTICAL
-	
-    }
-    image 
-    {
-      function		= SLIDER
-      state           	= INSENSITIVE
-      file			= "gray_textured/rangeslider-ins.png"
-      border		= { 6, 6, 6, 6 }
-      stretch		= TRUE
-      orientation	= VERTICAL
-
-    }
-  }
-}
-
-class "GtkWidget" style "clearlooks-default"
-class "GtkButton" style "clearlooks-wide"
-class "GtkRange" style "clearlooks-wide"
-class "GtkFrame" style "clearlooks-wide"
-class "GtkStatusbar" style "clearlooks-wide"
-class "GtkMenu" style "clearlooks-menu"
-class "GtkMenuItem" style "clearlooks-menu-item"
-widget_class "*.GtkMenuItem.*" style "clearlooks-menu-item"
-widget_class "*.GtkAccelMenuItem.*" style "clearlooks-menu-item"
-widget_class "*.GtkRadioMenuItem.*" style "clearlooks-menu-item"
-widget_class "*.GtkCheckMenuItem.*" style "clearlooks-menu-item"
-widget_class "*.GtkImageMenuItem.*" style "clearlooks-menu-item"
-widget_class "*.GtkSeparatorMenuItem.*" style "clearlooks-menu-item"
-class "GtkEntry" style "clearlooks-wide"
-widget_class "*.tooltips.*.GtkToggleButton" style "clearlooks-tasklist"
-widget_class "*.GtkTreeView.GtkButton" style "clearlooks-tree"
-widget_class "*.GtkCTree.GtkButton" style "clearlooks-tree"
-widget_class "*.GtkList.GtkButton" style "clearlooks-tree"
-widget_class "*.GtkCList.GtkButton" style "clearlooks-tree"
-widget_class "*.GtkFrame.GtkLabel" style "clearlooks-frame-title"
-widget_class "BasePWidget.GtkEventBox.GtkTable.GtkFrame" style "clearlooks-panel"
-widget "gtk-tooltips" style "clearlooks-tooltips"
-class "GtkNotebook" style "clearlooks-notebook"
-class "GtkProgressBar" style "clearlooks-progressbar"
-widget_class "*.GtkComboBox.GtkButton" style "clearlooks-combo"
-widget_class "*.GtkCombo.GtkButton" style "clearlooks-combo"
-class "MetaFrames" style "metacity-frame"
-
-
-class "GtkScrollbar"       			style "scrollbar"
-class "GtkRange"         			style "range"
diff --git a/rtdata/themes/Light b/rtdata/themes/Light
deleted file mode 100644
index 383034a59..000000000
--- a/rtdata/themes/Light
+++ /dev/null
@@ -1,168 +0,0 @@
-#
-#   This file is part of RawTherapee.
-#
-#   Copyright (c) 2004-2010 Gabor Horvath <hgabor@rawtherapee.com>
-#
-#   RawTherapee is free software: you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation, either version 3 of the License, or
-#   (at your option) any later version.
-#
-#   RawTherapee is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-# Based on Bluecurve
-# Created by Richard Stellingwerff, Emil Jacobs and Daniel Borgmann.
-
-
-style "clearlooks-default" {
-
-  GtkButton      ::default_border    = { 0, 0, 0, 0 }
-  GtkRange       ::trough_border     = 0
-  GtkPaned       ::handle_size       = 6
-  GtkRange       ::slider_width      = 12
-  GtkRange       ::stepper_size      = 12
-  GtkScrollbar   ::min_slider_length = 30
-  GtkCheckButton ::indicator_size    = 12
-  GtkMenuBar     ::internal-padding  = 0
-  GtkTreeView    ::expander_size     = 11
-  GtkExpander    ::expander_size     = 11
-
-  xthickness = 1
-  ythickness = 1
-
-  fg[NORMAL]        = "#101010" # very dark gray #101010
-  fg[PRELIGHT]      = "#101010" # dark grey
-  fg[ACTIVE]        = "#000000" # black
-  fg[SELECTED]      = "#ffffff" # white
-  fg[INSENSITIVE]   = "#b5b3ac" # dark beige / grey
-
-  bg[NORMAL]        = "#efebe7" # light beige / grey
-  bg[PRELIGHT]      = "#f5f3f0" # very light beige
-  bg[ACTIVE]        = "#d4cfca" # mid beige / grey
-  bg[SELECTED]      = "#7c99ad" # blueish
-  bg[INSENSITIVE]   = "#efebe7" # light beige / grey
-	
-  base[NORMAL]      = "#ffffff" # white
-  base[PRELIGHT]    = "#7c99ad" # blueish
-  base[ACTIVE]      = "#a29e8e" # dark beige / grey
-  base[SELECTED]    = "#7c99ad" # blueish
-  base[INSENSITIVE] = "#efebe7" #light beige / grey
-	
-  text[NORMAL]      = "#000000" # black
-  text[PRELIGHT]    = "#000000" # black
-  text[ACTIVE]      = "#ffffff" # white
-  text[SELECTED]    = "#ffffff" # white
-  text[INSENSITIVE] = "#b5b3ac" # dark beige / grey
-
-  engine "clearlooks"  {
-    sunkenmenubar     = 1       # 0 = disable, 1 = enable
-    menuitemstyle     = 0       # 0 = flat, 1 = 3d-ish (button)
-    listviewitemstyle = 0       # 0 = flat, 1 = 3d-ish (gradient)
-    progressbarstyle  = 0       # 0 = candy bar, 1 = flat
-  }
-}
-
-style "clearlooks-wide" = "clearlooks-default"
-{
-  xthickness = 1
-  ythickness = 1
-}
-
-style "clearlooks-notebook" = "clearlooks-wide"
-{
-  bg[NORMAL] = "#eae4df"
-}
-
-style "clearlooks-tasklist" = "clearlooks-default"
-{
-  xthickness = 5
-  ythickness = 3
-}
-
-style "clearlooks-menu" = "clearlooks-default"
-{
-  xthickness = 2
-  ythickness = 1
-  bg[NORMAL] = "#f8f5f2"
-}
-
-style "clearlooks-menu-item" = "clearlooks-default"
-{
-  xthickness = 1
-  ythickness = 1
-  fg[PRELIGHT] = "#ffffff"
-  text[PRELIGHT] = "#ffffff"
-}
-
-style "clearlooks-menu-itembar" = "clearlooks-default"
-{
-  xthickness = 1
-  ythickness = 1
-}
-
-style "clearlooks-tree" = "clearlooks-default"
-{
-  xthickness = 1
-  ythickness = 1
-}
-
-style "clearlooks-frame-title" = "clearlooks-default"
-{
-  fg[NORMAL] = "#404040"
-}
-
-style "clearlooks-panel" = "clearlooks-default"
-{
-  xthickness = 3
-  ythickness = 3
-}
-
-style "clearlooks-tooltips" = "clearlooks-default"
-{
-  xthickness = 4
-  ythickness = 4
-  bg[NORMAL] = { 1.0,1.0,0.75 }
-}
-
-style "clearlooks-progressbar" = "clearlooks-default"
-{
-  xthickness = 1
-  ythickness = 0
-
-  fg[PRELIGHT]  = "#ffffff"
-}
-
-style "clearlooks-combo" = "clearlooks-default"
-{
-  xthickness = 1
-  ythickness = 1
-}
-
-class "GtkWidget" style "clearlooks-default"
-class "GtkButton" style "clearlooks-wide"
-class "GtkRange" style "clearlooks-wide"
-class "GtkFrame" style "clearlooks-wide"
-class "GtkStatusbar" style "clearlooks-wide"
-class "GtkMenu" style "clearlooks-menu"
-class "GtkMenuItem" style "clearlooks-menu-item"
-widget_class "*MenuItem.*" style "clearlooks-menu-item"
-class "GtkEntry" style "clearlooks-wide"
-widget_class "*.tooltips.*.GtkToggleButton" style "clearlooks-tasklist"
-widget_class "*.GtkTreeView.GtkButton" style "clearlooks-tree"
-widget_class "*.GtkCTree.GtkButton" style "clearlooks-tree"
-widget_class "*.GtkList.GtkButton" style "clearlooks-tree"
-widget_class "*.GtkCList.GtkButton" style "clearlooks-tree"
-widget_class "*.GtkFrame.GtkLabel" style "clearlooks-frame-title"
-widget_class "BasePWidget.GtkEventBox.GtkTable.GtkFrame" style "clearlooks-panel"
-widget "gtk-tooltip" style "clearlooks-tooltips"
-class "GtkNotebook" style "clearlooks-notebook"
-class "GtkProgressBar" style "clearlooks-progressbar"
-widget_class "*.GtkComboBox.GtkButton" style "clearlooks-combo"
-widget_class "*.GtkCombo.GtkButton" style "clearlooks-combo"
diff --git a/rtdata/themes/Unity_Gray b/rtdata/themes/Unity_Gray
deleted file mode 100644
index b70e09ac4..000000000
--- a/rtdata/themes/Unity_Gray
+++ /dev/null
@@ -1,453 +0,0 @@
-# Set GtkSettings color scheme property.
-# This can be overriden (via an xsetting) with eg. the gnome-appearance-properties.
-gtk_color_scheme = "fg_color:#0A0A0A\nbg_color:#A1A1A1\nbase_color:#dddddd\ntext_color:#000\nselected_bg_color:#95B0DB\nselected_fg_color:#fff\ntooltip_bg_color:#F5F5B5\ntooltip_fg_color:#000"
-
-style "clearlooks-default"
-{
-	########
-	# Style Properties
-	########
-	GtkButton      ::child-displacement-x = 1
-	GtkButton      ::child-displacement-y = 1
-	GtkButton      ::default-border       = { 0, 0, 0, 0 }
-	GtkCheckButton ::indicator-size       = 14
-
-	GtkPaned       ::handle-size          = 6
-
-	GtkRange       ::trough-border        = 0
-	GtkRange       ::slider-width         = 15
-	GtkRange       ::stepper-size         = 15
-
-	GtkScale       ::slider-length        = 23
-	GtkScale       ::trough-side-details  = 1
-	GtkScrollbar   ::min-slider-length    = 30
-
-	GtkMenuBar     ::internal-padding     = 0
-	GtkExpander    ::expander-size        = 14
-	GtkToolbar     ::internal-padding     = 1
-	GtkTreeView    ::expander-size        = 12
-	GtkTreeView    ::vertical-separator   = 0
-
-	GtkMenu        ::horizontal-padding   = 0
-	GtkMenu        ::vertical-padding     = 0
-
-	# Glow the tasklist by changing the color, instead of overlaying it with a rectangle
-	WnckTasklist   ::fade-overlay-rect    = 0
-
-	xthickness = 1
-	ythickness = 1
-
-
-	fg[NORMAL]        = @fg_color
-	fg[PRELIGHT]      = @fg_color
-	fg[SELECTED]      = @selected_fg_color
-	fg[ACTIVE]        = @fg_color
-	fg[INSENSITIVE]   = darker (@bg_color)
-
-	bg[NORMAL]        = @bg_color
-	bg[PRELIGHT]      = shade (1.02, @bg_color)
-	bg[SELECTED]	  = @selected_bg_color
-	bg[INSENSITIVE]   = @bg_color
-	bg[ACTIVE]        = shade (0.9, @bg_color)
-
-	base[NORMAL]      = @base_color
-	base[PRELIGHT]    = shade (0.95, @bg_color)
-	base[ACTIVE]      = shade (0.9, @selected_bg_color)
-	base[SELECTED]    = @selected_bg_color
-	base[INSENSITIVE] = @bg_color
-
-	text[NORMAL]      = @text_color
-	text[PRELIGHT]    = @text_color
-	text[ACTIVE]      = @selected_fg_color
-	text[SELECTED]    = @selected_fg_color
-	text[INSENSITIVE] = darker (@bg_color)
-
-	engine "clearlooks" 
-	{
-		colorize_scrollbar = TRUE
-		reliefstyle        = 1
-		menubarstyle       = 2      # 0 = flat, 1 = sunken, 2 = flat gradient
-		toolbarstyle       = 1      # 0 = flat, 1 = enable effects
-		animation          = FALSE
-		style              = GUMMY
-		radius             = 4.0
-
-		# Set a hint to disable backward compatibility fallbacks.
-		hint = "use-hints"
-	}
-}
-
-style "clearlooks-wide"
-{
-	xthickness = 2
-	ythickness = 2
-}
-
-style "clearlooks-wider"
-{
-	xthickness = 3
-	ythickness = 3
-}
-
-style "clearlooks-button"
-{
-	xthickness   = 3
-	ythickness   = 3
-
-	bg[NORMAL]   = shade (1.07, @bg_color)
-	bg[PRELIGHT] = shade (1.09, @bg_color)
-	bg[ACTIVE]   = shade (0.85, @bg_color)
-
-	engine "clearlooks"
-	{
-		hint	= "scrollbar"
-		radius	= 5.0
-	}
-}
-
-style "clearlooks-notebook-bg"
-{
-	bg[NORMAL] = shade (1.05, @bg_color)
-	bg[ACTIVE] = shade (0.98, @bg_color)
-}
-
-style "clearlooks-notebook" = "clearlooks-notebook-bg"
-{
-	xthickness = 3
-	ythickness = 3
-}
-
-style "clearlooks-tasklist"
-{
-	xthickness = 5
-	ythickness = 3
-}
-
-style "clearlooks-menu"
-{
-	xthickness = 0
-	ythickness = 0
-
-	bg[NORMAL] = shade (1.09, @bg_color)
-
-	# Radius of the menu items (inside menus)
-	engine "clearlooks" 
-	{
-		radius = 0.0
-	}
-}
-
-style "clearlooks-menu-item"
-{
-	xthickness = 2
-	ythickness = 3
-
-	fg[PRELIGHT] = @selected_fg_color
-}
-
-style "clearlooks-separator-menu-item"
-{
-	GtkSeparatorMenuItem::horizontal-padding = 0
-	# We are setting the desired height by using wide-separators
-	# There is no other way to get the odd height ...
-	GtkWidget::wide-separators = 1
-	GtkWidget::separator-width = 1
-	GtkWidget::separator-height = 5
-	xthickness = 1
-	ythickness = 0
-}
-
-style "clearlooks-treeview"
-{
-	engine "clearlooks" {
-		hint = "treeview"
-	}
-}
-
-# Based on the default style so that the colors from the button
-# style are overriden again.
-style "clearlooks-treeview-header" = "clearlooks-default"
-{
-	xthickness = 2
-	ythickness = 1
-
-	bg[NORMAL]   = shade (1.07, @bg_color)
-
-	engine "clearlooks" {
-		hint = "treeview-header"
-	}
-}
-
-style "clearlooks-frame-title"
-{
-	fg[NORMAL] = lighter (@fg_color)
-}
-
-style "clearlooks-tooltips"
-{
-	xthickness = 4
-	ythickness = 4
-
-	bg[NORMAL] = @tooltip_bg_color
-	fg[NORMAL] = @tooltip_fg_color
-}
-
-style "clearlooks-progressbar"
-{
-	xthickness = 1
-	ythickness = 1
-
-	fg[PRELIGHT] = @selected_fg_color
-
-	engine "clearlooks"
-	{
-		# Explicitly set the radius, for progress
-		# bars inside menuitems
-		radius = 3.0
-
-		hint	= "progressbar"
-	}
-}
-
-style "clearlooks-statusbar"
-{
-	engine "clearlooks"
-	{
-		hint	= "statusbar"
-	}
-}
-
-style "clearlooks-comboboxentry"
-{
-	# NOTE:
-	# If you set the appears-as-list option on comboboxes in the theme
-	# you should set this hint on the combobox instead.
-	engine "clearlooks"
-	{
-		hint	= "comboboxentry"
-	}
-}
-
-style "clearlooks-spinbutton"
-{
-	engine "clearlooks"
-	{
-		hint	= "spinbutton"
-	}
-}
-
-style "clearlooks-scale-bg"
-{
-	bg[NORMAL]   = shade (1.07, @bg_color)
-	bg[PRELIGHT] = shade (1.09, @bg_color)
-}
-
-style "clearlooks-scale" = "clearlooks-scale-bg"
-{
-	engine "clearlooks"
-	{
-		hint	= "scale"
-	}
-}
-
-style "clearlooks-hscale" = "clearlooks-scale-bg"
-{
-	engine "clearlooks"
-	{
-		hint	= "hscale"
-	}
-}
-
-style "clearlooks-vscale" = "clearlooks-scale-bg"
-{
-	engine "clearlooks"
-	{
-		hint	= "vscale"
-	}
-}
-
-style "clearlooks-scrollbar"
-{
-	bg[NORMAL]   = shade (1.07, @bg_color)
-
-	engine "clearlooks"
-	{
-		hint	= "scrollbar"
-	}
-}
-
-style "clearlooks-hscrollbar"
-{
-	engine "clearlooks"
-	{
-		hint	= "hscrollbar"
-	}
-}
-
-style "clearlooks-vscrollbar"
-{
-	engine "clearlooks"
-	{
-		hint	= "vscrollbar"
-	}
-}
-
-style "clearlooks-toolbar"
-{
-	bg[NORMAL]   = shade (1.07, @bg_color)
-
-	engine "clearlooks" {
-		contrast = 1.16
-	}
-}
-
-style "clearlooks-menubar"
-{
-	engine "clearlooks"
-	{
-		contrast = 1.1
-		hint	= "menubar"
-	}
-}
-
-style "clearlooks-nautilus-location"
-{
-	bg[NORMAL] = mix(0.60, shade (1.05,@bg_color), @selected_bg_color)
-}
-
-
-#########################################
-# Matches
-#########################################
-
-# Clearlooks default style is applied to every widget
-class "GtkWidget"    style "clearlooks-default"
-
-# Increase the x/ythickness in some widgets
-class "GtkToolbar"   style "clearlooks-toolbar" 
-class "GtkRange"     style "clearlooks-wide"
-class "GtkFrame"     style "clearlooks-wide"
-class "GtkSeparator" style "clearlooks-wide"
-class "GtkEntry"     style "clearlooks-wider"
-
-class "GtkSpinButton"  style "clearlooks-spinbutton"
-class "GtkScale"       style "clearlooks-scale"
-class "GtkVScale"      style "clearlooks-vscale"
-class "GtkHScale"      style "clearlooks-hscale"
-class "GtkScrollbar"   style "clearlooks-scrollbar"
-class "GtkVScrollbar"  style "clearlooks-vscrollbar"
-class "GtkHScrollbar"  style "clearlooks-hscrollbar"
-
-# General matching following, the order is choosen so that the right styles override each other
-# eg. progressbar needs to be more important then the menu match.
-
-# This is not perfect, it could be done better
-# (That is modify *every* widget in the notebook, and change those back that
-# we really don't want changed)
-widget_class "*<GtkNotebook>*<GtkEventBox>"     style "clearlooks-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkDrawingArea>"  style "clearlooks-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkLayout>"       style "clearlooks-notebook-bg"
-
-widget_class "*<GtkButton>"      style "clearlooks-button"
-widget_class "*<GtkNotebook>"    style "clearlooks-notebook"
-widget_class "*<GtkStatusbar>*"  style "clearlooks-statusbar"
-
-widget_class "*<GtkComboBoxEntry>*" style "clearlooks-comboboxentry"
-widget_class "*<GtkCombo>*"         style "clearlooks-comboboxentry"
-
-widget_class "*<GtkMenuBar>*"           style "clearlooks-menubar"
-widget_class "*<GtkMenu>*"              style "clearlooks-menu"
-widget_class "*<GtkMenuItem>*"          style "clearlooks-menu-item"
-widget_class "*<GtkSeparatorMenuItem>*" style "clearlooks-separator-menu-item"
-
-widget_class "*.<GtkFrame>.<GtkLabel>" style "clearlooks-frame-title"
-widget_class "*.<GtkTreeView>*"        style "clearlooks-treeview"
-
-widget_class "*<GtkProgressBar>"       style "clearlooks-progressbar"
-
-# Treeview header
-widget_class "*.<GtkTreeView>.<GtkButton>" style "clearlooks-treeview-header"
-widget_class "*.<GtkCTree>.<GtkButton>"    style "clearlooks-treeview-header"
-widget_class "*.<GtkList>.<GtkButton>"     style "clearlooks-treeview-header"
-widget_class "*.<GtkCList>.<GtkButton>"    style "clearlooks-treeview-header"
-
-# Workarounds for Evolution
-widget_class "*.ETable.ECanvas"    style "clearlooks-treeview-header"
-widget_class "*.ETree.ECanvas"    style "clearlooks-treeview-header"
-
-# The window of the tooltip is called "gtk-tooltip"
-################################
-# FIXME:
-# This will not work if one embeds eg. a button into the tooltip.
-# As far as I can tell right now we will need to rework the theme
-# quite a bit to get this working correctly.
-# (It will involve setting different priorities, etc.)
-################################
-widget "gtk-tooltip*" style "clearlooks-tooltips"
-
-###################################################
-# Special cases and work arounds
-###################################################
-
-# Special case the nautilus-extra-view-widget
-# ToDo: A more generic approach for all applications that have a widget like this.
-widget "*.nautilus-extra-view-widget" style : highest "clearlooks-nautilus-location"
-
-# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
-# Note that the work around assumes that the combobox is _not_ in
-# appears-as-list mode.
-# Similar hack also in the menuitem style.
-# This style does not affect GtkComboBoxEntry, it does have an effect
-# on comboboxes in appears-as-list mode though.
-style "clearlooks-text-is-fg-color-workaround"
-{
-	text[NORMAL]      = @fg_color
-	text[PRELIGHT]    = @fg_color
-	text[SELECTED]    = @selected_fg_color
-	text[ACTIVE]      = @fg_color
-	text[INSENSITIVE] = darker (@bg_color)
-}
-widget_class "*.<GtkComboBox>.<GtkCellView>"   style "clearlooks-text-is-fg-color-workaround"
-
-style "clearlooks-menuitem-text-is-fg-color-workaround"
-{
-	text[NORMAL]        = @fg_color
-	text[PRELIGHT]      = @selected_fg_color
-	text[SELECTED]      = @selected_fg_color
-	text[ACTIVE]        = @fg_color
-	text[INSENSITIVE]   = darker (@bg_color)
-}
-widget "*.gtk-combobox-popup-menu.*"   style "clearlooks-menuitem-text-is-fg-color-workaround"
-
-# Work around the usage of GtkLabel inside GtkListItems to display text.
-# This breaks because the label is shown on a background that is based on the
-# base color set.
-style "clearlooks-fg-is-text-color-workaround"
-{
-	fg[NORMAL]      = @text_color
-	fg[PRELIGHT]    = @text_color
-	fg[ACTIVE]      = @selected_fg_color
-	fg[SELECTED]    = @selected_fg_color
-	fg[INSENSITIVE] = darker (@bg_color)
-}
-widget_class "*<GtkListItem>*" style "clearlooks-fg-is-text-color-workaround"
-# The same problem also exists for GtkCList and GtkCTree
-# Only match GtkCList and not the parent widgets, because that would also change the headers.
-widget_class "*<GtkCList>" style "clearlooks-fg-is-text-color-workaround"
-
-# Work around the evolution "New" button bug by making the toolbar flat.
-# http://bugzilla.gnome.org/show_bug.cgi?id=446953
-# Maybe remove this workaround in unstable releases.
-style "clearlooks-evo-new-button-workaround"
-{
-	GtkMenuBar     ::shadow-type          = GTK_SHADOW_NONE
-	GtkToolbar     ::shadow-type          = GTK_SHADOW_NONE
-
-	bg[NORMAL]      = @bg_color
-
-	engine "clearlooks"
-	{
-		toolbarstyle = 0
-	}
-}
-widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "clearlooks-evo-new-button-workaround"
diff --git a/rtdata/themes/slim b/rtdata/themes/slim
new file mode 100644
index 000000000..0d4cbd0ab
--- /dev/null
+++ b/rtdata/themes/slim
@@ -0,0 +1,131 @@
+#
+#  This file is part of RawTherapee.
+#
+#  Copyright (c) 2004-2011 Gabor Horvath <hgabor@rawtherapee.com>
+#
+#  RawTherapee is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+# 
+#  RawTherapee is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# Please keep this gtkrc in sync with the other ones from Clearlooks based themes.
+
+gtk-color-scheme = "salt_pinch:#95B0DB\nbase_color:#dddddd\nfg_color:#0A0A0A\ntooltip_fg_color:#000000\nselected_bg_color:#95B0DB\nselected_fg_color:#FFFFFF\ntext_color:#000000\nbg_color:#A1A1A1\ntooltip_bg_color:#F5F5B5"
+
+style "clearlooks-default" {
+	xthickness = 1
+	ythickness = 1
+
+	#######################
+	# Style Properties
+	#######################
+	GtkButton::child-displacement-x = 0
+	GtkButton::child-displacement-y = 0
+	GtkButton::default-border = { 0, 0, 0, 0 }
+	GtkButton::image-spacing = 1
+	GtkToolButton::icon-spacing = 1
+
+	GtkCheckButton::indicator-size = 12
+
+	GtkPaned::handle-size = 3
+
+	GtkRange::slider-width = 12
+	GtkRange::stepper-size = 12
+
+	GtkScale::slider-width = 8
+	GtkScrollbar::slider-width = 12
+
+	GtkMenuBar::internal-padding = 0
+	GtkExpander::expander-size = 11
+	GtkExpander::expander-spacing = 0
+	GtkToolbar::internal-padding = 0
+	GtkTreeView::expander-size = 10
+
+	GtkMenu::horizontal-padding = 0
+	GtkMenu::vertical-padding = 0
+
+	GtkNotebook::tab-curvature = 0
+	
+	GtkEntry::progress-border = { 2, 2, 2, 2 }
+
+}
+
+style "wide" {
+	xthickness = 1
+	ythickness = 1
+}
+
+style "wider" {
+	xthickness = 2
+	ythickness = 2
+}
+
+style "entry" {
+	xthickness = 1
+	ythickness = 1
+}
+style "scale" {
+	xthickness = 1
+	ythickness = 1
+}
+
+style "scrollbar" {
+	xthickness = 1
+	ythickness = 1
+}
+
+style "button" {
+	xthickness = 0
+	ythickness = 0
+}
+
+# The color is changed by the notebook_bg style, this style
+# changes the x/ythickness
+style "notebook" {
+	xthickness = 1
+	ythickness = 1
+}
+
+
+style "menu" {
+	xthickness = 0
+	ythickness = 0
+}
+
+style "menu_item" {
+	xthickness = 2
+	ythickness = 3
+}
+
+# This style is there to modify the separator menu items. The goals are:
+# 1. Get a specific height.
+# 2. The line should go to the edges (ie. no border at the left/right)
+style "separator_menu_item" {
+	xthickness = 1
+	ythickness = 0
+
+	GtkSeparatorMenuItem::horizontal-padding = 0
+	GtkWidget::separator-height = 5
+}
+
+# The almost useless progress bar style
+style "progressbar" {
+	xthickness = 1
+	ythickness = 1
+}
+
+# This style is based on the clearlooks-default style, so that the colors from the button
+# style are overriden again.
+style "treeview_header" {
+	xthickness = 2
+	ythickness = 1
+}
diff --git a/rtgui/main.cc b/rtgui/main.cc
index f253f399f..12ff61495 100644
--- a/rtgui/main.cc
+++ b/rtgui/main.cc
@@ -114,7 +114,9 @@ int main(int argc, char **argv)
    if (!options.useSystemTheme)
    {
        std::vector<Glib::ustring> rcfiles;
-       rcfiles.push_back (argv0+"/themes/"+options.theme);
+       rcfiles.push_back (argv0+"/themes/"+options.theme+".gtkrc");
+   	   if (options.slimUI)
+           rcfiles.push_back (argv0+"/themes/slim");
        // Set the font face and size
        Gtk::RC::parse_string (Glib::ustring::compose(
           "style \"clearlooks-default\" { font_name = \"%1\" }", options.font));
diff --git a/rtgui/mydiagonalcurve.cc b/rtgui/mydiagonalcurve.cc
index 8843958b5..4c8ec026a 100644
--- a/rtgui/mydiagonalcurve.cc
+++ b/rtgui/mydiagonalcurve.cc
@@ -128,15 +128,13 @@ void MyDiagonalCurve::draw (int handle) {
     if (prevInnerHeight != innerHeight || (int)point.size() != innerWidth)
         interpolate ();
 
-    Gtk::StateType state = Gtk::STATE_NORMAL;
-    if (!is_sensitive())
-        state = Gtk::STATE_INSENSITIVE;
+    Gtk::StateType state = !is_sensitive() ? Gtk::STATE_INSENSITIVE : Gtk::STATE_NORMAL;
 
     Glib::RefPtr<Gtk::Style> style = get_style ();
     Cairo::RefPtr<Cairo::Context> cr = pixmap->create_cairo_context();
 
     // bounding rectangle
-    Gdk::Color c = style->get_bg (state);
+    Gdk::Color c = style->get_bg (Gtk::STATE_NORMAL);
     cr->set_source_rgb (c.get_red_p(), c.get_green_p(), c.get_blue_p());
     cr->rectangle (0, 0, innerWidth + RADIUS*2, innerHeight + RADIUS*2);
     cr->fill ();
@@ -147,21 +145,22 @@ void MyDiagonalCurve::draw (int handle) {
         unsigned int histheight = 0;
         for (int i=0; i<256; i++)
             if (bghist[i]>histheight)
-	            histheight = bghist[i];
+                histheight = bghist[i];
         // draw histogram
         cr->set_line_width (1.0);
         double stepSize = (innerWidth-1) / 256.0;
         cr->move_to (RADIUS, innerHeight-1+RADIUS);
-        cr->set_source_rgb (0.75, 0.75, 0.75);
+        c = style->get_fg (Gtk::STATE_INSENSITIVE);
+        cr->set_source_rgb (c.get_red_p(), c.get_green_p(), c.get_blue_p());
         for (int i=0; i<256; i++) {
             double val = bghist[i] * (double)(innerHeight-2) / (double)histheight;
             if (val>innerHeight-1)
                 val = innerHeight-1;
-      	    if (i>0)
-       	        cr->line_to (i*stepSize+RADIUS, innerHeight-1+RADIUS-val);
-    	}
+            if (i>0)
+                cr->line_to (i*stepSize+RADIUS, innerHeight-1+RADIUS-val);
+        }
         cr->line_to (innerWidth-1+RADIUS, innerHeight-1+RADIUS);
-    	cr->fill ();
+        cr->fill ();
     }
 
     // draw the grid lines:
@@ -178,6 +177,8 @@ void MyDiagonalCurve::draw (int handle) {
     cr->stroke ();
 
     // draw f(x)=x line
+    //c = style->get_light (state);
+    c = style->get_fg (state);
     if (snapToElmt == -2)
         cr->set_source_rgb (1.0, 0.0, 0.0);
     else
@@ -212,31 +213,31 @@ void MyDiagonalCurve::draw (int handle) {
         std::valarray<double> ch_ds (1);
         ch_ds[0] = 2;
         cr->set_dash (ch_ds, 0);
-        cr->set_source_rgb (0.0, 0.0, 0.0);
+        cr->set_source_rgb (c.get_red_p(), c.get_green_p(), c.get_blue_p());
         std::vector<double> points = getPoints();
         nbPoints = ((int)points.size()-1)/2;
         for (unsigned int i = 1; i < nbPoints; i++) {
-        	int pos = i*2+1;
+            int pos = i*2+1;
 
-        	double x1 = ((innerWidth-1) * points[pos-2] + 0.5)+RADIUS;    // project (curve.x[i], 0, 1, innerWidth);
-			double y1 = innerHeight - ((innerHeight-1) * points[pos-1] + 0.5)+RADIUS; // project (curve.y[i], 0, 1, innerHeight);
-			double x2 = ((innerWidth-1) * points[pos] + 0.5)+RADIUS;    // project (curve.x[i], 0, 1, innerWidth);
-			double y2 = innerHeight - ((innerHeight-1) * points[pos+1] + 0.5)+RADIUS; // project (curve.y[i], 0, 1, innerHeight);
+            double x1 = ((innerWidth-1) * points[pos-2] + 0.5)+RADIUS;    // project (curve.x[i], 0, 1, innerWidth);
+            double y1 = innerHeight - ((innerHeight-1) * points[pos-1] + 0.5)+RADIUS; // project (curve.y[i], 0, 1, innerHeight);
+            double x2 = ((innerWidth-1) * points[pos] + 0.5)+RADIUS;    // project (curve.x[i], 0, 1, innerWidth);
+            double y2 = innerHeight - ((innerHeight-1) * points[pos+1] + 0.5)+RADIUS; // project (curve.y[i], 0, 1, innerHeight);
 
-			// set the color of the line when the point is snapped to the cage
-			if (curve.x.size() == nbPoints && snapToElmt >= 1000 && ((i == (snapToElmt-1000)) || (i == (snapToElmt-999))))
-				cr->set_source_rgb (1.0, 0.0, 0.0);
-			else
-				cr->set_source_rgb (0.0, 0.0, 0.0);
-			cr->move_to (x1, y1);
-			cr->line_to (x2, y2);
-			cr->stroke ();
+            // set the color of the line when the point is snapped to the cage
+            if (curve.x.size() == nbPoints && snapToElmt >= 1000 && ((i == (snapToElmt-1000)) || (i == (snapToElmt-999))))
+                cr->set_source_rgb (1.0, 0.0, 0.0);
+            else
+                cr->set_source_rgb (c.get_red_p(), c.get_green_p(), c.get_blue_p());
+            cr->move_to (x1, y1);
+            cr->line_to (x2, y2);
+            cr->stroke ();
         }
         cr->unset_dash ();
     }
 
     // draw curve
-    cr->set_source_rgb (0.0, 0.0, 0.0);
+    cr->set_source_rgb (c.get_red_p(), c.get_green_p(), c.get_blue_p());
     cr->move_to (point[0].get_x(), point[0].get_y());
     for (int i=1; i<(int)point.size(); i++)
         cr->line_to (point[i].get_x(), point[i].get_y());
@@ -245,16 +246,20 @@ void MyDiagonalCurve::draw (int handle) {
     // draw bullets
     if (curve.type!=DCT_Parametric)
         for (int i = 0; i < (int)curve.x.size(); ++i) {
-        	if (curve.x[i] == -1) continue;
-        	if (snapToElmt >= 1000) {
-        		int pt = snapToElmt-1000;
-        		if (i >= (pt-1) && i <= (pt+1))
-        			cr->set_source_rgb(1.0, 0.0, 0.0);
-        		else
-        			cr->set_source_rgb(0.0, 0.0, 0.0);
-        	}
-        	else
-        		cr->set_source_rgb ((i == handle || i == snapToElmt ? 1.0 : 0.0), 0.0, 0.0);
+            if (curve.x[i] == -1) continue;
+            if (snapToElmt >= 1000) {
+                int pt = snapToElmt-1000;
+                if (i >= (pt-1) && i <= (pt+1))
+                    cr->set_source_rgb(1.0, 0.0, 0.0);
+                else
+                    cr->set_source_rgb (c.get_red_p(), c.get_green_p(), c.get_blue_p());
+            }
+            else {
+                if (i == handle || i == snapToElmt)
+                    cr->set_source_rgb (1.0, 0.0, 0.0);
+                else
+                    cr->set_source_rgb (c.get_red_p(), c.get_green_p(), c.get_blue_p());
+            }
 
             double x = ((innerWidth-1) * curve.x[i] + 0.5)+RADIUS;    // project (curve.x[i], 0, 1, innerWidth);
             double y = innerHeight - ((innerHeight-1) * curve.y[i] + 0.5)+RADIUS; // project (curve.y[i], 0, 1, innerHeight);
diff --git a/rtgui/myflatcurve.cc b/rtgui/myflatcurve.cc
index d96cd192a..a0af94bc6 100644
--- a/rtgui/myflatcurve.cc
+++ b/rtgui/myflatcurve.cc
@@ -108,15 +108,13 @@ void MyFlatCurve::draw () {
 
     }
 
-    Gtk::StateType state = Gtk::STATE_NORMAL;
-    if (!is_sensitive())
-        state = Gtk::STATE_INSENSITIVE;
+    Gtk::StateType state = !is_sensitive() ? Gtk::STATE_INSENSITIVE : Gtk::STATE_NORMAL;
 
     Glib::RefPtr<Gtk::Style> style = get_style ();
     Cairo::RefPtr<Cairo::Context> cr = pixmap->create_cairo_context();
 
     // bounding rectangle
-    Gdk::Color c = style->get_bg (state);
+    Gdk::Color c = style->get_bg (Gtk::STATE_NORMAL);
     cr->set_source_rgb (c.get_red_p(), c.get_green_p(), c.get_blue_p());
     cr->rectangle (0, 0, innerWidth+RADIUS*2+1.5, innerHeight+RADIUS*2+1.5);
     cr->fill ();
@@ -132,7 +130,8 @@ void MyFlatCurve::draw () {
         cr->set_line_width (1.0);
         double stepSize = (innerWidth-1) / 256.0;
         cr->move_to (RADIUS, innerHeight-1+RADIUS);
-        cr->set_source_rgb (0.75, 0.75, 0.75);
+        c = style->get_fg (Gtk::STATE_INSENSITIVE);
+        cr->set_source_rgb (c.get_red_p(), c.get_green_p(), c.get_blue_p());
         for (int i=0; i<256; i++) {
             double val = bghist[i] * (double)(innerHeight-2) / (double)histheight;
             if (val>innerHeight-1)
@@ -174,6 +173,7 @@ void MyFlatCurve::draw () {
     cr->stroke ();
 
     // draw f(x)=0.5 line
+    c = style->get_fg (state);
     cr->set_source_rgb (c.get_red_p(), c.get_green_p(), c.get_blue_p());
     std::valarray<double> ds (1);
     ds[0] = 4;
@@ -270,6 +270,7 @@ void MyFlatCurve::draw () {
         bool crossingTheFrame;
 
         // left handle is yellow
+        // TODO: finding a way to set the left handle color for flat curve editor
         cr->set_source_rgb (1.0, 1.0, 0.0);
 
         // draw tangential vectors
@@ -303,6 +304,7 @@ void MyFlatCurve::draw () {
         cr->fill();
 
         // right handle is blue
+        // TODO: finding a way to set the right handle color for flat curve editor
         cr->set_source_rgb (0.0, 0.0, 1.0);
 
         // draw tangential vectors
@@ -337,7 +339,7 @@ void MyFlatCurve::draw () {
     }
 
     // draw curve
-    cr->set_source_rgb (0.0, 0.0, 0.0);
+    cr->set_source_rgb (c.get_red_p(), c.get_green_p(), c.get_blue_p());
     cr->move_to (point[0].get_x(), point[0].get_y());
     for (int i=1; i<(int)point.size(); i++)
         cr->line_to (point[i].get_x(), point[i].get_y());
@@ -361,7 +363,7 @@ void MyFlatCurve::draw () {
                 else if (curve.y[i] == 0.5)
                     cr->set_source_rgb (0.0, 0.5, 0.0);
                 else
-                    cr->set_source_rgb (0.0, 0.0, 0.0);
+                    cr->set_source_rgb (c.get_red_p(), c.get_green_p(), c.get_blue_p());
                 double x = (double)RADIUS+0.5 + (double)innerWidth * curve.x[i];    // project (curve.x[i], 0, 1, innerWidth);
                 double y = (double)RADIUS+0.5 + (double)innerHeight * (1.-curve.y[i]); // project (curve.y[i], 0, 1, innerHeight);
 
diff --git a/rtgui/options.cc b/rtgui/options.cc
index b1f5a7f66..e11b14e50 100644
--- a/rtgui/options.cc
+++ b/rtgui/options.cc
@@ -99,7 +99,8 @@ void Options::setDefaults () {
     language = DefaultLanguage;
     lastSaveAsPath = "";
     overwriteOutputFile = false;		// if TRUE, existing output JPGs/PNGs are overwritten, instead of adding ..-1.jpg, -2.jpg etc.
-    theme = "Dark";
+    theme = "17-Gray-Red";
+    slimUI = false;		// TODO: Should this be TRUE for worst case screen resolution or FALSE for nicer interface by default ???
     useSystemTheme = true;
     maxThumbnailHeight = 400;
     maxCacheEntries = 20000;			// was 10000
@@ -211,6 +212,7 @@ if (keyFile.has_group ("General")) {
     if (keyFile.has_key ("General", "Version"))          version         = keyFile.get_string ("General", "Version");
     if (keyFile.has_key ("General", "Language"))         language        = keyFile.get_string ("General", "Language");
     if (keyFile.has_key ("General", "Theme"))            theme           = keyFile.get_string ("General", "Theme");
+    if (keyFile.has_key ("General", "SlimUI"))           slimUI          = keyFile.get_boolean ("General", "SlimUI");
     if (keyFile.has_key ("General", "UseSystemTheme"))   useSystemTheme  = keyFile.get_boolean ("General", "UseSystemTheme");
     if (keyFile.has_key ("General", "FirstRun"))         firstRun        = keyFile.get_boolean ("General", "FirstRun");
     if( keyFile.has_key ("General", "DarkFramesPath"))   rtSettings.darkFramesPath = keyFile.get_string("General", "DarkFramesPath");
@@ -365,6 +367,7 @@ int Options::saveToFile (Glib::ustring fname) {
     keyFile.set_boolean ("General", "MultiUser", multiUser);
     keyFile.set_string  ("General", "Language", language);
     keyFile.set_string  ("General", "Theme", theme);
+    keyFile.set_boolean ("General", "SlimUI", slimUI);
     keyFile.set_boolean ("General", "UseSystemTheme", useSystemTheme);
     keyFile.set_string  ("General", "Version", VERSION);
     keyFile.set_boolean ("General", "FirstRun", false);
diff --git a/rtgui/options.h b/rtgui/options.h
index 976c82d0f..db604bd71 100644
--- a/rtgui/options.h
+++ b/rtgui/options.h
@@ -101,6 +101,7 @@ class Options {
     int bgcolor;
     Glib::ustring language;
     Glib::ustring theme;
+    bool slimUI;
     bool useSystemTheme;
     static Glib::ustring cacheBaseDir;
     bool autoSuffix;
diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc
index b880602d6..7856505d0 100644
--- a/rtgui/preferences.cc
+++ b/rtgui/preferences.cc
@@ -36,8 +36,12 @@ Preferences::Preferences  (RTWindow *rtwindow):parent(rtwindow)  {
 
     moptions.copyFrom (&options);
 
-    // Do not increase height, since it's not visible on e.g. smaller netbook screens
-    // Default height is about 550 pixels, that's why we do not set the height anymore
+    /*
+     * Do not increase height, since it's not visible on e.g. smaller netbook screens
+     * Default height is about 620 pixels actually, that's why we do not set the height anymore
+     * Netbook users will most certainly set a smaller font and use the "slimUI" mode,
+     * so they'll be able to shrink the pref window and close it.
+     */
     set_size_request (650, -1);
     set_default_size (options.preferencesWidth, options.preferencesHeight);
     set_border_width(4);
@@ -439,7 +443,7 @@ Gtk::Widget* Preferences::getGeneralPanel () {
     theme->append_text (Glib::ustring("(")+M("PREFERENCES_GTKTHEME")+")");
     theme->set_active (0);
     std::vector<Glib::ustring> themes;
-    parseDir (argv0 + "/themes", themes, "");
+    parseDir (argv0 + "/themes", themes, ".gtkrc");
     for (int i=0; i<themes.size(); i++) 
         theme->append_text (themes[i]);
 
@@ -452,10 +456,14 @@ Gtk::Widget* Preferences::getGeneralPanel () {
     hbtheme->pack_start (*theme);
     hbtheme->pack_start (*fontlab, Gtk::PACK_SHRINK, 0);
     hbtheme->pack_start (*fontbutton);
-    vbftheme->pack_end(*hbtheme, Gtk::PACK_SHRINK, 0);
+    vbftheme->pack_start(*hbtheme, Gtk::PACK_SHRINK, 0);
+
+    slimUI = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_SLIMUI")) );
+    vbftheme->pack_start(*slimUI, Gtk::PACK_SHRINK, 0);
+
     ftheme->add (*vbftheme);
     mvbsd->pack_start (*ftheme, Gtk::PACK_SHRINK, 0);
-  
+
 //-----
 
     Gtk::HBox* hbcd = Gtk::manage( new Gtk::HBox () );
@@ -592,6 +600,7 @@ Gtk::Widget* Preferences::getGeneralPanel () {
     mvbsd->set_border_width (4);
 
     tconn = theme->signal_changed().connect( sigc::mem_fun(*this, &Preferences::themeChanged) );
+    sconn = slimUI->signal_clicked().connect( sigc::mem_fun(*this, &Preferences::themeChanged) );
     fconn = fontbutton->signal_font_set().connect( sigc::mem_fun(*this, &Preferences::fontChanged) );
     usethcon = chUseSystemTheme->signal_clicked ().connect( sigc::mem_fun(*this, &Preferences::useThemeChanged) );
     
@@ -835,6 +844,7 @@ void Preferences::storePreferences () {
     moptions.shadowThreshold = (int)shThresh->get_value ();
     moptions.language        = languages->get_active_text ();
     moptions.theme           = theme->get_active_text ();
+    moptions.slimUI          = slimUI->get_active ();
     moptions.useSystemTheme  = chUseSystemTheme->get_active ();
      
     Gdk::Color cropCol=butCropCol->get_color();
@@ -931,6 +941,7 @@ void Preferences::storePreferences () {
 void Preferences::fillPreferences () {
 
     tconn.block (true);
+    sconn.block (true);
     dfconn.block (true);
     ffconn.block (true);
 
@@ -948,6 +959,7 @@ void Preferences::fillPreferences () {
 	intent->set_active (moptions.rtSettings.colorimetricIntent);
     languages->set_active_text (moptions.language);
     theme->set_active_text (moptions.theme);
+    slimUI->set_active(moptions.slimUI);
     chUseSystemTheme->set_active(moptions.useSystemTheme);
 
     Gdk::Color cropCol;
@@ -1045,6 +1057,7 @@ void Preferences::fillPreferences () {
     addc.block (false);
     setc.block (false);
     tconn.block (false);
+    sconn.block (false);
     dfconn.block (false);
     ffconn.block (false);
 
@@ -1088,7 +1101,7 @@ void Preferences::cancelPressed () {
 
 	// set the initial theme back
 	if (theme->get_active_text () != options.theme)
-		switchThemeTo(options.theme);
+		switchThemeTo(options.theme, options.slimUI);
 
 	// set the initial font back
 	if (fontbutton->get_font_name() != options.font)
@@ -1121,7 +1134,7 @@ void Preferences::aboutPressed () {
 
 void Preferences::themeChanged () {
 
-	switchThemeTo(theme->get_active_text ());
+	switchThemeTo(theme->get_active_text (), slimUI->get_active());
 }
 
 void Preferences::forRAWComboChanged () {
@@ -1146,10 +1159,12 @@ void Preferences::fontChanged () {
 	switchFontTo(fontbutton->get_font_name());
 }
 
-void Preferences::switchThemeTo(Glib::ustring newTheme) {
+void Preferences::switchThemeTo(Glib::ustring newTheme, bool slimInterface) {
 
 	std::vector<Glib::ustring> files;
-	files.push_back (argv0+"/themes/"+newTheme);
+	files.push_back (argv0+"/themes/"+newTheme+".gtkrc");
+	if (slimInterface)
+		files.push_back (argv0+"/themes/slim");
 	Gtk::RC::set_default_files (files);
 	Gtk::RC::reparse_all (Gtk::Settings::get_default());
 	GdkEventClient event = { GDK_CLIENT_EVENT, NULL, TRUE, gdk_atom_intern("_GTK_READ_RCFILES", FALSE), 8 };
diff --git a/rtgui/preferences.h b/rtgui/preferences.h
index 50d174316..6c27d9e07 100644
--- a/rtgui/preferences.h
+++ b/rtgui/preferences.h
@@ -85,6 +85,7 @@ class Preferences : public Gtk::Dialog {
     Gtk::ComboBoxText* intent;
 
     Gtk::ComboBoxText* theme;
+    Gtk::CheckButton* slimUI;
     Gtk::HBox* hbtheme;
     Gtk::CheckButton* chUseSystemTheme;
     Gtk::FontButton* fontbutton;
@@ -121,7 +122,7 @@ class Preferences : public Gtk::Dialog {
 
 
     Options moptions;
-    sigc::connection tconn, fconn, usethcon, addc, setc, dfconn, ffconn, autoMonProfileConn;
+    sigc::connection tconn, sconn, fconn, usethcon, addc, setc, dfconn, ffconn, autoMonProfileConn;
     Glib::ustring initialTheme;
     Glib::ustring initialFont;
 
@@ -138,7 +139,7 @@ class Preferences : public Gtk::Dialog {
     void forImageComboChanged ();
     void layoutComboChanged ();
     void cacheFormatComboChanged ();
-    void switchThemeTo (Glib::ustring newTheme);
+    void switchThemeTo (Glib::ustring newTheme, bool slimInterface);
     void switchFontTo  (Glib::ustring newFont);
 
     void appendBehavList (Gtk::TreeModel::iterator& parent, Glib::ustring label, int id, bool set);
diff --git a/rtgui/toolpanelcoord.cc b/rtgui/toolpanelcoord.cc
index 30a2cfa66..96ae6eeaa 100644
--- a/rtgui/toolpanelcoord.cc
+++ b/rtgui/toolpanelcoord.cc
@@ -219,9 +219,11 @@ ToolPanelCoordinator::ToolPanelCoordinator () : ipc(NULL)  {
 
 void ToolPanelCoordinator::addPanel (Gtk::Box* where, FoldableToolPanel* panel, Glib::ustring label) {
 
-    Gtk::HSeparator *hsep = Gtk::manage (new  Gtk::HSeparator());
-    where->pack_start(*hsep, Gtk::PACK_SHRINK, 0);
-    hsep->show();
+    if (where->children().size()) {
+        Gtk::HSeparator *hsep = Gtk::manage (new  Gtk::HSeparator());
+        where->pack_start(*hsep, Gtk::PACK_SHRINK, 0);
+        hsep->show();
+    }
 
     panel->setParent(where);
     panel->setLabel(label);