merge: mask fixes/upgrades, overlay plugin rework, popup menu tweak