ONHP-78 colors again
Merge remote-tracking branch 'origin/engagepoint/dev' into engagepoint/dev