Use new variables and fix some color issues
[cloud]
ERM19138
Change-Id: I35de69bf8ce9a07b615cb1ad65c3b4d795365b39