Adding an optional panel for the colour picker

RH-57937 is fixed in the latest WIP