diff --git a/vim/after/syntax/cpp.vim b/vim/after/syntax/cpp.vim
index 53fae74..ab60eb1 100644
--- a/vim/after/syntax/cpp.vim
+++ b/vim/after/syntax/cpp.vim
@@ -14,14 +14,23 @@ syn keyword cppStatement static_assert
 
 syn keyword cxxConstants       nullptr
 
+syn match cxxConstants  "\<C::[A-Za-z_][A-Z_a-z0-9]*\>"
+syn match cxxConstants  "\<k[A-Z][A-Za-z_][A-Z_a-z0-9]*\>"
+
 syn keyword cxxExceptionNames  Exception Exceptions
 syn match   cxxExceptionNames  "\<[A-Z][A-Za-z0-9_]*Exception\>"
 
 syn keyword cxxErrorNames      Error Errors
 syn match   cxxErrorNames      "\<[A-Z][A-Za-z0-9_]*Error\>"
 
-syn match cxxCast              "\<\(const\|static\|dynamic\|reinterpret\)_cast\s*<"me=e-1
-syn match cxxCast              "\<\(const\|static\|dynamic\|reinterpret\)_cast\s*$"
+syn match cxxCast              "\<\(const\|static\|dynamic\|reinterpret\)_cast\s*\(<\)\@="
+
+
+syn match cxxStlTypes          "\(\<std::\)\@<=\(string\|\(io\?\|o\)stream\)\>"
+syn match cxxStlTypes          "\(\<std::\)\@<=vector\(<\)\@="
+syn match cxxStlTypes "\(std::\)\@<=\(vector\|array\|deque\|list\|queue\|stack\|\(\|\(multi\|unordered\)_\)\(set\|map\)\)\(<\)\@="
+syn match cxxStlPrefix          "\<std\(::\)\@="
+
 
 
 " Define the default highlighting.
@@ -45,6 +54,9 @@ if version >= 508 || !exists("did_cxx_syntax_inits")
   HiLink cxxErrorNames     Error
   HiLink cxxDebug          Debug
   HiLink cxxConstants      Constant
+  HiLink cxxNamedConstant  Constant
+  HiLink cxxStlTypes       Object
+  HiLink cxxStlPrefix      Caller
 
   delcommand HiLink
 endif