Update padding and deactivate borders.

Borders are merged with padding for now.