add better color mapping