Merge branch 'master' of github.com:mate-desktop/mate-themes

73 files changed, 4425 insertions, 535 deletions

diff --git a/configure.ac b/configure.ac
index 1e4b2f1e..6c70c9cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -253,6 +253,10 @@ desktop-themes/TraditionalOk/wallpapers/Makefile
 desktop-themes/TraditionalOk/xfwm4/Makefile
 desktop-themes/TraditionalOk/xfwm4/png/Makefile
 desktop-themes/TraditionalOkTest/Makefile
+desktop-themes/TraditionalOkTest/gtk-2.0/Makefile
+desktop-themes/TraditionalOkTest/gtk-3.0/Makefile
+desktop-themes/TraditionalOkTest/gtk-3.0/img/Makefile
+desktop-themes/TraditionalOkTest/metacity-1/Makefile
 marco-themes/Makefile
 gtk-themes/Makefile
 gtk-themes/AlaDelta/Makefile
@@ -279,7 +283,6 @@ gtk-themes/LargePrint/gtkrc
 gtk-themes/Reverse/Makefile
 gtk-themes/Shiny/Makefile
 gtk-themes/Simply/Makefile
-gtk-themes/TraditionalOkTest/Makefile
 icon-themes/Makefile
 icon-themes/ContrastHigh/Makefile
 icon-themes/ContrastHighInverse/Makefile
diff --git a/desktop-themes/Menta/index.theme.in b/desktop-themes/Menta/index.theme.in
index dd1d3f1d..bceb6ed7 100644
--- a/desktop-themes/Menta/index.theme.in
+++ b/desktop-themes/Menta/index.theme.in
@@ -7,6 +7,6 @@ Encoding=UTF-8
 [X-GNOME-Metatheme]
 GtkTheme=Menta
 MetacityTheme=Menta
-IconTheme=mate
+IconTheme=menta
 CursorTheme=mate
 
diff --git a/desktop-themes/TraditionalOkTest/Makefile.am b/desktop-themes/TraditionalOkTest/Makefile.am
index acd1e912..c55eef34 100644
--- a/desktop-themes/TraditionalOkTest/Makefile.am
+++ b/desktop-themes/TraditionalOkTest/Makefile.am
@@ -1,11 +1,24 @@
 THEME_NAME=TraditionalOkTest
-THEME_IN_FILES=index.theme.in
  
-%.theme:   %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
 themedir = $(datadir)/themes/$(THEME_NAME)
 
 theme_DATA = index.theme
 
