changed color macro names