diff --git a/Todo.txt b/Todo.txt
index 469fac3..793684c 100644
--- a/Todo.txt
+++ b/Todo.txt
@@ -1,7 +1,8 @@
-(A) 2011-05-30 Create README.markdown to be published in github
+(A) 2011-05-31 Stop breaking lines automatically
 (B) 2011-05-31 Start documentation
-(C) 2011-05-30 Map commands to add, rm, ls, pri, depri etc
-(C) 2011-05-30 Sort lines per priority
+2011-05-30 Sort lines per priority
+2011-05-30 Map commands to add, rm, ls, pri, depri etc
+2011-05-30 Create README.markdown to be published in github
 2011-05-30 Contact main project for reference
 X 2011-05-30 Implement filetype detection
 X 2011-05-30 Implement colorized priorities
diff --git a/syntax/todo.vim b/syntax/todo.vim
index 5ef0828..b26058e 100644
--- a/syntax/todo.vim
+++ b/syntax/todo.vim
@@ -3,44 +3,50 @@
 " Author:      Leandro Freitas <freitass@gmail.com>
 " Licence:     Vim licence
 " Website:     http://github.com/freitass/todo.txt.vim
-" Version:     0.1
+" Version:     0.2
 
 if exists("b:current_syntax")
     finish
 endif
 
-syntax  match  TodoDone       '^[xX]\s.*$'
-syntax  match  TodoPriorityA  '^([aA])\s.*$'
-syntax  match  TodoPriorityB  '^([bB])\s.*$'
-syntax  match  TodoPriorityC  '^([cC])\s.*$'
-syntax  match  TodoPriorityD  '^([dD])\s.*$'
-syntax  match  TodoPriorityE  '^([eE])\s.*$'
-syntax  match  TodoPriorityF  '^([fF])\s.*$'
-syntax  match  TodoPriorityG  '^([gG])\s.*$'
-syntax  match  TodoPriorityH  '^([hH])\s.*$'
-syntax  match  TodoPriorityI  '^([iI])\s.*$'
-syntax  match  TodoPriorityJ  '^([jJ])\s.*$'
-syntax  match  TodoPriorityK  '^([kK])\s.*$'
-syntax  match  TodoPriorityL  '^([lL])\s.*$'
-syntax  match  TodoPriorityM  '^([mM])\s.*$'
-syntax  match  TodoPriorityN  '^([nN])\s.*$'
-syntax  match  TodoPriorityO  '^([oO])\s.*$'
-syntax  match  TodoPriorityP  '^([pP])\s.*$'
-syntax  match  TodoPriorityQ  '^([qQ])\s.*$'
-syntax  match  TodoPriorityR  '^([rR])\s.*$'
-syntax  match  TodoPriorityS  '^([sS])\s.*$'
-syntax  match  TodoPriorityT  '^([tT])\s.*$'
-syntax  match  TodoPriorityU  '^([uU])\s.*$'
-syntax  match  TodoPriorityV  '^([vV])\s.*$'
-syntax  match  TodoPriorityW  '^([wW])\s.*$'
-syntax  match  TodoPriorityX  '^([xX])\s.*$'
-syntax  match  TodoPriorityY  '^([yY])\s.*$'
-syntax  match  TodoPriorityZ  '^([zZ])\s.*$'
+syntax  match  TodoDone       '^[xX]\s.\+$'              contains=TodoDate,TodoProject,TodoContext
+syntax  match  TodoPriorityA  '^([aA])\s.\+$'            contains=TodoDate,TodoProject,TodoContext
+syntax  match  TodoPriorityB  '^([bB])\s.\+$'            contains=TodoDate,TodoProject,TodoContext
+syntax  match  TodoPriorityC  '^([cC])\s.\+$'            contains=TodoDate,TodoProject,TodoContext
+syntax  match  TodoPriorityD  '^([dD])\s.\+$'            contains=TodoDate,TodoProject,TodoContext
+syntax  match  TodoPriorityE  '^([eE])\s.\+$'            contains=TodoDate,TodoProject,TodoContext
+syntax  match  TodoPriorityF  '^([fF])\s.\+$'            contains=TodoDate,TodoProject,TodoContext
+syntax  match  TodoPriorityG  '^([gG])\s.\+$'            contains=TodoDate,TodoProject,TodoContext
+syntax  match  TodoPriorityH  '^([hH])\s.\+$'            contains=TodoDate,TodoProject,TodoContext
+syntax  match  TodoPriorityI  '^([iI])\s.\+$'            contains=TodoDate,TodoProject,TodoContext
+syntax  match  TodoPriorityJ  '^([jJ])\s.\+$'            contains=TodoDate,TodoProject,TodoContext
+syntax  match  TodoPriorityK  '^([kK])\s.\+$'            contains=TodoDate,TodoProject,TodoContext
+syntax  match  TodoPriorityL  '^([lL])\s.\+$'            contains=TodoDate,TodoProject,TodoContext
+syntax  match  TodoPriorityM  '^([mM])\s.\+$'            contains=TodoDate,TodoProject,TodoContext
+syntax  match  TodoPriorityN  '^([nN])\s.\+$'            contains=TodoDate,TodoProject,TodoContext
+syntax  match  TodoPriorityO  '^([oO])\s.\+$'            contains=TodoDate,TodoProject,TodoContext
+syntax  match  TodoPriorityP  '^([pP])\s.\+$'            contains=TodoDate,TodoProject,TodoContext
+syntax  match  TodoPriorityQ  '^([qQ])\s.\+$'            contains=TodoDate,TodoProject,TodoContext
+syntax  match  TodoPriorityR  '^([rR])\s.\+$'            contains=TodoDate,TodoProject,TodoContext
+syntax  match  TodoPriorityS  '^([sS])\s.\+$'            contains=TodoDate,TodoProject,TodoContext
+syntax  match  TodoPriorityT  '^([tT])\s.\+$'            contains=TodoDate,TodoProject,TodoContext
+syntax  match  TodoPriorityU  '^([uU])\s.\+$'            contains=TodoDate,TodoProject,TodoContext
+syntax  match  TodoPriorityV  '^([vV])\s.\+$'            contains=TodoDate,TodoProject,TodoContext
+syntax  match  TodoPriorityW  '^([wW])\s.\+$'            contains=TodoDate,TodoProject,TodoContext
+syntax  match  TodoPriorityX  '^([xX])\s.\+$'            contains=TodoDate,TodoProject,TodoContext
+syntax  match  TodoPriorityY  '^([yY])\s.\+$'            contains=TodoDate,TodoProject,TodoContext
+syntax  match  TodoPriorityZ  '^([zZ])\s.\+$'            contains=TodoDate,TodoProject,TodoContext
+syntax  match  TodoDate       '\d\{4\}-\d\{2\}-\d\{2\}'  contains=NONE                              contained
+syntax  match  TodoProject    '+\a\+'                    contains=NONE                              contained
+syntax  match  TodoContext    '@\a\+'                    contains=NONE                              contained
 
 " Other priority colours might be defined by the user
 highlight  default  link  TodoDone       Comment
 highlight  default  link  TodoPriorityA  Constant
 highlight  default  link  TodoPriorityB  Statement
 highlight  default  link  TodoPriorityC  Identifier
+highlight  default  link  TodoDate       PreProc
+highlight  default  link  TodoProject    Special
+highlight  default  link  TodoContext    Special
 
 let b:current_syntax = "todo"