diff --git a/.vim/syntax/todo.vim b/.vim/syntax/todo.vim
index 938f1d2..2ff1630 100644
--- a/.vim/syntax/todo.vim
+++ b/.vim/syntax/todo.vim
@@ -58,24 +58,24 @@ syntax match note "\v n .*$"
 syntax match note "\v  .*$"
 highlight note ctermfg=Grey guifg=#eeeeee
 
-syntax match todoStatusDone "\v^v "
-syntax match todoStatusDone "\v  v "
+syntax match todoStatusDone "\v^v " nextgroup=todoItem skipwhite
+syntax match todoStatusDone "\v  v " nextgroup=todoItem skipwhite
 highlight todoStatusDone ctermfg=green guifg=#00ff00
 
-syntax match todoStatusCancelled "\v^x "
-syntax match todoStatusCancelled "\v  x "
+syntax match todoStatusCancelled "\v^x " nextgroup=todoItem skipwhite
+syntax match todoStatusCancelled "\v  x " nextgroup=todoItem skipwhite
 highlight todoStatusCancelled ctermfg=DarkGreen
 
-syntax match todoStatusDoing "\v^d .*$"
-syntax match todoStatusDoing "\v  d .*$"
+syntax match todoStatusDoing "\v^d .*$" nextgroup=todoItem skipwhite
+syntax match todoStatusDoing "\v  d .*$" nextgroup=todoItem skipwhite
 highlight todoStatusDoing ctermfg=223 guifg=#f0dfaf
 
-syntax match todoStatusTest "\v^t "
-syntax match todoStatusTest "\v  t "
+syntax match todoStatusTest "\v^t " nextgroup=todoItem skipwhite
+syntax match todoStatusTest "\v  t " nextgroup=todoItem skipwhite
 highlight todoStatusTest ctermfg=darkcyan guifg=#6666ff
 
-syntax match todoStatusTodo "\v^- "
-syntax match todoStatusTodo "\v  - "
+syntax match todoStatusTodo "\v^- " nextgroup=todoItem skipwhite
+syntax match todoStatusTodo "\v  - " nextgroup=todoItem skipwhite
 highlight todoStatusTodo ctermfg=red guifg=#ff0000
 
 syntax match todoStatusImportant "\v^\> .*$"
@@ -85,16 +85,21 @@ syntax match todoStatusImportant "\v  ! .*$"
 "highlight todoStatusImportant ctermfg=131 guifg=#af5f5f
 highlight todoStatusImportant ctermfg=167 guifg=#d75f5f
 
-syntax match todoStatusQuestion "\v^\? "
-syntax match todoStatusQuestion "\v  \? "
+syntax match todoStatusQuestion "\v^\? " nextgroup=todoItem skipwhite
+syntax match todoStatusQuestion "\v  \? " nextgroup=todoItem skipwhite
 highlight todoStatusQuestion ctermfg=darkcyan guifg=#6666ff
 
 " Highlight matching brackets (for example a timeslot)
 "syntax match brack /[\[\]]/ | hi brack ctermfg=DarkMagenta
 
-syntax match timeslot "\v\[.*-.*\] "
+syntax match timeslot "\v\[.*-.*\] " nextgroup=todoItem skipwhite
 highlight timeslot ctermfg=Magenta
 
+"syn keyword todoType note todoStatusDone todoStatusCancelled todoStatusDoing todoStatusTest todoStatusImportant nextgroup=todoItem skipwhite
+"syn match VarName '\i\+' contained
+syn match todoItem '\i\+:' contained
+hi todoItem ctermfg=Blue
+
 highlight link todoStatusDone PreProc
 highlight link todoStatusDoing PreProc
 highlight link todoStatusTodo PreProc