fix colors service
Merge branch 'master' into ui