Tidied up and shifted Colour responsibility over to ColourManager