diff --git a/user/.config/awesome/core/bindings.lua b/user/.config/awesome/core/bindings.lua
index 700289ffd..a1d7d9286 100644
--- a/user/.config/awesome/core/bindings.lua
+++ b/user/.config/awesome/core/bindings.lua
@@ -330,15 +330,15 @@ awful.keyboard.append_global_keybindings({
         awful.keygrabber.run(
           function(_, key, event)
             if event == "release" then return end
-            if     key == "d" then awful.spawn.with_shell("dmenu_drun")
-            elseif key == "r" then awful.spawn.with_shell("dmenu_run -b -l 10 -i")
-            elseif key == "e" then awful.spawn.with_shell("dmenu_edit")
-            elseif key == "q" then awful.spawn.with_shell("dmenu_power")
-            elseif key == "i" then awful.spawn.with_shell("dmenu_wifi")
-            elseif key == "b" then awful.spawn.with_shell("dmenu_blue")
-            elseif key == "s" then awful.spawn.with_shell("dmenu_scrot")
-            elseif key == "z" then awful.spawn.with_shell("dmenu_emoji")
-            elseif key == "w" then awful.spawn.with_shell("dmenu_wall")
+            if     key == "d" then awful.spawn.with_shell("rofi -show drun -show-icons")
+            elseif key == "r" then awful.spawn.with_shell("rofi -show run")
+            elseif key == "e" then awful.spawn.with_shell("$HOME/.config/rofi/scripts/rofi_edit")
+            elseif key == "q" then awful.spawn.with_shell("$HOME/.config/rofi/scripts/rofi_power")
+            elseif key == "i" then awful.spawn.with_shell("$HOME/.config/rofi/scripts/rofi_wifi")
+            elseif key == "b" then awful.spawn.with_shell("$HOME/.config/rofi/scripts/rofi_blue")
+            elseif key == "s" then awful.spawn.with_shell("$HOME/.config/rofi/scripts/rofi_scrot")
+            elseif key == "z" then awful.spawn.with_shell("$HOME/.config/rofi/scripts/rofi_emoji")
+            elseif key == "w" then awful.spawn.with_shell("$HOME/.config/rofi/scripts/rofi_wall")
             end
             awful.keygrabber.stop(grabber)
             end
diff --git a/user/.config/rofi/scripts/rofi_power b/user/.config/rofi/scripts/rofi_power
index e2516c6cc..2ae9139f5 100755
--- a/user/.config/rofi/scripts/rofi_power
+++ b/user/.config/rofi/scripts/rofi_power
@@ -26,21 +26,21 @@ pwr4="(X) Cancel"
 pwrs="$pwr1\n$pwr2\n$pwr3\n$pwr4"
 
 ## MAIN ACTION COMMAND ##
-action=$(echo -e "$options" | rofi -dmenu -b -i -p " ")
+action=$(echo -e "$options" | rofi -dmenu -b -l 7 -i -p " ")
 case "$action" in
     $option1*)
         whoami | xargs -I % sh -c 'pkill -KILL -u %';;
     $option2*)
-        systemctl reboot;;
+        systemctl reboot || loginctl reboot;;
     $option3*)
-        systemctl poweroff;;
+        systemctl poweroff || loginctl poweroff;;
     $option4*)
         betterlockscreen --suspend;;
     $option5*)
         betterlockscreen -l;;
     $option6*)
         currentpwr=$(powerprofilesctl get)
-        pwraction=$(echo -e "$pwrs" | rofi -dmenu -b -i -p "Current profile is: ${currentpwr} | Select profile:")
+        pwraction=$(echo -e "$pwrs" | rofi -dmenu -b -l 3 -i -p "Current profile is: ${currentpwr} | Select profile:")
         case "$pwraction" in
             $pwr1*)
                 powerprofilesctl set performance && notify-send "Power profile switched to performance";;