update borders to use new styling
resolved merge conflicts
Merge pull request #799 from shoes/border_style

Updated Border to use new styling methods (#711)

Changelog: improvement