some fixes

10 files changed, 305 insertions, 125 deletions

diff --git a/common/gtk-3.0/3.14/_colors.scss b/common/gtk-3.0/3.14/_colors.scss
index 10040cd..c53454d 100644
--- a/common/gtk-3.0/3.14/_colors.scss
+++ b/common/gtk-3.0/3.14/_colors.scss
@@ -72,26 +72,26 @@ $panel_fg: $dark_sidebar_fg;
 //WM Buttons
 
 // Close
-$wm_button_close_bg: if($variant == 'light', #f37076, #e45e65);
-$wm_button_close_hover_bg: if($variant == 'light', #f79da1, #f48085);
-$wm_button_close_active_bg: if($variant == 'light', #ef4048, #e6262f);
+$wm_button_close_bg: if($variant == 'light' and $darker == 'false', #f37076, #e45e65);
+$wm_button_close_hover_bg: if($variant == 'light' and $darker == 'false', #f79da1, #f48085);
+$wm_button_close_active_bg: if($variant == 'light' and $darker == 'false', #ef4048, #e6262f);
 
 $wm_icon_close_bg: $selected_fg_color;
 $wm_icon_close_hover_bg: $selected_fg_color;
 $wm_icon_close_active_bg: $selected_fg_color;
 
 // Minimize, Maximize
-$wm_button_bg: if($variant == 'light', #fdfdfd, #212429);
-$wm_button_unfocused_bg: if($variant == 'light', #f6f7f8, #22252b);
-$wm_button_hover_bg: if($variant == 'light', #fdfdfd, #212429);
+$wm_button_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #212429);
+$wm_button_unfocused_bg: if($variant == 'light' and $darker == 'false', #f6f7f8, #22252b);
+$wm_button_hover_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #212429);
 $wm_button_active_bg: $selected_bg_color;
 
-$wm_button_border: if($variant == 'light', #d8dae0, #141619);
-$wm_button_unfocused_border: if($variant == 'light', #dddee2, #1a1c20);
+$wm_button_border: if($variant == 'light' and $darker == 'false', #d8dae0, #141619);
+$wm_button_unfocused_border: if($variant == 'light' and $darker == 'false', #dddee2, #1a1c20);
 $wm_button_hover_border: $selected_bg_color;
 $wm_button_active_border: $selected_bg_color;
 
-$wm_icon_bg: if($variant == 'light', #a7adb9, #777d86);
-$wm_icon_unfocused_bg: if($variant == 'light', #babec7, #575c63);
-$wm_icon_hover_bg: if($variant == 'light', #757d91, #838993);
+$wm_icon_bg: if($variant == 'light' and $darker == 'false', #a7adb9, #777d86);
+$wm_icon_unfocused_bg: if($variant == 'light' and $darker == 'false', #babec7, #575c63);
+$wm_icon_hover_bg: if($variant == 'light' and $darker == 'false', #757d91, #838993);
 $wm_icon_active_bg: $selected_fg_color;
diff --git a/common/gtk-3.0/3.14/_common.scss b/common/gtk-3.0/3.14/_common.scss
index 1c21611..be91dfb 100644
--- a/common/gtk-3.0/3.14/_common.scss
+++ b/common/gtk-3.0/3.14/_common.scss
@@ -2614,7 +2614,7 @@ GtkVolumeButton.button { padding: 8px; }
   .right:dir(rtl) .button.titlebutton:nth-child(3),
   .left .button.titlebutton:nth-child(3),
   .left:dir(rtl) .button.titlebutton:nth-last-child(3) {
-    background-image: -gtk-scaled(url('assets/titlebutton-min#{$asset_suffix}.png'),url('assets/titlebutton-min#{$darker_asset_suffix}@2.png'));
+    background-image: -gtk-scaled(url('assets/titlebutton-min#{$darker_asset_suffix}.png'),url('assets/titlebutton-min#{$darker_asset_suffix}@2.png'));
 
     &:hover, &:backdrop:hover { background-image: -gtk-scaled(url('assets/titlebutton-min-hover#{$darker_asset_suffix}.png'),url('assets/titlebutton-min-hover#{$darker_asset_suffix}@2.png')); }
     &:active:hover { background-image: -gtk-scaled(url('assets/titlebutton-min-active#{$darker_asset_suffix}.png'),url('assets/titlebutton-min-active#{$darker_asset_suffix}@2.png')); }
diff --git a/common/gtk-3.0/3.14/gtk-contained-dark.css b/common/gtk-3.0/3.14/gtk-contained-dark.css
index 263a3a3..9106a20 100644
--- a/common/gtk-3.0/3.14/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.14/gtk-contained-dark.css
@@ -2719,6 +2719,9 @@ EphyWindow .floating-bar {
 TotemGrilo.vertical GdMainView.frame {
   border-width: 0; }
 
+SynapseGuiViewDefault *:selected {
+  background-color: #5294E2; }
+
 .gnome-panel-menu-bar,
 PanelApplet > GtkMenuBar.menubar,
 PanelToplevel,
@@ -3155,141 +3158,195 @@ NautilusWindow GtkBox.sidebar,
 NemoWindow GtkBox.sidebar,
 MarlinViewWindow GtkBox.sidebar {
   background-color: transparent; }
-GtkFileChooserDialog .sidebar, GtkFileChooserDialog MarlinPlacesSidebar,
+GtkFileChooserDialog .sidebar, GtkFileChooserDialog MarlinPlacesSidebar, GtkFileChooserDialog NemoPlacesSidebar,
 NautilusWindow .sidebar,
 NautilusWindow MarlinPlacesSidebar,
+NautilusWindow NemoPlacesSidebar,
 NemoWindow .sidebar,
 NemoWindow MarlinPlacesSidebar,
+NemoWindow NemoPlacesSidebar,
 MarlinViewWindow .sidebar,
-MarlinViewWindow MarlinPlacesSidebar {
+MarlinViewWindow MarlinPlacesSidebar,
+MarlinViewWindow NemoPlacesSidebar {
   background-color: rgba(69, 74, 84, 0.95); }
-  GtkFileChooserDialog .sidebar .view, GtkFileChooserDialog .sidebar .source-list.sidebar row, GtkFileChooserDialog MarlinPlacesSidebar .view, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row,
+  GtkFileChooserDialog .sidebar .view, GtkFileChooserDialog .sidebar .source-list.sidebar row, GtkFileChooserDialog MarlinPlacesSidebar .view, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row, GtkFileChooserDialog NemoPlacesSidebar .view, GtkFileChooserDialog NemoPlacesSidebar .source-list.sidebar row,
   NautilusWindow .sidebar .view,
   NautilusWindow .sidebar .source-list.sidebar row,
   NautilusWindow MarlinPlacesSidebar .view,
   NautilusWindow MarlinPlacesSidebar .source-list.sidebar row,
+  NautilusWindow NemoPlacesSidebar .view,
+  NautilusWindow NemoPlacesSidebar .source-list.sidebar row,
   NemoWindow .sidebar .view,
   NemoWindow .sidebar .source-list.sidebar row,
   NemoWindow MarlinPlacesSidebar .view,
   NemoWindow MarlinPlacesSidebar .source-list.sidebar row,
+  NemoWindow NemoPlacesSidebar .view,
+  NemoWindow NemoPlacesSidebar .source-list.sidebar row,
   MarlinViewWindow .sidebar .view,
   MarlinViewWindow .sidebar .source-list.sidebar row,
   MarlinViewWindow MarlinPlacesSidebar .view,
-  MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row {
+  MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row,
+  MarlinViewWindow NemoPlacesSidebar .view,
+  MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row {
     background-color: transparent;
     color: #A8ADB5; }
-    GtkFileChooserDialog .sidebar .view.image, GtkFileChooserDialog .sidebar .source-list.sidebar row.image, GtkFileChooserDialog MarlinPlacesSidebar .view.image, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row.image,
+    GtkFileChooserDialog .sidebar .view.image, GtkFileChooserDialog .sidebar .source-list.sidebar row.image, GtkFileChooserDialog MarlinPlacesSidebar .view.image, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row.image, GtkFileChooserDialog NemoPlacesSidebar .view.image, GtkFileChooserDialog NemoPlacesSidebar .source-list.sidebar row.image,
     NautilusWindow .sidebar .view.image,
     NautilusWindow .sidebar .source-list.sidebar row.image,
     NautilusWindow MarlinPlacesSidebar .view.image,
     NautilusWindow MarlinPlacesSidebar .source-list.sidebar row.image,
+    NautilusWindow NemoPlacesSidebar .view.image,
+    NautilusWindow NemoPlacesSidebar .source-list.sidebar row.image,
     NemoWindow .sidebar .view.image,
     NemoWindow .sidebar .source-list.sidebar row.image,
     NemoWindow MarlinPlacesSidebar .view.image,
     NemoWindow MarlinPlacesSidebar .source-list.sidebar row.image,
+    NemoWindow NemoPlacesSidebar .view.image,
+    NemoWindow NemoPlacesSidebar .source-list.sidebar row.image,
     MarlinViewWindow .sidebar .view.image,
     MarlinViewWindow .sidebar .source-list.sidebar row.image,
     MarlinViewWindow MarlinPlacesSidebar .view.image,
-    MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.image {
+    MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.image,
+    MarlinViewWindow NemoPlacesSidebar .view.image,
+    MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row.image {
       color: rgba(168, 173, 181, 0.6); }
-    GtkFileChooserDialog .sidebar .view.cell:selected, GtkFileChooserDialog .sidebar .source-list.sidebar row.cell:selected, GtkFileChooserDialog MarlinPlacesSidebar .view.cell:selected, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row.cell:selected,
+    GtkFileChooserDialog .sidebar .view.cell:selected, GtkFileChooserDialog .sidebar .source-list.sidebar row.cell:selected, GtkFileChooserDialog MarlinPlacesSidebar .view.cell:selected, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row.cell:selected, GtkFileChooserDialog NemoPlacesSidebar .view.cell:selected, GtkFileChooserDialog NemoPlacesSidebar .source-list.sidebar row.cell:selected,
     NautilusWindow .sidebar .view.cell:selected,
     NautilusWindow .sidebar .source-list.sidebar row.cell:selected,
     NautilusWindow MarlinPlacesSidebar .view.cell:selected,
     NautilusWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected,
+    NautilusWindow NemoPlacesSidebar .view.cell:selected,
+    NautilusWindow NemoPlacesSidebar .source-list.sidebar row.cell:selected,
     NemoWindow .sidebar .view.cell:selected,
     NemoWindow .sidebar .source-list.sidebar row.cell:selected,
     NemoWindow MarlinPlacesSidebar .view.cell:selected,
     NemoWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected,
+    NemoWindow NemoPlacesSidebar .view.cell:selected,
+    NemoWindow NemoPlacesSidebar .source-list.sidebar row.cell:selected,
     MarlinViewWindow .sidebar .view.cell:selected,
     MarlinViewWindow .sidebar .source-list.sidebar row.cell:selected,
     MarlinViewWindow MarlinPlacesSidebar .view.cell:selected,
-    MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected {
+    MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected,
+    MarlinViewWindow NemoPlacesSidebar .view.cell:selected,
+    MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row.cell:selected {
       background-color: #5294E2;
       color: #ffffff; }
-  GtkFileChooserDialog .sidebar.frame, GtkFileChooserDialog MarlinPlacesSidebar.frame,
+  GtkFileChooserDialog .sidebar.frame, GtkFileChooserDialog MarlinPlacesSidebar.frame, GtkFileChooserDialog NemoPlacesSidebar.frame,
   NautilusWindow .sidebar.frame,
   NautilusWindow MarlinPlacesSidebar.frame,
+  NautilusWindow NemoPlacesSidebar.frame,
   NemoWindow .sidebar.frame,
   NemoWindow MarlinPlacesSidebar.frame,
+  NemoWindow NemoPlacesSidebar.frame,
   MarlinViewWindow .sidebar.frame,
-  MarlinViewWindow MarlinPlacesSidebar.frame {
+  MarlinViewWindow MarlinPlacesSidebar.frame,
+  MarlinViewWindow NemoPlacesSidebar.frame {
     color: #A8ADB5; }
-  GtkFileChooserDialog .sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, GtkFileChooserDialog MarlinPlacesSidebar .separator, GtkFileChooserDialog MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar GtkFileChooserDialog MarlinPlacesSidebar .view.separator,
+  GtkFileChooserDialog .sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, GtkFileChooserDialog MarlinPlacesSidebar .separator, GtkFileChooserDialog MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar GtkFileChooserDialog MarlinPlacesSidebar .view.separator, GtkFileChooserDialog NemoPlacesSidebar .separator, GtkFileChooserDialog NemoPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar GtkFileChooserDialog NemoPlacesSidebar .view.separator,
   NautilusWindow .sidebar .separator,
   NautilusWindow GtkPlacesSidebar.sidebar .view.separator,
   NautilusWindow MarlinPlacesSidebar .separator,
   NautilusWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator,
   GtkPlacesSidebar.sidebar NautilusWindow MarlinPlacesSidebar .view.separator,
+  NautilusWindow NemoPlacesSidebar .separator,
+  NautilusWindow NemoPlacesSidebar GtkPlacesSidebar.sidebar .view.separator,
+  GtkPlacesSidebar.sidebar NautilusWindow NemoPlacesSidebar .view.separator,
   NemoWindow .sidebar .separator,
   NemoWindow GtkPlacesSidebar.sidebar .view.separator,
   NemoWindow MarlinPlacesSidebar .separator,
   NemoWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator,
   GtkPlacesSidebar.sidebar NemoWindow MarlinPlacesSidebar .view.separator,
+  NemoWindow NemoPlacesSidebar .separator,
+  NemoWindow NemoPlacesSidebar GtkPlacesSidebar.sidebar .view.separator,
+  GtkPlacesSidebar.sidebar NemoWindow NemoPlacesSidebar .view.separator,
   MarlinViewWindow .sidebar .separator,
   MarlinViewWindow GtkPlacesSidebar.sidebar .view.separator,
   MarlinViewWindow MarlinPlacesSidebar .separator,
   MarlinViewWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator,
-  GtkPlacesSidebar.sidebar MarlinViewWindow MarlinPlacesSidebar .view.separator {
+  GtkPlacesSidebar.sidebar MarlinViewWindow MarlinPlacesSidebar .view.separator,
+  MarlinViewWindow NemoPlacesSidebar .separator,
+  MarlinViewWindow NemoPlacesSidebar GtkPlacesSidebar.sidebar .view.separator,
+  GtkPlacesSidebar.sidebar MarlinViewWindow NemoPlacesSidebar .view.separator {
     color: transparent; }
-  GtkFileChooserDialog .sidebar .scrollbar.trough, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.trough,
+  GtkFileChooserDialog .sidebar .scrollbar.trough, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.trough, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.trough,
   NautilusWindow .sidebar .scrollbar.trough,
   NautilusWindow MarlinPlacesSidebar .scrollbar.trough,
+  NautilusWindow NemoPlacesSidebar .scrollbar.trough,
   NemoWindow .sidebar .scrollbar.trough,
   NemoWindow MarlinPlacesSidebar .scrollbar.trough,
+  NemoWindow NemoPlacesSidebar .scrollbar.trough,
   MarlinViewWindow .sidebar .scrollbar.trough,
-  MarlinViewWindow MarlinPlacesSidebar .scrollbar.trough {
+  MarlinViewWindow MarlinPlacesSidebar .scrollbar.trough,
+  MarlinViewWindow NemoPlacesSidebar .scrollbar.trough {
     background-color: transparent;
     border-color: transparent; }
-  GtkFileChooserDialog .sidebar .scrollbar.slider, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider,
+  GtkFileChooserDialog .sidebar .scrollbar.slider, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider,
   NautilusWindow .sidebar .scrollbar.slider,
   NautilusWindow MarlinPlacesSidebar .scrollbar.slider,
+  NautilusWindow NemoPlacesSidebar .scrollbar.slider,
   NemoWindow .sidebar .scrollbar.slider,
   NemoWindow MarlinPlacesSidebar .scrollbar.slider,
+  NemoWindow NemoPlacesSidebar .scrollbar.slider,
   MarlinViewWindow .sidebar .scrollbar.slider,
-  MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider {
+  MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider,
+  MarlinViewWindow NemoPlacesSidebar .scrollbar.slider {
     border-radius: 20px;
     border: 3px solid transparent;
     background-color: rgba(209, 212, 216, 0.7); }
-    GtkFileChooserDialog .sidebar .scrollbar.slider:hover, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:hover,
+    GtkFileChooserDialog .sidebar .scrollbar.slider:hover, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:hover, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:hover,
     NautilusWindow .sidebar .scrollbar.slider:hover,
     NautilusWindow MarlinPlacesSidebar .scrollbar.slider:hover,
+    NautilusWindow NemoPlacesSidebar .scrollbar.slider:hover,
     NemoWindow .sidebar .scrollbar.slider:hover,
     NemoWindow MarlinPlacesSidebar .scrollbar.slider:hover,
+    NemoWindow NemoPlacesSidebar .scrollbar.slider:hover,
     MarlinViewWindow .sidebar .scrollbar.slider:hover,
-    MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:hover {
+    MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:hover,
+    MarlinViewWindow NemoPlacesSidebar .scrollbar.slider:hover {
       background-color: #dfe1e4; }
-    GtkFileChooserDialog .sidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:prelight:active,
+    GtkFileChooserDialog .sidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:prelight:active,
     NautilusWindow .sidebar .scrollbar.slider:prelight:active,
     NautilusWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active,
+    NautilusWindow NemoPlacesSidebar .scrollbar.slider:prelight:active,
     NemoWindow .sidebar .scrollbar.slider:prelight:active,
     NemoWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active,
+    NemoWindow NemoPlacesSidebar .scrollbar.slider:prelight:active,
     MarlinViewWindow .sidebar .scrollbar.slider:prelight:active,
-    MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active {
+    MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active,
+    MarlinViewWindow NemoPlacesSidebar .scrollbar.slider:prelight:active {
       background-color: #5294E2; }
-    GtkFileChooserDialog .sidebar .scrollbar.slider.fine-tune, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider.fine-tune,
+    GtkFileChooserDialog .sidebar .scrollbar.slider.fine-tune, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider.fine-tune, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider.fine-tune,
     NautilusWindow .sidebar .scrollbar.slider.fine-tune,
     NautilusWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune,
+    NautilusWindow NemoPlacesSidebar .scrollbar.slider.fine-tune,
     NemoWindow .sidebar .scrollbar.slider.fine-tune,
     NemoWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune,
+    NemoWindow NemoPlacesSidebar .scrollbar.slider.fine-tune,
     MarlinViewWindow .sidebar .scrollbar.slider.fine-tune,
-    MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune {
+    MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune,
+    MarlinViewWindow NemoPlacesSidebar .scrollbar.slider.fine-tune {
       border-width: 4px; }
-      GtkFileChooserDialog .sidebar .scrollbar.slider.fine-tune:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active,
+      GtkFileChooserDialog .sidebar .scrollbar.slider.fine-tune:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider.fine-tune:prelight:active,
       NautilusWindow .sidebar .scrollbar.slider.fine-tune:prelight:active,
       NautilusWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active,
+      NautilusWindow NemoPlacesSidebar .scrollbar.slider.fine-tune:prelight:active,
       NemoWindow .sidebar .scrollbar.slider.fine-tune:prelight:active,
       NemoWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active,
+      NemoWindow NemoPlacesSidebar .scrollbar.slider.fine-tune:prelight:active,
       MarlinViewWindow .sidebar .scrollbar.slider.fine-tune:prelight:active,
-      MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active {
+      MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active,
+      MarlinViewWindow NemoPlacesSidebar .scrollbar.slider.fine-tune:prelight:active {
         background-color: #5294E2; }
-    GtkFileChooserDialog .sidebar .scrollbar.slider:insensitive, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:insensitive,
+    GtkFileChooserDialog .sidebar .scrollbar.slider:insensitive, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:insensitive, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:insensitive,
     NautilusWindow .sidebar .scrollbar.slider:insensitive,
     NautilusWindow MarlinPlacesSidebar .scrollbar.slider:insensitive,
+    NautilusWindow NemoPlacesSidebar .scrollbar.slider:insensitive,
     NemoWindow .sidebar .scrollbar.slider:insensitive,
     NemoWindow MarlinPlacesSidebar .scrollbar.slider:insensitive,
+    NemoWindow NemoPlacesSidebar .scrollbar.slider:insensitive,
     MarlinViewWindow .sidebar .scrollbar.slider:insensitive,
-    MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:insensitive {
+    MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:insensitive,
+    MarlinViewWindow NemoPlacesSidebar .scrollbar.slider:insensitive {
       background-color: transparent; }
 GtkFileChooserDialog.maximized .sidebar,
 NautilusWindow.maximized .sidebar,
diff --git a/common/gtk-3.0/3.14/gtk-contained-darker.css b/common/gtk-3.0/3.14/gtk-contained-darker.css
index d0cb8ee..f3f0e0e 100644
--- a/common/gtk-3.0/3.14/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.14/gtk-contained-darker.css
@@ -2151,7 +2151,7 @@ GtkVolumeButton.button {
 .titlebar.selection-mode .right:dir(rtl) .button.titlebutton:nth-child(3),
 .titlebar.selection-mode .left .button.titlebutton:nth-child(3),
 .titlebar.selection-mode .left:dir(rtl) .button.titlebutton:nth-last-child(3) {
-  background-image: -gtk-scaled(url("assets/titlebutton-min.png"), url("assets/titlebutton-min-dark@2.png")); }
+  background-image: -gtk-scaled(url("assets/titlebutton-min-dark.png"), url("assets/titlebutton-min-dark@2.png")); }
   .header-bar .right .button.titlebutton:nth-last-child(3):hover, .header-bar .right .button.titlebutton:nth-last-child(3):backdrop:hover,
   .header-bar .right:dir(rtl) .button.titlebutton:nth-child(3):hover,
   .header-bar .right:dir(rtl) .button.titlebutton:nth-child(3):backdrop:hover,
@@ -2720,6 +2720,9 @@ EphyWindow .floating-bar {
 TotemGrilo.vertical GdMainView.frame {
   border-width: 0; }
 
+SynapseGuiViewDefault *:selected {
+  background-color: #5294E2; }
+
 .gnome-panel-menu-bar,
 PanelApplet > GtkMenuBar.menubar,
 PanelToplevel,
@@ -3147,141 +3150,195 @@ NautilusWindow GtkBox.sidebar,
 NemoWindow GtkBox.sidebar,
 MarlinViewWindow GtkBox.sidebar {
   background-color: transparent; }
-GtkFileChooserDialog .sidebar, GtkFileChooserDialog MarlinPlacesSidebar,
+GtkFileChooserDialog .sidebar, GtkFileChooserDialog MarlinPlacesSidebar, GtkFileChooserDialog NemoPlacesSidebar,
 NautilusWindow .sidebar,
 NautilusWindow MarlinPlacesSidebar,
+NautilusWindow NemoPlacesSidebar,
 NemoWindow .sidebar,
 NemoWindow MarlinPlacesSidebar,
+NemoWindow NemoPlacesSidebar,
 MarlinViewWindow .sidebar,
-MarlinViewWindow MarlinPlacesSidebar {
+MarlinViewWindow MarlinPlacesSidebar,
+MarlinViewWindow NemoPlacesSidebar {
   background-color: rgba(60, 64, 73, 0.95); }
-  GtkFileChooserDialog .sidebar .view, GtkFileChooserDialog .sidebar .source-list.sidebar row, GtkFileChooserDialog MarlinPlacesSidebar .view, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row,
+  GtkFileChooserDialog .sidebar .view, GtkFileChooserDialog .sidebar .source-list.sidebar row, GtkFileChooserDialog MarlinPlacesSidebar .view, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row, GtkFileChooserDialog NemoPlacesSidebar .view, GtkFileChooserDialog NemoPlacesSidebar .source-list.sidebar row,
   NautilusWindow .sidebar .view,
   NautilusWindow .sidebar .source-list.sidebar row,
   NautilusWindow MarlinPlacesSidebar .view,
   NautilusWindow MarlinPlacesSidebar .source-list.sidebar row,
+  NautilusWindow NemoPlacesSidebar .view,
+  NautilusWindow NemoPlacesSidebar .source-list.sidebar row,
   NemoWindow .sidebar .view,
   NemoWindow .sidebar .source-list.sidebar row,
   NemoWindow MarlinPlacesSidebar .view,
   NemoWindow MarlinPlacesSidebar .source-list.sidebar row,
+  NemoWindow NemoPlacesSidebar .view,
+  NemoWindow NemoPlacesSidebar .source-list.sidebar row,
   MarlinViewWindow .sidebar .view,
   MarlinViewWindow .sidebar .source-list.sidebar row,
   MarlinViewWindow MarlinPlacesSidebar .view,
-  MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row {
+  MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row,
+  MarlinViewWindow NemoPlacesSidebar .view,
+  MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row {
     background-color: transparent;
     color: #A8ADB5; }
-    GtkFileChooserDialog .sidebar .view.image, GtkFileChooserDialog .sidebar .source-list.sidebar row.image, GtkFileChooserDialog MarlinPlacesSidebar .view.image, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row.image,
+    GtkFileChooserDialog .sidebar .view.image, GtkFileChooserDialog .sidebar .source-list.sidebar row.image, GtkFileChooserDialog MarlinPlacesSidebar .view.image, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row.image, GtkFileChooserDialog NemoPlacesSidebar .view.image, GtkFileChooserDialog NemoPlacesSidebar .source-list.sidebar row.image,
     NautilusWindow .sidebar .view.image,
     NautilusWindow .sidebar .source-list.sidebar row.image,
     NautilusWindow MarlinPlacesSidebar .view.image,
     NautilusWindow MarlinPlacesSidebar .source-list.sidebar row.image,
+    NautilusWindow NemoPlacesSidebar .view.image,
+    NautilusWindow NemoPlacesSidebar .source-list.sidebar row.image,
     NemoWindow .sidebar .view.image,
     NemoWindow .sidebar .source-list.sidebar row.image,
     NemoWindow MarlinPlacesSidebar .view.image,
     NemoWindow MarlinPlacesSidebar .source-list.sidebar row.image,
+    NemoWindow NemoPlacesSidebar .view.image,
+    NemoWindow NemoPlacesSidebar .source-list.sidebar row.image,
     MarlinViewWindow .sidebar .view.image,
     MarlinViewWindow .sidebar .source-list.sidebar row.image,
     MarlinViewWindow MarlinPlacesSidebar .view.image,
-    MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.image {
+    MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.image,
+    MarlinViewWindow NemoPlacesSidebar .view.image,
+    MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row.image {
       color: rgba(168, 173, 181, 0.6); }
-    GtkFileChooserDialog .sidebar .view.cell:selected, GtkFileChooserDialog .sidebar .source-list.sidebar row.cell:selected, GtkFileChooserDialog MarlinPlacesSidebar .view.cell:selected, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row.cell:selected,
+    GtkFileChooserDialog .sidebar .view.cell:selected, GtkFileChooserDialog .sidebar .source-list.sidebar row.cell:selected, GtkFileChooserDialog MarlinPlacesSidebar .view.cell:selected, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row.cell:selected, GtkFileChooserDialog NemoPlacesSidebar .view.cell:selected, GtkFileChooserDialog NemoPlacesSidebar .source-list.sidebar row.cell:selected,
     NautilusWindow .sidebar .view.cell:selected,
     NautilusWindow .sidebar .source-list.sidebar row.cell:selected,
     NautilusWindow MarlinPlacesSidebar .view.cell:selected,
     NautilusWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected,
+    NautilusWindow NemoPlacesSidebar .view.cell:selected,
+    NautilusWindow NemoPlacesSidebar .source-list.sidebar row.cell:selected,
     NemoWindow .sidebar .view.cell:selected,
     NemoWindow .sidebar .source-list.sidebar row.cell:selected,
     NemoWindow MarlinPlacesSidebar .view.cell:selected,
     NemoWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected,
+    NemoWindow NemoPlacesSidebar .view.cell:selected,
+    NemoWindow NemoPlacesSidebar .source-list.sidebar row.cell:selected,
     MarlinViewWindow .sidebar .view.cell:selected,
     MarlinViewWindow .sidebar .source-list.sidebar row.cell:selected,
     MarlinViewWindow MarlinPlacesSidebar .view.cell:selected,
-    MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected {
+    MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected,
+    MarlinViewWindow NemoPlacesSidebar .view.cell:selected,
+    MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row.cell:selected {
       background-color: #5294E2;
       color: #ffffff; }
-  GtkFileChooserDialog .sidebar.frame, GtkFileChooserDialog MarlinPlacesSidebar.frame,
+  GtkFileChooserDialog .sidebar.frame, GtkFileChooserDialog MarlinPlacesSidebar.frame, GtkFileChooserDialog NemoPlacesSidebar.frame,
   NautilusWindow .sidebar.frame,
   NautilusWindow MarlinPlacesSidebar.frame,
+  NautilusWindow NemoPlacesSidebar.frame,
   NemoWindow .sidebar.frame,
   NemoWindow MarlinPlacesSidebar.frame,
+  NemoWindow NemoPlacesSidebar.frame,
   MarlinViewWindow .sidebar.frame,
-  MarlinViewWindow MarlinPlacesSidebar.frame {
+  MarlinViewWindow MarlinPlacesSidebar.frame,
+  MarlinViewWindow NemoPlacesSidebar.frame {
     color: #A8ADB5; }
-  GtkFileChooserDialog .sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, GtkFileChooserDialog MarlinPlacesSidebar .separator, GtkFileChooserDialog MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar GtkFileChooserDialog MarlinPlacesSidebar .view.separator,
+  GtkFileChooserDialog .sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, GtkFileChooserDialog MarlinPlacesSidebar .separator, GtkFileChooserDialog MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar GtkFileChooserDialog MarlinPlacesSidebar .view.separator, GtkFileChooserDialog NemoPlacesSidebar .separator, GtkFileChooserDialog NemoPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar GtkFileChooserDialog NemoPlacesSidebar .view.separator,
   NautilusWindow .sidebar .separator,
   NautilusWindow GtkPlacesSidebar.sidebar .view.separator,
   NautilusWindow MarlinPlacesSidebar .separator,
   NautilusWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator,
   GtkPlacesSidebar.sidebar NautilusWindow MarlinPlacesSidebar .view.separator,
+  NautilusWindow NemoPlacesSidebar .separator,
+  NautilusWindow NemoPlacesSidebar GtkPlacesSidebar.sidebar .view.separator,
+  GtkPlacesSidebar.sidebar NautilusWindow NemoPlacesSidebar .view.separator,
   NemoWindow .sidebar .separator,
   NemoWindow GtkPlacesSidebar.sidebar .view.separator,
   NemoWindow MarlinPlacesSidebar .separator,
   NemoWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator,
   GtkPlacesSidebar.sidebar NemoWindow MarlinPlacesSidebar .view.separator,
+  NemoWindow NemoPlacesSidebar .separator,
+  NemoWindow NemoPlacesSidebar GtkPlacesSidebar.sidebar .view.separator,
+  GtkPlacesSidebar.sidebar NemoWindow NemoPlacesSidebar .view.separator,
   MarlinViewWindow .sidebar .separator,
   MarlinViewWindow GtkPlacesSidebar.sidebar .view.separator,
   MarlinViewWindow MarlinPlacesSidebar .separator,
   MarlinViewWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator,
-  GtkPlacesSidebar.sidebar MarlinViewWindow MarlinPlacesSidebar .view.separator {
+  GtkPlacesSidebar.sidebar MarlinViewWindow MarlinPlacesSidebar .view.separator,
+  MarlinViewWindow NemoPlacesSidebar .separator,
+  MarlinViewWindow NemoPlacesSidebar GtkPlacesSidebar.sidebar .view.separator,
+  GtkPlacesSidebar.sidebar MarlinViewWindow NemoPlacesSidebar .view.separator {
     color: transparent; }
-  GtkFileChooserDialog .sidebar .scrollbar.trough, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.trough,
+  GtkFileChooserDialog .sidebar .scrollbar.trough, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.trough, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.trough,
   NautilusWindow .sidebar .scrollbar.trough,
   NautilusWindow MarlinPlacesSidebar .scrollbar.trough,
+  NautilusWindow NemoPlacesSidebar .scrollbar.trough,
   NemoWindow .sidebar .scrollbar.trough,
   NemoWindow MarlinPlacesSidebar .scrollbar.trough,
+  NemoWindow NemoPlacesSidebar .scrollbar.trough,
   MarlinViewWindow .sidebar .scrollbar.trough,
-  MarlinViewWindow MarlinPlacesSidebar .scrollbar.trough {
+  MarlinViewWindow MarlinPlacesSidebar .scrollbar.trough,
+  MarlinViewWindow NemoPlacesSidebar .scrollbar.trough {
     background-color: transparent;
     border-color: transparent; }
-  GtkFileChooserDialog .sidebar .scrollbar.slider, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider,
+  GtkFileChooserDialog .sidebar .scrollbar.slider, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider,
   NautilusWindow .sidebar .scrollbar.slider,
   NautilusWindow MarlinPlacesSidebar .scrollbar.slider,
+  NautilusWindow NemoPlacesSidebar .scrollbar.slider,
   NemoWindow .sidebar .scrollbar.slider,
   NemoWindow MarlinPlacesSidebar .scrollbar.slider,
+  NemoWindow NemoPlacesSidebar .scrollbar.slider,
   MarlinViewWindow .sidebar .scrollbar.slider,
-  MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider {
+  MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider,
+  MarlinViewWindow NemoPlacesSidebar .scrollbar.slider {
     border-radius: 20px;
     border: 3px solid transparent;
     background-color: rgba(209, 212, 216, 0.7); }
-    GtkFileChooserDialog .sidebar .scrollbar.slider:hover, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:hover,
+    GtkFileChooserDialog .sidebar .scrollbar.slider:hover, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:hover, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:hover,
     NautilusWindow .sidebar .scrollbar.slider:hover,
     NautilusWindow MarlinPlacesSidebar .scrollbar.slider:hover,
+    NautilusWindow NemoPlacesSidebar .scrollbar.slider:hover,
     NemoWindow .sidebar .scrollbar.slider:hover,
     NemoWindow MarlinPlacesSidebar .scrollbar.slider:hover,
+    NemoWindow NemoPlacesSidebar .scrollbar.slider:hover,
     MarlinViewWindow .sidebar .scrollbar.slider:hover,
-    MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:hover {
+    MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:hover,
+    MarlinViewWindow NemoPlacesSidebar .scrollbar.slider:hover {
       background-color: #dfe1e4; }
-    GtkFileChooserDialog .sidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:prelight:active,
+    GtkFileChooserDialog .sidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:prelight:active,
     NautilusWindow .sidebar .scrollbar.slider:prelight:active,
     NautilusWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active,
+    NautilusWindow NemoPlacesSidebar .scrollbar.slider:prelight:active,
     NemoWindow .sidebar .scrollbar.slider:prelight:active,
     NemoWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active,
+    NemoWindow NemoPlacesSidebar .scrollbar.slider:prelight:active,
     MarlinViewWindow .sidebar .scrollbar.slider:prelight:active,
-    MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active {
+    MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active,
+    MarlinViewWindow NemoPlacesSidebar .scrollbar.slider:prelight:active {
       background-color: #5294E2; }
-    GtkFileChooserDialog .sidebar .scrollbar.slider.fine-tune, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider.fine-tune,
+    GtkFileChooserDialog .sidebar .scrollbar.slider.fine-tune, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider.fine-tune, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider.fine-tune,
     NautilusWindow .sidebar .scrollbar.slider.fine-tune,
     NautilusWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune,
+    NautilusWindow NemoPlacesSidebar .scrollbar.slider.fine-tune,
     NemoWindow .sidebar .scrollbar.slider.fine-tune,
     NemoWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune,
+    NemoWindow NemoPlacesSidebar .scrollbar.slider.fine-tune,
     MarlinViewWindow .sidebar .scrollbar.slider.fine-tune,
-    MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune {
+    MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune,
+    MarlinViewWindow NemoPlacesSidebar .scrollbar.slider.fine-tune {
       border-width: 4px; }
-      GtkFileChooserDialog .sidebar .scrollbar.slider.fine-tune:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active,
+      GtkFileChooserDialog .sidebar .scrollbar.slider.fine-tune:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider.fine-tune:prelight:active,
       NautilusWindow .sidebar .scrollbar.slider.fine-tune:prelight:active,
       NautilusWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active,
+      NautilusWindow NemoPlacesSidebar .scrollbar.slider.fine-tune:prelight:active,
       NemoWindow .sidebar .scrollbar.slider.fine-tune:prelight:active,
       NemoWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active,
+      NemoWindow NemoPlacesSidebar .scrollbar.slider.fine-tune:prelight:active,
       MarlinViewWindow .sidebar .scrollbar.slider.fine-tune:prelight:active,
-      MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active {
+      MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active,
+      MarlinViewWindow NemoPlacesSidebar .scrollbar.slider.fine-tune:prelight:active {
         background-color: #5294E2; }
-    GtkFileChooserDialog .sidebar .scrollbar.slider:insensitive, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:insensitive,
+    GtkFileChooserDialog .sidebar .scrollbar.slider:insensitive, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:insensitive, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:insensitive,
     NautilusWindow .sidebar .scrollbar.slider:insensitive,
     NautilusWindow MarlinPlacesSidebar .scrollbar.slider:insensitive,
+    NautilusWindow NemoPlacesSidebar .scrollbar.slider:insensitive,
     NemoWindow .sidebar .scrollbar.slider:insensitive,
     NemoWindow MarlinPlacesSidebar .scrollbar.slider:insensitive,
+    NemoWindow NemoPlacesSidebar .scrollbar.slider:insensitive,
     MarlinViewWindow .sidebar .scrollbar.slider:insensitive,
-    MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:insensitive {
+    MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:insensitive,
+    MarlinViewWindow NemoPlacesSidebar .scrollbar.slider:insensitive {
       background-color: transparent; }
 GtkFileChooserDialog.maximized .sidebar,
 NautilusWindow.maximized .sidebar,
@@ -3457,22 +3514,22 @@ GtkFileChooserDialog .action-bar.frame {
 @define-color wm_bg_unfocused #32383f;
 @define-color wm_highlight #363c44;
 @define-color wm_shadow alpha(black, 0.35);
-@define-color wm_button_close_bg #f37076;
-@define-color wm_button_close_hover_bg #f79da1;
-@define-color wm_button_close_active_bg #ef4048;
+@define-color wm_button_close_bg #e45e65;
+@define-color wm_button_close_hover_bg #f48085;
+@define-color wm_button_close_active_bg #e6262f;
 @define-color wm_icon_close_bg #ffffff;
 @define-color wm_icon_close_hover_bg #ffffff;
 @define-color wm_icon_close_active_bg #ffffff;
-@define-color wm_button_bg #fdfdfd;
-@define-color wm_button_unfocused_bg #f6f7f8;
-@define-color wm_button_hover_bg #fdfdfd;
+@define-color wm_button_bg #212429;
+@define-color wm_button_unfocused_bg #22252b;
+@define-color wm_button_hover_bg #212429;
 @define-color wm_button_active_bg #5294E2;
-@define-color wm_button_border #d8dae0;
-@define-color wm_button_unfocused_border #dddee2;
+@define-color wm_button_border #141619;
+@define-color wm_button_unfocused_border #1a1c20;
 @define-color wm_button_hover_border #5294E2;
 @define-color wm_button_active_border #5294E2;
-@define-color wm_icon_bg #a7adb9;
-@define-color wm_icon_unfocused_bg #babec7;
-@define-color wm_icon_hover_bg #757d91;
+@define-color wm_icon_bg #777d86;
+@define-color wm_icon_unfocused_bg #575c63;
+@define-color wm_icon_hover_bg #838993;
 @define-color wm_icon_active_bg #ffffff;
 @define-color content_view_bg #ffffff;
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
index dc96e58..a4865a2 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
@@ -2719,6 +2719,9 @@ EphyWindow .floating-bar {
 TotemGrilo.vertical GdMainView.frame {
   border-width: 0; }
 
+SynapseGuiViewDefault *:selected {
+  background-color: #5294E2; }
+
 .gnome-panel-menu-bar,
 PanelApplet > GtkMenuBar.menubar,
 PanelToplevel,
@@ -3155,141 +3158,195 @@ NautilusWindow GtkBox.sidebar,
 NemoWindow GtkBox.sidebar,
 MarlinViewWindow GtkBox.sidebar {
   background-color: transparent; }
-GtkFileChooserDialog .sidebar, GtkFileChooserDialog MarlinPlacesSidebar,
+GtkFileChooserDialog .sidebar, GtkFileChooserDialog MarlinPlacesSidebar, GtkFileChooserDialog NemoPlacesSidebar,
 NautilusWindow .sidebar,
 NautilusWindow MarlinPlacesSidebar,
+NautilusWindow NemoPlacesSidebar,
 NemoWindow .sidebar,
 NemoWindow MarlinPlacesSidebar,
+NemoWindow NemoPlacesSidebar,
 MarlinViewWindow .sidebar,
-MarlinViewWindow MarlinPlacesSidebar {
+MarlinViewWindow MarlinPlacesSidebar,
+MarlinViewWindow NemoPlacesSidebar {
   background-color: #454a54; }
-  GtkFileChooserDialog .sidebar .view, GtkFileChooserDialog .sidebar .source-list.sidebar row, GtkFileChooserDialog MarlinPlacesSidebar .view, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row,
+  GtkFileChooserDialog .sidebar .view, GtkFileChooserDialog .sidebar .source-list.sidebar row, GtkFileChooserDialog MarlinPlacesSidebar .view, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row, GtkFileChooserDialog NemoPlacesSidebar .view, GtkFileChooserDialog NemoPlacesSidebar .source-list.sidebar row,
   NautilusWindow .sidebar .view,
   NautilusWindow .sidebar .source-list.sidebar row,
   NautilusWindow MarlinPlacesSidebar .view,
   NautilusWindow MarlinPlacesSidebar .source-list.sidebar row,
+  NautilusWindow NemoPlacesSidebar .view,
+  NautilusWindow NemoPlacesSidebar .source-list.sidebar row,
   NemoWindow .sidebar .view,
   NemoWindow .sidebar .source-list.sidebar row,
   NemoWindow MarlinPlacesSidebar .view,
   NemoWindow MarlinPlacesSidebar .source-list.sidebar row,
+  NemoWindow NemoPlacesSidebar .view,
+  NemoWindow NemoPlacesSidebar .source-list.sidebar row,
   MarlinViewWindow .sidebar .view,
   MarlinViewWindow .sidebar .source-list.sidebar row,
   MarlinViewWindow MarlinPlacesSidebar .view,
-  MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row {
+  MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row,
+  MarlinViewWindow NemoPlacesSidebar .view,
+  MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row {
     background-color: transparent;
     color: #A8ADB5; }
-    GtkFileChooserDialog .sidebar .view.image, GtkFileChooserDialog .sidebar .source-list.sidebar row.image, GtkFileChooserDialog MarlinPlacesSidebar .view.image, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row.image,
+    GtkFileChooserDialog .sidebar .view.image, GtkFileChooserDialog .sidebar .source-list.sidebar row.image, GtkFileChooserDialog MarlinPlacesSidebar .view.image, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row.image, GtkFileChooserDialog NemoPlacesSidebar .view.image, GtkFileChooserDialog NemoPlacesSidebar .source-list.sidebar row.image,
     NautilusWindow .sidebar .view.image,
     NautilusWindow .sidebar .source-list.sidebar row.image,
     NautilusWindow MarlinPlacesSidebar .view.image,
     NautilusWindow MarlinPlacesSidebar .source-list.sidebar row.image,
+    NautilusWindow NemoPlacesSidebar .view.image,
+    NautilusWindow NemoPlacesSidebar .source-list.sidebar row.image,
     NemoWindow .sidebar .view.image,
     NemoWindow .sidebar .source-list.sidebar row.image,
     NemoWindow MarlinPlacesSidebar .view.image,
     NemoWindow MarlinPlacesSidebar .source-list.sidebar row.image,
+    NemoWindow NemoPlacesSidebar .view.image,
+    NemoWindow NemoPlacesSidebar .source-list.sidebar row.image,
     MarlinViewWindow .sidebar .view.image,
     MarlinViewWindow .sidebar .source-list.sidebar row.image,
     MarlinViewWindow MarlinPlacesSidebar .view.image,
-    MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.image {
+    MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.image,
+    MarlinViewWindow NemoPlacesSidebar .view.image,
+    MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row.image {
       color: rgba(168, 173, 181, 0.6); }
-    GtkFileChooserDialog .sidebar .view.cell:selected, GtkFileChooserDialog .sidebar .source-list.sidebar row.cell:selected, GtkFileChooserDialog MarlinPlacesSidebar .view.cell:selected, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row.cell:selected,
+    GtkFileChooserDialog .sidebar .view.cell:selected, GtkFileChooserDialog .sidebar .source-list.sidebar row.cell:selected, GtkFileChooserDialog MarlinPlacesSidebar .view.cell:selected, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row.cell:selected, GtkFileChooserDialog NemoPlacesSidebar .view.cell:selected, GtkFileChooserDialog NemoPlacesSidebar .source-list.sidebar row.cell:selected,
     NautilusWindow .sidebar .view.cell:selected,
     NautilusWindow .sidebar .source-list.sidebar row.cell:selected,
     NautilusWindow MarlinPlacesSidebar .view.cell:selected,
     NautilusWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected,
+    NautilusWindow NemoPlacesSidebar .view.cell:selected,
+    NautilusWindow NemoPlacesSidebar .source-list.sidebar row.cell:selected,
     NemoWindow .sidebar .view.cell:selected,
     NemoWindow .sidebar .source-list.sidebar row.cell:selected,
     NemoWindow MarlinPlacesSidebar .view.cell:selected,
     NemoWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected,
+    NemoWindow NemoPlacesSidebar .view.cell:selected,
+    NemoWindow NemoPlacesSidebar .source-list.sidebar row.cell:selected,
     MarlinViewWindow .sidebar .view.cell:selected,
     MarlinViewWindow .sidebar .source-list.sidebar row.cell:selected,
     MarlinViewWindow MarlinPlacesSidebar .view.cell:selected,
-    MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected {
+    MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected,
+    MarlinViewWindow NemoPlacesSidebar .view.cell:selected,
+    MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row.cell:selected {
       background-color: #5294E2;
       color: #ffffff; }
-  GtkFileChooserDialog .sidebar.frame, GtkFileChooserDialog MarlinPlacesSidebar.frame,
+  GtkFileChooserDialog .sidebar.frame, GtkFileChooserDialog MarlinPlacesSidebar.frame, GtkFileChooserDialog NemoPlacesSidebar.frame,
   NautilusWindow .sidebar.frame,
   NautilusWindow MarlinPlacesSidebar.frame,
+  NautilusWindow NemoPlacesSidebar.frame,
   NemoWindow .sidebar.frame,
   NemoWindow MarlinPlacesSidebar.frame,
+  NemoWindow NemoPlacesSidebar.frame,
   MarlinViewWindow .sidebar.frame,
-  MarlinViewWindow MarlinPlacesSidebar.frame {
+  MarlinViewWindow MarlinPlacesSidebar.frame,
+  MarlinViewWindow NemoPlacesSidebar.frame {
     color: #A8ADB5; }
-  GtkFileChooserDialog .sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, GtkFileChooserDialog MarlinPlacesSidebar .separator, GtkFileChooserDialog MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar GtkFileChooserDialog MarlinPlacesSidebar .view.separator,
+  GtkFileChooserDialog .sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, GtkFileChooserDialog MarlinPlacesSidebar .separator, GtkFileChooserDialog MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar GtkFileChooserDialog MarlinPlacesSidebar .view.separator, GtkFileChooserDialog NemoPlacesSidebar .separator, GtkFileChooserDialog NemoPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar GtkFileChooserDialog NemoPlacesSidebar .view.separator,
   NautilusWindow .sidebar .separator,
   NautilusWindow GtkPlacesSidebar.sidebar .view.separator,
   NautilusWindow MarlinPlacesSidebar .separator,
   NautilusWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator,
   GtkPlacesSidebar.sidebar NautilusWindow MarlinPlacesSidebar .view.separator,
+  NautilusWindow NemoPlacesSidebar .separator,
+  NautilusWindow NemoPlacesSidebar GtkPlacesSidebar.sidebar .view.separator,
+  GtkPlacesSidebar.sidebar NautilusWindow NemoPlacesSidebar .view.separator,
   NemoWindow .sidebar .separator,
   NemoWindow GtkPlacesSidebar.sidebar .view.separator,
   NemoWindow MarlinPlacesSidebar .separator,
   NemoWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator,
   GtkPlacesSidebar.sidebar NemoWindow MarlinPlacesSidebar .view.separator,
+  NemoWindow NemoPlacesSidebar .separator,
+  NemoWindow NemoPlacesSidebar GtkPlacesSidebar.sidebar .view.separator,
+  GtkPlacesSidebar.sidebar NemoWindow NemoPlacesSidebar .view.separator,
   MarlinViewWindow .sidebar .separator,
   MarlinViewWindow GtkPlacesSidebar.sidebar .view.separator,
   MarlinViewWindow MarlinPlacesSidebar .separator,
   MarlinViewWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator,
-  GtkPlacesSidebar.sidebar MarlinViewWindow MarlinPlacesSidebar .view.separator {
+  GtkPlacesSidebar.sidebar MarlinViewWindow MarlinPlacesSidebar .view.separator,
+  MarlinViewWindow NemoPlacesSidebar .separator,
+  MarlinViewWindow NemoPlacesSidebar GtkPlacesSidebar.sidebar .view.separator,
+  GtkPlacesSidebar.sidebar MarlinViewWindow NemoPlacesSidebar .view.separator {
     color: transparent; }
-  GtkFileChooserDialog .sidebar .scrollbar.trough, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.trough,
+  GtkFileChooserDialog .sidebar .scrollbar.trough, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.trough, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.trough,
   NautilusWindow .sidebar .scrollbar.trough,
   NautilusWindow MarlinPlacesSidebar .scrollbar.trough,
+  NautilusWindow NemoPlacesSidebar .scrollbar.trough,
   NemoWindow .sidebar .scrollbar.trough,
   NemoWindow MarlinPlacesSidebar .scrollbar.trough,
+  NemoWindow NemoPlacesSidebar .scrollbar.trough,
   MarlinViewWindow .sidebar .scrollbar.trough,
-  MarlinViewWindow MarlinPlacesSidebar .scrollbar.trough {
+  MarlinViewWindow MarlinPlacesSidebar .scrollbar.trough,
+  MarlinViewWindow NemoPlacesSidebar .scrollbar.trough {
     background-color: transparent;
     border-color: transparent; }
-  GtkFileChooserDialog .sidebar .scrollbar.slider, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider,
+  GtkFileChooserDialog .sidebar .scrollbar.slider, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider,
   NautilusWindow .sidebar .scrollbar.slider,
   NautilusWindow MarlinPlacesSidebar .scrollbar.slider,
+  NautilusWindow NemoPlacesSidebar .scrollbar.slider,
   NemoWindow .sidebar .scrollbar.slider,
   NemoWindow MarlinPlacesSidebar .scrollbar.slider,
+  NemoWindow NemoPlacesSidebar .scrollbar.slider,
   MarlinViewWindow .sidebar .scrollbar.slider,
-  MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider {
+  MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider,
+  MarlinViewWindow NemoPlacesSidebar .scrollbar.slider {
     border-radius: 20px;
     border: 3px solid transparent;
     background-color: rgba(209, 212, 216, 0.7); }
-    GtkFileChooserDialog .sidebar .scrollbar.slider:hover, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:hover,
+    GtkFileChooserDialog .sidebar .scrollbar.slider:hover, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:hover, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:hover,
     NautilusWindow .sidebar .scrollbar.slider:hover,
     NautilusWindow MarlinPlacesSidebar .scrollbar.slider:hover,
+    NautilusWindow NemoPlacesSidebar .scrollbar.slider:hover,
     NemoWindow .sidebar .scrollbar.slider:hover,
     NemoWindow MarlinPlacesSidebar .scrollbar.slider:hover,
+    NemoWindow NemoPlacesSidebar .scrollbar.slider:hover,
     MarlinViewWindow .sidebar .scrollbar.slider:hover,
-    MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:hover {
+    MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:hover,
+    MarlinViewWindow NemoPlacesSidebar .scrollbar.slider:hover {
       background-color: #dfe1e4; }
-    GtkFileChooserDialog .sidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:prelight:active,
+    GtkFileChooserDialog .sidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:prelight:active,
     NautilusWindow .sidebar .scrollbar.slider:prelight:active,
     NautilusWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active,
+    NautilusWindow NemoPlacesSidebar .scrollbar.slider:prelight:active,
     NemoWindow .sidebar .scrollbar.slider:prelight:active,
     NemoWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active,
+    NemoWindow NemoPlacesSidebar .scrollbar.slider:prelight:active,
     MarlinViewWindow .sidebar .scrollbar.slider:prelight:active,
-    MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active {
+    MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active,
+    MarlinViewWindow NemoPlacesSidebar .scrollbar.slider:prelight:active {
       background-color: #5294E2; }
-    GtkFileChooserDialog .sidebar .scrollbar.slider.fine-tune, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider.fine-tune,
+    GtkFileChooserDialog .sidebar .scrollbar.slider.fine-tune, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider.fine-tune, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider.fine-tune,
     NautilusWindow .sidebar .scrollbar.slider.fine-tune,
     NautilusWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune,
+    NautilusWindow NemoPlacesSidebar .scrollbar.slider.fine-tune,
     NemoWindow .sidebar .scrollbar.slider.fine-tune,
     NemoWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune,
+    NemoWindow NemoPlacesSidebar .scrollbar.slider.fine-tune,
     MarlinViewWindow .sidebar .scrollbar.slider.fine-tune,
-    MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune {
+    MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune,
+    MarlinViewWindow NemoPlacesSidebar .scrollbar.slider.fine-tune {
       border-width: 4px; }
-      GtkFileChooserDialog .sidebar .scrollbar.slider.fine-tune:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active,
+      GtkFileChooserDialog .sidebar .scrollbar.slider.fine-tune:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider.fine-tune:prelight:active,
       NautilusWindow .sidebar .scrollbar.slider.fine-tune:prelight:active,
       NautilusWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active,
+      NautilusWindow NemoPlacesSidebar .scrollbar.slider.fine-tune:prelight:active,
       NemoWindow .sidebar .scrollbar.slider.fine-tune:prelight:active,
       NemoWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active,
+      NemoWindow NemoPlacesSidebar .scrollbar.slider.fine-tune:prelight:active,
       MarlinViewWindow .sidebar .scrollbar.slider.fine-tune:prelight:active,
-      MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active {
+      MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active,
+      MarlinViewWindow NemoPlacesSidebar .scrollbar.slider.fine-tune:prelight:active {
         background-color: #5294E2; }
-    GtkFileChooserDialog .sidebar .scrollbar.slider:insensitive, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:insensitive,
+    GtkFileChooserDialog .sidebar .scrollbar.slider:insensitive, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:insensitive, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:insensitive,
     NautilusWindow .sidebar .scrollbar.slider:insensitive,
     NautilusWindow MarlinPlacesSidebar .scrollbar.slider:insensitive,
+    NautilusWindow NemoPlacesSidebar .scrollbar.slider:insensitive,
     NemoWindow .sidebar .scrollbar.slider:insensitive,
     NemoWindow MarlinPlacesSidebar .scrollbar.slider:insensitive,
+    NemoWindow NemoPlacesSidebar .scrollbar.slider:insensitive,
     MarlinViewWindow .sidebar .scrollbar.slider:insensitive,
-    MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:insensitive {
+    MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:insensitive,
+    MarlinViewWindow NemoPlacesSidebar .scrollbar.slider:insensitive {
       background-color: transparent; }
 GtkFileChooserDialog.maximized .sidebar,
 NautilusWindow.maximized .sidebar,
diff --git a/common/gtk-3.0/3.16/_colors.scss b/common/gtk-3.0/3.16/_colors.scss
index 10040cd..c53454d 100644
--- a/common/gtk-3.0/3.16/_colors.scss
+++ b/common/gtk-3.0/3.16/_colors.scss
@@ -72,26 +72,26 @@ $panel_fg: $dark_sidebar_fg;
 //WM Buttons
 
 // Close
-$wm_button_close_bg: if($variant == 'light', #f37076, #e45e65);
-$wm_button_close_hover_bg: if($variant == 'light', #f79da1, #f48085);
-$wm_button_close_active_bg: if($variant == 'light', #ef4048, #e6262f);
+$wm_button_close_bg: if($variant == 'light' and $darker == 'false', #f37076, #e45e65);
+$wm_button_close_hover_bg: if($variant == 'light' and $darker == 'false', #f79da1, #f48085);
+$wm_button_close_active_bg: if($variant == 'light' and $darker == 'false', #ef4048, #e6262f);
 
 $wm_icon_close_bg: $selected_fg_color;
 $wm_icon_close_hover_bg: $selected_fg_color;
 $wm_icon_close_active_bg: $selected_fg_color;
 
 // Minimize, Maximize
-$wm_button_bg: if($variant == 'light', #fdfdfd, #212429);
-$wm_button_unfocused_bg: if($variant == 'light', #f6f7f8, #22252b);
-$wm_button_hover_bg: if($variant == 'light', #fdfdfd, #212429);
+$wm_button_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #212429);
+$wm_button_unfocused_bg: if($variant == 'light' and $darker == 'false', #f6f7f8, #22252b);
+$wm_button_hover_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #212429);
 $wm_button_active_bg: $selected_bg_color;
 
-$wm_button_border: if($variant == 'light', #d8dae0, #141619);
-$wm_button_unfocused_border: if($variant == 'light', #dddee2, #1a1c20);
+$wm_button_border: if($variant == 'light' and $darker == 'false', #d8dae0, #141619);
+$wm_button_unfocused_border: if($variant == 'light' and $darker == 'false', #dddee2, #1a1c20);
 $wm_button_hover_border: $selected_bg_color;
 $wm_button_active_border: $selected_bg_color;
 
-$wm_icon_bg: if($variant == 'light', #a7adb9, #777d86);
-$wm_icon_unfocused_bg: if($variant == 'light', #babec7, #575c63);
-$wm_icon_hover_bg: if($variant == 'light', #757d91, #838993);
+$wm_icon_bg: if($variant == 'light' and $darker == 'false', #a7adb9, #777d86);
+$wm_icon_unfocused_bg: if($variant == 'light' and $darker == 'false', #babec7, #575c63);
+$wm_icon_hover_bg: if($variant == 'light' and $darker == 'false', #757d91, #838993);
 $wm_icon_active_bg: $selected_fg_color;
diff --git a/common/gtk-3.0/3.16/gtk-contained-dark.css b/common/gtk-3.0/3.16/gtk-contained-dark.css
index 0c3c607..3c7f2de 100644
--- a/common/gtk-3.0/3.16/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-dark.css
@@ -2666,6 +2666,9 @@ EphyWindow .floating-bar {
 TotemGrilo.vertical GdMainView.frame {
   border-width: 0; }
 
+SynapseGuiViewDefault *:selected {
+  background-color: #5294E2; }
+
 .gnome-panel-menu-bar,
 PanelApplet > GtkMenuBar.menubar,
 PanelToplevel,
diff --git a/common/gtk-3.0/3.16/gtk-contained-darker.css b/common/gtk-3.0/3.16/gtk-contained-darker.css
index be69d55..7d59919 100644
--- a/common/gtk-3.0/3.16/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.16/gtk-contained-darker.css
@@ -2667,6 +2667,9 @@ EphyWindow .floating-bar {
 TotemGrilo.vertical GdMainView.frame {
   border-width: 0; }
 
+SynapseGuiViewDefault *:selected {
+  background-color: #5294E2; }
+
 .gnome-panel-menu-bar,
 PanelApplet > GtkMenuBar.menubar,
 PanelToplevel,
@@ -3375,22 +3378,22 @@ GtkFileChooserDialog .action-bar.frame {
 @define-color wm_bg_unfocused #32383f;
 @define-color wm_highlight #363c44;
 @define-color wm_shadow alpha(black, 0.35);
-@define-color wm_button_close_bg #f37076;
-@define-color wm_button_close_hover_bg #f79da1;
-@define-color wm_button_close_active_bg #ef4048;
+@define-color wm_button_close_bg #e45e65;
+@define-color wm_button_close_hover_bg #f48085;
+@define-color wm_button_close_active_bg #e6262f;
 @define-color wm_icon_close_bg #ffffff;
 @define-color wm_icon_close_hover_bg #ffffff;
 @define-color wm_icon_close_active_bg #ffffff;
-@define-color wm_button_bg #fdfdfd;
-@define-color wm_button_unfocused_bg #f6f7f8;
-@define-color wm_button_hover_bg #fdfdfd;
+@define-color wm_button_bg #212429;
+@define-color wm_button_unfocused_bg #22252b;
+@define-color wm_button_hover_bg #212429;
 @define-color wm_button_active_bg #5294E2;
-@define-color wm_button_border #d8dae0;
-@define-color wm_button_unfocused_border #dddee2;
+@define-color wm_button_border #141619;
+@define-color wm_button_unfocused_border #1a1c20;
 @define-color wm_button_hover_border #5294E2;
 @define-color wm_button_active_border #5294E2;
-@define-color wm_icon_bg #a7adb9;
-@define-color wm_icon_unfocused_bg #babec7;
-@define-color wm_icon_hover_bg #757d91;
+@define-color wm_icon_bg #777d86;
+@define-color wm_icon_unfocused_bg #575c63;
+@define-color wm_icon_hover_bg #838993;
 @define-color wm_icon_active_bg #ffffff;
 @define-color content_view_bg #ffffff;
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
index c81d4da..84f29d8 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
@@ -2666,6 +2666,9 @@ EphyWindow .floating-bar {
 TotemGrilo.vertical GdMainView.frame {
   border-width: 0; }
 
+SynapseGuiViewDefault *:selected {
+  background-color: #5294E2; }
+
 .gnome-panel-menu-bar,
 PanelApplet > GtkMenuBar.menubar,
 PanelToplevel,
diff --git a/common/gtk-3.0/3.16/gtk.css b/common/gtk-3.0/3.16/gtk.css
index 7391d1f..20b78fd 100644
--- a/common/gtk-3.0/3.16/gtk.css
+++ b/common/gtk-3.0/3.16/gtk.css
@@ -1 +1 @@
-@import url("gtk-contained-darker.css");
+@import url("gtk-contained.css");