Popup class for color picker setup
Merge remote-tracking branch 'origin/ColorPicker'