diff --git a/user/kak/filetypes.kak b/user/kak/filetypes.kak
index 8de3398..2ce7598 100644
--- a/user/kak/filetypes.kak
+++ b/user/kak/filetypes.kak
@@ -27,6 +27,17 @@ hook global BufCreate .*\.html %{
     set buffer formatcmd 'prettier --parser html'
 }
 
+hook global BufCreate .*\.component\.html %{
+    set buffer filetype angular
+}
+
+hook global WinSetOption filetype=angular %[
+    set-option buffer extra_word_chars '_' '-'
+
+    require-module html
+    add-highlighter buffer/angular ref html
+]
+
 hook global BufCreate .*\.js %{
     set buffer formatcmd 'prettier --parser babel'
 }
diff --git a/user/kak/kak-lsp.toml b/user/kak/kak-lsp.toml
index d7e1d6e..8df4bbd 100644
--- a/user/kak/kak-lsp.toml
+++ b/user/kak/kak-lsp.toml
@@ -7,6 +7,19 @@ verbosity = 2
 # set to 0 to disable
 timeout = 1800 # seconds = 30 minutes
 
+[language.angular]
+filetypes = ["angular"]
+roots = [".angular", ".git"]
+command = "node"
+args = [
+    "/home/lelgenio/.config/yarn/global/node_modules/@angular/language-server",
+    "--ngProbeLocations",
+    "/home/lelgenio/.config/yarn/global/node_modules",
+    "--tsProbeLocations",
+    "/home/lelgenio/.config/yarn/global/node_modules",
+    "--stdio",
+]
+
 [language.bash]
 filetypes = ["sh"]
 roots = [".git", ".hg"]
diff --git a/user/kak/keys.kak b/user/kak/keys.kak
index f71d163..8b32e1d 100644
--- a/user/kak/keys.kak
+++ b/user/kak/keys.kak
@@ -1,10 +1,8 @@
 # {{@@ header() @@}}
 
-map global normal <c-d> 10j
+# For colemak, this is pretty confortable, C-n = down, C-u = up
 map global normal <c-u> 10k
-
-map global normal <c-r> 10j
-map global normal <c-w> 10k
+map global normal <c-n> 10j
 
 # alt i makes searches case insensitive
 map global prompt <a-i> '<c-a>(?i)<c-e>'