diff --git a/.config/skhd/skhdrc b/.config/skhd/skhdrc
index 6ab3604..5311ad5 100644
--- a/.config/skhd/skhdrc
+++ b/.config/skhd/skhdrc
@@ -5,7 +5,6 @@ cmd + shift - v : ~/.config/skhd/scripts/menubar.sh
 
 # System Controls
 cmd - return : yabai -m window --swap west
-cmd - q : yabai -m window --close
 cmd - u : yabai --load-sa && yabai --restart # Assuming you have scripting additions installed
 
 # Window Management
@@ -15,12 +14,16 @@ cmd - j : yabai -m window --focus prev || yabai -m window --focus last
 cmd - k : yabai -m window --focus next || yabai -m window --focus first
 
 # Focus workspaces 1 through 6
-cmd - 1 : yabai -m space --focus 1
-cmd - 2 : yabai -m space --focus 2
-cmd - 3 : yabai -m space --focus 3
-cmd - 4 : yabai -m space --focus 4
-cmd - 5 : yabai -m space --focus 5
-cmd - 6 : yabai -m space --focus 6
+cmd - 1 : index=$(yabai -m query --spaces --space | jq .display); yabai -m space 1 --display ${index}; yabai -m space --focus 1
+cmd - 2 : index=$(yabai -m query --spaces --space | jq .display); yabai -m space 2 --display ${index}; yabai -m space --focus 2
+cmd - 3 : index=$(yabai -m query --spaces --space | jq .display); yabai -m space 3 --display ${index}; yabai -m space --focus 3
+cmd - 4 : index=$(yabai -m query --spaces --space | jq .display); yabai -m space 4 --display ${index}; yabai -m space --focus 4
+cmd - 5 : index=$(yabai -m query --spaces --space | jq .display); yabai -m space 5 --display ${index}; yabai -m space --focus 5
+cmd - 6 : index=$(yabai -m query --spaces --space | jq .display); yabai -m space 6 --display ${index}; yabai -m space --focus 6
+
+# Move window between monitor
+cmd + shift - e: yabai -m window --display next
+cmd + shift - w: yabai -m window --display prev
 
 # Move focused window to workspaces 1 through 6 and focus that space
 cmd + shift - 1 : yabai -m window --space 1