diff --git a/vim/vimrc b/vim/vimrc
index 40ec155..65fb07e 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -119,6 +119,9 @@ let g:abolish_no_mappings=1 " we set out own later
 " zig.vim
 let g:zig_fmt_autosave=0
 
+" polyglot
+let g:polyglot_disabled=['c++11']
+
 " gui and terminal specific settings
 if has('gui_running')
    set guicursor+=i:hor10-Cursor
@@ -205,27 +208,6 @@ filetype on
 filetype plugin on
 filetype indent on
 
-" Highlighting ---------------------------------------------------------------|
-
-" Settings for C++ to make it more consistent with other highlighting groups,
-" and better for recent standards and specs.
-let g:cpp_class_scope_highlight=1
-let g:cpp_concepts_highlight=1
-
-" Get rid of STL highlighting because those are NOT keywords
-hi link cppSTLbool         NONE
-hi link cppSTLcast         NONE
-hi link cppSTLconstant     NONE
-hi link cppSTLenum         NONE
-hi link cppSTLexception    NONE
-hi link cppSTLfunction     NONE
-hi link cppSTLfunctional   NONE
-hi link cppSTLios          NONE
-hi link cppSTLiterator     NONE
-hi link cppSTLiterator_tag NONE
-hi link cppSTLnamespace    NONE
-hi link cppSTLtype         NONE
-
 " Functions ------------------------------------------------------------------|
 
 " Automatic headers