Mods to color2colormap and barweb