diff --git a/vim/after/syntax/cpp.vim b/vim/after/syntax/cpp.vim
index 9afebf7..f6d03a2 100644
--- a/vim/after/syntax/cpp.vim
+++ b/vim/after/syntax/cpp.vim
@@ -19,11 +19,18 @@ syn keyword cxxExportNamespace exports
 
 syn match cxxConstants  "\<\(C::[A-Za-z_]\|k[A-Z]\)[A-Z_a-z0-9]*\>"
 
-syn keyword cxxExceptionNames  Exception Exceptions
-syn match   cxxExceptionNames  "\<[A-Z][A-Za-z0-9_]*Exception\>"
+syn keyword cxxErrorNames      Critical CriticalError
 
-syn keyword cxxErrorNames      Error Errors
-syn match   cxxErrorNames      "\<[A-Z][A-Za-z0-9_]*Error\>"
+syn keyword cxxExceptionNames  Exception Exceptions Error
+syn match   cxxExceptionNames  "\<[A-Z][A-Za-z0-9_]*Exception\>"
+syn match   cxxExceptionNames  "\<[A-Z][A-Za-z0-9_]*Error\>"
+syn match   cxxErrorNames      "\<Critical[A-Z][A-Za-z0-9_]*Error\>"
+
+syn keyword cxxNotificationNames Notification
+
+syn keyword cxxConditionNames Condition
+
+syn keyword cxxViolationNames Violation
 
 syn match cxxCast              "\<\(const\|static\|dynamic\|reinterpret\)_cast\s*\(<\)\@="
 
@@ -225,11 +232,15 @@ if version >= 508 || !exists("did_cxx_syntax_inits")
 
   HiLink cxxStatement      Statement
 
+  HiLink cxxErrorNames     Error
   HiLink cxxExceptionNames Exception
+  HiLink cxxConditionNames Condition
+  HiLink cxxNotificationNames Notification
+  HiLink cxxViolationNames Violation
+
   HiLink cxxStlExceptionNames Exception
   HiLink cxxStlNothrow     Nothrow
   HiLink cxxStlNothrowObject     NothrowObject
-  HiLink cxxErrorNames     Error
   HiLink cxxDebug          Debug
   HiLink cxxConstants      Constant
   HiLink cxxNamedConstant  Constant
diff --git a/vim/colors/adam.vim b/vim/colors/adam.vim
index 7dac81b..e6e4f6d 100644
--- a/vim/colors/adam.vim
+++ b/vim/colors/adam.vim
@@ -92,6 +92,9 @@ hi Comment ctermfg=darkgrey cterm=none term=NONE term=none start=<esc>[38;5;242m
 hi Identifier ctermfg=cyan cterm=none term=none start=<esc>[96m stop=<esc>[0m
 hi Object ctermfg=red term=none start=<esc>[91m stop=<esc>[0m
 hi Exception ctermfg=brown term=none start=<esc>[38;5;130m stop=<esc>[0m
+hi Notification ctermfg=yellow cterm=italic
+hi Condition ctermfg=darkgreen cterm=italic
+hi Violation ctermfg=208 cterm=italic,underline
 hi Nothrow ctermfg=215  term=none start=<esc>[38;5;130m stop=<esc>[0m
 hi Nothrow ctermfg=58  term=none start=<esc>[38;5;130m stop=<esc>[0m
 hi Service ctermfg=green start=<esc>[32m stop=<esc>[0m