Keep the baseline separate
The left selector keeps three independent buffers. Put chart defaults in Defaults, then the two complete override mappings in Old and New. A blank buffer means an empty mapping. The new version is never layered on top of the old one.