Added color picker stuff