Reworked Launcher/Installer integration