diff --git a/.config/kak/kakrc b/.config/kak/kakrc
index b2fbca28..a3332233 100644
--- a/.config/kak/kakrc
+++ b/.config/kak/kakrc
@@ -133,18 +133,16 @@ hook -once global WinSetOption filetype=kak %{
             printf '%s' "add-highlighter shared/kakrc/code/extra_keywords regex (?:\s|\A)\K($(join "${kak_opt_extra_kak_keywords}" '|'))(?:(?=\s)|\z) 0:keyword"
         fi
     }
-    # highlight TODO:
-    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 %{
     # make brackets gray a-la Ashen
 
     add-highlighter window/bracket regex [\[\]\(\)\{\}]{1} 0:rgb:737373
+    add-highlighter window/info regex '#\h*(INFO|NOTE|TODO|PERF|OPTIMIZE|PERFORMANCE|QUESTION|ASK):[^\n]*' 1:+a@ts_info
+    add-highlighter window/hint regex '#\h*(HINT|MARK|PASSED|STUB|MOCK):[^\n]*' 1:+a@ts_hint
+    add-highlighter window/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 window/error regex '#\h*(BUG|FIXME|ISSUE|XXX|FIX|SAFETY|FIXIT|FAILED|DEBUG|INVARIANT|COMPLIANCE):[^\n]*' 1:+a@ts_error
     # special highlighting for escaped goodies in regex
     # add-highlighter window/regex-escaped regex \\[\[\]\(\)\{\}fnrtv0\\dwshDWSH] 0:rgb:e5e5e5
 }