Remove direct color variable references and replace with element variables
More direct colour variable references replacements
Fix variable name
Merge pull request #154 from moneyadviceservice/variable-references

Remove direct color variable references and replace with element variabl...