Added choice element
Added more brush primitives