diff --git a/skhd/skhdrc b/skhd/skhdrc
index 0aefb9b..41fd7e9 100644
--- a/skhd/skhdrc
+++ b/skhd/skhdrc
@@ -5,12 +5,14 @@ cmd - return : /Applications/Kitty.app/Contents/MacOS/kitty --single-instance -d
 cmd - m : open -na /Applications/mpv.app $(pbpaste)
 
 # focus window
+alt - x : yabai -m window --focus recent
 alt - h : yabai -m window --focus west
 alt - j : yabai -m window --focus south
 alt - k : yabai -m window --focus north
 alt - l : yabai -m window --focus east
 
 # swap window
+shift + alt - x : yabai -m window --swap recent
 shift + alt - h : yabai -m window --swap west
 shift + alt - j : yabai -m window --swap south
 shift + alt - k : yabai -m window --swap north
@@ -50,18 +52,18 @@ cmd + alt - w : yabai -m space --destroy
 
 # fast focus desktop
 cmd + alt - x : yabai -m space --focus recent
-cmd + alt - z : yabai -m space --focus prev
-cmd + alt - c : yabai -m space --focus next
-cmd + alt - 1 : yabai -m space --focus 1
-cmd + alt - 2 : yabai -m space --focus 2
-cmd + alt - 3 : yabai -m space --focus 3
-cmd + alt - 4 : yabai -m space --focus 4
-cmd + alt - 5 : yabai -m space --focus 5
-cmd + alt - 6 : yabai -m space --focus 6
-cmd + alt - 7 : yabai -m space --focus 7
-cmd + alt - 8 : yabai -m space --focus 8
-cmd + alt - 9 : yabai -m space --focus 9
-cmd + alt - 0 : yabai -m space --focus 10
+cmd + alt - z : yabai -m space --focus prev || skhd -k "ctrl + alt + cmd - z"
+cmd + alt - c : yabai -m space --focus next || skhd -k "ctrl + alt + cmd - c"
+cmd + alt - 1 : yabai -m space --focus  1 || skhd -k "ctrl + alt + cmd - 1"
+cmd + alt - 2 : yabai -m space --focus  2 || skhd -k "ctrl + alt + cmd - 2"
+cmd + alt - 3 : yabai -m space --focus  3 || skhd -k "ctrl + alt + cmd - 3"
+cmd + alt - 4 : yabai -m space --focus  4 || skhd -k "ctrl + alt + cmd - 4"
+cmd + alt - 5 : yabai -m space --focus  5 || skhd -k "ctrl + alt + cmd - 5"
+cmd + alt - 6 : yabai -m space --focus  6 || skhd -k "ctrl + alt + cmd - 6"
+cmd + alt - 7 : yabai -m space --focus  7 || skhd -k "ctrl + alt + cmd - 7"
+cmd + alt - 8 : yabai -m space --focus  8 || skhd -k "ctrl + alt + cmd - 8"
+cmd + alt - 9 : yabai -m space --focus  9 || skhd -k "ctrl + alt + cmd - 9"
+cmd + alt - 0 : yabai -m space --focus 10 || skhd -k "ctrl + alt + cmd - 0"
 
 # send window to desktop and follow focus
 shift + cmd - x : yabai -m window --space recent && yabai -m space --focus recent
@@ -143,7 +145,8 @@ shift + alt - f : yabai -m window --toggle native-fullscreen
 alt - e : yabai -m window --toggle split
 
 # float / unfloat window and restore position
-alt - t : yabai -m window --toggle float && /tmp/yabai-restore/$(yabai -m query --windows --window | jq -re '.id').restore 2>/dev/null || true
+# alt - t : yabai -m window --toggle float && /tmp/yabai-restore/$(yabai -m query --windows --window | jq -re '.id').restore 2>/dev/null || true
+alt - t : yabai -m window --toggle float && yabai -m window --grid 4:4:1:1:2:2
 
 # toggle sticky (show on all spaces)
 alt - s : yabai -m window --toggle sticky
diff --git a/yabai/yabairc b/yabai/yabairc
index 32185ac..be7dd89 100755
--- a/yabai/yabairc
+++ b/yabai/yabairc
@@ -38,7 +38,7 @@ yabai -m rule --add app="^Safari$" space=3
 yabai -m rule --add app="^Notes$" space=4
 yabai -m rule --add app="^Transmission$" space=5
 yabai -m rule --add app="^Spotify$" space=6
-yabai -m rule --add app="^Discord$" space=7 grid=1:1:0:0:1:1
+yabai -m rule --add app="^Discord$" space=7 grid=1:1:0:0:1:1 manage=off
 yabai -m rule --add app="^Steam$" space=7 manage=off
 yabai -m rule --add app="^System Preferences$" manage=off
 yabai -m rule --add app="^Xcode$" manage=off