Added Color enum, incorporated Bo's color changes since MERGE was being ...

...STUPID