Fix styling when theme forces border-box. Now doing this ourself