10 files changed, 17 insertions, 16 deletions
diff --git a/dotfiles/.scripts/menublk b/dotfiles/.scripts/menublk
index f3a6f0b..0ca0607 100755
--- a/dotfiles/.scripts/menublk
+++ b/dotfiles/.scripts/menublk
@@ -51,7 +51,7 @@ mount_dev() {
     fstype="$(lsblk -r -o FSTYPE "/dev/$1" | tail -n 1)"
     part="/dev/$1"
     if [ "$fstype" = "crypto_LUKS" ]; then
-        password="$(bemenu -p "Enter passphrase for encrypted drive:" $BEMENU_CREDS_OPTIONS)"
+        password="$(bemenu -p "Enter passphrase for encrypted drive:" --tf="$BEMENU_TF" --tb="$BEMENU_NB" --ff="$BEMENU_NB" --fb="$BEMENU_NB" --fn="$BEMENU_FN" --nb="$BEMENU_NB" --nf="$BEMENU_NF" --hf="$BEMENU_HF" --hb="$BEMENU_HB")"
         if [ -z "$password" ]; then
             exit 0
         fi
@@ -86,17 +86,17 @@ unmount_dev() {
     fi
 }
 
-action="$(printf "mount\nunmount\n" | bemenu -p "What to do?" $BEMENU_OPTIONS)"
+action="$(printf "mount\nunmount\n" | bemenu -p "What to do?" --tf="$BEMENU_TF" --tb="$BEMENU_NB" --fb="$BEMENU_NB" --fn="$BEMENU_FN" --nb="$BEMENU_NB" --nf="$BEMENU_NF" --hf="$BEMENU_HF" --hb="$BEMENU_HB")"
 
 case "$action" in
     mount)
-        blkdev="$(get_mountable | bemenu -p "Choose device to mount:" $BEMENU_OPTIONS)"
+        blkdev="$(get_mountable | bemenu -p "Choose device to mount:" --tf="$BEMENU_TF" --tb="$BEMENU_NB" --fb="$BEMENU_NB" --fn="$BEMENU_FN" --nb="$BEMENU_NB" --nf="$BEMENU_NF" --hf="$BEMENU_HF" --hb="$BEMENU_HB")"
         if [ -z "$blkdev" ]; then
             exit 0
         fi
         mount_dev "$blkdev";;
     unmount)
-        blkdev="$(get_unmountable | bemenu -p "Choose device to umount:" $BEMENU_OPTIONS)"
+        blkdev="$(get_unmountable | bemenu -p "Choose device to umount:" --tf="$BEMENU_TF" --tb="$BEMENU_NB" --fb="$BEMENU_NB" --fn="$BEMENU_FN" --nb="$BEMENU_NB" --nf="$BEMENU_NF" --hf="$BEMENU_HF" --hb="$BEMENU_HB")"
         if [ -z "$blkdev" ]; then
             exit 0
         fi
diff --git a/dotfiles/.scripts/menudisplay b/dotfiles/.scripts/menudisplay
index 626f97c..6064bff 100755
--- a/dotfiles/.scripts/menudisplay
+++ b/dotfiles/.scripts/menudisplay
@@ -3,12 +3,12 @@
 # Source settings from .bemenurc
 . $HOME/.bemenurc
 
-display=$(swaymsg -t get_outputs | grep -E "name" | sed "s/^.*\"name\": \"//g;s/\",$//g;" | bemenu -p "Select output: " $BEMENU_OPTIONS)
+display=$(swaymsg -t get_outputs | grep -E "name" | sed "s/^.*\"name\": \"//g;s/\",$//g;" | bemenu -p "Select output: " --tf="$BEMENU_TF" --tb="$BEMENU_NB" --fb="$BEMENU_NB" --fn="$BEMENU_FN" --nb="$BEMENU_NB" --nf="$BEMENU_NF" --hf="$BEMENU_HF" --hb="$BEMENU_HB")
 
 if [ -z $display ]; then
     exit 0
 fi
 
