diff --git a/syntax/eo.vim b/syntax/eo.vim
index 42bb0bb..0546a84 100644
--- a/syntax/eo.vim
+++ b/syntax/eo.vim
@@ -9,7 +9,8 @@ syn keyword    eoConstants null
 
 syn keyword    eoType bool byte ubyte char uchar short ushort int uint long ulong float double void
 
-syn keyword    eoStructure class abstract interface mixin struct enum var
+syn keyword    eoClassTypes class abstract interface mixin
+syn keyword    eoStructure struct enum var
 syn keyword    eoTypedef type
 
 syn keyword    eoClassBodyLabels legacy_prefix eo_prefix data contained
@@ -22,7 +23,7 @@ syn keyword    eoStatements return
 
 syn match      className               "\(\w\+\.\)\+\w\+"
 
-syn match      attributes              "@\(inout\|out\|in\|class\|const\|extern\|protected\|constructor\|nonull\|warn_unused\|private\)"
+syn match      attributes              "@\(inout\|out\|in\|class\|constructor\|extern\|protected\|const\|nonull\|warn_unused\|private\)"
 
 syn match eoLabelMatch   "\w\+:" contains=eoClassBodyLabels
 syn match eoBlockOpener  "\w\+\s*{" contains=eoClassBodyBlockOpener,eoInnerBlockOpener
@@ -50,6 +51,7 @@ hi def link className Identifier
 hi def link eoStatements Statement
 
 hi def link eoStructure Structure
+hi def link eoClassTypes Structure
 
 hi def link eoType Type
 hi def link eoTypedef Typedef