Updated to use latest Color class