Improved performance.

ColorMap working properly (at last).