Add rudimentary border and mask options