More color replacement fixes