Convert to C++11 and simplify colors