diff --git a/spmenuify b/spmenuify
index b9e5e94..8cc1e22 100755
--- a/spmenuify
+++ b/spmenuify
@@ -50,19 +50,19 @@ print_theme_list() {
 print_theme_list_t() {
     find "$THEME_DIR" -type f > /tmp/list
 
-    if [ -z "$(cat /tmp/list)" ]; then
-        printf "%b%s\n" "\033[0;31m" "No themes installed."
-    else
-        while read -r l; do
-            file="$(basename "$l")"
-            printf "%s" "$l" | grep -qE "[.]desc|[.]png" && continue
-            if [ -f "${l}.png" ] && [ "$ENABLE_IMAGE_PREVIEW" = "true" ]; then
-                printf "img://%s\t%s\n" "${l}.png" "${file}"
-            else
-                printf "%s\n" "${file}"
-            fi
-        done < "/tmp/list"; rm -f /tmp/list
-    fi
+    while read -r l; do
+        file="$(basename "$l")"
+        printf "%s" "$l" | grep -qE "[.]desc|[.]png" && continue
+        if [ -f "${l}.png" ] && [ "$ENABLE_IMAGE_PREVIEW" = "true" ]; then
+            printf "img://%s\t%s\n" "${l}.png" "${file}"
+            set=true
+        else
+            printf "%s\n" "${file}"
+            set=true
+        fi
+    done < "/tmp/list"; rm -f /tmp/list
+
+    [ "$set" != "true" ] && printf "%b%s\n" "\033[0;31m" "No themes installed."
 }
 
 check_spmenu_ver() {
@@ -114,7 +114,7 @@ opt_theme() {
     case "$o" in
         "Remove")
             [ "$(printf "Yes\nNo\n" | spmenu --require-match --lines 40 --columns 1 --prompt "Remove themes?" --no-allow-typing --hide-mode --hide-input --hide-match-count --hide-left-arrow --hide-right-arrow --hide-highlighting --hide-caps --normal)" != "Yes" ] && main && exit 0
-            rm -f "$THEME_DIR/$output"
+            rm -f "$THEME_DIR/$output" "$THEME_DIR/$output*"
             main && exit 0
         ;;
         "View")