Added color picker support