diff --git a/vim/after/syntax/cpp.vim b/vim/after/syntax/cpp.vim
index 8eb95e2..e615fc7 100644
--- a/vim/after/syntax/cpp.vim
+++ b/vim/after/syntax/cpp.vim
@@ -80,6 +80,8 @@ syn keyword cxxStlKeywords contained containedin=cxxStlLibrary,cxxBoostLibrary s
 
 syn keyword cxxStlKeywords containedin=cxxStlLibrary,cxxBoostLibrary function contained
 
+syn keyword cxxStlKeywords containedin=cxxStlLibrary format_parse_context formatter contained
+
 syn keyword cxxStlTypes containedin=cxxStlLibrary exception_ptr contained
 syn keyword cxxStlTypes containedin=cxxStlLibrary iostream istream ostream fstream ifstream ofstream contained
 syn keyword cxxStlTypes containedin=cxxStlLibrary stringstream istringstream ostringstream contained
@@ -176,6 +178,7 @@ syn keyword cxxStlExceptionNames containedin=cxxStlLibrary out_of_range containe
 syn keyword cxxStlExceptionNames containedin=cxxStlLibrary range_error contained
 syn keyword cxxStlExceptionNames containedin=cxxStlLibrary overflow_error contained
 syn keyword cxxStlExceptionNames containedin=cxxStlLibrary underflow_error contained
+syn keyword cxxStlExceptionNames containedin=cxxStlLibrary format_error contained
 
 " Not really an exception, but it kinda is related
 syn keyword cxxStlNothrow containedin=cxxStlLibrary nothrow_t contained