Fixing colours on sane terminals...

Change-Id: Ie1868b75d0c5d5c8b3205a09048d9bfdefe16cfa
Merge "Fixing colours on sane terminals..." into kk