Mostly fixing awkward map colour schemes.