Merge branch 'master' into dark_headerbars

15 files changed, 354 insertions, 211 deletions

diff --git a/README.md b/README.md
index 1b85966..5bc8629 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,7 @@ Arc is a flat theme with transparent elements for GTK 3, GTK 2 and Gnome-Shell.
 ### Requirements
 
 * Gnome/GTK 3.14 or 3.16
+* The `gnome-themes-standard` package
 * The `gtk2-engines-pixbuf` package only for Debian/Ubuntu based distros.
 * The murrine engine. This has different names depending on your distro.
   * `gtk-engine-murrine` (Arch Linux)
diff --git a/common/gtk-3.0/3.14/_applications.scss b/common/gtk-3.0/3.14/_applications.scss
index a28e556..fdf34be 100644
--- a/common/gtk-3.0/3.14/_applications.scss
+++ b/common/gtk-3.0/3.14/_applications.scss
@@ -395,6 +395,11 @@ TotemGrilo.vertical GdMainView.frame {
 }
 
 //
+// Synapse
+//
+SynapseGuiViewDefault *:selected { background-color: $selected_bg_color; }
+
+//
 // Fallback Mode/Budgie Panel
 //
 .gnome-panel-menu-bar,
diff --git a/common/gtk-3.0/3.14/_transparent_widgets.scss b/common/gtk-3.0/3.14/_transparent_widgets.scss
index 1238b47..9b38470 100644
--- a/common/gtk-3.0/3.14/_transparent_widgets.scss
+++ b/common/gtk-3.0/3.14/_transparent_widgets.scss
@@ -33,7 +33,7 @@ MarlinViewWindow {
 
   GtkBox.sidebar { background-color: transparent; }
 
-  .sidebar, MarlinPlacesSidebar {
+  .sidebar, MarlinPlacesSidebar, NemoPlacesSidebar {
     background-color: $dark_sidebar_bg;
 
     .view, .source-list.sidebar row {
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid.css b/common/gtk-3.0/3.14/gtk-contained-solid.css
index 1090d96..08030f9 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid.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,
@@ -3146,141 +3149,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: #3c4049; }
-  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.css b/common/gtk-3.0/3.14/gtk-contained.css
index 32287ec..8a75691 100644
--- a/common/gtk-3.0/3.14/gtk-contained.css
+++ b/common/gtk-3.0/3.14/gtk-contained.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,
@@ -3146,141 +3149,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,
diff --git a/common/gtk-3.0/3.16/_applications.scss b/common/gtk-3.0/3.16/_applications.scss
index 66729e7..848da06 100644
--- a/common/gtk-3.0/3.16/_applications.scss
+++ b/common/gtk-3.0/3.16/_applications.scss
@@ -443,6 +443,11 @@ TotemGrilo.vertical GdMainView.frame {
 }
 
 //
+// Synapse
+//
+SynapseGuiViewDefault *:selected { background-color: $selected_bg_color; }
+
+//
 // Fallback Mode/Budgie Panel
 //
 .gnome-panel-menu-bar,
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid.css b/common/gtk-3.0/3.16/gtk-contained-solid.css
index 55e458c..0b8785a 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid.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.css b/common/gtk-3.0/3.16/gtk-contained.css
index c7dcbd8..49ad599 100644
--- a/common/gtk-3.0/3.16/gtk-contained.css
+++ b/common/gtk-3.0/3.16/gtk-contained.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/xfwm4/top-left-active-shaded.xpm b/common/xfwm4/top-left-active-shaded.xpm
index 9f11b41..47dc7df 100644
--- a/common/xfwm4/top-left-active-shaded.xpm
+++ b/common/xfwm4/top-left-active-shaded.xpm
@@ -1,30 +1,32 @@
 /* XPM */
 static char * top_left_active_shaded_xpm[] = {
-"5 24 3 1",
+"5 24 5 1",
 " 	c None",
-".	c #EEEFF1",
-"+	c #E7E8EB",
-"   ..",
-" ..++",
+".	c #ECEDF0",
+"+	c #EEEFF1",
+"@	c #E8E9EB",
+"#	c #E7E8EB",
 " .+++",
-".++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++"};
+".@###",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####"};
diff --git a/common/xfwm4/top-left-active.xpm b/common/xfwm4/top-left-active.xpm
index 14883d9..423a3bf 100644
--- a/common/xfwm4/top-left-active.xpm
+++ b/common/xfwm4/top-left-active.xpm
@@ -1,30 +1,32 @@
 /* XPM */
 static char * top_left_active_xpm[] = {
-"5 24 3 1",
+"5 24 5 1",
 " 	c None",
-".	c #EEEFF1",
-"+	c #E7E8EB",
-"   ..",
-" ..++",
+".	c #ECEDF0",
+"+	c #EEEFF1",
+"@	c #E8E9EB",
+"#	c #E7E8EB",
 " .+++",
-".++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++"};
+".@###",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####"};
diff --git a/common/xfwm4/top-left-inactive.xpm b/common/xfwm4/top-left-inactive.xpm
index d6c79ce..9c4f88e 100644
--- a/common/xfwm4/top-left-inactive.xpm
+++ b/common/xfwm4/top-left-inactive.xpm
@@ -1,30 +1,32 @@
 /* XPM */
 static char * top_left_inactive_xpm[] = {
-"5 24 3 1",
+"5 24 5 1",
 " 	c None",
-".	c #EEEFF1",
-"+	c #E7E8EB",
-"   ..",
-" ..++",
+".	c #ECEDF0",
+"+	c #EEEFF1",
+"@	c #E8E9EB",
+"#	c #E7E8EB",
 " .+++",
-".++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++"};
+".@###",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####",
+"#####"};
diff --git a/common/xfwm4/top-right-active-shaded.xpm b/common/xfwm4/top-right-active-shaded.xpm
index d94e855..4920284 100644
--- a/common/xfwm4/top-right-active-shaded.xpm
+++ b/common/xfwm4/top-right-active-shaded.xpm
@@ -1,30 +1,32 @@
 /* XPM */
 static char * top_right_active_shaded_xpm[] = {
-"5 24 3 1",
+"5 24 5 1",
 " 	c None",
 ".	c #EEEFF1",
-"+	c #E7E8EB",
-"..   ",
-"++.. ",
-"+++. ",
-"++++.",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++"};
+"+	c #ECEDF0",
+"@	c #E7E8EB",
+"#	c #E8E9EB",
+"...+ ",
+"@@@#+",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@"};
diff --git a/common/xfwm4/top-right-active.xpm b/common/xfwm4/top-right-active.xpm
index 5f635bd..3c9a583 100644
--- a/common/xfwm4/top-right-active.xpm
+++ b/common/xfwm4/top-right-active.xpm
@@ -1,30 +1,32 @@
 /* XPM */
 static char * top_right_active_xpm[] = {
-"5 24 3 1",
+"5 24 5 1",
 " 	c None",
 ".	c #EEEFF1",
-"+	c #E7E8EB",
-"..   ",
-"++.. ",
-"+++. ",
-"++++.",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++"};
+"+	c #ECEDF0",
+"@	c #E7E8EB",
+"#	c #E8E9EB",
+"...+ ",
+"@@@#+",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@"};
diff --git a/common/xfwm4/top-right-inactive.xpm b/common/xfwm4/top-right-inactive.xpm
index 0bcde26..35285a5 100644
--- a/common/xfwm4/top-right-inactive.xpm
+++ b/common/xfwm4/top-right-inactive.xpm
@@ -1,30 +1,32 @@
 /* XPM */
 static char * top_right_inactive_xpm[] = {
-"5 24 3 1",
+"5 24 5 1",
 " 	c None",
 ".	c #EEEFF1",
-"+	c #E7E8EB",
-"..   ",
-"++.. ",
-"+++. ",
-"++++.",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++",
-"+++++"};
+"+	c #ECEDF0",
+"@	c #E7E8EB",
+"#	c #E8E9EB",
+"...+ ",
+"@@@#+",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@",
+"@@@@@"};
diff --git a/m4/arc-enable.m4 b/m4/arc-enable.m4
index 99a5be8..a34e8c1 100644
--- a/m4/arc-enable.m4
+++ b/m4/arc-enable.m4
@@ -9,11 +9,11 @@ AC_DEFUN([ARC_ENABLE], [
         )],
         [ENABLE_$1="$enableval"],
         [AS_IF(
-            [test "x$4" == "xdisable"],
+            [test "x$4" = "xdisable"],
             [ENABLE_$1="yes"],
             [ENABLE_$1="no"]
         )]
     )
-    AM_CONDITIONAL([ENABLE_$1], [test "x$ENABLE_$1" == "xyes"])
+    AM_CONDITIONAL([ENABLE_$1], [test "x$ENABLE_$1" = "xyes"])
     AC_SUBST([ENABLE_$1])
 ])