update -xy mixin. add border support