diff --git a/app.properties b/app.properties
index f257b3dd..9c78fd91 100644
--- a/app.properties
+++ b/app.properties
@@ -79,6 +79,9 @@ deb.application.action.import: filebot -script fn:amc --output "$HOME/Media" --a
 # Default Java Options
 java.application.options: -Dunixfs=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Djava.net.useSystemProxies=true -Djna.nosys=true -Djna.nounpack=true --illegal-access=permit --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.function=ALL-UNNAMED --add-opens=java.base/java.util.regex=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.nio.file=ALL-UNNAMED --add-opens=java.base/java.nio.file.attribute=ALL-UNNAMED --add-opens=java.base/java.nio.channels=ALL-UNNAMED --add-opens=java.base/java.nio.charset=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED --add-opens=java.base/java.time.chrono=ALL-UNNAMED --add-opens=java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.logging/java.util.logging=ALL-UNNAMED --add-opens=java.desktop/java.awt=ALL-UNNAMED
 
+# Default Windows Java Options
+windows.application.options: -Dapplication.help=show -Dapplication.dir="%APPDATA%\FileBot" -Dapplication.dir="%APPDATA%\FileBot" -Djava.io.tmpdir="%APPDATA%\FileBot\tmp" -Dnet.filebot.AcoustID.fpcalc="%EXEDIR%\lib\fpcalc.exe" -Djna.boot.library.path="%EXEDIR%\lib" -Djna.library.path="%EXEDIR%\lib" -Djava.library.path="%EXEDIR%\lib"
+
 # Default Linux Java Options
 linux.application.options: -Djna.boot.library.path="$LIBRARY_PATH" -Djna.library.path="$LIBRARY_PATH" -Djava.library.path="$LIBRARY_PATH" -Dapplication.dir="$APP_DATA" -Dapplication.cache="$APP_DATA/cache" -Djava.io.tmpdir="$APP_DATA/tmp" -Dfile.encoding="UTF-8" -Dsun.jnu.encoding="UTF-8"
 linux.desktop.application.options: -Djdk.gtk.version=2 -Dsun.java2d.xrender=true -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dapplication.help=show -Dnet.filebot.UserFiles.fileChooser=JavaFX -DuseGVFS=true -Dnet.filebot.gio.GVFS="$XDG_RUNTIME_DIR/gvfs"
diff --git a/installer/appx/filebot.l4j.ini b/installer/appx/filebot.l4j.ini
index c2fc2ce7..0161d159 100644
--- a/installer/appx/filebot.l4j.ini
+++ b/installer/appx/filebot.l4j.ini
@@ -1,32 +1,20 @@
-# default java options
+# Default Java Options
 @{java.application.options}
 
-# deployment options
--Dapplication.dir="%APPDATA%\FileBot"
+# Default Windows Java Options
+@{windows.application.options}
+
+# Deployment Options
 -Dapplication.deployment=appx
--Dapplication.help=show
 -Dapplication.update=skip
 
-# put all temporary files here
--Djava.io.tmpdir="%APPDATA%\FileBot\tmp"
-
-# use Java API move/copy operations
+# Use Java API move/copy operations
 -DuseNativeShell=false
 
-# look for executables in the application folder
--Dnet.filebot.AcoustID.fpcalc="%EXEDIR%\lib\fpcalc.exe"
-
-# look for native libraries in the application folder
--Djna.library.path="%EXEDIR%\lib"
--Djna.boot.library.path="%EXEDIR%\lib"
--Djava.library.path="%EXEDIR%\lib"
-
-# disable HW acceleration
+# Disable HW acceleration
 -Dsun.java2d.d3d=false
 -Dprism.order=sw
 
-# support JAVA_OPTS environment variable
+# Support JAVA_OPTS and FILEBOT_OPTS environment variables
 %JAVA_OPTS%
-
-# support FILEBOT_OPTS environment variable
 %FILEBOT_OPTS%
diff --git a/installer/appx/filebot.launcher.l4j.ini b/installer/appx/filebot.launcher.l4j.ini
index 2a31a5a9..91516865 100644
--- a/installer/appx/filebot.launcher.l4j.ini
+++ b/installer/appx/filebot.launcher.l4j.ini
@@ -1,28 +1,19 @@
-# default java options
+# Default Java Options
 @{java.application.options}
 
-# deployment options
--Dapplication.dir="%APPDATA%\FileBot"
+# Default Windows Java Options
+@{windows.application.options}
+
+# Deployment Options
 -Dapplication.deployment=appx
--Dapplication.help=show
 -Dapplication.update=skip
 
-# put all temporary files here
--Djava.io.tmpdir="%APPDATA%\FileBot\tmp"
-
-# use Windows Shell for move/copy operations
+# Use Windows Shell for move/copy operations
 -DuseNativeShell=true
 
-# look for executables in the application folder
--Dnet.filebot.AcoustID.fpcalc="%EXEDIR%\lib\fpcalc.exe"
+# Force alphanumeric sort order to work around Windows Explorer DnD peculiarities
+-Dnet.filebot.dnd.sort=true
 
-# look for native libraries in the application folder
--Djna.library.path="%EXEDIR%\lib"
--Djna.boot.library.path="%EXEDIR%\lib"
--Djava.library.path="%EXEDIR%\lib"
-
-# support JAVA_OPTS environment variable
+# Support JAVA_OPTS and FILEBOT_OPTS environment variables
 %JAVA_OPTS%
-
-# support FILEBOT_OPTS environment variable
 %FILEBOT_OPTS%
diff --git a/installer/msi/filebot.l4j.ini b/installer/msi/filebot.l4j.ini
index 506398c0..bda859b9 100644
--- a/installer/msi/filebot.l4j.ini
+++ b/installer/msi/filebot.l4j.ini
@@ -1,27 +1,15 @@
-# default java options
+# Default Java Options
 @{java.application.options}
 
