diff --git a/syntax/cs.vim b/syntax/cs.vim
index 7444dcc..3a948b1 100644
--- a/syntax/cs.vim
+++ b/syntax/cs.vim
@@ -24,8 +24,9 @@ set cpoptions&vim
 syn keyword	csType	bool byte char decimal double float int long object sbyte short string T uint ulong ushort var void dynamic
 syn keyword	csType	nint nuint " contextual
 
-syn keyword	csStorage	enum interface namespace struct
-syn match	csStorage	"\<delegate\>"
+syn keyword	csStorage	namespace
+" syn keyword	csStorage	enum interface namespace struct
+" syn match	csStorage	"\<delegate\>"
 syn keyword	csRepeat	break continue do for foreach goto return while
 syn keyword	csConditional	else if switch
 syn keyword	csLabel	case default
@@ -154,13 +155,21 @@ endif
 
 syn cluster	csPreProcessor	contains=csPreProc.*
 
-syn region	csClassType	start="\<class\>"hs=s+6 end="[:\n{]"me=e-1 contains=csClass
+syn region	csClassType	matchgroup=csStorage start="\<class\>" matchgroup=NONE end=">" end="[:{]"me=e-1
+syn region	csInterfaceType	matchgroup=csStorage start="\<interface\>" matchgroup=NONE end=">" end="[:{]"me=e-1
+
+syn region	csStructType	matchgroup=csStorage start="\<struct\>" matchgroup=NONE end=">" end="[:{]"me=e-1
+syn region	csEnumType	matchgroup=csStorage start="\<enum\>" end="[:{]"me=e-1
+
+syn match	csStorage	"\<delegate\>\%(\_s*[*(]\)\@!" nextgroup=csDelegateReturnType skipwhite skipempty
+syn match	csDelegateReturnType	"@\=\<\h\w*\_s*\%(<\_[^;]\+>\)\=\%(\_s*\[]\)\=?\=\ze\_s*@\=\h" nextgroup=csDelegateType skipwhite skipempty contained contains=csType,csGeneric
+syn match	csDelegateType	"@\=\h\w*\_s*\%(<\_[^>]\+>\)\=\ze\_s*(" contained
+
 " csUserType may be defined by user scripts/plugins - it should be contained in csNewType
 syn region	csNewType	start="\<new\>"hs=s+4 end="[;\n{(<\[]"me=e-1 contains=csNew,@csNamespaceAlias,csUserType
 syn region	csIsType	start=" is "hs=s+4 end="[A-Za-z0-9]\+" oneline contains=csIsAs
 syn region	csIsType	start=" as "hs=s+4 end="[A-Za-z0-9]\+" oneline contains=csIsAs
 syn keyword	csNew	new contained
-syn keyword	csClass	class contained
 syn keyword	csIsAs	is as
 
 syn keyword	csBoolean	false true
@@ -223,9 +232,12 @@ syn match csIdentifier "@\h\w*"
 " The default highlighting.
 hi def link	csType	Type
 hi def link	csClassType	Type
+hi def link	csInterfaceType	Type
+hi def link	csStructType	Type
+hi def link	csEnumType	Type
+hi def link	csDelegateType	Type
 hi def link	csIsType	Type
 hi def link	csStorage	Structure
-hi def link	csClass	Structure
 hi def link	csRepeat	Repeat
 hi def link	csConditional	Conditional
 hi def link	csLabel	Label
diff --git a/test/types.vader b/test/types.vader
index 768f71d..8fcd7bc 100644
--- a/test/types.vader
+++ b/test/types.vader
@@ -27,3 +27,42 @@ Execute:
   AssertEqual 'csOpSymbols',       SyntaxOf('\*')
   AssertEqual 'csManagedModifier', SyntaxOf('\<managed')
 
+Given cs (class type declaration):
+  class Foo<T, U> : Bar<T, U> {}
+
+Execute:
+  AssertEqual 'csStorage',         SyntaxOf('class')
+  AssertEqual 'csClassType',       SyntaxOf('Foo')
+  AssertEqual 'csClassType',       SyntaxOf('T', 1)
+
+Given cs (interface type declaration):
+  interface Foo<T, U> : Bar<T, U> {}
+
+Execute:
+  AssertEqual 'csStorage',         SyntaxOf('interface')
+  AssertEqual 'csInterfaceType',   SyntaxOf('Foo')
+  AssertEqual 'csInterfaceType',   SyntaxOf('T', 1)
+
+Given cs (struct type declaration):
+  struct Foo<T, U> : Bar<T, U> {}
+
+Execute:
+  AssertEqual 'csStorage',         SyntaxOf('struct')
+  AssertEqual 'csStructType',      SyntaxOf('Foo')
+  AssertEqual 'csStructType',      SyntaxOf('T', 1)
+
+Given cs (enum type declaration):
+  enum Foo : int {}
+
+Execute:
+  AssertEqual 'csStorage',         SyntaxOf('enum')
+  AssertEqual 'csEnumType',        SyntaxOf('Foo')
+
+Given cs (delegate type declaration):
+  delegate Foo<Bar<T>> Baz<T>();
+
+Execute:
+  AssertEqual 'csStorage',         SyntaxOf('delegate')
+  AssertEqual 'csDelegateType',    SyntaxOf('Baz')
+  AssertEqual 'csDelegateType',    SyntaxOf('T', 2)
+