Added Circle and Bar to colour picker