colors support
Merge branch 'colors'