Colour widget fixes