diff --git a/.config/kak/autoload/lang/python.kak b/.config/kak/autoload/filetype.kak
similarity index 55%
rename from .config/kak/autoload/lang/python.kak
rename to .config/kak/autoload/filetype.kak
index 0c2e4853..cb1e776a 100644
--- a/.config/kak/autoload/lang/python.kak
+++ b/.config/kak/autoload/filetype.kak
@@ -7,3 +7,13 @@ hook global WinSetOption filetype=go %{
     set-option window expandtab false
     set-option window softtabstop 4
 }
+
+hook global WinSetOption filetype=kak %{
+	set-option window formatcmd "%val{config}/scripts/kakfmt"
+    set-option window expandtab false
+}
+
+hook global WinSetOption filetype=markdown %{
+	set-option window formatcmd "dprint fmt --stdin md"
+}
+
diff --git a/.config/kak/kakrc b/.config/kak/kakrc
index 2335497e..07278b63 100644
--- a/.config/kak/kakrc
+++ b/.config/kak/kakrc
@@ -9,14 +9,6 @@ hook global ModuleLoaded wayland %{
 	set-option global termcmd 'footclient sh -c'
 }
 
-hook global WinSetOption filetype=kak %{
-	set-option window formatcmd "%val{config}/scripts/kakfmt"
-}
-
-hook global WinSetOption filetype=markdown %{
-	set-option window formatcmd "dprint fmt --stdin md"
-}
-
 # open tutor (needs curl)
 define-command  trampoline -docstring "open a tutorial" %{
 	evaluate-commands %sh{
@@ -114,3 +106,5 @@ def git_blame %{
 	}
 }
 map -docstring "blame" global git b ": git_blame"
+
+map -docstring "format" global user F ": format<ret>"