Revert "+border"

This reverts commit 3cc0a6f423f14f02ca9b791e3a9f2b4566d65a6a.