Refactor to apply/unapply mods code
Handle shortcuts in runtime
Fix switching mods
Fix self-referenced events