diff --git a/README.md b/README.md
index 9720474..e0488bb 100644
--- a/README.md
+++ b/README.md
@@ -120,6 +120,9 @@ To install the Chrome/Chromium theme go to the `extra/Chrome` folder and drag an
 To install the Plank theme, copy the `extra/Arc-Plank` folder to `~/.local/share/plank/themes` or to `/usr/share/plank/themes` for system-wide use.
 Now open the Plank preferences window by executing `plank --preferences` from a terminal and select `Arc-Plank` as the theme.
 
+#### Arc-Dark for Ubuntu Software Center
+The Arc Dark theme for the Ubuntu Software Center by [mervick](https://github.com/mervick) can be installed from [here](https://github.com/mervick/arc-dark-software-center). It solves readability issues with Arc Dark and the Ubuntu Software Center.
+
 ### Troubleshooting
 
 If you have Ubuntu with a newer GTK/Gnome version than the one included by default (i.e Ubuntu 14.04 with GTK 3.14 or Ubuntu 15.04 with GTK 3.16, etc.) the prebuilt packages won't work properly and you have to install the theme manually as described above.
diff --git a/common/gnome-shell/3.14/gnome-shell-dark.css b/common/gnome-shell/3.14/gnome-shell-dark.css
index 870d70e..2af1233 100644
--- a/common/gnome-shell/3.14/gnome-shell-dark.css
+++ b/common/gnome-shell/3.14/gnome-shell-dark.css
@@ -1405,16 +1405,22 @@ StScrollBar {
   padding: 10px 8px 5px 8px;
   spacing: 4px; }
 
-.workspace-thumbnails {
+.workspace-thumbnails, .workspace-thumbnails:rtl,
+.workspace-thumbnails-left,
+.workspace-thumbnails-left:rtl {
   visible-width: 40px;
   spacing: 11px;
-  padding: 12px;
+  padding: 12px; }
+
+.workspace-thumbnails,
+.workspace-thumbnails-left:rtl {
   padding-right: 7px;
   border-image: url("common-assets/dash/dash-right.svg") 9 9 9 9; }
-  .workspace-thumbnails:rtl {
-    padding: 12px;
-    padding-left: 7px;
-    border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9; }
+
+.workspace-thumbnails:rtl,
+.workspace-thumbnails-left {
+  padding-left: 7px;
+  border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9; }
 
 .workspace-thumbnail-indicator {
   border: 4px solid rgba(82, 148, 226, 0.8);
diff --git a/common/gnome-shell/3.14/gnome-shell.css b/common/gnome-shell/3.14/gnome-shell.css
index e67ac22..cb1486c 100644
--- a/common/gnome-shell/3.14/gnome-shell.css
+++ b/common/gnome-shell/3.14/gnome-shell.css
@@ -1405,16 +1405,22 @@ StScrollBar {
   padding: 10px 8px 5px 8px;
   spacing: 4px; }
 
-.workspace-thumbnails {
+.workspace-thumbnails, .workspace-thumbnails:rtl,
+.workspace-thumbnails-left,
+.workspace-thumbnails-left:rtl {
   visible-width: 40px;
   spacing: 11px;
-  padding: 12px;
+  padding: 12px; }
+
+.workspace-thumbnails,
+.workspace-thumbnails-left:rtl {
   padding-right: 7px;
   border-image: url("common-assets/dash/dash-right.svg") 9 9 9 9; }
-  .workspace-thumbnails:rtl {
-    padding: 12px;
-    padding-left: 7px;
-    border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9; }
+
+.workspace-thumbnails:rtl,
+.workspace-thumbnails-left {
+  padding-left: 7px;
+  border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9; }
 
 .workspace-thumbnail-indicator {
   border: 4px solid rgba(82, 148, 226, 0.8);
diff --git a/common/gnome-shell/3.14/sass/_common.scss b/common/gnome-shell/3.14/sass/_common.scss
index 18bfb43..863159e 100644
--- a/common/gnome-shell/3.14/sass/_common.scss
+++ b/common/gnome-shell/3.14/sass/_common.scss
@@ -1773,18 +1773,25 @@ StScrollBar {
 //
 // Workspace pager
 //
-.workspace-thumbnails { //container ala dash
-  visible-width: 40px; //amount visible before hover
-  spacing: 11px;
-  padding: 12px;
+.workspace-thumbnails,
+.workspace-thumbnails-left {
+  &, &:rtl {
+    visible-width: 40px;  //amount visible before hover
+    spacing: 11px;
+    padding: 12px;
+  }
+}
+
+.workspace-thumbnails,
+.workspace-thumbnails-left:rtl {
   padding-right: 7px;
   border-image: url("common-assets/dash/dash-right.svg") 9 9 9 9;
+}
 
-  &:rtl {
-    padding: 12px;
-    padding-left: 7px;
-    border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9;
-  }
+.workspace-thumbnails:rtl,
+.workspace-thumbnails-left {
+  padding-left: 7px;
+  border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9;
 }
 
 .workspace-thumbnail-indicator {
diff --git a/common/gnome-shell/3.16/gnome-shell-dark.css b/common/gnome-shell/3.16/gnome-shell-dark.css
index f4cca1b..ad2c30b 100644
--- a/common/gnome-shell/3.16/gnome-shell-dark.css
+++ b/common/gnome-shell/3.16/gnome-shell-dark.css
@@ -1341,16 +1341,22 @@ StScrollBar {
   padding: 10px 8px 5px 8px;
   spacing: 4px; }
 
-.workspace-thumbnails {
+.workspace-thumbnails, .workspace-thumbnails:rtl,
+.workspace-thumbnails-left,
+.workspace-thumbnails-left:rtl {
   visible-width: 40px;
   spacing: 11px;
-  padding: 12px;
+  padding: 12px; }
+
+.workspace-thumbnails,
+.workspace-thumbnails-left:rtl {
   padding-right: 7px;
   border-image: url("common-assets/dash/dash-right.svg") 9 9 9 9; }
-  .workspace-thumbnails:rtl {
-    padding: 12px;
-    padding-left: 7px;
-    border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9; }
+
+.workspace-thumbnails:rtl,
+.workspace-thumbnails-left {
+  padding-left: 7px;
+  border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9; }
 
 .workspace-thumbnail-indicator {
   border: 4px solid rgba(82, 148, 226, 0.8);
diff --git a/common/gnome-shell/3.16/gnome-shell.css b/common/gnome-shell/3.16/gnome-shell.css
index 482bcbb..d505633 100644
--- a/common/gnome-shell/3.16/gnome-shell.css
+++ b/common/gnome-shell/3.16/gnome-shell.css
@@ -1341,16 +1341,22 @@ StScrollBar {
   padding: 10px 8px 5px 8px;
   spacing: 4px; }
 
-.workspace-thumbnails {
+.workspace-thumbnails, .workspace-thumbnails:rtl,
+.workspace-thumbnails-left,
+.workspace-thumbnails-left:rtl {
   visible-width: 40px;
   spacing: 11px;
-  padding: 12px;
+  padding: 12px; }
+
+.workspace-thumbnails,
+.workspace-thumbnails-left:rtl {
   padding-right: 7px;
   border-image: url("common-assets/dash/dash-right.svg") 9 9 9 9; }
-  .workspace-thumbnails:rtl {
-    padding: 12px;
-    padding-left: 7px;
-    border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9; }
+
+.workspace-thumbnails:rtl,
+.workspace-thumbnails-left {
+  padding-left: 7px;
+  border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9; }
 
 .workspace-thumbnail-indicator {
   border: 4px solid rgba(82, 148, 226, 0.8);
diff --git a/common/gnome-shell/3.16/sass/_common.scss b/common/gnome-shell/3.16/sass/_common.scss
index 77147ef..9515e43 100644
--- a/common/gnome-shell/3.16/sass/_common.scss
+++ b/common/gnome-shell/3.16/sass/_common.scss
@@ -1684,18 +1684,25 @@ StScrollBar {
 //
 // Workspace pager
 //
-.workspace-thumbnails { //container ala dash
-  visible-width: 40px; //amount visible before hover
-  spacing: 11px;
-  padding: 12px;
+.workspace-thumbnails,
+.workspace-thumbnails-left {
+  &, &:rtl {
+    visible-width: 40px;  //amount visible before hover
+    spacing: 11px;
+    padding: 12px;
+  }
+}
+
+.workspace-thumbnails,
+.workspace-thumbnails-left:rtl {
   padding-right: 7px;
   border-image: url("common-assets/dash/dash-right.svg") 9 9 9 9;
+}
 
-  &:rtl {
-    padding: 12px;
-    padding-left: 7px;
-    border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9;
-  }
+.workspace-thumbnails:rtl,
+.workspace-thumbnails-left {
+  padding-left: 7px;
+  border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9;
 }
 
 .workspace-thumbnail-indicator {
diff --git a/common/gnome-shell/3.18/gnome-shell-dark.css b/common/gnome-shell/3.18/gnome-shell-dark.css
index cbe9e1f..aa06531 100644
--- a/common/gnome-shell/3.18/gnome-shell-dark.css
+++ b/common/gnome-shell/3.18/gnome-shell-dark.css
@@ -1416,16 +1416,22 @@ StScrollBar {
   padding: 10px 8px 5px 8px;
   spacing: 4px; }
 
-.workspace-thumbnails {
+.workspace-thumbnails, .workspace-thumbnails:rtl,
+.workspace-thumbnails-left,
+.workspace-thumbnails-left:rtl {
   visible-width: 40px;
   spacing: 11px;
-  padding: 12px;
+  padding: 12px; }
+
+.workspace-thumbnails,
+.workspace-thumbnails-left:rtl {
   padding-right: 7px;
   border-image: url("common-assets/dash/dash-right.svg") 9 9 9 9; }
-  .workspace-thumbnails:rtl {
-    padding: 12px;
-    padding-left: 7px;
-    border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9; }
+
+.workspace-thumbnails:rtl,
+.workspace-thumbnails-left {
+  padding-left: 7px;
+  border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9; }
 
 .workspace-thumbnail-indicator {
   border: 4px solid rgba(82, 148, 226, 0.8);
@@ -1594,6 +1600,10 @@ StScrollBar {
     width: 24px;
     height: 24px; }
 
+.masterslider.smaller .masterlabel,
+.masterslider.smaller .slider {
+  min-width: 155px; }
+
 .magnifier-zoom-region {
   border: 2px solid #5294E2; }
   .magnifier-zoom-region.full-screen {
diff --git a/common/gnome-shell/3.18/gnome-shell.css b/common/gnome-shell/3.18/gnome-shell.css
index 0ad5515..9b36804 100644
--- a/common/gnome-shell/3.18/gnome-shell.css
+++ b/common/gnome-shell/3.18/gnome-shell.css
@@ -1416,16 +1416,22 @@ StScrollBar {
   padding: 10px 8px 5px 8px;
   spacing: 4px; }
 
-.workspace-thumbnails {
+.workspace-thumbnails, .workspace-thumbnails:rtl,
+.workspace-thumbnails-left,
+.workspace-thumbnails-left:rtl {
   visible-width: 40px;
   spacing: 11px;
-  padding: 12px;
+  padding: 12px; }
+
+.workspace-thumbnails,
+.workspace-thumbnails-left:rtl {
   padding-right: 7px;
   border-image: url("common-assets/dash/dash-right.svg") 9 9 9 9; }
-  .workspace-thumbnails:rtl {
-    padding: 12px;
-    padding-left: 7px;
-    border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9; }
+
+.workspace-thumbnails:rtl,
+.workspace-thumbnails-left {
+  padding-left: 7px;
+  border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9; }
 
 .workspace-thumbnail-indicator {
   border: 4px solid rgba(82, 148, 226, 0.8);
@@ -1594,6 +1600,10 @@ StScrollBar {
     width: 24px;
     height: 24px; }
 
+.masterslider.smaller .masterlabel,
+.masterslider.smaller .slider {
+  min-width: 155px; }
+
 .magnifier-zoom-region {
   border: 2px solid #5294E2; }
   .magnifier-zoom-region.full-screen {
diff --git a/common/gnome-shell/3.18/sass/_common.scss b/common/gnome-shell/3.18/sass/_common.scss
index 507b376..9c5afa4 100644
--- a/common/gnome-shell/3.18/sass/_common.scss
+++ b/common/gnome-shell/3.18/sass/_common.scss
@@ -1809,18 +1809,25 @@ StScrollBar {
 //
 // Workspace pager
 //
-.workspace-thumbnails { //container ala dash
-  visible-width: 40px; //amount visible before hover
-  spacing: 11px;
-  padding: 12px;
+.workspace-thumbnails,
+.workspace-thumbnails-left {
+  &, &:rtl {
+    visible-width: 40px;  //amount visible before hover
+    spacing: 11px;
+    padding: 12px;
+  }
+}
+
+.workspace-thumbnails,
+.workspace-thumbnails-left:rtl {
   padding-right: 7px;
   border-image: url("common-assets/dash/dash-right.svg") 9 9 9 9;
+}
 
-  &:rtl {
-    padding: 12px;
-    padding-left: 7px;
-    border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9;
-  }
+.workspace-thumbnails:rtl,
+.workspace-thumbnails-left {
+  padding-left: 7px;
+  border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9;
 }
 
 .workspace-thumbnail-indicator {
@@ -1982,6 +1989,11 @@ $legacy_icon_size: 24px;
   & StButton { width: $legacy_icon_size; height: $legacy_icon_size }
 }
 
+.masterslider.smaller .masterlabel,
+.masterslider.smaller .slider {
+  min-width: 155px;
+}
+
 // Magnifier
 
 .magnifier-zoom-region {
diff --git a/common/gtk-2.0/panel.rc b/common/gtk-2.0/panel.rc
index 212c704..b2c2352 100644
--- a/common/gtk-2.0/panel.rc
+++ b/common/gtk-2.0/panel.rc
@@ -159,6 +159,7 @@ widget_class "*Notif*Brasero*"                        style "theme-panel"
 widget "*Xfce*Panel*"                                 style "theme-panel"
 class "*Xfce*Panel*"                                  style "theme-panel"
 widget "*WnckPager*"                                  style "workspace-switcher"
+widget "*TopMenu*"                                    style "theme-panel"
 
 # Fix gtk-entries in the panel
 widget "*bookmark*GtkEntry"                           style "panel-entry" # fixes smartbookmark-plugin
diff --git a/common/gtk-3.0/3.14/gtk-dark.css b/common/gtk-3.0/3.14/gtk-dark.css
index 8684c90..3b8ae54 100644
--- a/common/gtk-3.0/3.14/gtk-dark.css
+++ b/common/gtk-3.0/3.14/gtk-dark.css
@@ -1284,7 +1284,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   .menubar:backdrop {
     color: rgba(207, 218, 231, 0.5); }
   .menubar > .menuitem {
-    padding: 6px 8px;
+    padding: 4px 8px;
     border: solid transparent;
     border-width: 0; }
     .menubar > .menuitem:hover {
@@ -3053,7 +3053,9 @@ ClockBox {
   color: #BAC3CF; }
 
 .xfce4-panel.panel {
-  background-color: rgba(43, 46, 55, 0.95); }
+  background-color: rgba(43, 46, 55, 0.95);
+  text-shadow: none;
+  icon-shadow: none; }
   .xfce4-panel.panel .button.flat {
     color: #BAC3CF;
     background-color: rgba(43, 46, 55, 0);
@@ -4012,6 +4014,7 @@ MarlinViewWindow MarlinPlacesSidebar .slider.scrollbar, GeditFileBrowserWidget .
 @define-color error_color #FC4138;
 @define-color success_color #73d216;
 @define-color placeholder_text_color #A8A8A8;
+@define-color link_color #a9caf1;
 @define-color wm_title alpha(#cfdae7, 0.8);
 @define-color wm_unfocused_title alpha(#cfdae7, 0.5);
 @define-color wm_bg #2f343f;
diff --git a/common/gtk-3.0/3.14/gtk-darker.css b/common/gtk-3.0/3.14/gtk-darker.css
index f259f27..9e161d9 100644
--- a/common/gtk-3.0/3.14/gtk-darker.css
+++ b/common/gtk-3.0/3.14/gtk-darker.css
@@ -1287,7 +1287,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   .menubar:backdrop {
     color: rgba(207, 218, 231, 0.5); }
   .menubar > .menuitem {
-    padding: 6px 8px;
+    padding: 4px 8px;
     border: solid transparent;
     border-width: 0; }
     .menubar > .menuitem:hover {
@@ -3056,7 +3056,9 @@ ClockBox {
   color: #BAC3CF; }
 
 .xfce4-panel.panel {
-  background-color: rgba(43, 46, 55, 0.95); }
+  background-color: rgba(43, 46, 55, 0.95);
+  text-shadow: none;
+  icon-shadow: none; }
   .xfce4-panel.panel .button.flat {
     color: #BAC3CF;
     background-color: rgba(43, 46, 55, 0);
@@ -4005,6 +4007,7 @@ MarlinViewWindow MarlinPlacesSidebar .slider.scrollbar, GeditFileBrowserWidget .
 @define-color error_color #FC4138;
 @define-color success_color #73d216;
 @define-color placeholder_text_color #A8A8A8;
+@define-color link_color #2679db;
 @define-color wm_title alpha(#cfdae7, 0.8);
 @define-color wm_unfocused_title alpha(#cfdae7, 0.5);
 @define-color wm_bg #2f343f;
diff --git a/common/gtk-3.0/3.14/gtk-solid-dark.css b/common/gtk-3.0/3.14/gtk-solid-dark.css
index 3acb0b3..5687164 100644
--- a/common/gtk-3.0/3.14/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.14/gtk-solid-dark.css
@@ -1284,7 +1284,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   .menubar:backdrop {
     color: rgba(207, 218, 231, 0.5); }
   .menubar > .menuitem {
-    padding: 6px 8px;
+    padding: 4px 8px;
     border: solid transparent;
     border-width: 0; }
     .menubar > .menuitem:hover {
@@ -3053,7 +3053,9 @@ ClockBox {
   color: #BAC3CF; }
 
 .xfce4-panel.panel {
-  background-color: #2b2e37; }
+  background-color: #2b2e37;
+  text-shadow: none;
+  icon-shadow: none; }
   .xfce4-panel.panel .button.flat {
     color: #BAC3CF;
     background-color: rgba(43, 46, 55, 0);
@@ -4012,6 +4014,7 @@ MarlinViewWindow MarlinPlacesSidebar .slider.scrollbar, GeditFileBrowserWidget .
 @define-color error_color #FC4138;
 @define-color success_color #73d216;
 @define-color placeholder_text_color #A8A8A8;
+@define-color link_color #a9caf1;
 @define-color wm_title alpha(#cfdae7, 0.8);
 @define-color wm_unfocused_title alpha(#cfdae7, 0.5);
 @define-color wm_bg #2f343f;
diff --git a/common/gtk-3.0/3.14/gtk-solid-darker.css b/common/gtk-3.0/3.14/gtk-solid-darker.css
index a529278..c4aac5b 100644
--- a/common/gtk-3.0/3.14/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.14/gtk-solid-darker.css
@@ -1287,7 +1287,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   .menubar:backdrop {
     color: rgba(207, 218, 231, 0.5); }
   .menubar > .menuitem {
-    padding: 6px 8px;
+    padding: 4px 8px;
     border: solid transparent;
     border-width: 0; }
     .menubar > .menuitem:hover {
@@ -3056,7 +3056,9 @@ ClockBox {
   color: #BAC3CF; }
 
 .xfce4-panel.panel {
-  background-color: #2b2e37; }
+  background-color: #2b2e37;
+  text-shadow: none;
+  icon-shadow: none; }
   .xfce4-panel.panel .button.flat {
     color: #BAC3CF;
     background-color: rgba(43, 46, 55, 0);
@@ -4005,6 +4007,7 @@ MarlinViewWindow MarlinPlacesSidebar .slider.scrollbar, GeditFileBrowserWidget .
 @define-color error_color #FC4138;
 @define-color success_color #73d216;
 @define-color placeholder_text_color #A8A8A8;
+@define-color link_color #2679db;
 @define-color wm_title alpha(#cfdae7, 0.8);
 @define-color wm_unfocused_title alpha(#cfdae7, 0.5);
 @define-color wm_bg #2f343f;
diff --git a/common/gtk-3.0/3.14/gtk-solid.css b/common/gtk-3.0/3.14/gtk-solid.css
index e3eb932..a9d8b45 100644
--- a/common/gtk-3.0/3.14/gtk-solid.css
+++ b/common/gtk-3.0/3.14/gtk-solid.css
@@ -1287,7 +1287,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   .menubar:backdrop {
     color: rgba(82, 93, 118, 0.5); }
   .menubar > .menuitem {
-    padding: 6px 8px;
+    padding: 4px 8px;
     border: solid transparent;
     border-width: 0; }
     .menubar > .menuitem:hover {
@@ -3056,7 +3056,9 @@ ClockBox {
   color: #BAC3CF; }
 
 .xfce4-panel.panel {
-  background-color: #2b2e37; }
+  background-color: #2b2e37;
+  text-shadow: none;
+  icon-shadow: none; }
   .xfce4-panel.panel .button.flat {
     color: #BAC3CF;
     background-color: rgba(43, 46, 55, 0);
@@ -4005,6 +4007,7 @@ MarlinViewWindow MarlinPlacesSidebar .slider.scrollbar, GeditFileBrowserWidget .
 @define-color error_color #FC4138;
 @define-color success_color #73d216;
 @define-color placeholder_text_color #A8A8A8;
+@define-color link_color #2679db;
 @define-color wm_title alpha(#525d76, 0.8);
 @define-color wm_unfocused_title alpha(#525d76, 0.5);
 @define-color wm_bg #e7e8eb;
diff --git a/common/gtk-3.0/3.14/gtk.css b/common/gtk-3.0/3.14/gtk.css
index 838218d..0f13a15 100644
--- a/common/gtk-3.0/3.14/gtk.css
+++ b/common/gtk-3.0/3.14/gtk.css
@@ -1287,7 +1287,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   .menubar:backdrop {
     color: rgba(82, 93, 118, 0.5); }
   .menubar > .menuitem {
-    padding: 6px 8px;
+    padding: 4px 8px;
     border: solid transparent;
     border-width: 0; }
     .menubar > .menuitem:hover {
@@ -3056,7 +3056,9 @@ ClockBox {
   color: #BAC3CF; }
 
 .xfce4-panel.panel {
-  background-color: rgba(43, 46, 55, 0.95); }
+  background-color: rgba(43, 46, 55, 0.95);
+  text-shadow: none;
+  icon-shadow: none; }
   .xfce4-panel.panel .button.flat {
     color: #BAC3CF;
     background-color: rgba(43, 46, 55, 0);
@@ -4005,6 +4007,7 @@ MarlinViewWindow MarlinPlacesSidebar .slider.scrollbar, GeditFileBrowserWidget .
 @define-color error_color #FC4138;
 @define-color success_color #73d216;
 @define-color placeholder_text_color #A8A8A8;
+@define-color link_color #2679db;
 @define-color wm_title alpha(#525d76, 0.8);
 @define-color wm_unfocused_title alpha(#525d76, 0.5);
 @define-color wm_bg #e7e8eb;
diff --git a/common/gtk-3.0/3.14/sass/_applications.scss b/common/gtk-3.0/3.14/sass/_applications.scss
index 3095a78..b40945d 100644
--- a/common/gtk-3.0/3.14/sass/_applications.scss
+++ b/common/gtk-3.0/3.14/sass/_applications.scss
@@ -491,6 +491,9 @@ ClockBox {
 .xfce4-panel.panel {
   background-color: $panel_bg;
 
+  text-shadow: none;
+  icon-shadow: none;
+
   .button.flat {
     color: $panel_fg;
     background-color: transparentize($panel_bg, 1);
diff --git a/common/gtk-3.0/3.14/sass/_colors-public.scss b/common/gtk-3.0/3.14/sass/_colors-public.scss
index 84970bd..b6b3dc5 100644
--- a/common/gtk-3.0/3.14/sass/_colors-public.scss
+++ b/common/gtk-3.0/3.14/sass/_colors-public.scss
@@ -29,6 +29,7 @@
 @define-color error_color #{"" + $error_color};
 @define-color success_color #{"" + $success_color};
 @define-color placeholder_text_color #{#A8A8A8};
+@define-color link_color #{"" + $link_color};
 
 //WM
 $wm_highlight: lighten(opacify($header_bg, 1), 3%);
diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss
index 22754de..f314530 100644
--- a/common/gtk-3.0/3.14/sass/_common.scss
+++ b/common/gtk-3.0/3.14/sass/_common.scss
@@ -1527,7 +1527,7 @@ column-header.button.dnd { // for treeview-like derive widgets
   }
 
   & > .menuitem {
-    padding: 6px 8px;
+    padding: 4px 8px;
     border: solid transparent;
     border-width: 0;
 
diff --git a/common/gtk-3.0/3.16/gtk-dark.css b/common/gtk-3.0/3.16/gtk-dark.css
index f70748b..cb8e163 100644
--- a/common/gtk-3.0/3.16/gtk-dark.css
+++ b/common/gtk-3.0/3.16/gtk-dark.css
@@ -1298,7 +1298,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   .menubar:backdrop {
     color: rgba(207, 218, 231, 0.5); }
   .menubar > .menuitem {
-    padding: 6px 8px;
+    padding: 4px 8px;
     border: solid transparent;
     border-width: 0; }
     .menubar > .menuitem:hover {
@@ -2930,7 +2930,9 @@ ClockBox {
   color: #BAC3CF; }
 
 .xfce4-panel.panel {
-  background-color: rgba(43, 46, 55, 0.95); }
+  background-color: rgba(43, 46, 55, 0.95);
+  text-shadow: none;
+  icon-shadow: none; }
   .xfce4-panel.panel .button.flat {
     color: #BAC3CF;
     background-color: rgba(43, 46, 55, 0);
@@ -3851,6 +3853,7 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW
 @define-color error_color #FC4138;
 @define-color success_color #73d216;
 @define-color placeholder_text_color #A8A8A8;
+@define-color link_color #a9caf1;
 @define-color content_view_bg #404552;
 @define-color wm_title alpha(#cfdae7, 0.8);
 @define-color wm_unfocused_title alpha(#cfdae7, 0.5);
diff --git a/common/gtk-3.0/3.16/gtk-darker.css b/common/gtk-3.0/3.16/gtk-darker.css
index 242c208..1267c82 100644
--- a/common/gtk-3.0/3.16/gtk-darker.css
+++ b/common/gtk-3.0/3.16/gtk-darker.css
@@ -1301,7 +1301,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   .menubar:backdrop {
     color: rgba(207, 218, 231, 0.5); }
   .menubar > .menuitem {
-    padding: 6px 8px;
+    padding: 4px 8px;
     border: solid transparent;
     border-width: 0; }
     .menubar > .menuitem:hover {
@@ -2933,7 +2933,9 @@ ClockBox {
   color: #BAC3CF; }
 
 .xfce4-panel.panel {
-  background-color: rgba(43, 46, 55, 0.95); }
+  background-color: rgba(43, 46, 55, 0.95);
+  text-shadow: none;
+  icon-shadow: none; }
   .xfce4-panel.panel .button.flat {
     color: #BAC3CF;
     background-color: rgba(43, 46, 55, 0);
@@ -3844,6 +3846,7 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW
 @define-color error_color #FC4138;
 @define-color success_color #73d216;
 @define-color placeholder_text_color #A8A8A8;
+@define-color link_color #2679db;
 @define-color content_view_bg #ffffff;
 @define-color wm_title alpha(#cfdae7, 0.8);
 @define-color wm_unfocused_title alpha(#cfdae7, 0.5);
diff --git a/common/gtk-3.0/3.16/gtk-solid-dark.css b/common/gtk-3.0/3.16/gtk-solid-dark.css
index e88b789..d15ccad 100644
--- a/common/gtk-3.0/3.16/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.16/gtk-solid-dark.css
@@ -1298,7 +1298,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   .menubar:backdrop {
     color: rgba(207, 218, 231, 0.5); }
   .menubar > .menuitem {
-    padding: 6px 8px;
+    padding: 4px 8px;
     border: solid transparent;
     border-width: 0; }
     .menubar > .menuitem:hover {
@@ -2930,7 +2930,9 @@ ClockBox {
   color: #BAC3CF; }
 
 .xfce4-panel.panel {
-  background-color: #2b2e37; }
+  background-color: #2b2e37;
+  text-shadow: none;
+  icon-shadow: none; }
   .xfce4-panel.panel .button.flat {
     color: #BAC3CF;
     background-color: rgba(43, 46, 55, 0);
@@ -3851,6 +3853,7 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW
 @define-color error_color #FC4138;
 @define-color success_color #73d216;
 @define-color placeholder_text_color #A8A8A8;
+@define-color link_color #a9caf1;
 @define-color content_view_bg #404552;
 @define-color wm_title alpha(#cfdae7, 0.8);
 @define-color wm_unfocused_title alpha(#cfdae7, 0.5);
diff --git a/common/gtk-3.0/3.16/gtk-solid-darker.css b/common/gtk-3.0/3.16/gtk-solid-darker.css
index 470d40f..a949c92 100644
--- a/common/gtk-3.0/3.16/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.16/gtk-solid-darker.css
@@ -1301,7 +1301,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   .menubar:backdrop {
     color: rgba(207, 218, 231, 0.5); }
   .menubar > .menuitem {
-    padding: 6px 8px;
+    padding: 4px 8px;
     border: solid transparent;
     border-width: 0; }
     .menubar > .menuitem:hover {
@@ -2933,7 +2933,9 @@ ClockBox {
   color: #BAC3CF; }
 
 .xfce4-panel.panel {
-  background-color: #2b2e37; }
+  background-color: #2b2e37;
+  text-shadow: none;
+  icon-shadow: none; }
   .xfce4-panel.panel .button.flat {
     color: #BAC3CF;
     background-color: rgba(43, 46, 55, 0);
@@ -3844,6 +3846,7 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW
 @define-color error_color #FC4138;
 @define-color success_color #73d216;
 @define-color placeholder_text_color #A8A8A8;
+@define-color link_color #2679db;
 @define-color content_view_bg #ffffff;
 @define-color wm_title alpha(#cfdae7, 0.8);
 @define-color wm_unfocused_title alpha(#cfdae7, 0.5);
diff --git a/common/gtk-3.0/3.16/gtk-solid.css b/common/gtk-3.0/3.16/gtk-solid.css
index bc3bf76..ba72279 100644
--- a/common/gtk-3.0/3.16/gtk-solid.css
+++ b/common/gtk-3.0/3.16/gtk-solid.css
@@ -1301,7 +1301,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   .menubar:backdrop {
     color: rgba(82, 93, 118, 0.5); }
   .menubar > .menuitem {
-    padding: 6px 8px;
+    padding: 4px 8px;
     border: solid transparent;
     border-width: 0; }
     .menubar > .menuitem:hover {
@@ -2933,7 +2933,9 @@ ClockBox {
   color: #BAC3CF; }
 
 .xfce4-panel.panel {
-  background-color: #2b2e37; }
+  background-color: #2b2e37;
+  text-shadow: none;
+  icon-shadow: none; }
   .xfce4-panel.panel .button.flat {
     color: #BAC3CF;
     background-color: rgba(43, 46, 55, 0);
@@ -3844,6 +3846,7 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW
 @define-color error_color #FC4138;
 @define-color success_color #73d216;
 @define-color placeholder_text_color #A8A8A8;
+@define-color link_color #2679db;
 @define-color content_view_bg #ffffff;
 @define-color wm_title alpha(#525d76, 0.8);
 @define-color wm_unfocused_title alpha(#525d76, 0.5);
diff --git a/common/gtk-3.0/3.16/gtk.css b/common/gtk-3.0/3.16/gtk.css
index 2c43a27..98e7e82 100644
--- a/common/gtk-3.0/3.16/gtk.css
+++ b/common/gtk-3.0/3.16/gtk.css
@@ -1301,7 +1301,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   .menubar:backdrop {
     color: rgba(82, 93, 118, 0.5); }
   .menubar > .menuitem {
-    padding: 6px 8px;
+    padding: 4px 8px;
     border: solid transparent;
     border-width: 0; }
     .menubar > .menuitem:hover {
@@ -2933,7 +2933,9 @@ ClockBox {
   color: #BAC3CF; }
 
 .xfce4-panel.panel {
-  background-color: rgba(43, 46, 55, 0.95); }
+  background-color: rgba(43, 46, 55, 0.95);
+  text-shadow: none;
+  icon-shadow: none; }
   .xfce4-panel.panel .button.flat {
     color: #BAC3CF;
     background-color: rgba(43, 46, 55, 0);
@@ -3844,6 +3846,7 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW
 @define-color error_color #FC4138;
 @define-color success_color #73d216;
 @define-color placeholder_text_color #A8A8A8;
+@define-color link_color #2679db;
 @define-color content_view_bg #ffffff;
 @define-color wm_title alpha(#525d76, 0.8);
 @define-color wm_unfocused_title alpha(#525d76, 0.5);
diff --git a/common/gtk-3.0/3.16/sass/_applications.scss b/common/gtk-3.0/3.16/sass/_applications.scss
index abb8cf1..bfcee21 100644
--- a/common/gtk-3.0/3.16/sass/_applications.scss
+++ b/common/gtk-3.0/3.16/sass/_applications.scss
@@ -542,6 +542,9 @@ ClockBox {
 .xfce4-panel.panel {
   background-color: $panel_bg;
 
+  text-shadow: none;
+  icon-shadow: none;
+
   .button.flat {
     color: $panel_fg;
     background-color: transparentize($panel_bg, 1);
diff --git a/common/gtk-3.0/3.16/sass/_colors-public.scss b/common/gtk-3.0/3.16/sass/_colors-public.scss
index bada81a..7d0abba 100644
--- a/common/gtk-3.0/3.16/sass/_colors-public.scss
+++ b/common/gtk-3.0/3.16/sass/_colors-public.scss
@@ -28,6 +28,7 @@
 @define-color error_color #{"" + $error_color};
 @define-color success_color #{"" + $success_color};
 @define-color placeholder_text_color #{#A8A8A8};
+@define-color link_color #{"" + $link_color};
 
 @define-color content_view_bg #{"" + $base_color};
 
diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss
index 819dc93..f2d8e1c 100644
--- a/common/gtk-3.0/3.16/sass/_common.scss
+++ b/common/gtk-3.0/3.16/sass/_common.scss
@@ -1541,7 +1541,7 @@ column-header.button.dnd { // for treeview-like derive widgets
   }
 
   & > .menuitem {
-    padding: 6px 8px;
+    padding: 4px 8px;
     border: solid transparent;
     border-width: 0;
 
diff --git a/common/gtk-3.0/3.18/gtk-dark.css b/common/gtk-3.0/3.18/gtk-dark.css
index 1d4ef57..8f5f85d 100644
--- a/common/gtk-3.0/3.18/gtk-dark.css
+++ b/common/gtk-3.0/3.18/gtk-dark.css
@@ -1367,7 +1367,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   .menubar:backdrop {
     color: rgba(207, 218, 231, 0.5); }
   .menubar > .menuitem {
-    padding: 6px 8px;
+    padding: 4px 8px;
     border: solid transparent;
     border-width: 0; }
     .menubar > .menuitem:hover {
@@ -2745,9 +2745,6 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline-
     background-color: #313541;
     border-color: #1b1d24; }
 
-NautilusListView .view {
-  border-bottom: 1px solid #2b2e39; }
-
 NemoWindow .sidebar .frame {
   border-width: 0; }
 
@@ -3085,7 +3082,9 @@ ClockBox {
   color: #BAC3CF; }
 
 .xfce4-panel.panel {
-  background-color: rgba(43, 46, 55, 0.95); }
+  background-color: rgba(43, 46, 55, 0.95);
+  text-shadow: none;
+  icon-shadow: none; }
   .xfce4-panel.panel .button.flat, .xfce4-panel.panel .sidebar-button.button {
     color: #BAC3CF;
     background-color: rgba(43, 46, 55, 0);
@@ -4007,6 +4006,7 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW
 @define-color error_color #FC4138;
 @define-color success_color #73d216;
 @define-color placeholder_text_color #A8A8A8;
+@define-color link_color #a9caf1;
 @define-color content_view_bg #404552;
 @define-color wm_title alpha(#cfdae7, 0.8);
 @define-color wm_unfocused_title alpha(#cfdae7, 0.5);
diff --git a/common/gtk-3.0/3.18/gtk-darker.css b/common/gtk-3.0/3.18/gtk-darker.css
index e2a1fad..93ef024 100644
--- a/common/gtk-3.0/3.18/gtk-darker.css
+++ b/common/gtk-3.0/3.18/gtk-darker.css
@@ -1370,7 +1370,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   .menubar:backdrop {
     color: rgba(207, 218, 231, 0.5); }
   .menubar > .menuitem {
-    padding: 6px 8px;
+    padding: 4px 8px;
     border: solid transparent;
     border-width: 0; }
     .menubar > .menuitem:hover {
@@ -2748,9 +2748,6 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline-
     background-color: #edeef0;
     border-color: #d0d5da; }
 
-NautilusListView .view {
-  border-bottom: 1px solid #dcdfe3; }
-
 NemoWindow .sidebar .frame {
   border-width: 0; }
 
@@ -3088,7 +3085,9 @@ ClockBox {
   color: #BAC3CF; }
 
 .xfce4-panel.panel {
-  background-color: rgba(43, 46, 55, 0.95); }
+  background-color: rgba(43, 46, 55, 0.95);
+  text-shadow: none;
+  icon-shadow: none; }
   .xfce4-panel.panel .button.flat, .xfce4-panel.panel .sidebar-button.button {
     color: #BAC3CF;
     background-color: rgba(43, 46, 55, 0);
@@ -4000,6 +3999,7 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW
 @define-color error_color #FC4138;
 @define-color success_color #73d216;
 @define-color placeholder_text_color #A8A8A8;
+@define-color link_color #2679db;
 @define-color content_view_bg #ffffff;
 @define-color wm_title alpha(#cfdae7, 0.8);
 @define-color wm_unfocused_title alpha(#cfdae7, 0.5);
diff --git a/common/gtk-3.0/3.18/gtk-solid-dark.css b/common/gtk-3.0/3.18/gtk-solid-dark.css
index d5a4214..84e87d7 100644
--- a/common/gtk-3.0/3.18/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.18/gtk-solid-dark.css
@@ -1367,7 +1367,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   .menubar:backdrop {
     color: rgba(207, 218, 231, 0.5); }
   .menubar > .menuitem {
-    padding: 6px 8px;
+    padding: 4px 8px;
     border: solid transparent;
     border-width: 0; }
     .menubar > .menuitem:hover {
@@ -2745,9 +2745,6 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline-
     background-color: #313541;
     border-color: #1b1d24; }
 
-NautilusListView .view {
-  border-bottom: 1px solid #2b2e39; }
-
 NemoWindow .sidebar .frame {
   border-width: 0; }
 
@@ -3085,7 +3082,9 @@ ClockBox {
   color: #BAC3CF; }
 
 .xfce4-panel.panel {
-  background-color: #2b2e37; }
+  background-color: #2b2e37;
+  text-shadow: none;
+  icon-shadow: none; }
   .xfce4-panel.panel .button.flat, .xfce4-panel.panel .sidebar-button.button {
     color: #BAC3CF;
     background-color: rgba(43, 46, 55, 0);
@@ -4007,6 +4006,7 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW
 @define-color error_color #FC4138;
 @define-color success_color #73d216;
 @define-color placeholder_text_color #A8A8A8;
+@define-color link_color #a9caf1;
 @define-color content_view_bg #404552;
 @define-color wm_title alpha(#cfdae7, 0.8);
 @define-color wm_unfocused_title alpha(#cfdae7, 0.5);
diff --git a/common/gtk-3.0/3.18/gtk-solid-darker.css b/common/gtk-3.0/3.18/gtk-solid-darker.css
index 258b29a..81b8e0e 100644
--- a/common/gtk-3.0/3.18/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.18/gtk-solid-darker.css
@@ -1370,7 +1370,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   .menubar:backdrop {
     color: rgba(207, 218, 231, 0.5); }
   .menubar > .menuitem {
-    padding: 6px 8px;
+    padding: 4px 8px;
     border: solid transparent;
     border-width: 0; }
     .menubar > .menuitem:hover {
@@ -2748,9 +2748,6 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline-
     background-color: #edeef0;
     border-color: #d0d5da; }
 
-NautilusListView .view {
-  border-bottom: 1px solid #dcdfe3; }
-
 NemoWindow .sidebar .frame {
   border-width: 0; }
 
@@ -3088,7 +3085,9 @@ ClockBox {
   color: #BAC3CF; }
 
 .xfce4-panel.panel {
-  background-color: #2b2e37; }
+  background-color: #2b2e37;
+  text-shadow: none;
+  icon-shadow: none; }
   .xfce4-panel.panel .button.flat, .xfce4-panel.panel .sidebar-button.button {
     color: #BAC3CF;
     background-color: rgba(43, 46, 55, 0);
@@ -4000,6 +3999,7 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW
 @define-color error_color #FC4138;
 @define-color success_color #73d216;
 @define-color placeholder_text_color #A8A8A8;
+@define-color link_color #2679db;
 @define-color content_view_bg #ffffff;
 @define-color wm_title alpha(#cfdae7, 0.8);
 @define-color wm_unfocused_title alpha(#cfdae7, 0.5);
diff --git a/common/gtk-3.0/3.18/gtk-solid.css b/common/gtk-3.0/3.18/gtk-solid.css
index 6f8e832..bf933ca 100644
--- a/common/gtk-3.0/3.18/gtk-solid.css
+++ b/common/gtk-3.0/3.18/gtk-solid.css
@@ -1374,7 +1374,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   .menubar:backdrop {
     color: rgba(82, 93, 118, 0.5); }
   .menubar > .menuitem {
-    padding: 6px 8px;
+    padding: 4px 8px;
     border: solid transparent;
     border-width: 0; }
     .menubar > .menuitem:hover {
@@ -2752,9 +2752,6 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline-
     background-color: #edeef0;
     border-color: #d0d5da; }
 
-NautilusListView .view {
-  border-bottom: 1px solid #dcdfe3; }
-
 NemoWindow .sidebar .frame {
   border-width: 0; }
 
@@ -3092,7 +3089,9 @@ ClockBox {
   color: #BAC3CF; }
 
 .xfce4-panel.panel {
-  background-color: #2b2e37; }
+  background-color: #2b2e37;
+  text-shadow: none;
+  icon-shadow: none; }
   .xfce4-panel.panel .button.flat, .xfce4-panel.panel .sidebar-button.button {
     color: #BAC3CF;
     background-color: rgba(43, 46, 55, 0);
@@ -4004,6 +4003,7 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW
 @define-color error_color #FC4138;
 @define-color success_color #73d216;
 @define-color placeholder_text_color #A8A8A8;
+@define-color link_color #2679db;
 @define-color content_view_bg #ffffff;
 @define-color wm_title alpha(#525d76, 0.8);
 @define-color wm_unfocused_title alpha(#525d76, 0.5);
diff --git a/common/gtk-3.0/3.18/gtk.css b/common/gtk-3.0/3.18/gtk.css
index 9fb09b8..6b5d571 100644
--- a/common/gtk-3.0/3.18/gtk.css
+++ b/common/gtk-3.0/3.18/gtk.css
@@ -1374,7 +1374,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   .menubar:backdrop {
     color: rgba(82, 93, 118, 0.5); }
   .menubar > .menuitem {
-    padding: 6px 8px;
+    padding: 4px 8px;
     border: solid transparent;
     border-width: 0; }
     .menubar > .menuitem:hover {
@@ -2752,9 +2752,6 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline-
     background-color: #edeef0;
     border-color: #d0d5da; }
 
-NautilusListView .view {
-  border-bottom: 1px solid #dcdfe3; }
-
 NemoWindow .sidebar .frame {
   border-width: 0; }
 
@@ -3092,7 +3089,9 @@ ClockBox {
   color: #BAC3CF; }
 
 .xfce4-panel.panel {
-  background-color: rgba(43, 46, 55, 0.95); }
+  background-color: rgba(43, 46, 55, 0.95);
+  text-shadow: none;
+  icon-shadow: none; }
   .xfce4-panel.panel .button.flat, .xfce4-panel.panel .sidebar-button.button {
     color: #BAC3CF;
     background-color: rgba(43, 46, 55, 0);
@@ -4004,6 +4003,7 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW
 @define-color error_color #FC4138;
 @define-color success_color #73d216;
 @define-color placeholder_text_color #A8A8A8;
+@define-color link_color #2679db;
 @define-color content_view_bg #ffffff;
 @define-color wm_title alpha(#525d76, 0.8);
 @define-color wm_unfocused_title alpha(#525d76, 0.5);
diff --git a/common/gtk-3.0/3.18/sass/_applications.scss b/common/gtk-3.0/3.18/sass/_applications.scss
index 9d28629..63e1186 100644
--- a/common/gtk-3.0/3.18/sass/_applications.scss
+++ b/common/gtk-3.0/3.18/sass/_applications.scss
@@ -156,9 +156,6 @@ $disk_space_free: darken($bg_color, 3%);
   }
 }
 
-// View
-NautilusListView .view { border-bottom: 1px solid $borders_color; }
-
 //
 // Nemo
 //
@@ -589,6 +586,9 @@ ClockBox {
 .xfce4-panel.panel {
   background-color: $panel_bg;
 
+  text-shadow: none;
+  icon-shadow: none;
+
   .button.flat {
     color: $panel_fg;
     background-color: transparentize($panel_bg, 1);
diff --git a/common/gtk-3.0/3.18/sass/_colors-public.scss b/common/gtk-3.0/3.18/sass/_colors-public.scss
index bada81a..7d0abba 100644
--- a/common/gtk-3.0/3.18/sass/_colors-public.scss
+++ b/common/gtk-3.0/3.18/sass/_colors-public.scss
@@ -28,6 +28,7 @@
 @define-color error_color #{"" + $error_color};
 @define-color success_color #{"" + $success_color};
 @define-color placeholder_text_color #{#A8A8A8};
+@define-color link_color #{"" + $link_color};
 
 @define-color content_view_bg #{"" + $base_color};
 
diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss
index 63904ee..dd39d6b 100644
--- a/common/gtk-3.0/3.18/sass/_common.scss
+++ b/common/gtk-3.0/3.18/sass/_common.scss
@@ -1486,7 +1486,7 @@ column-header.button.dnd { // for treeview-like derive widgets
   }
 
   & > .menuitem {
-    padding: 6px 8px;
+    padding: 4px 8px;
     border: solid transparent;
     border-width: 0;
 
diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css
index 2cf0003..034c752 100644
--- a/common/gtk-3.0/3.20/gtk-dark.css
+++ b/common/gtk-3.0/3.20/gtk-dark.css
@@ -1509,7 +1509,7 @@ menubar,
     color: rgba(207, 218, 231, 0.5); }
   menubar > menuitem,
   .menubar > menuitem {
-    padding: 6px 8px;
+    padding: 4px 8px;
     border: solid transparent;
     border-width: 0; }
     menubar > menuitem:hover,
@@ -1540,11 +1540,11 @@ menu,
   .menu separator {
     margin: 2px 0;
     background-color: #383C4A; }
-  menu .separator,
-  .csd menu .separator,
-  .menu .separator,
+  menu .separator:not(label),
+  .csd menu .separator:not(label),
+  .menu .separator:not(label),
   .csd
-  .menu .separator {
+  .menu .separator:not(label) {
     color: #383C4A; }
   menu menuitem,
   .menu menuitem {
@@ -3104,13 +3104,14 @@ terminal-window notebook > header.top {
 .nautilus-canvas-item {
   border-radius: 2px; }
 
-.nautilus-desktop.nautilus-canvas-item, .nemo-desktop.nemo-canvas-item {
+.nautilus-desktop.nautilus-canvas-item, .nemo-desktop.nemo-canvas-item, .caja-desktop {
   color: #ffffff;
   text-shadow: 1px 1px rgba(0, 0, 0, 0.6); }
-  .nautilus-desktop.nautilus-canvas-item:active, .nemo-desktop.nemo-canvas-item:active {
+  .nautilus-desktop.nautilus-canvas-item:active, .nemo-desktop.nemo-canvas-item:active, .caja-desktop:active {
     color: #D3DAE3; }
-  .nautilus-desktop.nautilus-canvas-item:selected, .nemo-desktop.nemo-canvas-item:selected {
-    color: #ffffff; }
+  .nautilus-desktop.nautilus-canvas-item:selected, .nemo-desktop.nemo-canvas-item:selected, .caja-desktop:selected {
+    color: #ffffff;
+    text-shadow: none; }
 
 .nautilus-canvas-item.dim-label, label.nautilus-canvas-item.separator,
 popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-canvas-item.subtitle, .titlebar:not(headerbar) .nautilus-canvas-item.subtitle,
@@ -3144,9 +3145,6 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
     background-color: #313541;
     border-color: #1b1d24; }
 
-.nautilus-list-view .view, .nautilus-list-view iconview {
-  border-bottom: 1px solid #2b2e39; }
-
 @keyframes needs_attention_keyframes {
   0% {
     color: rgba(207, 218, 231, 0.8);
@@ -3210,6 +3208,15 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
   box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); }
 
+.caja-notebook {
+  border-top: 1px solid #2b2e39; }
+
+.caja-side-pane .frame {
+  border-width: 1px 0 0; }
+
+.caja-notebook .frame {
+  border-width: 0 0 1px; }
+
 .open-document-selector-treeview.view, iconview.open-document-selector-treeview {
   padding: 3px 6px 3px 6px;
   border-color: #404552; }
@@ -3389,22 +3396,79 @@ button.documents-favorite:active:hover {
 .tr-workarea overshoot {
   border-color: transparent; }
 
+.gnome-panel-menu-bar, .gnome-panel-menu-bar menubar,
+.mate-panel-menu-bar,
+.mate-panel-menu-bar menubar {
+  background-color: rgba(43, 46, 55, 0.95); }
+
+.gnome-panel-menu-bar menubar,
+.gnome-panel-menu-bar #PanelApplet label,
+.gnome-panel-menu-bar #PanelApplet image,
+.mate-panel-menu-bar menubar,
+.mate-panel-menu-bar #PanelApplet label,
+.mate-panel-menu-bar #PanelApplet image {
+  color: #BAC3CF; }
+
+.gnome-panel-menu-bar button label, .gnome-panel-menu-bar button image,
+.gnome-panel-menu-bar #tasklist-button label,
+.gnome-panel-menu-bar #tasklist-button image,
+.mate-panel-menu-bar button label,
+.mate-panel-menu-bar button image,
+.mate-panel-menu-bar #tasklist-button label,
+.mate-panel-menu-bar #tasklist-button image {
+  color: inherit; }
+
+.gnome-panel-menu-bar .wnck-pager,
+.mate-panel-menu-bar .wnck-pager {
+  color: #5d6268;
+  background-color: rgba(20, 22, 27, 0.95); }
+  .gnome-panel-menu-bar .wnck-pager:hover,
+  .mate-panel-menu-bar .wnck-pager:hover {
+    background-color: rgba(54, 58, 70, 0.95); }
+  .gnome-panel-menu-bar .wnck-pager:selected,
+  .mate-panel-menu-bar .wnck-pager:selected {
+    color: #a9caf1;
+    background-color: #5294E2; }
+
+.gnome-panel-menu-bar na-tray-applet,
+.mate-panel-menu-bar na-tray-applet {
+  -NaTrayApplet-icon-padding: 0;
+  -NaTrayApplet-icon-size: 16px; }
+
 .xfce4-panel.panel {
   background-color: rgba(43, 46, 55, 0.95);
   text-shadow: none;
   -gtk-icon-shadow: none; }
-  .xfce4-panel.panel button.flat, .xfce4-panel.panel button.sidebar-button {
-    color: #BAC3CF;
-    background-color: rgba(43, 46, 55, 0);
-    border-radius: 0;
-    border: none; }
-    .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.sidebar-button:hover {
-      border: none;
-      background-color: rgba(65, 70, 84, 0.95); }
-    .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.sidebar-button:active, .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.sidebar-button:checked {
-      color: #ffffff;
-      border: none;
-      background-color: #5294E2; }
+
+#tasklist-button {
+  color: rgba(186, 195, 207, 0.8);
+  border-radius: 0;
+  border: none;
+  background-color: rgba(43, 46, 55, 0); }
+  #tasklist-button:hover {
+    color: #d8dde4;
+    background-color: rgba(0, 0, 0, 0.17); }
+  #tasklist-button:checked {
+    color: #ffffff;
+    background-color: rgba(0, 0, 0, 0.25);
+    box-shadow: inset 0 -2px #5294E2; }
+
+.gnome-panel-menu-bar button:not(#tasklist-button),
+.mate-panel-menu-bar button:not(#tasklist-button), .xfce4-panel.panel button.flat, .xfce4-panel.panel button.sidebar-button {
+  color: #BAC3CF;
+  border-radius: 0;
+  border: none;
+  background-color: rgba(43, 46, 55, 0); }
+  .gnome-panel-menu-bar button:hover:not(#tasklist-button),
+  .mate-panel-menu-bar button:hover:not(#tasklist-button), .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.sidebar-button:hover {
+    border: none;
+    background-color: rgba(65, 70, 84, 0.95); }
+  .gnome-panel-menu-bar button:active:not(#tasklist-button),
+  .mate-panel-menu-bar button:active:not(#tasklist-button), .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.sidebar-button:active, .gnome-panel-menu-bar button:checked:not(#tasklist-button),
+  .mate-panel-menu-bar button:checked:not(#tasklist-button), .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.sidebar-button:checked {
+    color: #ffffff;
+    border: none;
+    background-color: #5294E2; }
 
 .nautilus-window .floating-bar {
   padding: 1px;
@@ -4016,6 +4080,23 @@ filechooser.maximized placessidebar.sidebar,
   .nemo-window .sidebar separator {
     background-color: transparent; }
 
+.caja-side-pane,
+.caja-side-pane > notebook > stack > widget > box,
+.caja-side-pane text,
+.caja-side-pane treeview {
+  color: #BAC3CF;
+  caret-color: #BAC3CF;
+  background-color: #353945; }
+
+.caja-side-pane > box button:not(:active):not(:checked) {
+  color: #BAC3CF; }
+
+.caja-side-pane .frame {
+  border-color: #2a2d37; }
+
+.caja-side-pane junction {
+  background-color: rgba(42, 45, 55, 0.95); }
+
 filechooser actionbar {
   color: #BAC3CF;
   background-color: rgba(53, 57, 69, 0.95);
@@ -4051,7 +4132,7 @@ filechooser actionbar button {
   outline-color: rgba(186, 195, 207, 0.3);
   border-color: rgba(26, 28, 34, 0.35);
   background-color: rgba(102, 109, 132, 0.35); }
-  filechooser actionbar button:hover {
+  .caja-side-pane > box button:hover:not(:active), filechooser actionbar button:hover {
     color: #BAC3CF;
     outline-color: rgba(186, 195, 207, 0.3);
     border-color: rgba(26, 28, 34, 0.35);
@@ -4081,28 +4162,28 @@ filechooser actionbar entry {
     color: rgba(186, 195, 207, 0.55);
     background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.2)); }
 
-filechooser placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider,
-.nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .nemo-window .sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
-  background-color: #e7eaee;
-  border: 1px solid rgba(0, 0, 0, 0.3); }
-
-filechooser placessidebar.sidebar scrollbar slider,
-.nautilus-window placessidebar.sidebar scrollbar slider, .nemo-window .sidebar scrollbar slider {
-  background-color: rgba(231, 234, 238, 0.7); }
-  filechooser placessidebar.sidebar scrollbar slider:hover,
-  .nautilus-window placessidebar.sidebar scrollbar slider:hover, .nemo-window .sidebar scrollbar slider:hover {
-    background-color: #f6f7f9; }
-  filechooser placessidebar.sidebar scrollbar slider:hover:active,
-  .nautilus-window placessidebar.sidebar scrollbar slider:hover:active, .nemo-window .sidebar scrollbar slider:hover:active {
-    background-color: #5294E2; }
-  filechooser placessidebar.sidebar scrollbar slider:disabled,
-  .nautilus-window placessidebar.sidebar scrollbar slider:disabled, .nemo-window .sidebar scrollbar slider:disabled {
-    background-color: transparent; }
-
-filechooser placessidebar.sidebar scrollbar trough,
-.nautilus-window placessidebar.sidebar scrollbar trough, .nemo-window .sidebar scrollbar trough {
-  background-color: rgba(0, 0, 0, 0.2);
-  border: none; }
+filechooser placessidebar.sidebar scrollbar,
+.nautilus-window placessidebar.sidebar scrollbar, .nemo-window .sidebar scrollbar, .caja-side-pane scrollbar {
+  border-color: rgba(42, 45, 55, 0.95); }
+  filechooser placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider,
+  .nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .nemo-window .sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .caja-side-pane scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
+    background-color: #e7eaee;
+    border: 1px solid rgba(0, 0, 0, 0.3); }
+  filechooser placessidebar.sidebar scrollbar slider,
+  .nautilus-window placessidebar.sidebar scrollbar slider, .nemo-window .sidebar scrollbar slider, .caja-side-pane scrollbar slider {
+    background-color: rgba(231, 234, 238, 0.7); }
+    filechooser placessidebar.sidebar scrollbar slider:hover,
+    .nautilus-window placessidebar.sidebar scrollbar slider:hover, .nemo-window .sidebar scrollbar slider:hover, .caja-side-pane scrollbar slider:hover {
+      background-color: #f6f7f9; }
+    filechooser placessidebar.sidebar scrollbar slider:hover:active,
+    .nautilus-window placessidebar.sidebar scrollbar slider:hover:active, .nemo-window .sidebar scrollbar slider:hover:active, .caja-side-pane scrollbar slider:hover:active {
+      background-color: #5294E2; }
+    filechooser placessidebar.sidebar scrollbar slider:disabled,
+    .nautilus-window placessidebar.sidebar scrollbar slider:disabled, .nemo-window .sidebar scrollbar slider:disabled, .caja-side-pane scrollbar slider:disabled {
+      background-color: transparent; }
+  filechooser placessidebar.sidebar scrollbar trough,
+  .nautilus-window placessidebar.sidebar scrollbar trough, .nemo-window .sidebar scrollbar trough, .caja-side-pane scrollbar trough {
+    background-color: rgba(42, 45, 55, 0.95); }
 
 @define-color theme_fg_color #D3DAE3;
 @define-color theme_text_color #D3DAE3;
@@ -4129,6 +4210,7 @@ filechooser placessidebar.sidebar scrollbar trough,
 @define-color error_color #FC4138;
 @define-color success_color #73d216;
 @define-color placeholder_text_color #A8A8A8;
+@define-color link_color #a9caf1;
 @define-color content_view_bg #404552;
 @define-color wm_title alpha(#cfdae7, 0.8);
 @define-color wm_unfocused_title alpha(#cfdae7, 0.5);
diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css
index ba652bb..6cf6f13 100644
--- a/common/gtk-3.0/3.20/gtk-darker.css
+++ b/common/gtk-3.0/3.20/gtk-darker.css
@@ -1508,7 +1508,7 @@ menubar,
     color: rgba(207, 218, 231, 0.5); }
   menubar > menuitem,
   .menubar > menuitem {
-    padding: 6px 8px;
+    padding: 4px 8px;
     border: solid transparent;
     border-width: 0; }
     menubar > menuitem:hover,
@@ -1539,11 +1539,11 @@ menu,
   .menu separator {
     margin: 2px 0;
     background-color: #ffffff; }
-  menu .separator,
-  .csd menu .separator,
-  .menu .separator,
+  menu .separator:not(label),
+  .csd menu .separator:not(label),
+  .menu .separator:not(label),
   .csd
-  .menu .separator {
+  .menu .separator:not(label) {
     color: #ffffff; }
   menu menuitem,
   .menu menuitem {
@@ -3103,13 +3103,14 @@ terminal-window notebook > header.top {
 .nautilus-canvas-item {
   border-radius: 2px; }
 
-.nautilus-desktop.nautilus-canvas-item, .nemo-desktop.nemo-canvas-item {
+.nautilus-desktop.nautilus-canvas-item, .nemo-desktop.nemo-canvas-item, .caja-desktop {
   color: #ffffff;
   text-shadow: 1px 1px rgba(0, 0, 0, 0.6); }
-  .nautilus-desktop.nautilus-canvas-item:active, .nemo-desktop.nemo-canvas-item:active {
+  .nautilus-desktop.nautilus-canvas-item:active, .nemo-desktop.nemo-canvas-item:active, .caja-desktop:active {
     color: #5c616c; }
-  .nautilus-desktop.nautilus-canvas-item:selected, .nemo-desktop.nemo-canvas-item:selected {
-    color: #ffffff; }
+  .nautilus-desktop.nautilus-canvas-item:selected, .nemo-desktop.nemo-canvas-item:selected, .caja-desktop:selected {
+    color: #ffffff;
+    text-shadow: none; }
 
 .nautilus-canvas-item.dim-label, label.nautilus-canvas-item.separator,
 popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-canvas-item.subtitle, .titlebar:not(headerbar) .nautilus-canvas-item.subtitle,
@@ -3143,9 +3144,6 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
     background-color: #edeef0;
     border-color: #d0d5da; }
 
-.nautilus-list-view .view, .nautilus-list-view iconview {
-  border-bottom: 1px solid #dcdfe3; }
-
 @keyframes needs_attention_keyframes {
   0% {
     color: rgba(207, 218, 231, 0.8);
@@ -3208,6 +3206,15 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
   box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); }
 
+.caja-notebook {
+  border-top: 1px solid #dcdfe3; }
+
+.caja-side-pane .frame {
+  border-width: 1px 0 0; }
+
+.caja-notebook .frame {
+  border-width: 0 0 1px; }
+
 .open-document-selector-treeview.view, iconview.open-document-selector-treeview {
   padding: 3px 6px 3px 6px;
   border-color: #ffffff; }
@@ -3387,22 +3394,79 @@ button.documents-favorite:active:hover {
 .tr-workarea overshoot {
   border-color: transparent; }
 
+.gnome-panel-menu-bar, .gnome-panel-menu-bar menubar,
+.mate-panel-menu-bar,
+.mate-panel-menu-bar menubar {
+  background-color: rgba(43, 46, 55, 0.95); }
+
+.gnome-panel-menu-bar menubar,
+.gnome-panel-menu-bar #PanelApplet label,
+.gnome-panel-menu-bar #PanelApplet image,
+.mate-panel-menu-bar menubar,
+.mate-panel-menu-bar #PanelApplet label,
+.mate-panel-menu-bar #PanelApplet image {
+  color: #BAC3CF; }
+
+.gnome-panel-menu-bar button label, .gnome-panel-menu-bar button image,
+.gnome-panel-menu-bar #tasklist-button label,
+.gnome-panel-menu-bar #tasklist-button image,
+.mate-panel-menu-bar button label,
+.mate-panel-menu-bar button image,
+.mate-panel-menu-bar #tasklist-button label,
+.mate-panel-menu-bar #tasklist-button image {
+  color: inherit; }
+
+.gnome-panel-menu-bar .wnck-pager,
+.mate-panel-menu-bar .wnck-pager {
+  color: #5d6268;
+  background-color: rgba(20, 22, 27, 0.95); }
+  .gnome-panel-menu-bar .wnck-pager:hover,
+  .mate-panel-menu-bar .wnck-pager:hover {
+    background-color: rgba(54, 58, 70, 0.95); }
+  .gnome-panel-menu-bar .wnck-pager:selected,
+  .mate-panel-menu-bar .wnck-pager:selected {
+    color: #a9caf1;
+    background-color: #5294E2; }
+
+.gnome-panel-menu-bar na-tray-applet,
+.mate-panel-menu-bar na-tray-applet {
+  -NaTrayApplet-icon-padding: 0;
+  -NaTrayApplet-icon-size: 16px; }
+
 .xfce4-panel.panel {
   background-color: rgba(43, 46, 55, 0.95);
   text-shadow: none;
   -gtk-icon-shadow: none; }
-  .xfce4-panel.panel button.flat, .xfce4-panel.panel button.sidebar-button {
-    color: #BAC3CF;
-    background-color: rgba(43, 46, 55, 0);
-    border-radius: 0;
-    border: none; }
-    .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.sidebar-button:hover {
-      border: none;
-      background-color: rgba(65, 70, 84, 0.95); }
-    .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.sidebar-button:active, .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.sidebar-button:checked {
-      color: #ffffff;
-      border: none;
-      background-color: #5294E2; }
+
+#tasklist-button {
+  color: rgba(186, 195, 207, 0.8);
+  border-radius: 0;
+  border: none;
+  background-color: rgba(43, 46, 55, 0); }
+  #tasklist-button:hover {
+    color: #d8dde4;
+    background-color: rgba(0, 0, 0, 0.17); }
+  #tasklist-button:checked {
+    color: #ffffff;
+    background-color: rgba(0, 0, 0, 0.25);
+    box-shadow: inset 0 -2px #5294E2; }
+
+.gnome-panel-menu-bar button:not(#tasklist-button),
+.mate-panel-menu-bar button:not(#tasklist-button), .xfce4-panel.panel button.flat, .xfce4-panel.panel button.sidebar-button {
+  color: #BAC3CF;
+  border-radius: 0;
+  border: none;
+  background-color: rgba(43, 46, 55, 0); }
+  .gnome-panel-menu-bar button:hover:not(#tasklist-button),
+  .mate-panel-menu-bar button:hover:not(#tasklist-button), .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.sidebar-button:hover {
+    border: none;
+    background-color: rgba(65, 70, 84, 0.95); }
+  .gnome-panel-menu-bar button:active:not(#tasklist-button),
+  .mate-panel-menu-bar button:active:not(#tasklist-button), .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.sidebar-button:active, .gnome-panel-menu-bar button:checked:not(#tasklist-button),
+  .mate-panel-menu-bar button:checked:not(#tasklist-button), .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.sidebar-button:checked {
+    color: #ffffff;
+    border: none;
+    background-color: #5294E2; }
 
 .nautilus-window .floating-bar {
   padding: 1px;
@@ -4018,6 +4082,23 @@ filechooser.maximized placessidebar.sidebar,
   .nemo-window .sidebar separator {
     background-color: transparent; }
 
+.caja-side-pane,
+.caja-side-pane > notebook > stack > widget > box,
+.caja-side-pane text,
+.caja-side-pane treeview {
+  color: #BAC3CF;
+  caret-color: #BAC3CF;
+  background-color: #353945; }
+
+.caja-side-pane > box button:not(:active):not(:checked) {
+  color: #BAC3CF; }
+
+.caja-side-pane .frame {
+  border-color: #2a2d37; }
+
+.caja-side-pane junction {
+  background-color: rgba(42, 45, 55, 0.95); }
+
 filechooser actionbar {
   color: #BAC3CF;
   background-color: rgba(53, 57, 69, 0.95);
@@ -4053,7 +4134,7 @@ filechooser actionbar button {
   outline-color: rgba(186, 195, 207, 0.3);
   border-color: rgba(26, 28, 34, 0.35);
   background-color: rgba(102, 109, 132, 0.35); }
-  filechooser actionbar button:hover {
+  .caja-side-pane > box button:hover:not(:active), filechooser actionbar button:hover {
     color: #BAC3CF;
     outline-color: rgba(186, 195, 207, 0.3);
     border-color: rgba(26, 28, 34, 0.35);
@@ -4083,28 +4164,28 @@ filechooser actionbar entry {
     color: rgba(186, 195, 207, 0.55);
     background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.2)); }
 
-filechooser placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider,
-.nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .nemo-window .sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
-  background-color: #e7eaee;
-  border: 1px solid rgba(0, 0, 0, 0.3); }
-
-filechooser placessidebar.sidebar scrollbar slider,
-.nautilus-window placessidebar.sidebar scrollbar slider, .nemo-window .sidebar scrollbar slider {
-  background-color: rgba(231, 234, 238, 0.7); }
-  filechooser placessidebar.sidebar scrollbar slider:hover,
-  .nautilus-window placessidebar.sidebar scrollbar slider:hover, .nemo-window .sidebar scrollbar slider:hover {
-    background-color: #f6f7f9; }
-  filechooser placessidebar.sidebar scrollbar slider:hover:active,
-  .nautilus-window placessidebar.sidebar scrollbar slider:hover:active, .nemo-window .sidebar scrollbar slider:hover:active {
-    background-color: #5294E2; }
-  filechooser placessidebar.sidebar scrollbar slider:disabled,
-  .nautilus-window placessidebar.sidebar scrollbar slider:disabled, .nemo-window .sidebar scrollbar slider:disabled {
-    background-color: transparent; }
-
-filechooser placessidebar.sidebar scrollbar trough,
-.nautilus-window placessidebar.sidebar scrollbar trough, .nemo-window .sidebar scrollbar trough {
-  background-color: rgba(0, 0, 0, 0.2);
-  border: none; }
+filechooser placessidebar.sidebar scrollbar,
+.nautilus-window placessidebar.sidebar scrollbar, .nemo-window .sidebar scrollbar, .caja-side-pane scrollbar {
+  border-color: rgba(42, 45, 55, 0.95); }
+  filechooser placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider,
+  .nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .nemo-window .sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .caja-side-pane scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
+    background-color: #e7eaee;
+    border: 1px solid rgba(0, 0, 0, 0.3); }
+  filechooser placessidebar.sidebar scrollbar slider,
+  .nautilus-window placessidebar.sidebar scrollbar slider, .nemo-window .sidebar scrollbar slider, .caja-side-pane scrollbar slider {
+    background-color: rgba(231, 234, 238, 0.7); }
+    filechooser placessidebar.sidebar scrollbar slider:hover,
+    .nautilus-window placessidebar.sidebar scrollbar slider:hover, .nemo-window .sidebar scrollbar slider:hover, .caja-side-pane scrollbar slider:hover {
+      background-color: #f6f7f9; }
+    filechooser placessidebar.sidebar scrollbar slider:hover:active,
+    .nautilus-window placessidebar.sidebar scrollbar slider:hover:active, .nemo-window .sidebar scrollbar slider:hover:active, .caja-side-pane scrollbar slider:hover:active {
+      background-color: #5294E2; }
+    filechooser placessidebar.sidebar scrollbar slider:disabled,
+    .nautilus-window placessidebar.sidebar scrollbar slider:disabled, .nemo-window .sidebar scrollbar slider:disabled, .caja-side-pane scrollbar slider:disabled {
+      background-color: transparent; }
+  filechooser placessidebar.sidebar scrollbar trough,
+  .nautilus-window placessidebar.sidebar scrollbar trough, .nemo-window .sidebar scrollbar trough, .caja-side-pane scrollbar trough {
+    background-color: rgba(42, 45, 55, 0.95); }
 
 @define-color theme_fg_color #5c616c;
 @define-color theme_text_color #5c616c;
@@ -4131,6 +4212,7 @@ filechooser placessidebar.sidebar scrollbar trough,
 @define-color error_color #FC4138;
 @define-color success_color #73d216;
 @define-color placeholder_text_color #A8A8A8;
+@define-color link_color #2679db;
 @define-color content_view_bg #ffffff;
 @define-color wm_title alpha(#cfdae7, 0.8);
 @define-color wm_unfocused_title alpha(#cfdae7, 0.5);
diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css
index 82eb666..5fc855f 100644
--- a/common/gtk-3.0/3.20/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.20/gtk-solid-dark.css
@@ -1509,7 +1509,7 @@ menubar,
     color: rgba(207, 218, 231, 0.5); }
   menubar > menuitem,
   .menubar > menuitem {
-    padding: 6px 8px;
+    padding: 4px 8px;
     border: solid transparent;
     border-width: 0; }
     menubar > menuitem:hover,
@@ -1540,11 +1540,11 @@ menu,
   .menu separator {
     margin: 2px 0;
     background-color: #383C4A; }
-  menu .separator,
-  .csd menu .separator,
-  .menu .separator,
+  menu .separator:not(label),
+  .csd menu .separator:not(label),
+  .menu .separator:not(label),
   .csd
-  .menu .separator {
+  .menu .separator:not(label) {
     color: #383C4A; }
   menu menuitem,
   .menu menuitem {
@@ -3104,13 +3104,14 @@ terminal-window notebook > header.top {
 .nautilus-canvas-item {
   border-radius: 2px; }
 
-.nautilus-desktop.nautilus-canvas-item, .nemo-desktop.nemo-canvas-item {
+.nautilus-desktop.nautilus-canvas-item, .nemo-desktop.nemo-canvas-item, .caja-desktop {
   color: #ffffff;
   text-shadow: 1px 1px rgba(0, 0, 0, 0.6); }
-  .nautilus-desktop.nautilus-canvas-item:active, .nemo-desktop.nemo-canvas-item:active {
+  .nautilus-desktop.nautilus-canvas-item:active, .nemo-desktop.nemo-canvas-item:active, .caja-desktop:active {
     color: #D3DAE3; }
-  .nautilus-desktop.nautilus-canvas-item:selected, .nemo-desktop.nemo-canvas-item:selected {
-    color: #ffffff; }
+  .nautilus-desktop.nautilus-canvas-item:selected, .nemo-desktop.nemo-canvas-item:selected, .caja-desktop:selected {
+    color: #ffffff;
+    text-shadow: none; }
 
 .nautilus-canvas-item.dim-label, label.nautilus-canvas-item.separator,
 popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-canvas-item.subtitle, .titlebar:not(headerbar) .nautilus-canvas-item.subtitle,
@@ -3144,9 +3145,6 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
     background-color: #313541;
     border-color: #1b1d24; }
 
-.nautilus-list-view .view, .nautilus-list-view iconview {
-  border-bottom: 1px solid #2b2e39; }
-
 @keyframes needs_attention_keyframes {
   0% {
     color: rgba(207, 218, 231, 0.8);
@@ -3210,6 +3208,15 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
   box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); }
 
+.caja-notebook {
+  border-top: 1px solid #2b2e39; }
+
+.caja-side-pane .frame {
+  border-width: 1px 0 0; }
+
+.caja-notebook .frame {
+  border-width: 0 0 1px; }
+
 .open-document-selector-treeview.view, iconview.open-document-selector-treeview {
   padding: 3px 6px 3px 6px;
   border-color: #404552; }
@@ -3389,22 +3396,79 @@ button.documents-favorite:active:hover {
 .tr-workarea overshoot {
   border-color: transparent; }
 
+.gnome-panel-menu-bar, .gnome-panel-menu-bar menubar,
+.mate-panel-menu-bar,
+.mate-panel-menu-bar menubar {
+  background-color: #2b2e37; }
+
+.gnome-panel-menu-bar menubar,
+.gnome-panel-menu-bar #PanelApplet label,
+.gnome-panel-menu-bar #PanelApplet image,
+.mate-panel-menu-bar menubar,
+.mate-panel-menu-bar #PanelApplet label,
+.mate-panel-menu-bar #PanelApplet image {
+  color: #BAC3CF; }
+
+.gnome-panel-menu-bar button label, .gnome-panel-menu-bar button image,
+.gnome-panel-menu-bar #tasklist-button label,
+.gnome-panel-menu-bar #tasklist-button image,
+.mate-panel-menu-bar button label,
+.mate-panel-menu-bar button image,
+.mate-panel-menu-bar #tasklist-button label,
+.mate-panel-menu-bar #tasklist-button image {
+  color: inherit; }
+
+.gnome-panel-menu-bar .wnck-pager,
+.mate-panel-menu-bar .wnck-pager {
+  color: #5d6268;
+  background-color: #14161b; }
+  .gnome-panel-menu-bar .wnck-pager:hover,
+  .mate-panel-menu-bar .wnck-pager:hover {
+    background-color: #363a46; }
+  .gnome-panel-menu-bar .wnck-pager:selected,
+  .mate-panel-menu-bar .wnck-pager:selected {
+    color: #a9caf1;
+    background-color: #5294E2; }
+
+.gnome-panel-menu-bar na-tray-applet,
+.mate-panel-menu-bar na-tray-applet {
+  -NaTrayApplet-icon-padding: 0;
+  -NaTrayApplet-icon-size: 16px; }
+
 .xfce4-panel.panel {
   background-color: #2b2e37;
   text-shadow: none;
   -gtk-icon-shadow: none; }
-  .xfce4-panel.panel button.flat, .xfce4-panel.panel button.sidebar-button {
-    color: #BAC3CF;
-    background-color: rgba(43, 46, 55, 0);
-    border-radius: 0;
-    border: none; }
-    .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.sidebar-button:hover {
-      border: none;
-      background-color: #414654; }
-    .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.sidebar-button:active, .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.sidebar-button:checked {
-      color: #ffffff;
-      border: none;
-      background-color: #5294E2; }
+
+#tasklist-button {
+  color: rgba(186, 195, 207, 0.8);
+  border-radius: 0;
+  border: none;
+  background-color: rgba(43, 46, 55, 0); }
+  #tasklist-button:hover {
+    color: #d8dde4;
+    background-color: rgba(0, 0, 0, 0.17); }
+  #tasklist-button:checked {
+    color: #ffffff;
+    background-color: rgba(0, 0, 0, 0.25);
+    box-shadow: inset 0 -2px #5294E2; }
+
+.gnome-panel-menu-bar button:not(#tasklist-button),
+.mate-panel-menu-bar button:not(#tasklist-button), .xfce4-panel.panel button.flat, .xfce4-panel.panel button.sidebar-button {
+  color: #BAC3CF;
+  border-radius: 0;
+  border: none;
+  background-color: rgba(43, 46, 55, 0); }
+  .gnome-panel-menu-bar button:hover:not(#tasklist-button),
+  .mate-panel-menu-bar button:hover:not(#tasklist-button), .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.sidebar-button:hover {
+    border: none;
+    background-color: #414654; }
+  .gnome-panel-menu-bar button:active:not(#tasklist-button),
+  .mate-panel-menu-bar button:active:not(#tasklist-button), .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.sidebar-button:active, .gnome-panel-menu-bar button:checked:not(#tasklist-button),
+  .mate-panel-menu-bar button:checked:not(#tasklist-button), .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.sidebar-button:checked {
+    color: #ffffff;
+    border: none;
+    background-color: #5294E2; }
 
 .nautilus-window .floating-bar {
   padding: 1px;
@@ -4016,6 +4080,23 @@ filechooser.maximized placessidebar.sidebar,
   .nemo-window .sidebar separator {
     background-color: transparent; }
 
+.caja-side-pane,
+.caja-side-pane > notebook > stack > widget > box,
+.caja-side-pane text,
+.caja-side-pane treeview {
+  color: #BAC3CF;
+  caret-color: #BAC3CF;
+  background-color: #353945; }
+
+.caja-side-pane > box button:not(:active):not(:checked) {
+  color: #BAC3CF; }
+
+.caja-side-pane .frame {
+  border-color: #2a2d37; }
+
+.caja-side-pane junction {
+  background-color: #2a2d37; }
+
 filechooser actionbar {
   color: #BAC3CF;
   background-color: #353945;
@@ -4051,7 +4132,7 @@ filechooser actionbar button {
   outline-color: rgba(186, 195, 207, 0.3);
   border-color: rgba(26, 28, 34, 0.4);
   background-color: rgba(102, 109, 132, 0.4); }
-  filechooser actionbar button:hover {
+  .caja-side-pane > box button:hover:not(:active), filechooser actionbar button:hover {
     color: #BAC3CF;
     outline-color: rgba(186, 195, 207, 0.3);
     border-color: rgba(26, 28, 34, 0.4);
@@ -4081,28 +4162,28 @@ filechooser actionbar entry {
     color: rgba(186, 195, 207, 0.55);
     background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.25)); }
 
-filechooser placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider,
-.nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .nemo-window .sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
-  background-color: #e7eaee;
-  border: 1px solid rgba(0, 0, 0, 0.3); }
-
-filechooser placessidebar.sidebar scrollbar slider,
-.nautilus-window placessidebar.sidebar scrollbar slider, .nemo-window .sidebar scrollbar slider {
-  background-color: rgba(231, 234, 238, 0.7); }
-  filechooser placessidebar.sidebar scrollbar slider:hover,
-  .nautilus-window placessidebar.sidebar scrollbar slider:hover, .nemo-window .sidebar scrollbar slider:hover {
-    background-color: #f6f7f9; }
-  filechooser placessidebar.sidebar scrollbar slider:hover:active,
-  .nautilus-window placessidebar.sidebar scrollbar slider:hover:active, .nemo-window .sidebar scrollbar slider:hover:active {
-    background-color: #5294E2; }
-  filechooser placessidebar.sidebar scrollbar slider:disabled,
-  .nautilus-window placessidebar.sidebar scrollbar slider:disabled, .nemo-window .sidebar scrollbar slider:disabled {
-    background-color: transparent; }
-
-filechooser placessidebar.sidebar scrollbar trough,
-.nautilus-window placessidebar.sidebar scrollbar trough, .nemo-window .sidebar scrollbar trough {
-  background-color: rgba(0, 0, 0, 0.2);
-  border: none; }
+filechooser placessidebar.sidebar scrollbar,
+.nautilus-window placessidebar.sidebar scrollbar, .nemo-window .sidebar scrollbar, .caja-side-pane scrollbar {
+  border-color: #2a2d37; }
+  filechooser placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider,
+  .nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .nemo-window .sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .caja-side-pane scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
+    background-color: #e7eaee;
+    border: 1px solid rgba(0, 0, 0, 0.3); }
+  filechooser placessidebar.sidebar scrollbar slider,
+  .nautilus-window placessidebar.sidebar scrollbar slider, .nemo-window .sidebar scrollbar slider, .caja-side-pane scrollbar slider {
+    background-color: rgba(231, 234, 238, 0.7); }
+    filechooser placessidebar.sidebar scrollbar slider:hover,
+    .nautilus-window placessidebar.sidebar scrollbar slider:hover, .nemo-window .sidebar scrollbar slider:hover, .caja-side-pane scrollbar slider:hover {
+      background-color: #f6f7f9; }
+    filechooser placessidebar.sidebar scrollbar slider:hover:active,
+    .nautilus-window placessidebar.sidebar scrollbar slider:hover:active, .nemo-window .sidebar scrollbar slider:hover:active, .caja-side-pane scrollbar slider:hover:active {
+      background-color: #5294E2; }
+    filechooser placessidebar.sidebar scrollbar slider:disabled,
+    .nautilus-window placessidebar.sidebar scrollbar slider:disabled, .nemo-window .sidebar scrollbar slider:disabled, .caja-side-pane scrollbar slider:disabled {
+      background-color: transparent; }
+  filechooser placessidebar.sidebar scrollbar trough,
+  .nautilus-window placessidebar.sidebar scrollbar trough, .nemo-window .sidebar scrollbar trough, .caja-side-pane scrollbar trough {
+    background-color: #2a2d37; }
 
 @define-color theme_fg_color #D3DAE3;
 @define-color theme_text_color #D3DAE3;
@@ -4129,6 +4210,7 @@ filechooser placessidebar.sidebar scrollbar trough,
 @define-color error_color #FC4138;
 @define-color success_color #73d216;
 @define-color placeholder_text_color #A8A8A8;
+@define-color link_color #a9caf1;
 @define-color content_view_bg #404552;
 @define-color wm_title alpha(#cfdae7, 0.8);
 @define-color wm_unfocused_title alpha(#cfdae7, 0.5);
diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css
index c5b9b72..f515b6a 100644
--- a/common/gtk-3.0/3.20/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.20/gtk-solid-darker.css
@@ -1508,7 +1508,7 @@ menubar,
     color: rgba(207, 218, 231, 0.5); }
   menubar > menuitem,
   .menubar > menuitem {
-    padding: 6px 8px;
+    padding: 4px 8px;
     border: solid transparent;
     border-width: 0; }
     menubar > menuitem:hover,
@@ -1539,11 +1539,11 @@ menu,
   .menu separator {
     margin: 2px 0;
     background-color: #ffffff; }
-  menu .separator,
-  .csd menu .separator,
-  .menu .separator,
+  menu .separator:not(label),
+  .csd menu .separator:not(label),
+  .menu .separator:not(label),
   .csd
-  .menu .separator {
+  .menu .separator:not(label) {
     color: #ffffff; }
   menu menuitem,
   .menu menuitem {
@@ -3103,13 +3103,14 @@ terminal-window notebook > header.top {
 .nautilus-canvas-item {
   border-radius: 2px; }
 
-.nautilus-desktop.nautilus-canvas-item, .nemo-desktop.nemo-canvas-item {
+.nautilus-desktop.nautilus-canvas-item, .nemo-desktop.nemo-canvas-item, .caja-desktop {
   color: #ffffff;
   text-shadow: 1px 1px rgba(0, 0, 0, 0.6); }
-  .nautilus-desktop.nautilus-canvas-item:active, .nemo-desktop.nemo-canvas-item:active {
+  .nautilus-desktop.nautilus-canvas-item:active, .nemo-desktop.nemo-canvas-item:active, .caja-desktop:active {
     color: #5c616c; }
-  .nautilus-desktop.nautilus-canvas-item:selected, .nemo-desktop.nemo-canvas-item:selected {
-    color: #ffffff; }
+  .nautilus-desktop.nautilus-canvas-item:selected, .nemo-desktop.nemo-canvas-item:selected, .caja-desktop:selected {
+    color: #ffffff;
+    text-shadow: none; }
 
 .nautilus-canvas-item.dim-label, label.nautilus-canvas-item.separator,
 popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-canvas-item.subtitle, .titlebar:not(headerbar) .nautilus-canvas-item.subtitle,
@@ -3143,9 +3144,6 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
     background-color: #edeef0;
     border-color: #d0d5da; }
 
-.nautilus-list-view .view, .nautilus-list-view iconview {
-  border-bottom: 1px solid #dcdfe3; }
-
 @keyframes needs_attention_keyframes {
   0% {
     color: rgba(207, 218, 231, 0.8);
@@ -3208,6 +3206,15 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
   box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); }
 
+.caja-notebook {
+  border-top: 1px solid #dcdfe3; }
+
+.caja-side-pane .frame {
+  border-width: 1px 0 0; }
+
+.caja-notebook .frame {
+  border-width: 0 0 1px; }
+
 .open-document-selector-treeview.view, iconview.open-document-selector-treeview {
   padding: 3px 6px 3px 6px;
   border-color: #ffffff; }
@@ -3387,22 +3394,79 @@ button.documents-favorite:active:hover {
 .tr-workarea overshoot {
   border-color: transparent; }
 
+.gnome-panel-menu-bar, .gnome-panel-menu-bar menubar,
+.mate-panel-menu-bar,
+.mate-panel-menu-bar menubar {
+  background-color: #2b2e37; }
+
+.gnome-panel-menu-bar menubar,
+.gnome-panel-menu-bar #PanelApplet label,
+.gnome-panel-menu-bar #PanelApplet image,
+.mate-panel-menu-bar menubar,
+.mate-panel-menu-bar #PanelApplet label,
+.mate-panel-menu-bar #PanelApplet image {
+  color: #BAC3CF; }
+
+.gnome-panel-menu-bar button label, .gnome-panel-menu-bar button image,
+.gnome-panel-menu-bar #tasklist-button label,
+.gnome-panel-menu-bar #tasklist-button image,
+.mate-panel-menu-bar button label,
+.mate-panel-menu-bar button image,
+.mate-panel-menu-bar #tasklist-button label,
+.mate-panel-menu-bar #tasklist-button image {
+  color: inherit; }
+
+.gnome-panel-menu-bar .wnck-pager,
+.mate-panel-menu-bar .wnck-pager {
+  color: #5d6268;
+  background-color: #14161b; }
+  .gnome-panel-menu-bar .wnck-pager:hover,
+  .mate-panel-menu-bar .wnck-pager:hover {
+    background-color: #363a46; }
+  .gnome-panel-menu-bar .wnck-pager:selected,
+  .mate-panel-menu-bar .wnck-pager:selected {
+    color: #a9caf1;
+    background-color: #5294E2; }
+
+.gnome-panel-menu-bar na-tray-applet,
+.mate-panel-menu-bar na-tray-applet {
+  -NaTrayApplet-icon-padding: 0;
+  -NaTrayApplet-icon-size: 16px; }
+
 .xfce4-panel.panel {
   background-color: #2b2e37;
   text-shadow: none;
   -gtk-icon-shadow: none; }
-  .xfce4-panel.panel button.flat, .xfce4-panel.panel button.sidebar-button {
-    color: #BAC3CF;
-    background-color: rgba(43, 46, 55, 0);
-    border-radius: 0;
-    border: none; }
-    .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.sidebar-button:hover {
-      border: none;
-      background-color: #414654; }
-    .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.sidebar-button:active, .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.sidebar-button:checked {
-      color: #ffffff;
-      border: none;
-      background-color: #5294E2; }
+
+#tasklist-button {
+  color: rgba(186, 195, 207, 0.8);
+  border-radius: 0;
+  border: none;
+  background-color: rgba(43, 46, 55, 0); }
+  #tasklist-button:hover {
+    color: #d8dde4;
+    background-color: rgba(0, 0, 0, 0.17); }
+  #tasklist-button:checked {
+    color: #ffffff;
+    background-color: rgba(0, 0, 0, 0.25);
+    box-shadow: inset 0 -2px #5294E2; }
+
+.gnome-panel-menu-bar button:not(#tasklist-button),
+.mate-panel-menu-bar button:not(#tasklist-button), .xfce4-panel.panel button.flat, .xfce4-panel.panel button.sidebar-button {
+  color: #BAC3CF;
+  border-radius: 0;
+  border: none;
+  background-color: rgba(43, 46, 55, 0); }
+  .gnome-panel-menu-bar button:hover:not(#tasklist-button),
+  .mate-panel-menu-bar button:hover:not(#tasklist-button), .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.sidebar-button:hover {
+    border: none;
+    background-color: #414654; }
+  .gnome-panel-menu-bar button:active:not(#tasklist-button),
+  .mate-panel-menu-bar button:active:not(#tasklist-button), .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.sidebar-button:active, .gnome-panel-menu-bar button:checked:not(#tasklist-button),
+  .mate-panel-menu-bar button:checked:not(#tasklist-button), .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.sidebar-button:checked {
+    color: #ffffff;
+    border: none;
+    background-color: #5294E2; }
 
 .nautilus-window .floating-bar {
   padding: 1px;
@@ -4018,6 +4082,23 @@ filechooser.maximized placessidebar.sidebar,
   .nemo-window .sidebar separator {
     background-color: transparent; }
 
+.caja-side-pane,
+.caja-side-pane > notebook > stack > widget > box,
+.caja-side-pane text,
+.caja-side-pane treeview {
+  color: #BAC3CF;
+  caret-color: #BAC3CF;
+  background-color: #353945; }
+
+.caja-side-pane > box button:not(:active):not(:checked) {
+  color: #BAC3CF; }
+
+.caja-side-pane .frame {
+  border-color: #2a2d37; }
+
+.caja-side-pane junction {
+  background-color: #2a2d37; }
+
 filechooser actionbar {
   color: #BAC3CF;
   background-color: #353945;
@@ -4053,7 +4134,7 @@ filechooser actionbar button {
   outline-color: rgba(186, 195, 207, 0.3);
   border-color: rgba(26, 28, 34, 0.4);
   background-color: rgba(102, 109, 132, 0.4); }
-  filechooser actionbar button:hover {
+  .caja-side-pane > box button:hover:not(:active), filechooser actionbar button:hover {
     color: #BAC3CF;
     outline-color: rgba(186, 195, 207, 0.3);
     border-color: rgba(26, 28, 34, 0.4);
@@ -4083,28 +4164,28 @@ filechooser actionbar entry {
     color: rgba(186, 195, 207, 0.55);
     background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.25)); }
 
-filechooser placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider,
-.nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .nemo-window .sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
-  background-color: #e7eaee;
-  border: 1px solid rgba(0, 0, 0, 0.3); }
-
-filechooser placessidebar.sidebar scrollbar slider,
-.nautilus-window placessidebar.sidebar scrollbar slider, .nemo-window .sidebar scrollbar slider {
-  background-color: rgba(231, 234, 238, 0.7); }
-  filechooser placessidebar.sidebar scrollbar slider:hover,
-  .nautilus-window placessidebar.sidebar scrollbar slider:hover, .nemo-window .sidebar scrollbar slider:hover {
-    background-color: #f6f7f9; }
-  filechooser placessidebar.sidebar scrollbar slider:hover:active,
-  .nautilus-window placessidebar.sidebar scrollbar slider:hover:active, .nemo-window .sidebar scrollbar slider:hover:active {
-    background-color: #5294E2; }
-  filechooser placessidebar.sidebar scrollbar slider:disabled,
-  .nautilus-window placessidebar.sidebar scrollbar slider:disabled, .nemo-window .sidebar scrollbar slider:disabled {
-    background-color: transparent; }
-
-filechooser placessidebar.sidebar scrollbar trough,
-.nautilus-window placessidebar.sidebar scrollbar trough, .nemo-window .sidebar scrollbar trough {
-  background-color: rgba(0, 0, 0, 0.2);
-  border: none; }
+filechooser placessidebar.sidebar scrollbar,
+.nautilus-window placessidebar.sidebar scrollbar, .nemo-window .sidebar scrollbar, .caja-side-pane scrollbar {
+  border-color: #2a2d37; }
+  filechooser placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider,
+  .nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .nemo-window .sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .caja-side-pane scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
+    background-color: #e7eaee;
+    border: 1px solid rgba(0, 0, 0, 0.3); }
+  filechooser placessidebar.sidebar scrollbar slider,
+  .nautilus-window placessidebar.sidebar scrollbar slider, .nemo-window .sidebar scrollbar slider, .caja-side-pane scrollbar slider {
+    background-color: rgba(231, 234, 238, 0.7); }
+    filechooser placessidebar.sidebar scrollbar slider:hover,
+    .nautilus-window placessidebar.sidebar scrollbar slider:hover, .nemo-window .sidebar scrollbar slider:hover, .caja-side-pane scrollbar slider:hover {
+      background-color: #f6f7f9; }
+    filechooser placessidebar.sidebar scrollbar slider:hover:active,
+    .nautilus-window placessidebar.sidebar scrollbar slider:hover:active, .nemo-window .sidebar scrollbar slider:hover:active, .caja-side-pane scrollbar slider:hover:active {
+      background-color: #5294E2; }
+    filechooser placessidebar.sidebar scrollbar slider:disabled,
+    .nautilus-window placessidebar.sidebar scrollbar slider:disabled, .nemo-window .sidebar scrollbar slider:disabled, .caja-side-pane scrollbar slider:disabled {
+      background-color: transparent; }
+  filechooser placessidebar.sidebar scrollbar trough,
+  .nautilus-window placessidebar.sidebar scrollbar trough, .nemo-window .sidebar scrollbar trough, .caja-side-pane scrollbar trough {
+    background-color: #2a2d37; }
 
 @define-color theme_fg_color #5c616c;
 @define-color theme_text_color #5c616c;
@@ -4131,6 +4212,7 @@ filechooser placessidebar.sidebar scrollbar trough,
 @define-color error_color #FC4138;
 @define-color success_color #73d216;
 @define-color placeholder_text_color #A8A8A8;
+@define-color link_color #2679db;
 @define-color content_view_bg #ffffff;
 @define-color wm_title alpha(#cfdae7, 0.8);
 @define-color wm_unfocused_title alpha(#cfdae7, 0.5);
diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css
index 4edd832..87ce4d3 100644
--- a/common/gtk-3.0/3.20/gtk-solid.css
+++ b/common/gtk-3.0/3.20/gtk-solid.css
@@ -1512,7 +1512,7 @@ menubar,
     color: rgba(82, 93, 118, 0.5); }
   menubar > menuitem,
   .menubar > menuitem {
-    padding: 6px 8px;
+    padding: 4px 8px;
     border: solid transparent;
     border-width: 0; }
     menubar > menuitem:hover,
@@ -1543,11 +1543,11 @@ menu,
   .menu separator {
     margin: 2px 0;
     background-color: #ffffff; }
-  menu .separator,
-  .csd menu .separator,
-  .menu .separator,
+  menu .separator:not(label),
+  .csd menu .separator:not(label),
+  .menu .separator:not(label),
   .csd
-  .menu .separator {
+  .menu .separator:not(label) {
     color: #ffffff; }
   menu menuitem,
   .menu menuitem {
@@ -3107,13 +3107,14 @@ terminal-window notebook > header.top {
 .nautilus-canvas-item {
   border-radius: 2px; }
 
-.nautilus-desktop.nautilus-canvas-item, .nemo-desktop.nemo-canvas-item {
+.nautilus-desktop.nautilus-canvas-item, .nemo-desktop.nemo-canvas-item, .caja-desktop {
   color: #ffffff;
   text-shadow: 1px 1px rgba(0, 0, 0, 0.6); }
-  .nautilus-desktop.nautilus-canvas-item:active, .nemo-desktop.nemo-canvas-item:active {
+  .nautilus-desktop.nautilus-canvas-item:active, .nemo-desktop.nemo-canvas-item:active, .caja-desktop:active {
     color: #5c616c; }
-  .nautilus-desktop.nautilus-canvas-item:selected, .nemo-desktop.nemo-canvas-item:selected {
-    color: #ffffff; }
+  .nautilus-desktop.nautilus-canvas-item:selected, .nemo-desktop.nemo-canvas-item:selected, .caja-desktop:selected {
+    color: #ffffff;
+    text-shadow: none; }
 
 .nautilus-canvas-item.dim-label, label.nautilus-canvas-item.separator,
 popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-canvas-item.subtitle, .titlebar:not(headerbar) .nautilus-canvas-item.subtitle,
@@ -3147,9 +3148,6 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
     background-color: #edeef0;
     border-color: #d0d5da; }
 
-.nautilus-list-view .view, .nautilus-list-view iconview {
-  border-bottom: 1px solid #dcdfe3; }
-
 @keyframes needs_attention_keyframes {
   0% {
     color: rgba(82, 93, 118, 0.8);
@@ -3212,6 +3210,15 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
   box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); }
 
+.caja-notebook {
+  border-top: 1px solid #dcdfe3; }
+
+.caja-side-pane .frame {
+  border-width: 1px 0 0; }
+
+.caja-notebook .frame {
+  border-width: 0 0 1px; }
+
 .open-document-selector-treeview.view, iconview.open-document-selector-treeview {
   padding: 3px 6px 3px 6px;
   border-color: #ffffff; }
@@ -3391,22 +3398,79 @@ button.documents-favorite:active:hover {
 .tr-workarea overshoot {
   border-color: transparent; }
 
+.gnome-panel-menu-bar, .gnome-panel-menu-bar menubar,
+.mate-panel-menu-bar,
+.mate-panel-menu-bar menubar {
+  background-color: #2b2e37; }
+
+.gnome-panel-menu-bar menubar,
+.gnome-panel-menu-bar #PanelApplet label,
+.gnome-panel-menu-bar #PanelApplet image,
+.mate-panel-menu-bar menubar,
+.mate-panel-menu-bar #PanelApplet label,
+.mate-panel-menu-bar #PanelApplet image {
+  color: #BAC3CF; }
+
+.gnome-panel-menu-bar button label, .gnome-panel-menu-bar button image,
+.gnome-panel-menu-bar #tasklist-button label,
+.gnome-panel-menu-bar #tasklist-button image,
+.mate-panel-menu-bar button label,
+.mate-panel-menu-bar button image,
+.mate-panel-menu-bar #tasklist-button label,
+.mate-panel-menu-bar #tasklist-button image {
+  color: inherit; }
+
+.gnome-panel-menu-bar .wnck-pager,
+.mate-panel-menu-bar .wnck-pager {
+  color: #5d6268;
+  background-color: #14161b; }
+  .gnome-panel-menu-bar .wnck-pager:hover,
+  .mate-panel-menu-bar .wnck-pager:hover {
+    background-color: #363a46; }
+  .gnome-panel-menu-bar .wnck-pager:selected,
+  .mate-panel-menu-bar .wnck-pager:selected {
+    color: #a9caf1;
+    background-color: #5294E2; }
+
+.gnome-panel-menu-bar na-tray-applet,
+.mate-panel-menu-bar na-tray-applet {
+  -NaTrayApplet-icon-padding: 0;
+  -NaTrayApplet-icon-size: 16px; }
+
 .xfce4-panel.panel {
   background-color: #2b2e37;
   text-shadow: none;
   -gtk-icon-shadow: none; }
-  .xfce4-panel.panel button.flat, .xfce4-panel.panel button.sidebar-button {
-    color: #BAC3CF;
-    background-color: rgba(43, 46, 55, 0);
-    border-radius: 0;
-    border: none; }
-    .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.sidebar-button:hover {
-      border: none;
-      background-color: #414654; }
-    .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.sidebar-button:active, .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.sidebar-button:checked {
-      color: #ffffff;
-      border: none;
-      background-color: #5294E2; }
+
+#tasklist-button {
+  color: rgba(186, 195, 207, 0.8);
+  border-radius: 0;
+  border: none;
+  background-color: rgba(43, 46, 55, 0); }
+  #tasklist-button:hover {
+    color: #d8dde4;
+    background-color: rgba(0, 0, 0, 0.17); }
+  #tasklist-button:checked {
+    color: #ffffff;
+    background-color: rgba(0, 0, 0, 0.25);
+    box-shadow: inset 0 -2px #5294E2; }
+
+.gnome-panel-menu-bar button:not(#tasklist-button),
+.mate-panel-menu-bar button:not(#tasklist-button), .xfce4-panel.panel button.flat, .xfce4-panel.panel button.sidebar-button {
+  color: #BAC3CF;
+  border-radius: 0;
+  border: none;
+  background-color: rgba(43, 46, 55, 0); }
+  .gnome-panel-menu-bar button:hover:not(#tasklist-button),
+  .mate-panel-menu-bar button:hover:not(#tasklist-button), .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.sidebar-button:hover {
+    border: none;
+    background-color: #414654; }
+  .gnome-panel-menu-bar button:active:not(#tasklist-button),
+  .mate-panel-menu-bar button:active:not(#tasklist-button), .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.sidebar-button:active, .gnome-panel-menu-bar button:checked:not(#tasklist-button),
+  .mate-panel-menu-bar button:checked:not(#tasklist-button), .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.sidebar-button:checked {
+    color: #ffffff;
+    border: none;
+    background-color: #5294E2; }
 
 .nautilus-window .floating-bar {
   padding: 1px;
@@ -4022,6 +4086,23 @@ filechooser.maximized placessidebar.sidebar,
   .nemo-window .sidebar separator {
     background-color: transparent; }
 
+.caja-side-pane,
+.caja-side-pane > notebook > stack > widget > box,
+.caja-side-pane text,
+.caja-side-pane treeview {
+  color: #BAC3CF;
+  caret-color: #BAC3CF;
+  background-color: #353945; }
+
+.caja-side-pane > box button:not(:active):not(:checked) {
+  color: #BAC3CF; }
+
+.caja-side-pane .frame {
+  border-color: #2a2d37; }
+
+.caja-side-pane junction {
+  background-color: #2a2d37; }
+
 filechooser actionbar {
   color: #BAC3CF;
   background-color: #353945;
@@ -4057,7 +4138,7 @@ filechooser actionbar button {
   outline-color: rgba(186, 195, 207, 0.3);
   border-color: rgba(26, 28, 34, 0.4);
   background-color: rgba(102, 109, 132, 0.4); }
-  filechooser actionbar button:hover {
+  .caja-side-pane > box button:hover:not(:active), filechooser actionbar button:hover {
     color: #BAC3CF;
     outline-color: rgba(186, 195, 207, 0.3);
     border-color: rgba(26, 28, 34, 0.4);
@@ -4087,28 +4168,28 @@ filechooser actionbar entry {
     color: rgba(186, 195, 207, 0.55);
     background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.25)); }
 
-filechooser placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider,
-.nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .nemo-window .sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
-  background-color: #e7eaee;
-  border: 1px solid rgba(0, 0, 0, 0.3); }
-
-filechooser placessidebar.sidebar scrollbar slider,
-.nautilus-window placessidebar.sidebar scrollbar slider, .nemo-window .sidebar scrollbar slider {
-  background-color: rgba(231, 234, 238, 0.7); }
-  filechooser placessidebar.sidebar scrollbar slider:hover,
-  .nautilus-window placessidebar.sidebar scrollbar slider:hover, .nemo-window .sidebar scrollbar slider:hover {
-    background-color: #f6f7f9; }
-  filechooser placessidebar.sidebar scrollbar slider:hover:active,
-  .nautilus-window placessidebar.sidebar scrollbar slider:hover:active, .nemo-window .sidebar scrollbar slider:hover:active {
-    background-color: #5294E2; }
-  filechooser placessidebar.sidebar scrollbar slider:disabled,
-  .nautilus-window placessidebar.sidebar scrollbar slider:disabled, .nemo-window .sidebar scrollbar slider:disabled {
-    background-color: transparent; }
-
-filechooser placessidebar.sidebar scrollbar trough,
-.nautilus-window placessidebar.sidebar scrollbar trough, .nemo-window .sidebar scrollbar trough {
-  background-color: rgba(0, 0, 0, 0.2);
-  border: none; }
+filechooser placessidebar.sidebar scrollbar,
+.nautilus-window placessidebar.sidebar scrollbar, .nemo-window .sidebar scrollbar, .caja-side-pane scrollbar {
+  border-color: #2a2d37; }
+  filechooser placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider,
+  .nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .nemo-window .sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .caja-side-pane scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
+    background-color: #e7eaee;
+    border: 1px solid rgba(0, 0, 0, 0.3); }
+  filechooser placessidebar.sidebar scrollbar slider,
+  .nautilus-window placessidebar.sidebar scrollbar slider, .nemo-window .sidebar scrollbar slider, .caja-side-pane scrollbar slider {
+    background-color: rgba(231, 234, 238, 0.7); }
+    filechooser placessidebar.sidebar scrollbar slider:hover,
+    .nautilus-window placessidebar.sidebar scrollbar slider:hover, .nemo-window .sidebar scrollbar slider:hover, .caja-side-pane scrollbar slider:hover {
+      background-color: #f6f7f9; }
+    filechooser placessidebar.sidebar scrollbar slider:hover:active,
+    .nautilus-window placessidebar.sidebar scrollbar slider:hover:active, .nemo-window .sidebar scrollbar slider:hover:active, .caja-side-pane scrollbar slider:hover:active {
+      background-color: #5294E2; }
+    filechooser placessidebar.sidebar scrollbar slider:disabled,
+    .nautilus-window placessidebar.sidebar scrollbar slider:disabled, .nemo-window .sidebar scrollbar slider:disabled, .caja-side-pane scrollbar slider:disabled {
+      background-color: transparent; }
+  filechooser placessidebar.sidebar scrollbar trough,
+  .nautilus-window placessidebar.sidebar scrollbar trough, .nemo-window .sidebar scrollbar trough, .caja-side-pane scrollbar trough {
+    background-color: #2a2d37; }
 
 @define-color theme_fg_color #5c616c;
 @define-color theme_text_color #5c616c;
@@ -4135,6 +4216,7 @@ filechooser placessidebar.sidebar scrollbar trough,
 @define-color error_color #FC4138;
 @define-color success_color #73d216;
 @define-color placeholder_text_color #A8A8A8;
+@define-color link_color #2679db;
 @define-color content_view_bg #ffffff;
 @define-color wm_title alpha(#525d76, 0.8);
 @define-color wm_unfocused_title alpha(#525d76, 0.5);
diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css
index 0ff3d6b..f20d7d6 100644
--- a/common/gtk-3.0/3.20/gtk.css
+++ b/common/gtk-3.0/3.20/gtk.css
@@ -1512,7 +1512,7 @@ menubar,
     color: rgba(82, 93, 118, 0.5); }
   menubar > menuitem,
   .menubar > menuitem {
-    padding: 6px 8px;
+    padding: 4px 8px;
     border: solid transparent;
     border-width: 0; }
     menubar > menuitem:hover,
@@ -1543,11 +1543,11 @@ menu,
   .menu separator {
     margin: 2px 0;
     background-color: #ffffff; }
-  menu .separator,
-  .csd menu .separator,
-  .menu .separator,
+  menu .separator:not(label),
+  .csd menu .separator:not(label),
+  .menu .separator:not(label),
   .csd
-  .menu .separator {
+  .menu .separator:not(label) {
     color: #ffffff; }
   menu menuitem,
   .menu menuitem {
@@ -3107,13 +3107,14 @@ terminal-window notebook > header.top {
 .nautilus-canvas-item {
   border-radius: 2px; }
 
-.nautilus-desktop.nautilus-canvas-item, .nemo-desktop.nemo-canvas-item {
+.nautilus-desktop.nautilus-canvas-item, .nemo-desktop.nemo-canvas-item, .caja-desktop {
   color: #ffffff;
   text-shadow: 1px 1px rgba(0, 0, 0, 0.6); }
-  .nautilus-desktop.nautilus-canvas-item:active, .nemo-desktop.nemo-canvas-item:active {
+  .nautilus-desktop.nautilus-canvas-item:active, .nemo-desktop.nemo-canvas-item:active, .caja-desktop:active {
     color: #5c616c; }
-  .nautilus-desktop.nautilus-canvas-item:selected, .nemo-desktop.nemo-canvas-item:selected {
-    color: #ffffff; }
+  .nautilus-desktop.nautilus-canvas-item:selected, .nemo-desktop.nemo-canvas-item:selected, .caja-desktop:selected {
+    color: #ffffff;
+    text-shadow: none; }
 
 .nautilus-canvas-item.dim-label, label.nautilus-canvas-item.separator,
 popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-canvas-item.subtitle, .titlebar:not(headerbar) .nautilus-canvas-item.subtitle,
@@ -3147,9 +3148,6 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
     background-color: #edeef0;
     border-color: #d0d5da; }
 
-.nautilus-list-view .view, .nautilus-list-view iconview {
-  border-bottom: 1px solid #dcdfe3; }
-
 @keyframes needs_attention_keyframes {
   0% {
     color: rgba(82, 93, 118, 0.8);
@@ -3212,6 +3210,15 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
   box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); }
 
+.caja-notebook {
+  border-top: 1px solid #dcdfe3; }
+
+.caja-side-pane .frame {
+  border-width: 1px 0 0; }
+
+.caja-notebook .frame {
+  border-width: 0 0 1px; }
+
 .open-document-selector-treeview.view, iconview.open-document-selector-treeview {
   padding: 3px 6px 3px 6px;
   border-color: #ffffff; }
@@ -3391,22 +3398,79 @@ button.documents-favorite:active:hover {
 .tr-workarea overshoot {
   border-color: transparent; }
 
+.gnome-panel-menu-bar, .gnome-panel-menu-bar menubar,
+.mate-panel-menu-bar,
+.mate-panel-menu-bar menubar {
+  background-color: rgba(43, 46, 55, 0.95); }
+
+.gnome-panel-menu-bar menubar,
+.gnome-panel-menu-bar #PanelApplet label,
+.gnome-panel-menu-bar #PanelApplet image,
+.mate-panel-menu-bar menubar,
+.mate-panel-menu-bar #PanelApplet label,
+.mate-panel-menu-bar #PanelApplet image {
+  color: #BAC3CF; }
+
+.gnome-panel-menu-bar button label, .gnome-panel-menu-bar button image,
+.gnome-panel-menu-bar #tasklist-button label,
+.gnome-panel-menu-bar #tasklist-button image,
+.mate-panel-menu-bar button label,
+.mate-panel-menu-bar button image,
+.mate-panel-menu-bar #tasklist-button label,
+.mate-panel-menu-bar #tasklist-button image {
+  color: inherit; }
+
+.gnome-panel-menu-bar .wnck-pager,
+.mate-panel-menu-bar .wnck-pager {
+  color: #5d6268;
+  background-color: rgba(20, 22, 27, 0.95); }
+  .gnome-panel-menu-bar .wnck-pager:hover,
+  .mate-panel-menu-bar .wnck-pager:hover {
+    background-color: rgba(54, 58, 70, 0.95); }
+  .gnome-panel-menu-bar .wnck-pager:selected,
+  .mate-panel-menu-bar .wnck-pager:selected {
+    color: #a9caf1;
+    background-color: #5294E2; }
+
+.gnome-panel-menu-bar na-tray-applet,
+.mate-panel-menu-bar na-tray-applet {
+  -NaTrayApplet-icon-padding: 0;
+  -NaTrayApplet-icon-size: 16px; }
+
 .xfce4-panel.panel {
   background-color: rgba(43, 46, 55, 0.95);
   text-shadow: none;
   -gtk-icon-shadow: none; }
-  .xfce4-panel.panel button.flat, .xfce4-panel.panel button.sidebar-button {
-    color: #BAC3CF;
-    background-color: rgba(43, 46, 55, 0);
-    border-radius: 0;
-    border: none; }
-    .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.sidebar-button:hover {
-      border: none;
-      background-color: rgba(65, 70, 84, 0.95); }
-    .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.sidebar-button:active, .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.sidebar-button:checked {
-      color: #ffffff;
-      border: none;
-      background-color: #5294E2; }
+
+#tasklist-button {
+  color: rgba(186, 195, 207, 0.8);
+  border-radius: 0;
+  border: none;
+  background-color: rgba(43, 46, 55, 0); }
+  #tasklist-button:hover {
+    color: #d8dde4;
+    background-color: rgba(0, 0, 0, 0.17); }
+  #tasklist-button:checked {
+    color: #ffffff;
+    background-color: rgba(0, 0, 0, 0.25);
+    box-shadow: inset 0 -2px #5294E2; }
+
+.gnome-panel-menu-bar button:not(#tasklist-button),
+.mate-panel-menu-bar button:not(#tasklist-button), .xfce4-panel.panel button.flat, .xfce4-panel.panel button.sidebar-button {
+  color: #BAC3CF;
+  border-radius: 0;
+  border: none;
+  background-color: rgba(43, 46, 55, 0); }
+  .gnome-panel-menu-bar button:hover:not(#tasklist-button),
+  .mate-panel-menu-bar button:hover:not(#tasklist-button), .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.sidebar-button:hover {
+    border: none;
+    background-color: rgba(65, 70, 84, 0.95); }
+  .gnome-panel-menu-bar button:active:not(#tasklist-button),
+  .mate-panel-menu-bar button:active:not(#tasklist-button), .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.sidebar-button:active, .gnome-panel-menu-bar button:checked:not(#tasklist-button),
+  .mate-panel-menu-bar button:checked:not(#tasklist-button), .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.sidebar-button:checked {
+    color: #ffffff;
+    border: none;
+    background-color: #5294E2; }
 
 .nautilus-window .floating-bar {
   padding: 1px;
@@ -4022,6 +4086,23 @@ filechooser.maximized placessidebar.sidebar,
   .nemo-window .sidebar separator {
     background-color: transparent; }
 
+.caja-side-pane,
+.caja-side-pane > notebook > stack > widget > box,
+.caja-side-pane text,
+.caja-side-pane treeview {
+  color: #BAC3CF;
+  caret-color: #BAC3CF;
+  background-color: #353945; }
+
+.caja-side-pane > box button:not(:active):not(:checked) {
+  color: #BAC3CF; }
+
+.caja-side-pane .frame {
+  border-color: #2a2d37; }
+
+.caja-side-pane junction {
+  background-color: rgba(42, 45, 55, 0.95); }
+
 filechooser actionbar {
   color: #BAC3CF;
   background-color: rgba(53, 57, 69, 0.95);
@@ -4057,7 +4138,7 @@ filechooser actionbar button {
   outline-color: rgba(186, 195, 207, 0.3);
   border-color: rgba(26, 28, 34, 0.35);
   background-color: rgba(102, 109, 132, 0.35); }
-  filechooser actionbar button:hover {
+  .caja-side-pane > box button:hover:not(:active), filechooser actionbar button:hover {
     color: #BAC3CF;
     outline-color: rgba(186, 195, 207, 0.3);
     border-color: rgba(26, 28, 34, 0.35);
@@ -4087,28 +4168,28 @@ filechooser actionbar entry {
     color: rgba(186, 195, 207, 0.55);
     background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.2)); }
 
-filechooser placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider,
-.nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .nemo-window .sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
-  background-color: #e7eaee;
-  border: 1px solid rgba(0, 0, 0, 0.3); }
-
-filechooser placessidebar.sidebar scrollbar slider,
-.nautilus-window placessidebar.sidebar scrollbar slider, .nemo-window .sidebar scrollbar slider {
-  background-color: rgba(231, 234, 238, 0.7); }
-  filechooser placessidebar.sidebar scrollbar slider:hover,
-  .nautilus-window placessidebar.sidebar scrollbar slider:hover, .nemo-window .sidebar scrollbar slider:hover {
-    background-color: #f6f7f9; }
-  filechooser placessidebar.sidebar scrollbar slider:hover:active,
-  .nautilus-window placessidebar.sidebar scrollbar slider:hover:active, .nemo-window .sidebar scrollbar slider:hover:active {
-    background-color: #5294E2; }
-  filechooser placessidebar.sidebar scrollbar slider:disabled,
-  .nautilus-window placessidebar.sidebar scrollbar slider:disabled, .nemo-window .sidebar scrollbar slider:disabled {
-    background-color: transparent; }
-
-filechooser placessidebar.sidebar scrollbar trough,
-.nautilus-window placessidebar.sidebar scrollbar trough, .nemo-window .sidebar scrollbar trough {
-  background-color: rgba(0, 0, 0, 0.2);
-  border: none; }
+filechooser placessidebar.sidebar scrollbar,
+.nautilus-window placessidebar.sidebar scrollbar, .nemo-window .sidebar scrollbar, .caja-side-pane scrollbar {
+  border-color: rgba(42, 45, 55, 0.95); }
+  filechooser placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider,
+  .nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .nemo-window .sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .caja-side-pane scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
+    background-color: #e7eaee;
+    border: 1px solid rgba(0, 0, 0, 0.3); }
+  filechooser placessidebar.sidebar scrollbar slider,
+  .nautilus-window placessidebar.sidebar scrollbar slider, .nemo-window .sidebar scrollbar slider, .caja-side-pane scrollbar slider {
+    background-color: rgba(231, 234, 238, 0.7); }
+    filechooser placessidebar.sidebar scrollbar slider:hover,
+    .nautilus-window placessidebar.sidebar scrollbar slider:hover, .nemo-window .sidebar scrollbar slider:hover, .caja-side-pane scrollbar slider:hover {
+      background-color: #f6f7f9; }
+    filechooser placessidebar.sidebar scrollbar slider:hover:active,
+    .nautilus-window placessidebar.sidebar scrollbar slider:hover:active, .nemo-window .sidebar scrollbar slider:hover:active, .caja-side-pane scrollbar slider:hover:active {
+      background-color: #5294E2; }
+    filechooser placessidebar.sidebar scrollbar slider:disabled,
+    .nautilus-window placessidebar.sidebar scrollbar slider:disabled, .nemo-window .sidebar scrollbar slider:disabled, .caja-side-pane scrollbar slider:disabled {
+      background-color: transparent; }
+  filechooser placessidebar.sidebar scrollbar trough,
+  .nautilus-window placessidebar.sidebar scrollbar trough, .nemo-window .sidebar scrollbar trough, .caja-side-pane scrollbar trough {
+    background-color: rgba(42, 45, 55, 0.95); }
 
 @define-color theme_fg_color #5c616c;
 @define-color theme_text_color #5c616c;
@@ -4135,6 +4216,7 @@ filechooser placessidebar.sidebar scrollbar trough,
 @define-color error_color #FC4138;
 @define-color success_color #73d216;
 @define-color placeholder_text_color #A8A8A8;
+@define-color link_color #2679db;
 @define-color content_view_bg #ffffff;
 @define-color wm_title alpha(#525d76, 0.8);
 @define-color wm_unfocused_title alpha(#525d76, 0.5);
diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss
index c709235..5a6cb9d 100644
--- a/common/gtk-3.0/3.20/sass/_applications.scss
+++ b/common/gtk-3.0/3.20/sass/_applications.scss
@@ -39,7 +39,11 @@ terminal-window {
   text-shadow: 1px 1px transparentize(black, 0.4);
 
   &:active { color: $fg_color; }
-  &:selected { color: $selected_fg_color; }
+
+  &:selected {
+    color: $selected_fg_color;
+    text-shadow: none;
+  }
 }
 
 .nautilus-canvas-item.dim-label,
@@ -87,9 +91,6 @@ $disk_space_free: darken($bg_color, 3%);
   }
 }
 
-// View
-.nautilus-list-view .view { border-bottom: 1px solid $borders_color; }
-
 @keyframes needs_attention_keyframes {
     0% { @include button(header-hover); }
     100% { @include button(header-active) }
@@ -142,6 +143,15 @@ $disk_space_free: darken($bg_color, 3%);
   }
 }
 
+//
+// Caja
+//
+.caja-desktop { @extend .nautilus-desktop.nautilus-canvas-item; }
+
+.caja-notebook { border-top: 1px solid $borders_color; }
+.caja-side-pane .frame { border-width: 1px 0 0; }
+.caja-notebook .frame { border-width: 0 0 1px; }
+
 //
 // Gedit
 //
@@ -396,65 +406,46 @@ button.documents-favorite:active:hover {
 }
 
 //
-// Fallback Mode/Budgie Panel
+// Mate/Gnome Flashback Panel
 //
-//.gnome-panel-menu-bar,
-//PanelApplet > menubar,
-//PanelToplevel,
-//PanelWidget,
-//PanelAppletFrame,
-//PanelApplet {
-//  color: $panel_fg;
-//  background-image: linear-gradient(to bottom, $panel_bg);
-//}
-//
-//PanelApplet button, PanelApplet button:backdrop {
-//  padding: 4px;
-//  border: 2px solid transparent;
-//  border-radius: 0;
-//  background-image: none;
-//  background-color: transparent;
-//  color: $panel_fg;
-//}
-//
-//PanelApplet button:hover {
-//  color: lighten($panel_fg, 10%);
-//  background-color: transparentize(black, 0.83);
-//  border-color: transparentize(black, 0.83);
-//}
-//
-//PanelApplet button:active, PanelApplet button:active:backdrop,
-//PanelApplet button:checked, PanelApplet button:checked:backdrop {
-//  background-clip: padding-box;
-//  color: $selected_fg_color;
-//  background-color: transparentize(black, 0.75);
-//  border-radius: 0;
-//  border-color: transparentize(black, 0.75);
-//  box-shadow: inset 0 -2px $selected_bg_color;
-//}
-//
-//PanelApplet:hover {
-//  color: $selected_fg_color;
-//}
-//
-//PanelApplet:active,
-//PanelApplet:hover:active {
-//  color: $selected_bg_color;
-//}
-//
-//WnckPager {
-//  color: mix($panel_fg, black, 50%);
-//  &:selected { color: $selected_bg_color }
-//}
-//
-//NaTrayApplet {
-//  -NaTrayApplet-icon-padding: 12;
-//  -NaTrayApplet-icon-size: 16;
-//}
-//
-//ClockBox {
-//  color: $panel_fg;
-//}
+.gnome-panel-menu-bar,
+.mate-panel-menu-bar {
+
+  &, menubar { background-color: $panel_bg; }
+
+  menubar,
+  #PanelApplet label,
+  #PanelApplet image { color: $panel_fg; }
+
+  // Panel buttons
+  button:not(#tasklist-button) {
+    @extend %panelbutton;
+  }
+
+  button,
+  #tasklist-button {
+    label, image { color: inherit; }
+  }
+
+  .wnck-pager {
+    color: mix($panel_fg, black, 50%);
+    background-color: darken($panel_bg, 10%);
+
+    &:hover {
+      background-color: lighten($panel_bg, 5%);
+    }
+
+    &:selected {
+      color: lighten($selected_bg_color, 20%);
+      background-color: $selected_bg_color;
+    }
+  }
+
+  na-tray-applet {
+    -NaTrayApplet-icon-padding: 0;
+    -NaTrayApplet-icon-size: 16px;
+  }
+}
 
 // Xfce Panel
 .xfce4-panel.panel {
@@ -463,21 +454,41 @@ button.documents-favorite:active:hover {
   text-shadow: none;
   -gtk-icon-shadow: none;
 
-  button.flat {
-    color: $panel_fg;
-    background-color: transparentize($panel_bg, 1);
-    border-radius: 0;
-    border: none;
+  button.flat { @extend %panelbutton; }
+}
 
-    &:hover {
-      border: none;
-      background-color: lighten($panel_bg, 10%);
-    }
-    &:active, &:checked {
-      color: $selected_fg_color;
-      border: none;
-      background-color: $selected_bg_color;
-    }
+#tasklist-button {
+  color: transparentize($panel_fg, 0.2);
+  border-radius: 0;
+  border: none;
+  background-color: transparentize($panel_bg, 1);
+
+  &:hover {
+    color: lighten($panel_fg, 10%);
+    background-color: transparentize(black, 0.83);
+  }
+
+  &:checked {
+    color: $selected_fg_color;
+    background-color: transparentize(black, 0.75);
+    box-shadow: inset 0 -2px $selected_bg_color;
+  }
+}
+
+%panelbutton {
+  color: $panel_fg;
+  border-radius: 0;
+  border: none;
+  background-color: transparentize($panel_bg, 1);
+
+  &:hover {
+    border: none;
+    background-color: lighten($panel_bg, 10%);
+  }
+  &:active, &:checked {
+    color: $selected_fg_color;
+    border: none;
+    background-color: $selected_bg_color;
   }
 }
 
diff --git a/common/gtk-3.0/3.20/sass/_colors-public.scss b/common/gtk-3.0/3.20/sass/_colors-public.scss
index bada81a..7d0abba 100644
--- a/common/gtk-3.0/3.20/sass/_colors-public.scss
+++ b/common/gtk-3.0/3.20/sass/_colors-public.scss
@@ -28,6 +28,7 @@
 @define-color error_color #{"" + $error_color};
 @define-color success_color #{"" + $success_color};
 @define-color placeholder_text_color #{#A8A8A8};
+@define-color link_color #{"" + $link_color};
 
 @define-color content_view_bg #{"" + $base_color};
 
diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss
index 0b60153..8cf477d 100644
--- a/common/gtk-3.0/3.20/sass/_common.scss
+++ b/common/gtk-3.0/3.20/sass/_common.scss
@@ -1579,7 +1579,7 @@ menubar,
   }
 
   > menuitem {
-    padding: 6px 8px;
+    padding: 4px 8px;
     border: solid transparent;
     border-width: 0;
 
@@ -1616,8 +1616,9 @@ menu,
   }
 
   // Firefox workaround
-  .separator,
-  .csd & .separator { color: $_menu_bg; }
+  .separator:not(label),
+  .csd & .separator:not(label) { color: $_menu_bg; }
+  // Firefox workaround end
 
   menuitem {
     min-height: 16px;
diff --git a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss
index 27611ce..b154491 100644
--- a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss
+++ b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss
@@ -104,6 +104,28 @@ filechooser,
   }
 }
 
+.caja-side-pane {
+
+  &,
+  > notebook > stack > widget > box,
+  text,
+  treeview {
+    color: $dark_sidebar_fg;
+    caret-color: $dark_sidebar_fg;
+    background-color: opacify($dark_sidebar_bg, 1);
+  }
+
+  > box button {
+    &:not(:active):not(:checked) { color: $dark_sidebar_fg; }
+    &:hover:not(:active) { @extend %dark_sidebar_button:hover; }
+  }
+
+  .frame { border-color: darken(opacify($dark_sidebar_bg, 1), 5%); }
+
+  scrollbar { @extend %dark_sidebar_scrollbar; }
+  junction { background-color: darken($dark_sidebar_bg, 5%); }
+}
+
 filechooser {
 
   actionbar {
@@ -168,6 +190,8 @@ filechooser {
 
 %dark_sidebar_scrollbar {
 
+  border-color: darken($dark_sidebar_bg, 5%);
+
   &.overlay-indicator:not(.dragging):not(.hovering) slider {
     background-color: lighten($dark_sidebar_fg, 15%);
     border: 1px solid transparentize(black, 0.7);
@@ -184,7 +208,6 @@ filechooser {
     }
   }
   trough {
-    background-color: transparentize(black, 0.8);
-    border: none;
+    background-color: darken($dark_sidebar_bg, 5%);
   }
 }