diff --git a/configuration.nix b/configuration.nix
index 3ee2257..f8c00ef 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -139,7 +139,7 @@
         ids = [ "*" ];
         extraConfig = ''
           [main]
-          capslock = toggle(capslock)
+          capslock = overload(capslock, toggle(capslock))
 
           [capslock]
           h = left
@@ -147,10 +147,12 @@
           k = up
           l = right
           e = C-right
+          w = C-right
           b = C-left
           0 = home
           v = toggle(shift)
           capslock = clear()
+          i = clear()
           esc = clear()
 
           [capslock+control]