Rename $b-borderColor to $c-border