consolidate colors (needs work)