diff --git a/.vim/syntax/todo.vim b/.vim/syntax/todo.vim
index 1b0c1ff..af91bf7 100644
--- a/.vim/syntax/todo.vim
+++ b/.vim/syntax/todo.vim
@@ -2,15 +2,57 @@ if exists("b:current_syntax")
     finish
 endif
 
+
+" Keywords that we want to emphasize
 syntax keyword todoKeyword todo done
 syntax keyword todoKeyword vrij free
 highlight link todoKeyword Keyword
 
+
+" Inline commenting
 syntax match todoComment "\v#.*$"
 highlight link todoComment Comment
 
+
+" Heading (day) delimiters
 syn region todoDay matchgroup=todoHeadingDelimiter start="==\@!" end="==*\s*$" keepend oneline
 
 hi def link todoHeadingDelimiter Delimiter
 
+
+" Generic operators
+syntax match todoOperator "\v\*"
+syntax match todoOperator "\v/"
+syntax match todoOperator "\v\+"
+syntax match todoOperator "\v-"
+
+highlight link todoOperator Operator
+
+
+" Task statuses
+syntax match todoStatusDone "\v^v "
+syntax match todoStatusDone "\v v "
+syntax match todoStatusDone "\v^x "
+syntax match todoStatusDone "\v x "
+highlight todoStatusDone ctermfg=green guifg=#00ff00
+
+syntax match todoStatusDoing "\v^d "
+syntax match todoStatusDoing "\v d "
+"highlight todoStatusDoing ctermfg=DarkOrange guifg=#ffcc00
+highlight todoStatusDoing ctermfg=DarkYellow guifg=#ffcc00
+
+syntax match todoStatusTest "\v^t "
+syntax match todoStatusTest "\v t "
+highlight todoStatusTest ctermfg=darkcyan guifg=#6666ff
+
+syntax match todoStatusTodo "\v^- "
+syntax match todoStatusTodo "\v - "
+highlight todoStatusTodo ctermfg=red guifg=#ff0000
+
+highlight link todoStatusDone PreProc
+highlight link todoStatusDoing PreProc
+highlight link todoStatusTodo PreProc
+
+
+" Syntax highlighting scheme name
 let b:current_syntax = "todo"