added and rearranged a bunch of string <-> color stuff