Colour picker fixes