More ColorKey cleanup