Color support
Merge remote-tracking branch 'origin/colors'