TraditionalOKTest: update to GTK+-3.12, new checked radiocheck buttons, some color corrections

63 files changed, 628 insertions, 429 deletions

diff --git a/desktop-themes/TraditionalOkTest/gtk-2.0/applications.rc b/desktop-themes/TraditionalOkTest/gtk-2.0/applications.rc
index f71fa7ff..7358cfcd 100644..100755
--- a/desktop-themes/TraditionalOkTest/gtk-2.0/applications.rc
+++ b/desktop-themes/TraditionalOkTest/gtk-2.0/applications.rc
@@ -43,5 +43,22 @@ style "chromium_toolbar_button" {
 	}
 }
 
+style "chrome-hacks"
+{
+	ChromeGtkFrame::frame-color = "#f57900"
+	ChromeGtkFrame::frame-gradient-color = "#F77A00"
+	ChromeGtkFrame::frame-gradient-size = 16
+	ChromeGtkFrame::inactive-frame-color = "#dedcda"
+	ChromeGtkFrame::inactive-frame-gradient-color = "#e3e2e0"
+	ChromeGtkFrame::incognito-frame-color = "#AD8156"
+	ChromeGtkFrame::incognito-frame-gradient-color = shade (1.02, "#AD8156")
+	ChromeGtkFrame::incognito-inactive-frame-color = "#d5d3d1"
+	ChromeGtkFrame::incognito-inactive-frame-gradient-color = shade (1.02, "#d5d3d1")
+	ChromeGtkFrame::scrollbar-trough-color = shade (0.9, "#edeceb")
+	ChromeGtkFrame::scrollbar-slider-prelight-color = shade (1.05, "#f57900")
+	ChromeGtkFrame::scrollbar-slider-normal-color = "#f57900"
+}
+
+class "ChromeGtkFrame" style "chrome-hacks"
 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
index 76ee5a65..76ee5a65 100644..100755
--- a/desktop-themes/TraditionalOkTest/gtk-2.0/gtkrc
+++ b/desktop-themes/TraditionalOkTest/gtk-2.0/gtkrc
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/Makefile.am b/desktop-themes/TraditionalOkTest/gtk-3.0/Makefile.am
index e898e022..f8e0d92d 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/Makefile.am
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/Makefile.am
@@ -8,6 +8,7 @@ theme_DATA = \
 	gtk-variant.css \
 	gtk-widgets.css \
 	gtk-widgets-img.css \
