TraditionalTest GTK3-3.14: more adjustments from clearlook-phenix upstream

6 files changed, 503 insertions, 348 deletions

diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/Makefile.am b/desktop-themes/TraditionalOkTest/gtk-3.0/Makefile.am
index f8e0d92d..3517cd04 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/Makefile.am
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/Makefile.am
@@ -5,7 +5,6 @@ themedir = $(datadir)/themes/$(THEME_NAME)/gtk-3.0
 theme_DATA = \
 	applications.css \
 	gtk.css \
-	gtk-variant.css \
 	gtk-widgets.css \
 	gtk-widgets-img.css \
 	mate-applications.css \
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/applications.css b/desktop-themes/TraditionalOkTest/gtk-3.0/applications.css
index 5f4ffedc..ae69728b 100755
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/applications.css
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/applications.css
@@ -20,6 +20,12 @@
 	border-image: none;
 }
 
+NautilusToolbar .linked.raised GtkToggleButton.button:first-child,
+NautilusToolbar .linked.raised GtkToggleButton.button:first-child:active:hover {
+	border-right-width: 1px;
+}
+
+
 /************
  * Nemo *
  ************/
@@ -42,13 +48,73 @@
 	border-image: none;
 }
 
+NemoToolbar .linked.raised GtkToggleButton.button:first-child,
+NemoToolbar .linked.raised GtkToggleButton.button:first-child:active:hover {
+	border-right-width: 1px;
+}
+
 
 /*********
  * gedit *
  *********/
 
-GeditFloatingSlider .entry.not-found:focus {
-	border-image: url("img/border-error.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
+GeditMenuStackSwitcher.button.flat {
+	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;
+}
+
+.gedit-side-panel-paned,
+.gedit-bottom-panel-paned,
+.gedit-bottom-panel-stack-switcher .notebook GtkBox.vertical {
+	border-style: solid;
+	border-color: @toolbar_border_top_color;
+}
+
+.gedit-side-panel-paned {
+	border-width: 0px 1px 0px 0px;
+}
+
+.gedit-bottom-panel-paned {
+	border-width: 1px 0px 0px 0px;
+}
+
+.gedit-bottom-panel-stack-switcher .notebook GtkBox.vertical {
+	border-width: 1px;
+}
+
+.gedit-menu-stack-switcher {
+	padding: 15px 15px 2px 15px;
+}
+
+GeditMultiNotebook .notebook {
+	border-width: 0px 0px 1px 1px;
+}
+
+GeditViewFrame .gedit-search-slider {
+	padding: 4px;
+	border-image: url("img/border-focused.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
+}
+
+.gedit-search-entry-occurrences-tag {
+	color: @theme_text_color;
+	background-color: @theme_bg_color;
+	margin: 2px 0px 2px 2px;
+	padding: 2px;
+}
+
+GeditStatusbar .frame.flat {
+	border: none;
+}
+
+/**********
+ * evince *
+ **********/
+
+EvPageActionWidget .linked .entry:first-child {
+	border-right-width: 0px;
 }
 
 /*******************
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-variant.css b/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-variant.css
deleted file mode 100755
index edfbf965..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-variant.css
+++ /dev/null
@@ -1,54 +0,0 @@
-/***********************************************************************
- * This section can be modified to create color variants of the theme. *
- ***********************************************************************/
-
-/****************
- * color scheme *
- ****************/
-
-@define-color base_color #babdb6;
-@define-color theme_base_color @base_color;
-
-@define-color bg_color #888a85;
-@define-color theme_bg_color @bg_color;
-@define-color fg_color #000000;
-@define-color theme_fg_color @fg_color;
-
-@define-color selected_bg_color #f57900;
-@define-color theme_selected_bg_color @selected_bg_color;
-@define-color selected_fg_color #ffffff;
-@define-color theme_selected_fg_color @selected_fg_color;
-
-@define-color tooltip_bg_color #EAF5B5;
-@define-color theme_tooltip_bg_color @tooltip_bg_color;
-@define-color tooltip_fg_color #000000;
-@define-color theme_tooltip_fg_color @tooltip_fg_color;
-
-@define-color text_color #000000;
-@define-color theme_text_color @text_color;
-
-@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 orange widgets in TraditionalOKTest. */
-@define-color core_color_b #888a85; /* Core color for gray widgets in TraditionalOKTest. */
-
-/********************************************
- * 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
index 6292fc81..2e10f50b 100755..100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets-img.css
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets-img.css
@@ -34,9 +34,9 @@ GtkSwitch.slider:insensitive {
 	background-image: url("img/resize-grip.png");
 }
 
-/***************
+/*************
  * Scrollbar *
- ***************/
+ *************/
 
 .scrollbar.slider {
 	background-repeat: no-repeat;
@@ -94,117 +94,127 @@ GtkSwitch.slider:insensitive {
 .check,
 .check row:selected,
 .check row:selected:focus {
-  background-image: none;
-  -gtk-icon-source: -gtk-scaled(url("img/checkbox-unchecked.png"));
+	-gtk-icon-source: url("img/checkbox-unchecked.png");
 }
 
 .check:hover,
 .check row:selected:hover,
 .check row:selected:focus:hover {
-	background-image: url("img/checkbox-unchecked-hover.png");
+	-gtk-icon-source: url("img/checkbox-unchecked-hover.png");
 }
 
 .check:insensitive,
 .check row:selected:insensitive,
 .check row:selected:focus:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("img/checkbox-unchecked-insensitive.png"));
+	-gtk-icon-source: url("img/checkbox-unchecked-insensitive.png");
 }
 
 .check:checked,
-.check:active,
 .check row:selected:checked,
+.check row:selected:focus:checked,
+.check:active,
 .check row:selected:active,
 .check row:selected:focus:active {
-	-gtk-icon-source: -gtk-scaled(url("img/checkbox-checked.png"));
+	-gtk-icon-source: url("img/checkbox-checked.png");
 }
 
+.check:checked:hover,
+.check row:selected:checked:hover,
+.check row:selected:focus:checked:hover,
 .check:active:hover,
 .check row:selected:active:hover,
 .check row:selected:focus:active:hover {
-	background-image: url("img/checkbox-checked-hover.png");
+	-gtk-icon-source: url("img/checkbox-checked-hover.png");
 }
 
 .check:checked:insensitive,
+.check row:selected:checked:insensitive,
+.check row:selected:focus:checked:insensitive,
 .check:active:insensitive,
 .check row:selected:active:insensitive,
 .check row:selected:focus:active:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("img/checkbox-checked-insensitive.png"));
+	-gtk-icon-source: url("img/checkbox-checked-insensitive.png");
 }
 
 .check:inconsistent,
 .check row:selected:inconsistent,
 .check row:selected:focus:inconsistent {
-	-gtk-icon-source: -gtk-scaled(url("img/checkbox-mixed.png"));
+	-gtk-icon-source: 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");
+	-gtk-icon-source: url("img/checkbox-mixed-hover.png");
 }
 
 .check:inconsistent:insensitive,
 .check row:selected:inconsistent:insensitive,
 .check row:selected:focus:inconsistent:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("img/checkbox-mixed-insensitive.png"));
