Update Color Scheme [MJ-580]

All tests pass.

This is #364, but merged to a feature instead of master.