diff --git a/app.properties b/app.properties
index 321f191b..cc1eec55 100644
--- a/app.properties
+++ b/app.properties
@@ -2,7 +2,15 @@
 application.name: FileBot
 application.version: 4.8.0
 
-
+# Missing info (recovered from distributed prod binaries)
+url.data: https://app.filebot.net/data
+apikey.fanart.tv: 6fa42b0ef3b5f3aab6a7edaa78675ac2
+apikey.thetvdb: BA864DEE427E384A
+apikey.themoviedb: 66308fb6e3fd850dde4c7d21df2e8306
+apikey.omdb: 49d311ec
+apikey.acoustid: 0B3qZnQc
+apikey.anidb: filebot
+apikey.opensubtitles:
 
 # Script Base URL
 github.stable: https://app.filebot.net/scripts/m1.jar.xz
@@ -55,7 +63,7 @@ package.homepage: https://www.filebot.net/
 
 # Distribution-specific Package Information
 microsoft.application.name: PointPlanck.FileBot
-microsoft.application.publisher: CN=761A0D2B-9B86-4FE4-B664-18E4E0AFC3F1
+microsoft.application.publisher: CN=Example.com(Test)
 
 # Platform-specific Package Information
 mac.application.category: public.app-category.utilities
diff --git a/build.xml b/build.xml
index 505ded2b..c0926389 100644
--- a/build.xml
+++ b/build.xml
@@ -160,6 +160,11 @@
 
 	<target name="fatjar" depends="jar" description="Build executable jar">
 		<jar destfile="${path.fatjar}" filesetmanifest="merge" duplicate="fail" compress="no">
+			<!-- Manifest for fatjar so its executable-->
+			<manifest>
+				<attribute name="Main-Class" value="net.filebot.Main"/>
+			</manifest>
+
 			<!-- include main jar -->
 			<zipfileset src="${dir.dist}/lib/filebot.jar" />
 
@@ -607,10 +612,10 @@
 		</copy-replace>
 
 		<!-- fetch latest JRE -->
-		<exec executable="powershell" dir="${dir.cache}" failonerror="yes">
-			<env key="PROCESSOR_ARCHITECTURE" value="${arch.env}" />
-			<arg line="get-java" />
-		</exec>
+		<!--<exec executable="powershell" dir="${dir.cache}" failonerror="yes">-->
+			<!--<env key="PROCESSOR_ARCHITECTURE" value="${arch.env}" />-->
+			<!--<arg line="get-java" />-->
+		<!--</exec>-->
 		<untar src="${dir.cache}/jre-${jre.version}_windows-${arch.jre}_bin.tar.gz" dest="${dir.staging}/jre" compression="gzip">
 			<patternset>
 				<exclude name="**/dtplugin/**" />
@@ -635,7 +640,7 @@
 			<arg line="new /o /pr . /cf priconfig.xml /in ${microsoft.application.name}" />
 		</exec>
 		<exec executable="makeappx" dir="${dir.dist}" failonerror="yes">
-			<arg line="pack /v /o /d ${dir.staging} /p ${release}_r${revision}_${arch}.appx" />
+			<arg line="pack /v /o /d '${dir.staging}' /p ${release}_r${revision}_${arch}.appx" />
 		</exec>
 	</target>
 
@@ -670,7 +675,7 @@
 			<arg line="filebot.wix -out msi.wixobj" />
 		</exec>
 		<exec executable="light" dir="${dir.staging}" failonerror="true">
-			<arg line="msi.wixobj -sval -ext WixUIExtension -out ${dir.dist}/${release}_${arch}.msi" />
+			<arg line="msi.wixobj -sval -ext WixUIExtension -out '${dir.dist}/${release}_${arch}.msi'" />
 		</exec>
 	</target>
 
@@ -1001,4 +1006,4 @@
 		</copy-replace>
 	</target>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/downloads/data/anidb.txt.xz b/downloads/data/anidb.txt.xz
