Made the switch to the bin-style colour lookup, and fixed the tests.