Change spacers to use generic generators.
Change borders to use generic generators.