some refactoring

21 files changed, 765 insertions, 1095 deletions

diff --git a/common/gtk-3.0/3.14/gtk-dark.css b/common/gtk-3.0/3.14/gtk-dark.css
index 706c975..e89322b 100644
--- a/common/gtk-3.0/3.14/gtk-dark.css
+++ b/common/gtk-3.0/3.14/gtk-dark.css
@@ -3024,22 +3024,17 @@ BirdieWidgetsTweetList * {
   background-image: none;
   background-color: transparent; }
 
-MarlinViewWindow GtkIconView.view:selected,
-MarlinViewWindow GtkIconView.view:selected:focus,
-MarlinViewWindow GtkIconView.view:selected:hover,
-MarlinViewWindow GtkIconView.view:selected:focus:hover {
-  background-color: transparent; }
-
-MarlinViewWindow FMListView,
-MarlinViewWindow FMColumnView {
-  outline-color: transparent; }
-
-MarlinViewWindow *:selected,
-MarlinViewWindow *:selected:focus {
+MarlinViewWindow *:selected, MarlinViewWindow *:selected:focus {
   color: #ffffff;
   background-color: #5294E2;
   outline-color: transparent; }
 
+MarlinViewWindow GtkIconView.view:selected, MarlinViewWindow GtkIconView.view:selected:focus, MarlinViewWindow GtkIconView.view:selected:hover, MarlinViewWindow GtkIconView.view:selected:focus:hover {
+  background-color: transparent; }
+
+MarlinViewWindow FMListView, MarlinViewWindow FMColumnView {
+  outline-color: transparent; }
+
 .marlin-pathbar.pathbar {
   border-radius: 3px;
   padding-left: 4px;
@@ -3075,55 +3070,44 @@ MarlinViewWindow *:selected:focus {
   font-weight: bold;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
-
-.panel-shadow {
-  background-image: none;
-  background-color: transparent; }
-
-.panel .menu {
-  box-shadow: none; }
-
-.panel .menu .menuitem {
-  font-weight: normal;
-  text-shadow: none;
-  icon-shadow: none; }
-
-.panel .menubar > .menuitem {
-  padding: 3px 6px; }
-
-.panel .menubar > .menuitem:hover {
-  background-color: transparent; }
-
-.panel .window-frame.menu.csd,
-.panel .window-frame.popup.csd {
-  box-shadow: none; }
-
-.panel .menu .window-frame.menu.csd,
-.panel .menu .window-frame.popup.csd {
-  box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); }
+  .panel-shadow {
+    background-image: none;
+    background-color: transparent; }
+  .panel .menu {
+    box-shadow: none; }
+    .panel .menu .menuitem {
+      font-weight: normal;
+      text-shadow: none;
+      icon-shadow: none; }
+    .panel .menu .window-frame.menu.csd,
+    .panel .menu .window-frame.popup.csd {
+      box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); }
+  .panel .menubar > .menuitem {
+    padding: 3px 6px; }
+    .panel .menubar > .menuitem:hover {
+      background-color: transparent; }
+  .panel .window-frame.menu.csd,
+  .panel .window-frame.popup.csd {
+    box-shadow: none; }
 
 .composited-indicator {
   background-color: transparent;
   color: white;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
-
-.composited-indicator > GtkWidget > GtkWidget:first-child {
-  padding: 0 2px; }
+  .composited-indicator > GtkWidget > GtkWidget:first-child {
+    padding: 0 2px; }
+  .composited-indicator .menuitem:active, .composited-indicator .menuitem:prelight {
+    border-style: none;
+    background-image: none;
+    box-shadow: none; }
+  .composited-indicator > .popup > .menu {
+    padding-top: 8px;
+    padding-bottom: 8px; }
 
 .panel-app-button > GtkWidget > GtkWidget:first-child {
   padding: 0 2px 0 4px; }
 
-.composited-indicator.menuitem:active,
-.composited-indicator.menuitem:prelight {
-  border-style: none;
-  background-image: none;
-  box-shadow: none; }
-
-.composited-indicator > .popup > .menu {
-  padding-top: 8px;
-  padding-bottom: 8px; }
-
 .panel .menu .spinner,
 .menu .spinner {
   opacity: 1; }
diff --git a/common/gtk-3.0/3.14/gtk-darker.css b/common/gtk-3.0/3.14/gtk-darker.css
index 584981d..972334d 100644
--- a/common/gtk-3.0/3.14/gtk-darker.css
+++ b/common/gtk-3.0/3.14/gtk-darker.css
@@ -3027,22 +3027,17 @@ BirdieWidgetsTweetList * {
   background-image: none;
   background-color: transparent; }
 
-MarlinViewWindow GtkIconView.view:selected,
-MarlinViewWindow GtkIconView.view:selected:focus,
-MarlinViewWindow GtkIconView.view:selected:hover,
-MarlinViewWindow GtkIconView.view:selected:focus:hover {
-  background-color: transparent; }
-
-MarlinViewWindow FMListView,
-MarlinViewWindow FMColumnView {
-  outline-color: transparent; }
-
-MarlinViewWindow *:selected,
-MarlinViewWindow *:selected:focus {
+MarlinViewWindow *:selected, MarlinViewWindow *:selected:focus {
   color: #ffffff;
   background-color: #5294E2;
   outline-color: transparent; }
 
+MarlinViewWindow GtkIconView.view:selected, MarlinViewWindow GtkIconView.view:selected:focus, MarlinViewWindow GtkIconView.view:selected:hover, MarlinViewWindow GtkIconView.view:selected:focus:hover {
+  background-color: transparent; }
+
+MarlinViewWindow FMListView, MarlinViewWindow FMColumnView {
+  outline-color: transparent; }
+
 .marlin-pathbar.pathbar {
   border-radius: 3px;
   padding-left: 4px;
@@ -3078,55 +3073,44 @@ MarlinViewWindow *:selected:focus {
   font-weight: bold;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
-
-.panel-shadow {
-  background-image: none;
-  background-color: transparent; }
-
-.panel .menu {
-  box-shadow: none; }
-
-.panel .menu .menuitem {
-  font-weight: normal;
-  text-shadow: none;
-  icon-shadow: none; }
-
-.panel .menubar > .menuitem {
-  padding: 3px 6px; }
-
-.panel .menubar > .menuitem:hover {
-  background-color: transparent; }
-
-.panel .window-frame.menu.csd,
-.panel .window-frame.popup.csd {
-  box-shadow: none; }
-
-.panel .menu .window-frame.menu.csd,
-.panel .menu .window-frame.popup.csd {
-  box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); }
+  .panel-shadow {
+    background-image: none;
+    background-color: transparent; }
+  .panel .menu {
+    box-shadow: none; }
+    .panel .menu .menuitem {
+      font-weight: normal;
+      text-shadow: none;
+      icon-shadow: none; }
+    .panel .menu .window-frame.menu.csd,
+    .panel .menu .window-frame.popup.csd {
+      box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); }
+  .panel .menubar > .menuitem {
+    padding: 3px 6px; }
+    .panel .menubar > .menuitem:hover {
+      background-color: transparent; }
+  .panel .window-frame.menu.csd,
+  .panel .window-frame.popup.csd {
+    box-shadow: none; }
 
 .composited-indicator {
   background-color: transparent;
   color: white;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
-
-.composited-indicator > GtkWidget > GtkWidget:first-child {
-  padding: 0 2px; }
+  .composited-indicator > GtkWidget > GtkWidget:first-child {
+    padding: 0 2px; }
+  .composited-indicator .menuitem:active, .composited-indicator .menuitem:prelight {
+    border-style: none;
+    background-image: none;
+    box-shadow: none; }
+  .composited-indicator > .popup > .menu {
+    padding-top: 8px;
+    padding-bottom: 8px; }
 
 .panel-app-button > GtkWidget > GtkWidget:first-child {
   padding: 0 2px 0 4px; }
 
-.composited-indicator.menuitem:active,
-.composited-indicator.menuitem:prelight {
-  border-style: none;
-  background-image: none;
-  box-shadow: none; }
-
-.composited-indicator > .popup > .menu {
-  padding-top: 8px;
-  padding-bottom: 8px; }
-
 .panel .menu .spinner,
 .menu .spinner {
   opacity: 1; }
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 a4ce1a9..ae83d76 100644
--- a/common/gtk-3.0/3.14/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.14/gtk-solid-dark.css
@@ -3024,22 +3024,17 @@ BirdieWidgetsTweetList * {
   background-image: none;
   background-color: transparent; }
 
-MarlinViewWindow GtkIconView.view:selected,
-MarlinViewWindow GtkIconView.view:selected:focus,
-MarlinViewWindow GtkIconView.view:selected:hover,
-MarlinViewWindow GtkIconView.view:selected:focus:hover {
-  background-color: transparent; }
-
-MarlinViewWindow FMListView,
-MarlinViewWindow FMColumnView {
-  outline-color: transparent; }
-
-MarlinViewWindow *:selected,
-MarlinViewWindow *:selected:focus {
+MarlinViewWindow *:selected, MarlinViewWindow *:selected:focus {
   color: #ffffff;
   background-color: #5294E2;
   outline-color: transparent; }
 
+MarlinViewWindow GtkIconView.view:selected, MarlinViewWindow GtkIconView.view:selected:focus, MarlinViewWindow GtkIconView.view:selected:hover, MarlinViewWindow GtkIconView.view:selected:focus:hover {
+  background-color: transparent; }
+
+MarlinViewWindow FMListView, MarlinViewWindow FMColumnView {
+  outline-color: transparent; }
+
 .marlin-pathbar.pathbar {
   border-radius: 3px;
   padding-left: 4px;
@@ -3075,55 +3070,44 @@ MarlinViewWindow *:selected:focus {
   font-weight: bold;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
-
-.panel-shadow {
-  background-image: none;
-  background-color: transparent; }
-
-.panel .menu {
-  box-shadow: none; }
-
-.panel .menu .menuitem {
-  font-weight: normal;
-  text-shadow: none;
-  icon-shadow: none; }
-
-.panel .menubar > .menuitem {
-  padding: 3px 6px; }
-
-.panel .menubar > .menuitem:hover {
-  background-color: transparent; }
-
-.panel .window-frame.menu.csd,
-.panel .window-frame.popup.csd {
-  box-shadow: none; }
-
-.panel .menu .window-frame.menu.csd,
-.panel .menu .window-frame.popup.csd {
-  box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); }
+  .panel-shadow {
+    background-image: none;
+    background-color: transparent; }
+  .panel .menu {
+    box-shadow: none; }
+    .panel .menu .menuitem {
+      font-weight: normal;
+      text-shadow: none;
+      icon-shadow: none; }
+    .panel .menu .window-frame.menu.csd,
+    .panel .menu .window-frame.popup.csd {
+      box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); }
+  .panel .menubar > .menuitem {
+    padding: 3px 6px; }
+    .panel .menubar > .menuitem:hover {
+      background-color: transparent; }
+  .panel .window-frame.menu.csd,
+  .panel .window-frame.popup.csd {
+    box-shadow: none; }
 
 .composited-indicator {
   background-color: transparent;
   color: white;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
-
-.composited-indicator > GtkWidget > GtkWidget:first-child {
-  padding: 0 2px; }
+  .composited-indicator > GtkWidget > GtkWidget:first-child {
+    padding: 0 2px; }
+  .composited-indicator .menuitem:active, .composited-indicator .menuitem:prelight {
+    border-style: none;
+    background-image: none;
+    box-shadow: none; }
+  .composited-indicator > .popup > .menu {
+    padding-top: 8px;
+    padding-bottom: 8px; }
 
 .panel-app-button > GtkWidget > GtkWidget:first-child {
   padding: 0 2px 0 4px; }
 
-.composited-indicator.menuitem:active,
-.composited-indicator.menuitem:prelight {
-  border-style: none;
-  background-image: none;
-  box-shadow: none; }
-
-.composited-indicator > .popup > .menu {
-  padding-top: 8px;
-  padding-bottom: 8px; }
-
 .panel .menu .spinner,
 .menu .spinner {
   opacity: 1; }
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 2a65b47..c32f9cb 100644
--- a/common/gtk-3.0/3.14/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.14/gtk-solid-darker.css
@@ -3027,22 +3027,17 @@ BirdieWidgetsTweetList * {
   background-image: none;
   background-color: transparent; }
 
-MarlinViewWindow GtkIconView.view:selected,
-MarlinViewWindow GtkIconView.view:selected:focus,
-MarlinViewWindow GtkIconView.view:selected:hover,
-MarlinViewWindow GtkIconView.view:selected:focus:hover {
-  background-color: transparent; }
-
-MarlinViewWindow FMListView,
-MarlinViewWindow FMColumnView {
-  outline-color: transparent; }
-
-MarlinViewWindow *:selected,
-MarlinViewWindow *:selected:focus {
+MarlinViewWindow *:selected, MarlinViewWindow *:selected:focus {
   color: #ffffff;
   background-color: #5294E2;
   outline-color: transparent; }
 
+MarlinViewWindow GtkIconView.view:selected, MarlinViewWindow GtkIconView.view:selected:focus, MarlinViewWindow GtkIconView.view:selected:hover, MarlinViewWindow GtkIconView.view:selected:focus:hover {
+  background-color: transparent; }
+
+MarlinViewWindow FMListView, MarlinViewWindow FMColumnView {
+  outline-color: transparent; }
+
 .marlin-pathbar.pathbar {
   border-radius: 3px;
   padding-left: 4px;
@@ -3078,55 +3073,44 @@ MarlinViewWindow *:selected:focus {
   font-weight: bold;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
-
-.panel-shadow {
-  background-image: none;
-  background-color: transparent; }
-
-.panel .menu {
-  box-shadow: none; }
-
-.panel .menu .menuitem {
-  font-weight: normal;
-  text-shadow: none;
-  icon-shadow: none; }
-
-.panel .menubar > .menuitem {
-  padding: 3px 6px; }
-
-.panel .menubar > .menuitem:hover {
-  background-color: transparent; }
-
-.panel .window-frame.menu.csd,
-.panel .window-frame.popup.csd {
-  box-shadow: none; }
-
-.panel .menu .window-frame.menu.csd,
-.panel .menu .window-frame.popup.csd {
-  box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); }
+  .panel-shadow {
+    background-image: none;
+    background-color: transparent; }
+  .panel .menu {
+    box-shadow: none; }
+    .panel .menu .menuitem {
+      font-weight: normal;
+      text-shadow: none;
+      icon-shadow: none; }
+    .panel .menu .window-frame.menu.csd,
+    .panel .menu .window-frame.popup.csd {
+      box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); }
+  .panel .menubar > .menuitem {
+    padding: 3px 6px; }
+    .panel .menubar > .menuitem:hover {
+      background-color: transparent; }
+  .panel .window-frame.menu.csd,
+  .panel .window-frame.popup.csd {
+    box-shadow: none; }
 
 .composited-indicator {
   background-color: transparent;
   color: white;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
-
-.composited-indicator > GtkWidget > GtkWidget:first-child {
-  padding: 0 2px; }
+  .composited-indicator > GtkWidget > GtkWidget:first-child {
+    padding: 0 2px; }
+  .composited-indicator .menuitem:active, .composited-indicator .menuitem:prelight {
+    border-style: none;
+    background-image: none;
+    box-shadow: none; }
+  .composited-indicator > .popup > .menu {
+    padding-top: 8px;
+    padding-bottom: 8px; }
 
 .panel-app-button > GtkWidget > GtkWidget:first-child {
   padding: 0 2px 0 4px; }
 
-.composited-indicator.menuitem:active,
-.composited-indicator.menuitem:prelight {
-  border-style: none;
-  background-image: none;
-  box-shadow: none; }
-
-.composited-indicator > .popup > .menu {
-  padding-top: 8px;
-  padding-bottom: 8px; }
-
 .panel .menu .spinner,
 .menu .spinner {
   opacity: 1; }
diff --git a/common/gtk-3.0/3.14/gtk-solid.css b/common/gtk-3.0/3.14/gtk-solid.css
index d0d235a..6e6ad51 100644
--- a/common/gtk-3.0/3.14/gtk-solid.css
+++ b/common/gtk-3.0/3.14/gtk-solid.css
@@ -3027,22 +3027,17 @@ BirdieWidgetsTweetList * {
   background-image: none;
   background-color: transparent; }
 
-MarlinViewWindow GtkIconView.view:selected,
-MarlinViewWindow GtkIconView.view:selected:focus,
-MarlinViewWindow GtkIconView.view:selected:hover,
-MarlinViewWindow GtkIconView.view:selected:focus:hover {
-  background-color: transparent; }
-
-MarlinViewWindow FMListView,
-MarlinViewWindow FMColumnView {
-  outline-color: transparent; }
-
-MarlinViewWindow *:selected,
-MarlinViewWindow *:selected:focus {
+MarlinViewWindow *:selected, MarlinViewWindow *:selected:focus {
   color: #ffffff;
   background-color: #5294E2;
   outline-color: transparent; }
 
+MarlinViewWindow GtkIconView.view:selected, MarlinViewWindow GtkIconView.view:selected:focus, MarlinViewWindow GtkIconView.view:selected:hover, MarlinViewWindow GtkIconView.view:selected:focus:hover {
+  background-color: transparent; }
+
+MarlinViewWindow FMListView, MarlinViewWindow FMColumnView {
+  outline-color: transparent; }
+
 .marlin-pathbar.pathbar {
   border-radius: 3px;
   padding-left: 4px;
@@ -3078,55 +3073,44 @@ MarlinViewWindow *:selected:focus {
   font-weight: bold;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
-
-.panel-shadow {
-  background-image: none;
-  background-color: transparent; }
-
-.panel .menu {
-  box-shadow: none; }
-
-.panel .menu .menuitem {
-  font-weight: normal;
-  text-shadow: none;
-  icon-shadow: none; }
-
-.panel .menubar > .menuitem {
-  padding: 3px 6px; }
-
-.panel .menubar > .menuitem:hover {
-  background-color: transparent; }
-
-.panel .window-frame.menu.csd,
-.panel .window-frame.popup.csd {
-  box-shadow: none; }
-
-.panel .menu .window-frame.menu.csd,
-.panel .menu .window-frame.popup.csd {
-  box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); }
+  .panel-shadow {
+    background-image: none;
+    background-color: transparent; }
+  .panel .menu {
+    box-shadow: none; }
+    .panel .menu .menuitem {
+      font-weight: normal;
+      text-shadow: none;
+      icon-shadow: none; }
+    .panel .menu .window-frame.menu.csd,
+    .panel .menu .window-frame.popup.csd {
+      box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); }
+  .panel .menubar > .menuitem {
+    padding: 3px 6px; }
+    .panel .menubar > .menuitem:hover {
+      background-color: transparent; }
+  .panel .window-frame.menu.csd,
+  .panel .window-frame.popup.csd {
+    box-shadow: none; }
 
 .composited-indicator {
   background-color: transparent;
   color: white;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
-
-.composited-indicator > GtkWidget > GtkWidget:first-child {
-  padding: 0 2px; }
+  .composited-indicator > GtkWidget > GtkWidget:first-child {
+    padding: 0 2px; }
+  .composited-indicator .menuitem:active, .composited-indicator .menuitem:prelight {
+    border-style: none;
+    background-image: none;
+    box-shadow: none; }
+  .composited-indicator > .popup > .menu {
+    padding-top: 8px;
+    padding-bottom: 8px; }
 
 .panel-app-button > GtkWidget > GtkWidget:first-child {
   padding: 0 2px 0 4px; }
 
-.composited-indicator.menuitem:active,
-.composited-indicator.menuitem:prelight {
-  border-style: none;
-  background-image: none;
-  box-shadow: none; }
-
-.composited-indicator > .popup > .menu {
-  padding-top: 8px;
-  padding-bottom: 8px; }
-
 .panel .menu .spinner,
 .menu .spinner {
   opacity: 1; }
diff --git a/common/gtk-3.0/3.14/gtk.css b/common/gtk-3.0/3.14/gtk.css
index ebf516d..1e2578b 100644
--- a/common/gtk-3.0/3.14/gtk.css
+++ b/common/gtk-3.0/3.14/gtk.css
@@ -3027,22 +3027,17 @@ BirdieWidgetsTweetList * {
   background-image: none;
   background-color: transparent; }
 
-MarlinViewWindow GtkIconView.view:selected,
-MarlinViewWindow GtkIconView.view:selected:focus,
-MarlinViewWindow GtkIconView.view:selected:hover,
-MarlinViewWindow GtkIconView.view:selected:focus:hover {
-  background-color: transparent; }
-
-MarlinViewWindow FMListView,
-MarlinViewWindow FMColumnView {
-  outline-color: transparent; }
-
-MarlinViewWindow *:selected,
-MarlinViewWindow *:selected:focus {
+MarlinViewWindow *:selected, MarlinViewWindow *:selected:focus {
   color: #ffffff;
   background-color: #5294E2;
   outline-color: transparent; }
 
+MarlinViewWindow GtkIconView.view:selected, MarlinViewWindow GtkIconView.view:selected:focus, MarlinViewWindow GtkIconView.view:selected:hover, MarlinViewWindow GtkIconView.view:selected:focus:hover {
+  background-color: transparent; }
+
+MarlinViewWindow FMListView, MarlinViewWindow FMColumnView {
+  outline-color: transparent; }
+
 .marlin-pathbar.pathbar {
   border-radius: 3px;
   padding-left: 4px;
@@ -3078,55 +3073,44 @@ MarlinViewWindow *:selected:focus {
   font-weight: bold;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
-
-.panel-shadow {
-  background-image: none;
-  background-color: transparent; }
-
-.panel .menu {
-  box-shadow: none; }
-
-.panel .menu .menuitem {
-  font-weight: normal;
-  text-shadow: none;
-  icon-shadow: none; }
-
-.panel .menubar > .menuitem {
-  padding: 3px 6px; }
-
-.panel .menubar > .menuitem:hover {
-  background-color: transparent; }
-
-.panel .window-frame.menu.csd,
-.panel .window-frame.popup.csd {
-  box-shadow: none; }
-
-.panel .menu .window-frame.menu.csd,
-.panel .menu .window-frame.popup.csd {
-  box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); }
+  .panel-shadow {
+    background-image: none;
+    background-color: transparent; }
+  .panel .menu {
+    box-shadow: none; }
+    .panel .menu .menuitem {
+      font-weight: normal;
+      text-shadow: none;
+      icon-shadow: none; }
+    .panel .menu .window-frame.menu.csd,
+    .panel .menu .window-frame.popup.csd {
+      box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); }
+  .panel .menubar > .menuitem {
+    padding: 3px 6px; }
+    .panel .menubar > .menuitem:hover {
+      background-color: transparent; }
+  .panel .window-frame.menu.csd,
+  .panel .window-frame.popup.csd {
+    box-shadow: none; }
 
 .composited-indicator {
   background-color: transparent;
   color: white;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
-
-.composited-indicator > GtkWidget > GtkWidget:first-child {
-  padding: 0 2px; }
+  .composited-indicator > GtkWidget > GtkWidget:first-child {
+    padding: 0 2px; }
+  .composited-indicator .menuitem:active, .composited-indicator .menuitem:prelight {
+    border-style: none;
+    background-image: none;
+    box-shadow: none; }
+  .composited-indicator > .popup > .menu {
+    padding-top: 8px;
+    padding-bottom: 8px; }
 
 .panel-app-button > GtkWidget > GtkWidget:first-child {
   padding: 0 2px 0 4px; }
 
-.composited-indicator.menuitem:active,
-.composited-indicator.menuitem:prelight {
-  border-style: none;
-  background-image: none;
-  box-shadow: none; }
-
-.composited-indicator > .popup > .menu {
-  padding-top: 8px;
-  padding-bottom: 8px; }
-
 .panel .menu .spinner,
 .menu .spinner {
   opacity: 1; }
diff --git a/common/gtk-3.0/3.14/sass/_applications.scss b/common/gtk-3.0/3.14/sass/_applications.scss
index 57eaec8..585f1be 100644
--- a/common/gtk-3.0/3.14/sass/_applications.scss
+++ b/common/gtk-3.0/3.14/sass/_applications.scss
@@ -543,23 +543,17 @@ BirdieWidgetsTweetList * {
 //
 // Marlin / Pantheon Files
 //
-MarlinViewWindow GtkIconView.view:selected,
-MarlinViewWindow GtkIconView.view:selected:focus,
-MarlinViewWindow GtkIconView.view:selected:hover,
-MarlinViewWindow GtkIconView.view:selected:focus:hover {
-  background-color: transparent;
-}
-
-MarlinViewWindow FMListView,
-MarlinViewWindow FMColumnView {
-  outline-color: transparent;
-}
+MarlinViewWindow {
 
-MarlinViewWindow *:selected,
-MarlinViewWindow *:selected:focus {
-	color: $selected_fg_color;
-	background-color: $selected_bg_color;
-  outline-color: transparent;
+  *:selected, *:selected:focus {
+    color: $selected_fg_color;
+    background-color: $selected_bg_color;
+    outline-color: transparent;
+  }
+  GtkIconView.view:selected {
+    &, &:focus, &:hover, &:focus:hover { background-color: transparent; }
+  }
+  FMListView, FMColumnView { outline-color: transparent; }
 }
 
 .marlin-pathbar.pathbar {
@@ -602,37 +596,33 @@ MarlinViewWindow *:selected:focus {
   font-weight: bold;
   text-shadow: 0 1px 2px transparentize(black, 0.4);
   icon-shadow: 0 1px 2px transparentize(black, 0.4);
-}
-
-.panel-shadow {
-  background-image: none;
-  background-color: transparent;
-}
-
-.panel .menu {
-  box-shadow: none;
-}
-
-.panel .menu .menuitem {
-  font-weight: normal;
-  text-shadow: none;
-  icon-shadow: none;
-}
-
-.panel .menubar > .menuitem { padding: 3px 6px; }
 
-.panel .menubar > .menuitem:hover { background-color: transparent; }
+  &-shadow {
+    background-image: none;
+    background-color: transparent;
+  }
+  .menu {
+    box-shadow: none;
 
-.panel .window-frame.menu.csd,
-.panel .window-frame.popup.csd {
-  box-shadow: none;
-}
+    .menuitem {
+      font-weight: normal;
+      text-shadow: none;
+      icon-shadow: none;
+    }
 
-.panel .menu .window-frame.menu.csd,
-.panel .menu .window-frame.popup.csd {
-  box-shadow: 0 0 0 1px transparentize(black, 0.8),
-              0 10px 20px transparentize(black, 0.81),
-              0 6px 6px transparentize(black, 0.77);
+    .window-frame.menu.csd,
+    .window-frame.popup.csd {
+      box-shadow: 0 0 0 1px transparentize(black, 0.8),
+                  0 10px 20px transparentize(black, 0.81),
+                  0 6px 6px transparentize(black, 0.77);
+    }
+  }
+  .menubar > .menuitem {
+    padding: 3px 6px;
+    &:hover { background-color: transparent; }
+  }
+  .window-frame.menu.csd,
+  .window-frame.popup.csd { box-shadow: none; }
 }
 
 .composited-indicator {
@@ -640,28 +630,24 @@ MarlinViewWindow *:selected:focus {
   color: white;
   text-shadow: 0 1px 2px transparentize(black, 0.4);
   icon-shadow: 0 1px 2px transparentize(black, 0.4);
-}
 
-.composited-indicator > GtkWidget > GtkWidget:first-child {
-  padding: 0 2px;
+  > GtkWidget > GtkWidget:first-child { padding: 0 2px; }
+
+  .menuitem:active, .menuitem:prelight {
+    border-style: none;
+    background-image: none;
+    box-shadow: none;
+  }
+  > .popup > .menu {
+    padding-top: 8px;
+    padding-bottom: 8px;
+  }
 }
 
 .panel-app-button > GtkWidget > GtkWidget:first-child {
   padding: 0 2px 0 4px;
 }
 
-.composited-indicator.menuitem:active,
-.composited-indicator.menuitem:prelight {
-  border-style: none;
-  background-image: none;
-  box-shadow: none;
-}
-
-.composited-indicator > .popup > .menu {
-  padding-top: 8px;
-  padding-bottom: 8px;
-}
-
 .panel .menu .spinner,
 .menu .spinner { opacity: 1 } // Fixes sound indicator buttons
 
diff --git a/common/gtk-3.0/3.16/gtk-dark.css b/common/gtk-3.0/3.16/gtk-dark.css
index 452a96d..2ec0fed 100644
--- a/common/gtk-3.0/3.16/gtk-dark.css
+++ b/common/gtk-3.0/3.16/gtk-dark.css
@@ -2956,22 +2956,17 @@ BirdieWidgetsTweetList * {
   background-image: none;
   background-color: transparent; }
 
-MarlinViewWindow GtkIconView.view:selected,
-MarlinViewWindow GtkIconView.view:selected:focus,
-MarlinViewWindow GtkIconView.view:selected:hover,
-MarlinViewWindow GtkIconView.view:selected:focus:hover {
-  background-color: transparent; }
-
-MarlinViewWindow FMListView,
-MarlinViewWindow FMColumnView {
-  outline-color: transparent; }
-
-MarlinViewWindow *:selected,
-MarlinViewWindow *:selected:focus {
+MarlinViewWindow *:selected, MarlinViewWindow *:selected:focus {
   color: #ffffff;
   background-color: #5294E2;
   outline-color: transparent; }
 
+MarlinViewWindow GtkIconView.view:selected, MarlinViewWindow GtkIconView.view:selected:focus, MarlinViewWindow GtkIconView.view:selected:hover, MarlinViewWindow GtkIconView.view:selected:focus:hover {
+  background-color: transparent; }
+
+MarlinViewWindow FMListView, MarlinViewWindow FMColumnView {
+  outline-color: transparent; }
+
 .marlin-pathbar.pathbar {
   border-radius: 3px;
   padding-left: 4px;
@@ -3007,55 +3002,44 @@ MarlinViewWindow *:selected:focus {
   font-weight: bold;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
-
-.panel-shadow {
-  background-image: none;
-  background-color: transparent; }
-
-.panel .menu {
-  box-shadow: none; }
-
-.panel .menu .menuitem {
-  font-weight: normal;
-  text-shadow: none;
-  icon-shadow: none; }
-
-.panel .menubar > .menuitem {
-  padding: 3px 6px; }
-
-.panel .menubar > .menuitem:hover {
-  background-color: transparent; }
-
-.panel .window-frame.menu.csd,
-.panel .window-frame.popup.csd {
-  box-shadow: none; }
-
-.panel .menu .window-frame.menu.csd,
-.panel .menu .window-frame.popup.csd {
-  box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); }
+  .panel-shadow {
+    background-image: none;
+    background-color: transparent; }
+  .panel .menu {
+    box-shadow: none; }
+    .panel .menu .menuitem {
+      font-weight: normal;
+      text-shadow: none;
+      icon-shadow: none; }
+    .panel .menu .window-frame.menu.csd,
+    .panel .menu .window-frame.popup.csd {
+      box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); }
+  .panel .menubar > .menuitem {
+    padding: 3px 6px; }
+    .panel .menubar > .menuitem:hover {
+      background-color: transparent; }
+  .panel .window-frame.menu.csd,
+  .panel .window-frame.popup.csd {
+    box-shadow: none; }
 
 .composited-indicator {
   background-color: transparent;
   color: white;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
-
-.composited-indicator > GtkWidget > GtkWidget:first-child {
-  padding: 0 2px; }
+  .composited-indicator > GtkWidget > GtkWidget:first-child {
+    padding: 0 2px; }
+  .composited-indicator .menuitem:active, .composited-indicator .menuitem:prelight {
+    border-style: none;
+    background-image: none;
+    box-shadow: none; }
+  .composited-indicator > .popup > .menu {
+    padding-top: 8px;
+    padding-bottom: 8px; }
 
 .panel-app-button > GtkWidget > GtkWidget:first-child {
   padding: 0 2px 0 4px; }
 
-.composited-indicator.menuitem:active,
-.composited-indicator.menuitem:prelight {
-  border-style: none;
-  background-image: none;
-  box-shadow: none; }
-
-.composited-indicator > .popup > .menu {
-  padding-top: 8px;
-  padding-bottom: 8px; }
-
 .panel .menu .spinner,
 .menu .spinner {
   opacity: 1; }
diff --git a/common/gtk-3.0/3.16/gtk-darker.css b/common/gtk-3.0/3.16/gtk-darker.css
index 6765f77..4406219 100644
--- a/common/gtk-3.0/3.16/gtk-darker.css
+++ b/common/gtk-3.0/3.16/gtk-darker.css
@@ -2959,22 +2959,17 @@ BirdieWidgetsTweetList * {
   background-image: none;
   background-color: transparent; }
 
-MarlinViewWindow GtkIconView.view:selected,
-MarlinViewWindow GtkIconView.view:selected:focus,
-MarlinViewWindow GtkIconView.view:selected:hover,
-MarlinViewWindow GtkIconView.view:selected:focus:hover {
-  background-color: transparent; }
-
-MarlinViewWindow FMListView,
-MarlinViewWindow FMColumnView {
-  outline-color: transparent; }
-
-MarlinViewWindow *:selected,
-MarlinViewWindow *:selected:focus {
+MarlinViewWindow *:selected, MarlinViewWindow *:selected:focus {
   color: #ffffff;
   background-color: #5294E2;
   outline-color: transparent; }
 
+MarlinViewWindow GtkIconView.view:selected, MarlinViewWindow GtkIconView.view:selected:focus, MarlinViewWindow GtkIconView.view:selected:hover, MarlinViewWindow GtkIconView.view:selected:focus:hover {
+  background-color: transparent; }
+
+MarlinViewWindow FMListView, MarlinViewWindow FMColumnView {
+  outline-color: transparent; }
+
 .marlin-pathbar.pathbar {
   border-radius: 3px;
   padding-left: 4px;
@@ -3010,55 +3005,44 @@ MarlinViewWindow *:selected:focus {
   font-weight: bold;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
-
-.panel-shadow {
-  background-image: none;
-  background-color: transparent; }
-
-.panel .menu {
-  box-shadow: none; }
-
-.panel .menu .menuitem {
-  font-weight: normal;
-  text-shadow: none;
-  icon-shadow: none; }
-
-.panel .menubar > .menuitem {
-  padding: 3px 6px; }
-
-.panel .menubar > .menuitem:hover {
-  background-color: transparent; }
-
-.panel .window-frame.menu.csd,
-.panel .window-frame.popup.csd {
-  box-shadow: none; }
-
-.panel .menu .window-frame.menu.csd,
-.panel .menu .window-frame.popup.csd {
-  box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); }
+  .panel-shadow {
+    background-image: none;
+    background-color: transparent; }
+  .panel .menu {
+    box-shadow: none; }
+    .panel .menu .menuitem {
+      font-weight: normal;
+      text-shadow: none;
+      icon-shadow: none; }
+    .panel .menu .window-frame.menu.csd,
+    .panel .menu .window-frame.popup.csd {
+      box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); }
+  .panel .menubar > .menuitem {
+    padding: 3px 6px; }
+    .panel .menubar > .menuitem:hover {
+      background-color: transparent; }
+  .panel .window-frame.menu.csd,
+  .panel .window-frame.popup.csd {
+    box-shadow: none; }
 
 .composited-indicator {
   background-color: transparent;
   color: white;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
-
-.composited-indicator > GtkWidget > GtkWidget:first-child {
-  padding: 0 2px; }
+  .composited-indicator > GtkWidget > GtkWidget:first-child {
+    padding: 0 2px; }
+  .composited-indicator .menuitem:active, .composited-indicator .menuitem:prelight {
+    border-style: none;
+    background-image: none;
+    box-shadow: none; }
+  .composited-indicator > .popup > .menu {
+    padding-top: 8px;
+    padding-bottom: 8px; }
 
 .panel-app-button > GtkWidget > GtkWidget:first-child {
   padding: 0 2px 0 4px; }
 
-.composited-indicator.menuitem:active,
-.composited-indicator.menuitem:prelight {
-  border-style: none;
-  background-image: none;
-  box-shadow: none; }
-
-.composited-indicator > .popup > .menu {
-  padding-top: 8px;
-  padding-bottom: 8px; }
-
 .panel .menu .spinner,
 .menu .spinner {
   opacity: 1; }
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 ebc7184..f3bdbb3 100644
--- a/common/gtk-3.0/3.16/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.16/gtk-solid-dark.css
@@ -2956,22 +2956,17 @@ BirdieWidgetsTweetList * {
   background-image: none;
   background-color: transparent; }
 
-MarlinViewWindow GtkIconView.view:selected,
-MarlinViewWindow GtkIconView.view:selected:focus,
-MarlinViewWindow GtkIconView.view:selected:hover,
-MarlinViewWindow GtkIconView.view:selected:focus:hover {
-  background-color: transparent; }
-
-MarlinViewWindow FMListView,
-MarlinViewWindow FMColumnView {
-  outline-color: transparent; }
-
-MarlinViewWindow *:selected,
-MarlinViewWindow *:selected:focus {
+MarlinViewWindow *:selected, MarlinViewWindow *:selected:focus {
   color: #ffffff;
   background-color: #5294E2;
   outline-color: transparent; }
 
+MarlinViewWindow GtkIconView.view:selected, MarlinViewWindow GtkIconView.view:selected:focus, MarlinViewWindow GtkIconView.view:selected:hover, MarlinViewWindow GtkIconView.view:selected:focus:hover {
+  background-color: transparent; }
+
+MarlinViewWindow FMListView, MarlinViewWindow FMColumnView {
+  outline-color: transparent; }
+
 .marlin-pathbar.pathbar {
   border-radius: 3px;
   padding-left: 4px;
@@ -3007,55 +3002,44 @@ MarlinViewWindow *:selected:focus {
   font-weight: bold;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
-
-.panel-shadow {
-  background-image: none;
-  background-color: transparent; }
-
-.panel .menu {
-  box-shadow: none; }
-
-.panel .menu .menuitem {
-  font-weight: normal;
-  text-shadow: none;
-  icon-shadow: none; }
-
-.panel .menubar > .menuitem {
-  padding: 3px 6px; }
-
-.panel .menubar > .menuitem:hover {
-  background-color: transparent; }
-
-.panel .window-frame.menu.csd,
-.panel .window-frame.popup.csd {
-  box-shadow: none; }
-
-.panel .menu .window-frame.menu.csd,
-.panel .menu .window-frame.popup.csd {
-  box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); }
+  .panel-shadow {
+    background-image: none;
+    background-color: transparent; }
+  .panel .menu {
+    box-shadow: none; }
+    .panel .menu .menuitem {
+      font-weight: normal;
+      text-shadow: none;
+      icon-shadow: none; }
+    .panel .menu .window-frame.menu.csd,
+    .panel .menu .window-frame.popup.csd {
+      box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); }
+  .panel .menubar > .menuitem {
+    padding: 3px 6px; }
+    .panel .menubar > .menuitem:hover {
+      background-color: transparent; }
+  .panel .window-frame.menu.csd,
+  .panel .window-frame.popup.csd {
+    box-shadow: none; }
 
 .composited-indicator {
   background-color: transparent;
   color: white;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
-
-.composited-indicator > GtkWidget > GtkWidget:first-child {
-  padding: 0 2px; }
+  .composited-indicator > GtkWidget > GtkWidget:first-child {
+    padding: 0 2px; }
+  .composited-indicator .menuitem:active, .composited-indicator .menuitem:prelight {
+    border-style: none;
+    background-image: none;
+    box-shadow: none; }
+  .composited-indicator > .popup > .menu {
+    padding-top: 8px;
+    padding-bottom: 8px; }
 
 .panel-app-button > GtkWidget > GtkWidget:first-child {
   padding: 0 2px 0 4px; }
 
-.composited-indicator.menuitem:active,
-.composited-indicator.menuitem:prelight {
-  border-style: none;
-  background-image: none;
-  box-shadow: none; }
-
-.composited-indicator > .popup > .menu {
-  padding-top: 8px;
-  padding-bottom: 8px; }
-
 .panel .menu .spinner,
 .menu .spinner {
   opacity: 1; }
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 c000ab7..ad9bf79 100644
--- a/common/gtk-3.0/3.16/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.16/gtk-solid-darker.css
@@ -2959,22 +2959,17 @@ BirdieWidgetsTweetList * {
   background-image: none;
   background-color: transparent; }
 
-MarlinViewWindow GtkIconView.view:selected,
-MarlinViewWindow GtkIconView.view:selected:focus,
-MarlinViewWindow GtkIconView.view:selected:hover,
-MarlinViewWindow GtkIconView.view:selected:focus:hover {
-  background-color: transparent; }
-
-MarlinViewWindow FMListView,
-MarlinViewWindow FMColumnView {
-  outline-color: transparent; }
-
-MarlinViewWindow *:selected,
-MarlinViewWindow *:selected:focus {
+MarlinViewWindow *:selected, MarlinViewWindow *:selected:focus {
   color: #ffffff;
   background-color: #5294E2;
   outline-color: transparent; }
 
+MarlinViewWindow GtkIconView.view:selected, MarlinViewWindow GtkIconView.view:selected:focus, MarlinViewWindow GtkIconView.view:selected:hover, MarlinViewWindow GtkIconView.view:selected:focus:hover {
+  background-color: transparent; }
+
+MarlinViewWindow FMListView, MarlinViewWindow FMColumnView {
+  outline-color: transparent; }
+
 .marlin-pathbar.pathbar {
   border-radius: 3px;
   padding-left: 4px;
@@ -3010,55 +3005,44 @@ MarlinViewWindow *:selected:focus {
   font-weight: bold;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
-
-.panel-shadow {
-  background-image: none;
-  background-color: transparent; }
-
-.panel .menu {
-  box-shadow: none; }
-
-.panel .menu .menuitem {
-  font-weight: normal;
-  text-shadow: none;
-  icon-shadow: none; }
-
-.panel .menubar > .menuitem {
-  padding: 3px 6px; }
-
-.panel .menubar > .menuitem:hover {
-  background-color: transparent; }
-
-.panel .window-frame.menu.csd,
-.panel .window-frame.popup.csd {
-  box-shadow: none; }
-
-.panel .menu .window-frame.menu.csd,
-.panel .menu .window-frame.popup.csd {
-  box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); }
+  .panel-shadow {
+    background-image: none;
+    background-color: transparent; }
+  .panel .menu {
+    box-shadow: none; }
+    .panel .menu .menuitem {
+      font-weight: normal;
+      text-shadow: none;
+      icon-shadow: none; }
+    .panel .menu .window-frame.menu.csd,
+    .panel .menu .window-frame.popup.csd {
+      box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); }
+  .panel .menubar > .menuitem {
+    padding: 3px 6px; }
+    .panel .menubar > .menuitem:hover {
+      background-color: transparent; }
+  .panel .window-frame.menu.csd,
+  .panel .window-frame.popup.csd {
+    box-shadow: none; }
 
 .composited-indicator {
   background-color: transparent;
   color: white;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
-
-.composited-indicator > GtkWidget > GtkWidget:first-child {
-  padding: 0 2px; }
+  .composited-indicator > GtkWidget > GtkWidget:first-child {
+    padding: 0 2px; }
+  .composited-indicator .menuitem:active, .composited-indicator .menuitem:prelight {
+    border-style: none;
+    background-image: none;
+    box-shadow: none; }
+  .composited-indicator > .popup > .menu {
+    padding-top: 8px;
+    padding-bottom: 8px; }
 
 .panel-app-button > GtkWidget > GtkWidget:first-child {
   padding: 0 2px 0 4px; }
 
-.composited-indicator.menuitem:active,
-.composited-indicator.menuitem:prelight {
-  border-style: none;
-  background-image: none;
-  box-shadow: none; }
-
-.composited-indicator > .popup > .menu {
-  padding-top: 8px;
-  padding-bottom: 8px; }
-
 .panel .menu .spinner,
 .menu .spinner {
   opacity: 1; }
diff --git a/common/gtk-3.0/3.16/gtk-solid.css b/common/gtk-3.0/3.16/gtk-solid.css
index 5b45c65..62db911 100644
--- a/common/gtk-3.0/3.16/gtk-solid.css
+++ b/common/gtk-3.0/3.16/gtk-solid.css
@@ -2959,22 +2959,17 @@ BirdieWidgetsTweetList * {
   background-image: none;
   background-color: transparent; }
 
-MarlinViewWindow GtkIconView.view:selected,
-MarlinViewWindow GtkIconView.view:selected:focus,
-MarlinViewWindow GtkIconView.view:selected:hover,
-MarlinViewWindow GtkIconView.view:selected:focus:hover {
-  background-color: transparent; }
-
-MarlinViewWindow FMListView,
-MarlinViewWindow FMColumnView {
-  outline-color: transparent; }
-
-MarlinViewWindow *:selected,
-MarlinViewWindow *:selected:focus {
+MarlinViewWindow *:selected, MarlinViewWindow *:selected:focus {
   color: #ffffff;
   background-color: #5294E2;
   outline-color: transparent; }
 
+MarlinViewWindow GtkIconView.view:selected, MarlinViewWindow GtkIconView.view:selected:focus, MarlinViewWindow GtkIconView.view:selected:hover, MarlinViewWindow GtkIconView.view:selected:focus:hover {
+  background-color: transparent; }
+
+MarlinViewWindow FMListView, MarlinViewWindow FMColumnView {
+  outline-color: transparent; }
+
 .marlin-pathbar.pathbar {
   border-radius: 3px;
   padding-left: 4px;
@@ -3010,55 +3005,44 @@ MarlinViewWindow *:selected:focus {
   font-weight: bold;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
-
-.panel-shadow {
-  background-image: none;
-  background-color: transparent; }
-
-.panel .menu {
-  box-shadow: none; }
-
-.panel .menu .menuitem {
-  font-weight: normal;
-  text-shadow: none;
-  icon-shadow: none; }
-
-.panel .menubar > .menuitem {
-  padding: 3px 6px; }
-
-.panel .menubar > .menuitem:hover {
-  background-color: transparent; }
-
-.panel .window-frame.menu.csd,
-.panel .window-frame.popup.csd {
-  box-shadow: none; }
-
-.panel .menu .window-frame.menu.csd,
-.panel .menu .window-frame.popup.csd {
-  box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); }
+  .panel-shadow {
+    background-image: none;
+    background-color: transparent; }
+  .panel .menu {
+    box-shadow: none; }
+    .panel .menu .menuitem {
+      font-weight: normal;
+      text-shadow: none;
+      icon-shadow: none; }
+    .panel .menu .window-frame.menu.csd,
+    .panel .menu .window-frame.popup.csd {
+      box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); }
+  .panel .menubar > .menuitem {
+    padding: 3px 6px; }
+    .panel .menubar > .menuitem:hover {
+      background-color: transparent; }
+  .panel .window-frame.menu.csd,
+  .panel .window-frame.popup.csd {
+    box-shadow: none; }
 
 .composited-indicator {
   background-color: transparent;
   color: white;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
-
-.composited-indicator > GtkWidget > GtkWidget:first-child {
-  padding: 0 2px; }
+  .composited-indicator > GtkWidget > GtkWidget:first-child {
+    padding: 0 2px; }
+  .composited-indicator .menuitem:active, .composited-indicator .menuitem:prelight {
+    border-style: none;
+    background-image: none;
+    box-shadow: none; }
+  .composited-indicator > .popup > .menu {
+    padding-top: 8px;
+    padding-bottom: 8px; }
 
 .panel-app-button > GtkWidget > GtkWidget:first-child {
   padding: 0 2px 0 4px; }
 
-.composited-indicator.menuitem:active,
-.composited-indicator.menuitem:prelight {
-  border-style: none;
-  background-image: none;
-  box-shadow: none; }
-
-.composited-indicator > .popup > .menu {
-  padding-top: 8px;
-  padding-bottom: 8px; }
-
 .panel .menu .spinner,
 .menu .spinner {
   opacity: 1; }
diff --git a/common/gtk-3.0/3.16/gtk.css b/common/gtk-3.0/3.16/gtk.css
index 80912f5..4c2d945 100644
--- a/common/gtk-3.0/3.16/gtk.css
+++ b/common/gtk-3.0/3.16/gtk.css
@@ -2959,22 +2959,17 @@ BirdieWidgetsTweetList * {
   background-image: none;
   background-color: transparent; }
 
-MarlinViewWindow GtkIconView.view:selected,
-MarlinViewWindow GtkIconView.view:selected:focus,
-MarlinViewWindow GtkIconView.view:selected:hover,
-MarlinViewWindow GtkIconView.view:selected:focus:hover {
-  background-color: transparent; }
-
-MarlinViewWindow FMListView,
-MarlinViewWindow FMColumnView {
-  outline-color: transparent; }
-
-MarlinViewWindow *:selected,
-MarlinViewWindow *:selected:focus {
+MarlinViewWindow *:selected, MarlinViewWindow *:selected:focus {
   color: #ffffff;
   background-color: #5294E2;
   outline-color: transparent; }
 
+MarlinViewWindow GtkIconView.view:selected, MarlinViewWindow GtkIconView.view:selected:focus, MarlinViewWindow GtkIconView.view:selected:hover, MarlinViewWindow GtkIconView.view:selected:focus:hover {
+  background-color: transparent; }
+
+MarlinViewWindow FMListView, MarlinViewWindow FMColumnView {
+  outline-color: transparent; }
+
 .marlin-pathbar.pathbar {
   border-radius: 3px;
   padding-left: 4px;
@@ -3010,55 +3005,44 @@ MarlinViewWindow *:selected:focus {
   font-weight: bold;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
-
-.panel-shadow {
-  background-image: none;
-  background-color: transparent; }
-
-.panel .menu {
-  box-shadow: none; }
-
-.panel .menu .menuitem {
-  font-weight: normal;
-  text-shadow: none;
-  icon-shadow: none; }
-
-.panel .menubar > .menuitem {
-  padding: 3px 6px; }
-
-.panel .menubar > .menuitem:hover {
-  background-color: transparent; }
-
-.panel .window-frame.menu.csd,
-.panel .window-frame.popup.csd {
-  box-shadow: none; }
-
-.panel .menu .window-frame.menu.csd,
-.panel .menu .window-frame.popup.csd {
-  box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); }
+  .panel-shadow {
+    background-image: none;
+    background-color: transparent; }
+  .panel .menu {
+    box-shadow: none; }
+    .panel .menu .menuitem {
+      font-weight: normal;
+      text-shadow: none;
+      icon-shadow: none; }
+    .panel .menu .window-frame.menu.csd,
+    .panel .menu .window-frame.popup.csd {
+      box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); }
+  .panel .menubar > .menuitem {
+    padding: 3px 6px; }
+    .panel .menubar > .menuitem:hover {
+      background-color: transparent; }
+  .panel .window-frame.menu.csd,
+  .panel .window-frame.popup.csd {
+    box-shadow: none; }
 
 .composited-indicator {
   background-color: transparent;
   color: white;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
-
-.composited-indicator > GtkWidget > GtkWidget:first-child {
-  padding: 0 2px; }
+  .composited-indicator > GtkWidget > GtkWidget:first-child {
+    padding: 0 2px; }
+  .composited-indicator .menuitem:active, .composited-indicator .menuitem:prelight {
+    border-style: none;
+    background-image: none;
+    box-shadow: none; }
+  .composited-indicator > .popup > .menu {
+    padding-top: 8px;
+    padding-bottom: 8px; }
 
 .panel-app-button > GtkWidget > GtkWidget:first-child {
   padding: 0 2px 0 4px; }
 
-.composited-indicator.menuitem:active,
-.composited-indicator.menuitem:prelight {
-  border-style: none;
-  background-image: none;
-  box-shadow: none; }
-
-.composited-indicator > .popup > .menu {
-  padding-top: 8px;
-  padding-bottom: 8px; }
-
 .panel .menu .spinner,
 .menu .spinner {
   opacity: 1; }
diff --git a/common/gtk-3.0/3.16/sass/_applications.scss b/common/gtk-3.0/3.16/sass/_applications.scss
index 06cdeb8..18a2dfc 100644
--- a/common/gtk-3.0/3.16/sass/_applications.scss
+++ b/common/gtk-3.0/3.16/sass/_applications.scss
@@ -594,23 +594,17 @@ BirdieWidgetsTweetList * {
 //
 // Marlin / Pantheon Files
 //
-MarlinViewWindow GtkIconView.view:selected,
-MarlinViewWindow GtkIconView.view:selected:focus,
-MarlinViewWindow GtkIconView.view:selected:hover,
-MarlinViewWindow GtkIconView.view:selected:focus:hover {
-  background-color: transparent;
-}
-
-MarlinViewWindow FMListView,
-MarlinViewWindow FMColumnView {
-  outline-color: transparent;
-}
+MarlinViewWindow {
 
-MarlinViewWindow *:selected,
-MarlinViewWindow *:selected:focus {
-	color: $selected_fg_color;
-	background-color: $selected_bg_color;
-  outline-color: transparent;
+  *:selected, *:selected:focus {
+    color: $selected_fg_color;
+    background-color: $selected_bg_color;
+    outline-color: transparent;
+  }
+  GtkIconView.view:selected {
+    &, &:focus, &:hover, &:focus:hover { background-color: transparent; }
+  }
+  FMListView, FMColumnView { outline-color: transparent; }
 }
 
 .marlin-pathbar.pathbar {
@@ -653,37 +647,33 @@ MarlinViewWindow *:selected:focus {
   font-weight: bold;
   text-shadow: 0 1px 2px transparentize(black, 0.4);
   icon-shadow: 0 1px 2px transparentize(black, 0.4);
-}
-
-.panel-shadow {
-  background-image: none;
-  background-color: transparent;
-}
-
-.panel .menu {
-  box-shadow: none;
-}
-
-.panel .menu .menuitem {
-  font-weight: normal;
-  text-shadow: none;
-  icon-shadow: none;
-}
-
-.panel .menubar > .menuitem { padding: 3px 6px; }
 
-.panel .menubar > .menuitem:hover { background-color: transparent; }
+  &-shadow {
+    background-image: none;
+    background-color: transparent;
+  }
+  .menu {
+    box-shadow: none;
 
-.panel .window-frame.menu.csd,
-.panel .window-frame.popup.csd {
-  box-shadow: none;
-}
+    .menuitem {
+      font-weight: normal;
+      text-shadow: none;
+      icon-shadow: none;
+    }
 
-.panel .menu .window-frame.menu.csd,
-.panel .menu .window-frame.popup.csd {
-  box-shadow: 0 0 0 1px transparentize(black, 0.8),
-              0 10px 20px transparentize(black, 0.81),
-              0 6px 6px transparentize(black, 0.77);
+    .window-frame.menu.csd,
+    .window-frame.popup.csd {
+      box-shadow: 0 0 0 1px transparentize(black, 0.8),
+                  0 10px 20px transparentize(black, 0.81),
+                  0 6px 6px transparentize(black, 0.77);
+    }
+  }
+  .menubar > .menuitem {
+    padding: 3px 6px;
+    &:hover { background-color: transparent; }
+  }
+  .window-frame.menu.csd,
+  .window-frame.popup.csd { box-shadow: none; }
 }
 
 .composited-indicator {
@@ -691,28 +681,24 @@ MarlinViewWindow *:selected:focus {
   color: white;
   text-shadow: 0 1px 2px transparentize(black, 0.4);
   icon-shadow: 0 1px 2px transparentize(black, 0.4);
-}
 
-.composited-indicator > GtkWidget > GtkWidget:first-child {
-  padding: 0 2px;
+  > GtkWidget > GtkWidget:first-child { padding: 0 2px; }
+
+  .menuitem:active, .menuitem:prelight {
+    border-style: none;
+    background-image: none;
+    box-shadow: none;
+  }
+  > .popup > .menu {
+    padding-top: 8px;
+    padding-bottom: 8px;
+  }
 }
 
 .panel-app-button > GtkWidget > GtkWidget:first-child {
   padding: 0 2px 0 4px;
 }
 
-.composited-indicator.menuitem:active,
-.composited-indicator.menuitem:prelight {
-  border-style: none;
-  background-image: none;
-  box-shadow: none;
-}
-
-.composited-indicator > .popup > .menu {
-  padding-top: 8px;
-  padding-bottom: 8px;
-}
-
 .panel .menu .spinner,
 .menu .spinner { opacity: 1 } // Fixes sound indicator buttons
 
diff --git a/common/gtk-3.0/3.18/gtk-dark.css b/common/gtk-3.0/3.18/gtk-dark.css
index 4a84e60..6d57ece 100644
--- a/common/gtk-3.0/3.18/gtk-dark.css
+++ b/common/gtk-3.0/3.18/gtk-dark.css
@@ -3144,22 +3144,17 @@ BirdieWidgetsTweetList * {
   background-image: none;
   background-color: transparent; }
 
-MarlinViewWindow GtkIconView.view:selected,
-MarlinViewWindow GtkIconView.view:selected:focus,
-MarlinViewWindow GtkIconView.view:selected:hover,
-MarlinViewWindow GtkIconView.view:selected:focus:hover {
-  background-color: transparent; }
-
-MarlinViewWindow FMListView,
-MarlinViewWindow FMColumnView {
-  outline-color: transparent; }
-
-MarlinViewWindow *:selected,
-MarlinViewWindow *:selected:focus {
+MarlinViewWindow *:selected, MarlinViewWindow *:selected:focus {
   color: #ffffff;
   background-color: #5294E2;
   outline-color: transparent; }
 
+MarlinViewWindow GtkIconView.view:selected, MarlinViewWindow GtkIconView.view:selected:focus, MarlinViewWindow GtkIconView.view:selected:hover, MarlinViewWindow GtkIconView.view:selected:focus:hover {
+  background-color: transparent; }
+
+MarlinViewWindow FMListView, MarlinViewWindow FMColumnView {
+  outline-color: transparent; }
+
 .marlin-pathbar.pathbar {
   border-radius: 3px;
   padding-left: 4px;
@@ -3195,55 +3190,44 @@ MarlinViewWindow *:selected:focus {
   font-weight: bold;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
-
-.panel-shadow {
-  background-image: none;
-  background-color: transparent; }
-
-.panel .menu {
-  box-shadow: none; }
-
-.panel .menu .menuitem {
-  font-weight: normal;
-  text-shadow: none;
-  icon-shadow: none; }
-
-.panel .menubar > .menuitem {
-  padding: 3px 6px; }
-
-.panel .menubar > .menuitem:hover {
-  background-color: transparent; }
-
-.panel .window-frame.menu.csd,
-.panel .window-frame.popup.csd {
-  box-shadow: none; }
-
-.panel .menu .window-frame.menu.csd,
-.panel .menu .window-frame.popup.csd {
-  box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); }
+  .panel-shadow {
+    background-image: none;
+    background-color: transparent; }
+  .panel .menu {
+    box-shadow: none; }
+    .panel .menu .menuitem {
+      font-weight: normal;
+      text-shadow: none;
+      icon-shadow: none; }
+    .panel .menu .window-frame.menu.csd,
+    .panel .menu .window-frame.popup.csd {
+      box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); }
+  .panel .menubar > .menuitem {
+    padding: 3px 6px; }
+    .panel .menubar > .menuitem:hover {
+      background-color: transparent; }
+  .panel .window-frame.menu.csd,
+  .panel .window-frame.popup.csd {
+    box-shadow: none; }
 
 .composited-indicator {
   background-color: transparent;
   color: white;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
-
-.composited-indicator > GtkWidget > GtkWidget:first-child {
-  padding: 0 2px; }
+  .composited-indicator > GtkWidget > GtkWidget:first-child {
+    padding: 0 2px; }
+  .composited-indicator .menuitem:active, .composited-indicator .menuitem:prelight {
+    border-style: none;
+    background-image: none;
+    box-shadow: none; }
+  .composited-indicator > .popup > .menu {
+    padding-top: 8px;
+    padding-bottom: 8px; }
 
 .panel-app-button > GtkWidget > GtkWidget:first-child {
   padding: 0 2px 0 4px; }
 
-.composited-indicator.menuitem:active,
-.composited-indicator.menuitem:prelight {
-  border-style: none;
-  background-image: none;
-  box-shadow: none; }
-
-.composited-indicator > .popup > .menu {
-  padding-top: 8px;
-  padding-bottom: 8px; }
-
 .panel .menu .spinner,
 .menu .spinner {
   opacity: 1; }
diff --git a/common/gtk-3.0/3.18/gtk-darker.css b/common/gtk-3.0/3.18/gtk-darker.css
index 8a7f735..3bd254a 100644
--- a/common/gtk-3.0/3.18/gtk-darker.css
+++ b/common/gtk-3.0/3.18/gtk-darker.css
@@ -3147,22 +3147,17 @@ BirdieWidgetsTweetList * {
   background-image: none;
   background-color: transparent; }
 
-MarlinViewWindow GtkIconView.view:selected,
-MarlinViewWindow GtkIconView.view:selected:focus,
-MarlinViewWindow GtkIconView.view:selected:hover,
-MarlinViewWindow GtkIconView.view:selected:focus:hover {
-  background-color: transparent; }
-
-MarlinViewWindow FMListView,
-MarlinViewWindow FMColumnView {
-  outline-color: transparent; }
-
-MarlinViewWindow *:selected,
-MarlinViewWindow *:selected:focus {
+MarlinViewWindow *:selected, MarlinViewWindow *:selected:focus {
   color: #ffffff;
   background-color: #5294E2;
   outline-color: transparent; }
 
+MarlinViewWindow GtkIconView.view:selected, MarlinViewWindow GtkIconView.view:selected:focus, MarlinViewWindow GtkIconView.view:selected:hover, MarlinViewWindow GtkIconView.view:selected:focus:hover {
+  background-color: transparent; }
+
+MarlinViewWindow FMListView, MarlinViewWindow FMColumnView {
+  outline-color: transparent; }
+
 .marlin-pathbar.pathbar {
   border-radius: 3px;
   padding-left: 4px;
@@ -3198,55 +3193,44 @@ MarlinViewWindow *:selected:focus {
   font-weight: bold;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
-
-.panel-shadow {
-  background-image: none;
-  background-color: transparent; }
-
-.panel .menu {
-  box-shadow: none; }
-
-.panel .menu .menuitem {
-  font-weight: normal;
-  text-shadow: none;
-  icon-shadow: none; }
-
-.panel .menubar > .menuitem {
-  padding: 3px 6px; }
-
-.panel .menubar > .menuitem:hover {
-  background-color: transparent; }
-
-.panel .window-frame.menu.csd,
-.panel .window-frame.popup.csd {
-  box-shadow: none; }
-
-.panel .menu .window-frame.menu.csd,
-.panel .menu .window-frame.popup.csd {
-  box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); }
+  .panel-shadow {
+    background-image: none;
+    background-color: transparent; }
+  .panel .menu {
+    box-shadow: none; }
+    .panel .menu .menuitem {
+      font-weight: normal;
+      text-shadow: none;
+      icon-shadow: none; }
+    .panel .menu .window-frame.menu.csd,
+    .panel .menu .window-frame.popup.csd {
+      box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); }
+  .panel .menubar > .menuitem {
+    padding: 3px 6px; }
+    .panel .menubar > .menuitem:hover {
+      background-color: transparent; }
+  .panel .window-frame.menu.csd,
+  .panel .window-frame.popup.csd {
+    box-shadow: none; }
 
 .composited-indicator {
   background-color: transparent;
   color: white;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
-
-.composited-indicator > GtkWidget > GtkWidget:first-child {
-  padding: 0 2px; }
+  .composited-indicator > GtkWidget > GtkWidget:first-child {
+    padding: 0 2px; }
+  .composited-indicator .menuitem:active, .composited-indicator .menuitem:prelight {
+    border-style: none;
+    background-image: none;
+    box-shadow: none; }
+  .composited-indicator > .popup > .menu {
+    padding-top: 8px;
+    padding-bottom: 8px; }
 
 .panel-app-button > GtkWidget > GtkWidget:first-child {
   padding: 0 2px 0 4px; }
 
-.composited-indicator.menuitem:active,
-.composited-indicator.menuitem:prelight {
-  border-style: none;
-  background-image: none;
-  box-shadow: none; }
-
-.composited-indicator > .popup > .menu {
-  padding-top: 8px;
-  padding-bottom: 8px; }
-
 .panel .menu .spinner,
 .menu .spinner {
   opacity: 1; }
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 f16a2d3..58ab25e 100644
--- a/common/gtk-3.0/3.18/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.18/gtk-solid-dark.css
@@ -3144,22 +3144,17 @@ BirdieWidgetsTweetList * {
   background-image: none;
   background-color: transparent; }
 
-MarlinViewWindow GtkIconView.view:selected,
-MarlinViewWindow GtkIconView.view:selected:focus,
-MarlinViewWindow GtkIconView.view:selected:hover,
-MarlinViewWindow GtkIconView.view:selected:focus:hover {
-  background-color: transparent; }
-
-MarlinViewWindow FMListView,
-MarlinViewWindow FMColumnView {
-  outline-color: transparent; }
-
-MarlinViewWindow *:selected,
-MarlinViewWindow *:selected:focus {
+MarlinViewWindow *:selected, MarlinViewWindow *:selected:focus {
   color: #ffffff;
   background-color: #5294E2;
   outline-color: transparent; }
 
+MarlinViewWindow GtkIconView.view:selected, MarlinViewWindow GtkIconView.view:selected:focus, MarlinViewWindow GtkIconView.view:selected:hover, MarlinViewWindow GtkIconView.view:selected:focus:hover {
+  background-color: transparent; }
+
+MarlinViewWindow FMListView, MarlinViewWindow FMColumnView {
+  outline-color: transparent; }
+
 .marlin-pathbar.pathbar {
   border-radius: 3px;
   padding-left: 4px;
@@ -3195,55 +3190,44 @@ MarlinViewWindow *:selected:focus {
   font-weight: bold;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
-
-.panel-shadow {
-  background-image: none;
-  background-color: transparent; }
-
-.panel .menu {
-  box-shadow: none; }
-
-.panel .menu .menuitem {
-  font-weight: normal;
-  text-shadow: none;
-  icon-shadow: none; }
-
-.panel .menubar > .menuitem {
-  padding: 3px 6px; }
-
-.panel .menubar > .menuitem:hover {
-  background-color: transparent; }
-
-.panel .window-frame.menu.csd,
-.panel .window-frame.popup.csd {
-  box-shadow: none; }
-
-.panel .menu .window-frame.menu.csd,
-.panel .menu .window-frame.popup.csd {
-  box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); }
+  .panel-shadow {
+    background-image: none;
+    background-color: transparent; }
+  .panel .menu {
+    box-shadow: none; }
+    .panel .menu .menuitem {
+      font-weight: normal;
+      text-shadow: none;
+      icon-shadow: none; }
+    .panel .menu .window-frame.menu.csd,
+    .panel .menu .window-frame.popup.csd {
+      box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); }
+  .panel .menubar > .menuitem {
+    padding: 3px 6px; }
+    .panel .menubar > .menuitem:hover {
+      background-color: transparent; }
+  .panel .window-frame.menu.csd,
+  .panel .window-frame.popup.csd {
+    box-shadow: none; }
 
 .composited-indicator {
   background-color: transparent;
   color: white;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
-
-.composited-indicator > GtkWidget > GtkWidget:first-child {
-  padding: 0 2px; }
+  .composited-indicator > GtkWidget > GtkWidget:first-child {
+    padding: 0 2px; }
+  .composited-indicator .menuitem:active, .composited-indicator .menuitem:prelight {
+    border-style: none;
+    background-image: none;
+    box-shadow: none; }
+  .composited-indicator > .popup > .menu {
+    padding-top: 8px;
+    padding-bottom: 8px; }
 
 .panel-app-button > GtkWidget > GtkWidget:first-child {
   padding: 0 2px 0 4px; }
 
-.composited-indicator.menuitem:active,
-.composited-indicator.menuitem:prelight {
-  border-style: none;
-  background-image: none;
-  box-shadow: none; }
-
-.composited-indicator > .popup > .menu {
-  padding-top: 8px;
-  padding-bottom: 8px; }
-
 .panel .menu .spinner,
 .menu .spinner {
   opacity: 1; }
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 d3f7513..42afe55 100644
--- a/common/gtk-3.0/3.18/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.18/gtk-solid-darker.css
@@ -3147,22 +3147,17 @@ BirdieWidgetsTweetList * {
   background-image: none;
   background-color: transparent; }
 
-MarlinViewWindow GtkIconView.view:selected,
-MarlinViewWindow GtkIconView.view:selected:focus,
-MarlinViewWindow GtkIconView.view:selected:hover,
-MarlinViewWindow GtkIconView.view:selected:focus:hover {
-  background-color: transparent; }
-
-MarlinViewWindow FMListView,
-MarlinViewWindow FMColumnView {
-  outline-color: transparent; }
-
-MarlinViewWindow *:selected,
-MarlinViewWindow *:selected:focus {
+MarlinViewWindow *:selected, MarlinViewWindow *:selected:focus {
   color: #ffffff;
   background-color: #5294E2;
   outline-color: transparent; }
 
+MarlinViewWindow GtkIconView.view:selected, MarlinViewWindow GtkIconView.view:selected:focus, MarlinViewWindow GtkIconView.view:selected:hover, MarlinViewWindow GtkIconView.view:selected:focus:hover {
+  background-color: transparent; }
+
+MarlinViewWindow FMListView, MarlinViewWindow FMColumnView {
+  outline-color: transparent; }
+
 .marlin-pathbar.pathbar {
   border-radius: 3px;
   padding-left: 4px;
@@ -3198,55 +3193,44 @@ MarlinViewWindow *:selected:focus {
   font-weight: bold;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
-
-.panel-shadow {
-  background-image: none;
-  background-color: transparent; }
-
-.panel .menu {
-  box-shadow: none; }
-
-.panel .menu .menuitem {
-  font-weight: normal;
-  text-shadow: none;
-  icon-shadow: none; }
-
-.panel .menubar > .menuitem {
-  padding: 3px 6px; }
-
-.panel .menubar > .menuitem:hover {
-  background-color: transparent; }
-
-.panel .window-frame.menu.csd,
-.panel .window-frame.popup.csd {
-  box-shadow: none; }
-
-.panel .menu .window-frame.menu.csd,
-.panel .menu .window-frame.popup.csd {
-  box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); }
+  .panel-shadow {
+    background-image: none;
+    background-color: transparent; }
+  .panel .menu {
+    box-shadow: none; }
+    .panel .menu .menuitem {
+      font-weight: normal;
+      text-shadow: none;
+      icon-shadow: none; }
+    .panel .menu .window-frame.menu.csd,
+    .panel .menu .window-frame.popup.csd {
+      box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); }
+  .panel .menubar > .menuitem {
+    padding: 3px 6px; }
+    .panel .menubar > .menuitem:hover {
+      background-color: transparent; }
+  .panel .window-frame.menu.csd,
+  .panel .window-frame.popup.csd {
+    box-shadow: none; }
 
 .composited-indicator {
   background-color: transparent;
   color: white;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
-
-.composited-indicator > GtkWidget > GtkWidget:first-child {
-  padding: 0 2px; }
+  .composited-indicator > GtkWidget > GtkWidget:first-child {
+    padding: 0 2px; }
+  .composited-indicator .menuitem:active, .composited-indicator .menuitem:prelight {
+    border-style: none;
+    background-image: none;
+    box-shadow: none; }
+  .composited-indicator > .popup > .menu {
+    padding-top: 8px;
+    padding-bottom: 8px; }
 
 .panel-app-button > GtkWidget > GtkWidget:first-child {
   padding: 0 2px 0 4px; }
 
-.composited-indicator.menuitem:active,
-.composited-indicator.menuitem:prelight {
-  border-style: none;
-  background-image: none;
-  box-shadow: none; }
-
-.composited-indicator > .popup > .menu {
-  padding-top: 8px;
-  padding-bottom: 8px; }
-
 .panel .menu .spinner,
 .menu .spinner {
   opacity: 1; }
diff --git a/common/gtk-3.0/3.18/gtk-solid.css b/common/gtk-3.0/3.18/gtk-solid.css
index 6a1d0dd..773ff78 100644
--- a/common/gtk-3.0/3.18/gtk-solid.css
+++ b/common/gtk-3.0/3.18/gtk-solid.css
@@ -3151,22 +3151,17 @@ BirdieWidgetsTweetList * {
   background-image: none;
   background-color: transparent; }
 
-MarlinViewWindow GtkIconView.view:selected,
-MarlinViewWindow GtkIconView.view:selected:focus,
-MarlinViewWindow GtkIconView.view:selected:hover,
-MarlinViewWindow GtkIconView.view:selected:focus:hover {
-  background-color: transparent; }
-
-MarlinViewWindow FMListView,
-MarlinViewWindow FMColumnView {
-  outline-color: transparent; }
-
-MarlinViewWindow *:selected,
-MarlinViewWindow *:selected:focus {
+MarlinViewWindow *:selected, MarlinViewWindow *:selected:focus {
   color: #ffffff;
   background-color: #5294E2;
   outline-color: transparent; }
 
+MarlinViewWindow GtkIconView.view:selected, MarlinViewWindow GtkIconView.view:selected:focus, MarlinViewWindow GtkIconView.view:selected:hover, MarlinViewWindow GtkIconView.view:selected:focus:hover {
+  background-color: transparent; }
+
+MarlinViewWindow FMListView, MarlinViewWindow FMColumnView {
+  outline-color: transparent; }
+
 .marlin-pathbar.pathbar {
   border-radius: 3px;
   padding-left: 4px;
@@ -3202,55 +3197,44 @@ MarlinViewWindow *:selected:focus {
   font-weight: bold;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
-
-.panel-shadow {
-  background-image: none;
-  background-color: transparent; }
-
-.panel .menu {
-  box-shadow: none; }
-
-.panel .menu .menuitem {
-  font-weight: normal;
-  text-shadow: none;
-  icon-shadow: none; }
-
-.panel .menubar > .menuitem {
-  padding: 3px 6px; }
-
-.panel .menubar > .menuitem:hover {
-  background-color: transparent; }
-
-.panel .window-frame.menu.csd,
-.panel .window-frame.popup.csd {
-  box-shadow: none; }
-
-.panel .menu .window-frame.menu.csd,
-.panel .menu .window-frame.popup.csd {
-  box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); }
+  .panel-shadow {
+    background-image: none;
+    background-color: transparent; }
+  .panel .menu {
+    box-shadow: none; }
+    .panel .menu .menuitem {
+      font-weight: normal;
+      text-shadow: none;
+      icon-shadow: none; }
+    .panel .menu .window-frame.menu.csd,
+    .panel .menu .window-frame.popup.csd {
+      box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); }
+  .panel .menubar > .menuitem {
+    padding: 3px 6px; }
+    .panel .menubar > .menuitem:hover {
+      background-color: transparent; }
+  .panel .window-frame.menu.csd,
+  .panel .window-frame.popup.csd {
+    box-shadow: none; }
 
 .composited-indicator {
   background-color: transparent;
   color: white;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
-
-.composited-indicator > GtkWidget > GtkWidget:first-child {
-  padding: 0 2px; }
+  .composited-indicator > GtkWidget > GtkWidget:first-child {
+    padding: 0 2px; }
+  .composited-indicator .menuitem:active, .composited-indicator .menuitem:prelight {
+    border-style: none;
+    background-image: none;
+    box-shadow: none; }
+  .composited-indicator > .popup > .menu {
+    padding-top: 8px;
+    padding-bottom: 8px; }
 
 .panel-app-button > GtkWidget > GtkWidget:first-child {
   padding: 0 2px 0 4px; }
 
-.composited-indicator.menuitem:active,
-.composited-indicator.menuitem:prelight {
-  border-style: none;
-  background-image: none;
-  box-shadow: none; }
-
-.composited-indicator > .popup > .menu {
-  padding-top: 8px;
-  padding-bottom: 8px; }
-
 .panel .menu .spinner,
 .menu .spinner {
   opacity: 1; }
diff --git a/common/gtk-3.0/3.18/gtk.css b/common/gtk-3.0/3.18/gtk.css
index ffd9ba5..752380c 100644
--- a/common/gtk-3.0/3.18/gtk.css
+++ b/common/gtk-3.0/3.18/gtk.css
@@ -3151,22 +3151,17 @@ BirdieWidgetsTweetList * {
   background-image: none;
   background-color: transparent; }
 
-MarlinViewWindow GtkIconView.view:selected,
-MarlinViewWindow GtkIconView.view:selected:focus,
-MarlinViewWindow GtkIconView.view:selected:hover,
-MarlinViewWindow GtkIconView.view:selected:focus:hover {
-  background-color: transparent; }
-
-MarlinViewWindow FMListView,
-MarlinViewWindow FMColumnView {
-  outline-color: transparent; }
-
-MarlinViewWindow *:selected,
-MarlinViewWindow *:selected:focus {
+MarlinViewWindow *:selected, MarlinViewWindow *:selected:focus {
   color: #ffffff;
   background-color: #5294E2;
   outline-color: transparent; }
 
+MarlinViewWindow GtkIconView.view:selected, MarlinViewWindow GtkIconView.view:selected:focus, MarlinViewWindow GtkIconView.view:selected:hover, MarlinViewWindow GtkIconView.view:selected:focus:hover {
+  background-color: transparent; }
+
+MarlinViewWindow FMListView, MarlinViewWindow FMColumnView {
+  outline-color: transparent; }
+
 .marlin-pathbar.pathbar {
   border-radius: 3px;
   padding-left: 4px;
@@ -3202,55 +3197,44 @@ MarlinViewWindow *:selected:focus {
   font-weight: bold;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
-
-.panel-shadow {
-  background-image: none;
-  background-color: transparent; }
-
-.panel .menu {
-  box-shadow: none; }
-
-.panel .menu .menuitem {
-  font-weight: normal;
-  text-shadow: none;
-  icon-shadow: none; }
-
-.panel .menubar > .menuitem {
-  padding: 3px 6px; }
-
-.panel .menubar > .menuitem:hover {
-  background-color: transparent; }
-
-.panel .window-frame.menu.csd,
-.panel .window-frame.popup.csd {
-  box-shadow: none; }
-
-.panel .menu .window-frame.menu.csd,
-.panel .menu .window-frame.popup.csd {
-  box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); }
+  .panel-shadow {
+    background-image: none;
+    background-color: transparent; }
+  .panel .menu {
+    box-shadow: none; }
+    .panel .menu .menuitem {
+      font-weight: normal;
+      text-shadow: none;
+      icon-shadow: none; }
+    .panel .menu .window-frame.menu.csd,
+    .panel .menu .window-frame.popup.csd {
+      box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2), 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); }
+  .panel .menubar > .menuitem {
+    padding: 3px 6px; }
+    .panel .menubar > .menuitem:hover {
+      background-color: transparent; }
+  .panel .window-frame.menu.csd,
+  .panel .window-frame.popup.csd {
+    box-shadow: none; }
 
 .composited-indicator {
   background-color: transparent;
   color: white;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
   icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); }
-
-.composited-indicator > GtkWidget > GtkWidget:first-child {
-  padding: 0 2px; }
+  .composited-indicator > GtkWidget > GtkWidget:first-child {
+    padding: 0 2px; }
+  .composited-indicator .menuitem:active, .composited-indicator .menuitem:prelight {
+    border-style: none;
+    background-image: none;
+    box-shadow: none; }
+  .composited-indicator > .popup > .menu {
+    padding-top: 8px;
+    padding-bottom: 8px; }
 
 .panel-app-button > GtkWidget > GtkWidget:first-child {
   padding: 0 2px 0 4px; }
 
-.composited-indicator.menuitem:active,
-.composited-indicator.menuitem:prelight {
-  border-style: none;
-  background-image: none;
-  box-shadow: none; }
-
-.composited-indicator > .popup > .menu {
-  padding-top: 8px;
-  padding-bottom: 8px; }
-
 .panel .menu .spinner,
 .menu .spinner {
   opacity: 1; }
diff --git a/common/gtk-3.0/3.18/sass/_applications.scss b/common/gtk-3.0/3.18/sass/_applications.scss
index 5c7f645..e241b5a 100644
--- a/common/gtk-3.0/3.18/sass/_applications.scss
+++ b/common/gtk-3.0/3.18/sass/_applications.scss
@@ -642,23 +642,17 @@ BirdieWidgetsTweetList * {
 //
 // Marlin / Pantheon Files
 //
-MarlinViewWindow GtkIconView.view:selected,
-MarlinViewWindow GtkIconView.view:selected:focus,
-MarlinViewWindow GtkIconView.view:selected:hover,
-MarlinViewWindow GtkIconView.view:selected:focus:hover {
-  background-color: transparent;
-}
-
-MarlinViewWindow FMListView,
-MarlinViewWindow FMColumnView {
-  outline-color: transparent;
-}
+MarlinViewWindow {
 
-MarlinViewWindow *:selected,
-MarlinViewWindow *:selected:focus {
-	color: $selected_fg_color;
-	background-color: $selected_bg_color;
-  outline-color: transparent;
+  *:selected, *:selected:focus {
+    color: $selected_fg_color;
+    background-color: $selected_bg_color;
+    outline-color: transparent;
+  }
+  GtkIconView.view:selected {
+    &, &:focus, &:hover, &:focus:hover { background-color: transparent; }
+  }
+  FMListView, FMColumnView { outline-color: transparent; }
 }
 
 .marlin-pathbar.pathbar {
@@ -701,37 +695,33 @@ MarlinViewWindow *:selected:focus {
   font-weight: bold;
   text-shadow: 0 1px 2px transparentize(black, 0.4);
   icon-shadow: 0 1px 2px transparentize(black, 0.4);
-}
-
-.panel-shadow {
-  background-image: none;
-  background-color: transparent;
-}
-
-.panel .menu {
-  box-shadow: none;
-}
-
-.panel .menu .menuitem {
-  font-weight: normal;
-  text-shadow: none;
-  icon-shadow: none;
-}
-
-.panel .menubar > .menuitem { padding: 3px 6px; }
 
-.panel .menubar > .menuitem:hover { background-color: transparent; }
+  &-shadow {
+    background-image: none;
+    background-color: transparent;
+  }
+  .menu {
+    box-shadow: none;
 
-.panel .window-frame.menu.csd,
-.panel .window-frame.popup.csd {
-  box-shadow: none;
-}
+    .menuitem {
+      font-weight: normal;
+      text-shadow: none;
+      icon-shadow: none;
+    }
 
-.panel .menu .window-frame.menu.csd,
-.panel .menu .window-frame.popup.csd {
-  box-shadow: 0 0 0 1px transparentize(black, 0.8),
-              0 10px 20px transparentize(black, 0.81),
-              0 6px 6px transparentize(black, 0.77);
+    .window-frame.menu.csd,
+    .window-frame.popup.csd {
+      box-shadow: 0 0 0 1px transparentize(black, 0.8),
+                  0 10px 20px transparentize(black, 0.81),
+                  0 6px 6px transparentize(black, 0.77);
+    }
+  }
+  .menubar > .menuitem {
+    padding: 3px 6px;
+    &:hover { background-color: transparent; }
+  }
+  .window-frame.menu.csd,
+  .window-frame.popup.csd { box-shadow: none; }
 }
 
 .composited-indicator {
@@ -739,28 +729,24 @@ MarlinViewWindow *:selected:focus {
   color: white;
   text-shadow: 0 1px 2px transparentize(black, 0.4);
   icon-shadow: 0 1px 2px transparentize(black, 0.4);
-}
 
-.composited-indicator > GtkWidget > GtkWidget:first-child {
-  padding: 0 2px;
+  > GtkWidget > GtkWidget:first-child { padding: 0 2px; }
+
+  .menuitem:active, .menuitem:prelight {
+    border-style: none;
+    background-image: none;
+    box-shadow: none;
+  }
+  > .popup > .menu {
+    padding-top: 8px;
+    padding-bottom: 8px;
+  }
 }
 
 .panel-app-button > GtkWidget > GtkWidget:first-child {
   padding: 0 2px 0 4px;
 }
 
-.composited-indicator.menuitem:active,
-.composited-indicator.menuitem:prelight {
-  border-style: none;
-  background-image: none;
-  box-shadow: none;
-}
-
-.composited-indicator > .popup > .menu {
-  padding-top: 8px;
-  padding-bottom: 8px;
-}
-
 .panel .menu .spinner,
 .menu .spinner { opacity: 1 } // Fixes sound indicator buttons