diff --git a/installer/msi/filebot.exe b/installer/msi/filebot.exe
index 4db0a823..84911806 100644
Binary files a/installer/msi/filebot.exe and b/installer/msi/filebot.exe differ
diff --git a/installer/msi/filebot-cmd-launch4j.xml b/installer/msi/filebot.l4j.xml
similarity index 85%
rename from installer/msi/filebot-cmd-launch4j.xml
rename to installer/msi/filebot.l4j.xml
index 95ea3a41..874878a5 100644
--- a/installer/msi/filebot-cmd-launch4j.xml
+++ b/installer/msi/filebot.l4j.xml
@@ -2,7 +2,7 @@
 <launch4jConfig>
   <dontWrapJar>true</dontWrapJar>
   <headerType>console</headerType>
-  <jar></jar>
+  <jar>jar\filebot.jar</jar>
   <outfile>filebot.exe</outfile>
   <errTitle></errTitle>
   <cmdLine></cmdLine>
@@ -14,10 +14,6 @@
   <restartOnCrash>false</restartOnCrash>
   <manifest></manifest>
   <icon>icon.ico</icon>
-  <classPath>
-    <mainClass>net.filebot.Main</mainClass>
-    <cp>%EXEDIR%\jar\*.jar</cp>
-  </classPath>
   <jre>
     <path>jre</path>
     <bundledJre64Bit>true</bundledJre64Bit>
diff --git a/installer/msi/filebot.launcher.exe b/installer/msi/filebot.launcher.exe
index 8374e121..efd92d40 100644
Binary files a/installer/msi/filebot.launcher.exe and b/installer/msi/filebot.launcher.exe differ
diff --git a/installer/appx/filebot.launcher.l4j.xml b/installer/msi/filebot.launcher.xml
similarity index 85%
rename from installer/appx/filebot.launcher.l4j.xml
rename to installer/msi/filebot.launcher.xml
index 10ff6f56..c022c3a5 100644
--- a/installer/appx/filebot.launcher.l4j.xml
+++ b/installer/msi/filebot.launcher.xml
@@ -2,7 +2,7 @@
 <launch4jConfig>
   <dontWrapJar>true</dontWrapJar>
   <headerType>gui</headerType>
-  <jar></jar>
+  <jar>jar\filebot.jar</jar>
   <outfile>filebot.launcher.exe</outfile>
   <errTitle></errTitle>
   <cmdLine></cmdLine>
@@ -14,10 +14,6 @@
   <restartOnCrash>false</restartOnCrash>
   <manifest></manifest>
   <icon>icon.ico</icon>
-  <classPath>
-    <mainClass>net.filebot.Main</mainClass>
-    <cp>%EXEDIR%\lib\*.jar</cp>
-  </classPath>
   <jre>
     <path>jre</path>
     <bundledJre64Bit>true</bundledJre64Bit>
diff --git a/installer/msi/filebot.platform.launcher.exe b/installer/msi/filebot.platform.launcher.exe
index 7c0fe7bb..e9619bd2 100644
Binary files a/installer/msi/filebot.platform.launcher.exe and b/installer/msi/filebot.platform.launcher.exe differ
diff --git a/installer/msi/filebot-platform-launch4j.xml b/installer/msi/filebot.platform.launcher.xml
similarity index 86%
rename from installer/msi/filebot-platform-launch4j.xml
rename to installer/msi/filebot.platform.launcher.xml
index 40afd8e0..a25d2733 100644
--- a/installer/msi/filebot-platform-launch4j.xml
+++ b/installer/msi/filebot.platform.launcher.xml
@@ -2,7 +2,7 @@
 <launch4jConfig>
   <dontWrapJar>true</dontWrapJar>
   <headerType>gui</headerType>
-  <jar></jar>
+  <jar>jar\filebot.jar</jar>
   <outfile>filebot.platform.launcher.exe</outfile>
   <errTitle></errTitle>
   <cmdLine></cmdLine>
@@ -14,10 +14,6 @@
   <restartOnCrash>false</restartOnCrash>
   <manifest></manifest>
   <icon>icon.ico</icon>
-  <classPath>
-    <mainClass>net.filebot.Main</mainClass>
-    <cp>%EXEDIR%\jar\*.jar</cp>
-  </classPath>
   <jre>
     <path>jre</path>
     <bundledJre64Bit>true</bundledJre64Bit>