diff --git a/syntax/taskpaper.vim b/syntax/taskpaper.vim
index 6be06d1..712b7ce 100644
--- a/syntax/taskpaper.vim
+++ b/syntax/taskpaper.vim
@@ -34,10 +34,10 @@ syn sync fromstart
 
 "highlighting for Taskpaper groups
 HiLink taskpaperListItem      Identifier
-HiLink taskpaperContext       Identifier
-HiLink taskpaperProject       Title
-HiLink taskpaperDone          NonText
-HiLink taskpaperCancelled     NonText
+HiLink taskpaperContext       String
+HiLink taskpaperProject       Identifier
+HiLink taskpaperDone          Comment
+HiLink taskpaperCancelled     Comment
 HiLink taskpaperComment       Comment
 
 call taskpaper#tag_style_dict(g:task_paper_styles)