ENH: added better color handling