new file mode 100644
index 00000000..f0cd3d47
Binary files /dev/null and b/downloads/data/anidb.txt.xz differ
diff --git a/downloads/data/moviedb.txt.xz b/downloads/data/moviedb.txt.xz
new file mode 100644
index 00000000..bede9b80
Binary files /dev/null and b/downloads/data/moviedb.txt.xz differ
diff --git a/downloads/data/osdb.txt.xz b/downloads/data/osdb.txt.xz
new file mode 100644
index 00000000..8eee8938
Binary files /dev/null and b/downloads/data/osdb.txt.xz differ
diff --git a/downloads/data/query-blacklist.txt.xz b/downloads/data/query-blacklist.txt.xz
new file mode 100644
index 00000000..c3d9a4d9
Binary files /dev/null and b/downloads/data/query-blacklist.txt.xz differ
diff --git a/downloads/data/release-groups.txt.xz b/downloads/data/release-groups.txt.xz
new file mode 100644
index 00000000..eda01ded
Binary files /dev/null and b/downloads/data/release-groups.txt.xz differ
diff --git a/downloads/data/series-mappings.txt.xz b/downloads/data/series-mappings.txt.xz
new file mode 100644
index 00000000..e23976c2
Binary files /dev/null and b/downloads/data/series-mappings.txt.xz differ
diff --git a/downloads/data/thetvdb.txt.xz b/downloads/data/thetvdb.txt.xz
new file mode 100644
index 00000000..f1d831fc
Binary files /dev/null and b/downloads/data/thetvdb.txt.xz differ
diff --git a/downloads/scripts/m1.jar.xz b/downloads/scripts/m1.jar.xz
new file mode 100644
index 00000000..9ae78b69
Binary files /dev/null and b/downloads/scripts/m1.jar.xz differ
diff --git a/filebot.iml b/filebot.iml
new file mode 100644
index 00000000..f47d787b
--- /dev/null
+++ b/filebot.iml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="EclipseModuleManager">
+    <libelement value="file://lib/ivy/bundle/args4j.jar" />
+    <libelement value="jar://$MODULE_DIR$/lib/jars/jacksum.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/lib/jars/simmetrics.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/lib/jars/xmlrpc.jar!/" />
+    <libelement value="file://lib/ivy/jar/ehcache.jar" />
+    <libelement value="file://lib/ivy/jar/icu4j.jar" />
+    <libelement value="file://lib/ivy/jar/jna.jar" />
+    <libelement value="file://lib/ivy/jar/junit.jar" />
+    <libelement value="file://lib/ivy/jar/miglayout-core.jar" />
+    <libelement value="file://lib/ivy/jar/miglayout-swing.jar" />
+    <libelement value="file://lib/ivy/jar/rsyntaxtextarea.jar" />
+    <libelement value="file://lib/ivy/jar/xz.jar" />
+    <libelement value="file://lib/ivy/jar/slf4j-api.jar" />
+    <libelement value="file://lib/ivy/jar/commons-io.jar" />
+    <libelement value="file://lib/ivy/jar/jsoup.jar" />
+    <libelement value="file://lib/ivy/jar/groovy-all.jar" />
+    <libelement value="file://lib/ivy/jar/slf4j-jdk14.jar" />
+    <libelement value="file://lib/ivy/jar/hamcrest-core.jar" />
+    <libelement value="jar://$MODULE_DIR$/lib/jars/ObjCBridge.jar!/" />
+    <libelement value="file://lib/ivy/jar/junrar.jar" />
+    <libelement value="file://lib/ivy/jar/commons-vfs2.jar" />
+    <libelement value="file://lib/ivy/jar/commons-logging.jar" />
+    <libelement value="file://lib/ivy/jar/sevenzipjbinding.jar" />
+    <libelement value="file://lib/ivy/bundle/json-io.jar" />
+    <libelement value="file://lib/ivy/jar/jna-platform.jar" />
+    <libelement value="file://lib/ivy/jar/language-detector.jar" />
+    <libelement value="file://lib/ivy/bundle/guava.jar" />
+    <libelement value="file://lib/ivy/jar/streamex.jar" />
+    <libelement value="file://lib/ivy/jar/controlsfx.jar" />
+    <libelement value="file://lib/ivy/jar/lanterna.jar" />
+    <libelement value="file://lib/ivy/jar/metadata-extractor.jar" />
+    <libelement value="file://lib/ivy/jar/xmpcore.jar" />
+    <libelement value="file://lib/ivy/jar/glazedlists_java16.jar" />
+    <libelement value="file://lib/ivy/jar/jaxb-api.jar" />
+    <libelement value="file://lib/ivy/jar/jaxb-impl.jar" />
+    <libelement value="file://lib/ivy/jar/activation.jar" />
+    <src_description expected_position="0">
+      <src_folder value="file://$MODULE_DIR$/source" expected_position="0" />
+      <src_folder value="file://$MODULE_DIR$/test" expected_position="1" />
+    </src_description>
+  </component>
+  <component name="NewModuleRootManager">
+    <output url="file://$MODULE_DIR$/bin" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/source" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="false" />
+    </content>
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/lib/ivy/jar" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://$MODULE_DIR$/lib/ivy/source" />
+        </SOURCES>
+        <jarDirectory url="file://$MODULE_DIR$/lib/ivy/jar" recursive="false" />
+        <jarDirectory url="file://$MODULE_DIR$/lib/ivy/source" recursive="false" type="SOURCES" />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/lib/ivy/bundle" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://$MODULE_DIR$/lib/ivy/bundle" />
+        </SOURCES>
+        <jarDirectory url="file://$MODULE_DIR$/lib/ivy/bundle" recursive="false" />
+        <jarDirectory url="file://$MODULE_DIR$/lib/ivy/bundle" recursive="false" type="SOURCES" />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/lib/jars" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+        <jarDirectory url="file://$MODULE_DIR$/lib/jars" recursive="false" />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/lib/ivy/eclipse-plugin" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+        <jarDirectory url="file://$MODULE_DIR$/lib/ivy/eclipse-plugin" recursive="false" />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/lib/ivy/javadoc" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+        <jarDirectory url="file://$MODULE_DIR$/lib/ivy/javadoc" recursive="false" />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/lib/ivy/maven-plugin" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+        <jarDirectory url="file://$MODULE_DIR$/lib/ivy/maven-plugin" recursive="false" />
+      </library>
+    </orderEntry>
+  </component>
+</module>
\ No newline at end of file