fixed colors
Merge branch 'colorfix'
merge