Add border color property
Expose buttons property