+	-gtk-icon-source: url("img/checkbox-mixed-insensitive.png");
 }
 
 .radio,
 .radio row:selected,
 .radio row:selected:focus {
-	background-image: none;
-    -gtk-icon-source: -gtk-scaled(url("img/radio-unchecked.png"));
+	-gtk-icon-source: url("img/radio-unchecked.png");
 }
 
 .radio:hover,
 .radio row:selected:hover,
 .radio row:selected:focus:hover {
-	background-image: url("img/radio-unchecked-hover.png");
+	-gtk-icon-source: url("img/radio-unchecked-hover.png");
 }
 
 .radio:insensitive,
 .radio row:selected:insensitive,
 .radio row:selected:focus:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("img/radio-unchecked-insensitive.png"));
+	-gtk-icon-source: url("img/radio-unchecked-insensitive.png");
 }
 
 .radio:checked,
-.radio:active,
 .radio row:selected:checked,
+.radio row:selected:focus:checked,
+.radio:active,
 .radio row:selected:active,
 .radio row:selected:focus:active {
-	-gtk-icon-source: -gtk-scaled(url("img/radio-checked.png"));
+	-gtk-icon-source: url("img/radio-checked.png");
 }
 
+.radio:checked:hover,
+.radio row:selected:checked:hover,
+.radio row:selected:focus:checked:hover,
 .radio:active:hover,
 .radio row:selected:active:hover,
 .radio row:selected:focus:active:hover {
-	background-image: url("img/radio-checked-hover.png");
+	-gtk-icon-source: url("img/radio-checked-hover.png");
 }
 
 .radio:checked:insensitive,
+.radio row:selected:checked:insensitive,
+.radio row:selected:focus:checked:insensitive,
 .radio:active:insensitive,
 .radio row:selected:active:insensitive,
 .radio row:selected:focus:active:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("img/radio-checked-insensitive.png"));
+	-gtk-icon-source: url("img/radio-checked-insensitive.png");
 }
 
 .radio:inconsistent,
 .radio row:selected:inconsistent,
 .radio row:selected:focus:inconsistent {
-	-gtk-icon-source: -gtk-scaled(url("img/radio-mixed.png"));
+	-gtk-icon-source: 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");
+	-gtk-icon-source: url("img/radio-mixed-hover.png");
 }
 
 .radio:inconsistent:insensitive,
 .radio row:selected:inconsistent:insensitive,
 .radio row:selected:focus:inconsistent:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("img/radio-mixed-insensitive.png"));
