changed NUMBER and STRING macros defined in color.h