Reworked mako_hotplug & interactive