GTK3 all themes: follow canvas-item changes with caja-1.13.0

11 files changed, 287 insertions, 194 deletions

diff --git a/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css b/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css
index 0ca6ef24..a9a4892b 100644
--- a/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css
+++ b/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css
@@ -11,12 +11,6 @@ CajaNavigationWindow .view {
     border-color: transparent;
 }
 
-/* do not flash the desktop with a color during theme switching */
-CajaDesktopWindow FMDesktopIconView .view {
-    background-color: transparent;
-    background-image: none;
-}
-
 .caja-inactive-pane .view {
 	background-color: shade(@less_dark_color, 1.3);
 }
@@ -269,31 +263,43 @@ CajaQueryEditor .toolbar .entry:focus {
 	            inset 0 -1px alpha(@entry_shadow, 0.06);
 }
 
-.caja-canvas-item {
-	border-radius: 5px;
+.caja-canvas-item,
+EelEditableLabel.entry {
+	border-radius: 4px;
+}
+
+/* view */
+CajaNavigationWindow.background .view.caja-canvas-item {
+    color: @theme_fg_color;
+}
+
+CajaNavigationWindow.background .view.caja-canvas-item:active,
+CajaNavigationWindow.background .view.caja-canvas-item:selected {
+    color: @theme_selected_fg_color;
 }
 
 /**** Desktop Drawn ***/
 
-.caja-desktop.caja-canvas-item {
+CajaDesktopWindow.background .caja-canvas-item {
 	color: @theme_fg_color;
-	text-shadow: none;
+    text-shadow: 1px 1px alpha (#000000, 0.8);
 }
 
-.caja-desktop.caja-canvas-item:active {
+CajaDesktopWindow.background .caja-canvas-item:active {
 	color: @theme_text_color;
 }
 
-.caja-desktop.caja-canvas-item:selected {
+CajaDesktopWindow.background .caja-canvas-item:selected {
 	color: @theme_selected_fg_color;
 }
 
-.caja-desktop.caja-canvas-item:active,
-.caja-desktop.caja-canvas-item:prelight,
-.caja-desktop.caja-canvas-item:selected {
+CajaDesktopWindow.background .caja-canvas-item:active,
+CajaDesktopWindow.background .caja-canvas-item:prelight,
+CajaDesktopWindow.background .caja-canvas-item:selected {
 	text-shadow: none;
 }
 
+
 /****************
  * Mate-Panel   *
  ****************/
diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css b/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css
index 6ea16ec0..0c27c521 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css
@@ -2,15 +2,7 @@
  * CAJA File manager *
  *********************/
 
-/**** Desktop View ***/
-
-/* do not flash the desktop with a color during theme switching */
-CajaDesktopWindow FMDesktopIconView .view {
-    background-color: transparent;
-    background-image: none;
-}
-
-/**** View ***/
+/**** Window ***/
 
 /* background of all views */
 CajaNavigationWindow .view {
@@ -23,8 +15,6 @@ CajaNavigationWindow FMListView .view {
     background-color: shade (@base_color, 1.0);
 }
 
-/**** Window ***/
-
 /* caja sidebar */
 CajaWindow FMTreeView .view,
 CajaWindow CajaNotesViewer .view,
@@ -612,35 +602,32 @@ CajaNavigationWindow CajaNotebook.notebook tab .button.flat {
     border-radius: 4px;
 }
 
-.caja-canvas-item {
-    border-radius: 3px;
+EelEditableLabel.entry,
+EelEditableLabel.entry:focused {
+   border-image: none;
+   border-width: 1px;
+   border-color: @theme_fg_color;
+   box-shadow: none;
+   border-radius: 3px;
+   text-shadow: none;
 }
-/*
+
 .caja-canvas-item {
-    border-radius: 3px;
+    border-radius: 4px;
 }
 
-*//* desktop mode *//*
-.caja-desktop.caja-canvas-item {
+/* desktop mode */
+CajaDesktopWindow.background .caja-canvas-item {
     color: white;
-    text-shadow: 1px 1px black;
-}
-
-.caja-desktop.caja-canvas-item:checked {
-    background-image: none;
-    color: @theme_text_color;
-}
-
-.caja-desktop.caja-canvas-item:selected {
-    color: @theme_selected_fg_color;
+    text-shadow: 1px 1px alpha (#000000, 0.8);
 }
 
-.caja-desktop.caja-canvas-item:checked,
-.caja-desktop.caja-canvas-item:prelight,
-.caja-desktop.caja-canvas-item:selected {
+CajaDesktopWindow.background .caja-canvas-item:active,
+CajaDesktopWindow.background .caja-canvas-item:prelight,
+CajaDesktopWindow.background .caja-canvas-item:selected {
     text-shadow: none;
 }
-*/
+
 /****************
  * Mate-Panel *
  ****************/
diff --git a/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css b/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
index 19867c15..82bb43c1 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
@@ -2,12 +2,6 @@
  * CAJA File manager *
  *********************/
 
-/* do not flash the desktop with a color during theme switching */
-CajaDesktopWindow FMDesktopIconView .view {
-    background-color: transparent;
-    background-image: none;
-}
-
 /* for breadcrumbs path bar */
 
 .caja-pathbar-button,
@@ -239,27 +233,40 @@ CajaWindow CajaHistorySidebar .vertical.scrollbar.overlay-indicator {
 	-GtkRange-slider-width: 11;
 }
 
-/* desktop mode */
-.caja-desktop.caja-canvas-item {
-    color: @theme_bg_color;
-    text-shadow: 1px 1px alpha (#000000, 0.8);
+.caja-canvas-item {
+    border-radius: 3px;
 }
 
-.caja-desktop.caja-canvas-item:active {
-    background-image: none;
-    background-color: alpha (@theme_bg_color, 0.84);
+/* view */
+CajaNavigationWindow.background .view.caja-canvas-item {
     color: @theme_fg_color;
 }
 
-.caja-desktop.caja-canvas-item:selected {
-    background-image: none;
-    background-color: alpha (@theme_selected_bg_color, 0.84);
+CajaNavigationWindow.background .view.caja-canvas-item:active,
+CajaNavigationWindow.background .view.caja-canvas-item:selected {
+    color: @theme_selected_fg_color;
+}
+
+/* desktop mode */
+CajaDesktopWindow.background FMIconContainer.view EelEditableLabel.entry {
+   border-image: none;
+   border-width: 1px;
+   text-shadow: none;
+}
+
+CajaDesktopWindow.background .caja-canvas-item {
+    color: @theme_selected_fg_color;
+    text-shadow: 1px 1px alpha (#000000, 0.8);
+}
+
+CajaDesktopWindow.background .caja-canvas-item:selected {
+    background-color: @theme_selected_bg_color;
     color: @theme_selected_fg_color;
 }
 
-.caja-desktop.caja-canvas-item:active,
-.caja-desktop.caja-canvas-item:prelight,
-.caja-desktop.caja-canvas-item:selected {
+CajaDesktopWindow.background .caja-canvas-item:active,
+CajaDesktopWindow.background .caja-canvas-item:prelight,
+CajaDesktopWindow.background .caja-canvas-item:selected {
     text-shadow: none;
 }
 
diff --git a/desktop-themes/ContrastHigh/gtk-3.0/mate-applications.css b/desktop-themes/ContrastHigh/gtk-3.0/mate-applications.css
index 1d1a836b..11f96cc0 100644
--- a/desktop-themes/ContrastHigh/gtk-3.0/mate-applications.css
+++ b/desktop-themes/ContrastHigh/gtk-3.0/mate-applications.css
@@ -2,12 +2,6 @@
  * Caja *
  ************/
 
-/* do not flash the desktop with a color during theme switching */
-CajaDesktopWindow FMDesktopIconView .view {
-    background-color: transparent;
-    background-image: none;
-}
-
 .caja-cluebar-label {
     color: @theme_selected_fg_color;
     font: bold;
@@ -33,22 +27,32 @@ CajaWindow .pane-separator {
     border-color: @theme_border_color;
 }
 
-.caja-desktop.caja-canvas-item {
+.caja-canvas-item,
+EelEditableLabel.entry {
+	border-radius: 3px;
+}
+
+EelEditableLabel.entry {
+    text-shadow: none;
+    color: @theme_fg_color;
+}
+
+CajaDesktopWindow.background .caja-canvas-item {
     color: @theme_selected_fg_color;
     text-shadow: 1px 1px black;
 }
 
-.caja-desktop.caja-canvas-item:selected {
+CajaDesktopWindow.background .caja-canvas-item:selected {
     color: @theme_selected_fg_color;
 }
 
-.caja-desktop.caja-canvas-item:backdrop {
+CajaDesktopWindow.background .caja-canvas-item:backdrop {
     background-color: @theme_fg_color;
 }
 
-.caja-desktop.caja-canvas-item:active,
-.caja-desktop.caja-canvas-item:prelight,
-.caja-desktop.caja-canvas-item:selected {
+CajaDesktopWindow.background .caja-canvas-item:active,
+CajaDesktopWindow.background .caja-canvas-item:prelight,
+CajaDesktopWindow.background .caja-canvas-item:selected {
     text-shadow: none;
 }
 
diff --git a/desktop-themes/ContrastHighInverse/gtk-3.0/mate-applications.css b/desktop-themes/ContrastHighInverse/gtk-3.0/mate-applications.css
index 6ea20701..fafbdbdb 100644
--- a/desktop-themes/ContrastHighInverse/gtk-3.0/mate-applications.css
+++ b/desktop-themes/ContrastHighInverse/gtk-3.0/mate-applications.css
@@ -2,10 +2,61 @@
  * Caja *
  ************/
 
-/* do not flash the desktop with a color during theme switching */
-CajaDesktopWindow FMDesktopIconView .view {
-    background-color: transparent;
-    background-image: none;
+.caja-cluebar-label {
+    color: @theme_selected_fg_color;
+    font: bold;
+}
+
+CajaWindow .sidebar .frame {
+    border-style: none;
+}
+
+CajaNotebook.notebook {
+    border-right-width: 0;
+    border-left-width: 0;
+    border-bottom-width: 0;
+}
+
+CajaNotebook .frame {
+    border-width: 0;
+}
+
+CajaWindow .pane-separator {
+    border-width: 0 1px 0 0;
+    border-style: solid;
+    border-color: @theme_border_color;
+}
+
+.caja-canvas-item,
+EelEditableLabel.entry {
+	border-radius: 3px;
+}
+
+EelEditableLabel.entry,
+EelEditableLabel.entry:selected {
+    text-shadow: none;
+    color: @theme_fg_color;
+}
+
+CajaDesktopWindow.background .caja-canvas-item {
+    color: @theme_fg_color;
+    text-shadow: 1px 1px black;
+}
+
+CajaDesktopWindow.background .caja-canvas-item:active,
+CajaDesktopWindow.background .caja-canvas-item:selected {
+    color: @theme_fg_color;
+    background-color: @theme_selected_bg_color;
+}
+
+CajaDesktopWindow.background .caja-canvas-item:backdrop {
+    background-color: @theme_fg_color;
+}
+
+CajaDesktopWindow.background .caja-canvas-item:active,
+CajaDesktopWindow.background .caja-canvas-item:prelight,
+CajaDesktopWindow.background .caja-canvas-item:selected {
+    text-shadow: none;
 }
 
 /**************
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/mate-applications.css b/desktop-themes/Green-Submarine/gtk-3.0/mate-applications.css
index cda4d730..08e0fca1 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/mate-applications.css
+++ b/desktop-themes/Green-Submarine/gtk-3.0/mate-applications.css
@@ -2,15 +2,7 @@
  * CAJA File manager *
  *********************/
 
-/**** Desktop View ***/
-
-/* do not flash the desktop with a color during theme switching */
-CajaDesktopWindow FMDesktopIconView .view {
-    background-color: transparent;
-    background-image: none;
-}
-
-/**** View ***/
+/**** Window ***/
 
 /* background of all views */
 CajaNavigationWindow .view {
@@ -23,8 +15,6 @@ CajaNavigationWindow FMListView .view {
     background-color: shade (@base_color, 1.0);
 }
 
-/**** Window ***/
-
 /* caja sidebar */
 CajaWindow FMTreeView .view,
 CajaWindow CajaNotesViewer .view,
@@ -611,32 +601,33 @@ CajaNavigationWindow CajaNotebook.notebook tab .button.flat {
     padding: 0px;
     border-radius: 4px;
 }
-/*
-.caja-canvas-item {
-    border-radius: 3px;
-}
 
-*//* desktop mode *//*
-.caja-desktop.caja-canvas-item {
-    color: white;
-    text-shadow: 1px 1px black;
+EelEditableLabel.entry,
+EelEditableLabel.entry:focused {
+   border-image: none;
+   border-width: 1px;
+   border-color: @theme_fg_color;
+   box-shadow: none;
+   border-radius: 3px;
+   text-shadow: none;
 }
 
-.caja-desktop.caja-canvas-item:checked {
-    background-image: none;
-    color: @theme_text_color;
+.caja-canvas-item {
+    border-radius: 4px;
 }
 
-.caja-desktop.caja-canvas-item:selected {
-    color: @theme_selected_fg_color;
+/* desktop mode */
+CajaDesktopWindow.background .caja-canvas-item {
+    color: white;
+    text-shadow: 1px 1px alpha (#000000, 0.8);
 }
 
-.caja-desktop.caja-canvas-item:checked,
-.caja-desktop.caja-canvas-item:prelight,
-.caja-desktop.caja-canvas-item:selected {
+CajaDesktopWindow.background .caja-canvas-item:active,
+CajaDesktopWindow.background .caja-canvas-item:prelight,
+CajaDesktopWindow.background .caja-canvas-item:selected {
     text-shadow: none;
 }
-*/
+
 /****************
  * Mate-Panel *
  ****************/
diff --git a/desktop-themes/GreenLaguna/gtk-3.0/mate-applications.css b/desktop-themes/GreenLaguna/gtk-3.0/mate-applications.css
index 882980aa..6852f642 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/mate-applications.css
+++ b/desktop-themes/GreenLaguna/gtk-3.0/mate-applications.css
@@ -17,12 +17,6 @@ CajaNavigationWindow CajaNotebook .vertical .vertical FMIconView.frame {
     border-radius: 2px;
 }
 
-/* do not flash the desktop with a color during theme switching */
-CajaDesktopWindow FMDesktopIconView .view {
-    background-color: transparent;
-    background-image: none;
-}
-
 /* FIXME, doesn't work */
 .caja-inactive-pane .view {
 	background-color: shade(@theme_bg_color, 0.9);
@@ -201,26 +195,44 @@ CajaWindow .notebook NautilusQueryEditor .toolbar {
 	padding: 5px 7px;
 }
 
-.caja-canvas-item {
-	border-radius: 5px;
+.caja-canvas-item,
+EelEditableLabel.entry {
+	border-radius: 4px;
+}
+
+/* view */
+CajaNavigationWindow.background .view.caja-canvas-item {
+    color: @theme_fg_color;
+	text-shadow: none;
+}
+
+CajaNavigationWindow.background .view.caja-canvas-item:active,
+CajaNavigationWindow.background .view.caja-canvas-item:selected {
+    color: @theme_selected_fg_color;
 }
 
-.caja-desktop.nautilus-canvas-item {
-	color: @theme_bg_color;
-	text-shadow: 1px 1px black;
+/**** Desktop Drawn ***/
+CajaDesktopWindow.background FMIconContainer.view EelEditableLabel.entry {
+   border-image: none;
+   text-shadow: none;
+}
+
+CajaDesktopWindow.background .caja-canvas-item {
+	color: @theme_selected_fg_color;
+    text-shadow: 1px 1px alpha (#000000, 0.8);
 }
 
-.caja-desktop.nautilus-canvas-item:active {
+CajaDesktopWindow.background .caja-canvas-item:active {
 	color: @theme_text_color;
 }
 
-.caja-desktop.nautilus-canvas-item:selected {
+CajaDesktopWindow.background .caja-canvas-item:selected {
 	color: @theme_selected_fg_color;
 }
 
-.caja-desktop.nautilus-canvas-item:active,
-.caja-desktop.nautilus-canvas-item:prelight,
-.caja-desktop.nautilus-canvas-item:selected {
+CajaDesktopWindow.background .caja-canvas-item:active,
+CajaDesktopWindow.background .caja-canvas-item:prelight,
+CajaDesktopWindow.background .caja-canvas-item:selected {
 	text-shadow: none;
 }
 
diff --git a/desktop-themes/Menta/gtk-3.0/mate-applications.css b/desktop-themes/Menta/gtk-3.0/mate-applications.css
index c7c5a0eb..719c0837 100644
--- a/desktop-themes/Menta/gtk-3.0/mate-applications.css
+++ b/desktop-themes/Menta/gtk-3.0/mate-applications.css
@@ -2,12 +2,6 @@
  * CAJA File manager *
  *********************/
 
-/* do not flash the desktop with a color during theme switching */
-CajaDesktopWindow FMDesktopIconView .view {
-    background-color: transparent;
-    background-image: none;
-}
-
 /* for breadcrumbs path bar */
 
 .caja-pathbar-button,
@@ -241,27 +235,40 @@ CajaWindow CajaHistorySidebar .vertical.scrollbar.overlay-indicator {
 	-GtkRange-slider-width: 11;
 }
 
-/* desktop mode */
-.caja-desktop.caja-canvas-item {
-    color: @theme_bg_color;
-    text-shadow: 1px 1px alpha (#000000, 0.8);
+.caja-canvas-item {
+    border-radius: 3px;
 }
 
-.caja-desktop.caja-canvas-item:active {
-    background-image: none;
-    background-color: alpha (@theme_bg_color, 0.84);
+/* view */
+CajaNavigationWindow.background .view.caja-canvas-item {
     color: @theme_fg_color;
 }
 
-.caja-desktop.caja-canvas-item:selected {
-    background-image: none;
-    background-color: alpha (@theme_selected_bg_color, 0.84);
+CajaNavigationWindow.background .view.caja-canvas-item:active,
+CajaNavigationWindow.background .view.caja-canvas-item:selected {
+    color: @theme_selected_fg_color;
+}
+
+/* desktop mode */
+CajaDesktopWindow.background FMIconContainer.view EelEditableLabel.entry {
+   border-image: none;
+   border-width: 1px;
+   text-shadow: none;
+}
+
+CajaDesktopWindow.background .caja-canvas-item {
+    color: @theme_selected_fg_color;
+    text-shadow: 1px 1px alpha (#000000, 0.8);
+}
+
+CajaDesktopWindow.background .caja-canvas-item:selected {
+    background-color: @theme_selected_bg_color;
     color: @theme_selected_fg_color;
 }
 
-.caja-desktop.caja-canvas-item:active,
-.caja-desktop.caja-canvas-item:prelight,
-.caja-desktop.caja-canvas-item:selected {
+CajaDesktopWindow.background .caja-canvas-item:active,
+CajaDesktopWindow.background .caja-canvas-item:prelight,
+CajaDesktopWindow.background .caja-canvas-item:selected {
     text-shadow: none;
 }
 
diff --git a/desktop-themes/TraditionalGreen/gtk-3.0/mate-applications.css b/desktop-themes/TraditionalGreen/gtk-3.0/mate-applications.css
index bb5c8368..bc125b2b 100644
--- a/desktop-themes/TraditionalGreen/gtk-3.0/mate-applications.css
+++ b/desktop-themes/TraditionalGreen/gtk-3.0/mate-applications.css
@@ -2,12 +2,6 @@
  * Caja *
  ************/
 
-/* do not flash the desktop with a color during theme switching */
-CajaDesktopWindow FMDesktopIconView .view {
-    background-color: transparent;
-    background-image: none;
-}
-
 /* caja sidebar */
 CajaWindow FMTreeView .view,
 CajaWindow CajaNotesViewer .view,
@@ -39,21 +33,41 @@ CajaWindow .primary-toolbar.toolbar.horizontal GtkComboBox .button {
     padding: 4px 4px;
 }
 
-.caja-desktop.caja-canvas-item {
+.caja-canvas-item,
+EelEditableLabel.entry {
+	border-radius: 3px;
+}
+
+EelEditableLabel.entry,
+EelEditableLabel.entry:focus {
+   border-image: none;
+   border-width: 1px;
+   border-color: @theme_fg_color;
+   box-shadow: none;
+   border-radius: 3px;
+   text-shadow: none;
+}
+
+/* desktop */
+CajaDesktopWindow.background .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 {
+CajaDesktopWindow.background .caja-canvas-item:active,
+CajaDesktopWindow.background .caja-canvas-item:prelight,
+CajaDesktopWindow.background .caja-canvas-item:selected {
 	text-shadow: none;
+    color: @theme_fg_color;
 }
 
+/* view */
+CajaNavigationWindow.background .view.caja-canvas-item {
+    color: @theme_fg_color;
+}
 
-.caja-desktop .entry {
-	background-image: none;
-	border-image: none;
+CajaNavigationWindow.background .view.caja-canvas-item:selected {
+    color: @theme_fg_color;
 }
 
 /***************
diff --git a/desktop-themes/TraditionalOk/gtk-3.0/mate-applications.css b/desktop-themes/TraditionalOk/gtk-3.0/mate-applications.css
index 38db4785..8fe89332 100644
--- a/desktop-themes/TraditionalOk/gtk-3.0/mate-applications.css
+++ b/desktop-themes/TraditionalOk/gtk-3.0/mate-applications.css
@@ -2,12 +2,6 @@
  * Caja *
  ************/
 
-/* do not flash the desktop with a color during theme switching */
-CajaDesktopWindow FMDesktopIconView .view {
-    background-color: transparent;
-    background-image: none;
-}
-
 /* caja sidebar */
 CajaWindow FMTreeView .view,
 CajaWindow CajaNotesViewer .view,
@@ -39,34 +33,40 @@ CajaWindow .primary-toolbar.toolbar.horizontal GtkComboBox .button {
     padding: 4px 4px;
 }
 
-/* moved eject button to left better for overlay scrollbars */
-CajaWindow CajaPlacesSidebar .view row {
-    padding: 0px 4px 0px 0px;
+.caja-canvas-item,
+EelEditableLabel.entry {
+	border-radius: 3px;
 }
 
-/* better for overlay scrollbars */
-CajaWindow FMTreeView .vertical.scrollbar.overlay-indicator,
-CajaWindow CajaNotesViewer .vertical.scrollbar.overlay-indicator,
-CajaWindow CajaPlacesSidebar .vertical.scrollbar.overlay-indicator,
-CajaWindow CajaEmblemSidebar .vertical.scrollbar.overlay-indicator,
-CajaWindow CajaHistorySidebar .vertical.scrollbar.overlay-indicator {
-	-GtkRange-slider-width: 13;
+EelEditableLabel.entry,
+EelEditableLabel.entry:focus {
+   border-image: none;
+   border-width: 1px;
+   border-color: @theme_fg_color;
+   box-shadow: none;
+   border-radius: 3px;
+   text-shadow: none;
 }
 
-.caja-desktop.caja-canvas-item {
+/* desktop */
+CajaDesktopWindow.background .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 {
+CajaDesktopWindow.background .caja-canvas-item:active,
+CajaDesktopWindow.background .caja-canvas-item:prelight,
+CajaDesktopWindow.background .caja-canvas-item:selected {
 	text-shadow: none;
 }
 
-.caja-desktop .entry {
-	background-image: none;
-	border-image: none;
+/* view */
+CajaNavigationWindow.background .view.caja-canvas-item {
+    color: @theme_fg_color;
+}
+
+CajaNavigationWindow.background .view.caja-canvas-item:selected {
+    color: @theme_sectected_fg_color;
 }
 
 /***************
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/mate-applications.css b/desktop-themes/TraditionalOkTest/gtk-3.0/mate-applications.css
index 0502b7b9..3ec81844 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/mate-applications.css
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/mate-applications.css
@@ -2,12 +2,6 @@
  * Caja *
  ************/
 
-/* do not flash the desktop with a color during theme switching */
-CajaDesktopWindow FMDesktopIconView .view {
-    background-color: transparent;
-    background-image: none;
-}
-
 /* caja sidebar */
 CajaWindow FMTreeView .view,
 CajaWindow CajaNotesViewer .view,
@@ -39,21 +33,41 @@ CajaWindow .primary-toolbar.toolbar.horizontal GtkComboBox .button {
     padding: 4px 4px;
 }
 
-.caja-desktop.caja-canvas-item {
-	color: @theme_base_color;
+.caja-canvas-item,
+EelEditableLabel.entry {
+	border-radius: 3px;
+}
+
+EelEditableLabel.entry,
+EelEditableLabel.entry:focus {
+   border-image: none;
+   border-width: 1px;
+   border-color: @theme_fg_color;
+   box-shadow: none;
+   border-radius: 3px;
+   text-shadow: none;
+}
+
+/* desktop */
+CajaDesktopWindow.background .caja-canvas-item {
+	color: @theme_sectected_fg_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 {
+CajaDesktopWindow.background .caja-canvas-item:active,
+CajaDesktopWindow.background .caja-canvas-item:prelight,
+CajaDesktopWindow.background .caja-canvas-item:selected {
 	text-shadow: none;
+    color: @theme_sectected_fg_color;
 }
 
+/* view */
+CajaNavigationWindow.background .view.caja-canvas-item {
+    color: @theme_fg_color;
+}
 
-.caja-desktop .entry {
-	background-image: none;
-	border-image: none;
+CajaNavigationWindow.background .view.caja-canvas-item:selected {
+    color: @theme_sectected_fg_color;
 }
 
 /***************