Colour tweaks.
Started some minor clean-up.