diff --git a/.i3/config b/.i3/config
index b36786e..2563c5e 100644
--- a/.i3/config
+++ b/.i3/config
@@ -1,6 +1,7 @@
 # ntnsndr's i3 config file
 #
 # Reference: https://i3wm.org/docs/userguide.html
+# Added some COSMIC bindings: https://github.com/pop-os/cosmic-comp/blob/master/data/keybindings.ron
 # XFCE hybrid based on https://forum.endeavouros.com/t/tutorial-easy-setup-endeavour-xfce-i3-tiling-window-manager/13171
 
 set $mod Mod4
@@ -47,10 +48,10 @@ bindsym $mod+d exec --no-startup-id dmenu_run
 # bindcode $mod+40 exec --no-startup-id i3-dmenu-desktop
 
 # change focus
-bindsym $mod+j focus left
-bindsym $mod+k focus down
-bindsym $mod+l focus up
-bindsym $mod+semicolon focus right
+bindsym $mod+h focus left
+bindsym $mod+j focus down
+bindsym $mod+k focus up
+bindsym $mod+l focus right
 
 # alternatively, you can use the cursor keys:
 bindsym $mod+Left focus left
@@ -59,10 +60,10 @@ bindsym $mod+Up focus up
 bindsym $mod+Right focus right
 
 # move focused window
-bindsym $mod+Shift+j move left
-bindsym $mod+Shift+k move down
-bindsym $mod+Shift+l move up
-bindsym $mod+Shift+semicolon move right
+bindsym $mod+Shift+h move left
+bindsym $mod+Shift+j move down
+bindsym $mod+Shift+k move up
+bindsym $mod+Shift+l move right
 
 # alternatively, you can use the cursor keys:
 bindsym $mod+Shift+Left move left
@@ -71,7 +72,7 @@ bindsym $mod+Shift+Up move up
 bindsym $mod+Shift+Right move right
 
 # split in horizontal orientation
-bindsym $mod+h split h
+bindsym $mod+b split h
 
 # split in vertical orientation
 bindsym $mod+v split v
@@ -86,6 +87,7 @@ bindsym $mod+e layout toggle split
 
 # toggle tiling / floating
 bindsym $mod+Shift+space floating toggle
+bindsym $mod+g floating toggle
 
 # change focus between tiling / floating windows
 bindsym $mod+space focus mode_toggle
diff --git a/.vimrc b/.vimrc
index df5c5d0..0a122dc 100644
--- a/.vimrc
+++ b/.vimrc
@@ -33,6 +33,7 @@ set shell=bash\ -l
 
 " Shortcuts
 command! Proximate :e ~/Cloud/Notes/Proximate.md
+command! W :w|b#|bd#
 
 " Create panda command for pandout
 command! -nargs=1 Panda execute ':w' | execute ':!~/.scripts/panda.sh % <args>'