BorderWidth now properly contributes to the padding.