diff --git a/install.sh b/install.sh
index cf6f4e02..68932bf3 100755
--- a/install.sh
+++ b/install.sh
@@ -720,10 +720,19 @@ uninstall_theme() {
 
 clean_theme() {
   if [[ "$UID" != "$ROOT_UID" ]]; then
-#    local DEST_DIR="$HOME/.themes"
-#    uninstall_theme
-    local DEST_DIR="$HOME/.local/share/themes"
-    uninstall_theme
+    if [[ "$DEST_DIR" == "$HOME/.themes" ]]; then
+      local dest="$HOME/.local/share/themes"
+    fi
+
+    for theme in "${themes[@]}"; do
+      for color in "${colors[@]}"; do
+        for size in "${sizes[@]}"; do
+          for scheme in "${schemes[@]}"; do
+            uninstall "${dest}" "${name:-$THEME_NAME}" "$theme" "$color" "$size" "$scheme"
+          done
+        done
+      done
+    done
   fi
 }
 
diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index 752a8b43..db3dbf91 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -301,16 +301,6 @@ spinner {
 entry {
   @extend %entry_basic;
 
-  .background:not(.csd) & {
-    @include entry(solid);
-
-    &:focus { @include entry(solid-checked); }
-
-    &:drop(active) { @include entry(solid-hover); }
-
-    &:disabled { @include entry(solid-disabled); }
-  }
-
   &.flat {
     min-height: 0;
     padding: 2px;
diff --git a/src/sass/gtk/apps/_misc.scss b/src/sass/gtk/apps/_misc.scss
index 4482ad6b..d88e6dc3 100644
--- a/src/sass/gtk/apps/_misc.scss
+++ b/src/sass/gtk/apps/_misc.scss
@@ -139,7 +139,7 @@ tooltip.background.chromium { background-color: rgba($tooltip, 1); }
 
 
 //
-// Firefox *
+// Firefox
 //
 #MozillaGtkWidget {
   decoration { border: none; }
@@ -254,7 +254,7 @@ window.background:not(.csd) {
 }
 
 //
-// Inkscape *
+// Inkscape
 //
 
 #ToolboxCommon {
@@ -336,13 +336,13 @@ scrolledwindow#DialogNotebook {
 
 
 //
-// Synapse *
+// Synapse
 //
 box.vertical > widget > widget:selected { @extend %selected_items; }
 
 
 //
-// Libreoffice *
+// Libreoffice
 //
 window.background {
   > grid > widget > widget > scrolledwindow > viewport > grid > box > box > frame > box {
@@ -352,7 +352,7 @@ window.background {
 
 
 //
-// Pamac *
+// Pamac
 //
 window.background.csd {
   > box.vertical > overlay > stack > box.vertical > box.horizontal {
@@ -382,3 +382,15 @@ window.background:not(.csd):not(.solid-csd) {
     background-color: $base-alt;
   }
 }
+
+//
+// FileZilla
+//
+
+window.background:not(.csd) {
+  > box > widget > widget > widget > widget > widget > widget > widget > scrolledwindow {
+    entry:focus {
+      background-color: if($variant == 'light', mix(black, $background, 5%), mix(white, $background, 5%));
+    }
+  }
+}