Colour refactoring