Added color picker back in