diff --git a/.vim/after/syntax/_comment_keywords.vim b/.vim/after/syntax/_comment_keywords.vim
new file mode 100644
index 0000000..867c34a
--- /dev/null
+++ b/.vim/after/syntax/_comment_keywords.vim
@@ -0,0 +1,5 @@
+syn match Todo /TODO/
+syn match Todo /FIXME/
+syn match Todo /FIX/
+syn match Todo /QUESTION/
+syn match Todo /NOTE/
diff --git a/.vim/after/syntax/pandoc.vim b/.vim/after/syntax/pandoc.vim
index 770d990..ee6405e 100644
--- a/.vim/after/syntax/pandoc.vim
+++ b/.vim/after/syntax/pandoc.vim
@@ -19,3 +19,5 @@ syn match pandocUListItem /^>\=\s*[*+-]\s\+-\@!.*$/ nextgroup=pandocUListItem,pa
 syn match TaskWikiTaskUuid containedin=TaskWikiTask /\v#([A-Z]:)?[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/
 syn match TaskWikiTaskUuid containedin=TaskWikiTask /\v#([A-Z]:)?[0-9a-fA-F]{8}$/
 highlight link TaskWikiTaskUuid Comment
+
+:runtime! syntax/_comment_keywords.vim
diff --git a/.vim/after/syntax/prolog.vim b/.vim/after/syntax/prolog.vim
index 41a7f58..1afd2b3 100644
--- a/.vim/after/syntax/prolog.vim
+++ b/.vim/after/syntax/prolog.vim
@@ -1,3 +1,5 @@
 syn keyword Operator \+ conceal cchar=¬
 syn keyword Operator ,  conceal cchar=∧
 syn keyword Operator ;  conceal cchar=∨
+
+:runtime! syntax/_comment_keywords.vim
diff --git a/.vim/after/syntax/scheme.vim b/.vim/after/syntax/scheme.vim
index 5e2c6db..b82337b 100644
--- a/.vim/after/syntax/scheme.vim
+++ b/.vim/after/syntax/scheme.vim
@@ -35,3 +35,5 @@ syn keyword Operator phi     conceal cchar=φ
 syn keyword Operator chi     conceal cchar=χ
 syn keyword Operator psi     conceal cchar=ψ
 syn keyword Operator omega   conceal cchar=ω
+
+:runtime! syntax/_comment_keywords.vim
diff --git a/.vimrc b/.vimrc
index 1c3866b..49992f2 100644
--- a/.vimrc
+++ b/.vimrc
@@ -525,15 +525,6 @@ augroup vimStartup
 
 augroup END
 
-" Highlight todo's for every filetype
-" https://stackoverflow.com/questions/11709965/vim-highlight-the-word-todo-for-every-filetype
-augroup HiglightTODO
-    autocmd!
-    autocmd WinEnter,VimEnter * :silent! call matchadd('Todo', 'TODO', -1)
-    autocmd WinEnter,VimEnter * :silent! call matchadd('Todo', 'FIXME', -1)
-    autocmd WinEnter,VimEnter * :silent! call matchadd('Todo', 'QUESTION', -1)
-augroup END
-
 augroup Vim
   au!
   " Reload vim config when ~/.vimrc is changed