diff --git a/installer/appx/filebot.exe b/installer/appx/filebot.exe
index 8de2fe13..01c7e576 100644
Binary files a/installer/appx/filebot.exe and b/installer/appx/filebot.exe differ
diff --git a/installer/appx/filebot.l4j.xml b/installer/appx/filebot.l4j.xml
index 60b95b7d..e2ea5d40 100644
--- a/installer/appx/filebot.l4j.xml
+++ b/installer/appx/filebot.l4j.xml
@@ -2,7 +2,7 @@
 <launch4jConfig>
   <dontWrapJar>true</dontWrapJar>
   <headerType>console</headerType>
-  <jar>FileBot.jar</jar>
+  <jar></jar>
   <outfile>filebot.exe</outfile>
   <errTitle></errTitle>
   <cmdLine></cmdLine>
@@ -14,6 +14,10 @@
   <restartOnCrash>false</restartOnCrash>
   <manifest></manifest>
   <icon>..\icons\shortcut.ico</icon>
+  <classPath>
+    <mainClass>net.filebot.Main</mainClass>
+    <cp>lib\*.jar</cp>
+  </classPath>
   <jre>
     <path>jre</path>
     <bundledJre64Bit>true</bundledJre64Bit>
diff --git a/installer/appx/filebot.launcher.exe b/installer/appx/filebot.launcher.exe
index 861d3422..e6792acb 100644
Binary files a/installer/appx/filebot.launcher.exe and b/installer/appx/filebot.launcher.exe differ
diff --git a/installer/appx/filebot.launcher.l4j.xml b/installer/appx/filebot.launcher.l4j.xml
index c3bdb697..0cb593f1 100644
--- a/installer/appx/filebot.launcher.l4j.xml
+++ b/installer/appx/filebot.launcher.l4j.xml
@@ -2,7 +2,7 @@
 <launch4jConfig>
   <dontWrapJar>true</dontWrapJar>
   <headerType>gui</headerType>
-  <jar>FileBot.jar</jar>
+  <jar></jar>
   <outfile>filebot.launcher.exe</outfile>
   <errTitle></errTitle>
   <cmdLine></cmdLine>
@@ -14,6 +14,10 @@
   <restartOnCrash>false</restartOnCrash>
   <manifest></manifest>
   <icon>..\icons\shortcut.ico</icon>
+  <classPath>
+    <mainClass>net.filebot.Main</mainClass>
+    <cp>lib\*.jar</cp>
+  </classPath>
   <jre>
     <path>jre</path>
     <bundledJre64Bit>true</bundledJre64Bit>