adjusted green to make it more readable under the most conditions, swap cyan for blue to better match
Merge branch 'develop' into care-portal