diff --git a/.config/kak-tree-sitter/config.toml b/.config/kak-tree-sitter/config.toml
index 492bb2f1..4122afdf 100644
--- a/.config/kak-tree-sitter/config.toml
+++ b/.config/kak-tree-sitter/config.toml
@@ -58,48 +58,3 @@ link = "cc"
 link_args = ["-shared", "-fpic", "scanner.o", "parser.o", "-o", "kdl.so"]
 link_flags = ["-O3"]
 
-
-# # markdown
-# [language.markdown.grammar.source.git]
-# url = "https://github.com/tree-sitter-grammars/tree-sitter-markdown"
-# pin = "413285231ce8fa8b11e7074bbe265b48aa7277f9"
-
-# [language.markdown.grammar]
-# path = "tree-sitter-markdown/src"
-# compile = "cc"
-# compile_args = ["-c", "-fpic", "../scanner.c", "../parser.c", "-I", ".."]
-# compile_flags = ["-O3"]
-# link = "cc"
-# link_args = ["-shared", "-fpic", "scanner.o", "parser.o", "-o", "markdown.so"]
-# link_flags = ["-O3"]
-
-# [language.markdown.queries.source.git]
-# url = "https://git.sr.ht/~hadronized/kak-tree-sitter"
-# pin = "1b783cb1a4db29aedb6bf715bf918d51767da31f"
-# # [language.markdown.queries.source.git]
-# # url = "https://github.com/helix-editor/helix"
-# # pin = "ebf96bd4692dfa02c6318b15b11f8a7bc127e7ca"
-
-# [language.markdown.queries]
-# path = "runtime/queries/markdown"
-
-# # markdown.inline
-# [language."markdown.inline".grammar.source.git]
-# url = "https://github.com/tree-sitter-grammars/tree-sitter-markdown"
-# pin = "413285231ce8fa8b11e7074bbe265b48aa7277f9"
-
-# [language."markdown.inline".grammar]
-# path = "tree-sitter-markdown-inline/src"
-# compile = "cc"
-# compile_args = ["-c", "-fpic", "../scanner.c", "../parser.c", "-I", ".."]
-# compile_flags = ["-O3"]
-# link = "cc"
-# link_args = ["-shared", "-fpic", "scanner.o", "parser.o", "-o", "markdown.inline.so"]
-# link_flags = ["-O3"]
-
-# [language."markdown.inline".queries.source.git]
-# url = "https://github.com/helix-editor/helix"
-# pin = "ebf96bd4692dfa02c6318b15b11f8a7bc127e7ca"
-
-# [language."markdown.inline".queries]
-# path = "runtime/queries/markdown.inline"
diff --git a/.config/kak/autoload/filetype/jsonc.kak b/.config/kak/autoload/filetype/jsonc.kak
index d0dba756..7e638979 100644
--- a/.config/kak/autoload/filetype/jsonc.kak
+++ b/.config/kak/autoload/filetype/jsonc.kak
@@ -6,6 +6,9 @@
 
 hook global BufCreate .*[.](jsonc) %{
     set-option buffer filetype jsonc
+    set-option buffer comment_line //
+    set-option buffer comment_block_begin /*
+    set-option buffer comment_block_end */
 }
 
 # Initialization
@@ -14,16 +17,16 @@ hook global BufCreate .*[.](jsonc) %{
 hook global WinSetOption filetype=jsonc %{
     require-module jsonc
 
-    hook window ModeChange pop:insert:.* -group json-trim-indent json-trim-indent
-    hook window InsertChar .* -group json-indent json-indent-on-char
-    hook window InsertChar \n -group json-indent json-indent-on-new-line
+    hook window ModeChange pop:insert:.* -group jsonc-trim-indent jsonc-trim-indent
+    hook window InsertChar .* -group jsonc-indent jsonc-indent-on-char
+    hook window InsertChar \n -group jsonc-indent jsonc-indent-on-new-line
 
-    hook -once -always window WinSetOption filetype=.* %{ remove-hooks window json-.+ }
+    hook -once -always window WinSetOption filetype=.* %{ remove-hooks window jsonc-.+ }
 }
 
-hook -group json-highlight global WinSetOption filetype=json %{
-    add-highlighter window/json ref json
-    hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/json }
+hook -group jsonc-highlight global WinSetOption filetype=jsonc %{
+    add-highlighter window/jsonc ref jsonc
+    hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/jsonc }
 }
 
 provide-module jsonc %(
@@ -31,33 +34,33 @@ provide-module jsonc %(
 # Highlighters
 # ‾‾‾‾‾‾‾‾‾‾‾‾
 
-add-highlighter shared/json regions
-add-highlighter shared/json/code default-region group
-add-highlighter shared/json/string region '"' (?<!\\)(\\\\)*" fill string
-
-add-highlighter shared/json/code/ regex \b(true|false|null|\d+(?:\.\d+)?(?:[eE][+-]?\d*)?)\b 0:value
+add-highlighter shared/jsonc regions
+add-highlighter shared/jsonc/code default-region group
+add-highlighter shared/jsonc/string region '"' (?<!\\)(\\\\)*" fill string
+add-highlighter shared/jsonc/comment region // $ fill comment
+add-highlighter shared/jsonc/code/ regex \b(true|false|null|\d+(?:\.\d+)?(?:[eE][+-]?\d*)?)\b 0:value
 
 # Commands
 # ‾‾‾‾‾‾‾‾
 
-define-command -hidden json-trim-indent %{
+define-command -hidden jsonc-trim-indent %{
     # remove trailing white spaces
     try %{ execute-keys -draft -itersel x s \h+$ <ret> d }
 }
 
-define-command -hidden json-indent-on-char %<
+define-command -hidden jsonc-indent-on-char %<
     evaluate-commands -draft -itersel %<
         # align closer token to its opener when alone on a line
         try %< execute-keys -draft <a-h> <a-k> ^\h+[\]}]$ <ret> m <a-S> 1<a-&> >
     >
 >
 
-define-command -hidden json-indent-on-new-line %<
+define-command -hidden jsonc-indent-on-new-line %<
     evaluate-commands -draft -itersel %<
         # preserve previous line indent
         try %{ execute-keys -draft <semicolon> K <a-&> }
         # filter previous line
-        try %{ execute-keys -draft k : json-trim-indent <ret> }
+        try %{ execute-keys -draft k : jsonc-trim-indent <ret> }
         # indent after lines ending with opener token
         try %< execute-keys -draft k x <a-k> [[{]\h*$ <ret> j <a-gt> >
         # deindent closer token(s) when after cursor