fix up colors
Merge commit 'bbcb19a08e0a1770661ab8a6ab55b2c4a014b714' into revision1