-# deployment options
--Dapplication.dir="%APPDATA%\FileBot"
+# Default Windows Java Options
+@{windows.application.options}
+
+# Deployment Options
 -Dapplication.deployment=msi
--Dapplication.help=show
 
-# put all temporary files here
--Djava.io.tmpdir="%APPDATA%\FileBot\tmp"
-
-# use Java API move/copy operations
+# Use Java API move/copy operations
 -DuseNativeShell=false
 
-# look for executables in the application folder
--Dnet.filebot.AcoustID.fpcalc="%EXEDIR%\lib\fpcalc.exe"
-
-# look for native libraries in the application folder
--Djna.library.path="%EXEDIR%\lib"
--Djna.boot.library.path="%EXEDIR%\lib"
--Djava.library.path="%EXEDIR%\lib"
-
-# support JAVA_OPTS environment variable
+# Support JAVA_OPTS and FILEBOT_OPTS environment variables
 %JAVA_OPTS%
-
-# support FILEBOT_OPTS environment variable
 %FILEBOT_OPTS%
diff --git a/installer/msi/filebot.launcher.l4j.ini b/installer/msi/filebot.launcher.l4j.ini
index 538ac6f2..5d9a95c4 100644
--- a/installer/msi/filebot.launcher.l4j.ini
+++ b/installer/msi/filebot.launcher.l4j.ini
@@ -1,30 +1,18 @@
-# default java options
+# Default Java Options
 @{java.application.options}
 
-# deployment options
--Dapplication.dir="%APPDATA%\FileBot"
+# Default Windows Java Options
+@{windows.application.options}
+
+# Deployment Options
 -Dapplication.deployment=msi
--Dapplication.help=show
 
-# put all temporary files here
--Djava.io.tmpdir="%APPDATA%\FileBot\tmp"
-
-# network settings
--Djava.net.useSystemProxies=true
-
-# use Windows Shell for move/copy operations
+# Use Windows Shell for move/copy operations
 -DuseNativeShell=true
 
-# look for executables in the application folder
--Dnet.filebot.AcoustID.fpcalc="%EXEDIR%\lib\fpcalc.exe"
+# Force alphanumeric sort order to work around Windows Explorer DnD peculiarities
+-Dnet.filebot.dnd.sort=true
 
-# look for native libraries in the application folder
--Djna.library.path="%EXEDIR%\lib"
--Djna.boot.library.path="%EXEDIR%\lib"
--Djava.library.path="%EXEDIR%\lib"
-
-# support JAVA_OPTS environment variable
+# Support JAVA_OPTS and FILEBOT_OPTS environment variables
 %JAVA_OPTS%
-
-# support FILEBOT_OPTS environment variable
 %FILEBOT_OPTS%
diff --git a/installer/msi/filebot.platform.launcher.l4j.ini b/installer/msi/filebot.platform.launcher.l4j.ini
index 0e8d544b..511026ed 100644
--- a/installer/msi/filebot.platform.launcher.l4j.ini
+++ b/installer/msi/filebot.platform.launcher.l4j.ini
@@ -1,53 +1,41 @@
-# default java options
+# Default Java Options
 @{java.application.options}
 
-# deployment options
--Dapplication.dir="%APPDATA%\FileBot"
+# Default Windows Java Options
+@{windows.application.options}
+
+# Deployment Options
 -Dapplication.deployment=msi
--Dapplication.help=skip
 
-# put all temporary files here
--Djava.io.tmpdir="%APPDATA%\FileBot\tmp"
+# Use Windows Shell for move/copy operations
+-DuseNativeShell=true
 
-# FileBot system properties
--DthreadPool=32
+# Force alphanumeric sort order to work around Windows Explorer DnD peculiarities
+-Dnet.filebot.dnd.sort=true
 
-# do not use native shell for move/copy operations
--DuseNativeShell=false
+# Improved parallel processing
+-DthreadPool=64
 
-# do not use NTFS extended attributes for storing metadata
+# Do not use NTFS extended attributes
 -DuseExtendedFileAttributes=false
 
-# look for executables in the application folder
--Dnet.filebot.AcoustID.fpcalc="%EXEDIR%\lib\fpcalc.exe"
+# Use Apache VFS to extract archives
+-Dnet.filebot.Archive.extractor=ApacheVFS
 
-# look for native libraries in the application folder
--Djna.library.path="%EXEDIR%\lib"
--Djna.boot.library.path="%EXEDIR%\lib"
--Djava.library.path="%EXEDIR%\lib"
+# Use Nimbus LaF
+-Dswing.systemlaf=javax.swing.plaf.nimbus.NimbusLookAndFeel
 
-# use Java implementation for extracting archives
--Dnet.filebot.Archive.extractor="ApacheVFS"
-
-# force english locale
+# Force English Locale
 -Dfile.encoding=UTF-8
 -Duser.country=US
 -Duser.country.format=US
 -Duser.language=en
 -Duser.language.format=en
 
-# disable HW acceleration
+# Disable HW acceleration
 -Dsun.java2d.d3d=false
 -Dprism.order=sw
 
-# force platform L&F
--Dswing.systemlaf=javax.swing.plaf.nimbus.NimbusLookAndFeel
-
-# force HTTP for OpenSubtitles API calls (useful for debugging requests with Fiddler)
--Dnet.filebot.OpenSubtitlesXmlRpc.url="http://api.opensubtitles.org/xml-rpc"
-
-# support JAVA_OPTS environment variable
+# Support JAVA_OPTS and FILEBOT_OPTS environment variables
 %JAVA_OPTS%
-
-# support FILEBOT_OPTS environment variable
 %FILEBOT_OPTS%