Merge color and animation fixes