theme edit fix for cancel clear change flag