Added color picker, removed autocomplete