Updated ColorPicker to not be a class