-action=$(printf "enable\ndisable\n" | bemenu -p "Choose action: " $BEMENU_OPTIONS)
+action=$(printf "enable\ndisable\n" | bemenu -p "Choose action: " --tf="$BEMENU_TF" --tb="$BEMENU_NB" --fb="$BEMENU_NB" --fn="$BEMENU_FN" --nb="$BEMENU_NB" --nf="$BEMENU_NF" --hf="$BEMENU_HF" --hb="$BEMENU_HB")
 
 swaymsg output $display $action
diff --git a/dotfiles/.scripts/menuducksearch b/dotfiles/.scripts/menuducksearch
index 6965b69..979c365 100755
--- a/dotfiles/.scripts/menuducksearch
+++ b/dotfiles/.scripts/menuducksearch
@@ -7,9 +7,7 @@
 # Source settings from .bemenurc
 . $HOME/.bemenurc
 
-pgrep -x dmenu && exit
-
-choice=$(echo "" | bemenu -i -p "Search DuckDuckGo:" $BEMENU_OPTIONS) || exit 1
+choice=$(echo "" | bemenu -i -p "Search DuckDuckGo:" --tf="$BEMENU_TF" --tb="$BEMENU_NB" --fb="$BEMENU_NB" --fn="$BEMENU_FN" --nb="$BEMENU_NB" --nf="$BEMENU_NF" --hf="$BEMENU_HF" --hb="$BEMENU_HB") || exit 1
 
 if [ "$choice" = ""  ]; then
 	$BROWSER "https://duckduckgo.com"
diff --git a/dotfiles/.scripts/menuemoji b/dotfiles/.scripts/menuemoji
index c21039f..8f0720c 100755
--- a/dotfiles/.scripts/menuemoji
+++ b/dotfiles/.scripts/menuemoji
@@ -5,7 +5,7 @@
 # Source settings from .bemenurc
 . $HOME/.bemenurc
 
-chosen=$(grep -v "#" ~/.emoji | bemenu -i -l 25 $BEMENU_OPTIONS)
+chosen=$(grep -v "#" ~/.emoji | bemenu -i -l 25 --tf="$BEMENU_TF" --tb="$BEMENU_NB" --fb="$BEMENU_NB" --fn="$BEMENU_FN" --nb="$BEMENU_NB" --nf="$BEMENU_NF" --hf="$BEMENU_HF" --hb="$BEMENU_HB")
 
 if [ -z $chosen ]; then
     exit 0
diff --git a/dotfiles/.scripts/menugrim b/dotfiles/.scripts/menugrim
index 6575487..bc77c11 100755
--- a/dotfiles/.scripts/menugrim
+++ b/dotfiles/.scripts/menugrim
@@ -19,7 +19,7 @@ case "$1" in
     --quick|-q)
         grim $SCROT_DIR/fullscreen-"$(date '+%y%m%d-%H%M-%S').png"; notify_saved ;;
     *)
-        case "$(printf "a selected area\ncurrent window\nfull screen\na selected area (copy)\ncurrent window (copy)\nfull screen (copy)\n" | bemenu -l 6 -i -p "Screenshot which area?" $BEMENU_OPTIONS)" in
+        case "$(printf "a selected area\ncurrent window\nfull screen\na selected area (copy)\ncurrent window (copy)\nfull screen (copy)\n" | bemenu -l 6 -i -p "Screenshot which area?" --tf="$BEMENU_TF" --tb="$BEMENU_NB" --fb="$BEMENU_NB" --fn="$BEMENU_FN" --nb="$BEMENU_NB" --nf="$BEMENU_NF" --hf="$BEMENU_HF" --hb="$BEMENU_HB")" in
             "a selected area") grim -g "$(slurp)" $SCROT_DIR/selected-"$(date '+%y%m%d-%H%M-%S').png"; notify_saved ;;
             "current window") grim -g "$(swaygetcurrentwindow)" $SCROT_DIR/window-"$(date '+%y%m%d-%H%M-%S').png"; notify_saved ;;
             "full screen") grim $SCROT_DIR/fullscreen-"$(date '+%y%m%d-%H%M-%S').png"; notify_saved ;;
