Rename NOBORDER to MINIMALBORDER