diff --git a/.config/kak/kakrc b/.config/kak/kakrc
index 77e47fcd..b2fbca28 100644
--- a/.config/kak/kakrc
+++ b/.config/kak/kakrc
@@ -134,7 +134,11 @@ hook -once global WinSetOption filetype=kak %{
         fi
     }
     # highlight TODO:
-    add-highlighter window/todo regex '#\h*(INFO|NOTE|TODO|PERF|OPTIMIZE|PERFORMANCE|QUESTION|ASK):[^\n]*' 1:+a@ts_info
+    add-highlighter shared/kakrc/comment/info region (INFO|NOTE|TODO|PERF|OPTIMIZE|PERFORMANCE|QUESTION|ASK) : fill ts_info
+    # add-highlighter shared/kakrc/comment/info region '#\h*(INFO|NOTE|TODO|PERF|OPTIMIZE|PERFORMANCE|QUESTION|ASK):[^\n]*' 1:+a@ts_info
+    # add-highlighter shared/kakrc/comment/hint regex '#\h*(HINT|MARK|PASSED|STUB|MOCK):[^\n]*' 1:+a@ts_hint
+    # add-highlighter shared/kakrc/comment/warning regex '#\h*(HACK|WARN|WARNING|TEST|TEMPHACK|WARN|WARNING|TEST|TEMPHACK|WARN|WARNING|TEST|TEMPHACK|WARN|WARNING|TEST|TEMP):[^\n]*' 1:+a@ts_warning
+    # add-highlighter shared/kakrc/comment/error regex '#\h*(BUG|FIXME|ISSUE|XXX|FIX|SAFETY|FIXIT|FAILED|DEBUG|INVARIANT|COMPLIANCE):[^\n]*' 1:+a@ts_error
 }
 
 hook global WinSetOption filetype=kak %{