+	-gtk-icon-source: url("img/radio-mixed-insensitive.png");
 }
 
 /*********************
@@ -291,81 +301,72 @@ GtkScale.scale-has-marks-below.slider.vertical:insensitive {
  *********/
 
 .menu .menuitem.check {
-	background-image: url("img/menuitem-checkbox.png");
-	background-repeat: no-repeat;
+	-gtk-icon-source: url("img/menuitem-checkbox.png");
 }
 
 .menu .menuitem.check:hover {
-	background-image: url("img/menuitem-checkbox-hover.png");
-	background-repeat: no-repeat;
+	-gtk-icon-source: url("img/menuitem-checkbox-hover.png");
 }
 
 .menu .menuitem.check:insensitive {
-	background-image: url("img/menuitem-checkbox-insensitive.png");
-	background-repeat: no-repeat;
+	-gtk-icon-source: url("img/menuitem-checkbox-insensitive.png");
 }
 
+.menu .menuitem.check:checked,
 .menu .menuitem.check:active {
-	background-image: url("img/menuitem-checkbox-checked.png");
-	background-repeat: no-repeat;
+	-gtk-icon-source: url("img/menuitem-checkbox-checked.png");
 }
 
+.menu .menuitem.check:checked:hover,
 .menu .menuitem.check:active:hover {
-	background-image: url("img/menuitem-checkbox-checked-hover.png");
-	background-repeat: no-repeat;
+	-gtk-icon-source: url("img/menuitem-checkbox-checked-hover.png");
 }
 
+.menu .menuitem.check:checked:insensitive,
 .menu .menuitem.check:active:insensitive {
-	background-image: url("img/menuitem-checkbox-checked-insensitive.png");
-	background-repeat: no-repeat;
+	-gtk-icon-source: url("img/menuitem-checkbox-checked-insensitive.png");
 }
 
 .menu .menuitem.check:inconsistent,
 .menu .menuitem.radio:inconsistent {
-	background-image: url("img/menuitem-checkbox-mixed.png");
-	background-repeat: no-repeat;
+	-gtk-icon-source: url("img/menuitem-checkbox-mixed.png");
 }
 
 .menu .menuitem.check:inconsistent:hover,
 .menu .menuitem.radio:inconsistent:hover {
-	background-image: url("img/menuitem-checkbox-mixed-hover.png");
-	background-repeat: no-repeat;
+	-gtk-icon-source: url("img/menuitem-checkbox-mixed-hover.png");
 }
 
 .menu .menuitem.check:inconsistent:insensitive,
 .menu .menuitem.radio:inconsistent:insensitive {
-	background-image: url("img/menuitem-checkbox-mixed-insensitive.png");
-	background-repeat: no-repeat;
+	-gtk-icon-source: url("img/menuitem-checkbox-mixed-insensitive.png");
 }
 
 .menu .menuitem.radio {
-	background-image: url("img/menuitem-radio.png");
-	background-repeat: no-repeat;
+	-gtk-icon-source: url("img/menuitem-radio.png");
 }
 
 .menu .menuitem.radio:hover {
-	background-image: url("img/menuitem-radio-hover.png");
-	background-repeat: no-repeat;
+	-gtk-icon-source: url("img/menuitem-radio-hover.png");
 }
 
 .menu .menuitem.radio:insensitive {
-	background-image: url("img/menuitem-radio-insensitive.png");
-	background-repeat: no-repeat;
+	-gtk-icon-source: url("img/menuitem-radio-insensitive.png");
 }
 
+.menu .menuitem.radio:checked,
 .menu .menuitem.radio:active {
-	background-image: url("img/menuitem-radio-checked.png");
-	background-repeat: no-repeat;
+	-gtk-icon-source: url("img/menuitem-radio-checked.png");
 }
 
+.menu .menuitem.radio:checked:hover,
 .menu .menuitem.radio:active:hover {
-	background-image: url("img/menuitem-radio-checked-hover.png");
-	background-repeat: no-repeat;
+	-gtk-icon-source: url("img/menuitem-radio-checked-hover.png");
 }
 
+.menu .menuitem.radio:checked:insensitive,
 .menu .menuitem.radio:active:insensitive {
-	background-image: url("img/menuitem-radio-checked-insensitive.png");
-	background-repeat: no-repeat;
+	-gtk-icon-source: url("img/menuitem-radio-checked-insensitive.png");
 }
 
 /*********
@@ -386,22 +387,26 @@ GtkScale.scale-has-marks-below.slider.vertical:insensitive {
 
 /* generic element borders */
 .entry,
-GtkComboBox.combobox-entry .entry,
-GtkComboBox.combobox-entry .button,
+.combobox-entry .entry,
+.combobox-entry .button,
 .button:active,
 .trough,
 .trough.highlight,
 GtkSwitch.trough,
 /* generic button borders */
 .button,
+.button.flat:active,
+.button.flat:hover,
+.menu-button:active,
 .titlebar .titlebutton:hover,
+.primary-toolbar .button:checked,
 .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 .combobox-entry .entry,
+.primary-toolbar .combobox-entry .button,
 .primary-toolbar .button:active,
 .primary-toolbar .button.raised:active,
 .primary-toolbar .raised .button:active,
@@ -421,40 +426,15 @@ GtkSwitch.trough,
 }
 
 .primary-toolbar .entry,
