FLOE-108: Removed more occurrences of "colour" from the code.