diff --git a/.config/kak/autoload/colemak.kak b/.config/kak/autoload/colemak.kak
index e69de29b..dd1f556a 100644
--- a/.config/kak/autoload/colemak.kak
+++ b/.config/kak/autoload/colemak.kak
@@ -0,0 +1,103 @@
+# Colemak-friendly bindings
+
+map global normal m "h"
+map global normal n "j"
+map global normal e "k"
+map global normal i "l"
+map global normal h "i"
+map global normal k "m"
+map global normal j "n"
+map global normal l "j"
+
+map global goto m h
+map global goto i l
+map global goto h i
+map global goto e k
+map global goto n j
+map global goto k m
+
+map global view m h
+map global view n j
+map global view e k
+map global view i l
+map global view k m
+
+# map global goto m "h"
+# map global goto n "j"
+# map global goto e "k"
+# map global goto i "l"
+# map global goto h "i"
+# map global goto k "m"
+# map global goto j "n"
+# map global goto l "e"
+
+# Alt-modified mappings
+map global normal <a-m> "<a-h>"
+map global normal <a-n> "<a-j>"
+map global normal <a-e> "<a-k>"
+map global normal <a-i> "<a-l>"
+map global normal <a-h> "<a-i>"
+map global normal <a-k> "<a-m>"
+map global normal <a-j> "<a-n>"
+map global normal <a-l> "<a-e>"
+
+# Ctrl-modified mappings
+map global normal <c-m> "<c-h>"
+map global normal <c-n> "<c-j>"
+map global normal <c-e> "<c-k>"
+map global normal <c-i> "<c-l>"
+map global normal <c-h> "<c-i>"
+map global normal <c-k> "<c-m>"
+map global normal <c-j> "<c-n>"
+map global normal <c-l> "<c-e>"
+
+# Shift-modified mappings
+map global normal <s-m> "<s-h>"
+map global normal <s-n> "<s-j>"
+map global normal <s-e> "<s-k>"
+map global normal <s-i> "<s-l>"
+map global normal <s-h> "<s-i>"
+map global normal <s-k> "<s-m>"
+map global normal <s-j> "<s-n>"
+map global normal <s-l> "<s-e>"
+
+# Alt + Ctrl
+map global normal <a-c-m> "<a-c-h>"
+map global normal <a-c-n> "<a-c-j>"
+map global normal <a-c-e> "<a-c-k>"
+map global normal <a-c-i> "<a-c-l>"
+map global normal <a-c-h> "<a-c-i>"
+map global normal <a-c-k> "<a-c-m>"
+map global normal <a-c-j> "<a-c-n>"
+map global normal <a-c-l> "<a-c-e>"
+
+# Alt + Shift
+map global normal <a-s-m> "<a-s-h>"
+map global normal <a-s-n> "<a-s-j>"
+map global normal <a-s-e> "<a-s-k>"
+map global normal <a-s-i> "<a-s-l>"
+map global normal <a-s-h> "<a-s-i>"
+map global normal <a-s-k> "<a-s-m>"
+map global normal <a-s-j> "<a-s-n>"
+map global normal <a-s-l> "<a-s-e>"
+
+# Ctrl + Shift
+map global normal <c-s-m> "<c-s-h>"
+map global normal <c-s-n> "<c-s-j>"
+map global normal <c-s-e> "<c-s-k>"
+map global normal <c-s-i> "<c-s-l>"
+map global normal <c-s-h> "<c-s-i>"
+map global normal <c-s-k> "<c-s-m>"
+map global normal <c-s-j> "<c-s-n>"
+map global normal <c-s-l> "<c-s-e>"
+
+# Alt + Ctrl + Shift
+map global normal <a-c-s-m> "<a-c-s-h>"
+map global normal <a-c-s-n> "<a-c-s-j>"
+map global normal <a-c-s-e> "<a-c-s-k>"
+map global normal <a-c-s-i> "<a-c-s-l>"
+map global normal <a-c-s-h> "<a-c-s-i>"
+map global normal <a-c-s-k> "<a-c-s-m>"
+map global normal <a-c-s-j> "<a-c-s-n>"
+map global normal <a-c-s-l> "<a-c-s-e>"
+
diff --git a/.config/kak/kakrc b/.config/kak/kakrc
index 4ece1b69..a524ca5e 100644
--- a/.config/kak/kakrc
+++ b/.config/kak/kakrc
@@ -1,13 +1,9 @@
 colorscheme gruvbox-dark
 
