Added some additional logic for color map changes

We want to render whenever the color map is changes, added some logic
to ensure this happens at the right times.
Merge branch 'missing-renders'