Bug Fixes:

* Fix colour handling for non-constant colours.
