diff --git a/Todo.txt b/Todo.txt
index 793684c..d519038 100644
--- a/Todo.txt
+++ b/Todo.txt
@@ -1,8 +1,9 @@
-(A) 2011-05-31 Stop breaking lines automatically
-(B) 2011-05-31 Start documentation
-2011-05-30 Sort lines per priority
-2011-05-30 Map commands to add, rm, ls, pri, depri etc
+(A) 2011-05-31 Stop breaking lines automatically @ftplugin
+(B) 2011-05-31 Start documentation @doc
+2011-05-30 Sort lines per priority @ftplugin
+2011-05-30 Map commands to add, rm, ls, pri, depri etc @ftplugin
 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
+X 2011-05-30 Implement filetype detection @ftdetect
+X 2011-05-30 Implement colorized priorities @syntax
+X 2011-05-31 Highlight date, project and context of tasks with no priority @syntax
diff --git a/syntax/todo.vim b/syntax/todo.vim
index b26058e..c42d603 100644
--- a/syntax/todo.vim
+++ b/syntax/todo.vim
@@ -36,9 +36,9 @@ syntax  match  TodoPriorityW  '^([wW])\s.\+$'            contains=TodoDate,TodoP
 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
+syntax  match  TodoDate       '\d\{4\}-\d\{2\}-\d\{2\}'  contains=NONE
+syntax  match  TodoProject    '+\a\+'                    contains=NONE
+syntax  match  TodoContext    '@\a\+'                    contains=NONE
 
 " Other priority colours might be defined by the user
 highlight  default  link  TodoDone       Comment