Add color naming in logo-color

There was a fair bit of refactoring to make this nicer, and there are
some other improvements stowing away as well.