diff --git a/dotfiles/.scripts/menuoutput b/dotfiles/.scripts/menuoutput
index d11d722..5e29f66 100755
--- a/dotfiles/.scripts/menuoutput
+++ b/dotfiles/.scripts/menuoutput
@@ -4,7 +4,7 @@
 # Source settings from .bemenurc
 . $HOME/.bemenurc
 
-output=$(listsinks | bemenu -p "Select audio output: " $BEMENU_OPTIONS)
+output=$(listsinks | bemenu -p "Select audio output: " --tf="$BEMENU_TF" --tb="$BEMENU_NB" --fb="$BEMENU_NB" --fn="$BEMENU_FN" --nb="$BEMENU_NB" --nf="$BEMENU_NF" --hf="$BEMENU_HF" --hb="$BEMENU_HB")
 
 [ "$output" != "" ] || exit
 
diff --git a/dotfiles/.scripts/menuprompt b/dotfiles/.scripts/menuprompt
index d744bf6..c336679 100755
--- a/dotfiles/.scripts/menuprompt
+++ b/dotfiles/.scripts/menuprompt
@@ -4,4 +4,4 @@
 # For example:
 # `./prompt "Do you want to shutdown?" "shutdown -h now"`
 
-[ "$(printf "No\\nYes" | bemenu -i -p "$1" --nb darkred --hb red --hf white -nf gray )" = "Yes" ] && $2
+[ "$(printf "No\\nYes" | bemenu -i -p "$1" --tf="$BEMENU_TF" --tb="$BEMENU_NB" --fb="$BEMENU_NB" --fn="$BEMENU_FN" --nb="$BEMENU_NB" --nf="$BEMENU_NF" --hf="$BEMENU_HF" --hb="$BEMENU_HB")" = "Yes" ] && $2
diff --git a/dotfiles/.scripts/menurun b/dotfiles/.scripts/menurun
index 900a4c3..744d420 100755
--- a/dotfiles/.scripts/menurun
+++ b/dotfiles/.scripts/menurun
@@ -3,4 +3,7 @@
 # Source settings from .bemenurc
 . $HOME/.bemenurc
 
-bemenu-run $BEMENU_OPTIONS
+#action=$(compgen -c | sort -u | bemenu -p "Run:" $BEMENU_OPTIONS)
+#$action
+
+bemenu-run --tf="$BEMENU_TF" --tb="$BEMENU_NB" --fb="$BEMENU_NB" --fn="$BEMENU_FN" --nb="$BEMENU_NB" --nf="$BEMENU_NF" --hf="$BEMENU_HF" --hb="$BEMENU_HB"
diff --git a/dotfiles/.scripts/menusession b/dotfiles/.scripts/menusession
index 9a4ae8c..3867b73 100755
--- a/dotfiles/.scripts/menusession
+++ b/dotfiles/.scripts/menusession
@@ -3,6 +3,6 @@
 # Source settings from .bemenurc
 . $HOME/.bemenurc
 
-action=$(printf "logout\nsuspend\nreboot\nshutdown\n" | bemenu -p "What to do?" $BEMENU_OPTIONS)
+action=$(printf "logout\nsuspend\nreboot\npoweroff\n" | bemenu -p "What to do?" --tf="$BEMENU_TF" --tb="$BEMENU_NB" --fb="$BEMENU_NB" --fn="$BEMENU_FN" --nb="$BEMENU_NB" --nf="$BEMENU_NF" --hf="$BEMENU_HF" --hb="$BEMENU_HB")
 
 swaysession $action
diff --git a/dotfiles/.scripts/swaysession b/dotfiles/.scripts/swaysession
index 17f99ca..0507368 100755
--- a/dotfiles/.scripts/swaysession
+++ b/dotfiles/.scripts/swaysession
@@ -23,7 +23,7 @@ case "$1" in
     reboot)
         $logind reboot
         ;;
-    shutdown)
+    poweroff)
         $logind poweroff
         ;;
     *)