Add support for border removal and replacement