Added and removed some colors.
Merge branch 'foo_pblessing_interactive_rebase_FOO-18'