Refactored bug in colours since Angular update