Isolate contrast colors

Hopefully this will make merges from upstream easier.