diff --git a/emacs.el b/emacs.el
index b036696..626fb9c 100644
--- a/emacs.el
+++ b/emacs.el
@@ -74,6 +74,7 @@
 ;; (straight-use-package 'mingus)
 (straight-use-package 'ace-window)
 ;; (straight-use-package 'projectile)
+(straight-use-package 'osm)
 
 ;; Emacs Configuration
 (setq inhibit-splash-screen t)
@@ -167,5 +168,5 @@
 
 (use-package ace-window
   :config
-  (setq aw-keys '(?a ?s ?d ?f ?g ?h ?j ?k ?l))
+  (setq aw-keys '(?h ?i ?e ?a ?t ?r ?n ?s))
   :bind (("C-x o" . ace-window)))
diff --git a/sway/config b/sway/config
index d49923f..400236e 100644
--- a/sway/config
+++ b/sway/config
@@ -11,12 +11,12 @@ include localconfig
 # Logo key. Use Mod1 for Alt.
 set $mod Mod4
 # Home row direction keys, like vim
-set $left h
-set $down j
-set $up k
-set $right l
+set $left d
+set $down t
+set $up r
+set $right n
 # Your preferred terminal emulator
-set $term env XCURSOR_THEME=Adwaita foot
+set $term env XCURSOR_THEME=Adwaita footclient
 # Your preferred application launcher
 # Note: pass the final command to swaymsg so that the resulting window can be opened
 # on the original workspace that the command was run on.
@@ -36,6 +36,10 @@ exec swayidle -w \
 # your displays after another 300 seconds, and turn your screens back on when
 # resumed. It will also lock your screen before your computer goes to sleep.
 
+### Start foot server
+
+exec foot --server
+
 ### Other configuration
 # Hide edge borders smart
 hide_edge_borders smart
@@ -191,7 +195,7 @@ mode "resize" {
     bindsym Return mode "default"
     bindsym Escape mode "default"
 }
-bindsym $mod+r mode "resize"
+bindsym $mod+k mode "resize"
 
 #
 # Status Bar: