diff --git a/syntax/eo.vim b/syntax/eo.vim
index dd3a28d..6c83ac1 100644
--- a/syntax/eo.vim
+++ b/syntax/eo.vim
@@ -9,7 +9,9 @@ syn keyword    eoConstants null
 
 syn keyword    eoType int uint bool char uchar byte ubyte double float
 
-syn keyword    classKeywords           class abstract legacy_prefix eo_prefix data contained
+syn keyword    eoStructure  class type struct enum var
+
+syn keyword    classKeywords           abstract legacy_prefix eo_prefix data contained
 syn keyword    classKeywords           constructors properties methods implements events contained
 
 syn keyword    functionKeywords        set get keys values params constructor destructor finalize virtual const contained return
@@ -24,13 +26,15 @@ syn cluster	eoCommentGroup	contains=eoTodo
 
 syn region     eo_comment start="\/\*" end="\*\/" contains=@eoCommentGroup
 
-hi def link classKeywords Function
+hi def link classKeywords Statement
 hi def link functionKeywords Label
 hi def link attributes Constant
 hi def link eo_comment Comment
 hi def link eoBoolean Boolean
 hi def link eoConstants Constant
 
+hi def link eoStructure Structure
+
 hi def link eoType Type
 hi def link eoTodo Todo