-DISTCLEANFILES=index.theme
-EXTRA_DIST=index.theme.in index.theme
+EXTRA_DIST = $(theme_DATA)
+
+SUBDIRS =		\
+	gtk-2.0		\
+	gtk-3.0		\
+	metacity-1
+
+DIST_SUBDIRS =	\
+	gtk-2.0		\
+	gtk-3.0		\
+	metacity-1
+
+CLEANFILES = index.theme
+
+index.theme: index.theme.in
+	$(AM_V_GEN)sed \
+		-e s!\@BACKGROUND_DIR\@!$(datadir)/pixmaps/backgrounds/mate/desktop! \
+		< $< > $@
diff --git a/desktop-themes/TraditionalOkTest/gtk-2.0/Makefile.am b/desktop-themes/TraditionalOkTest/gtk-2.0/Makefile.am
new file mode 100644
index 00000000..c9db774b
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-2.0/Makefile.am
@@ -0,0 +1,9 @@
+THEME_NAME=TraditionalOkTest
+
+themedir = $(datadir)/themes/$(THEME_NAME)/gtk-2.0
+
+theme_DATA = \
+	applications.rc \
+	gtkrc
+
+EXTRA_DIST = $(theme_DATA)
diff --git a/desktop-themes/TraditionalOkTest/gtk-2.0/applications.rc b/desktop-themes/TraditionalOkTest/gtk-2.0/applications.rc
new file mode 100644
index 00000000..f71fa7ff
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-2.0/applications.rc
@@ -0,0 +1,47 @@
+# 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 caja-extra-view-widget
+# ToDo: A more generic approach for all applications that have a widget like this.
+widget "*.caja-extra-view-widget" style : highest "caja-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"
+# Caja 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"
+
+##########################################################################
+# Chromium.
+##########################################################################
+
+style "chromium_toolbar_button" {
+	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"
+	}
+}
+
+widget_class "*Chrom*Button*" style "chromium_toolbar_button"
+
diff --git a/desktop-themes/TraditionalOkTest/gtk-2.0/gtkrc b/desktop-themes/TraditionalOkTest/gtk-2.0/gtkrc
new file mode 100644
index 00000000..194d5e41
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-2.0/gtkrc
@@ -0,0 +1,408 @@
+
+# Please keep this gtkrc in sync with the other ones from Clearlooks based themes.
+
+gtk-color-scheme = "base_color:#babdb6\nfg_color:#f5f5f5\ntooltip_fg_color:#000000\nselected_bg_color:#f57900\nselected_fg_color:#ffffff\ntext_color:#000000\nbg_color:#888a85\ntooltip_bg_color:#F5F5B5\nlink_color:#0000ee\nvisited_link_color:#551a8b"
+
+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 = 1
+
+	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 }
+
+	GtkWidget::link-color = @link_color
+	GtkWidget::visited-link-color = @visited_link_color
+
+	####################
+	# 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 "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 = 1
+	ythickness = 1
+
+	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
+}
+
+# fix for caja
+
+style "caja-location" {
+
+	bg[NORMAL]  = mix (0.60, shade (1.05, @bg_color), @bg_color)
+}
+widget "*.caja-extra-view-widget" style : highest "caja-location"
+
+# 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"
+
+# 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.
+##########################################################################
+
+include "applications.rc"
+
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/Makefile.am b/desktop-themes/TraditionalOkTest/gtk-3.0/Makefile.am
new file mode 100644
index 00000000..e898e022
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/Makefile.am
@@ -0,0 +1,17 @@
+THEME_NAME=TraditionalOkTest
+
+themedir = $(datadir)/themes/$(THEME_NAME)/gtk-3.0
+
+theme_DATA = \
+	applications.css \
+	gtk.css \
+	gtk-variant.css \
+	gtk-widgets.css \
+	gtk-widgets-img.css \
+	settings.ini
+
+EXTRA_DIST = $(theme_DATA)
+
+SUBDIRS = img
+
+DIST_SUBDIRS = img
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/applications.css b/desktop-themes/TraditionalOkTest/gtk-3.0/applications.css
new file mode 100644
index 00000000..5ab26ec1
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/applications.css
@@ -0,0 +1,190 @@
+/************
+ * Nautilus *
+ ************/
+
+/*
+.nautilus-desktop.nautilus-canvas-item {
+	color: @theme_base_color;
+	text-shadow: 1 1 alpha (@theme_fg_color, 0.8);
+}
+
+.nautilus-desktop.nautilus-canvas-item:active,
+.nautilus-desktop.nautilus-canvas-item:prelight,
+.nautilus-desktop.nautilus-canvas-item:selected {
+	text-shadow: none;
+}
+*/
+
+.nautilus-desktop .entry {
+	background-image: none;
+	border-image: none;
+}
+
+/************
+ * Nemo *
+ ************/
+
+/*
+.nemo-desktop.nemo-canvas-item {
+	color: @theme_base_color;
+	text-shadow: 1 1 alpha (@theme_fg_color, 0.8);
+}
+
+.nemo-desktop.nemo-canvas-item:active,
+.nemo-desktop.nemo-canvas-item:prelight,
+.nemo-desktop.nemo-canvas-item:selected {
+	text-shadow: none;
+}
+*/
+
+.nemo-desktop .entry {
+	background-image: none;
+	border-image: none;
+}
+
+
+/*********
+ * gedit *
+ *********/
+
+GeditFloatingSlider .entry.not-found:focus {
+	border-image: url("img/border-error.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
+}
+
+/*******************
+ * gnome-documents *
+ *******************/
+
+.documents-scrolledwin.frame {
+	border-width: 1px 0 0 0;
+	border-radius: 0;
+}
+
+.documents-main-view.view {
+	background-color: @theme_base_color;
+}
+
+GtkIconView.documents-main-view.check {
+	background-repeat: no-repeat;
+	background-position: center;
+	background-color: @theme_base_color;
+}
+
+.documents-selection-mode.toolbar {
+	border-width: 0;
+}
+
+.documents-selection-mode.toolbar .dim-label {
+	color: @theme_fg_color;
+}
+
+.documents-icon-bg {
+	background-color: @switch_trough_active_gradient_a;
+	border-radius: 3px;
+	color: @theme_base_color;
+}
+
+.documents-collection-icon {
+	background-color: @theme_bg_color;
+	border-radius: 3px;
+}
+
+/***************
+ * gnome-panel *
+ ***************/
+
+.gnome-panel-menu-bar,
+PanelApplet > GtkMenuBar.menubar,
+PanelToplevel,
+PanelWidget,
+PanelApplet {
+	background-color: @os_chrome_bg_color;
+	background-image: none;
+	color: @os_chrome_fg_color;
+}
+
+.gnome-panel-menu-bar,
+PanelApplet > GtkMenuBar.menubar,
+PanelApplet > GtkMenuBar.menubar.menuitem,
+PanelMenuBar.menubar,
+PanelMenuBar.menubar.menuitem {
+	-PanelMenuBar-icon-visible: true;
+}
+
+PanelAppletFrame {
+	background-color: @applet_frame_bg_color;
+	background-image: none;
+	color: @os_chrome_fg_color;
+}
+
+PanelApplet .button,
+PanelApplet .button:active,
+PanelApplet .button:hover,
+PanelApplet .button:hover:active {
+	border-image: url("img/border-gnome-panel-button.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
+}
+
+PanelApplet .menu .menuitem *:active {
+	color: @theme_text_color;
+}
+
+PanelApplet .menu .menuitem *:selected {
+	color: @theme_selected_fg_color;
+}
+
+PanelWidget > .button
+{
+	padding: 0;
+}
+
+WnckPager {
+	background-color: @pager_bg_color;
+}
+
+NaTrayApplet {
+	-NaTrayApplet-icon-padding: 7;
+	-NaTrayApplet-icon-size: 22;
+}
+
+GsmFailWhaleDialog {
+	background-color: @os_chrome_bg_color;
+	background-image: none;
+	color: @os_chrome_fg_color;
+}
+
+/******************
+ * gnome-terminal *
+ ******************/
+
+TerminalScreen {
+	background-color: @theme_base_color;
+	color: @theme_fg_color;
+}
+
+/*********
+ * Unity *
+ *********/
+
+UnityPanelWidget,
+.unity-panel {
+	background-image: none;
+	background-color: @theme_bg_color;
+	color: @theme_fg_color;
+	border-width: 0;
+}
+
+.unity-panel.menubar.menuitem:hover {
+	background-color: @menu_bg_color;
+	border-style: solid;
+	border-width: 1px 1px 0px;
+	border-color: @menubar_menuitem_hover_border_color;
+	border-radius: 3px 3px 0 0;
+	background-image: -gtk-gradient (linear,
+	                  left top,
+	                  left bottom,
+	                  from (@menubar_menuitem_hover_gradient_a),
+	                  color-stop (0.50, @menubar_menuitem_hover_gradient_b),
+	                  color-stop (0.50, @menubar_menuitem_hover_gradient_c),
+	                  to (@menubar_menuitem_hover_gradient_d));
+}
+
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-variant.css b/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-variant.css
new file mode 100644
index 00000000..a25e5e23
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-variant.css
@@ -0,0 +1,46 @@
+/***********************************************************************
+ * This section can be modified to create color variants of the theme. *
+ ***********************************************************************/
+
+/****************
+ * color scheme *
+ ****************/
+
+@define-color theme_base_color #babdb6;
+
+@define-color theme_bg_color #888a85;
+@define-color theme_fg_color #f5f5f5;
+
+@define-color theme_selected_bg_color #f57900;
+@define-color theme_selected_fg_color #ffffff;
+
+@define-color theme_tooltip_bg_color #EAF5B5;
+@define-color theme_tooltip_fg_color #000000;
+
+@define-color theme_text_color #000000;
+
+@define-color link_color #0000ee;
+@define-color visited_link_color #551a8b;
+
+/*****************
+ * error/warning *
+ *****************/
+
+@define-color error_color #cc0000;
+
+@define-color warning_bg_color #faad3d;
+
+/***************
+ * core colors *
+ ***************/
+
+/* Core colors are only used in the current file, as bases for other
+   color declarations. */
+
+@define-color core_color_a #f57900; /* Core color for blue widgets in Clearlooks-Phenix. */
+@define-color core_color_b #888a85; /* Core color for gray widgets in Clearlooks-Phenix. */
+
+/********************************************
+ * End of configuration for color variants. *
+ ********************************************/
+
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets-img.css b/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets-img.css
new file mode 100644
index 00000000..f3ea71fb
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets-img.css
@@ -0,0 +1,665 @@
+/**********
+ * Assets *
+ **********/
+
+/*************
+ * GtkSwitch *
+ *************/
+
+GtkSwitch.slider {
+	background-image: linear-gradient(to bottom,
+	                      alpha (@switch_slider_gradient_a, 0.5),
+	                      alpha (@switch_slider_gradient_b, 0.5) 50%,
+	                      alpha (@switch_slider_gradient_c, 0.5) 50%,
+	                      alpha (@switch_slider_gradient_d, 0.5)),
+	                  url("img/slider-horz-grip.png");
+	background-repeat: no-repeat;
+	background-position: center center;
+}
+
+GtkSwitch.slider:insensitive {
+	background-image: linear-gradient(to bottom,
+	                      alpha (@switch_slider_insensitive_gradient_a, 0.8),
+	                      alpha (@switch_slider_insensitive_gradient_b, 0.8) 50%,
+	                      alpha (@switch_slider_insensitive_gradient_c, 0.8) 50%,
+	                      alpha (@switch_slider_insensitive_gradient_d, 0.8)),
+	                  url("img/slider-horz-grip.png");
+}
+
+/***************
+ * Resize grip *
+ ***************/
+
+.grip {
+	background-image: url("img/resize-grip.png");
+}
+
+/***************
+ * Scrollbar *
+ ***************/
+
+.scrollbar.slider {
+	background-repeat: no-repeat;
+	background-position: center center;
+}
+
+.scrollbar.slider.vertical {
+	background-image: linear-gradient(to right,
+	                      alpha (@scrollbar_slider_inner_border_color, 0.5),
+	                      alpha (@scrollbar_slider_gradient_a, 0.5) 1px,
+	                      alpha (@scrollbar_slider_gradient_b, 0.5) 50%,
+	                      alpha (@scrollbar_slider_gradient_c, 0.5) 50%,
+	                      alpha (@scrollbar_slider_gradient_d, 0.5) 95%,
+	                      alpha (@scrollbar_slider_inner_border_color, 0.5)),
+	                  url("img/slider-vert-grip.png");
+}
+
+.scrollbar.slider.horizontal {
+	background-image: linear-gradient(to bottom,
+	                      alpha (@scrollbar_slider_inner_border_color, 0.5),
+	                      alpha (@scrollbar_slider_gradient_a, 0.5) 1px,
+	                      alpha (@scrollbar_slider_gradient_b, 0.5) 50%,
+	                      alpha (@scrollbar_slider_gradient_c, 0.5) 50%,
+	                      alpha (@scrollbar_slider_gradient_d, 0.5) 95%,
+	                      alpha (@scrollbar_slider_inner_border_color, 0.5)),
+	                  url("img/slider-horz-grip.png");
+}
+
+.scrollbar.slider.vertical:hover {
+	background-image: linear-gradient(to right,
+	                      alpha (@scrollbar_slider_inner_border_color, 0.5),
+	                      alpha (@scrollbar_slider_hover_gradient_a, 0.5) 1px,
+	                      alpha (@scrollbar_slider_hover_gradient_b, 0.5) 50%,
+	                      alpha (@scrollbar_slider_hover_gradient_c, 0.5) 50%,
+	                      alpha (@scrollbar_slider_hover_gradient_d, 0.5) 95%,
+	                      alpha (@scrollbar_slider_inner_border_color, 0.5)),
+	                  url("img/slider-vert-grip.png");
+}
+
+.scrollbar.slider.horizontal:hover {
+	background-image: linear-gradient(to bottom,
+	                      alpha (@scrollbar_slider_inner_border_color, 0.5),
+	                      alpha (@scrollbar_slider_hover_gradient_a, 0.5) 1px,
+	                      alpha (@scrollbar_slider_hover_gradient_b, 0.5) 50%,
+	                      alpha (@scrollbar_slider_hover_gradient_c, 0.5) 50%,
+	                      alpha (@scrollbar_slider_hover_gradient_d, 0.5) 95%,
+	                      alpha (@scrollbar_slider_inner_border_color, 0.5)),
+	                  url("img/slider-horz-grip.png");
+}
+
+/*************************
+ * Check and Radio items *
+ *************************/
+
+.check,
+.check row:selected,
+.check row:selected:focus {
+	background-image: url("img/checkbox-unchecked.png");
+}
+
+.check:hover,
+.check row:selected:hover,
+.check row:selected:focus:hover {
+	background-image: url("img/checkbox-unchecked-hover.png");
+}
+
+.check:insensitive,
+.check row:selected:insensitive,
+.check row:selected:focus:insensitive {
+	background-image: url("img/checkbox-unchecked-insensitive.png");
+}
+
+.check:active,
+.check row:selected:active,
+.check row:selected:focus:active {
+	background-image: url("img/checkbox-checked.png");
+}
+
+.check:active:hover,
+.check row:selected:active:hover,
+.check row:selected:focus:active:hover {
+	background-image: url("img/checkbox-checked-hover.png");
+}
+
+.check:active:insensitive,
+.check row:selected:active:insensitive,
+.check row:selected:focus:active:insensitive {
+	background-image: url("img/checkbox-checked-insensitive.png");
+}
+
+.check:inconsistent,
+.check row:selected:inconsistent,
+.check row:selected:focus:inconsistent {
+	background-image: url("img/checkbox-mixed.png");
+}
+
+.check:inconsistent:hover,
+.check row:selected:inconsistent:hover,
+.check row:selected:focus:inconsistent:hover {
+	background-image: url("img/checkbox-mixed-hover.png");
+}
+
+.check:inconsistent:insensitive,
+.check row:selected:inconsistent:insensitive,
+.check row:selected:focus:inconsistent:insensitive {
+	background-image: url("img/checkbox-mixed-insensitive.png");
+}
+
+.radio,
+.radio row:selected,
+.radio row:selected:focus {
+	background-image: url("img/radio-unchecked.png");
+}
+
+.radio:hover,
+.radio row:selected:hover,
+.radio row:selected:focus:hover {
+	background-image: url("img/radio-unchecked-hover.png");
+}
+
+.radio:insensitive,
+.radio row:selected:insensitive,
+.radio row:selected:focus:insensitive {
+	background-image: url("img/radio-unchecked-insensitive.png");
+}
+
+.radio:active,
+.radio row:selected:active,
+.radio row:selected:focus:active {
+	background-image: url("img/radio-checked.png");
+}
+
+.radio:active:hover,
+.radio row:selected:active:hover,
+.radio row:selected:focus:active:hover {
+	background-image: url("img/radio-checked-hover.png");
+}
+
+.radio:active:insensitive,
+.radio row:selected:active:insensitive,
+.radio row:selected:focus:active:insensitive {
+	background-image: url("img/radio-checked-insensitive.png");
+}
+
+.radio:inconsistent,
+.radio row:selected:inconsistent,
+.radio row:selected:focus:inconsistent {
+	background-image: url("img/radio-mixed.png");
+}
+
+.radio:inconsistent:hover,
+.radio row:selected:inconsistent:hover,
+.radio row:selected:focus:inconsistent:hover {
+	background-image: url("img/radio-mixed-hover.png");
+}
+
+.radio:inconsistent:insensitive,
+.radio row:selected:inconsistent:insensitive,
+.radio row:selected:focus:inconsistent:insensitive {
+	background-image: url("img/radio-mixed-insensitive.png");
+}
+
+/*********************
+ * GtkScale's slider *
+ *********************/
+ 
+GtkScale.slider,
+GtkScale.slider.horizontal {
+	background-image: url("img/scale-slider-horz.png");
+}
+
+GtkScale.slider:hover,
+GtkScale.slider.horizontal:hover {
+	background-image: url("img/scale-slider-horz-hover.png");
+}
+
+GtkScale.slider:insensitive,
+GtkScale.slider.horizontal:insensitive {
+	background-image: url("img/scale-slider-horz-insensitive.png");
+}
+
+GtkScale.slider.vertical {
+	background-image: url("img/scale-slider-vert.png");
+}
+
+GtkScale.slider.vertical:hover {
+	background-image: url("img/scale-slider-vert-hover.png");
+}
+
+GtkScale.slider.vertical:insensitive {
+	background-image: url("img/scale-slider-vert-insensitive.png");
+}
+
+GtkScale.scale-has-marks-above.slider.horizontal {
+	background-image: url("img/scale-slider-horz.png");
+}
+
+GtkScale.scale-has-marks-above.slider.horizontal:hover {
+	background-image: url("img/scale-slider-horz-hover.png");
+}
+
+GtkScale.scale-has-marks-above.slider.horizontal:insensitive {
+	background-image: url("img/scale-slider-horz-insensitive.png");
+}
+
+GtkScale.scale-has-marks-above.slider.vertical {
+	background-image: url("img/scale-slider-vert.png");
+}
+
+GtkScale.scale-has-marks-above.slider.vertical:hover {
+	background-image: url("img/scale-slider-vert-hover.png");
+}
+
+GtkScale.scale-has-marks-above.slider.vertical:insensitive {
+	background-image: url("img/scale-slider-vert-insensitive.png");
+}
+
+GtkScale.scale-has-marks-below.slider.horizontal {
+	background-image: url("img/scale-slider-horz.png");
+}
+
+GtkScale.scale-has-marks-below.slider.horizontal:hover {
+	background-image: url("img/scale-slider-horz-hover.png");
+}
+
+GtkScale.scale-has-marks-below.slider.horizontal:insensitive {
+	background-image: url("img/scale-slider-horz-insensitive.png");
+}
+
+GtkScale.scale-has-marks-below.slider.vertical {
+	background-image: url("img/scale-slider-vert.png");
+}
+
+GtkScale.scale-has-marks-below.slider.vertical:hover {
+	background-image: url("img/scale-slider-vert-hover.png");
+}
+
+GtkScale.scale-has-marks-below.slider.vertical:insensitive {
+	background-image: url("img/scale-slider-vert-insensitive.png");
+}
+
+/*********
+ * Menus *
+ *********/
+
+.menu .menuitem.check {
+	background-image: url("img/menuitem-checkbox.png");
+	background-repeat: no-repeat;
+}
+
+.menu .menuitem.check:hover {
+	background-image: url("img/menuitem-checkbox-hover.png");
+	background-repeat: no-repeat;
+}
+
+.menu .menuitem.check:insensitive {
+	background-image: url("img/menuitem-checkbox-insensitive.png");
+	background-repeat: no-repeat;
+}
+
+.menu .menuitem.check:active {
+	background-image: url("img/menuitem-checkbox-checked.png");
+	background-repeat: no-repeat;
+}
+
+.menu .menuitem.check:active:hover {
+	background-image: url("img/menuitem-checkbox-checked-hover.png");
+	background-repeat: no-repeat;
+}
+
+.menu .menuitem.check:active:insensitive {
+	background-image: url("img/menuitem-checkbox-checked-insensitive.png");
+	background-repeat: no-repeat;
+}
+
+.menu .menuitem.check:inconsistent,
+.menu .menuitem.radio:inconsistent {
+	background-image: url("img/menuitem-checkbox-mixed.png");
+	background-repeat: no-repeat;
+}
+
+.menu .menuitem.check:inconsistent:hover,
+.menu .menuitem.radio:inconsistent:hover {
+	background-image: url("img/menuitem-checkbox-mixed-hover.png");
+	background-repeat: no-repeat;
+}
+
+.menu .menuitem.check:inconsistent:insensitive,
+.menu .menuitem.radio:inconsistent:insensitive {
+	background-image: url("img/menuitem-checkbox-mixed-insensitive.png");
+	background-repeat: no-repeat;
+}
+
+.menu .menuitem.radio {
+	background-image: url("img/menuitem-radio.png");
+	background-repeat: no-repeat;
+}
+
+.menu .menuitem.radio:hover {
+	background-image: url("img/menuitem-radio-hover.png");
+	background-repeat: no-repeat;
+}
+
+.menu .menuitem.radio:insensitive {
+	background-image: url("img/menuitem-radio-insensitive.png");
+	background-repeat: no-repeat;
+}
+
+.menu .menuitem.radio:active {
+	background-image: url("img/menuitem-radio-checked.png");
+	background-repeat: no-repeat;
+}
+
+.menu .menuitem.radio:active:hover {
+	background-image: url("img/menuitem-radio-checked-hover.png");
+	background-repeat: no-repeat;
+}
+
+.menu .menuitem.radio:active:insensitive {
+	background-image: url("img/menuitem-radio-checked-insensitive.png");
+	background-repeat: no-repeat;
+}
+
+/*********
+ * Panes *
+ *********/
+
+.pane-separator {
+	background-image: url("img/pane-separator-grip-horz.png");
+}
+
+.pane-separator.vertical {
+	background-image: url("img/pane-separator-grip-vert.png");
+}
+
+/***********
+ * Borders *
+ ***********/
+
+/* generic element borders */
+.entry,
+GtkComboBox.combobox-entry .entry,
+GtkComboBox.combobox-entry .button,
+.button:active,
+.trough,
+.trough.highlight,
+GtkSwitch.trough,
+/* generic button borders */
+.button,
+.primary-toolbar .button.raised,
+.primary-toolbar .raised .button,
+.primary-toolbar GtkComboBox .button,
+/* primary toolbar - generic element borders */
+.primary-toolbar .entry,
+.primary-toolbar GtkComboBox.combobox-entry .entry,
+.primary-toolbar GtkComboBox.combobox-entry .button,
+.primary-toolbar .button:active,
+.primary-toolbar .button.raised:active,
+.primary-toolbar .raised .button:active,
+.primary-toolbar .button.raised:insensitive,
+.primary-toolbar .raised .button:insensitive,
+.primary-toolbar GtkSwitch.trough,
+.primary-toolbar GtkSwitch.trough:insensitive,
+.primary-toolbar GtkComboBox .button:active,
+.primary-toolbar GtkComboBox .button:insensitive,
+/* primary toolbar - hover button borders */
+.primary-toolbar .button:hover {
+	border-image: url("img/border.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
+	border-radius: 3px;
+	border-width: 1px 1px 2px 1px;
+	border-style: solid;
+	border-color: transparent;
+}
+
+.primary-toolbar .entry,
+.primary-toolbar GtkComboBox.combobox-entry .entry {
+	border-width: 1px 2px 2px;
+}
+
+.primary-toolbar .entry:focus,
+.primary-toolbar GtkComboBox.combobox-entry .entry:focus {
+	border-width: 1px 2px 2px;
+}
+
+/* linked buttons */
+/* Middle button */
+.linked .entry,
+.linked .button,
+.linked .button:active,
+.linked .button:active:hover,
+.linked .button:focus,
+.linked .button:focus:active,
+.linked .button:insensitive,
+/* Leftmost button */
+.linked .entry:first-child,
+.linked .button:first-child,
+.linked .button:active:first-child,
+.linked .button:active:hover:first-child,
+.linked .button:focus:first-child,
+.linked .button:focus:active:first-child,
+.linked .button:insensitive:first-child,
+/* Rightmost button */
+.linked .entry:last-child,
+.linked .button:last-child,
+.linked .button:active:last-child,
+.linked .button:active:hover:last-child,
+.linked .button:focus:last-child,
+.linked .button:focus:active:last-child,
+.linked .button:insensitive:last-child,
+/* Linked single button */
+.linked .entry:only-child,
+.linked .button:only-child,
+.linked .button:active:only-child,
+.linked .button:active:hover:only-child,
+.linked .button:focus:only-child,
+.linked .button:focus:active:only-child,
+.linked .button:insensitive:only-child,
+/* Middle button (vertical) */
+.linked.vertical .entry,
+.linked.vertical .button,
+.linked.vertical .button:active,
+.linked.vertical .button:active:hover,
+.linked.vertical .button:focus,
+.linked.vertical .button:focus:active,
+.linked.vertical .button:insensitive,
+/* Top button (vertical) */
+.linked.vertical .entry:first-child,
+.linked.vertical .button:first-child,
+.linked.vertical .button:active:first-child,
+.linked.vertical .button:active:hover:first-child,
+.linked.vertical .button:focus:first-child,
+.linked.vertical .button:focus:active:first-child,
+.linked.vertical .button:insensitive:first-child,
+/* Bottom button (vertical) */
+.linked.vertical .entry:last-child,
+.linked.vertical .button:last-child,
+.linked.vertical .button:active:last-child,
+.linked.vertical .button:active:hover:last-child,
+.linked.vertical .button:focus:last-child,
+.linked.vertical .button:focus:active:last-child,
+.linked.vertical .button:insensitive:last-child,
+/* Linked single button (vertical) */
+.linked.vertical .entry:only-child,
+.linked.vertical .button:only-child,
+.linked.vertical .button:active:only-child,
+.linked.vertical .button:active:hover:only-child,
+.linked.vertical .button:focus:only-child,
+.linked.vertical .button:focus:active:only-child,
+.linked.vertical .button:insensitive:only-child,
+/* Linked buttons on primary toolbars */
+/* Middle button */
+.primary-toolbar .button.raised.linked,
+.primary-toolbar .button.raised.linked:active,
+.primary-toolbar .button.raised.linked:focus,
+.primary-toolbar .button.raised.linked:focus:active,
+.primary-toolbar .button.raised.linked:insensitive,
+.primary-toolbar .raised.linked .button,
+.primary-toolbar .raised.linked .button:active,
+.primary-toolbar .raised.linked .button:focus,
+.primary-toolbar .raised.linked .button:focus:active,
+.primary-toolbar .raised.linked .button:insensitive,
+.inline-toolbar.toolbar .button,
+.inline-toolbar.toolbar .button:active,
+.inline-toolbar.toolbar .button:focus,
+.inline-toolbar.toolbar .button:focus:active,
+.inline-toolbar.toolbar .button:insensitive,
+.inline-toolbar.toolbar GtkToolButton .button,
+.inline-toolbar.toolbar GtkToolButton .button:active,
+.inline-toolbar.toolbar GtkToolButton .button:focus,
+.inline-toolbar.toolbar GtkToolButton .button:focus:active,
+.inline-toolbar.toolbar GtkToolButton .button:insensitive,
+/* Leftmost button */
+.primary-toolbar .button.raised.linked:first-child,
+.primary-toolbar .button.raised.linked:active:first-child,
+.primary-toolbar .button.raised.linked:focus:first-child,
+.primary-toolbar .button.raised.linked:focus:active:first-child,
+.primary-toolbar .button.raised.linked:insensitive:first-child,
+.primary-toolbar .raised.linked .button:first-child,
+.primary-toolbar .raised.linked .button:active:first-child,
+.primary-toolbar .raised.linked .button:focus:first-child,
+.primary-toolbar .raised.linked .button:focus:active:first-child,
+.primary-toolbar .raised.linked .button:insensitive:first-child,
+.inline-toolbar.toolbar .button:first-child,
+.inline-toolbar.toolbar .button:active:first-child,
+.inline-toolbar.toolbar .button:focus:first-child,
+.inline-toolbar.toolbar .button:focus:active:first-child,
+.inline-toolbar.toolbar .button:insensitive:first-child,
+.inline-toolbar.toolbar GtkToolButton:first-child .button,
+.inline-toolbar.toolbar GtkToolButton:first-child .button:active,
+.inline-toolbar.toolbar GtkToolButton:first-child .button:focus,
+.inline-toolbar.toolbar GtkToolButton:first-child .button:focus:active,
+.inline-toolbar.toolbar GtkToolButton:first-child .button:insensitive,
+/* Rightmost button */
+.primary-toolbar .button.raised.linked:last-child,
+.primary-toolbar .button.raised.linked:active:last-child,
+.primary-toolbar .button.raised.linked:focus:last-child,
+.primary-toolbar .button.raised.linked:focus:active:last-child,
+.primary-toolbar .button.raised.linked:insensitive:last-child,
+.primary-toolbar .raised.linked .button:last-child,
+.primary-toolbar .raised.linked .button:active:last-child,
+.primary-toolbar .raised.linked .button:focus:last-child,
+.primary-toolbar .raised.linked .button:focus:active:last-child,
+.primary-toolbar .raised.linked .button:insensitive:last-child,
+.inline-toolbar.toolbar .button:last-child,
+.inline-toolbar.toolbar .button:active:last-child,
+.inline-toolbar.toolbar .button:focus:last-child,
+.inline-toolbar.toolbar .button:focus:active:last-child,
+.inline-toolbar.toolbar .button:insensitive:last-child,
+.inline-toolbar.toolbar GtkToolButton:last-child .button,
+.inline-toolbar.toolbar GtkToolButton:last-child .button:active,
+.inline-toolbar.toolbar GtkToolButton:last-child .button:focus,
+.inline-toolbar.toolbar GtkToolButton:last-child .button:focus:active,
+.inline-toolbar.toolbar GtkToolButton:last-child .button:insensitive,
+/* Single button */
+.inline-toolbar.toolbar .button:only-child,
+.inline-toolbar.toolbar .button:active:only-child,
+.inline-toolbar.toolbar .button:focus:only-child,
+.inline-toolbar.toolbar .button:focus:active:only-child,
+.inline-toolbar.toolbar .button:insensitive:only-child,
+.inline-toolbar.toolbar GtkToolButton:only-child .button,
+.inline-toolbar.toolbar GtkToolButton:only-child .button:active,
+.inline-toolbar.toolbar GtkToolButton:only-child .button:focus,
+.inline-toolbar.toolbar GtkToolButton:only-child .button:focus:active,
+.inline-toolbar.toolbar GtkToolButton:only-child .button:insensitive {
+	border-image: url("img/border-inline-button.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
+	border-radius: 3px;
+	border-width: 1px 1px 2px 1px;
+	border-style: solid;
+	border-color: transparent;
+}
+
+/* generic insensitive element borders */
+GtkSwitch.trough:insensitive,
+GtkComboBox.combobox-entry .entry:insensitive,
+GtkComboBox.combobox-entry .button:insensitive,
+.entry:insensitive,
+.button:insensitive,
+.trough row {
+	border-image: url("img/border-insensitive.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
+	border-radius: 3px;
+	border-width: 1px 1px 2px 1px;
+	border-style: solid;
+	border-color: transparent;
+}
+
+/* focused element borders */
+.entry:focus,
+GtkComboBox.combobox-entry .entry:focus,
+.button:focus:active,
+.button.default:active,
+/* focused button borders */
+.button:focus,
+.button.default,
+.primary-toolbar .entry:focus,
+.primary-toolbar .button:active:focus,
+.primary-toolbar .button:focus:hover,
+.primary-toolbar GtkComboBox.combobox-entry .entry:focus,
+.primary-toolbar GtkComboBox.combobox-entry .button:focus,
+.primary-toolbar .button.raised:focus:active,
+.primary-toolbar .raised .button:focus:active,
+.primary-toolbar .button.raised.default:active,
+.primary-toolbar .raised .button.default:active,
+.primary-toolbar GtkComboBox .button:active:focus,
+.primary-toolbar .button.raised:focus,
+.primary-toolbar .button.raised.default,
+.primary-toolbar .raised .button:focus,
+.primary-toolbar .raised .button.default,
+.primary-toolbar GtkComboBox .button:focus {
+	border-image: url("img/border-focused.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
+	border-radius: 3px;
+	border-width: 1px 1px 2px 1px;
+	border-style: solid;
+	border-color: transparent;
+}
+
+/* focused primary toolbar button borders */
+.primary-toolbar .button:focus {
+	border-image: url("img/border-focused-ptb.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
+	border-radius: 3px;
+	border-width: 1px 1px 2px 1px;
+	border-style: solid;
+	border-color: transparent;
+}
+
+/* focused switch trough borders */
+GtkSwitch.trough:active {
+	border-image: url("img/border-focused-switch.svg") 3 3 4 3 / 3px 3px 4px 3px stretch;
+	border-radius: 3px;
+	border-width: 1px 1px 2px 1px;
+	border-style: solid;
+	border-color: transparent;
+}
+
+/* column-headers borders */
+column-header.button,
+column-header .button,
+column-header.button:focus,
+column-header .button:focus,
+column-header.button:active,
+column-header .button:active,
+column-header.button:active:hover,
+column-header .button:active:hover
+column-header.button:active:focus,
+column-header .button:active:focus {
+	border-image: none;
+	border-width: 1px;
+	border-radius: 0;
+	border-style: solid;
+	border-color: @column_header_border_top_color @column_header_border_right_color
+	              @column_header_border_bottom_color @column_header_border_left_color;
+
+}
+
+column-header.button:last-child,
+column-header:last-child .button,
+column-header.button:last-child:focus,
+column-header:last-child .button:focus,
+column-header.button:last-child:active,
+column-header:last-child .button:active,
+column-header.button:last-child:active:hover,
+column-header:last-child .button:active:hover,
+column-header.button:last-child:active:focus,
+column-header:last-child .button:active:focus {
+	border-right: none;
+}
+
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets.css
new file mode 100644
index 00000000..29ad24ab
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets.css
@@ -0,0 +1,1764 @@
+* {
+	engine: none;
+	padding: 0;
+
+	background-clip: padding-box;
+
+	-GtkToolButton-icon-spacing: 4;
+
+	-GtkTextView-error-underline-color: @error_color;
+
+	-GtkPaned-handle-size: 5;
+
+	-GtkCheckButton-indicator-size: 16;
+	-GtkCheckMenuItem-indicator-size: 12;
+
+	-GtkScrolledWindow-scrollbar-spacing: 3;
+	-GtkScrolledWindow-scrollbars-within-bevel: 0;
+
+	-GtkToolItemGroup-expander-size: 11;
+	-GtkExpander-expander-size: 14;
+
+	-GtkMenu-horizontal-padding: 0;
+	-GtkMenu-vertical-padding: 0;
+
+	-GtkWidget-link-color: @link_color;
+	-GtkWidget-visited-link-color: @visited_link_color;
+	-GtkIMHtml-hyperlink-color: @link_color;
+	-GtkHTML-link-color: @link_color;
+
+	-WnckTasklist-fade-overlay-rect: 0;
+
+	-GtkWidget-focus-padding: 2;
+	-GtkWidget-focus-line-width: 1;
+	-GtkWindow-resize-grip-width: 11;
+	-GtkWindow-resize-grip-height: 11;
+}
+
+/***************
+ * Base States *
+ ***************/
+
+GtkWindow {
+	color: @theme_fg_color;
+}
+
+* {
+	background-color: @theme_bg_color;
+}
+
+*:selected,
+*:selected:focus {
+	background-color: @theme_selected_bg_color;
+	color: @theme_selected_fg_color;
+}
+
+*:insensitive {
+	background-color: @insensitive_bg_color;
+	color: @insensitive_fg_color;
+	text-shadow: 1px 1px @insensitive_text_shadow_color;
+	border-color: @insensitive_border_color;
+}
+
+GtkImage,
+GtkImage:insensitive,
+GtkLabel,
+GtkLabel:insensitive {
+	background-color: transparent;
+}
+
+/************
+ * Tooltips *
+ ************/
+.tooltip {
+	padding: 4px;
+	border-style: solid;
+	border-width: 1px;
+	border-color: @theme_tooltip_border_color;
+	border-radius: 0px;
+	background-color: @theme_tooltip_bg_color;
+	color: @theme_tooltip_fg_color;
+}
+
+.tooltip * {
+	background-color: transparent;
+}
+
+/*****************
+ * Miscellaneous *
+ *****************/
+
+.spinner:active {
+	transition: 750ms linear loop;
+}
+
+.floating-bar {
+	background-image: linear-gradient(
+	                  to bottom,
+	                  @theme_base_color 20%,
+	                  shade(@theme_base_color, 0.9));
+	background-color: @theme_base_color;
+	border-color: @border_color;
+	border-radius: 3px;
+	border-width: 1px;
+	border-style: solid;
+}
+
+.floating-bar.top {
+	border-top-width: 0;
+	border-top-right-radius: 0;
+	border-top-left-radius: 0;
+}
+
+.floating-bar.right {
+	border-right-width: 0;
+	border-top-right-radius: 0;
+	border-bottom-right-radius: 0;
+}
+
+.floating-bar.bottom {
+	border-bottom-width: 0;
+	border-bottom-right-radius: 0;
+	border-bottom-left-radius: 0;
+}
+
+.floating-bar.left {
+	border-left-width: 0;
+	border-top-left-radius: 0;
+	border-bottom-left-radius: 0;
+}
+
+.floating-bar .button {
+	background-color: alpha (@theme_base_color, 0.0);
+	background-image: none;
+	border-style: none;
+	border-image: none;
+	-GtkButton-image-spacing: 0;
+	-GtkButton-inner-border: 0;
+}
+
+.view.rubberband,
+.rubberband {
+	background-color: alpha (@theme_selected_bg_color, 0.35);
+	border-color: @theme_selected_bg_color;
+	border-style: solid;
+	border-width: 1px;
+	border-radius: 2px;
+}
+
+GtkStatusbar {
+	padding: 5px;
+	color: @theme_fg_color;
+	-GtkStatusbar-shadow-type: none;
+}
+
+.dnd {
+	border-width: 1px;
+	border-style: solid;
+	border-color: @theme_selected_bg_color;
+	border-radius: 0;
+}
+
+GtkTreeView.view.separator,
+GtkTreeView.separator,
+.separator,
+.separator:hover {
+	color: shade(@border_color, 1.30);
+}
+
+.pane-separator,
+.pane-separator:hover,
+.pane-separator:selected {
+	color: @theme_bg_color;
+	background-color: @theme_bg_color;
+	background-repeat: no-repeat;
+	background-position: center;
+}
+
+/****************
+ * Text Entries *
+ ****************/
+
+.entry {
+	border-style: solid;
+	padding: 4px;
+	color: @entry_text_color;
+	background-color: @theme_base_color;
+}
+
+.entry.progressbar {
+	background-color: @theme_selected_bg_color;
+	color: @theme_selected_fg_color;
+}
+
+.entry:selected {
+	color: @theme_selected_fg_color;
+	background-color: @theme_selected_bg_color;
+}
+
+.entry:insensitive {
+	color: @insensitive_fg_color;
+}
+
+/* Entry background */
+.entry {
+	background-color: @entry_bg_color;
+	background-image: linear-gradient(to bottom,
+	                  @entry_inner_border_color 1px,
+	                  @entry_bg_color 2px);
+}
+
+/* Focused entry background */
+.entry:focus {
+	background-image: none;
+}
+
+/* Insensitive entry background */
+.entry:insensitive {
+	background-image: linear-gradient(to bottom,
+	                  @entry_insensitive_inner_border_color 2px,
+	                  @entry_insensitive_bg_color 3px);
+}
+
+/*******************
+ * Symbolic images *
+ *******************/
+
+.image {
+	color: @internal_element_color;
+}
+
+.image:hover {
+	color: @internal_element_hover_color;
+}
+
+.image:selected {
+	color: @theme_selected_fg_color;
+}
+
+/*****************
+ * Color Chooser *
+ *****************/
+
+GtkColorSwatch,
+GtkColorSwatch:selected {
+	border-width: 1px;
+	border-style: solid;
+	border-radius: 3px;
+	border-color: @color_swatch_border_color;
+	background-color: transparent;
+	background-clip: border-box;
+}
+
+GtkColorSwatch:hover,
+GtkColorSwatch:selected:hover {
+	border-color: @color_swatch_hover_border_color;
+}
+
+GtkColorChooserWidget #add-color-button:hover,
+GtkColorChooserWidget #add-color-button:selected:hover {
+}
+
+.color-active-badge,
+.color-active-badge:selected {
+	border-style: solid;
+	border-width: 2px;
+	background-color: transparent;
+}
+
+.color-active-badge.color-light,
+.color-active-badge.color-light:hover {
+	border-color: @color_active_badge_light_border_color;
+	color: @color_active_badge_light_color;
+}
+
+.color-active-badge.color-dark,
+.color-active-badge.color-dark:hover {
+	border-color: @color_active_badge_dark_border_color;
+	color: @color_active_badge_dark_color;
+}
+
+GtkColorEditor GtkColorSwatch.color-light:hover,
+GtkColorEditor GtkColorSwatch.color-dark:hover {
+	background-image: none;
+}
+
+/****************
+ * Progress bar *
+ ****************/
+
+GtkProgressBar {
+	padding: 0 0 1px 0;
+}
+
+/* progress component */
+.progressbar,
+.progressbar row,
+.progressbar row:hover,
+.progressbar row:selected,
+.progressbar row:selected:focus {
+	background-color: @progressbar_bg_color;
+	background-image: linear-gradient(to bottom,
+	                      alpha (@progressbar_gradient_a, 0.7),
+	                      alpha (@progressbar_gradient_b, 0.7) 50%,
+	                      alpha (@progressbar_gradient_c, 0.7) 50%,
+	                      alpha (@progressbar_gradient_d, 0.7)),
+	                  repeating-linear-gradient(135deg,
+	                      alpha (@progressbar_pattern_color, 0.0),
+	                      alpha (@progressbar_pattern_color, 0.0) 12px,
+	                      alpha (@progressbar_pattern_color, 0.5) 12px,
+	                      alpha (@progressbar_pattern_color, 0.5) 24px);
+	border-radius: 3px;
+	border-width: 1px;
+	border-style: solid;
+	border-color: @progressbar_border_color;
+}
+
+.progressbar row:selected,
+.progressbar row:selected:focus {
+	border-color: shade(@progressbar_border_color, 0.85);
+}
+
+.progressbar.vertical {
+	background-image: linear-gradient(to right,
+	                      alpha (@progressbar_gradient_a, 0.7),
+	                      alpha (@progressbar_gradient_b, 0.7) 50%,
+	                      alpha (@progressbar_gradient_c, 0.7) 50%,
+	                      alpha (@progressbar_gradient_d, 0.7)),
+	                  repeating-linear-gradient(45deg,
+	                      alpha (@progressbar_pattern_color, 0.0),
+	                      alpha (@progressbar_pattern_color, 0.0) 12px,
+	                      alpha (@progressbar_pattern_color, 0.5) 12px,
+	                      alpha (@progressbar_pattern_color, 0.5) 24px);
+}
+
+/* for progressbars in cell renderers */
+.trough row {
+	padding: 0;
+}
+
+.trough row:selected,
+.trough row:selected:focus {
+	background-image: -gtk-gradient (linear,
+	                  left top, left bottom,
+	                  from (mix (@trough_gradient_a, @theme_selected_bg_color, 0.25)),
+	                  to (mix (@trough_gradient_b, @theme_selected_bg_color, 0.25)));
+}
+
+/************
+ * GtkScale *
+ ************/
+
+GtkScale {
+	-GtkScale-slider-length: 21;
+	-GtkRange-slider-width: 13;
+	-GtkRange-trough-border: 4;
+}
+
+GtkScale.slider,
+GtkScale.slider:hover,
+GtkScale.slider:insensitive {
+	border-radius: 0;
+	border-style: none;
+	background-color: transparent;
+}
+
+GtkScale.trough,
+GtkScale.trough.highlight,
+GtkScale.trough.vertical,
+GtkScale.trough:insensitive {
+	border-image: none;
+	border-style: solid;
+	border-width: 1px;
+	border-radius: 1px;
+	background-image: none;
+}
+
+GtkScale.trough {
+	margin: 8px 0;
+	border-color: @scale_trough_border_color;
+	background-color: @scale_trough_bg_color;
+}
+
+GtkScale.trough.vertical {
+	margin: 0 8px;
+}
+
+GtkScale.trough.highlight {
+	border-color: @scale_trough_highlight_border_color;
+	background-color: @scale_trough_highlight_bg_color;
+}
+
+GtkScale.trough:insensitive {
+	border-color: @scale_trough_insensitive_border_color;
+	background-color: @scale_trough_insensitive_highlight_bg_color;
+}
+
+GtkScale.trough.highlight:insensitive {
+	border-color: @scale_trough_highlight_insensitive_border_color;
+	background-color: @scale_trough_highlight_insensitive_bg_color;
+}
+
+GtkScale.progressbar {
+	background-color: @scale_progressbar_bg_color;
+}
+
+GtkScale.mark {
+	color: @scale_mark_color;
+}
+
+/**********
+ * Frames *
+ **********/
+
+.frame {
+	border-width: 1px;
+	border-color: @border_color;
+	border-style: solid;
+	border-radius: 3px;
+	background-color: @theme_base_color;
+	padding: 0;
+}
+
+GtkScrolledWindow.frame {
+	border-style: solid;
+	border-color: @border_color;
+	border-width: 1px;
+	border-radius: 2px;
+	padding: 0;
+}
+
+/* avoid double borders when a viewport is
+ * packed into a GtkScrolledWindow */
+GtkScrolledWindow GtkViewport.frame {
+	border-style: none;
+}
+
+/***********
+ * Buttons *
+ ***********/
+
+.button,
+.button.menuitem.menubar,
+GtkComboBox.combobox-entry .button {
+	padding: 1px 4px;
+}
+
+.button {
+	-GtkButton-image-spacing: 4;
+	-GtkButton-interior-focus: true;
+	-GtkButton-default-border: 0;
+	-GtkButton-inner-border: 3;
+	color: @theme_text_color;
+	border-style: solid;
+	border-color: transparent;
+}
+
+/* We may want a background for focused buttons, but in the meantime let's remove it too */
+.primary-toolbar .button,
+.primary-toolbar .button:insensitive {
+	background-image: none;
+	background-color: transparent;
+}
+
+.primary-toolbar .button {
+	border-image: none;
+	border-style: solid;
+	border-width: 1px 1px 2px 1px;
+	border-color: transparent;
+}
+
+.primary-toolbar .button *:active,
+.inline-toolbar .button *:active,
+.button *:active {
+	color: @button_active_text_color;
+}
+
+.button *:insensitive,
+.button *:active:insensitive {
+	color: @insensitive_fg_color;
+}
+
+.button .separator {
+	color: shade(@internal_element_color, 1.30);
+}
+
+/*****************
+ * GtkSpinButton *
+ *****************/
+
+.spinbutton .button,
+.spinbutton .button:focus {
+	color: @internal_element_color;
+	padding: 2px 6px;
+	border-width: 0 0 0 1px;
+	border-radius: 0;
+	border-style: solid;
+	border-color: @spinbutton_border_color;
+	border-image: none;
+}
+
+.spinbutton .button {
+	background-color: transparent;
+}
+
+.spinbutton .button:insensitive {
+	color: @internal_element_insensitive_color;
+}
+
+.spinbutton .button:active,
+.spinbutton .button:active:focus,
+.spinbutton .button:hover {
+	color: @internal_element_hover_color;
+}
+
+.spinbutton .button:first-child {
+	border-radius: 2px 0 0 2px;
+}
+
+.spinbutton .button:last-child {
+	border-radius: 0 2px 2px 0;
+}
+
+/*********************
+ * Button background *
+ *********************/
+
+/* Button background */
+.button,
+.spinbutton .button,
+.toolbar .button.raised,
+.toolbar .raised .button,
+.toolbar .button.raised:focus,
+.toolbar .raised .button:focus,
+.toolbar GtkComboBox .button,
+.toolbar GtkComboBox .button:focus,
+GtkComboBox.combobox-entry .button,
+.primary-toolbar GtkComboBox.combobox-entry .button,
+GtkColorChooserWidget #add-color-button {
+	background-image: -gtk-gradient (linear,
+	                  left top,
+	                  left bottom,
+	                  from (@button_gradient_a),
+	                  color-stop (0.50, @button_gradient_b),
+	                  color-stop (0.50, @button_gradient_c),
+	                  to (@button_gradient_d));
+	background-color: transparent;
+}
+
+/* Pushed button background */
+.button:active,
+.button:active:hover,
+.spinbutton .button:active,
+.spinbutton .button:active:hover,
+.toolbar .button:active,
+.toolbar .button:active:hover,
+.toolbar .button.raised:active,
+.toolbar .raised .button:active,
+.toolbar .button.raised:active:hover,
+.toolbar .raised .button:active:hover,
+.primary-toolbar GtkComboBox.combobox-entry .button:active,
+GtkComboBox.combobox-entry .button:active,
+.primary-toolbar .button:active,
+.primary-toolbar .button:active:hover,
+.primary-toolbar .button:focus:active,
+.primary-toolbar .button:focus:active:hover,
+.inline-toolbar .button:active,
+.inline-toolbar .button:active:hover {
+	background-image: linear-gradient(to bottom,
+	                  @button_active_gradient_a,
+	                  @button_active_gradient_b 3px,
+	                  @button_active_gradient_c 4px,
+	                  @button_active_gradient_d 50%,
+	                  @button_active_gradient_e 50%,
+	                  @button_active_gradient_f);
+	background-color: transparent;
+}
+
+.trough,
+.trough.highlight,
+.trough row,
+.trough row:hover {
+	background-image: linear-gradient(to bottom,
+	                  @trough_gradient_a,
+	                  @trough_gradient_b 4px);
+}
+
+/* Flipped pushed button background for vertical progressbar through and the like */
+.trough.vertical {
+	background-image: linear-gradient(to right,
+	                  @trough_gradient_a,
+	                  @trough_gradient_b 4px);
+}
+
+/* Prelit button background */
+.button:hover,
+.spinbutton .button:hover,
+.toolbar .button:hover,
+.toolbar .button.raised:hover,
+.toolbar .raised .button:hover,
+.toolbar GtkComboBox .button:hover,
+.primary-toolbar .button:hover,
+GtkComboBox.combobox-entry .button:hover,
+.primary-toolbar GtkComboBox.combobox-entry .button:hover,
+GtkColorChooserWidget #add-color-button:hover {
+	background-color: transparent;
+	background-image: linear-gradient(to bottom,
+	                  @button_hover_gradient_a 5%,
+	                  @button_hover_gradient_b 95%,
+	                  @button_hover_gradient_c);
+}
+
+/* Insensitive button background */
+.button:insensitive,
+.toolbar GtkComboBox .button:insensitive,
+GtkComboBox.combobox-entry .button:insensitive {
+	background-image: linear-gradient(to bottom,
+	                  @button_insensitive_inner_border_color 1px,
+	                  @button_insensitive_gradient_a 2px,
+	                  @button_insensitive_gradient_b 50%,
+	                  @button_insensitive_gradient_c 50%,
+	                  @button_insensitive_gradient_d);
+	background-color: @insensitive_bg_color;
+}
+
+/* Pushed + Insensitive button background */
+.button:active:insensitive,
+.toolbar .button:active:insensitive,
+.toolbar GtkComboBox .button:active:insensitive {
+	background-image: linear-gradient(to bottom,
+	                  @button_active_insensitive_gradient_a,
+	                  @button_active_insensitive_gradient_b 3px,
+	                  @button_active_insensitive_gradient_c 4px,
+	                  @button_active_insensitive_gradient_d 50%,
+	                  @button_active_insensitive_gradient_e 50%,
+	                  @button_active_insensitive_gradient_f);
+	background-color: transparent;
+}
+
+/* Focused primary toolbar button background */
+.primary-toolbar .button:focus {
+	background-image: linear-gradient(to bottom,
+	                  @pt_button_focus_gradient_a,
+	                  @pt_button_focus_gradient_b 50%,
+	                  @pt_button_focus_gradient_c 50%,
+	                  @pt_button_focus_gradient_d);
+}
+
+/* Focused + prelit primary toolbar button background */
+.primary-toolbar .button:focus:hover {
+	background-image: linear-gradient(to bottom,
+	                  @pt_button_focus_hover_gradient_a,
+	                  @pt_button_focus_hover_gradient_b 50%,
+	                  @pt_button_focus_hover_gradient_c 50%,
+	                  @pt_button_focus_hover_gradient_d);
+}
+
+/*****************
+ * Notebooks and *
+ * tabs          *
+ *****************/
+
+.notebook {
+	padding: 0;
+	border-color: @border_color;
+	border-style: solid;
+	border-width: 1px;
+	background-clip: border-box;
+	background-color: @notebook_bg_color;
+	-GtkNotebook-tab-overlap: 2;
+	-GtkNotebook-tab-curvature: 3;
+	-GtkNotebook-initial-gap: 0;
+}
+
+.notebook GtkViewport {
+	background-color: @theme_base_color;
+}
+
+.notebook tab {
+	padding: 3px;
+	border-radius: 3px;
+	border-style: solid;
+	border-width: 1px;
+}
+
+.notebook tab.top {
+	padding: 4px 2px 0 2px;
+	border-width: 1px 1px 0px;
+	background-image: linear-gradient(to bottom,
+	                  @notebook_tab_inner_border_color 1px,
+	                  @notebook_tab_gradient_a 2px,
+	                  @notebook_tab_gradient_b 50%,
+	                  @notebook_tab_gradient_c 50%,
+	                  @notebook_tab_gradient_d);
+}
+
+.notebook tab.right {
+	padding: 2px 4px 2px 0;
+	border-width: 1px 1px 1px 0;
+	background-image: linear-gradient(to left,
+	                  @notebook_tab_inner_border_color 1px,
+	                  @notebook_tab_gradient_a 2px,
+	                  @notebook_tab_gradient_b 50%,
+	                  @notebook_tab_gradient_c 50%,
+	                  @notebook_tab_gradient_d);
+}
+
+.notebook tab.bottom {
+	padding: 0 2px 4px;
+	border-width: 0px 1px 1px;
+	background-image: linear-gradient(to top,
+	                  @notebook_tab_inner_border_color 1px,
+	                  @notebook_tab_gradient_a 2px,
+	                  @notebook_tab_gradient_b 50%,
+	                  @notebook_tab_gradient_c 50%,
+	                  @notebook_tab_gradient_d);
+}
+
+.notebook tab.left {
+	padding: 2px 0 2px 4px;
+	border-width: 1px 0 1px 1px;
+	background-image: linear-gradient(to right,
+	                  @notebook_tab_inner_border_color 1px,
+	                  @notebook_tab_gradient_a 2px,
+	                  @notebook_tab_gradient_b 50%,
+	                  @notebook_tab_gradient_c 50%,
+	                  @notebook_tab_gradient_d);
+}
+
+.notebook tab.top:active {
+	padding-top: 7px;
+	border-top-color: @notebook_active_tab_border;
+	background-image: linear-gradient(to bottom,
+	                  @notebook_active_tab_strip_gradient_a,
+	                  @notebook_active_tab_strip_gradient_b 3px,
+	                  @notebook_active_tab_strip_border_bottom_color 4px,
+	                  @notebook_active_tab_gradient_a 4px,
+	                  @notebook_active_tab_gradient_b);
+}
+
+.notebook tab.right:active {
+	padding-right: 7px;
+	border-right-color: @notebook_active_tab_border;
+	background-image: linear-gradient(to left,
+	                  @notebook_active_tab_strip_gradient_a,
+	                  @notebook_active_tab_strip_gradient_b 3px,
+	                  @notebook_active_tab_strip_border_bottom_color 4px,
+	                  @notebook_active_tab_gradient_a 4px,
+	                  @notebook_active_tab_gradient_b);
+}
+
+.notebook tab.bottom:active {
+	padding-bottom: 7px;
+	border-bottom-color: @notebook_active_tab_border;
+	background-image: linear-gradient(to top,
+	                  @notebook_active_tab_strip_gradient_a,
+	                  @notebook_active_tab_strip_gradient_b 3px,
+	                  @notebook_active_tab_strip_border_bottom_color 4px,
+	                  @notebook_active_tab_gradient_a 4px,
+	                  @notebook_active_tab_gradient_b);
+}
+
+.notebook tab.left:active {
+	padding-left: 7px;
+	border-left-color: @notebook_active_tab_border;
+	background-image: linear-gradient(to right,
+	                  @notebook_active_tab_strip_gradient_a,
+	                  @notebook_active_tab_strip_gradient_b 3px,
+	                  @notebook_active_tab_strip_border_bottom_color 4px,
+	                  @notebook_active_tab_gradient_a 4px,
+	                  @notebook_active_tab_gradient_b);
+}
+
+/* close button styling */
+.notebook tab .button,
+.notebook tab .button:active,
+.notebook tab .button:hover {
+	border-image: none;
+	border-style: none;
+	background-image: none;
+	background-color: transparent;
+}
+
+.notebook tab .button GtkImage {
+	border-radius: 3px;
+	color: mix(@theme_fg_color, @theme_base_color, 0.6);
+	border-style: solid;
+	border-color: transparent;
+	border-width: 1px;
+	padding: 0;
+}
+
+.notebook tab .button GtkImage:hover {
+	color: @theme_fg_color;
+	border-color: alpha(black, 0.1);
+}
+
+.notebook tab .button GtkImage:active,
+.notebook tab .button GtkImage:active:hover {
+	background-color: alpha(black, 0.08);
+	color:  @theme_base_color;
+	border-color: alpha(black, 0.27)
+	              alpha(black, 0.13)
+	              alpha(black, 0.13)
+	              alpha(black, 0.13);
+}
+
+/**************
+ * ComboBoxes *
+ **************/
+
+GtkComboBox {
+	padding: 0;
+	-GtkComboBox-arrow-scaling: 0.5;
+	-GtkComboBox-shadow-type: none;
+}
+
+GtkComboBox *:insensitive {
+	color: @insensitive_fg_color;
+}
+
+GtkComboBox .separator {
+	/* always disable separators */
+	-GtkWidget-wide-separators: true;
+	-GtkWidget-horizontal-separator: 0;
+	-GtkWidget-vertical-separator: 0;
+}
+
+GtkComboBox.combobox-entry .entry:first-child,
+GtkComboBox.combobox-entry .button:first-child {
+	border-image-width: 3px 0 4px 3px;
+	border-radius: 3px 0 0 3px;
+	border-right-width: 0;
+}
+
+GtkComboBox.combobox-entry .entry:last-child,
+GtkComboBox.combobox-entry .button:last-child {
+	border-image-width: 3px 3px 4px 0;
+	border-radius: 0 3px 3px 0;
+	border-left-width: 0;
+}
+
+GtkComboBox.combobox-entry .button:last-child {
+	border-image-width: 3px 3px 4px 2px;
+}
+
+.primary-toolbar GtkComboBox.combobox-entry .entry:first-child,
+.primary-toolbar GtkComboBox.combobox-entry .button:first-child {
+	border-image-width: 4px 0 4px 4px;
+	border-radius: 3px 0 0 3px;
+	border-right-width: 0;
+}
+
+.primary-toolbar GtkComboBox.combobox-entry .entry:last-child,
+.primary-toolbar GtkComboBox.combobox-entry .button:last-child {
+	border-image-width: 4px 4px 4px 0;
+	border-radius: 0 3px 3px 0;
+	border-left-width: 0;
+}
+
+GtkComboBox.combobox-entry .button *:active,
+GtkComboBox.combobox-entry .button *:active:hover {
+	color: @theme_text_color;
+}
+
+GtkComboBox .button {
+	color: @internal_element_color;
+}
+
+GtkComboBox .button *:hover {
+	color: @theme_text_color;
+}
+
+/**************
+ * Scrollbars *
+ **************/
+
+.scrollbar {
+	background-image: none;
+	border-style: solid;
+	-GtkRange-trough-border: 0;
+	-GtkScrollbar-has-backward-stepper: true;
+	-GtkScrollbar-has-forward-stepper: true;
+	-GtkRange-arrow-scaling: 0.4;
+	-GtkRange-slider-width: 15;
+	-GtkRange-stepper-size: 15px;
+	-GtkScrollbar-min-slider-length: 30;
+	-GtkRange-stepper-spacing: 0;
+	-GtkRange-trough-under-steppers: 0;
+}
+
+.scrollbars-junction {
+	background-image: none;
+	background-color: @scrollbars_junction_bg_color;
+}
+
+.scrollbars-junction,
+.scrollbar.trough {
+	border-color: @scrollbar_trough_border_color;
+	border-radius: 0;
+	border-image: none;
+}
+
+.scrollbar.trough.horizontal {
+	border-width: 1px 0px;
+	background-image: -gtk-gradient (linear,
+	                  left top,
+	                  left bottom,
+	                  color-stop (0, @scrollbar_trough_gradient_a),
+	                  color-stop (0.5, @scrollbar_trough_gradient_b));
+}
+
+.scrollbar.trough.vertical {
+	border-width: 0px 1px;
+	background-image: -gtk-gradient (linear,
+	                  left top,
+	                  right top,
+	                  color-stop (0, @scrollbar_trough_gradient_a),
+	                  color-stop (0.5, @scrollbar_trough_gradient_b));
+}
+
+.scrollbar.button {
+	border-width: 1px;
+	border-image: none;
+	border-color: @scrollbar_button_border_color;
+	background-image: none;
+	background-color: transparent;
+	color: @scrollbar_button_color;
+}
+
+.scrollbar.button.top {
+	border-radius: 3px 3px 0px 0px;
+}
+
+.scrollbar.button.bottom {
+	border-radius: 0px 0px 3px 3px;
+}
+
+.scrollbar.button.left {
+	border-radius: 3px 0px 0px 3px;
+}
+
+.scrollbar.button.right {
+	border-radius: 0px 3px 3px 0px;
+}
+
+.scrollbar.button.horizontal {
+	background-image: -gtk-gradient (linear,
+	                  left top,
+	                  left bottom,
+	                  from (@scrollbar_button_gradient_a),
+	                  color-stop (0.50, @scrollbar_button_gradient_b),
+	                  color-stop (0.50, @scrollbar_button_gradient_c),
+	                  to (@scrollbar_button_gradient_d));
+}
+
+.scrollbar.button.vertical {
+	background-image: -gtk-gradient (linear,
+	                  left top,
+	                  right top,
+	                  from (@scrollbar_button_gradient_a),
+	                  color-stop (0.50, @scrollbar_button_gradient_b),
+	                  color-stop (0.50, @scrollbar_button_gradient_c),
+	                  to (@scrollbar_button_gradient_d));
+}
+
+.scrollbar.button.horizontal:hover {
+	background-image: -gtk-gradient (linear,
+	                  left top,
+	                  left bottom,
+	                  from (@scrollbar_button_hover_gradient_a),
+	                  color-stop (0.50, @scrollbar_button_hover_gradient_b),
+	                  color-stop (0.50, @scrollbar_button_hover_gradient_c),
+	                  to (@scrollbar_button_hover_gradient_d));
+}
+
+.scrollbar.button.vertical:hover {
+	background-image: -gtk-gradient (linear,
+	                  left top,
+	                  right top,
+	                  from (@scrollbar_button_hover_gradient_a),
+	                  color-stop (0.50, @scrollbar_button_hover_gradient_b),
+	                  color-stop (0.50, @scrollbar_button_hover_gradient_c),
+	                  to (@scrollbar_button_hover_gradient_d));
+}
+
+.scrollbar.button.horizontal:active {
+	background-image: -gtk-gradient (linear,
+	                  left top,
+	                  left bottom,
+	                  from (@scrollbar_button_active_gradient_a),
+	                  color-stop (0.50, @scrollbar_button_active_gradient_b),
+	                  color-stop (0.50, @scrollbar_button_active_gradient_c),
+	                  to (@scrollbar_button_active_gradient_d));
+}
+
+.scrollbar.button.vertical:active {
+	background-image: -gtk-gradient (linear,
+	                  left top,
+	                  right top,
+	                  from (@scrollbar_button_active_gradient_a),
+	                  color-stop (0.50, @scrollbar_button_active_gradient_b),
+	                  color-stop (0.50, @scrollbar_button_active_gradient_c),
+	                  to (@scrollbar_button_active_gradient_d));
+}
+
+.scrollbar.button:insensitive {
+	color: @scrollbar_button_insensitive_color;
+}
+
+.scrollbar.button.top:insensitive {
+	border-bottom: none;
+}
+
+.scrollbar.button.bottom:insensitive {
+	border-top: none;
+}
+
+.scrollbar.button.left:insensitive {
+	border-right: none;
+}
+
+.scrollbar.button.right:insensitive {
+	border-left: none;
+}
+
+.scrollbar.slider {
+	background-color: @scrollbar_slider_bg_color;
+	background-image: none;
+	border-radius: 0;
+	border-style: solid;
+	border-image: none;
+	border-color: @scrollbar_slider_border_color;
+	border-width: 1px;
+}
+
+.scrollbar.slider:hover {
+	background-color: @scrollbar_slider_hover_bg_color;
+}
+
+/*********
+ * Menus *
+ *********/
+
+/* combobox menus */
+GtkTreeMenu.menu {
+	background-color: @theme_base_color;
+}
+
+GtkTreeMenu .menuitem {
+	padding: 2px;
+}
+
+GtkTreeMenu .menuitem * {
+	color: @theme_text_color;
+}
+
+.menu {
+	background-color: @theme_bg_color;
+	color: @menu_fg_color;
+	padding: 0;
+	border-style: solid;
+	border-width: 1px;
+	border-color: @menu_border_color;
+}
+
+.menu.button {
+	background-image: none;
+	background-color: @theme_base_color;
+	color: @internal_element_color;
+
+	border-image: none;
+	border-style: none;
+}
+
+.menu.button:hover {
+	background-image: none;
+	background-color: @theme_base_color;
+	color: @theme_text_color;
+
+	border-image: none;
+	border-style: none;
+}
+
+.menu.button:insensitive {
+	background-color: @theme_base_color;
+	color: lighter(@internal_element_color);
+
+	border-image: none;
+	border-style: none;
+}
+
+/* this controls the general appearance of the menubar */
+.menubar {
+	border-style: none;
+	padding: 4px;
+	-GtkWidget-window-dragging: true;
+	-GtkMenuBar-internal-padding: 1;
+	background-image: -gtk-gradient (linear,
+	                  left top,
+	                  left bottom,
+	                  from (@menubar_gradient_a),
+	                  color-stop (0.50, @menubar_gradient_b),
+	                  to (@menubar_gradient_c));
+}
+
+.menubar .menuitem {
+	border-style: none;
+	padding: 3px 5px;
+}
+
+.menubar .menuitem:hover {
+	background-color: @theme_bg_color;
+	border-style: solid;
+	border-width: 1px 1px 0px;
+	border-color: @menubar_menuitem_hover_border_color;
+	border-radius: 3px 3px 0 0;
+	background-image: -gtk-gradient (linear,
+	                  left top,
+	                  left bottom,
+	                  from (@menubar_menuitem_hover_gradient_a),
+	                  color-stop (0.50, @menubar_menuitem_hover_gradient_b),
+	                  color-stop (0.50, @menubar_menuitem_hover_gradient_c),
+	                  to (@menubar_menuitem_hover_gradient_d));
+}
+
+.menubar .menuitem *:hover {
+	border-width: 1px;
+	color: @menubar_menuitem_hover_color;
+}
+
+.menu .menuitem {
+	-GtkMenuItem-arrow-scaling: 0.5;
+	padding: 4px;
+}
+
+.menu .menuitem:hover {
+	border-radius: 0;
+}
+
+GtkTreeMenu .menuitem:hover,
+.menu .menuitem:active,
+.menu .menuitem:hover {
+	border-style: solid;
+	border-width: 1px;
+	border-color: @menubar_menuitem_hover_border_color;
+	background-image: -gtk-gradient (linear,
+	                  left top,
+	                  left bottom,
+	                  from (@menubar_menuitem_hover_gradient_a),
+	                  color-stop (0.50, @menubar_menuitem_hover_gradient_b),
+	                  color-stop (0.50, @menubar_menuitem_hover_gradient_c),
+	                  to (@menubar_menuitem_hover_gradient_d));
+}
+
+GtkTreeMenu .menuitem *:hover,
+.menu .menuitem:active,
+.menu .menuitem *:active,
+.menu .menuitem:hover,
+.menu .menuitem *:hover {
+	color: @theme_selected_fg_color;
+}
+
+.menu .menuitem:insensitive,
+.menu .menuitem *:insensitive {
+	color: mix (@menu_fg_color, @theme_bg_color, 0.6);
+}
+
+.menu .menuitem .accelerator:insensitive {
+	color: mix (@menu_fg_color, @theme_bg_color, 0.7);
+}
+
+.menuitem .accelerator {
+	color: alpha (@menu_fg_color, 0.4);
+}
+
+.menuitem .accelerator:hover,
+.menuitem .accelerator:active {
+	color: alpha (@menu_fg_color, 0.3);
+}
+
+.menuitem.arrow {
+	color: @menu_controls_color;
+}
+
+.menuitem.separator {
+	color: @menu_separator_color;
+
+	-GtkMenuItem-horizontal-padding: 0;
+}
+
+.menuitem.check,
+.menuitem.radio,
+.menuitem.check:hover,
+.menuitem.radio:hover,
+.menuitem.check:insensitive,
+.menuitem.radio:insensitive {
+	background-image: none;
+	background-color: transparent;
+}
+
+.menuitem.check:active,
+.menuitem.radio:active {
+	background-color: transparent;
+}
+
+/***************
+ * Menu Button *
+ ***************/
+
+.button.menuitem.menubar:active,
+.button.menuitem.menubar *:active {
+	color: @theme_text_color;
+	background-image: none;
+	background-color: @theme_bg_color;
+	border-radius: 5px 5px 0 0;
+	border-image: none;
+	border-width: 1px 1px 0 1px;
+	border-color: shade(@border_color, 1.30);
+	border-style: solid;
+}
+
+/****************
+ * Radiobuttons *
+ ****************/
+
+.check,
+.radio,
+.check:insensitive,
+.radio:insensitive {
+	background-color: transparent;
+	border-style: none;
+}
+
+.check row:selected:insensitive,
+.check row:selected:focus:insensitive {
+	background-color: transparent;
+}
+
+GtkCheckButton:hover,
+GtkCheckButton:active:hover,
+GtkCheckButton:selected,
+GtkCheckButton:selected:focus {
+	background-color: transparent;
+}
+
+/************
+ * Toolbars *
+ ************/
+
+.toolbar {
+	border-style: none;
+	border-color: darker (@theme_bg_color);
+	padding: 4px;
+}
+
+.toolbar .button {
+	padding: 1px;
+}
+
+.toolbar:insensitive {
+	color: alpha (@theme_fg_color, 0.6);
+}
+
+/********************
+ * Menubar Toolbars *
+ ********************/
+
+.toolbar.menubar {
+	border-style: none;
+	-GtkToolbar-button-relief: normal;
+	padding-left: 4px;
+	padding-right: 4px;
+}
+
+/********************
+ * Primary Toolbars *
+ ********************/
+
+/* applications using EggEditableToolbar usually set the primary-toolbar
+ * hint on the containing vbox, so we need to handle both these cases here.
+ */
+.primary-toolbar .toolbar,
+.primary-toolbar.toolbar {
+	border-width: 1px 0 1px 0;
+	border-radius: 0;
+	border-style: solid;
+	border-top-color: @toolbar_border_top_color;
+	border-bottom-color: @toolbar_border_bottom_color;
+	-GtkWidget-window-dragging: true;
+	-GtkToolbar-button-relief: normal;
+}
+
+.primary-toolbar .toolbar:insensitive,
+.primary-toolbar.toolbar:insensitive {
+	background-image: none;
+	background-color: shade (@theme_bg_color, 0.97);
+	border-color: shade (@theme_bg_color, 0.91);
+}
+
+/* progressbars on primary toolbar entries are special */
+.primary-toolbar .toolbar .entry.progressbar,
+.primary-toolbar.toolbar .entry.progressbar {
+	background-image: -gtk-gradient (linear,
+	                  left top, left bottom,
+	                  from (@trough_gradient_a),
+	                  to (@trough_gradient_b));
+	border-width: 1px;
+	border-radius: 2px;
+	border-style: solid;
+	border-color: shade(@internal_element_color, 1.10);
+	border-image: none;
+	color: @theme_text_color;
+}
+
+/*******************
+ * Inline toolbars *
+ *******************/
+
+.inline-toolbar.toolbar {
+	border-width: 1px;
+	border-radius: 0;
+	border-style: solid;
+	-GtkToolbar-button-relief: normal;
+	padding: 4px;
+}
+
+.inline-toolbar.toolbar:last-child {
+	border-width: 0 1px 1px 1px;
+	border-radius: 0 0 3px 3px;
+}
+
+/* Primary and inline toolbars background */
+.primary-toolbar .toolbar,
+.primary-toolbar.toolbar,
+.inline-toolbar.toolbar  {
+	background-color: transparent;
+	background-image: linear-gradient(to bottom,
+	                  @toolbar_inner_border_color 1px,
+	                  @toolbar_gradient_a 2px,
+	                  @toolbar_gradient_b 50%,
+	                  @toolbar_gradient_c 50%,
+	                  @toolbar_gradient_d);
+}
+
+/***********
+ * Sidebar *
+ ***********/
+
+.sidebar,
+.sidebar .view {
+	background-color: @sidebar_bg_color;
+}
+
+.sidebar .scrollbar.trough {
+	border-radius: 100px;
+	border-style: solid;
+	border-width: 2px;
+	border-color: transparent;
+}
+
+.sidebar .scrollbar.trough {
+	background-color: shade(@sidebar_bg_color, 0.8);
+}
+
+.sidebar .scrollbar.slider {
+	background-color: @sidebar_bg_color;
+}
+
+.sidebar .scrollbar.slider:hover {
+	background-color: @theme_base_color;
+}
+
+.sidebar .radio,
+.sidebar .radio:focus,
+.sidebar .radio:selected {
+	background-image: none;
+	background-color: transparent;
+}
+
+/*******
+ * OSD *
+ *******/
+
+.osd {
+	color: @osd_fg_color;
+	background-color: @osd_bg_color;
+	border-width: 1px;
+	border-style: solid;
+	border-color: @osd_border_color;
+}
+
+/****************
+ * GtkAssistant *
+ ****************/
+
+GtkAssistant .sidebar .highlight {
+	color: @theme_fg_color;
+	font: bold;
+}
+
+GtkAssistant .sidebar {
+	padding: 12px;
+	border-width: 1px;
+	border-radius: 2px;
+	border-style: solid;
+	border-color: @gtkassistant_sidebar_border_color;
+	color: mix (@theme_fg_color, @theme_bg_color, 0.40);
+	background-color: shade (@theme_bg_color, 0.97);
+	/* shall we make it like sidebars in general? */
+}
+
+/*************
+ * GtkSwitch *
+ *************/
+
+GtkSwitch {
+	color: @switch_color;
+}
+
+GtkScale.progressbar,
+GtkSwitch.trough:active {
+	color: @switch_trough_active_color;
+}
+
+GtkSwitch.trough:active {
+	background-image: -gtk-gradient (linear,
+	                  left top, left bottom,
+	                  from (@switch_trough_active_gradient_a),
+	                  to (@switch_trough_active_gradient_b));
+}
+
+GtkSwitch.trough:insensitive {
+	background-image: none;
+	background-color: @insensitive_bg_color;
+	color: mix(@insensitive_bg_color, @insensitive_fg_color, 0.5);
+}
+
+GtkSwitch.slider {
+	background-color: @switch_slider_bg_color;
+	border-width: 1px;
+	border-radius: 2px;
+	border-style: solid;
+	border-color: @switch_slider_border_color;
+	padding: 0px 0px 1px 0px;
+}
+
+GtkSwitch.slider:insensitive {
+	background-color: @switch_slider_insensitive_bg_color;
+	border-color: @insensitive_border_color;
+}
+
+GtkTreeView {
+	-GtkTreeView-vertical-separator: 0;
+	-GtkTreeView-expander-size: 13;
+	-GtkWidget-focus-line-width: 1;
+	-GtkWidget-focus-padding: 1;
+}
+
+GtkTreeView.dnd {
+	border-color: @internal_element_color;
+	border-radius: 2px;
+	border-width: 1px;
+	border-style: solid;
+}
+
+GtkViewport,
+GtkIconView {
+	border-radius: 3px;
+	padding: 0;
+	background-color: @theme_base_color;
+}
+
+GtkIconView.view.cell:selected,
+GtkIconView.view.cell:selected:focus {
+	background-color: @theme_selected_bg_color;
+	color: @theme_selected_fg_color;
+	border-radius: 4px;
+}
+
+.view,
+GtkTreeView {
+	background-color: @theme_base_color;
+	color: @theme_text_color;
+}
+
+.view:selected,
+GtkTreeView:selected {
+	background-color: @theme_selected_bg_color;
+	color: @theme_selected_fg_color;
+}
+
+.view:insensitive,
+GtkTreeView:insensitive {
+	background-color: @insensitive_bg_color;
+	color: @insensitive_fg_color;
+}
+
+GtkTreeView:selected:focus {
+}
+
+column-header.button,
+column-header .button {
+	color: @internal_element_color;
+}
+
+column-header.button,
+column-header .button,
+column-header.button:insensitive,
+column-header .button:insensitive,
+column-header.button:hover,
+column-header .button:hover,
+column-header.button:focus:hover,
+column-header .button:focus:hover {
+	background-color: @theme_base_color;
+	background-image: -gtk-gradient (linear,
+	                  left top,
+	                  left bottom,
+	                  from (@column_header_button_gradient_a),
+	                  color-stop (0.50, @column_header_button_gradient_b),
+	                  color-stop (0.50, @column_header_button_gradient_c),
+	                  to (@column_header_button_gradient_d));
+	padding: 0 4px;
+	font-weight: normal;
+}
+
+column-header.button:insensitive,
+column-header .button:insensitive {
+	background-color: @insensitive_bg_color;
+}
+
+column-header.button:hover,
+column-header .button:hover,
+column-header.button:focus:hover,
+column-header .button:focus:hover,
+column-header.button:active:focus:hover,
+column-header .button:active:focus:hover,
+column-header.button:active:focus,
+column-header .button:active:focus,
+column-header.button:active:hover,
+column-header .button:active:hover,
+column-header.button *:active,
+column-header .button *:active,
+column-header.button *:active:hover,
+column-header .button *:active:hover {
+	color: @internal_element_hover_color;
+}
+
+column-header.button:active,
+column-header .button:active,
+column-header.button:active:hover,
+column-header .button:active:hover,
+column-header.button:active:hover:focus,
+column-header .button:active:hover:focus,
+column-header.button:active:focus,
+column-header .button:active:focus {
+	background-color: @entry_bg_color;
+	background-image: none;
+}
+
+row:hover {
+	border-width: 0;
+}
+
+row:insensitive {
+	border-width: 0;
+}
+
+row:selected,
+row:selected:focus {
+	border-width: 0;
+}
+
+row:selected:focus,
+.cell:selected {
+	background-image: -gtk-gradient (linear,
+	                  left top,
+	                  left bottom,
+	                  from (@menubar_menuitem_hover_gradient_a),
+	                  color-stop (0.50, @menubar_menuitem_hover_gradient_b),
+	                  color-stop (0.50, @menubar_menuitem_hover_gradient_c),
+	                  to (@menubar_menuitem_hover_gradient_d));
+}
+
+.cell {
+	color: @theme_text_color;
+	padding: 2px;
+	border-width: 0;
+}
+
+.cell:selected {
+	color: @theme_selected_fg_color;
+}
+
+.expander {
+	border-style: solid;
+	border-width: 1px;
+	border-radius: 2px;
+	border-color: shade (@internal_element_color, 1.40);
+	color: @theme_base_color;
+	background-color: @theme_base_color;
+}
+
+.expander:active {
+	border-style: solid;
+	border-width: 1px;
+	border-color: shade (@internal_element_color, 1.40);
+	background-color: @theme_base_color;
+}
+
+.expander:hover {
+	border-style: solid;
+	border-width: 1px;
+	color: @internal_element_color;
+	border-color: shade (@internal_element_color, 1.40);
+	background-color: shade (@theme_bg_color, 1.02);
+}
+
+.expander row {
+	border-radius: 2px;
+}
+
+.expander row:selected,
+.expander row:selected:focus {
+	border-style: solid;
+	border-width: 1px;
+	border-color: @expander_row_selected_border_color;
+	color: @expander_row_selected_color;
+	background-color: @theme_selected_bg_color;
+}
+
+/* Calendars */
+GtkCalendar {
+	padding: 2px;
+}
+
+GtkCalendar.view {
+	border-radius: 3px;
+	border-style: solid;
+	border-width: 1px;
+	padding: 2px;
+}
+
+GtkCalendar.header {
+	border-radius: 0;
+	background-image: -gtk-gradient (linear,
+	                  left top,
+	                  left bottom,
+	                  from (shade (@theme_bg_color, 1.04)),
+	                  to (shade (@theme_bg_color, 0.89)));
+	border-width: 0;
+}
+
+GtkCalendar.button,
+GtkCalendar.button:insensitive {
+	background-image: none;
+	background-color: transparent;
+}
+
+.highlight,
+GtkCalendar.highlight {
+	background-color: @theme_selected_bg_color;
+	color: @theme_selected_fg_color;
+	border-radius: 0;
+	padding: 0;
+	border-width: 0;
+}
+
+/* Use different button and entry borders on infobars */
+GtkInfoBar .entry,
+GtkInfoBar .entry:focus,
+GtkInfoBar .button,
+GtkInfoBar .button:insensitive,
+GtkInfoBar .button:active,
+GtkInfoBar .button:focus,
+GtkInfoBar .button:active:focus,
+.info .entry,
+.info .entry:focus,
+.info .button,
+.info .button:insensitive,
+.info .button:active,
+.info .button:focus,
+.info .button:active:focus,
+.warning .entry,
+.warning .entry:focus,
+.warning .button,
+.warning .button:insensitive,
+.warning .button:active,
+.warning .button:focus,
+.warning .button:active:focus,
+.question .entry,
+.question .entry:focus,
+.question .button,
+.question .button:insensitive,
+.question .button:active,
+.question .button:focus,
+.question .button:active:focus,
+.error .entry,
+.error .entry:focus,
+.error .button,
+.error .button:insensitive,
+.error .button:active,
+.error .button:focus,
+.error .button:active:focus {
+	border-image: none;
+	border-color: shade(@border_color, 0.9);
+	border-style: solid;
+	border-width: 1px;
+}
+
+GtkInfoBar:last-child,
+.info:last-child,
+.warning:last-child,
+.question:last-child,
+.error:last-child {
+	/* only apply a border on the last infobar if
+	 * there's more than one packed in */
+	border-bottom-width: 1px;
+	border-style: solid;
+}
+
+.info {
+	background-color: @info_bg_color;
+	color: @info_fg_color;
+	border-color: darker(@info_bg_color);
+}
+
+.warning {
+	background-color: @warning_bg_color;
+	color: @warning_fg_color;
+	border-color: darker(@warning_bg_color);
+}
+
+.question {
+	background-color: @question_bg_color;
+	color: @question_fg_color;
+	border-color: darker(@question_bg_color);
+}
+
+.error {
+	background-color: @error_bg_color;
+	color: @error_fg_color;
+	border-color: darker(@error_bg_color);
+}
+
+.view.dim-label,
+.dim-label,
+.dim-label:hover,
+.dim-label:focus {
+	color: mix (@theme_fg_color, @theme_bg_color, 0.50);
+}
+
+.dim-label:selected,
+.dim-label:selected:focus {
+	color: mix (@theme_selected_fg_color, @theme_base_color, 0.50);
+}
+
+/***************
+ * Resize grip *
+ ***************/
+
+.grip {
+	background-color: transparent;
+}
+
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/gtk.css b/desktop-themes/TraditionalOkTest/gtk-3.0/gtk.css
new file mode 100644
index 00000000..c916fc5a
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/gtk.css
@@ -0,0 +1,397 @@
+/******************
+ * imports 1 of 2 *
+ ******************/
+
+@import url("gtk-variant.css");
+
+/***********
+ * general *
+ ***********/
+
+@define-color insensitive_bg_color @theme_bg_color;
+@define-color insensitive_fg_color shade(@core_color_b, 0.70);
+@define-color insensitive_text_shadow_color @theme_base_color;
+
+@define-color internal_element_color @theme_text_color;
+@define-color internal_element_hover_color @theme_text_color;
+@define-color internal_element_insensitive_color @insensitive_fg_color;
+
+/* border */
+
+@define-color border_color shade(@core_color_b, 0.67);
+@define-color focus_border_color mix(#acacac, shade(@core_color_a, 0.75), 0.54);
+@define-color insensitive_border_color shade(@core_color_b, 0.79);
+
+/**********
+ * button *
+ **********/
+
+@define-color button_gradient_a shade(@core_color_b, 1.07);
+@define-color button_gradient_b shade(@core_color_b, 1.06);
+@define-color button_gradient_c shade(@core_color_b, 1.04);
+@define-color button_gradient_d shade(@core_color_b, 0.98);
+
+/* hover */
+
+@define-color button_hover_gradient_a @theme_base_color;
+@define-color button_hover_gradient_b shade(@core_color_b, 1.05);
+@define-color button_hover_gradient_c @core_color_b;
+
+/* active */
+
+@define-color button_active_text_color @theme_fg_color;
+
+@define-color button_active_gradient_a shade(@core_color_b, 0.85);
+@define-color button_active_gradient_b shade(@core_color_b, 0.90);
+@define-color button_active_gradient_c shade(@core_color_b, 0.91);
+@define-color button_active_gradient_d shade(@core_color_b, 0.86);
+@define-color button_active_gradient_e shade(@core_color_b, 0.84);
+@define-color button_active_gradient_f shade(@core_color_b, 0.80);
+
+/* insensitive */
+
+@define-color button_insensitive_inner_border_color shade(@core_color_b, 1.05);
+
+@define-color button_insensitive_gradient_a shade(@core_color_b, 1.04);
+@define-color button_insensitive_gradient_b shade(@core_color_b, 1.01);
+@define-color button_insensitive_gradient_c shade(@core_color_b, 0.99);
+@define-color button_insensitive_gradient_d shade(@core_color_b, 0.96);
+
+/* active insensitive */
+
+@define-color button_active_insensitive_gradient_a shade(@core_color_b, 0.98);
+@define-color button_active_insensitive_gradient_b shade(@core_color_b, 1.02);
+@define-color button_active_insensitive_gradient_c shade(@core_color_b, 1.03);
+@define-color button_active_insensitive_gradient_d shade(@core_color_b, 1.01);
+@define-color button_active_insensitive_gradient_e shade(@core_color_b, 0.99);
+@define-color button_active_insensitive_gradient_f shade(@core_color_b, 0.96);
+
+/* primary toolbar focus */
+
+@define-color pt_button_focus_gradient_a mix(#fafafa, shade(@core_color_a, 1.09), 0.3);
+@define-color pt_button_focus_gradient_b mix(#ededed, shade(@core_color_a, 1.05), 0.3);
+@define-color pt_button_focus_gradient_c mix(#e8e8e8, shade(@core_color_a, 1.01), 0.25);
+@define-color pt_button_focus_gradient_d mix(#e8e8e8, shade(@core_color_a, 0.96), 0.3);
+
+/* primary toolbar focus hover */
+
+@define-color pt_button_focus_hover_gradient_a mix(#fcfcfc, shade(@core_color_a, 1.09), 0.15);
+@define-color pt_button_focus_hover_gradient_b mix(#fcfcfc, shade(@core_color_a, 1.05), 0.15);
+@define-color pt_button_focus_hover_gradient_c mix(#fcfcfc, shade(@core_color_a, 1.01), 0.2);
+@define-color pt_button_focus_hover_gradient_d mix(#e8e8e8, shade(@core_color_a, 0.96), 0.2);
+
+/*****************
+ * color chooser *
+ *****************/
+
+@define-color color_swatch_border_color @border_color;
+@define-color color_swatch_hover_border_color @menubar_menuitem_hover_border_color;
+
+@define-color color_active_badge_light_border_color @theme_fg_color;
+@define-color color_active_badge_light_color @color_active_badge_light_border_color;
+
+@define-color color_active_badge_dark_border_color @theme_base_color;
+@define-color color_active_badge_dark_color @color_active_badge_light_border_color;
+
+/*****************
+ * column-header *
+ *****************/
+
+@define-color column_header_border_top_color @theme_base_color;
+@define-color column_header_border_right_color shade(@core_color_b, 0.82);
+@define-color column_header_border_bottom_color shade(@core_color_b, 0.70);
+@define-color column_header_border_left_color @column_header_border_top_color;
+
+@define-color column_header_button_gradient_a shade(@core_color_b, 1.05);
+@define-color column_header_button_gradient_b shade(@core_color_b, 1.02);
+@define-color column_header_button_gradient_c @core_color_b;
+@define-color column_header_button_gradient_d shade(@core_color_b, 0.96);
+
+/*********
+ * entry *
+ *********/
+
+@define-color entry_text_color @theme_text_color;
+
+@define-color entry_inner_border_color shade(@core_color_b, 0.96);
+@define-color entry_bg_color @theme_base_color;
+
+/* insensitive */
+
+@define-color entry_insensitive_inner_border_color shade(@core_color_b, 0.97);
+@define-color entry_insensitive_bg_color @insensitive_bg_color;
+
+/************
+ * expander *
+ ************/
+
+@define-color expander_row_selected_border_color mix(#acacac, shade(@core_color_a, 0.75), 0.54);
+
+/*****************
+ * fallback mode *
+ *****************/
+
+@define-color os_chrome_bg_color @theme_bg_color;
+@define-color os_chrome_fg_color @theme_fg_color;
+
+/* gnome-panel */
+
+@define-color applet_frame_bg_color shade(@core_color_b, 0.89);
+@define-color pager_bg_color shade(@core_color_b, 0.97);
+
+/*******************************
+ * info/question/error/warning *
+ *******************************/
+
+@define-color info_bg_color @theme_tooltip_bg_color;
+@define-color info_fg_color @theme_fg_color;
+
+@define-color question_bg_color mix(#727272, shade(@core_color_a, 0.90), 0.95);
+@define-color question_fg_color @theme_base_color;
+
+@define-color error_bg_color mix(#ababab, shade(@error_color, 0.77), 0.78);
+@define-color error_fg_color @theme_base_color;
+
+@define-color warning_fg_color @theme_fg_color;
+
+/********
+ * menu *
+ ********/
+
+@define-color menu_bg_color @theme_base_color;
+@define-color menu_fg_color @theme_fg_color;
+
+/* Example: submenu arrow. */
+@define-color menu_controls_color @theme_fg_color;
+
+@define-color menu_border_color shade(@core_color_b, 0.72);
+@define-color menu_separator_color @menu_border_color;
+
+/***********
+ * menubar *
+ ***********/
+
+@define-color menubar_gradient_a shade(@core_color_b, 0.99);
+@define-color menubar_gradient_b shade(@core_color_b, 0.98);
+@define-color menubar_gradient_c shade(@core_color_b, 0.96);
+
+/* hover */
+
+@define-color menubar_menuitem_hover_color @theme_selected_fg_color;
+@define-color menubar_menuitem_hover_border_color shade(@core_color_a, 0.58);
+
+@define-color menubar_menuitem_hover_gradient_a @core_color_a;
+@define-color menubar_menuitem_hover_gradient_b shade(@core_color_a, 0.95);
+@define-color menubar_menuitem_hover_gradient_c shade(@core_color_a, 0.93);
+@define-color menubar_menuitem_hover_gradient_d shade(@core_color_a, 0.88);
+
+/************
+ * notebook *
+ ************/
+
+@define-color notebook_bg_color shade(@core_color_b, 1.02);
+
+@define-color notebook_tab_inner_border_color shade(@core_color_b, 1.04);
+
+@define-color notebook_tab_gradient_a shade(@core_color_b, 0.97);
+@define-color notebook_tab_gradient_b shade(@core_color_b, 0.92);
+@define-color notebook_tab_gradient_c shade(@core_color_b, 0.90);
+@define-color notebook_tab_gradient_d shade(@core_color_b, 0.86);
+
+/* active tab */
+
+@define-color notebook_active_tab_border @menubar_menuitem_hover_border_color;
+
+@define-color notebook_active_tab_strip_gradient_a shade(@core_color_a, 1.05);
+@define-color notebook_active_tab_strip_gradient_b shade(@core_color_a, 0.94);
+@define-color notebook_active_tab_strip_border_bottom_color mix(#727272, shade(@core_color_a, 0.84), 0.65);
+@define-color notebook_active_tab_gradient_a shade(@core_color_b, 1.07);
+@define-color notebook_active_tab_gradient_b @notebook_bg_color;
+
+/*******
+ * osd *
+ *******/
+
+@define-color osd_bg_color @theme_tooltip_bg_color;
+@define-color osd_fg_color @theme_tooltip_fg_color;
+@define-color osd_border_color @theme_tooltip_border_color;
+
+/***************
+ * progressbar *
+ ***************/
+
+@define-color progressbar_border_color mix(#6a6a6a, shade(@core_color_a, 0.75), 0.80);
+@define-color progressbar_pattern_color @progressbar_border_color;
+
+@define-color progressbar_bg_color @core_color_a;
+
+@define-color progressbar_gradient_a @progressbar_bg_color;
+@define-color progressbar_gradient_b @menubar_menuitem_hover_gradient_b;
+@define-color progressbar_gradient_c @menubar_menuitem_hover_gradient_c;
+@define-color progressbar_gradient_d @menubar_menuitem_hover_gradient_d;
+
+/*********
+ * scale *
+ *********/
+
+@define-color scale_mark_color @border_color;
+@define-color scale_progressbar_bg_color @scale_trough_highlight_gradient_b;
+
+@define-color scale_trough_border_color shade(@core_color_b, 0.56);
+@define-color scale_trough_bg_color shade(@core_color_b, 0.90);
+
+/* trough highlight */
+
+@define-color scale_trough_highlight_border_color mix(#2b2b2b, shade(@core_color_a, 0.75), 0.80);
+@define-color scale_trough_highlight_bg_color shade(@core_color_a, 0.92);
+
+/* trough insensitive */
+
+@define-color scale_trough_insensitive_border_color @insensitive_border_color;
+@define-color scale_trough_insensitive_bg_color shade(@core_color_b, 0.97);
+
+/* trough highlight insensitive */
+
+@define-color scale_trough_highlight_insensitive_border_color mix(#6a6a6a, shade(@core_color_a, 0.88), 0.90);
+@define-color scale_trough_highlight_insensitive_bg_color shade(@core_color_a, 1.20);
+
+/*************
+ * scrollbar *
+ *************/
+
+/* junction */
+
+@define-color scrollbars_junction_bg_color @theme_bg_color;
+
+/* trough */
+
+@define-color scrollbar_trough_border_color shade(@core_color_b, 0.67);
+
+@define-color scrollbar_trough_gradient_a shade(@core_color_b, 0.86);
+@define-color scrollbar_trough_gradient_b shade(@core_color_b, 0.90);
+
+/* slider */
+
+@define-color scrollbar_slider_bg_color shade(@core_color_a, 0.99);
+
+@define-color scrollbar_slider_gradient_a @scrollbar_slider_bg_color;
+@define-color scrollbar_slider_gradient_b shade(@core_color_a, 0.96);
+@define-color scrollbar_slider_gradient_c shade(@core_color_a, 0.92);
+@define-color scrollbar_slider_gradient_d shade(@core_color_a, 0.88);
+
+@define-color scrollbar_slider_border_color mix(#000000, shade(@core_color_a, 0.72), 0.95);
+
+@define-color scrollbar_slider_inner_border_color shade(@core_color_a, 1.04);
+
+/* slider hover */
+
+@define-color scrollbar_slider_hover_bg_color shade(@core_color_a, 1.03);
+
+@define-color scrollbar_slider_hover_gradient_a @scrollbar_slider_hover_bg_color;
+@define-color scrollbar_slider_hover_gradient_b shade(@core_color_a, 0.99);
+@define-color scrollbar_slider_hover_gradient_c shade(@core_color_a, 0.96);
+@define-color scrollbar_slider_hover_gradient_d shade(@core_color_a, 0.91);
+
+/* button */
+
+@define-color scrollbar_button_color @theme_fg_color;
+@define-color scrollbar_button_insensitive_color @internal_element_insensitive_color;
+@define-color scrollbar_button_border_color shade(@core_color_b, 0.56);
+
+@define-color scrollbar_button_gradient_a shade(@core_color_b, 1.07);
+@define-color scrollbar_button_gradient_b shade(@core_color_b, 1.02);
+@define-color scrollbar_button_gradient_c shade(@core_color_b, 0.99);
+@define-color scrollbar_button_gradient_d shade(@core_color_b, 0.95);
+
+/* button hover */
+
+@define-color scrollbar_button_hover_gradient_a shade(@core_color_b, 1.07);
+@define-color scrollbar_button_hover_gradient_b shade(@core_color_b, 1.05);
+@define-color scrollbar_button_hover_gradient_c shade(@core_color_b, 1.02);
+@define-color scrollbar_button_hover_gradient_d shade(@core_color_b, 0.97);
+
+/* button active */
+
+@define-color scrollbar_button_active_gradient_a shade(@core_color_b, 0.95);
+@define-color scrollbar_button_active_gradient_b shade(@core_color_b, 0.92);
+@define-color scrollbar_button_active_gradient_c shade(@core_color_b, 0.89);
+@define-color scrollbar_button_active_gradient_d shade(@core_color_b, 0.85);
+
+/***********
+ * sidebar *
+ ***********/
+
+@define-color sidebar_bg_color @theme_base_color;
+@define-color gtkassistant_sidebar_border_color @border_color;
+
+/**************
+ * spinbutton *
+ **************/
+
+@define-color spinbutton_border_color @border_color;
+
+/**********
+ * switch *
+ **********/
+
+@define-color switch_color shade(@core_color_b, 0.45);
+
+@define-color switch_slider_border_color @progressbar_border_color;
+
+@define-color switch_slider_bg_color @scrollbar_slider_bg_color;
+
+@define-color switch_slider_gradient_a @switch_slider_bg_color;
+@define-color switch_slider_gradient_b @scrollbar_slider_gradient_b;
+@define-color switch_slider_gradient_c @scrollbar_slider_gradient_c;
+@define-color switch_slider_gradient_d @scrollbar_slider_gradient_d;
+
+/* active */
+
+@define-color switch_trough_active_color @theme_base_color;
+
+@define-color switch_trough_active_gradient_a @menubar_menuitem_hover_border_color;
+@define-color switch_trough_active_gradient_b shade(@core_color_a, 1.12);
+
+/* insensitive */
+
+@define-color switch_slider_insensitive_bg_color @button_insensitive_gradient_a;
+
+@define-color switch_slider_insensitive_gradient_a @switch_slider_insensitive_bg_color;
+@define-color switch_slider_insensitive_gradient_b @button_insensitive_gradient_b;
+@define-color switch_slider_insensitive_gradient_c @button_insensitive_gradient_c;
+@define-color switch_slider_insensitive_gradient_d @button_insensitive_gradient_d;
+
+/***********
+ * toolbar *
+ ***********/
+
+@define-color toolbar_border_top_color shade(@core_color_b, 0.82);
+@define-color toolbar_inner_border_color @theme_base_color;
+@define-color toolbar_border_bottom_color @toolbar_border_top_color;
+
+@define-color toolbar_gradient_a shade(@core_color_b, 1.04);
+@define-color toolbar_gradient_b shade(@core_color_b, 1.01);
+@define-color toolbar_gradient_c @core_color_b;
+@define-color toolbar_gradient_d shade(@core_color_b, 0.97);
+
+/***********
+ * tooltip *
+ ***********/
+
+@define-color theme_tooltip_border_color shade(@theme_tooltip_bg_color, 0.60);
+
+/**********
+ * trough *
+ **********/
+
+@define-color trough_gradient_a shade(@core_color_b, 0.81);
+@define-color trough_gradient_b shade(@core_color_b, 0.90);
+
+/******************
+ * imports 2 of 2 *
+ ******************/
+
+@import url("gtk-widgets-img.css");
+@import url("gtk-widgets.css");
+@import url("applications.css");
+
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/Makefile.am b/desktop-themes/TraditionalOkTest/gtk-3.0/img/Makefile.am
new file mode 100644
index 00000000..80bdbb25
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/Makefile.am
@@ -0,0 +1,60 @@
+THEME_NAME=TraditionalOkTest
+
+themedir = $(datadir)/themes/$(THEME_NAME)/gtk-3.0/img
+
+theme_DATA = \
+	border-error.svg \
+	border-focused-ptb.svg \
+	border-focused.svg \
+	border-focused-switch.svg \
+	border-gnome-panel-button.svg \
+	border-inline-button.svg \
+	border-insensitive.svg \
+	border.svg \
+	checkbox-checked-hover.png \
+	checkbox-checked-insensitive.png \
+	checkbox-checked.png \
+	checkbox-mixed-hover.png \
+	checkbox-mixed-insensitive.png \
+	checkbox-mixed.png \
+	checkbox-unchecked-hover.png \
+	checkbox-unchecked-insensitive.png \
+	checkbox-unchecked.png \
+	menuitem-checkbox-checked-hover.png \
+	menuitem-checkbox-checked-insensitive.png \
+	menuitem-checkbox-checked.png \
+	menuitem-checkbox-hover.png \
+	menuitem-checkbox-insensitive.png \
+	menuitem-checkbox-mixed-hover.png \
+	menuitem-checkbox-mixed-insensitive.png \
+	menuitem-checkbox-mixed.png \
+	menuitem-checkbox.png \
+	menuitem-radio-checked-hover.png \
+	menuitem-radio-checked-insensitive.png \
+	menuitem-radio-checked.png \
+	menuitem-radio-hover.png \
+	menuitem-radio-insensitive.png \
+	menuitem-radio.png \
+	pane-separator-grip-horz.png \
+	pane-separator-grip-vert.png \
+	radio-checked-hover.png \
+	radio-checked-insensitive.png \
+	radio-checked.png \
+	radio-mixed-hover.png \
+	radio-mixed-insensitive.png \
+	radio-mixed.png \
+	radio-unchecked-hover.png \
+	radio-unchecked-insensitive.png \
+	radio-unchecked.png \
+	resize-grip.png \
+	scale-slider-horz-hover.png \
+	scale-slider-horz-insensitive.png \
+	scale-slider-horz.png \
+	scale-slider-vert-hover.png \
+	scale-slider-vert-insensitive.png \
+	scale-slider-vert.png \
+	slider-horz-grip.png \
+	slider-vert-grip.png
+
+
+EXTRA_DIST = $(theme_DATA)
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-error.svg b/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-error.svg
new file mode 100644
index 00000000..6532d220
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-error.svg
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16px"
+   height="16px"
+   id="svg33222"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="border-error.svg">
+  <defs
+     id="defs33224">
+    <linearGradient
+       id="linearGradient3837">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3839" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3841" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#8e8e8e"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="33.768656"
+     inkscape:cx="7.9987245"
+     inkscape:cy="7.9987245"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1280"
+     inkscape:window-height="951"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     inkscape:showpageshadow="false"
+     showborder="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2992"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata33227">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.6"
+       d="m 15.5,4 0,8.999999 c 0,1.385 -1.115,2.5 -2.5,2.5 l -9.9999995,0 c -1.3850003,0 -2.5000005,-1.115 -2.5000005,-2.5 L 0.5,4"
+       id="rect17861-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cssssc" />
+    <rect
+       ry="2.5"
+       rx="2.5000005"
+       y="0.5"
+       x="0.5"
+       height="13.999999"
+       width="15"
+       id="rect17861"
+       style="color:#000000;fill:none;stroke:#9b3636;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       ry="1.5"
+       rx="1.5"
+       y="1.5"
+       x="1.5"
+       height="12"
+       width="13.000001"
+       id="rect17861-6"
+       style="color:#000000;fill:none;stroke:#9b3636;stroke-width:0.99999994000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.25000000000000000" />
+  </g>
+</svg>
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-focused-ptb.svg b/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-focused-ptb.svg
new file mode 100644
index 00000000..b360734f
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-focused-ptb.svg
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16px"
+   height="16px"
+   id="svg33222"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="border-focused-2.svg">
+  <defs
+     id="defs33224">
+    <linearGradient
+       id="linearGradient3837">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3839" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3841" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#8e8e8e"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="44.5625"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1280"
+     inkscape:window-height="949"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     inkscape:showpageshadow="false"
+     showborder="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2992"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata33227">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       ry="2.5"
+       rx="2.5000005"
+       y="0.5"
+       x="0.5"
+       height="13.999999"
+       width="15"
+       id="rect17861"
+       style="color:#000000;fill:none;stroke:#869bb7;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       ry="1.5"
+       rx="1.5"
+       y="1.5"
+       x="1.5"
+       height="12"
+       width="13.000001"
+       id="rect17861-6"
+       style="color:#000000;fill:none;stroke:#cccccc;stroke-width:0.99999994000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.25" />
+  </g>
+</svg>
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-focused-switch.svg b/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-focused-switch.svg
new file mode 100644
index 00000000..1402b7f2
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-focused-switch.svg
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16px"
+   height="16px"
+   id="svg33222"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="border-focused2.svg">
+  <defs
+     id="defs33224">
+    <linearGradient
+       id="linearGradient3837">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3839" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3841" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#8e8e8e"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="2.81232"
+     inkscape:cy="9.5803639"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1280"
+     inkscape:window-height="951"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     inkscape:showpageshadow="false"
+     showborder="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2992"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata33227">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.6"
+       d="m 15.5,4 0,8.999999 c 0,1.385 -1.115,2.5 -2.5,2.5 l -9.9999995,0 c -1.3850003,0 -2.5000005,-1.115 -2.5000005,-2.5 L 0.5,4"
+       id="rect17861-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cssssc" />
+    <rect
+       ry="2.5"
+       rx="2.5000005"
+       y="0.5"
+       x="0.5"
+       height="13.999999"
+       width="15"
+       id="rect17861"
+       style="color:#000000;fill:none;stroke:#4b6e99;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+</svg>
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-focused.svg b/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-focused.svg
new file mode 100644
index 00000000..95378763
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-focused.svg
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16px"
+   height="16px"
+   id="svg33222"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="button-border-focused.svg">
+  <defs
+     id="defs33224">
+    <linearGradient
+       id="linearGradient3837">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3839" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3841" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#8e8e8e"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="2.68732"
+     inkscape:cy="9.5803639"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1280"
+     inkscape:window-height="951"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     inkscape:showpageshadow="false"
+     showborder="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2992"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata33227">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.6"
+       d="m 15.5,4 0,8.999999 c 0,1.385 -1.115,2.5 -2.5,2.5 l -9.9999995,0 c -1.3850003,0 -2.5000005,-1.115 -2.5000005,-2.5 L 0.5,4"
+       id="rect17861-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cssssc" />
+    <rect
+       ry="2.5"
+       rx="2.5000005"
+       y="0.5"
+       x="0.5"
+       height="13.999999"
+       width="15"
+       id="rect17861"
+       style="color:#000000;fill:none;stroke:#4b6e99;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       ry="1.5"
+       rx="1.5"
+       y="1.5"
+       x="1.5"
+       height="12"
+       width="13.000001"
+       id="rect17861-6"
+       style="color:#000000;fill:none;stroke:#c8daef;stroke-width:0.99999994000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.80000000000000004" />
+  </g>
+</svg>
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-gnome-panel-button.svg b/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-gnome-panel-button.svg
new file mode 100644
index 00000000..bcc83d8d
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-gnome-panel-button.svg
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16px"
+   height="16px"
+   id="svg33222"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="0.svg">
+  <defs
+     id="defs33224">
+    <linearGradient
+       id="linearGradient4410-4-9-7-9">
+      <stop
+         style="stop-color:#fbfcfb;stop-opacity:1;"
+         offset="0"
+         id="stop4412-6-7-4-4" />
+      <stop
+         style="stop-color: rgb(221, 222, 221); stop-opacity: 1;"
+         offset="1"
+         id="stop4414-9-8-8-8" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5378-2-93"
+       id="linearGradient17869"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.59659086,0,0,0.59090912,-423.94512,-57.054903)"
+       x1="220"
+       y1="304"
+       x2="220"
+       y2="336.06244" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5378-2-93">
+      <stop
+         style="stop-color:#f4f6f4;stop-opacity:1"
+         offset="0"
+         id="stop5380-6-3" />
+      <stop
+         style="stop-color:#d7dad7;stop-opacity:1"
+         offset="1"
+         id="stop5382-06-2" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4410-4-9-7-9"
+       id="linearGradient34952"
+       x1="7.9695358"
+       y1="0.96953601"
+       x2="7.9695358"
+       y2="14.937024"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.88240352,0,0,0.88240352,0.9407721,0.9407716)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="44.5625"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1280"
+     inkscape:window-height="948"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     showborder="true"
+     fit-margin-top="0" />
+  <metadata
+     id="metadata33227">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       ry="2.2060091"
+       rx="2.2060091"
+       y="1.3819733"
+       x="1.3819733"
+       height="13.236053"
+       width="13.236053"
+       id="rect17861"
+       style="color:#000000;fill:none;stroke:#918e8c;stroke-width:0.88240348999999996;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+</svg>
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-inline-button.svg b/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-inline-button.svg
new file mode 100644
index 00000000..1691c52e
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-inline-button.svg
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="18"
+   height="16"
+   id="svg33222"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="border-inline.svg">
+  <defs
+     id="defs33224" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#8e8e8e"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="-0.97883235"
+     inkscape:cy="-0.54712037"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1280"
+     inkscape:window-height="951"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     inkscape:showpageshadow="false"
+     showborder="true"
+     fit-margin-top="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2992"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata33227">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g2991"
+       transform="translate(0,1)">
+      <path
+         sodipodi:nodetypes="cssssc"
+         inkscape:connector-curvature="0"
+         id="rect17861-5"
+         d="M 16.5,3.000001 16.5,12 c 0,1.385 -1.115,2.5 -2.5,2.5 l -9.9999995,0 C 2.6150002,14.5 1.5,13.385 1.5,12 l 0,-8.999999"
+         style="opacity:0.6;color:#000000;fill:none;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         style="color:#000000;fill:none;stroke:#918e8c;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect17861"
+         width="15"
+         height="13.999999"
+         x="1.5"
+         y="-0.49999899"
+         rx="2.5000005"
+         ry="2.5" />
+    </g>
+  </g>
+</svg>
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-insensitive.svg b/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-insensitive.svg
new file mode 100644
index 00000000..2b9e3612
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-insensitive.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16px"
+   height="16px"
+   id="svg33222"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="border-insensitive.svg">
+  <defs
+     id="defs33224" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#8e8e8e"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="-3.4249403"
+     inkscape:cy="-0.54712037"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1280"
+     inkscape:window-height="951"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     inkscape:showpageshadow="false"
+     showborder="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2992"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata33227">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.6"
+       d="m 15.5,4 0,8.999999 c 0,1.385 -1.115,2.5 -2.5,2.5 l -9.9999995,0 c -1.3850003,0 -2.5000005,-1.115 -2.5000005,-2.5 L 0.5,4"
+       id="rect17861-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cssssc" />
+    <rect
+       ry="2.5"
+       rx="2.5000005"
+       y="0.5"
+       x="0.5"
+       height="13.999999"
+       width="15"
+       id="rect17861"
+       style="color:#000000;fill:none;stroke:#a9a5a2;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+</svg>
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/border.svg b/desktop-themes/TraditionalOkTest/gtk-3.0/img/border.svg
new file mode 100644
index 00000000..4b97b514
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/border.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16px"
+   height="16px"
+   id="svg33222"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="border.svg">
+  <defs
+     id="defs33224" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#8e8e8e"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="-11.50355"
+     inkscape:cy="-0.54712037"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1280"
+     inkscape:window-height="951"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     inkscape:showpageshadow="false"
+     showborder="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2992"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata33227">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.6"
+       d="m 15.5,4 0,8.999999 c 0,1.385 -1.115,2.5 -2.5,2.5 l -9.9999995,0 c -1.3850003,0 -2.5000005,-1.115 -2.5000005,-2.5 L 0.5,4"
+       id="rect17861-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cssssc" />
+    <rect
+       ry="2.5"
+       rx="2.5000005"
+       y="0.5"
+       x="0.5"
+       height="13.999999"
+       width="15"
+       id="rect17861"
+       style="color:#000000;fill:none;stroke:#918e8c;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+</svg>
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-checked-hover.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-checked-hover.png
new file mode 100644
index 00000000..07767a38
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-checked-hover.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-checked-insensitive.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-checked-insensitive.png
new file mode 100644
index 00000000..ca4ad904
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-checked-insensitive.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-checked.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-checked.png
new file mode 100644
index 00000000..25370da6
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-checked.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-mixed-hover.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-mixed-hover.png
new file mode 100644
index 00000000..22a3a5e5
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-mixed-hover.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-mixed-insensitive.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-mixed-insensitive.png
new file mode 100644
index 00000000..8b84e388
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-mixed-insensitive.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-mixed.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-mixed.png
new file mode 100644
index 00000000..f68af349
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-mixed.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-unchecked-hover.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-unchecked-hover.png
new file mode 100644
index 00000000..da5fcc74
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-unchecked-hover.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-unchecked-insensitive.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-unchecked-insensitive.png
new file mode 100644
index 00000000..56d6a6cc
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-unchecked-insensitive.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-unchecked.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-unchecked.png
new file mode 100644
index 00000000..5c315ff0
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-unchecked.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-checked-hover.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-checked-hover.png
new file mode 100644
index 00000000..783f8725
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-checked-hover.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-checked-insensitive.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-checked-insensitive.png
new file mode 100644
index 00000000..70c02000
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-checked-insensitive.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-checked.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-checked.png
new file mode 100644
index 00000000..2191b1d7
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-checked.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-hover.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-hover.png
new file mode 100644
index 00000000..c41492f2
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-hover.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-insensitive.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-insensitive.png
new file mode 100644
index 00000000..2f387960
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-insensitive.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-mixed-hover.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-mixed-hover.png
new file mode 100644
index 00000000..48726eec
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-mixed-hover.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-mixed-insensitive.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-mixed-insensitive.png
new file mode 100644
index 00000000..882b675b
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-mixed-insensitive.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-mixed.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-mixed.png
new file mode 100644
index 00000000..15b05201
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-mixed.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox.png
new file mode 100644
index 00000000..69e491b5
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio-checked-hover.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio-checked-hover.png
new file mode 100644
index 00000000..2b793e7a
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio-checked-hover.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio-checked-insensitive.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio-checked-insensitive.png
new file mode 100644
index 00000000..d8bd994d
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio-checked-insensitive.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio-checked.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio-checked.png
new file mode 100644
index 00000000..717f0892
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio-checked.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio-hover.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio-hover.png
new file mode 100644
index 00000000..af5a5ca4
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio-hover.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio-insensitive.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio-insensitive.png
new file mode 100644
index 00000000..d94dfd54
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio-insensitive.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio.png
new file mode 100644
index 00000000..aba5c767
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/pane-separator-grip-horz.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/pane-separator-grip-horz.png
new file mode 100644
index 00000000..2670deba
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/pane-separator-grip-horz.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/pane-separator-grip-vert.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/pane-separator-grip-vert.png
new file mode 100644
index 00000000..6358b068
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/pane-separator-grip-vert.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-checked-hover.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-checked-hover.png
new file mode 100644
index 00000000..fe240e9f
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-checked-hover.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-checked-insensitive.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-checked-insensitive.png
new file mode 100644
index 00000000..46e46c25
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-checked-insensitive.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-checked.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-checked.png
new file mode 100644
index 00000000..6250c17f
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-checked.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-mixed-hover.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-mixed-hover.png
new file mode 100644
index 00000000..075ab049
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-mixed-hover.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-mixed-insensitive.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-mixed-insensitive.png
new file mode 100644
index 00000000..bf64ef22
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-mixed-insensitive.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-mixed.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-mixed.png
new file mode 100644
index 00000000..556083f0
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-mixed.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-unchecked-hover.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-unchecked-hover.png
new file mode 100644
index 00000000..1c39e132
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-unchecked-hover.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-unchecked-insensitive.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-unchecked-insensitive.png
new file mode 100644
index 00000000..e9d18a2f
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-unchecked-insensitive.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-unchecked.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-unchecked.png
new file mode 100644
index 00000000..e903a422
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-unchecked.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/resize-grip.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/resize-grip.png
new file mode 100644
index 00000000..3bd6e607
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/resize-grip.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-horz-hover.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-horz-hover.png
new file mode 100644
index 00000000..a2a1cfd2
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-horz-hover.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-horz-insensitive.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-horz-insensitive.png
new file mode 100644
index 00000000..9319b7b0
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-horz-insensitive.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-horz.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-horz.png
new file mode 100644
index 00000000..355b9d6b
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-horz.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-vert-hover.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-vert-hover.png
new file mode 100644
index 00000000..acfee6b2
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-vert-hover.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-vert-insensitive.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-vert-insensitive.png
new file mode 100644
index 00000000..23402339
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-vert-insensitive.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-vert.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-vert.png
new file mode 100644
index 00000000..acc04350
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-vert.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/slider-horz-grip.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/slider-horz-grip.png
new file mode 100644
index 00000000..313c11dc
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/slider-horz-grip.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/slider-vert-grip.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/slider-vert-grip.png
new file mode 100644
index 00000000..4b5a55a3
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/slider-vert-grip.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/settings.ini b/desktop-themes/TraditionalOkTest/gtk-3.0/settings.ini
new file mode 100644
index 00000000..0ef654c8
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/settings.ini
@@ -0,0 +1,5 @@
+[Settings]
+gtk-color-scheme = "base_color:#babdb6\nbg_color:#888a85\nfg_color:#f5f5f5\nselected_bg_color:#f57900\nselected_fg_color:#ffffff\ntooltip_bg_color:#EAF5B5\ntooltip_fg_color:#000000\ntext_color:#000000\nlink_color:#0000ee\nvisited_link_color:#551a8b"
+gtk-auto-mnemonics = 0
+gtk-visible-focus = automatic
+
diff --git a/desktop-themes/TraditionalOkTest/index.theme.in b/desktop-themes/TraditionalOkTest/index.theme.in
index 488b7640..fcab979e 100644
--- a/desktop-themes/TraditionalOkTest/index.theme.in
+++ b/desktop-themes/TraditionalOkTest/index.theme.in
@@ -1,9 +1,17 @@
+[Desktop Entry]
+Type=X-GNOME-Metatheme
+Name=TraditionalOkTest
+Comment=GTK2/3 port of Clearlooks-Phenix
+Encoding=UTF-8
+
 [X-GNOME-Metatheme]
-_Name=TraditionalOk Test Theme
+_Name=TraditionalOkTest
 Type=X-GNOME-Metatheme
-_Comment=Theme with a different colorscheme to find problems in applications.
+_Comment=Unattractive Usability
 Encoding=UTF-8
 GtkTheme=TraditionalOkTest
-MetacityTheme=TraditionalOk
+MetacityTheme=TraditionalOkTest
 IconTheme=mate
-NotificationTheme=Coco
+CursorTheme=MATE
+CursorSize=16
+ButtonLayout=:minimize,maximize,close
diff --git a/desktop-themes/TraditionalOkTest/metacity-1/Makefile.am b/desktop-themes/TraditionalOkTest/metacity-1/Makefile.am
new file mode 100644
index 00000000..53dd46a2
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/metacity-1/Makefile.am
@@ -0,0 +1,8 @@
+THEME_NAME=TraditionalOkTest
+
+themedir = $(datadir)/themes/$(THEME_NAME)/metacity-1
+
+theme_DATA = \
+	metacity-theme-1.xml
+
+EXTRA_DIST = $(theme_DATA)
diff --git a/marco-themes/TraditionalOk/metacity-theme-1.xml b/desktop-themes/TraditionalOkTest/metacity-1/metacity-theme-1.xml
index 24b70111..b824497a 100644
--- a/marco-themes/TraditionalOk/metacity-theme-1.xml
+++ b/desktop-themes/TraditionalOkTest/metacity-1/metacity-theme-1.xml
@@ -2,11 +2,11 @@
 <!-- 	$Id$	 -->
 <metacity_theme>
 <info>
-	<name>TraditionalOk</name>
-	<author>Daniel Borgmann &lt;[email protected]&gt;, Andrea Cimitan &lt;[email protected]&gt;</author>
-	<copyright>&#194; 2005-2007 Daniel Borgmann, Andrea Cimitan</copyright>
-	<date>Apr, 2007</date>
-	<description>The TraditionalOk "Gummy" Marco Theme</description>
+	<name>TraditionalMarine</name>
+	<author> Wolfgang Ulbrich &lt;[email protected]&gt;</author>
+	<copyright>&#194; 2013 Wolfgang Ulbrich </copyright>
+	<date>March, 2013</date>
+	<description>The Clearlooks Marine Metacity Theme</description>
 </info>
 
 <!-- ::: GEOMETRY ::: -->
diff --git a/gtk-themes/Makefile.am b/gtk-themes/Makefile.am
index d776d6c1..30d33a49 100644
--- a/gtk-themes/Makefile.am
+++ b/gtk-themes/Makefile.am
@@ -9,8 +9,7 @@ SUBDIRS = \
 	Reverse \
 	ContrastLow \
 	ContrastLowLargePrint \
-	LargePrint \
-	$(TEST_THEMES)
+	LargePrint
 
 DIST_SUBDIRS = \
 	AlaDelta \
@@ -23,6 +22,5 @@ DIST_SUBDIRS = \
 	Reverse \
 	ContrastLow \
 	ContrastLowLargePrint \
-	LargePrint \
-	TraditionalOkTest
+	LargePrint
 
diff --git a/gtk-themes/TraditionalOkTest/Makefile.am b/gtk-themes/TraditionalOkTest/Makefile.am
deleted file mode 100644
index a42b0454..00000000
--- a/gtk-themes/TraditionalOkTest/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-themedir = $(datadir)/themes/TraditionalOkTest/gtk-2.0
-
-theme_DATA = gtkrc
-
-EXTRA_DIST = $(theme_DATA)
diff --git a/gtk-themes/TraditionalOkTest/gtkrc b/gtk-themes/TraditionalOkTest/gtkrc
deleted file mode 100644
index c8319f4d..00000000
--- a/gtk-themes/TraditionalOkTest/gtkrc
+++ /dev/null
@@ -1,509 +0,0 @@
-
-# Please keep this gtkrc in sync with the other ones from Clearlooks based themes.
-
-gtk-color-scheme = "fg_color:#f5f5f5\nbg_color:#888a85\nbase_color:#babdb6\ntext_color:#000\nselected_bg_color:#f57900\nselected_fg_color:#fff\ntooltip_bg_color:#F5F5B5\ntooltip_fg_color:#000"
-
-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 }
-
-	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 = 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 "clearlooks-wide" {
-	xthickness = 2
-	ythickness = 2
-}
-
-style "clearlooks-wider" {
-	xthickness = 3
-	ythickness = 3
-}
-
-style "clearlooks-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 "clearlooks-spinbutton" {
-
-	engine "clearlooks" {
-		hint = "spinbutton"
-	}
-}
-
-style "clearlooks-scale" {
-	xthickness = 2
-	ythickness = 2
-
-	engine "clearlooks" {
-		hint = "scale"
-	}
-}
-
-style "clearlooks-vscale" {
-
-	engine "clearlooks" {
-		hint = "vscale"
-	}
-}
-
-style "clearlooks-hscale" {
-
-	engine "clearlooks" {
-		hint = "hscale"
-	}
-}
-
-style "clearlooks-scrollbar" {
-	xthickness = 2
-	ythickness = 2
-
-	engine "clearlooks" {
-		hint = "scrollbar"
-	}
-}
-
-style "clearlooks-hscrollbar" {
-
-	engine "clearlooks" {
-		hint = "hscrollbar"
-	}
-}
-
-style "clearlooks-vscrollbar" {
-
-	engine "clearlooks" {
-		hint = "vscrollbar"
-	}
-}
-
-style "clearlooks-notebook_bg" {
-
-	bg[NORMAL]        = shade (1.02, @bg_color)
-}
-
-style "clearlooks-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 "clearlooks-notebook" {
-	xthickness = 3
-	ythickness = 3
-}
-
-style "clearlooks-statusbar" {
-
-	engine "clearlooks" {
-		hint = "statusbar"
-	}
-}
-
-style "clearlooks-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 "clearlooks-menubar" {
-
-	engine "clearlooks" {
-		hint = "menubar"
-	}
-}
-
-style "clearlooks-menu" {
-	xthickness = 0
-	ythickness = 0
-
-	bg[NORMAL]        = shade (1.08, @bg_color)
-
-	engine "clearlooks" {
-		radius = 0.0
-	}
-}
-
-style "clearlooks-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 "clearlooks-separator_menu_item" {
-	xthickness = 1
-	ythickness = 0
-
-	GtkSeparatorMenuItem::horizontal-padding = 0
-	GtkWidget::wide-separators = 1
-	GtkWidget::separator-width = 1
-	GtkWidget::separator-height = 7
-}
-
-style "clearlooks-frame_title" {
-
-	fg[NORMAL]        = lighter (@fg_color)
-}
-
-style "clearlooks-treeview" {
-
-	engine "clearlooks" {
-		hint = "treeview"
-	}
-}
-
-# The almost useless progress bar style
-style "clearlooks-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 "clearlooks-treeview_header" = "default" {
-	xthickness = 2
-	ythickness = 1
-
-	engine "clearlooks" {
-		hint = "treeview-header"
-	}
-}
-
-style "clearlooks-tooltips" {
-	xthickness = 4
-	ythickness = 4
-
-	bg[NORMAL]        = @tooltip_bg_color
-	fg[NORMAL]        = @tooltip_fg_color
-}
-
-style "clearlooks-caja_location" {
-
-	bg[NORMAL]        = mix (0.60, shade (1.05, @bg_color), @bg_color)
-}
-
-# Wrokaroudn style for places where the text color is used instead of the fg color.
-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)
-}
-
-# Workaround style for menus where the text color is used instead of the fg color.
-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)
-}
-
-# Workaround style for places where the fg color is used instead of the text color.
-style "clearlooks-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 "clearlooks-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 "clearlooks-default"
-
-class "GtkSeparator" style "clearlooks-wide"
-class "GtkFrame" style "clearlooks-wide"
-class "GtkCalendar" style "clearlooks-wide"
-class "GtkEntry" style "clearlooks-entry"
-
-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 "GtkHScrollbar" style "clearlooks-hscrollbar"
-class "GtkVScrollbar" style "clearlooks-vscrollbar"
-
-# 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 "clearlooks-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 "clearlooks-notebook_bg"
-widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "clearlooks-notebook_bg"
-widget_class "*<GtkNotebook>*<GtkLayout>" style "clearlooks-notebook_bg"
-widget_class "*<GtkNotebook>*<GtkViewport>" style "clearlooks-notebook_bg"
-widget_class "*<GtkNotebook>*<GtkScrolledWindow>" 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 "*<GtkProgress>" style "clearlooks-progressbar"
-
-# Treeview headers (and similar stock GTK+ widgets)
-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"
-
-# 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"
-
-##########################################################################
-# Following are special cases and workarounds for issues in applications.
-##########################################################################
-
-# Workaround for the evolution ETable (bug #527532)
-widget_class "*.<ETable>.<ECanvas>" style "clearlooks-treeview_header"
-# Workaround for the evolution ETree
-widget_class "*.<ETree>.<ECanvas>" style "clearlooks-treeview_header"
-
-# Special case the caja-extra-view-widget
-# ToDo: A more generic approach for all applications that have a widget like this.
-widget "*.caja-extra-view-widget" style : highest "clearlooks-caja_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 "clearlooks-text_is_fg_color_workaround"
-# This is the part of the workaround that fixes the menus
-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.
-widget_class "*<GtkListItem>*" style "clearlooks-fg_is_text_color_workaround"
-# GtkCList also uses the fg color to draw text on top of the base colors.
-widget_class "*<GtkCList>" style "clearlooks-fg_is_text_color_workaround"
-widget_class "*<GtkListItem>*" style "clearlooks-fg_is_text_color_workaround"
-widget_class "*<GtkTreeItem>*" style "clearlooks-fg_is_text_color_workaround"
-# Caja when renaming files, and maybe other places.
-widget_class "*<EelEditableLabel>" style "clearlooks-fg_is_text_color_workaround"
-
-# See the documentation of the style.
-widget_class "EShellWindow.GtkVBox.MateComponentDock.MateComponentDockBand.MateComponentDockItem*" style "clearlooks-evo_new_button_workaround"
-
-
-##################################################
-# Marking deprecated widgets
-##################################################
-
-style "clearlooks-deprecated-widgets"
-{
-	bg[NORMAL]        = mix(0.9, @bg_color, "#ff0000")
-	bg[PRELIGHT]      = mix(0.9, shade (1.02, @bg_color), "#ff0000")
-	bg[SELECTED]      = mix(0.9, @selected_bg_color, "#ff0000")
-	bg[INSENSITIVE]   = mix(0.9, @bg_color, "#ff0000")
-	bg[ACTIVE]        = mix(0.9, shade (0.9, @bg_color), "#ff0000")
-
-	fg[NORMAL]        = mix(0.9, @fg_color, "#ff0000")
-	fg[PRELIGHT]      = mix(0.9, @fg_color, "#ff0000")
-	fg[SELECTED]      = mix(0.9, @selected_fg_color, "#ff0000")
-	fg[INSENSITIVE]   = mix(0.9, darker (@bg_color), "#ff0000")
-	fg[ACTIVE]        = mix(0.9, @fg_color, "#ff0000")
-
-	text[NORMAL]      = mix(0.9, @text_color, "#ff0000")
-	text[PRELIGHT]    = mix(0.9, @text_color, "#ff0000")
-	text[SELECTED]    = mix(0.9, @selected_fg_color, "#ff0000")
-	text[INSENSITIVE] = mix(0.9, darker (@bg_color), "#ff0000")
-	text[ACTIVE]      = mix(0.9, @selected_fg_color, "#ff0000")
-
-	base[NORMAL]      = mix(0.9, @base_color, "#ff0000")
-	base[PRELIGHT]    = mix(0.9, shade (0.95, @bg_color), "#ff0000")
-	base[SELECTED]    = mix(0.9, @selected_bg_color, "#ff0000")
-	base[INSENSITIVE] = mix(0.9, @bg_color, "#ff0000")
-	base[ACTIVE]      = mix(0.9, shade (0.9, @selected_bg_color), "#ff0000")
-}
-
-# GTK+
-widget_class "*.<GtkCombo>*"          style "clearlooks-deprecated-widgets"
-widget_class "*.<GtkOptionMenu>*"     style "clearlooks-deprecated-widgets"
-widget_class "*.<GtkList>*"           style "clearlooks-deprecated-widgets"
-widget_class "*.<GtkTree>*"           style "clearlooks-deprecated-widgets"
-widget_class "*.<GtkCList>*"          style "clearlooks-deprecated-widgets"
-widget_class "*.<GtkCTree>*"          style "clearlooks-deprecated-widgets"
-widget_class "*.<GtkFileSelection>*"  style "clearlooks-deprecated-widgets"
-widget_class "*.<GtkOldEditable>*"    style "clearlooks-deprecated-widgets"
-widget_class "*.GtkProgress"          style "clearlooks-deprecated-widgets"
-widget_class "*.<GtkText>*"           style "clearlooks-deprecated-widgets"
-
-# libmateui
-widget_class "*.<MateColorPicker>*"      style "clearlooks-deprecated-widgets"
-widget_class "*.<MateDialog>*"           style "clearlooks-deprecated-widgets"
-# MateEntry is already in because of GtkCombo
-widget_class "*.<MateFileEntry>*"        style "clearlooks-deprecated-widgets"
-widget_class "*.<MateIconEntry>*"        style "clearlooks-deprecated-widgets"
-widget_class "*.<MateIconSelection>*"    style "clearlooks-deprecated-widgets"
-
-widget_class "*.<MateFontPicker>*"       style "clearlooks-deprecated-widgets"
-widget_class "*.<MateIconList>*"         style "clearlooks-deprecated-widgets"
-widget_class "*.<MateIconTextItem>*"     style "clearlooks-deprecated-widgets"
-widget_class "*.<MateScores>*"           style "clearlooks-deprecated-widgets"
-widget_class "*.<MateDruid>*"            style "clearlooks-deprecated-widgets"
-widget_class "*.<MateHRef>*"             style "clearlooks-deprecated-widgets"
-
-
-# MATE Canvas -- well, is there a replacement?
-#widget_class "*.<MateCanvas>*"    style "clearlooks-deprecated-widgets"
-
-# All widgets that are embedded with MateComponent ... this makes a lot of things red
-# like evolution and mate-panel
-#widget_class "*<MateComponentWidget>*"    style "clearlooks-deprecated-widgets"
-#widget_class "*<MateComponentWindow>*"    style "clearlooks-deprecated-widgets"
-#widget_class "*<MateComponentSelector>*"  style "clearlooks-deprecated-widgets"
-
-style "clearlooks-deprecated-fg_is_text_color_workaround"
-{
-	fg[NORMAL]      = mix(0.9, @text_color, "#ff0000")
-	fg[PRELIGHT]    = mix(0.9, @text_color, "#ff0000")
-	fg[SELECTED]    = mix(0.9, @selected_fg_color, "#ff0000")
-	fg[INSENSITIVE] = mix(0.9, darker (@bg_color), "#ff0000")
-	fg[ACTIVE]      = mix(0.9, @selected_fg_color, "#ff0000")
-}
-
-widget_class "*<GtkListItem>*" style "clearlooks-deprecated-fg_is_text_color_workaround"
-widget_class "*<GtkCList>" style "clearlooks-deprecated-fg_is_text_color_workaround"
-widget_class "*<GtkListItem>*" style "clearlooks-deprecated-fg_is_text_color_workaround"
-widget_class "*<GtkTreeItem>*" style "clearlooks-deprecated-fg_is_text_color_workaround"
diff --git a/marco-themes/Makefile.am b/marco-themes/Makefile.am
index 00794e69..724b7ff6 100644
--- a/marco-themes/Makefile.am
+++ b/marco-themes/Makefile.am
@@ -1,6 +1,5 @@
 THEMES = \
 	Atantla \
-	TraditionalOk \
 	AlaDelta \
 	Shiny \
 	Reverse \