diff --git a/syntax/idris2.vim b/syntax/idris2.vim
index a7a06b5..60068e6 100644
--- a/syntax/idris2.vim
+++ b/syntax/idris2.vim
@@ -47,33 +47,32 @@ syn region idrisBlockComment start="{-" end="-}" contains=idrisBlockComment,idri
 syn match idrisIdentifier "[a-zA-Z][a-zA-z0-9_']*" contained
 
 highlight def link idrisDeprecated Error
-highlight def link idrisIdentifier Identifier
+" highlight def link idrisIdentifier Identifier
 highlight def link idrisImport Structure
 highlight def link idrisModule Structure
 highlight def link idrisStructure Structure
-highlight def link idrisStatement Statement
+highlight def link idrisStatement Structure
 highlight def link idrisForall Structure
-highlight def link idrisDataOpt Statement
-highlight def link idrisDSL Statement
-highlight def link idrisBlock Statement
-highlight def link idrisAnnotation Statement
+highlight def link idrisDataOpt Macro
+highlight def link idrisBlock Structure
+highlight def link idrisAnnotation Structure
 highlight def link idrisWhere Structure
 highlight def link idrisLet Structure
-highlight def link idrisTotality Statement
-highlight def link idrisVisibility Statement
+highlight def link idrisTotality Macro
+highlight def link idrisVisibility Macro
 highlight def link idrisConditional Conditional
-highlight def link idrisPragma Statement
+highlight def link idrisPragma Macro
 highlight def link idrisNumber Number
 highlight def link idrisFloat Float
 highlight def link idrisDelimiter Delimiter
 highlight def link idrisInfix PreProc
 highlight def link idrisOperators Operator
-highlight def link idrisType Include
+highlight def link idrisType Type
 highlight def link idrisDocComment Comment
 highlight def link idrisLineComment Comment
 highlight def link idrisBlockComment Comment
 highlight def link idrisTodo Todo
-highlight def link idrisMetaVar Macro
+highlight def link idrisMetaVar Special
 highlight def link idrisString String
 highlight def link idrisRawString String
 highlight def link idrisChar String