Use semantic values for colours not $grey and $black

Good catch @edds, I had forgotten about these variables.
Removed duplication between hmrc templates