changed color handling