Merge "Add 'error' color to color scheme based on updated bluechip resources" into main