+	mate-applications.css \
 	settings.ini
 
 EXTRA_DIST = $(theme_DATA)
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/applications.css b/desktop-themes/TraditionalOkTest/gtk-3.0/applications.css
index 5ab26ec1..5f4ffedc 100644..100755
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/applications.css
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/applications.css
@@ -89,69 +89,6 @@ GtkIconView.documents-main-view.check {
 	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 *
  ******************/
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-variant.css b/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-variant.css
index a25e5e23..edfbf965 100644..100755
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-variant.css
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-variant.css
@@ -6,18 +6,26 @@
  * color scheme *
  ****************/
 
-@define-color theme_base_color #babdb6;
+@define-color base_color #babdb6;
+@define-color theme_base_color @base_color;
 
-@define-color theme_bg_color #888a85;
-@define-color theme_fg_color #f5f5f5;
+@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 theme_selected_bg_color #f57900;
-@define-color theme_selected_fg_color #ffffff;
+@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 theme_tooltip_bg_color #EAF5B5;
-@define-color theme_tooltip_fg_color #000000;
+@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 theme_text_color #000000;
+@define-color text_color #000000;
+@define-color theme_text_color @text_color;
 
 @define-color link_color #0000ee;
 @define-color visited_link_color #551a8b;
@@ -37,8 +45,8 @@
 /* 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. */
+@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 f3ea71fb..eeff8574 100644..100755
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets-img.css
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets-img.css
@@ -386,6 +386,7 @@ GtkComboBox.combobox-entry .button,
 GtkSwitch.trough,
 /* generic button borders */
 .button,
+.titlebar .titlebutton:hover,
 .primary-toolbar .button.raised,
 .primary-toolbar .raised .button,
 .primary-toolbar GtkComboBox .button,
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets.css
index 2b1f3d14..43992c1b 100644..100755
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets.css
@@ -63,7 +63,11 @@ GtkWindow {
 GtkImage,
 GtkImage:insensitive,
 GtkLabel,
-GtkLabel:insensitive {
+GtkLabel:insensitive,
+GtkBox,
+GtkBox:insensitive,
+GtkGrid,
+GtkGrid:insensitive {
 	background-color: transparent;
 }
 
@@ -416,7 +420,7 @@ GtkScale.mark {
 	border-color: @border_color;
 	border-style: solid;
 	border-radius: 3px;
-	background-color: @theme_base_color;
+	background-color: @theme_bg_color;
 	padding: 0;
 }
 
@@ -454,7 +458,13 @@ GtkComboBox.combobox-entry .button {
 	border-color: transparent;
 }
 
+/* We want anything inside the buttons to use their background */
+.button * {
+	background-color: transparent;
+}
+
 /* We may want a background for focused buttons, but in the meantime let's remove it too */
+GtkMenuToolButton *,
 .primary-toolbar .button,
 .primary-toolbar .button:insensitive {
 	background-image: none;
@@ -535,6 +545,7 @@ GtkComboBox.combobox-entry .button {
 .toolbar GtkComboBox .button:focus,
 GtkComboBox.combobox-entry .button,
 .primary-toolbar GtkComboBox.combobox-entry .button,
+.titlebar .titlebutton:hover,
 GtkColorChooserWidget #add-color-button {
 	background-image: -gtk-gradient (linear,
 	                  left top,
@@ -680,6 +691,7 @@ GtkComboBox.combobox-entry .button:insensitive {
 	border-radius: 3px;
 	border-style: solid;
 	border-width: 1px;
+	background-color: transparent;
 }
 
 .notebook tab.top {
@@ -770,6 +782,10 @@ GtkComboBox.combobox-entry .button:insensitive {
 	                  @notebook_active_tab_gradient_b);
 }
 
+.notebook tab * {
+	background-color: transparent;
+}
+
 /* close button styling */
 .notebook tab .button,
 .notebook tab .button:active,
@@ -1042,22 +1058,19 @@ GtkComboBox .button *:hover {
  *********/
 
 /* combobox menus */
-GtkTreeMenu.menu {
-	background-color: @theme_base_color;
+GtkTreeMenu.menu,
+GtkTreeMenu.menu * {
+	background-color: @menu_bg_color;
 }
 
 GtkTreeMenu .menuitem {
 	padding: 2px;
 }
 
-GtkTreeMenu .menuitem * {
-	color: @theme_text_color;
-}
-
 .menu {
-	background-color: @theme_bg_color;
+	background-color: @menu_bg_color;
 	color: @menu_fg_color;
-	padding: 0;
+	padding: 1px;
 	border-style: solid;
 	border-width: 1px;
 	border-color: @menu_border_color;
@@ -1065,7 +1078,7 @@ GtkTreeMenu .menuitem * {
 
 .menu.button {
 	background-image: none;
-	background-color: @theme_base_color;
+	background-color: @menu_bg_color;
 	color: @internal_element_color;
 
 	border-image: none;
@@ -1092,7 +1105,7 @@ GtkTreeMenu .menuitem * {
 /* this controls the general appearance of the menubar */
 .menubar {
 	border-style: none;
-	padding: 4px;
+	padding: 0px;
 	-GtkWidget-window-dragging: true;
 	-GtkMenuBar-internal-padding: 1;
 	background-image: -gtk-gradient (linear,
@@ -1110,17 +1123,16 @@ GtkTreeMenu .menuitem * {
 }
 
 .menubar .menuitem:hover {
-	background-color: @theme_bg_color;
+	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;
+	color: @menubar_menuitem_hover_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));
 }
 
@@ -1132,6 +1144,11 @@ GtkTreeMenu .menuitem * {
 .menu .menuitem {
 	-GtkMenuItem-arrow-scaling: 0.5;
 	padding: 4px;
+	background-color: @menu_bg_color;
+}
+
+.menu .menuitem > * {
+	background-color: transparent;
 }
 
 .menu .menuitem:hover {
@@ -1144,13 +1161,6 @@ GtkTreeMenu .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,
@@ -1159,15 +1169,22 @@ GtkTreeMenu .menuitem *:hover,
 .menu .menuitem:hover,
 .menu .menuitem *:hover {
 	color: @theme_selected_fg_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));
 }
 
 .menu .menuitem:insensitive,
 .menu .menuitem *:insensitive {
-	color: mix (@menu_fg_color, @theme_bg_color, 0.6);
+	color: mix (@menu_fg_color, @menu_bg_color, 0.6);
 }
 
 .menu .menuitem .accelerator:insensitive {
-	color: mix (@menu_fg_color, @theme_bg_color, 0.7);
+	color: mix (@menu_fg_color, @menu_bg_color, 0.7);
 }
 
 .menuitem .accelerator {
@@ -1185,6 +1202,7 @@ GtkTreeMenu .menuitem *:hover,
 
 .menuitem.separator {
 	color: @menu_separator_color;
+	padding: 3px 1px 3px 1px;
 
 	-GtkMenuItem-horizontal-padding: 0;
 }
@@ -1212,7 +1230,7 @@ GtkTreeMenu .menuitem *:hover,
 .button.menuitem.menubar *:active {
 	color: @theme_text_color;
 	background-image: none;
-	background-color: @theme_bg_color;
+	background-color: @menu_bg_color;
 	border-radius: 5px 5px 0 0;
 	border-image: none;
 	border-width: 1px 1px 0 1px;
@@ -1348,29 +1366,11 @@ GtkCheckButton:selected:focus {
  ***********/
 
 .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 {
+.sidebar .view,
+.sidebar GtkScrolledWindow {
 	background-color: @sidebar_bg_color;
 }
 
-.sidebar .scrollbar.slider:hover {
-	background-color: @theme_base_color;
-}
-
 .sidebar .radio,
 .sidebar .radio:focus,
 .sidebar .radio:selected {
@@ -1719,25 +1719,25 @@ GtkInfoBar:last-child,
 	border-style: solid;
 }
 
-.info {
+.info > * {
 	background-color: @info_bg_color;
 	color: @info_fg_color;
 	border-color: darker(@info_bg_color);
 }
 
-.warning {
+.warning > * {
 	background-color: @warning_bg_color;
 	color: @warning_fg_color;
 	border-color: darker(@warning_bg_color);
 }
 
-.question {
+.question > * {
 	background-color: @question_bg_color;
 	color: @question_fg_color;
 	border-color: darker(@question_bg_color);
 }
 
-.error {
+.error > * {
 	background-color: @error_bg_color;
 	color: @error_fg_color;
 	border-color: darker(@error_bg_color);
@@ -1763,3 +1763,62 @@ GtkInfoBar:last-child,
 	background-color: transparent;
 }
 
+/************
+ * Titlebar *
+ ************/
+
+.titlebar {
+	background-image: linear-gradient(to bottom,
+	                  @theme_base_color,
+	                  @theme_bg_color);
+	background-color: transparent;
+	border-radius: 7px 7px 0px 0px;
+	border-bottom: 1px solid;
+	border-color: shade(@border_color, 1.30);
+}
+
+.titlebar > * {
+	background: none;
+}
+
+.tiled .titlebar {
+	border-radius: 0;
+}
+
+.maximized .titlebar {
+	border-radius: 0;
+}
+
+.titlebar .title {
+	font: Bold;
+}
+
+.titlebar .titlebutton {
+	background: none;
+	border-image: none;
+	padding: 5px 5px 6px 5px;
+}
+
+.window-frame {
+	border-width: 1px;
+	border-radius: 7px 7px 0 0;
+	border-style: solid;
+	margin: 10px;
+}
+
+/************
+ * Popovers *
+ ************/
+
+GtkPopover {
+	border: 1px solid;
+	border-radius: 7px;
+	border-color: @border_color;
+	background-clip: border-box;
+}
+
+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 c916fc5a..6dd43210 100644..100755
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/gtk.css
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/gtk.css
@@ -394,4 +394,5 @@
 @import url("gtk-widgets-img.css");
 @import url("gtk-widgets.css");
 @import url("applications.css");
+@import url("mate-applications.css");
 
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-error.svg b/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-error.svg
index 6532d220..6532d220 100644..100755
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-error.svg
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-error.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
index b360734f..dfee1e5b 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-focused-ptb.svg
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-focused-ptb.svg
@@ -7,6 +7,7 @@
    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"
@@ -14,52 +15,54 @@
    id="svg33222"
    version="1.1"
    inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="border-focused-2.svg">
+   sodipodi:docname="button-default-border-dark.svg">
   <defs
      id="defs33224">
     <linearGradient
-       id="linearGradient3837">
+       id="linearGradient7928">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         style="stop-color:#505050;stop-opacity:1;"
          offset="0"
-         id="stop3839" />
+         id="stop7930" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3762"
+         offset="0.75114173"
+         style="stop-color:#aaaaaa;stop-opacity:1;" />
+      <stop
+         style="stop-color:#aaaaaa;stop-opacity:1;"
          offset="1"
-         id="stop3841" />
+         id="stop7932" />
     </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7928"
+       id="linearGradient7934"
+       x1="5.0061774"
+       y1="8.9020138"
+       x2="14.827382"
+       y2="1.0544924"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99998621,0,0,0.99998621,-15.999891,1.0988204e-4)" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#8e8e8e"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
-     inkscape:pageopacity="1"
+     inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="44.5625"
-     inkscape:cx="8"
-     inkscape:cy="8"
+     inkscape:zoom="22.172911"
+     inkscape:cx="7.2404508"
+     inkscape:cy="9.7450004"
      inkscape:current-layer="layer1"
-     showgrid="false"
+     showgrid="true"
      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>
+     inkscape:window-width="849"
+     inkscape:window-height="744"
+     inkscape:window-x="242"
+     inkscape:window-y="148"
+     inkscape:window-maximized="0" />
   <metadata
      id="metadata33227">
     <rdf:RDF>
@@ -77,22 +80,14 @@
      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"
+       ry="3"
+       rx="3"
+       y="0.500103"
+       x="-15.499897"
+       height="14.999794"
+       width="14.999794"
        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" />
+       style="color:#000000;fill:none;stroke:url(#linearGradient7934);stroke-width:1.00020635000000002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       transform="matrix(0,-1,1,0,0,0)" />
   </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
index 1402b7f2..76adc2c9 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-focused-switch.svg
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-focused-switch.svg
@@ -11,64 +11,40 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16px"
    height="16px"
-   id="svg33222"
+   id="svg12251"
    version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="border-focused2.svg">
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="entry-border-focused-dark.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>
+     id="defs12253" />
   <sodipodi:namedview
      id="base"
-     pagecolor="#8e8e8e"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
-     inkscape:pageopacity="1"
+     inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="2.81232"
-     inkscape:cy="9.5803639"
+     inkscape:zoom="22.197802"
+     inkscape:cx="2.9655938"
+     inkscape:cy="8"
      inkscape:current-layer="layer1"
-     showgrid="false"
+     showgrid="true"
      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>
+     inkscape:window-width="1216"
+     inkscape:window-height="739"
+     inkscape:window-x="5"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0" />
   <metadata
-     id="metadata33227">
+     id="metadata12256">
     <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 />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -76,20 +52,23 @@
      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" />
+       style="fill:#ffffff;fill-opacity:0;stroke:#6c6c6c;stroke-width:0.99999994000000003;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;enable-background:new"
+       id="rect5836"
+       width="15.000001"
+       height="15"
+       x="0.49999997"
+       y="-15.5"
+       rx="2.2980974"
+       ry="2.2980971"
+       transform="scale(1,-1)" />
+    <rect
+       transform="matrix(0,1,-1,0,0,0)"
+       style="opacity:1;fill:#6c6c6c;fill-opacity:0.27450982;stroke:none;display:inline;enable-background:new"
+       id="rect6042"
+       width="1"
+       height="12"
+       x="1"
+       y="-14" />
   </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
index 95378763..76adc2c9 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-focused.svg
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-focused.svg
@@ -11,64 +11,40 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16px"
    height="16px"
-   id="svg33222"
+   id="svg12251"
    version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="button-border-focused.svg">
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="entry-border-focused-dark.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>
+     id="defs12253" />
   <sodipodi:namedview
      id="base"
-     pagecolor="#8e8e8e"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
-     inkscape:pageopacity="1"
+     inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="2.68732"
-     inkscape:cy="9.5803639"
+     inkscape:zoom="22.197802"
+     inkscape:cx="2.9655938"
+     inkscape:cy="8"
      inkscape:current-layer="layer1"
-     showgrid="false"
+     showgrid="true"
      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>
+     inkscape:window-width="1216"
+     inkscape:window-height="739"
+     inkscape:window-x="5"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0" />
   <metadata
-     id="metadata33227">
+     id="metadata12256">
     <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 />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -76,29 +52,23 @@
      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" />
+       style="fill:#ffffff;fill-opacity:0;stroke:#6c6c6c;stroke-width:0.99999994000000003;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;enable-background:new"
+       id="rect5836"
+       width="15.000001"
+       height="15"
+       x="0.49999997"
+       y="-15.5"
+       rx="2.2980974"
+       ry="2.2980971"
+       transform="scale(1,-1)" />
     <rect
-       ry="1.5"
-       rx="1.5"
-       y="1.5"
-       x="1.5"
+       transform="matrix(0,1,-1,0,0,0)"
+       style="opacity:1;fill:#6c6c6c;fill-opacity:0.27450982;stroke:none;display:inline;enable-background:new"
+       id="rect6042"
+       width="1"
        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" />
+       x="1"
+       y="-14" />
   </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
index bcc83d8d..bcc83d8d 100644..100755
--- 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
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
index 1691c52e..76adc2c9 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-inline-button.svg
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-inline-button.svg
@@ -9,55 +9,42 @@
    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"
+   width="16px"
+   height="16px"
+   id="svg12251"
    version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="border-inline.svg">
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="entry-border-focused-dark.svg">
   <defs
-     id="defs33224" />
+     id="defs12253" />
   <sodipodi:namedview
      id="base"
-     pagecolor="#8e8e8e"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
-     inkscape:pageopacity="1"
+     inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="-0.97883235"
-     inkscape:cy="-0.54712037"
+     inkscape:zoom="22.197802"
+     inkscape:cx="2.9655938"
+     inkscape:cy="8"
      inkscape:current-layer="layer1"
-     showgrid="false"
+     showgrid="true"
      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>
+     inkscape:window-width="1216"
+     inkscape:window-height="739"
+     inkscape:window-x="5"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0" />
   <metadata
-     id="metadata33227">
+     id="metadata12256">
     <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 />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -65,24 +52,23 @@
      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>
+    <rect
+       style="fill:#ffffff;fill-opacity:0;stroke:#6c6c6c;stroke-width:0.99999994000000003;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;enable-background:new"
+       id="rect5836"
+       width="15.000001"
+       height="15"
+       x="0.49999997"
+       y="-15.5"
+       rx="2.2980974"
+       ry="2.2980971"
+       transform="scale(1,-1)" />
+    <rect
+       transform="matrix(0,1,-1,0,0,0)"
+       style="opacity:1;fill:#6c6c6c;fill-opacity:0.27450982;stroke:none;display:inline;enable-background:new"
+       id="rect6042"
+       width="1"
+       height="12"
+       x="1"
+       y="-14" />
   </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
index 2b9e3612..76adc2c9 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-insensitive.svg
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-insensitive.svg
@@ -11,52 +11,40 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16px"
    height="16px"
-   id="svg33222"
+   id="svg12251"
    version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="border-insensitive.svg">
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="entry-border-focused-dark.svg">
   <defs
-     id="defs33224" />
+     id="defs12253" />
   <sodipodi:namedview
      id="base"
-     pagecolor="#8e8e8e"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
-     inkscape:pageopacity="1"
+     inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="-3.4249403"
-     inkscape:cy="-0.54712037"
+     inkscape:zoom="22.197802"
+     inkscape:cx="2.9655938"
+     inkscape:cy="8"
      inkscape:current-layer="layer1"
-     showgrid="false"
+     showgrid="true"
      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>
+     inkscape:window-width="1216"
+     inkscape:window-height="739"
+     inkscape:window-x="5"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0" />
   <metadata
-     id="metadata33227">
+     id="metadata12256">
     <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 />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -64,20 +52,23 @@
      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" />
+       style="fill:#ffffff;fill-opacity:0;stroke:#6c6c6c;stroke-width:0.99999994000000003;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;enable-background:new"
+       id="rect5836"
+       width="15.000001"
+       height="15"
+       x="0.49999997"
+       y="-15.5"
+       rx="2.2980974"
+       ry="2.2980971"
+       transform="scale(1,-1)" />
+    <rect
+       transform="matrix(0,1,-1,0,0,0)"
+       style="opacity:1;fill:#6c6c6c;fill-opacity:0.27450982;stroke:none;display:inline;enable-background:new"
+       id="rect6042"
+       width="1"
+       height="12"
+       x="1"
+       y="-14" />
   </g>
 </svg>
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/border.svg b/desktop-themes/TraditionalOkTest/gtk-3.0/img/border.svg
index 4b97b514..646f882d 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/border.svg
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/border.svg
@@ -7,49 +7,60 @@
    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"
+   id="svg11633"
    version="1.1"
    inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="border.svg">
+   sodipodi:docname="entry-border-normal-dark.svg">
   <defs
-     id="defs33224" />
+     id="defs11635">
+    <linearGradient
+       id="linearGradient3751">
+      <stop
+         style="stop-color:#2d2d2d;stop-opacity:1;"
+         offset="0"
+         id="stop3753" />
+      <stop
+         style="stop-color:#525258;stop-opacity:1;"
+         offset="1"
+         id="stop3755" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3751"
+       id="linearGradient3757"
+       x1="0.49999997"
+       y1="-0.5"
+       x2="0.49999997"
+       y2="-15.5"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#8e8e8e"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
-     inkscape:pageopacity="1"
+     inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="-11.50355"
-     inkscape:cy="-0.54712037"
+     inkscape:zoom="26.24"
+     inkscape:cx="10.506099"
+     inkscape:cy="8.1522251"
      inkscape:current-layer="layer1"
-     showgrid="false"
+     showgrid="true"
      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>
+     inkscape:window-width="1065"
+     inkscape:window-height="814"
+     inkscape:window-x="301"
+     inkscape:window-y="155"
+     inkscape:window-maximized="0"
+     inkscape:object-nodes="true" />
   <metadata
-     id="metadata33227">
+     id="metadata11638">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -64,20 +75,18 @@
      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" />
+       transform="scale(1,-1)"
+       ry="3"
+       rx="3"
+       y="-15.5"
+       x="0.49999997"
+       height="15"
+       width="15.000001"
+       id="rect5760"
+       style="fill:none;stroke:url(#linearGradient3757);stroke-width:0.99999988;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;enable-background:new"
+       inkscape:export-filename="/home/cosimoc/Sources/Checkouts/gnome-themes-standard/themes/Adwaita/gtk-3.0/assets/entry-normal-border.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
   </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
index 07767a38..4829fc82 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-checked-hover.png
+++ 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
index ca4ad904..3ae980fe 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-checked-insensitive.png
+++ 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
index 25370da6..4829fc82 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-checked.png
+++ 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
index 22a3a5e5..6654de23 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-mixed-hover.png
+++ 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
index 8b84e388..a4c2e3ee 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-mixed-insensitive.png
+++ 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
index f68af349..6654de23 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-mixed.png
+++ 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
index da5fcc74..d905828d 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-unchecked-hover.png
+++ 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
index 56d6a6cc..e27c7f93 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-unchecked-insensitive.png
+++ 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
index 5c315ff0..d905828d 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-unchecked.png
+++ 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
index 783f8725..4829fc82 100644
--- 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
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
index 70c02000..3ae980fe 100644
--- 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
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
index 2191b1d7..4829fc82 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-checked.png
+++ 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
index c41492f2..d905828d 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-hover.png
+++ 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
index 2f387960..e27c7f93 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-insensitive.png
+++ 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
index 48726eec..6654de23 100644
--- 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
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
index 882b675b..a4c2e3ee 100644
--- 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
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
index 15b05201..6654de23 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-mixed.png
+++ 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
index 69e491b5..d905828d 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox.png
+++ 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
index 2b793e7a..3ffe271e 100644
--- 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
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
index d8bd994d..741b2e57 100644
--- 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
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
index 717f0892..3ffe271e 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio-checked.png
+++ 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
index af5a5ca4..6a9d7753 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio-hover.png
+++ 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
index d94dfd54..44f80c55 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio-insensitive.png
+++ 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
index aba5c767..6a9d7753 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio.png
+++ 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
index 2670deba..2670deba 100644..100755
--- 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
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
index 6358b068..6358b068 100644..100755
--- 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
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
index fe240e9f..3ffe271e 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-checked-hover.png
+++ 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
index 46e46c25..741b2e57 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-checked-insensitive.png
+++ 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
index 6250c17f..3ffe271e 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-checked.png
+++ 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
index 075ab049..5f62bdf7 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-mixed-hover.png
+++ 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
index bf64ef22..bc8e1b65 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-mixed-insensitive.png
+++ 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
index 556083f0..5f62bdf7 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-mixed.png
+++ 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
index 1c39e132..6a9d7753 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-unchecked-hover.png
+++ 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
index e9d18a2f..44f80c55 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-unchecked-insensitive.png
+++ 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
index e903a422..6a9d7753 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-unchecked.png
+++ 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
index 3bd6e607..3bd6e607 100644..100755
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/resize-grip.png
+++ 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
index a2a1cfd2..a2a1cfd2 100644..100755
--- 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
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
index 9319b7b0..9319b7b0 100644..100755
--- 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
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
index 355b9d6b..355b9d6b 100644..100755
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-horz.png
+++ 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
index acfee6b2..acfee6b2 100644..100755
--- 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
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
index 23402339..23402339 100644..100755
--- 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
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
index acc04350..acc04350 100644..100755
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-vert.png
+++ 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
index 313c11dc..313c11dc 100644..100755
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/slider-horz-grip.png
+++ 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
index 4b5a55a3..4b5a55a3 100644..100755
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/slider-vert-grip.png
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/slider-vert-grip.png
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/mate-applications.css b/desktop-themes/TraditionalOkTest/gtk-3.0/mate-applications.css
new file mode 100755
index 00000000..a0955e75
--- /dev/null
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/mate-applications.css
@@ -0,0 +1,245 @@
+/************
+ * Caja *
+ ************/
+
+
+.caja-desktop.caja-canvas-item {
+	color: @theme_base_color;
+	text-shadow: 1px 1px alpha (@theme_fg_color, 0.8);
+}
+
+.caja-desktop.caja-canvas-item:active,
+.caja-desktop.caja-canvas-item:prelight,
+.caja-desktop.caja-canvas-item:selected {
+	text-shadow: none;
+}
+
+
+.caja-desktop .entry {
+	background-image: none;
+	border-image: none;
+}
+
+/***************
+ * mate-panel *
+ ***************/
+
+.mate-panel-menu-bar,
+MatePanelApplet > GtkMenuBar.menubar,
+PanelToplevel,
+PanelWidget,
+PanelFrame,
+PanelAppletFrame,
+MatePanelAppletFrameDBus,
+MatePanelAppletContainer,
+MatePanelApplet {
+	background-image: -gtk-gradient (linear,
+	                  left top,
+	                  left bottom,
+	                  from (@menubar_gradient_a),
+	                  color-stop (0.50, @menubar_gradient_b),
+	                  to (@menubar_gradient_c));
+	background-color: @theme_bg_color;
+	padding: 0px;
+	color: @theme_fg_color;
+	text-shadow: none;
+}
+
+/* set selected menubar button */
+PanelMenuBar.menubar .menuitem:hover {
+	background-color: shade(@theme_selected_bg_color, 1.1);
+	border-style: solid;
+	border-width: 1px 1px 0px;
+	border-color: @menubar_menuitem_hover_border_color;
+	border-radius: 3px 3px 0 0;
+	color: @menubar_menuitem_hover_color;
+	background-image: -gtk-gradient (linear,
+	                  left top,
+	                  left bottom,
+	                  from (@menubar_menuitem_hover_gradient_a),
+	                  to (@menubar_menuitem_hover_gradient_d));
+}
+
+/* set selected menubar menuitem */
+PanelMenuBar.menubar .menu .menuitem:active:hover,
+PanelMenuBar.menubar .menu .menuitem:hover {
+	background-image: none;
+	color: @theme_selected_fg_color;
+	border-style: solid;
+	border-width: 0px;
+	border-radius: 3px;
+	border-color: alpha(@theme_selected_bg_color, 0.1);
+	padding: 3px 5px;
+}
+
+MatePanelApplet {
+	border-width: 0;
+}
+
+PanelSeparator {
+	border-width: 0;
+	background-image: none;
+	color: shade (@theme_bg_color, 0.75);
+	text-shadow: none;
+}
+
+/* desktop-applet, clockapplet, drivemount, character-map,
+dictionary */
+MatePanelApplet .button {
+	/* Due to a bug somewhere in gtk or cairo,
+	   a padding of zero (or even one) doesn't work always!!! */
+	padding: 0px;
+
+	border-radius: 3px;
+	border-width: 1px;
+	border-style: solid;
+	text-shadow: none;
+
+	color: @theme_fg_color;
+	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));
+}
+
+MatePanelApplet .button:active:hover,
+MatePanelApplet .button:active {
+	border-style: solid;
+	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);
+}
+
+MatePanelApplet .button:hover {
+	border-style: solid;
+	background-image: linear-gradient(to bottom,
+	                                  @button_gradient_color_b,
+	                                  @button_gradient_color_a);
+}
+
+/*Wncklist */
+WnckTasklist .button {
+	padding: 0px;
+	border-radius: 3px;
+	border-width: 1px;
+	border-style: solid;
+	text-shadow: none;
+
+	color: @theme_fg_color;
+	background-color: transparent;
+	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));
+}
+
+WnckTasklist .button:active:hover,
+WnckTasklist .button:active {
+	border-style: solid;
+	background-color: transparent;
+	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);
+}
+
+WnckTasklist .button:hover {
+	border-style: solid;
+	background-color: transparent;
+	background-image: linear-gradient(to bottom,
+	                  @button_hover_gradient_c);
+}
+
+/* set selected button WnckSelector */
+.mate-panel-window-menu-menu-bar .menuitem:hover,
+MatePanelApplet > WnckSelector.menubar .menuitem:hover {
+	color: @theme_fg_color;
+	border-style: solid;
+	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);
+}
+
+/* set WnckSelector selected menuitem */
+.mate-panel-window-menu-menu-bar .menu .menuitem:hover,
+MatePanelApplet > WnckSelector.menubar .menu .menuitem:hover {
+	background-image: none;
+	background-color: shade(@theme_selected_bg_color, 1.1);
+	color: @theme_text_color;
+	border-style: solid;
+	border-width: 1px;
+	border-radius: 3px;
+	border-image: url("assets/menu-border.svg") 2 / 2px stretch;
+	/*border-color: alpha(@theme_selected_bg_color, 0.1);*/
+}
+
+ClockBox,
+.mate-panel-menu-bar.menubar,
+MatePanelApplet > GtkMenuBar.menubar {
+	font: normal;
+}
+
+WnckPager {
+	background-image: none;
+	border-color: transparent;
+	background-color: shade(@theme_bg_color, 0.9);
+	text-shadow: none;
+}
+
+/* prelight of WnckPager */
+MatePanelApplet *:hover {
+	background-image: linear-gradient(to bottom,
+		shade (@theme_selected_bg_color, 2.86),
+		shade (@theme_selected_bg_color, 1.0));
+	background-color: @theme_base_color;
+}
+
+/* Classic icon style */
+/*.mate-panel-menu-bar {
+	-PanelMenuBar-icon-visible: true;
+}*/
+
+NaTrayApplet {
+	background-image: none;
+	background-color: @theme_bg_color;
+	padding: 0;
+	color: @theme_fg_color;
+	text-shadow: none;
+/*	-NaTrayApplet-icon-padding: 12;
+	-NaTrayApplet-icon-size: 16;*/
+}
+
+/*********
+ * Pluma *
+ *********/
+
+PlumaFloatingSlider .entry.not-found:focus {
+	border-image: url("img/border-error.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
+}
+
+/******************
+ * mate-terminal *
+ ******************/
+
+TerminalWindow .entry {
+    -TerminalWindow-background-darkness: 0.95;
+	background-color: @theme_base_color;
+	color: @theme_fg_color;
+}
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/settings.ini b/desktop-themes/TraditionalOkTest/gtk-3.0/settings.ini
index 0ef654c8..cf65fbe7 100644..100755
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/settings.ini
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/settings.ini
@@ -1,5 +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-color-scheme = "base_color:#babdb6\nbg_color:#888a85\nfg_color:#000000\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
-
+gtk-primary-button-warps-slider = false
diff --git a/desktop-themes/TraditionalOkTest/metacity-1/metacity-theme-1.xml b/desktop-themes/TraditionalOkTest/metacity-1/metacity-theme-1.xml
index b824497a..d414fd03 100644..100755
--- a/desktop-themes/TraditionalOkTest/metacity-1/metacity-theme-1.xml
+++ b/desktop-themes/TraditionalOkTest/metacity-1/metacity-theme-1.xml
@@ -340,16 +340,16 @@
 
 <!-- ::: TITLES ::: -->
 <draw_ops name="title_text">
-	<title color="shade/gtk:bg[SELECTED]/0.7" x="((3 `max` (width-title_width)) / 2)" y="(((height - title_height) / 2) `max` 0) + 1"/>
+	<!--<title color="shade/gtk:bg[SELECTED]/0.7" x="((3 `max` (width-title_width)) / 2)" y="(((height - title_height) / 2) `max` 0) + 1"/>
 	<title color="shade/gtk:bg[SELECTED]/0.7" x="((3 `max` (width-title_width)) / 2)+1" y="(((height - title_height) / 2) `max` 0)"/>
 	<title color="shade/gtk:bg[SELECTED]/0.7" x="((3 `max` (width-title_width)) / 2)-1" y="(((height - title_height) / 2) `max` 0)"/>
-	<title color="shade/gtk:bg[SELECTED]/0.7" x="((3 `max` (width-title_width)) / 2)" y="(((height - title_height) / 2) `max` 0)-1"/>
-	<title color="#FFFFFF" x="(3 `max` (width-title_width)) / 2" y="(((height - title_height) / 2) `max` 0)"/>
+	<title color="shade/gtk:bg[SELECTED]/0.7" x="((3 `max` (width-title_width)) / 2)" y="(((height - title_height) / 2) `max` 0)-1"/>-->
+	<title color="blend/gtk:fg[NORMAL]/gtk:text[NORMAL]/0.95" x="4 `max` (width-title_width)/2" y="0 `max` ((height-title_height)/2)"/>
 </draw_ops>
 
 <draw_ops name="title_text_unfocused">
 	<!--<title color="shade/gtk:bg[NORMAL]/1.07" x="5 `max` (width-title_width)/2+1" y="1 `max` ((height-title_height)/2)+1"/>-->
-	<title color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" x="4 `max` (width-title_width)/2" y="0 `max` ((height-title_height)/2)"/>
+	<title color="blend/gtk:fg[NORMAL]/gtk:text[NORMAL]/0.65" x="4 `max` (width-title_width)/2" y="0 `max` ((height-title_height)/2)"/>
 </draw_ops>
 
 <draw_ops name="title">
@@ -463,12 +463,12 @@
 
 	<!-- fill gradient -->
 	<gradient type="vertical" x="3" y="3" width="width-6" height="(height)/2-1">
-		<color value="shade/gtk:bg[NORMAL]/1.15"/>
-		<color value="shade/gtk:bg[NORMAL]/1.07"/>
+		<color value="shade/gtk:bg[NORMAL]/0.95"/>
+		<color value="shade/gtk:bg[NORMAL]/0.87"/>
 	</gradient>
 	<gradient type="vertical" x="3" y="(height)/2" width="width-6" height="(height)/2-2">
-		<color value="shade/gtk:bg[NORMAL]/1.05"/>
-		<color value="shade/gtk:bg[NORMAL]/0.97"/>
+		<color value="shade/gtk:bg[NORMAL]/0.85"/>
+		<color value="shade/gtk:bg[NORMAL]/0.77"/>
 	</gradient>
 
 	<!-- bottom border smooth effect -->