Cleaned up changeColor shuffle