Separated inner and outer border styles so they have their own modifier classes

@sdbernard, if you're happy, please merge. Thanks