Various colour tweaks.
Merge.