Handle colour lists better