Replaced 'bordercol' with 'border' with other tweaks