More refactoring to distinguish between colormaps and colorscales