diff --git a/jdk8.patch b/jdk8.patch
index 09ed30b3..dee049a3 100644
--- a/jdk8.patch
+++ b/jdk8.patch
@@ -17,7 +17,7 @@ index 940479cc..0be259e9 100644
  	<classpathentry kind="lib" path="lib/jars/jacksum.jar"/>
  	<classpathentry kind="lib" path="lib/jars/simmetrics.jar"/>
 diff --git a/app.properties b/app.properties
-index f257b3dd..f366e237 100644
+index 252679d3..64a6eb0a 100644
 --- a/app.properties
 +++ b/app.properties
 @@ -35,11 +35,12 @@ link.patreon: https://www.patreon.com/filebot
@@ -36,15 +36,6 @@ index f257b3dd..f366e237 100644
  
  # Package Information
  package.name: filebot
-@@ -67,7 +68,7 @@ mac.application.category: public.app-category.utilities
- deb.application.categories: AudioVideo;Video;Utility;FileTools;
- deb.application.mimetype: inode/directory;video/*;audio/*;text/*;application/*;
- deb.application.class: net-filebot-Main
--deb.application.depends: openjdk-10-jre, openjfx, mediainfo, libchromaprint-tools
-+deb.application.depends: openjdk-8-jre, openjfx, mediainfo, libchromaprint-tools
- 
- # Package Options
- tar.compression: xz
 @@ -77,7 +78,7 @@ msi.compression: high
  deb.application.action.import: filebot -script fn:amc --output "$HOME/Media" --action duplicate -non-strict --log-file "$HOME/Media/amc.log" --def excludeList="$HOME/Media/amc.excludes" unsorted=y music=y artwork=y
  
@@ -52,10 +43,10 @@ index f257b3dd..f366e237 100644
 -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
 +java.application.options: -Dunixfs=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Djava.net.useSystemProxies=true -Djna.nosys=true -Djna.nounpack=true
  
- # 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"
+ # 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"
 diff --git a/build.xml b/build.xml
-index a7b0fa5a..0d5880d8 100644
+index 2860ba90..1a55833c 100644
 --- a/build.xml
 +++ b/build.xml
 @@ -93,9 +93,10 @@
@@ -70,7 +61,7 @@ index a7b0fa5a..0d5880d8 100644
  				<patternset refid="pattern.jre" />
  				<cutdirsmapper dirs="1" />
  			</untar>
-@@ -266,7 +267,7 @@
+@@ -269,7 +270,7 @@
  		</copy>
  
  		<!-- compile -->
@@ -79,7 +70,7 @@ index a7b0fa5a..0d5880d8 100644
  			<classpath>
  				<fileset dir="${dir.dist}/lib" />
  			</classpath>
-@@ -305,7 +306,7 @@
+@@ -308,7 +309,7 @@
  			<fileset dir="${dir.installer}/appx" includes="*.exe, **/*.png" />
  		</copy>
  		<copy todir="${dir.staging}/lib">
@@ -88,7 +79,7 @@ index a7b0fa5a..0d5880d8 100644
  		</copy>
  		<copy todir="${dir.staging}/jar">
  			<fileset dir="${dir.dist}/lib" includes="*.jar" />
-@@ -333,7 +334,7 @@
+@@ -336,7 +337,7 @@
  			<arg line="new /o /pr . /cf priconfig.xml /in ${microsoft.application.name}" />
  		</exec>
  		<exec executable="makeappx" dir="${dir.dist}" failonerror="yes">