Improved C and C++ highlighting