-.primary-toolbar GtkComboBox.combobox-entry .entry {
+.primary-toolbar .combobox-entry .entry {
 	border-width: 1px 2px 2px;
 }
 
 .primary-toolbar .entry:focus,
-.primary-toolbar GtkComboBox.combobox-entry .entry:focus {
+.primary-toolbar .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,
@@ -579,8 +559,8 @@ GtkSwitch.trough,
 
 /* generic insensitive element borders */
 GtkSwitch.trough:insensitive,
-GtkComboBox.combobox-entry .entry:insensitive,
-GtkComboBox.combobox-entry .button:insensitive,
+.combobox-entry .entry:insensitive,
+.combobox-entry .button:insensitive,
 .entry:insensitive,
 .button:insensitive,
 .trough row {
@@ -591,19 +571,29 @@ GtkComboBox.combobox-entry .button:insensitive,
 	border-color: transparent;
 }
 
+.menuitem.button.flat,
+.button.flat,
+.button.flat:insensitive,
+GtkListBoxRow.button.list-row,
+GtkListBoxRow.button.list-row:hover {
+    border-image: none;
+    background-image: none;
+}
+
 /* focused element borders */
 .entry:focus,
-GtkComboBox.combobox-entry .entry:focus,
+.combobox-entry .entry:focus,
+.button.flat:focus:active,
 .button:focus:active,
 .button.default:active,
 /* focused button borders */
-.button:focus,
+.button.flat: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 .combobox-entry .entry:focus,
+.primary-toolbar .combobox-entry .button:focus,
 .primary-toolbar .button.raised:focus:active,
 .primary-toolbar .raised .button:focus:active,
 .primary-toolbar .button.raised.default:active,
@@ -672,3 +662,88 @@ column-header:last-child .button:active:focus {
 	border-right: none;
 }
 
+/* Leftmost button */
+.linked .entry:first-child,
+.linked > GtkComboBox:first-child > .button:last-child,
+.linked > GtkComboBox:first-child > .button:active:last-child,
+.linked > GtkComboBox:first-child > .button:active:hover:last-child,
+.linked > GtkComboBox:first-child > .button:focus:last-child,
+.linked > GtkComboBox:first-child > .button:focus:active:last-child,
+.linked > GtkComboBox:first-child > .button:insensitive:last-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 {
+    border-image: none;
+    border-radius: 3px 0 0 3px;
+    border-color: @border_color;
+    border-width: 1px;
+    padding: 1px 2px;
+}
+
+/* Middle button */
+.linked .entry,
+.linked > GtkComboBox > .button:last-child,
+.linked > GtkComboBox > .button:active:last-child,
+.linked > GtkComboBox > .button:active:hover:last-child,
+.linked > GtkComboBox > .button:focus:last-child,
+.linked > GtkComboBox > .button:focus:active:last-child,
+.linked > GtkComboBox > .button:insensitive:last-child,
+.linked .button,
+.linked .button:active,
+.linked .button:active:hover,
+.linked .button:focus,
+.linked .button:focus:active,
+.linked .button:insensitive {
+    border-image: none;
+	border-radius: 0;
+    border-color: @border_color;
+    border-width: 1px 0;
+    padding: 1px 2px;
+}
+
+/* Rightmost button */
+.linked .entry:last-child,
+.linked > GtkComboBox:last-child > .button,
+.linked > GtkComboBox:last-child > .button: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 {
+    border-image: none;
+	border-radius: 0 3px 3px 0;
+    border-color: @border_color;
+    border-width: 1px;
+    padding: 1px 2px;
+}
+
+/* Dialog Action Area */
+
+/* Leftmost button */
+.dialog-action-area.linked .button:first-child,
+.dialog-action-area.linked .button:active:first-child,
+.dialog-action-area.linked .button:active:hover:first-child,
+.dialog-action-area.linked .button:focus:first-child,
+.dialog-action-area.linked .button:focus:active:first-child,
+.dialog-action-area.linked .button:insensitive:first-child,
+/* Middle button */
+.dialog-action-area.linked .button,
+.dialog-action-area.linked .button:active,
+.dialog-action-area.linked .button:active:hover,
+.dialog-action-area.linked .button:focus,
+.dialog-action-area.linked .button:focus:active,
+.dialog-action-area.linked .button:insensitive,
+/* Rightmost button */
+.dialog-action-area.linked .button:last-child,
+.dialog-action-area.linked .button:active:last-child,
+.dialog-action-area.linked .button:active:hover:last-child,
+.dialog-action-area.linked .button:focus:last-child,
+.dialog-action-area.linked .button:focus:active:last-child,
+.dialog-action-area.linked .button:insensitive:last-child {
+	border-radius: 3px;
+	border-width: 1px;
+}
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets.css
index a1a1d0fa..1069703a 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets.css
@@ -11,7 +11,7 @@
 	-GtkPaned-handle-size: 5;
 
 	-GtkCheckButton-indicator-size: 16;
-	-GtkCheckMenuItem-indicator-size: 12;
+	-GtkCheckMenuItem-indicator-size: 10;
 
 	-GtkScrolledWindow-scrollbar-spacing: 3;
 	-GtkScrolledWindow-scrollbars-within-bevel: 0;
@@ -31,6 +31,12 @@
 
 	-GtkWidget-focus-padding: 2;
 	-GtkWidget-focus-line-width: 1;
+	outline-color: @focus_border_color;
+	outline-style: dashed;
+	outline-offset: -2px;
+	outline-width: 1px;
+	outline-radius: 2px;
+	
 	-GtkWindow-resize-grip-width: 11;
 	-GtkWindow-resize-grip-height: 11;
 }
@@ -43,7 +49,8 @@ GtkWindow {
 	color: @theme_fg_color;
 }
 
-* {
+.background {
+	color: @theme_fg_color;
 	background-color: @theme_bg_color;
 }
 
@@ -92,8 +99,23 @@ GtkGrid:insensitive {
  * Miscellaneous *
  *****************/
 
+@keyframes spin {
+	to {
+	    -gtk-icon-transform: rotate(1turn);
+	}
+}
+.spinner {
+	background-image: none;
+	background-color: blue;
+	opacity: 0;
+	-gtk-icon-source: -gtk-icontheme("process-working-symbolic");
+}
 .spinner:active {
-	transition: 750ms linear loop;
+	opacity: 1;
+	animation: spin 1s linear infinite;
+}
+.spinner:active:insensitive {
+	opacity: 0.5;
 }
 
 .floating-bar {
@@ -432,6 +454,10 @@ GtkScrolledWindow.frame {
 	padding: 0;
 }
 
+GtkScrolledWindow GtkViewport {
+	background-color: @theme_bg_color;
+}
+
 /* avoid double borders when a viewport is
  * packed into a GtkScrolledWindow */
 GtkScrolledWindow GtkViewport.frame {
@@ -444,8 +470,52 @@ GtkScrolledWindow GtkViewport.frame {
 
 .button,
 .button.menuitem.menubar,
-GtkComboBox.combobox-entry .button {
-	padding: 1px 4px;
+.combobox-entry .button,
+.inline-toolbar.toolbar .button,
+.primary-toolbar.toolbar.horizontal .button,
+.primary-toolbar.toolbar.horizontal .button:active,
+.toolbar.horizontal .button,
+.toolbar.horizontal .button:active,
+.titlebar .linked.raised .button,
+.titlebar .linked.raised .button:active {
+	padding: 5px 8px 6px;
+}
+
+GtkComboBox GtkToggleButton.button,
+GtkComboBoxText GtkToggleButton.button,
+.toolbar.horizontal GtkComboBox GtkToggleButton.button,
+.toolbar.horizontal GtkComboBoxText GtkToggleButton.button {
+	padding: 2px;
+}
+
+.path-bar .button,
+.path-bar .button GtkImage,
+.path-bar .button GtkLabel {
+	padding: 2px;
+}
+
+.path-bar .button {
+	border-width: 1px 0px 1px 1px;
+}
+
+.path-bar .button:hover:active {
+	border-left-width: 1px;
+}
+
+.path-bar .button:first-child,
+.path-bar .button:first-child:hover:active {
+	border-right-width: 0px;
+}
+
+.path-bar .button:only-child,
+.path-bar .button:only-child:hover:active {
+	border-radius: 3px;
+	border-right-width: 1px;
+}
+
+.linked.raised .button:first-child,
+.linked.raised .button:first-child:hover:active {
+	border-right-width: 0px;
 }
 
 .button {
@@ -480,7 +550,9 @@ GtkMenuToolButton *,
 
 .primary-toolbar .button *:active,
 .inline-toolbar .button *:active,
-.button *:active {
+.button *:active,
+.button *:active:focus,
+.button *:focus {
 	color: @button_active_text_color;
 }
 
@@ -543,8 +615,8 @@ GtkMenuToolButton *,
 .toolbar .raised .button:focus,
 .toolbar GtkComboBox .button,
 .toolbar GtkComboBox .button:focus,
-GtkComboBox.combobox-entry .button,
-.primary-toolbar GtkComboBox.combobox-entry .button,
+.combobox-entry .button,
+.primary-toolbar .combobox-entry .button,
 .titlebar .titlebutton:hover,
 GtkColorChooserWidget #add-color-button {
 	background-image: -gtk-gradient (linear,
@@ -558,8 +630,11 @@ GtkColorChooserWidget #add-color-button {
 }
 
 /* Pushed button background */
+.button:checked,
+.button:checked:hover,
 .button:active,
 .button:active:hover,
+.menuitem.button:hover,
 .spinbutton .button:active,
 .spinbutton .button:active:hover,
 .toolbar .button:active,
@@ -568,8 +643,8 @@ GtkColorChooserWidget #add-color-button {
 .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 .combobox-entry .button:active,
+.combobox-entry .button:active,
 .primary-toolbar .button:active,
 .primary-toolbar .button:active:hover,
 .primary-toolbar .button:focus:active,
@@ -586,6 +661,38 @@ GtkComboBox.combobox-entry .button:active,
 	background-color: transparent;
 }
 
+GtkListBoxRow.button.list-row:hover {
+	background-image: linear-gradient(to bottom,
+	                  shade(@button_active_gradient_a, 1.20),
+	                  shade(@button_active_gradient_b, 1.20) 3px,
+	                  shade(@button_active_gradient_c, 1.20) 4px,
+	                  shade(@button_active_gradient_d, 1.20) 50%,
+	                  shade(@button_active_gradient_e, 1.20) 50%,
+	                  shade(@button_active_gradient_f, 1.20));
+	background-color: transparent;
+}
+
+GtkListBoxRow.button.list-row {
+	color: @theme_text_color;
+	background-color: @theme_base_color;
+	border-radius: 0px;
+	border: none;
+}
+
+GtkListBoxRow.button.list-row:selected {
+	color: @theme_selected_fg_color;
+	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));
+}
+
 .trough,
 .trough.highlight,
 .trough row,
@@ -610,20 +717,20 @@ GtkComboBox.combobox-entry .button:active,
 .toolbar .raised .button:hover,
 .toolbar GtkComboBox .button:hover,
 .primary-toolbar .button:hover,
-GtkComboBox.combobox-entry .button:hover,
-.primary-toolbar GtkComboBox.combobox-entry .button:hover,
+.combobox-entry .button:hover,
+.primary-toolbar .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_a 50%,
+	                  @button_hover_gradient_b 50%,
 	                  @button_hover_gradient_c);
 }
 
 /* Insensitive button background */
 .button:insensitive,
 .toolbar GtkComboBox .button:insensitive,
-GtkComboBox.combobox-entry .button:insensitive {
+.combobox-entry .button:insensitive {
 	background-image: linear-gradient(to bottom,
 	                  @button_insensitive_inner_border_color 1px,
 	                  @button_insensitive_gradient_a 2px,
@@ -672,9 +779,6 @@ GtkComboBox.combobox-entry .button:insensitive {
 
 .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;
@@ -682,13 +786,18 @@ GtkComboBox.combobox-entry .button:insensitive {
 	-GtkNotebook-initial-gap: 0;
 }
 
+.notebook.header.frame {
+	border-width: 0;
+}
+
 .notebook GtkViewport {
-	background-color: @theme_base_color;
+	background-color: @theme_bg_color;
 }
 
 .notebook tab {
 	padding: 3px;
 	border-radius: 3px;
+	border-color: @border_color;
 	border-style: solid;
 	border-width: 1px;
 	background-color: transparent;
@@ -841,40 +950,40 @@ GtkComboBox .separator {
 	-GtkWidget-vertical-separator: 0;
 }
 
-GtkComboBox.combobox-entry .entry:first-child,
-GtkComboBox.combobox-entry .button:first-child {
+.combobox-entry .entry:first-child,
+.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 {
+.combobox-entry .entry:last-child,
+.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 {
+.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 {
+.primary-toolbar .combobox-entry .entry:first-child,
+.primary-toolbar .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 {
+.primary-toolbar .combobox-entry .entry:last-child,
+.primary-toolbar .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 {
+.combobox-entry .button *:active,
+.combobox-entry .button *:active:hover {
 	color: @theme_text_color;
 }
 
@@ -1023,22 +1132,6 @@ GtkComboBox .button *:hover {
 	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;
@@ -1068,6 +1161,7 @@ GtkTreeMenu .menuitem {
 }
 
 .menu {
+	font: normal;
 	background-color: @menu_bg_color;
 	color: @menu_fg_color;
 	padding: 1px;
@@ -1105,7 +1199,7 @@ GtkTreeMenu .menuitem {
 /* this controls the general appearance of the menubar */
 .menubar {
 	border-style: none;
-	padding: 0px;
+	padding: 1px;
 	-GtkWidget-window-dragging: true;
 	-GtkMenuBar-internal-padding: 1;
 	background-image: -gtk-gradient (linear,
@@ -1122,7 +1216,9 @@ GtkTreeMenu .menuitem {
 	background-color: transparent;
 }
 
-.menubar .menuitem:hover {
+.menubar .menuitem:hover,
+.menuitem.button.flat:hover,
+.menuitem.button.flat:active {
 	background-color: @menu_bg_color;
 	border-style: solid;
 	border-width: 1px 1px 0px;
@@ -1133,9 +1229,20 @@ GtkTreeMenu .menuitem {
 	                  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));
 }
 
+.menuitem.button.flat:hover {
+	border-width: 1px;
+	border-radius: 3px;
+}
+
+.menuitem.button.flat:focus {
+	color: @theme_text_color;
+}
+
 .menubar .menuitem *:hover {
 	border-width: 1px;
 	color: @menubar_menuitem_hover_color;
@@ -1164,6 +1271,7 @@ GtkTreeMenu .menuitem:hover,
 }
 
 GtkTreeMenu .menuitem *:hover,
+GtkComboBox .menuitem:hover *,
 .menu .menuitem:active,
 .menu .menuitem *:active,
 .menu .menuitem:hover,
@@ -1238,75 +1346,29 @@ GtkTreeMenu .menuitem *:hover,
 	border-style: solid;
 }
 
-/*****************************************************************************************************
- * Check and Radio items                                                                             *
- * Related to recent gtk3 development, to reveal checkboxes as part of the dialogue                  *
- * of some of the applications whose notification icons appear in the system tray                    *
- * the reference section of the HighContrast theme is used.                                          *
- * https://git.gnome.org/browse/gnome-themes-standard/tree/themes/HighContrast/gtk-3.0/gtk.css#n1398 *
- *****************************************************************************************************/
-
-GtkCheckButton.text-button, GtkRadioButton.text-button {
-  padding: 1px;
-  outline-offset: 0; }
-
-.check {
-  color: rgba(0, 0, 0, 0.1);
-  background-image: none;
-  -gtk-icon-source: -gtk-scaled(url("img/checkbox-unchecked.png")); }
-  .check:hover {
-    color: #7f7f7f; }
-  .check:checked, .check:active {
-    -gtk-icon-source: -gtk-scaled(url("img/checkbox-checked.png"));
-    color: #000; }
-    .check:checked:hover, .check:active:hover {
-      color: #7f7f7f; }
-    .check:checked:insensitive, .check:active:insensitive {
-    -gtk-icon-source: -gtk-scaled(url("img/checkbox-checked-insensitive.png"));
-      color: #7f7f7f; }
-      .check:checked:insensitive:backdrop, .check:active:insensitive:backdrop {
-        color: #7f7f7f; }
-    .check:checked:backdrop, .check:active:backdrop {
-      color: #000; }
-  .check:insensitive {
-    color: rgba(127, 127, 127, 0.1); }
-    .check:insensitive:backdrop {
-      color: transparent; }
-  .check:inconsistent {
-    -gtk-icon-source: -gtk-scaled(url("img/checkbox-mixed.png")); }
-  .check:backdrop {
-    color: rgba(0, 0, 0, 0.1); }
-    .check:backdrop:selected {
-      color: rgba(255, 255, 255, 0.1); }
-
-.radio {
-  color: rgba(0, 0, 0, 0.1);
-  background-image: none;
-  -gtk-icon-source: -gtk-scaled(url("img/radio-unchecked.png")); }
-  .radio:hover {
-    color: #7f7f7f; }
-  .radio:checked, .radio:active {
-    -gtk-icon-source: -gtk-scaled(url("img/radio-checked.png"));
-    color: #000; }
-    .radio:checked:hover, .radio:active:hover {
-      color: #7f7f7f; }
-    .radio:checked:insensitive, .radio:active:insensitive {
-    -gtk-icon-source: -gtk-scaled(url("img/radio-checked-insensitive.png"));
-      color: #7f7f7f; }
-      .radio:checked:insensitive:backdrop, .radio:active:insensitive:backdrop {
-        color: #7f7f7f; }
-    .radio:checked:backdrop, .radio:active:backdrop {
-      color: #000; }
-  .radio:insensitive {
-    color: rgba(127, 127, 127, 0.1); }
-    .radio:insensitive:backdrop {
-      color: transparent; }
-  .radio:inconsistent {
-    -gtk-icon-source: -gtk-scaled(url("img/radio-mixed.png")); }
-  .radio:backdrop {
-    color: rgba(0, 0, 0, 0.1); }
-    .radio:backdrop:selected {
-      color: rgba(255, 255, 255, 0.1); }
+/****************
+ * 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 *
@@ -1542,7 +1604,15 @@ GtkTreeView:insensitive {
 	color: @insensitive_fg_color;
 }
 
-GtkTreeView:selected:focus {
+GtkTreeView:hover {
+	background-image: linear-gradient(to bottom,
+	                  shade(@button_active_gradient_a, 1.20),
+	                  shade(@button_active_gradient_b, 1.20) 3px,
+	                  shade(@button_active_gradient_c, 1.20) 4px,
+	                  shade(@button_active_gradient_d, 1.20) 50%,
+	                  shade(@button_active_gradient_e, 1.20) 50%,
+	                  shade(@button_active_gradient_f, 1.20));
+	background-color: transparent;
 }
 
 column-header.button,
@@ -1813,106 +1883,65 @@ GtkInfoBar:last-child,
  * Titlebar *
  ************/
 
-/* this is the default titlebar that is added by GTK
- * when client-side decorations are in use and the application
- * did not set a custom titlebar.
- */
-.titlebar.default-decoration {
-    border: none;
-    box-shadow: none;
-}
-
 .titlebar {
 	background-image: linear-gradient(to bottom,
-	                  shade (@theme_selected_bg_color, 1.20),
-	                  @theme_selected_bg_color);
+	                  @theme_base_color,
+	                  @theme_bg_color);
 	background-color: transparent;
-	border-radius: 7px 7px 0px 0px;
+	border-radius: 0px;
 	border-bottom: 1px solid;
 	border-color: shade(@border_color, 1.30);
-    color: @theme_selected_fg_color;
-    font: Bold 10;
-    text-shadow: 1px 1px @theme_fg_color;
-}
-
- /* Colour when unfocused? */
-.titlebar:backdrop {
-    text-shadow: none;
-    background-image: none;
-    background-color: @theme_bg_color;
+	padding: 5px 4px 4px 4px;
 }
 
-.titlebar .titlebutton {
+.titlebar > * {
 	background: none;
-	border-image: none;
-	padding: 5px 5px 6px 5px;
-}
-
-.titlebar .titlebutton:hover {
-	background-image: linear-gradient(to bottom,
-	                  shade (@theme_selected_bg_color, 1.30),
-	                  shade (@theme_selected_bg_color, 1.05));
-	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;
-	padding: 5px 5px 6px 5px;
-}
-
-.titlebar .titlebutton:active {
-	background-image: linear-gradient(to bottom,
-	                  shade (@theme_selected_bg_color, 1.05),
-	                  shade (@theme_selected_bg_color, 1.25));
-	border-image: url("img/border.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
-    color: @theme_fg_color;
-    icon-shadow: none;
 }
 
-.titlebar .right .titlebutton:first-child {
-    border-left: 1px solid @menu_separator;
+.tiled .titlebar {
+	border-radius: 0;
 }
 
-.titlebar .right .titlebutton:last-child {
-
+.maximized .titlebar {
+	border-radius: 0;
 }
 
-.titlebar .left .titlebutton:last-child {
-    border-right: 1px solid @menu_separator;
+.titlebar .title {
+	font: Bold;
 }
 
-.titlebar .left .titlebutton:first-child {
+/*.titlebar :first-child {*/
+/*	padding: 5px 5px 6px 5px;*/
+/*}*/
 
+.titlebar .titlebutton {
+	background: none;
+	border-image: none;
 }
 
-.titlebar .titlebutton:backdrop {
-    background: none;
-    color: @theme_text_color;
-    border-image: none;
-    icon-shadow: none;
-}
-
-/****************************************************************************************
- * Give and take related to recent gtk3 development,                                    *
- * to achieve full size of the icon menu of some of the applications whose notification *
- * icons appear in the system tray, the "shadow" is disabled.                           *
- ****************************************************************************************/
-/*
 .window-frame {
 	border-width: 1px;
 	border-radius: 7px 7px 0 0;
 	border-style: solid;
-    background-color: @theme_bg_color;
- * dummy to avoid resizing mate-appearence-properties if theme changed
-    box-shadow: 0px 0px 0px 0px;
 	margin: 10px;
 }
 
-.window-frame:backdrop {
- * dummy to avoid resizing mate-appearence-properties if theme changed
-    box-shadow: 0 0 0 2px @insensitive_text_shadow_color, 0 2px 5px 1px @insensitive_text_shadow_color;
+/**************
+ * Action bar *
+ **************/
+
+.action-bar {
+	border: none;
+	padding: 7px 7px 3px 7px;
+}
+
+/**************
+ * Header bar *
+ **************/
+
+GtkHeaderBar .header-bar {
+	padding: 5px 4px 4px 4px;
 }
-*/
 
 /************
  * Popovers *
@@ -1920,8 +1949,9 @@ GtkInfoBar:last-child,
 
 GtkPopover {
 	border: 1px solid;
-	border-radius: 7px;
+	border-radius: 0px;
 	border-color: @border_color;
+	background-color: @theme_bg_color;
 	background-clip: border-box;
 }
 
@@ -1929,4 +1959,3 @@ GtkPopover > .toolbar,
 GtkPopover.osd > .toolbar .button {
 	background-color: transparent;
 }
-
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/gtk.css b/desktop-themes/TraditionalOkTest/gtk-3.0/gtk.css
index 6dd43210..466dcd12 100755
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/gtk.css
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/gtk.css
@@ -1,8 +1,48 @@
-/******************
- * imports 1 of 2 *
- ******************/
+/***********************************************************************
+ * This section can be modified to create color variants of the theme. *
+ ***********************************************************************/
 
-@import url("gtk-variant.css");
+/****************
+ * color scheme *
+ ****************/
+
+@define-color theme_base_color #babdb6;
+
+@define-color theme_bg_color #888a85;
+@define-color theme_fg_color #000000;
+
+@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 orange widgets in TraditionalOKTest. */
+@define-color core_color_b #888a85; /* Core color for gray widgets in TraditionalOKTest. */
+
+/********************************************
+ * End of configuration for color variants. *
+ ********************************************/
 
 /***********
  * general *
@@ -387,9 +427,9 @@
 @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 *
- ******************/
+/***********
+ * imports *
+ ***********/
 
 @import url("gtk-widgets-img.css");
 @import url("gtk-widgets.css");