better compat between add-ons using Watchers
simplify Overlays code