fix colors
Merge branch 'develop'