changed color
Merge branch 'feature/ST-XXX_julie' into feature/refresh