Improvements in ColorMap (again)

Switch loop removed