Added color picker and poly type option