GTK+-3.20 GreenLaguna: fine tunning part-8 .......

- drop obsolete settings from gnome-applications.css
- addjust settings for rhythmbox
- add a few settings for nautilus and gedit
- addjust color definitions for window-mananager
- adjust bg color for popover button.text-button
- adjust settings for nemo
- use headerbar and not .titlebar in window-controls to match gedit

5 files changed, 243 insertions, 526 deletions

diff --git a/desktop-themes/GreenLaguna/gtk-3.0/gnome-applications.css b/desktop-themes/GreenLaguna/gtk-3.0/gnome-applications.css
index 348d44bb..ae34dd37 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/gnome-applications.css
+++ b/desktop-themes/GreenLaguna/gtk-3.0/gnome-applications.css
@@ -1,144 +1,10 @@
-/****************
- * Applications *
- ****************/
-
-ApDocView, /* Abiword */
-EogScrollView, /* Eog */
-CheeseThumbView /* Cheese */
-{
-	background-color: @chrome_bg_color;
-	-EogScrollView-shadow-type: none;
-}
-
-/* gnome-terminal */
-TerminalScreen {
-	background-color: @selected_fg_color;
-	color: @theme_text_color;
-	-TerminalScreen-background-darkness: 0.95;
-}
-
-/* gcalctool */
-MathWindow {
-	background-image: none;
-	background-color: @theme_bg_color;
-}
-
-MathWindow .frame {
-	border-color: @theme_main_color;
-	padding: 0px;
-}
-
-MathWindow GtkScrolledWindow GtkViewport.frame {
-	border-style: solid;
-	border-width: 2px;
-	border-radius: 3px;
-	border-color: @theme_main_color;
-}
-
-/* gnome-contacts */
-.contacts-main-view.view {
-	background-color: @theme_bg_color;
-	color: @theme_fg_color;
-}
-
-.contacts-left-toolbar.toolbar.menubar {
-	border-width: 0 2px 0 0;
-	border-style: solid;
-	border-color: @theme_bg_color;
-}
-
-/* empathy and gnome-contacts */
-EmpathyRosterView,
-ContactsListPane.frame * {
-	background-color: @theme_bg_color;
-	color: @theme_text_color;
-}
-
-ContactsListPane.frame GtkLabel,
-ContactsListPane.frame GtkImage,
-ContactsListPane.frame GtkBox,
-ContactsListPane.frame GtkGrid {
-	background-color: transparent;
-}
-
-EmpathyRosterView:hover,
-ContactsView:hover,
-EmpathyRosterView GtkBin:hover,
-ContactsView GtkBin:hover {
-	background-color: alpha(shade(@theme_bg_color, 1.1), 0.4);
-}
-
-.contacts-suggestion {
-	background-color: @theme_bg_color;
-}
-
-EmpathyRosterView:selected,
-ContactsView:selected,
-EmpathyRosterView GtkBin:selected,
-ContactsView GtkBin:selected {
-	background-image: linear-gradient(to bottom,
-	                                  shade(@theme_bg_color, 0.8),
-	                                  shade(@theme_bg_color, 1.2));
-}
-
-ContactsWindow .toolbar {
-	background-image: none;
-}
-
-ContactsListPane.frame GtkToolbar,
-ContactsListPane GtkScrolledWindow {
-	border-radius: 0px;
-}
-
-ContactsListPane.frame GtkToolbar {
-	padding: 4px 4px 10px 4px;
-}
-
-/* evolution */
-GtkHTML,
-EMailDisplay {
-	background-color: @theme_main_color;
-}
-
-EShellWindow *:active {
-	background-color: shade(@theme_selected_bg_color, 1.3);
-	color: @theme_main_color;
-}
-
-EShellWindow .button *:active {
-	background-color: transparent;
-	color: @theme_fg_color;
-}
-
-EShellSidebar *.cell:disabled { /* removes the "flash" when quitting */
-	background-color: @theme_bg_color;
-}
-
-/* File Roller */
-FrWindow GtkTreeView.view {
-	background-color: @theme_bg_color;
-}
-
-/* gnome-documents and Totem's search */
-.documents-entry-tag {
-	background-color: transparent;
-	border-radius: 3px;
-	border-width: 0;
-	margin: 2px;
-	padding: 4px;
-}
-
-.documents-entry-tag:hover {
-	background-color: shade(@theme_selected_bg_color, 1.23);
-}
-
 /*************
  * rhythmbox *
  *************/
 
