Updated colors to work using maps