Colour handling changed