-.primary-toolbar.toolbar.horizontal RBHeader.horizontal GtkVolumeButton.button.flat,
-.primary-toolbar.toolbar.horizontal RBHeader.horizontal GtkVolumeButton.button.flat:active,
-.primary-toolbar.toolbar.horizontal RBHeader.horizontal GtkVolumeButton.button.flat:hover {
+toolbar.primary-toolbar.horizontal > toolitem > grid.horizontal > button.scale.flat,
+toolbar.primary-toolbar.horizontal > toolitem > grid.horizontal > button.scale.flat:hover,
+toolbar.primary-toolbar.horizontal > toolitem > grid.horizontal > button.scale.flat:hover:active {
 	padding: 0px 6px;
 }
 
@@ -150,148 +16,34 @@ RBSource .cell.image {
  * Nautilus *
  ************/
 
-NautilusView .view {
-	background-color: shade(@base_color, 1.04)
-}
-
-.nautilus-inactive-pane .view {
-	background-color: shade(@theme_bg_color, 0.9);
-}
-
-.nautilus-inactive-pane .notebook {
-	background-color: shade(@theme_bg_color, 0.9);
+.nautilus-window > grid.horizontal > paned.horizontal > overlay > notebook header {
+    border-width: 0px 1px 0px 1px;
+    border-style: solid;
+    border-color: alpha(@frame_color, 0.6);
+    border-radius: 3px 3px 0px 0px;
 }
 
-.nautilus-inactive-pane .notebook tab.top:active {
-	background-image: linear-gradient(to bottom,
-	                                  shade(@theme_bg_color, 0.8),
-	                                  shade(@theme_bg_color, 0.86) 40%,
-	                                  shade(@theme_bg_color, 0.88) 70%,
-	                                  shade(@theme_bg_color, 0.9));
+.nautilus-window > grid.horizontal > paned.horizontal > overlay > notebook tab {
+    border-width: 0px 1px 1px 1px;
+    border-style: solid;
+    border-color: alpha(@frame_color, 0.6);
+    margin: 0px -1px 0px -1px;
+    border-radius: 3px 3px 0px 0px;
 }
 
-.nautilus-inactive-pane .notebook .scrollbar.button:disabled {
+.nautilus-inactive-pane notebook scrollbar.button:disabled {
 	background-color: shade(@theme_bg_color, 0.9);
 	border-radius: 0px;
 }
 
-/* file renaming */
-NautilusView .view .entry,
-NautilusView .view .entry:focus {
-	background-image: none;
-	border-image: none;
-	border-style: solid;
-	border-radius: 1px;
-	border-color: @theme_selected_bg_color;
-}
-
-NautilusWindow GtkScrolledWindow.frame {
-	border-style: none;
-}
-
-NautilusView .expander column:sorted:selected,
-NautilusView .expander column:sorted:selected:hover {
-	background-image: none;
-	background-color: transparent;
-}
-
-/* the small line between sidebar and view */
-NautilusWindow GtkPaned.horizontal {
-/*    -GtkPaned-handle-size: 3px;*/
-    border-style: solid;
-    border-width: 1px;
-    border-color: shade(@toolbar_gradient_base, 0.98);
-    background-color: @theme_bg_color;
-}
-
-NautilusWindow GtkStatusbar,
-NautilusWindow .floating-bar {
+.nautilus-window .floating-bar {
 	font: italic;
 }
 
-NautilusWindow .notebook {
-	/*border-color: shade(@notebook_border, 1.2);*/
-	border-radius: 0px 0px 5px 5px;
-}
-
-NautilusWindow .notebook tab {
-	border-radius: 0px;
-}
-
-NautilusWindow .notebook tab:active {
-	border-radius: 0px 0px 5px 5px;
-}
-
-NautilusWindow .notebook tab.top {
-	/* top right-left bottom */
-	padding: 4px 8px 4px;
-}
-
-NautilusWindow .notebook tab.top:active {
-	padding: 6px 8px 4px;
-}
-
-NautilusWindow .notebook .view.rubberband,
-NautilusWindow .notebook .rubberband {
-	background-color: alpha(@theme_selected_bg_color, 0.35);
-	border-radius: 6px;
-}
-
-NautilusWindow .sidebar .view {
-	background-color: shade(@theme_bg_color, 1.02);
-	border-width: 0px;
-}
-
-NautilusWindow .sidebar .frame {
-	border-width: 0px;
-}
-
-NautilusPlacesSidebar .cell:selected,
-NautilusPlacesSidebar *.cell:selected {
-	background-image:  linear-gradient(to bottom,
-	                                   shade(@theme_bg_color, 1.2),
-	                                   shade(@theme_bg_color, 0.63));
-	color: @theme_text_color;
-	border-radius: 2px;
-}
-
-NautilusPlacesSidebar .cell:selected:focus,
-NautilusPlacesSidebar *.cell:selected:focus {
-	color: @theme_text_color;
-	background-image:  linear-gradient(to top,
-	                                   shade(@theme_bg_color, 1.2),
-	                                   shade(@theme_bg_color, 0.63));
-}
-
-NautilusPlacesSidebar .cell.image:selected,
-NautilusPlacesSidebar .cell.image:selected:focus {
-	color: shade(@theme_selected_bg_color, 0.75);
-}
-
-NautilusWindow .question, /* why question for trash? */
-NautilusWindow .info,
-NautilusTrashBar.info,
-NautilusXContentBar.info,
-NautilusQueryEditor.info,
-NautilusSearchBar.info {
-	background-color: @theme_bg_color;
-}
-
-NautilusWindow NautilusQueryEditor .toolbar,
-NautilusWindow .notebook NautilusQueryEditor .toolbar {
-	background-image: none;
-	background-color: transparent;
-	padding: 5px 7px;
-}
-
 .nautilus-canvas-item {
 	border-radius: 5px;
 }
 
-NautilusDesktopWindow GtkPaned.horizontal {
-	background-color: transparent;
-}
-
 .nautilus-desktop.nautilus-canvas-item {
 	color: @theme_bg_color;
 	text-shadow: 1px 1px black;
@@ -311,3 +63,25 @@ NautilusDesktopWindow GtkPaned.horizontal {
 	text-shadow: none;
 }
 
+/*********
+ * Gedit *
+ *********/
+
+.gedit-side-panel-paned {
+    margin: 0px -2px 0px -2px;
+}
+
+.gedit-side-panel-paned viewport.frame {
+    border-width: 0px 1px 1px 1px;
+    border-style: solid;
+    border-color: alpha(@frame_color, 0.6);
+}
+
+.gedit-bottom-panel-paned > grid > notebook scrolledwindow {
+    background-color: shade(@base_color, 1.04);
+	border-style: solid;
+	border-color: alpha(@frame_color, 0.6);
+	border-width: 0px 1px 1px 1px;
+	border-radius: 2px;
+}
+
diff --git a/desktop-themes/GreenLaguna/gtk-3.0/gtk-main.css b/desktop-themes/GreenLaguna/gtk-3.0/gtk-main.css
index 93efdcc2..e28d9321 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/gtk-main.css
+++ b/desktop-themes/GreenLaguna/gtk-3.0/gtk-main.css
@@ -155,13 +155,13 @@
 @define-color overshoot_bg_color alpha (@theme_selected_bg_color, 0.15);
 @define-color overshoot_backdrop_bg_color #C8FA96;
 
-@define-color wm_a shade(@theme_bg_color, 1.3);
+@define-color wm_a shade(@theme_bg_color, 1.05);
 @define-color wm_b @theme_bg_color;
-@define-color wm_util shade(@theme_bg_color, 1.2);
-@define-color wm_unfocus shade(@theme_bg_color, 1.05);
+@define-color wm_util shade(@theme_bg_color, 1.05);
+@define-color wm_unfocus shade(@theme_bg_color, 1.02);
 @define-color wm_shadow alpha(black, 0.5);
 /* csd border */
-@define-color wm_csd_solid_bg shade(@theme_bg_color, 1.05);
+@define-color wm_csd_solid_bg shade(@theme_bg_color, 1.02);
 @define-color wm_csd_border_color shade (#B4B5B3, 1.35);
 @define-color wm_csd_solid_border_color shade (#B4B5B3, 1.2);
 
diff --git a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
index 6f19f223..1283d44e 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
@@ -800,6 +800,19 @@ scrolledwindow viewport.frame {
 	border-style: none;
 }
 
+/* ie, dconf-editor, nautilus view */
+.background.csd scrolledwindow,
+.gedit-bottom-panel-paned > grid > notebook scrolledwindow,
+.background.solid-csd > grid > paned.horizontal scrolledwindow {
+    background-color: shade(@base_color, 1.04);
+	-gtk-icon-style: regular;
+	border-style: solid;
+	border-color: alpha(@frame_color, 0.6);
+	border-width: 0px 1px 1px 1px;
+	border-radius: 2px;
+	padding: 0;
+}
+
 /***************
  * GtkLevelBar *
  ***************/
@@ -955,6 +968,8 @@ notebook header tab .active-page label {
 }
 
 /* tabs and header in view areas, ie. pluma-, caja-tabs */
+.gedit-bottom-panel-paned > grid > notebook > header.top,
+window.background > notebook > header.top, /* nautilus preferences */
 paned.horizontal > box.vertical > notebook > header.top,
 paned.horizontal > paned.vertical > notebook > header.top {
     border-style: solid;
@@ -971,6 +986,8 @@ paned.horizontal > paned.vertical > notebook scrolledwindow.frame {
     border-color: @notebook_border;
 }
 
+.gedit-bottom-panel-paned > grid > notebook > header tab,
+window.background > notebook > header tab,
 paned.horizontal > notebook > header tab,
 paned.horizontal > box.vertical > notebook > header tab,
 paned.horizontal > paned.vertical > notebook > header tab {
@@ -985,6 +1002,10 @@ paned.horizontal > paned.vertical > notebook > header tab {
     border-color: @notebook_border;
 }
 
+.gedit-bottom-panel-paned > grid > notebook > header tab:checked,
+.gedit-bottom-panel-paned > grid > notebook > header tab:checked:hover,
+window.background > notebook > header.top tab:checked,
+window.background > notebook > header.top tab:checked:hover,
 paned.horizontal > notebook > header.top tab:checked,
 paned.horizontal > notebook > header.top tab:checked:hover,
 paned.horizontal > box.vertical > notebook > header.top tab:checked,
@@ -1003,6 +1024,8 @@ paned.horizontal > paned.vertical > notebook > header.top tab:checked:hover {
     box-shadow: none;
 }
 
+.gedit-bottom-panel-paned > grid > notebook > header tab:hover,
+window.background > notebook > header.top tab:hover,
 paned.horizontal > notebook > header.top tab:hover,
 paned.horizontal > box.vertical > notebook > header.top tab:hover,
 paned.horizontal > paned.vertical > notebook > header.top tab:hover {
@@ -1018,6 +1041,7 @@ paned.horizontal > paned.vertical > notebook > header.top tab:hover {
     box-shadow: none;
 }
 
+.gedit-bottom-panel-paned > grid > notebook > header button.flat.small-button,
 paned.horizontal > box.vertical > notebook > header button.flat,
 paned.horizontal > paned.vertical > notebook > header button.flat {
     padding: 1px;
@@ -2534,23 +2558,6 @@ stackswitcher > button.needs-attention:checked > image {
 	background-image: none;
 }
 
-/***************
- * Header bars *
- ***************/
-
-headerbar {
-    border-width: 0 0 1px;
-    border-style: solid;
-    border-radius: 7px 7px 0 0;
-    padding: 0 1px;
-    padding: 6px;
-    background-color: @theme_bg_color;
-    /*background-image: linear-gradient(to bottom,
-                                        @toolbar_gradient_base,
-                                        shade(@theme_bg_color, 1.6));*/
-    border-color: shade(@theme_bg_color, 0.8);
-}
-
 /*******
  * OSD *
  *******/
@@ -3112,6 +3119,7 @@ popover .horizontal label {
 }
 
 .linked button.image-button.model,
+popover button.text-button,
 popover button.default.suggested-action.text-button {
     background-color: transparent;
     background-image: none;
@@ -3122,6 +3130,7 @@ popover button.default.suggested-action.text-button {
 }
 
 .linked button.image-button.model:hover,
+popover button.text-button:hover,
 popover button.default.suggested-action.text-button:hover {
 	color: @theme_selected_fg_color;
 	background-image:  linear-gradient(to bottom,
@@ -3133,10 +3142,17 @@ popover button.default.suggested-action.text-button:hover {
 	border-radius: 3px;
 }
 
+/***************
+ * Header bars *
+ ***************/
+
+
+
 /*******
  * CSD *
  *******/
 
+headerbar,
 .titlebar,
 .titlebar:backdrop {
     text-shadow: none;
@@ -3145,6 +3161,18 @@ popover button.default.suggested-action.text-button:hover {
                                       shade (@theme_bg_color, 1.0));
     border-radius: 7px 7px 0 0;
 	padding: 5px 4px 5px 5px;
+    border-width: 0 0 1px;
+    border-style: solid;
+    border-color: shade(@theme_bg_color, 0.8);
+}
+
+/* fix for gedit, .titlebar does not match headerbar selector */
+.background.csd > paned.horizontal.titlebar,
+.background.solid-csd > paned.horizontal.titlebar {
+    background-color: transparent;
+    padding: 0px 0px 0px 0px;
+    margin: 0px -2px 0px -2px;
+    border-width: 0px;
 }
 
 .tiled .titlebar {
@@ -4003,6 +4031,12 @@ placessidebar.sidebar {
 }
 
 /* dialog open, nautilus */
+placessidebar.sidebar.frame {
+    border-width: 0px 1px 1px 1px;
+    border-style: solid;
+    border-color: alpha(@frame_color, 0.6);
+}
+
 placessidebar.sidebar.frame > viewport.frame > list > row.activatable.sidebar-row {
     background-color: shade(@theme_bg_color, 1.02);
     border-radius: 0px;
diff --git a/desktop-themes/GreenLaguna/gtk-3.0/other-applications.css b/desktop-themes/GreenLaguna/gtk-3.0/other-applications.css
index df858c47..8fee6048 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/other-applications.css
+++ b/desktop-themes/GreenLaguna/gtk-3.0/other-applications.css
@@ -1,76 +1,31 @@
-/****************
- * Dconf-editor *
- ****************/
-
-/* sidebar */
-DConfWindow GtkTreeView.view {
-    background-color: shade(@theme_bg_color, 1.03);
-}
-
-DConfWindow GtkTreeView.view row:selected,
-DConfWindow GtkTreeView.view row:selected:focus {
-    background-image:  linear-gradient(to bottom,
-                                       shade(@theme_bg_color, 1.3),
-                                       shade(@theme_bg_color, 0.73));
-    color: @theme_fg_color;
-}
-
-DConfWindow DConfKeyView.view {
-    background-color: shade(@base_color, 1.06)
-}
-
-DConfWindow DConfKeyView.view row:selected,
-DConfWindow DConfKeyView.view row:selected:hover,
-DConfWindow DConfKeyView.view row:selected:focus {
-    background-image: linear-gradient(to bottom,
-                                      shade(@theme_selected_bg_color, 1.45),
-                                      shade(@theme_selected_bg_color, 0.95));
-    color: @theme_selected_fg_color;
-}
-
-DConfWindow DConfKeyView.view row:hover {
-    background-image:  linear-gradient(to bottom,
-                                       @theme_bg_color,
-                                       shade(@theme_bg_color, 0.80));
-    color: shade (@theme_selected_bg_color, 0.35);
-}
-
-/* the small line between sidebar and view */
-DConfWindow GtkPaned.horizontal {
-/*    -GtkPaned-handle-size: 3px;*/
-    border-color: transparent;
-    background-color: @theme_bg_color;
-}
-
-DConfKeyView.view .spinbutton .button {
-    border-image: none;
-    border-style: solid;
-    border-width:  1px;
-    border-radius: 0px;
-}
-
-/********
+ /********
  * Nemo *
  ********/
 
-.nemo-window-pane scrolledwindow {
-	background-color: shade(@base_color, 1.06);
+.nemo-window-pane notebook scrolledwindow {
+    background-color: shade(@base_color, 1.04);
+    border-width: 0px 1px 1px 1px;
+    border-style: solid;
+    border-color: alpha(@frame_color, 0.6);
 }
 
-NemoView .view,
-NemoView .view row {
-	background-color: shade(@base_color, 1.04)
+.nemo-window-pane treeview.view {
+    padding: 0px;
 }
 
-.nemo-inactive-pane .view {
+/* inactive pane */
+/* bug in gtk+, .view writes no bg color in all browsers */
+.nemo-inactive-pane .view,
+.nemo-inactive-pane scrolledwindow,
+.nemo-inactive-pane scrolledwindow treeview {
 	background-color: shade(@theme_bg_color, 0.9);
 }
 
-.nemo-inactive-pane .notebook {
+.nemo-inactive-pane notebook {
 	background-color: shade(@theme_bg_color, 0.9);
 }
 
-.nemo-inactive-pane .notebook tab.top:active {
+.nemo-inactive-pane notebook tab.top:checked {
 	background-image: linear-gradient(to bottom,
 	                                  shade(@theme_bg_color, 0.8),
 	                                  shade(@theme_bg_color, 0.86) 40%,
@@ -78,128 +33,46 @@ NemoView .view row {
 	                                  shade(@theme_bg_color, 0.9));
 }
 
-.nemo-inactive-pane .notebook .scrollbar.button:disabled {
+.nemo-inactive-pane notebook scrollbar button:disabled {
 	background-color: shade(@theme_bg_color, 0.9);
 	border-radius: 0px;
 }
 
-/* file renaming */
-NemoView .view .entry,
-NemoView .view .entry:focus {
-	background-image: none;
-	border-image: none;
-	border-style: solid;
-	border-radius: 1px;
-	border-color: @theme_selected_bg_color;
-}
-
-NemoWindow GtkScrolledWindow.frame {
-	border-style: none;
-}
-
-NemoView .expander column:sorted:selected,
-NemoView .expander column:sorted:selected:hover {
+.nemo-window-pane expander column:sorted:selected,
+.nemo-window-pane expander column:sorted:selected:hover {
 	background-image: none;
 	background-color: transparent;
 }
 
-/* the small line between sidebar and view */
-NemoWindow GtkPaned.horizontal {
-/*    -GtkPaned-handle-size: 3px;*/
-    border-style: solid;
-    border-width: 1px;
-    border-color: shade(@toolbar_gradient_base, 0.98);
-    background-color: @theme_bg_color;
-}
-
-NemoWindow GtkStatusbar,
-NemoWindow .floating-bar {
+.nemo-window statusbar {
 	font: italic;
 }
 
-NemoWindow NemoStatusBar.toolbar.horizontal {
+.nemo-window box.toolbar.horizontal {
     border-style: solid;
     border-width: 0 1px 0 0;
     border-color: shade(@toolbar_gradient_base, 0.98);
 }
 
-NemoWindow .notebook {
-	/*border-color: shade(@notebook_border, 1.2);*/
-	border-radius: 0px 0px 5px 5px;
-}
-
-NemoWindow .notebook tab {
+.nemo-window-pane .question,
+.nemo-window-pane .info {
+	background-color: @theme_bg_color;
 	border-radius: 0px;
 }
 
-NemoWindow .notebook tab:active {
-	border-radius: 0px 0px 5px 5px;
-}
-
-NemoWindow .notebook tab.top {
-	/* top right-left bottom */
-	padding: 4px 8px 4px;
-}
-
-NemoWindow .notebook tab.top:active {
-	padding: 6px 8px 4px;
-}
-
-NemoWindow .notebook .view.rubberband,
-NemoWindow .notebook .rubberband {
-	background-color: alpha(@theme_selected_bg_color, 0.35);
-	border-radius: 6px;
-}
-
-NemoWindow .sidebar .view{
-	background-color: shade(@theme_bg_color, 1.02);
-	border-width: 0px;
-}
-
-NemoWindow .sidebar .frame {
-	border-width: 0px;
-}
-
-NemoPlacesSidebar .cell:selected,
-NemoPlacesSidebar *.cell:selected {
-	background-image:  linear-gradient(to bottom,
-	                                   shade(@theme_bg_color, 1.2),
-	                                   shade(@theme_bg_color, 0.63));
-	color: @theme_text_color;
-	border-radius: 2px;
-}
-
-NemoPlacesSidebar .cell:selected:focus,
-NemoPlacesSidebar *.cell:selected:focus {
-	color: @theme_text_color;
-	background-image:  linear-gradient(to top,
-	                                   shade(@theme_bg_color, 1.2),
-	                                   shade(@theme_bg_color, 0.63));
-}
-
-NemoPlacesSidebar .cell.image:selected,
-NemoPlacesSidebar .cell.image:selected:focus {
-	color: shade(@theme_selected_bg_color, 0.75);
-}
-
-NemoWindow .question,
-NemoWindow .info,
-NemoTrashBar.info,
-NemoXContentBar.info,
-NemoQueryEditor.info,
-NemoSearchBar.info {
+/* query-editor */
+.nemo-window-pane  notebook box.vertical.toolbar.primary-toolbar {
 	background-color: @theme_bg_color;
+	padding: 5px 7px;
+    border-width: 0px 0px 1px 0px;
+    border-style: solid;
+    border-color: alpha(@frame_color, 0.6);
 }
 
-NemoSearchBar.info {
-	border-radius: 0px;
-}
-
-NemoWindow NemoQueryEditor .toolbar,
-NemoWindow .notebook NemoQueryEditor .toolbar {
-	background-image: none;
-	background-color: transparent;
-	padding: 5px 7px;
+.nemo-window .sidebar scrolledwindow {
+    border-width: 0px 1px 1px 1px;
+    border-style: solid;
+    border-color: alpha(@frame_color, 0.6);
 }
 
 .nemo-canvas-item {
@@ -225,6 +98,42 @@ NemoWindow .notebook NemoQueryEditor .toolbar {
 	text-shadow: none;
 }
 
+.nemo-desktop.view .entry,
+.nemo-desktop.view .entry:focus,
+.nemo-desktop.view .entry:active,
+.nemo-desktop.view .entry:backdrop,
+.nemo-window-pane .view .entry,
+.nemo-window-pane .view .entry:focus,
+.nemo-window-pane .view .entry:active,
+.nemo-window-pane .view .entry:backdrop {
+   background-image: -gtk-gradient(linear,
+                                   left top, left bottom,
+                                   from       (shade(@theme_base_color, 0.86)),
+                                   color-stop (0.15, shade(@theme_base_color, 0.96)),
+                                   color-stop (0.50, shade(@theme_base_color, 0.98)),
+                                   to         (shade(@theme_base_color, 1.00)));
+   border-image: none;
+   border-style: solid;
+   border-width: 1px;
+   border-color: @theme_fg_color;
+   box-shadow: none;
+   border-radius: 3px;
+   text-shadow: none;
+}
+
+.nemo-desktop.view .entry:selected,
+.nemo-desktop.view .entry:focus:selected,
+.nemo-desktop.view .entry:focus:active,
+.nemo-desktop.view .entry:backdrop:selected,
+.nemo-window-pane .view .entry:selected,
+.nemo-window-pane .view .entry:focus:active,
+.nemo-window-pane .view .entry:focus:selected,
+.nemo-window-pane .view .entry:backdrop:selected {
+    background-color: @theme_selected_bg_color;
+    color: @theme_selected_fg_color;
+    text-shadow: none;
+}
+
 /* parole madia list, hopefuly that styles no other things */
 paned.horizontal > notebook  box.horizontal > box.vertical > notebook,
 paned.horizontal > notebook  box.horizontal > box.vertical > notebook  scrolledwindow.frame {
diff --git a/desktop-themes/GreenLaguna/gtk-3.0/window-controls.css b/desktop-themes/GreenLaguna/gtk-3.0/window-controls.css
index 6e836764..ef2a8e21 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/window-controls.css
+++ b/desktop-themes/GreenLaguna/gtk-3.0/window-controls.css
@@ -1,15 +1,15 @@
-headerbar.titlebar .right button.minimize.titlebutton,
-headerbar.titlebar .right:dir(rtl) button.minimize.titlebutton,
-headerbar.titlebar .left button.minimize.titlebutton,
-headerbar.titlebar .left:dir(rtl) button.minimize.titlebutton,
-headerbar.titlebar .right button.maximize.titlebutton,
-headerbar.titlebar .right:dir(rtl) button.maximize.titlebutton,
-headerbar.titlebar .left button.maximize.titlebutton,
-headerbar.titlebar .left:dir(rtl) button.maximize.titlebutton,
-headerbar.titlebar .right button.close.titlebutton,
-headerbar.titlebar .right:dir(rtl) button.close.titlebutton,
-headerbar.titlebar .left button.close.titlebutton,
-headerbar.titlebar .left:dir(rtl) button.close.titlebutton {
+headerbar .right button.minimize.titlebutton,
+headerbar .right:dir(rtl) button.minimize.titlebutton,
+headerbar .left button.minimize.titlebutton,
+headerbar .left:dir(rtl) button.minimize.titlebutton,
+headerbar .right button.maximize.titlebutton,
+headerbar .right:dir(rtl) button.maximize.titlebutton,
+headerbar .left button.maximize.titlebutton,
+headerbar .left:dir(rtl) button.maximize.titlebutton,
+headerbar .right button.close.titlebutton,
+headerbar .right:dir(rtl) button.close.titlebutton,
+headerbar .left button.close.titlebutton,
+headerbar .left:dir(rtl) button.close.titlebutton {
 	color: transparent;
 	background-position: center;
 	background-repeat: no-repeat;
@@ -24,111 +24,111 @@ headerbar.titlebar .left:dir(rtl) button.close.titlebutton {
 
 /* minimize */
 
-headerbar.titlebar .right button.minimize.titlebutton,
-headerbar.titlebar .right:dir(rtl) button.minimize.titlebutton,
-headerbar.titlebar .left button.minimize.titlebutton,
-headerbar.titlebar .left:dir(rtl) button.minimize.titlebutton {
+headerbar .right button.minimize.titlebutton,
+headerbar .right:dir(rtl) button.minimize.titlebutton,
+headerbar .left button.minimize.titlebutton,
+headerbar .left:dir(rtl) button.minimize.titlebutton {
 	background-image: url('window-controls/neutral.png');
 }
 
-headerbar.titlebar .right button.minimize.titlebutton:hover,
-headerbar.titlebar .right:dir(rtl) button.minimize.titlebutton:hover,
-headerbar.titlebar .left button.minimize.titlebutton:hover,
-headerbar.titlebar .left:dir(rtl) button.minimize.titlebutton:hover {
+headerbar .right button.minimize.titlebutton:hover,
+headerbar .right:dir(rtl) button.minimize.titlebutton:hover,
+headerbar .left button.minimize.titlebutton:hover,
+headerbar .left:dir(rtl) button.minimize.titlebutton:hover {
 	background-image: url('window-controls/button-min-focus.png');
 }
 
-headerbar.titlebar .right button.minimize.titlebutton:checked,
-headerbar.titlebar .right:dir(rtl) button.minimize.titlebutton:checked,
-headerbar.titlebar .left button.minimize.titlebutton:checked,
-headerbar.titlebar .left:dir(rtl) button.minimize.titlebutton:checked {
+headerbar .right button.minimize.titlebutton:checked,
+headerbar .right:dir(rtl) button.minimize.titlebutton:checked,
+headerbar .left button.minimize.titlebutton:checked,
+headerbar .left:dir(rtl) button.minimize.titlebutton:checked {
 	background-image: url('window-controls/neutral.png');
 }
 
-headerbar.titlebar .right button.minimize.titlebutton:backdrop,
-headerbar.titlebar .right:dir(rtl) button.minimize.titlebutton:backdrop,
-headerbar.titlebar .left button.minimize.titlebutton:backdrop,
-headerbar.titlebar .left:dir(rtl) button.minimize.titlebutton:backdrop {
+headerbar .right button.minimize.titlebutton:backdrop,
+headerbar .right:dir(rtl) button.minimize.titlebutton:backdrop,
+headerbar .left button.minimize.titlebutton:backdrop,
+headerbar .left:dir(rtl) button.minimize.titlebutton:backdrop {
 	background-image: url('window-controls/unfocus.png');
 }
 /*
-headerbar.titlebar .right button.minimize.titlebutton:backdrop:hover,
-headerbar.titlebar .right:dir(rtl) button.minimize.titlebutton:backdrop:hover,
-headerbar.titlebar .left button.minimize.titlebutton:backdrop:hover,
-headerbar.titlebar .left:dir(rtl) button.minimize.titlebutton:backdrop:hover {
+headerbar .right button.minimize.titlebutton:backdrop:hover,
+headerbar .right:dir(rtl) button.minimize.titlebutton:backdrop:hover,
+headerbar .left button.minimize.titlebutton:backdrop:hover,
+headerbar .left:dir(rtl) button.minimize.titlebutton:backdrop:hover {
 	background-image: url('window-controls/minimize_unfocused_prelight.png');
 }
 */
 /* maximize */
-headerbar.titlebar .right button.maximize.titlebutton,
-headerbar.titlebar .right:dir(rtl) button.maximize.titlebutton,
-headerbar.titlebar .left button.maximize.titlebutton,
-headerbar.titlebar .left:dir(rtl) button.maximize.titlebutton {
+headerbar .right button.maximize.titlebutton,
+headerbar .right:dir(rtl) button.maximize.titlebutton,
+headerbar .left button.maximize.titlebutton,
+headerbar .left:dir(rtl) button.maximize.titlebutton {
 	background-image: url('window-controls/neutral.png');
 }
 
-headerbar.titlebar .right button.maximize.titlebutton:hover,
-headerbar.titlebar .right:dir(rtl) button.maximize.titlebutton:hover,
-headerbar.titlebar .left button.maximize.titlebutton:hover,
-headerbar.titlebar .left:dir(rtl) button.maximize.titlebutton:hover {
+headerbar .right button.maximize.titlebutton:hover,
+headerbar .right:dir(rtl) button.maximize.titlebutton:hover,
+headerbar .left button.maximize.titlebutton:hover,
+headerbar .left:dir(rtl) button.maximize.titlebutton:hover {
 	background-image: url('window-controls/button-max-focus.png');
 }
 
-headerbar.titlebar .right button.maximize.titlebutton:checked,
-headerbar.titlebar .right:dir(rtl) button.maximize.titlebutton:checked,
-headerbar.titlebar .left button.maximize.titlebutton:checked,
-headerbar.titlebar .left:dir(rtl) button.maximize.titlebutton:checked {
+headerbar .right button.maximize.titlebutton:checked,
+headerbar .right:dir(rtl) button.maximize.titlebutton:checked,
+headerbar .left button.maximize.titlebutton:checked,
+headerbar .left:dir(rtl) button.maximize.titlebutton:checked {
 	background-image: url('window-controls/neutral.png');
 }
 
-headerbar.titlebar .right button.maximize.titlebutton:backdrop,
-headerbar.titlebar .right:dir(rtl) button.maximize.titlebutton:backdrop,
-headerbar.titlebar .left button.maximize.titlebutton:backdrop,
-headerbar.titlebar .left:dir(rtl) button.maximize.titlebutton:backdrop {
+headerbar .right button.maximize.titlebutton:backdrop,
+headerbar .right:dir(rtl) button.maximize.titlebutton:backdrop,
+headerbar .left button.maximize.titlebutton:backdrop,
+headerbar .left:dir(rtl) button.maximize.titlebutton:backdrop {
 	background-image: url('window-controls/unfocus.png');
 }
 /*
-headerbar.titlebar .right button.maximize.titlebutton:backdrop:hover,
-headerbar.titlebar .right:dir(rtl) button.maximize.titlebutton:backdrop:hover,
-headerbar.titlebar .left button.maximize.titlebutton:backdrop:hover,
-headerbar.titlebar .left:dir(rtl) button.maximize.titlebutton:backdrop:hover {
+headerbar .right button.maximize.titlebutton:backdrop:hover,
+headerbar .right:dir(rtl) button.maximize.titlebutton:backdrop:hover,
+headerbar .left button.maximize.titlebutton:backdrop:hover,
+headerbar .left:dir(rtl) button.maximize.titlebutton:backdrop:hover {
 	background-image: url('window-controls/maximize_unfocused_prelight.png');
 }
 */
 /* close */
-headerbar.titlebar .right button.close.titlebutton,
-headerbar.titlebar .right:dir(rtl) button.close.titlebutton,
-headerbar.titlebar .left button.close.titlebutton,
-headerbar.titlebar .left:dir(rtl) button.close.titlebutton {
+headerbar .right button.close.titlebutton,
+headerbar .right:dir(rtl) button.close.titlebutton,
+headerbar .left button.close.titlebutton,
+headerbar .left:dir(rtl) button.close.titlebutton {
 	background-image: url('window-controls/neutral.png');
 	/*padding: 2px 6px 3px 3px;*/ /* FIXME: Uncomment this shit when using the Faenza icon theme and maybe some other icon themes */
 }
 
-headerbar.titlebar .right button.close.titlebutton:hover,
-headerbar.titlebar .right:dir(rtl) button.close.titlebutton:hover,
-headerbar.titlebar .left button.close.titlebutton:hover,
-headerbar.titlebar .left:dir(rtl) button.close.titlebutton:hover {
+headerbar .right button.close.titlebutton:hover,
+headerbar .right:dir(rtl) button.close.titlebutton:hover,
+headerbar .left button.close.titlebutton:hover,
+headerbar .left:dir(rtl) button.close.titlebutton:hover {
 	background-image: url('window-controls/button-close-focus.png');
 }
 
-headerbar.titlebar .right button.close.titlebutton:checked,
-headerbar.titlebar .right:dir(rtl) button.close.titlebutton:checked,
-headerbar.titlebar .left button.close.titlebutton:checked,
-headerbar.titlebar .left:dir(rtl) button.close.titlebutton:checked {
+headerbar .right button.close.titlebutton:checked,
+headerbar .right:dir(rtl) button.close.titlebutton:checked,
+headerbar .left button.close.titlebutton:checked,
+headerbar .left:dir(rtl) button.close.titlebutton:checked {
 	background-image: url('window-controls/neutral.png');
 }
 
-headerbar.titlebar .right button.close.titlebutton:backdrop,
-headerbar.titlebar .right:dir(rtl) button.close.titlebutton:backdrop,
-headerbar.titlebar .left button.close.titlebutton:backdrop,
-headerbar.titlebar .left:dir(rtl) button.close.titlebutton:backdrop {
+headerbar .right button.close.titlebutton:backdrop,
+headerbar .right:dir(rtl) button.close.titlebutton:backdrop,
+headerbar .left button.close.titlebutton:backdrop,
+headerbar .left:dir(rtl) button.close.titlebutton:backdrop {
 	background-image: url('window-controls/unfocus.png');
 }
 /*
-headerbar.titlebar .right button.close.titlebutton:backdrop:hover,
-headerbar.titlebar .right:dir(rtl) button.close.titlebutton:backdrop:hover,
-headerbar.titlebar .left button.close.titlebutton:backdrop:hover,
-headerbar.titlebar .left:dir(rtl) button.close.titlebutton:backdrop:hover {
+headerbar .right button.close.titlebutton:backdrop:hover,
+headerbar .right:dir(rtl) button.close.titlebutton:backdrop:hover,
+headerbar .left button.close.titlebutton:backdrop:hover,
+headerbar .left:dir(rtl) button.close.titlebutton:backdrop:hover {
 	background-image: url('window-controls/close_unfocused_prelight.png');
 }
 */
@@ -140,30 +140,30 @@ headerbar.titlebar .left:dir(rtl) button.close.titlebutton:backdrop:hover {
 
 /* Menu button when fallback kicks in (XFCE, Cinnamon etc.) */
 /*
-headerbar.titlebar .button.menu-button.titlebutton {
+headerbar .button.menu-button.titlebutton {
 	background-image: url('window-controls/menu.png');
 }
 
-headerbar.titlebar .button.menu-button.titlebutton:hover {
+headerbar .button.menu-button.titlebutton:hover {
 	background-image: url('window-controls/menu_prelight.png');
 }
 
-headerbar.titlebar .button.menu-button.titlebutton:active {
+headerbar .button.menu-button.titlebutton:active {
 	background-image: url('window-controls/menu.png');
 }
 */
 
-headerbar.titlebar button.close.titlebutton,
-headerbar.titlebar button.minimize.titlebutton,
-headerbar.titlebar button.maximize.titlebutton {
+headerbar button.close.titlebutton,
+headerbar button.minimize.titlebutton,
+headerbar button.maximize.titlebutton {
     border-width: 0px;
     border-image: none;
     background-color: transparent;
 }
 
-headerbar.titlebar button.close.titlebutton image,
-headerbar.titlebar button.minimize.titlebutton image,
-headerbar.titlebar button.maximize.titlebutton image {
+headerbar button.close.titlebutton image,
+headerbar button.minimize.titlebutton image,
+headerbar button.maximize.titlebutton image {
         color: transparent;
 }