diff --git a/installer/msi/filebot-cmd-launch4j.xml b/installer/msi/filebot-cmd-launch4j.xml
index bf24702b..d7be8368 100644
--- a/installer/msi/filebot-cmd-launch4j.xml
+++ b/installer/msi/filebot-cmd-launch4j.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,13 +14,17 @@
   <restartOnCrash>false</restartOnCrash>
   <manifest></manifest>
   <icon>..\icons\shortcut.ico</icon>
+  <classPath>
+    <mainClass>net.filebot.Main</mainClass>
+    <cp>%EXEDIR%\lib\*.jar</cp>
+  </classPath>
   <jre>
-    <path></path>
-    <bundledJre64Bit>false</bundledJre64Bit>
+    <path>jre</path>
+    <bundledJre64Bit>true</bundledJre64Bit>
     <bundledJreAsFallback>false</bundledJreAsFallback>
-    <minVersion>1.8.0</minVersion>
+    <minVersion></minVersion>
     <maxVersion></maxVersion>
-    <jdkPreference>preferJre</jdkPreference>
-    <runtimeBits>64/32</runtimeBits>
+    <jdkPreference>jreOnly</jdkPreference>
+    <runtimeBits>64</runtimeBits>
   </jre>
 </launch4jConfig>
\ No newline at end of file
diff --git a/installer/msi/filebot-launch4j.xml b/installer/msi/filebot-launch4j.xml
index ef5841dd..508fa776 100644
--- a/installer/msi/filebot-launch4j.xml
+++ b/installer/msi/filebot-launch4j.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,13 +14,17 @@
   <restartOnCrash>false</restartOnCrash>
   <manifest></manifest>
   <icon>..\icons\shortcut.ico</icon>
+  <classPath>
+    <mainClass>net.filebot.Main</mainClass>
+    <cp>%EXEDIR%\lib\*.jar</cp>
+  </classPath>
   <jre>
-    <path></path>
-    <bundledJre64Bit>false</bundledJre64Bit>
+    <path>jre</path>
+    <bundledJre64Bit>true</bundledJre64Bit>
     <bundledJreAsFallback>false</bundledJreAsFallback>
-    <minVersion>1.8.0</minVersion>
+    <minVersion></minVersion>
     <maxVersion></maxVersion>
-    <jdkPreference>preferJre</jdkPreference>
-    <runtimeBits>64/32</runtimeBits>
+    <jdkPreference>jreOnly</jdkPreference>
+    <runtimeBits>64</runtimeBits>
   </jre>
 </launch4jConfig>
\ No newline at end of file
diff --git a/installer/msi/filebot-platform-launch4j.xml b/installer/msi/filebot-platform-launch4j.xml
index 02f5ca1d..82e0d226 100644
--- a/installer/msi/filebot-platform-launch4j.xml
+++ b/installer/msi/filebot-platform-launch4j.xml
@@ -2,7 +2,7 @@
 <launch4jConfig>
   <dontWrapJar>true</dontWrapJar>
   <headerType>gui</headerType>
-  <jar>FileBot.jar</jar>
+  <jar></jar>
   <outfile>filebot.platform.launcher.exe</outfile>
   <errTitle></errTitle>
   <cmdLine></cmdLine>
@@ -14,13 +14,17 @@
   <restartOnCrash>false</restartOnCrash>
   <manifest></manifest>
   <icon>..\icons\shortcut.ico</icon>
+  <classPath>
+    <mainClass>net.filebot.Main</mainClass>
+    <cp>%EXEDIR%\lib\*.jar</cp>
+  </classPath>
   <jre>
-    <path></path>
-    <bundledJre64Bit>false</bundledJre64Bit>
+    <path>jre</path>
+    <bundledJre64Bit>true</bundledJre64Bit>
     <bundledJreAsFallback>false</bundledJreAsFallback>
-    <minVersion>1.8.0</minVersion>
+    <minVersion></minVersion>
     <maxVersion></maxVersion>
-    <jdkPreference>preferJre</jdkPreference>
-    <runtimeBits>64/32</runtimeBits>
+    <jdkPreference>jreOnly</jdkPreference>
+    <runtimeBits>64</runtimeBits>
   </jre>
 </launch4jConfig>
\ No newline at end of file
diff --git a/installer/msi/filebot.exe b/installer/msi/filebot.exe
index 0c34aa03..9d15531e 100644
Binary files a/installer/msi/filebot.exe and b/installer/msi/filebot.exe differ
diff --git a/installer/msi/filebot.launcher.exe b/installer/msi/filebot.launcher.exe
index 14003ccb..d0c086df 100644
Binary files a/installer/msi/filebot.launcher.exe and b/installer/msi/filebot.launcher.exe differ
diff --git a/installer/msi/filebot.platform.launcher.exe b/installer/msi/filebot.platform.launcher.exe
index bc15fba9..03d61379 100644
Binary files a/installer/msi/filebot.platform.launcher.exe and b/installer/msi/filebot.platform.launcher.exe differ