diff --git a/hm_modules/sxhkd.nix b/hm_modules/sxhkd.nix
index 2297477..73e8b58 100644
--- a/hm_modules/sxhkd.nix
+++ b/hm_modules/sxhkd.nix
@@ -18,8 +18,8 @@
       fileManager = "nemo";
       secondaryFileManager = "nautilus";
       emojiChooser = "rofimoji --skin-tone light -a copy";
+      arandr = "${pkgs.arandr}/bin/arandr";
       passwordChoser = "rofi-rbw";
-      yad = "${pkgs.yad}/bin/yad";
       notify = "${pkgs.libnotify}/bin/notify-send";
       pamixer = "${pkgs.pamixer}/bin/pamixer";
       playerctl = "${pkgs.playerctl}/bin/playerctl";
@@ -28,6 +28,7 @@
         bspc wm -r
         for p in {top,bottom,left,right}; do bspc config -m any ''${p}_padding 0; done # Reset padding
         systemctl --user restart polybar # Restart polybar
+        ${notify} "BSPWM restarted"
       '';
       moveAllNodesToPrimary = pkgs.writeShellScript "moveAllNodesToPrimary" ''
         comm -23 <(bspc query -N | sort) <(bspc query -m primary -N | sort) | while read n; do bspc node $n -m primary; done
@@ -52,11 +53,7 @@
         "Print" = "${pkgs.gnome.gnome-screenshot}/bin/gnome-screenshot";
         "super + alt + {h,j,k,l}" = "bspc node -z {left -20 0,bottom 0 20,top 0 -20,right 20 0}";
         "super + alt + m" = "lockscreen";
-        "super + alt + p" = "autorandr -c";
-        "super + alt + shift + p" = "arandr";
-        "super + alt + q" = ''
-          ${yad} --question --center --on-top --sticky --timeout=30 --timeout-indicator=bottom --image=gnome-shutdown --title "Shutdown" --text "Do you want to shutdown?" && bspc quit
-        '';
+        "super + alt + p" = "${arandr}";
         "super + alt + o" = "${moveAllNodesToPrimary}";
         "super + alt + r" = "${resetBspwm}";
         "super + alt + shift + {h,j,k,l}" = "bspc node -z {right -20 0,top 0 20,bottom 0 -20,left 20 0}";
@@ -84,9 +81,7 @@
         "super + shift + ctrl + d" = "rofi -show ssh";
         "super + alt + e" = emojiChooser;
         "super + alt + i" = passwordChoser;
-        "super + shift + {h,j,k,l}" = ''
-          dir={west,south,north,east}; bspc node -s "$dir.local" --follow || bspc node -m "$dir" --follow
-        '';
+        "super + shift + {h,j,k,l}" = ''dir={west,south,north,east}; bspc node -s "$dir.local" --follow || bspc node -m "$dir" --follow'';
         "super + {_,shift + } Return" = "{${primaryTerminal} , ${secondaryTerminal}}";
         "super + {_,shift + } w" = "bspc node -{c,k}";
         "super + {t,shift + t,s,f}" = "bspc node -t {tiled,pseudo_tiled,floating,fullscreen}";
@@ -97,6 +92,7 @@
         "XF86MonBrightness{Up,Down}" = "${xbacklight} -{inc,dec} 10 && ${notifyBrightness}";
         "XF86PowerOff" = toString powermenu;
         "button10" = "rofi -show drun";
+        "super + shift + {a,d}" = "bspc node @/ -C {forward,backward}";
       };
     };
 }