Tweaks to how colours are managed.
Added border to bottom of header.