diff --git a/scripts/.local/bin/musmenu b/scripts/.local/bin/musmenu
index 87563aa..fbcc15c 100755
--- a/scripts/.local/bin/musmenu
+++ b/scripts/.local/bin/musmenu
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-menu=bmenu
+menu=wdmenu
 
 search(){
     music=$(mpc playlist --format '%artist% : %title%' | sed '/^ : $/d' | $menu)
diff --git a/scripts/.local/bin/pulse-sink b/scripts/.local/bin/pulse-sink
index a117dbc..fcb6f95 100755
--- a/scripts/.local/bin/pulse-sink
+++ b/scripts/.local/bin/pulse-sink
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 opts="Fone\nSpeaker\nHDMI"
-out=$(echo -e $opts | bmenu -p "Saida:")
+out=$(echo -e $opts | wdmenu -p "Saida:")
 vol=$(pamixer --get-volume)
 
 if [ "$out" == "HDMI" ]
diff --git a/scripts/.local/bin/wdmenu b/scripts/.local/bin/wdmenu
new file mode 100755
index 0000000..90a2f6a
--- /dev/null
+++ b/scripts/.local/bin/wdmenu
@@ -0,0 +1,6 @@
+#!/bin/fish
+
+command -qs wofi &&
+    exec wofi -d $argv
+command -qs bmenu &&
+    exec bemenu $argv
diff --git a/scripts/.local/bin/wpass b/scripts/.local/bin/wpass
index 4693def..863f16f 100755
--- a/scripts/.local/bin/wpass
+++ b/scripts/.local/bin/wpass
@@ -18,14 +18,14 @@ done
 entry=$(printf '%s\n' "${password_files[@]}" | 
         sort | uniq -c | sort -r | 
         sed 's/ *[0-9]* //'|
-        bmenu "$@")
+        wdmenu -p Password $@)
 
 [ -n "$entry" ] && echo "$entry" >> $CACHE || exit
 
 username=$( pass show "$entry" 2>/dev/null | perl -ne 'print $1 if /^login: (.*)/' )
 password=$( pass show "$entry" 2>/dev/null | head -n 1 )
 
-case $(echo -e "Autotype\nUsername -> $username\nPassword" | bmenu) in
+case $(echo -e "Autotype\nUsername -> $username\nPassword" | wdmenu -p Action) in
     Autotype)
         ydotool type "$username"
         ydotool key tab