another update
more colors
Merge branch 'master' into color-text