diff --git a/syntax/haskell.vim b/syntax/haskell.vim
index 15e9d26..d753351 100644
--- a/syntax/haskell.vim
+++ b/syntax/haskell.vim
@@ -76,10 +76,10 @@ syn region haskellBrackets matchgroup=haskellDelimiter start="\[" end="]" contai
 syn region haskellBlock matchgroup=haskellDelimiter start="{" end="}" contains=TOP,@Spell
 syn keyword haskellInfix infix infixl infixr
 syn keyword haskellBottom undefined error
-syn match haskellOperators "[-!#$%&\*\+/<=>\?@\\^|~:.]\+\|\<_\>"
+syn match haskellOperators "\%([A-Z][a-zA-Z0-9_']*\.\)*[-!#$%&\*\+/<=>\?@\\^|~:]\+\|\<_\>\|\k\@<!\.\|\.\k\@!"
 syn match haskellQuote "\<'\+" contained
-syn match haskellQuotedType "[A-Z][a-zA-Z0-9_']*\>" contained
-syn region haskellQuoted start="\<'\+" end="\>"
+syn match haskellQuotedType "\%([A-Z][a-zA-Z0-9_']*\.\)*[A-Z][a-zA-Z0-9_']*\>" contained
+syn region haskellQuoted start="\<'\+" end="\>" skip="\."
   \ contains=
   \ haskellType,
   \ haskellQuote,
@@ -97,7 +97,7 @@ syn region haskellString start=+"+ skip=+\\\\\|\\"+ end=+"+
   \ contains=@Spell
 syn match haskellIdentifier "[_a-z][a-zA-Z0-9_']*" contained
 syn match haskellChar "\<'[^'\\]'\|'\\.'\|'\\u[0-9a-fA-F]\{4}'\>"
-syn match haskellType "\<[A-Z][a-zA-Z0-9_']*\>"
+syn match haskellType "\<[A-Z][a-zA-Z0-9_']*\%(\.[A-Z][a-zA-Z0-9_']*\)*\.\@!\>"
 syn region haskellBlockComment start="{-" end="-}"
   \ contains=
   \ haskellBlockComment,
@@ -106,7 +106,7 @@ syn region haskellBlockComment start="{-" end="-}"
 syn region haskellPragma start="{-#" end="#-}"
 syn region haskellLiquid start="{-@" end="@-}"
 syn match haskellPreProc "^#.*$"
-syn keyword haskellTodo TODO FIXME contained
+syn keyword haskellTodo TODO FIXME XXX contained
 " Treat a shebang line at the start of the file as a comment
 syn match haskellShebang "\%^#!.*$"
 if !get(g:, 'haskell_disable_TH', 0)