Add flag to disable borders