diff --git a/src/main.sh b/src/main.sh
index aed1ae0..a9f0b57 100755
--- a/src/main.sh
+++ b/src/main.sh
@@ -136,6 +136,7 @@ while true; do
           --ansi \
           --reverse \
           --delimiter="\t" \
+          --prompt="$(printf "$ARTIST_PROMPT" "$3")" \
           --accept-nth="{2}" \
           --with-nth="{1}"
     )
@@ -150,13 +151,14 @@ while true; do
           --no-sort \
           --disabled \
           --delimiter="\t" \
-          --accept-nth="{1}" \
+          --prompt="$SEARCH_PROMPT" \
+          --accept-nth="{1} {2}" \
           --with-nth="{2}" \
           --preview-window="wrap" \
           --preview="$0 --internal-preview-artist {1}" \
           --bind="change:execute-silent($0 --internal-search \$FZF_QUERY &)+reload($0 --internal-reload)"
     )
-    [ "$sel" ] && set -- "--show-artist" "$sel"
+    [ "$sel" ] && set -- "--show-artist" "$(echo "$sel" | cut -d " " -f 1)" "$(echo "$sel" | cut -d " " -f2-)"
     ;;
   esac
 done
diff --git a/src/sh/theme.sh b/src/sh/theme.sh
index d60ea39..85bec0a 100644
--- a/src/sh/theme.sh
+++ b/src/sh/theme.sh
@@ -34,3 +34,13 @@ export FORMAT_PERSON FORMAT_GROUP FORMAT_DISAMBIGUATION \
   FORMAT_TYPE_SECONDARY_INTERVIEW FORMAT_TYPE_SECONDARY_AUDIOBOOK FORMAT_TYPE_SECONDARY_AUDIODRAMA \
   FORMAT_TYPE_SECONDARY_LIVE FORMAT_TYPE_SECONDARY_REMIX FORMAT_TYPE_SECONDARY_DJMIX FORMAT_TYPE_SECONDARY_MIXTAPE \
   FORMAT_TYPE_SECONDARY_DEMO FORMAT_TYPE_SECONDARY_FIELDREC
+
+SEARCH_PROMPT=${SEARCH_PROMPT:-"🔎 search〉"}
+ARTIST_PROMPT="${ARTIST_PROMPT:-"🎤 ${COLOR_ARTIST}%s$COLOR_RESET 〉"}"
+export SEARCH_PROMPT ARTIST_PROMPT
+#BROWSE_PROMPT_ROOT="${BROWSE_PROMPT_ROOT:-"$SEARCH_PROMPT"}"
+#BROWSE_PROMPT_ARTIST="${BROWSE_PROMPT_ARTIST:-"$AFMT 〉"}"
+#BROWSE_PROMPT_RELEASE="${BROWSE_PROMPT_RELEASE:-"$AFMT 》 $RFMT 〉"}"
+#AFMT="${AFMT:-"🎤 ${ARTIST_COLOR}%s${OFF}"}"
+#RFMT="${RFMT:-"💽 ${RELEASE_COLOR}%s${OFF}"}"
+#TFMT="${TFMT:-"🎵 ${TRACK_COLOR}%s${OFF}"}"