Added color picker holding code back in