Renamed a couple of colorspaces and removed others that we're problematic.