Improved syntax highlighing for C++ and C++11