-require-module wayland
-
 hook global ModuleLoaded wayland %{
     set-option global termcmd 'footclient sh -c'
 }
 
-set-option global termcmd "footclient sh -c"
-
 set-option global tabstop 4
 
 set-option global indentwidth 4
@@ -28,106 +24,3 @@ map -docstring "quit" global user q ":q<ret>"
 # map global normal <c-d> ":exec <c-d>vv<ret>"
 
 map global normal <tab> _
-
-# Colemak-friendly bindings
-
-map global normal m "h"
-map global normal n "j"
-map global normal e "k"
-map global normal i "l"
-map global normal h "i"
-map global normal k "m"
-map global normal j "n"
-map global normal l "b"
-
-map global goto m h
-map global goto i l
-map global goto h i
-map global goto e k
-map global goto n j
-map global goto k m
-
-map global view m h
-map global view n j
-map global view e k
-map global view i l
-map global view k m
-
-# map global goto m "h"
-# map global goto n "j"
-# map global goto e "k"
-# map global goto i "l"
-# map global goto h "i"
-# map global goto k "m"
-# map global goto j "n"
-# map global goto l "e"
-
-# Alt-modified mappings
-map global normal <a-m> "<a-h>"
-map global normal <a-n> "<a-j>"
-map global normal <a-e> "<a-k>"
-map global normal <a-i> "<a-l>"
-map global normal <a-h> "<a-i>"
-map global normal <a-k> "<a-m>"
-map global normal <a-j> "<a-n>"
-map global normal <a-l> "<a-e>"
-
-# Ctrl-modified mappings
-map global normal <c-m> "<c-h>"
-map global normal <c-n> "<c-j>"
-map global normal <c-e> "<c-k>"
-map global normal <c-i> "<c-l>"
-map global normal <c-h> "<c-i>"
-map global normal <c-k> "<c-m>"
-map global normal <c-j> "<c-n>"
-map global normal <c-l> "<c-e>"
-
-# Shift-modified mappings
-map global normal <s-m> "<s-h>"
-map global normal <s-n> "<s-j>"
-map global normal <s-e> "<s-k>"
-map global normal <s-i> "<s-l>"
-map global normal <s-h> "<s-i>"
-map global normal <s-k> "<s-m>"
-map global normal <s-j> "<s-n>"
-map global normal <s-l> "<s-e>"
-
-# Alt + Ctrl
-map global normal <a-c-m> "<a-c-h>"
-map global normal <a-c-n> "<a-c-j>"
-map global normal <a-c-e> "<a-c-k>"
-map global normal <a-c-i> "<a-c-l>"
-map global normal <a-c-h> "<a-c-i>"
-map global normal <a-c-k> "<a-c-m>"
-map global normal <a-c-j> "<a-c-n>"
-map global normal <a-c-l> "<a-c-e>"
-
-# Alt + Shift
-map global normal <a-s-m> "<a-s-h>"
-map global normal <a-s-n> "<a-s-j>"
-map global normal <a-s-e> "<a-s-k>"
-map global normal <a-s-i> "<a-s-l>"
-map global normal <a-s-h> "<a-s-i>"
-map global normal <a-s-k> "<a-s-m>"
-map global normal <a-s-j> "<a-s-n>"
-map global normal <a-s-l> "<a-s-e>"
-
-# Ctrl + Shift
-map global normal <c-s-m> "<c-s-h>"
-map global normal <c-s-n> "<c-s-j>"
-map global normal <c-s-e> "<c-s-k>"
-map global normal <c-s-i> "<c-s-l>"
-map global normal <c-s-h> "<c-s-i>"
-map global normal <c-s-k> "<c-s-m>"
-map global normal <c-s-j> "<c-s-n>"
-map global normal <c-s-l> "<c-s-e>"
-
-# Alt + Ctrl + Shift
-map global normal <a-c-s-m> "<a-c-s-h>"
-map global normal <a-c-s-n> "<a-c-s-j>"
-map global normal <a-c-s-e> "<a-c-s-k>"
-map global normal <a-c-s-i> "<a-c-s-l>"
-map global normal <a-c-s-h> "<a-c-s-i>"
-map global normal <a-c-s-k> "<a-c-s-m>"
-map global normal <a-c-s-j> "<a-c-s-n>"
-map global normal <a-c-s-l> "<a-c-s-e>"