diff --git a/build.xml b/build.xml
index 28ff6d31..09634768 100644
--- a/build.xml
+++ b/build.xml
@@ -1,17 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <project name="filebot" default="fatjar" xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:cmp="antlib:org.apache.ant.compress">
-	<property file="profile.properties" />
-	<property file="source/net/filebot/Settings.properties" />
-
-	<property name="title" value="${application.name}" />
-	<property name="version" value="${application.version}" />
-
-	<tstamp>
-		<format property="tstamp.date" pattern="yyyy-MM-dd" />
-	</tstamp>
-	<tstamp>
-		<format property="tstamp.year" pattern="yyyy" />
-	</tstamp>
 
 	<!-- define source dirs -->
 	<property name="dir.source" location="${basedir}/source" />
@@ -21,23 +9,33 @@
 	<property name="dir.website" location="${basedir}/website" />
 	<property name="dir.installer" location="${basedir}/installer" />
 
+	<!-- import property files -->
+	<property file="${basedir}/profile.properties" />
+	<property file="${dir.installer}/ant/ant.properties" />
+	<property file="${dir.source}/net/filebot/Settings.properties" />
+
+	<property name="release" value="${application.name}_${application.version}" />
+	<property name="version" value="${application.version}" />
+
 	<!-- define output paths -->
-	<property name="path.fatjar" location="${dir.dist}/${title}_${version}.jar" />
-
-	<property name="dir.cache" location="${basedir}/cache/${title}_${version}" />
-	<property name="dir.release" location="${basedir}/release/${title}_${version}" />
-
-	<!-- target JRE -->
-	<property name="jre.major" value="8" />
-	<property name="jre.build" value="111" />
+	<property name="dir.cache" location="${basedir}/cache/${release}" />
+	<property name="dir.release" location="${basedir}/release/${release}" />
+	<property name="path.fatjar" location="${dir.dist}/${release}.jar" />
 
 
-	<!-- copy and replace ant variables -->
+	<!-- timestamp variables -->
+	<tstamp prefix="tstamp">
+		<format property="date" pattern="yyyy-MM-dd" />
+		<format property="year" pattern="yyyy" />
+	</tstamp>
+
+
+	<!-- copy and replace ant variables macro -->
 	<macrodef name="copy-replace">
 		<attribute name="todir" />
 		<element name="filesets" implicit="yes" />
 		<sequential>
-			<copy todir="@{todir}" encoding="UTF-8" overwrite="yes" verbose="yes">
+			<copy todir="@{todir}" encoding="utf-8" overwrite="yes" verbose="yes">
 				<filesets />
 				<filterset begintoken="@{" endtoken="}">
 					<propertyset>
@@ -125,16 +123,9 @@
 			<manifest>
 				<attribute name="Build-Date" value="${tstamp.date}" />
 				<attribute name="Build-Revision" value="${revision}" />
-				<attribute name="Application-Name" value="${title}" />
-				<attribute name="Application-Version" value="${version}" />
-				<attribute name="Main-Class" value="net.filebot.Main" />
+				<attribute name="Main-Class" value="${main.class}" />
 			</manifest>
 		</jar>
-
-		<!-- source as zip -->
-		<zip destfile="${dir.dist}/${title}-${version}-src.zip">
-			<fileset dir="source" />
-		</zip>
 	</target>
 
 
@@ -312,7 +303,7 @@
 
 
 	<target name="appbundle" description="Build Mac application bundle" depends="revision">
-		<bundleapp minimumsystemversion="10.8" jvmrequired="1.8" outputdirectory="${dir.dist}" executablename="purchase.sh" hidedockicon="true" name="${application.name}" displayname="${title} ${version}" version="${revision}" shortversion="${version}" identifier="net.filebot.app" mainclassname="net.filebot.Main" icon="${dir.installer}/appbundle/filebot.icns" copyright="${tstamp.year} Reinhard Pointner" applicationcategory="public.app-category.utilities" highresolutioncapable="true" supportsautomaticgraphicsswitching="true" debug="true">
+		<bundleapp outputdirectory="${dir.dist}" executablename="purchase.sh" hidedockicon="true" minimumsystemversion="${mac.version}" jvmrequired="${jvm.version}" name="${application.name}" displayname="${application.name} ${version}" version="${revision}" shortversion="${version}" identifier="net.filebot.Main" mainclassname="${main.class}" icon="${dir.installer}/appbundle/filebot.icns" copyright="${tstamp.year} ${package.developer}" applicationcategory="${mac.application.category}" highresolutioncapable="true" supportsautomaticgraphicsswitching="true" debug="true">
 			<classpath file="${path.fatjar}" />
 			<librarypath dir="${dir.lib}/native/mac-x86_64" />
 			<librarypath dir="${dir.installer}/appbundle/MacOS" />
@@ -327,8 +318,6 @@
 			<option value="-DuseCreationDate=false" />
 
 			<option value="-Djava.net.useSystemProxies=true" />
-			<option value="-Dsun.net.client.defaultConnectTimeout=10000" />
-			<option value="-Dsun.net.client.defaultReadTimeout=60000" />
 			<option value="-Dfile.encoding=UTF-8" />
 
 			<option value="-Djna.nosys=true" />
@@ -336,7 +325,7 @@
 			<option value="-Djava.library.path=$APP_ROOT/Contents/MacOS" />
 			<option value="-Dnet.filebot.AcoustID.fpcalc=$APP_ROOT/Contents/MacOS/fpcalc" />
 
-			<option value="-Xdock:name=${title}" />
+			<option value="-Xdock:name=${application.name}" />
 			<option value="-Xdock:icon=Contents/Resources/filebot.icns" />
 			<option value="-Dapple.laf.useScreenMenuBar=true" />
 
@@ -346,7 +335,7 @@
 		</bundleapp>
 
 		<!-- application bundle folder as .tar -->
-		<cmp:xz destfile="${dir.dist}/${title}_${version}-darwin.tar.xz">
+		<cmp:xz destfile="${dir.dist}/${release}-darwin.tar.xz">
 			<cmp:tar format="gnu" encoding="utf-8">
 				<cmp:tarfileset dir="${dir.dist}" includes="${application.name}.app/**" excludes="**/MacOS/**" />
 				<cmp:tarfileset dir="${dir.dist}" includes="${application.name}.app/**/**.dylib" />
@@ -361,11 +350,11 @@
 	<target name="appbundle-maspkg-core">
 		<antcall target="appbundle-maspkg">
 			<param name="application.name" value="FileBot" />
-			<param name="application.executable" value="FileBot" />
+			<param name="application.executable" value="filebot.launcher" />
 			<param name="application.identifier" value="net.filebot.FileBot" />
 			<param name="application.icon" value="${dir.installer}/appbundle/filebot.icns" />
-			<param name="application.cert.appbundle" value="3rd Party Mac Developer Application: Point Planck Limited" />
-			<param name="application.cert.installer" value="3rd Party Mac Developer Installer: Point Planck Limited" />
+			<param name="application.cert.appbundle" value="3rd Party Mac Developer Application: ${package.company}" />
+			<param name="application.cert.installer" value="3rd Party Mac Developer Installer: ${package.company}" />
 
 			<!-- MAS does not allow subtitle apps -->
 			<param name="application.mode" value="Rename|Episodes|SFV|Filter|List" />
@@ -379,11 +368,11 @@
 	<target name="appbundle-maspkg-subtitles">
 		<antcall target="appbundle-maspkg">
 			<param name="application.name" value="FileBot Subtitles" />
-			<param name="application.executable" value="FileBotSubtitles" />
-			<param name="application.identifier" value="net.filebot.subtitles" />
+			<param name="application.executable" value="filebot.subtitles.launcher" />
+			<param name="application.identifier" value="net.filebot.FileBot.Subtitles" />
 			<param name="application.icon" value="${dir.installer}/appbundle/subtitles.icns" />
-			<param name="application.cert.appbundle" value="Developer ID Application: Point Planck Limited" />
-			<param name="application.cert.installer" value="Developer ID Installer: Point Planck Limited" />
+			<param name="application.cert.appbundle" value="Developer ID Application: ${package.company}" />
+			<param name="application.cert.installer" value="Developer ID Installer: ${package.company}" />
 			<param name="application.mode" value="Subtitles" />
 			<param name="application.help" value="skip" />
 		</antcall>
@@ -392,12 +381,12 @@
 
 	<target name="appbundle-maspkg" depends="revision">
 		<property name="path.app" value="${application.name}.app" />
-		<property name="path.pkg" value="${application.executable}_${version}_r${revision}.pkg" />
+		<property name="path.pkg" value="${application.identifier}_${version}_r${revision}.pkg" />
 
 		<property name="jre.version" value="jdk1.${jre.major}.0_${jre.build}.jdk" />
 		<property name="jre.path" value="/Library/Java/JavaVirtualMachines/${jre.version}/Contents/Home" />
 
-		<bundleapp minimumsystemversion="10.8" jvmrequired="1.8" outputdirectory="${dir.dist}" executablename="${application.executable}AppLauncher" name="${application.name}" displayname="${application.name}" version="${revision}" shortversion="${version}" identifier="${application.identifier}" mainclassname="net.filebot.Main" icon="${application.icon}" copyright="${tstamp.year} Point Planck Limited" applicationcategory="public.app-category.utilities" highresolutioncapable="true" supportsautomaticgraphicsswitching="true" debug="true">
+		<bundleapp jvmrequired="${jvm.version}" minimumsystemversion="${mac.version}" outputdirectory="${dir.dist}" executablename="${application.executable}" name="${application.name}" displayname="${application.name}" version="${revision}" shortversion="${version}" identifier="${application.identifier}" mainclassname="${main.class}" icon="${application.icon}" copyright="${tstamp.year} ${package.company}" applicationcategory="${mac.application.category}" highresolutioncapable="true" supportsautomaticgraphicsswitching="true" debug="true">
 			<classpath file="${path.fatjar}" />
 			<librarypath dir="${dir.lib}/native/mac-x86_64" />
 			<librarypath dir="${dir.installer}/appbundle/MacOS" excludes="purchase.sh" />
@@ -423,8 +412,6 @@
 			<option value="-DuseCreationDate=false" />
 
 			<option value="-Djava.net.useSystemProxies=true" />
-			<option value="-Dsun.net.client.defaultConnectTimeout=10000" />
-			<option value="-Dsun.net.client.defaultReadTimeout=60000" />
 			<option value="-Dfile.encoding=UTF-8" />
 
 			<option value="-Djna.nosys=true" />
@@ -510,7 +497,7 @@
 			<arg line="--verify '${path.app}'" />
 		</exec>
 		<exec dir="${dir.dist}" executable="productbuild" failonerror="on">
-			<arg line="--component '${path.app}' /Applications --sign '${application.cert.installer}' ${path.pkg}" />
+			<arg line="--component '${path.app}' /Applications --sign '${application.cert.installer}' '${path.pkg}'" />
 		</exec>
 
 		<!-- store as release build-->
@@ -610,7 +597,7 @@
 		</copy-replace>
 
 		<exec executable="makeappx" dir="${dir.dist}" failonerror="yes">
-			<arg line="pack /d appx /p ${title}_${version}_r${revision}.appx" />
+			<arg line="pack /d appx /p ${release}_r${revision}.appx" />
 		</exec>
 	</target>
 
@@ -632,17 +619,26 @@
 
 
 	<target name="msi-arch">
-		<property name="jnidispatch" location="${dir.lib}/native/win32-${arch}/jnidispatch.dll" />
-		<property name="mediainfo" location="${dir.lib}/native/win32-${arch}/MediaInfo.dll" />
-		<property name="lib7z_binding" location="${dir.lib}/native/win32-${arch}/7-Zip-JBinding.dll" />
-		<property name="fpcalc_path" location="${dir.lib}/native/win32-${arch}/fpcalc.exe" />
-		<property name="installer" location="${dir.dist}/${title}_${version}_${arch}.msi" />
+		<property name="dir.staging" location="${dir.dist}/msi/${arch}" />
 
-		<exec executable="candle" dir="${dir.installer}/msi" failonerror="true">
-			<arg line="filebot-wix.xml -out ${dir.dist}/msi.wixobj -darch=${arch} -dreleaseversion=${version} -dfatjar=${path.fatjar} -djnidispatch=${jnidispatch} -dmediainfo=${mediainfo} -dlib7z_binding=${lib7z_binding} -dfpcalc_path=${fpcalc_path}" />
+		<copy todir="${dir.staging}">
+			<fileset dir="${dir.installer}/msi" includes="*.exe, *.rtf, *.bmp" />
+		</copy>
+		<copy todir="${dir.staging}">
+			<fileset dir="${dir.lib}/native/win32-${arch}" />
+		</copy>
+		<copy todir="${dir.staging}">
+			<fileset dir="${dir.installer}/icons" includes="*.ico" />
+		</copy>
+		<copy-replace todir="${dir.staging}">
+			<fileset dir="${dir.installer}/msi" includes="*.wix, *.ini" />
+		</copy-replace>
+
+		<exec executable="candle" dir="${dir.staging}" failonerror="true">
+			<arg line="filebot.wix -out msi.wixobj" />
 		</exec>
-		<exec executable="light" dir="${dir.installer}/msi" failonerror="true">
-			<arg line="${dir.dist}/msi.wixobj -sval -ext WixUIExtension -out ${installer}" />
+		<exec executable="light" dir="${dir.staging}" failonerror="true">
+			<arg line="msi.wixobj -sval -ext WixUIExtension -out ${dir.dist}/${release}_${arch}.msi" />
 		</exec>
 	</target>
 
@@ -654,7 +650,7 @@
 			<fileset dir="${dir.installer}/portable" includes="*.exe, *.ini, *.cmd, *.sh" />
 		</copy>
 
-		<cmp:xz destfile="${dir.dist}/${title}_${version}-portable.tar.xz">
+		<cmp:xz destfile="${dir.dist}/${release}-portable.tar.xz">
 			<cmp:tar format="gnu" encoding="utf-8">
 				<cmp:tarfileset dir="${dir.dist}/portable" includes="*.jar, *.exe, *.ini, *.cmd" />
 				<cmp:tarfileset dir="${dir.dist}/portable" includes="*.sh" filemode="755" />
@@ -664,15 +660,15 @@
 
 
 	<target name="spk" description="Build Synology NAS package" depends="revision">
-		<spk destdir="${dir.dist}" name="filebot" version="${version}" arch="noarch" compression="xz">
-			<info name="displayname" value="FileBot" />
-			<info name="description" value="FileBot is the ultimate tool for organizing and renaming your movies, TV shows or anime, as well as downloading subtitles and artwork. It's smart and just works." />
-			<info name="maintainer" value="FileBot" />
-			<info name="maintainer_url" value="http://www.filebot.net/" />
-			<info name="distributor" value="FileBot" />
-			<info name="distributor_url" value="http://www.filebot.net/" />
-			<info name="support_url" value="http://www.filebot.net/syno/support.html" />
-			<info name="helpurl" value="http://www.filebot.net/cli.html" />
+		<spk destdir="${dir.dist}" name="${package.name}" version="${version}" arch="noarch" compression="xz">
+			<info name="displayname" value="${application.name}" />
+			<info name="description" value="${package.description}" />
+			<info name="maintainer" value="${package.project}" />
+			<info name="maintainer_url" value="${package.homepage}" />
+			<info name="distributor" value="${package.project}" />
+			<info name="distributor_url" value="${package.homepage}" />
+			<info name="support_url" value="${link.help.synology}" />
+			<info name="helpurl" value="${link.help.manpage}" />
 			<info name="firmware" value="6.0" />
 			<info name="startable" value="no" />
 			<info name="silent_install" value="yes" />
@@ -698,7 +694,7 @@
 
 	<target name="build" depends="revision">
 		<!-- compile -->
-		<javac srcdir="${dir.source}" destdir="${dir.build}" target="1.8" source="1.8" encoding="UTF-8" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false">
+		<javac srcdir="${dir.source}" destdir="${dir.build}" target="${jvm.version}" source="${jvm.version}" encoding="utf-8" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false">
 			<classpath>
 				<fileset dir="${dir.lib}" includes="**/*.jar" />
 			</classpath>
@@ -769,7 +765,7 @@
 		<checksum algorithm="SHA-256" pattern="{0}	{1}" todir="${dir.cache}" fileext=".sha256">
 			<fileset dir="${dir.release}" />
 		</checksum>
-		<concat destfile="${dir.release}/README.md" overwrite="true" eol="unix" outputencoding="UTF-8">
+		<concat destfile="${dir.release}/README.md" overwrite="true" eol="unix" outputencoding="utf-8">
 			<fileset file="${dir.installer}/ant/digest.header.md" />
 			<fileset dir="${dir.cache}" includes="*.sha256" />
 			<fileset file="${dir.installer}/ant/digest.footer.md" />
@@ -847,8 +843,8 @@
 		<!-- merge all filebot related packages into a single package source file -->
 		<package-source file="${dir.dist}/website/syno/index.json">
 			<keyring file="${dir.installer}/gpg/FileBot.pub" />
-			<spk file="${dir.release}/filebot-${version}-noarch.spk">
-				<info name="link" value="http://downloads.sourceforge.net/project/filebot/filebot/FileBot_${version}/filebot-${version}-noarch.spk" />
+			<spk file="${dir.release}/${package.name}-${version}-noarch.spk">
+				<info name="link" value="http://downloads.sourceforge.net/project/filebot/filebot/${release}/${package.name}-${version}-noarch.spk" />
 				<thumbnail url="http://app.filebot.net/syno/filebot-thumbnail.png" />
 				<snapshot url="http://app.filebot.net/syno/filebot-snapshot.png" />
 			</spk>
@@ -868,8 +864,8 @@
 
 	<target name="deploy-chocolatey" description="Update Chocolatey Package Source">
 		<!-- prepare sha1 checksums -->
-		<checksum property="x86.msi.sha256" file="${dir.release}/${title}_${version}_x86.msi" algorithm="SHA-256" />
-		<checksum property="x64.msi.sha256" file="${dir.release}/${title}_${version}_x64.msi" algorithm="SHA-256" />
+		<checksum property="x86.msi.sha256" file="${dir.release}/${release}_x86.msi" algorithm="SHA-256" />
+		<checksum property="x64.msi.sha256" file="${dir.release}/${release}_x64.msi" algorithm="SHA-256" />
 
 		<!-- replace variables for new release -->
 		<copy-replace todir="${dir.dist}/chocolatey">
@@ -880,12 +876,12 @@
 		</copy-replace>
 
 		<!-- chocolatey pack and push -->
-		<exec executable="chocolatey" dir="${dir.dist}\chocolatey" failonerror="true">
+		<exec executable="chocolatey" dir="${dir.dist}/chocolatey" failonerror="true">
 			<arg value="pack" />
 		</exec>
-		<exec executable="chocolatey" dir="${dir.dist}\chocolatey" failonerror="true">
+		<exec executable="chocolatey" dir="${dir.dist}/chocolatey" failonerror="true">
 			<arg value="push" />
-			<arg value="${dir.dist}\chocolatey\filebot.${version}.nupkg" />
+			<arg value="${dir.dist}/chocolatey/${package.name}.${version}.nupkg" />
 		</exec>
 	</target>
 
@@ -913,8 +909,8 @@
 	<target name="deploy-beta-release" description="Build and deploy the latest release files">
 		<input addproperty="mark" message="Mark:" />
 		<antcall target="deploy-release">
-			<param name="dir.release" location="${dir.dist}/beta/release/${title}_${version}_${mark}" />
-			<param name="dir.cache" location="${dir.dist}/beta/cache/${title}_${version}_${mark}" />
+			<param name="dir.release" location="${dir.dist}/beta/release/${release}_${mark}" />
+			<param name="dir.cache" location="${dir.dist}/beta/cache/${release}_${mark}" />
 			<param name="deploy.release" value="${deploy.release}/HEAD" />
 		</antcall>
 	</target>
diff --git a/installer/ant/ant.properties b/installer/ant/ant.properties
new file mode 100644
index 00000000..07e022cd
--- /dev/null
+++ b/installer/ant/ant.properties
@@ -0,0 +1,26 @@
+# Build
+main.class: net.filebot.Main
+jre.major: 8
+jre.build: 111
+
+# Minimum System Version
+jvm.version: 1.8
+mac.version: 10.8
+
+# Package Information
+package.name: filebot
+package.developer: Reinhard Pointner
+package.maintainer: Reinhard Pointner <maintainer@filebot.net>
+package.company: Point Planck Limited
+package.project: FileBot
+package.synopsis: The ultimate TV and Movie Renamer
+package.description: FileBot is the ultimate tool for organizing and renaming your Movies, TV Shows and Anime as well as fetching subtitles and artwork. It's smart and just works.
+package.homepage: http://www.filebot.net/
+
+# Platform-specific Package Information
+mac.application.category: public.app-category.utilities
+gnome.application.categories: AudioVideo;Video;Utility;FileTools
+
+# Links
+link.help.manpage: http://www.filebot.net/cli.html
+link.help.synology: http://www.filebot.net/syno/support.html
diff --git a/installer/appx/AppxManifest.xml b/installer/appx/AppxManifest.xml
index ce245873..9a46cd7f 100644
--- a/installer/appx/AppxManifest.xml
+++ b/installer/appx/AppxManifest.xml
@@ -10,13 +10,13 @@
 		Name="PointPlanck.FileBot"
 		ProcessorArchitecture="x64"
 		Publisher="CN=761A0D2B-9B86-4FE4-B664-18E4E0AFC3F1"
-		Version="@{version}.0"
+		Version="@{application.version}.0"
 	/>
 
 	<Properties>
-		<DisplayName>FileBot</DisplayName>
-		<PublisherDisplayName>Point Planck Limited</PublisherDisplayName>
-		<Description>FileBot is the ultimate tool for organizing and renaming Movies, TV Shows, Anime or Music. It's smart, highly customizable, and just works.</Description>
+		<DisplayName>@{application.name}</DisplayName>
+		<PublisherDisplayName>@{package.company}</PublisherDisplayName>
+		<Description>@{package.description}</Description>
 		<Logo>icon.png</Logo>
 	</Properties>
 
@@ -33,10 +33,10 @@
 	</Capabilities>
 
 	<Applications>
-		<Application Id="FileBot" Executable="filebot.launcher.exe" EntryPoint="Windows.FullTrustApplication">
+		<Application Id="@{package.name}" Executable="filebot.launcher.exe" EntryPoint="Windows.FullTrustApplication">
 			<uap:VisualElements
-				DisplayName="FileBot"
-				Description="FileBot is the ultimate tool for organizing and renaming Movies, TV Shows, Anime or Music."
+				DisplayName="@{application.name}"
+				Description="@{package.synopsis}"
 				BackgroundColor="transparent"
 				Square44x44Logo="icon44.png"
 				Square150x150Logo="icon150.png"
diff --git a/installer/appx/filebot.l4j.ini b/installer/appx/filebot.l4j.ini
index 0139ba65..faafe7f4 100644
--- a/installer/appx/filebot.l4j.ini
+++ b/installer/appx/filebot.l4j.ini
@@ -8,6 +8,9 @@
 # network settings
 -Djava.net.useSystemProxies=true
 
+# use native shell for move/copy operations
+-DuseNativeShell=false
+
 # use NTFS extended attributes for storing metadata
 -DuseExtendedFileAttributes=true
 -DuseCreationDate=false
diff --git a/installer/appx/filebot.launcher.l4j.ini b/installer/appx/filebot.launcher.l4j.ini
index e93aec88..0fe66956 100644
--- a/installer/appx/filebot.launcher.l4j.ini
+++ b/installer/appx/filebot.launcher.l4j.ini
@@ -22,3 +22,6 @@
 
 # look for fpcalc here
 -Dnet.filebot.AcoustID.fpcalc="%EXEDIR%\fpcalc.exe"
+
+# force Application User Model ID for Windows Store
+-Dnet.filebot.AppUserModelID=PointPlanck.FileBot
diff --git a/installer/chocolatey/filebot.nuspec b/installer/chocolatey/filebot.nuspec
index 7e6c2c0f..a0521e82 100644
--- a/installer/chocolatey/filebot.nuspec
+++ b/installer/chocolatey/filebot.nuspec
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
-		<id>filebot</id>
-		<title>FileBot</title>
-		<version>@{version}</version>
-		<authors>Reinhard Pointner</authors>
+		<id>@{package.name}</id>
+		<title>@{application.name}</title>
+		<version>@{application.version}</version>
+		<authors>@{package.developer}</authors>
 		<owners>rednoah</owners>
-		<summary>The ultimate TV and Movie Renamer / Subtitle Downloader</summary>
-		<description>FileBot is the ultimate tool for renaming your movies, tv shows or anime and even downloading subtitles. It's smart, streamlined for simplicity and just works. Putting the super-efficient UI aside, it's also got a full-featured command-line interface and scripting engine for all sorts of automation. Anything is possible.</description>
-		<projectUrl>http://www.filebot.net/</projectUrl>
-		<tags>rename movie tv anime subtitles music htpc kodi plex OpenSubtitles</tags>
-		<copyright>2016 Reinhard Pointner</copyright>
-		<licenseUrl>http://www.gnu.org/licenses/gpl-2.0.html</licenseUrl>
+		<summary>@{package.synopsis}</summary>
+		<description>@{package.description}</description>
+		<projectUrl>@{package.homepage}</projectUrl>
+		<tags>rename media tv movie anime video file folder batch renamer checksum hash sort subtitles plex kodi</tags>
+		<copyright>@{tstamp.year} @{package.developer}</copyright>
+		<licenseUrl>https://www.gnu.org/licenses/gpl-3.0.en.html</licenseUrl>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
 		<iconUrl>http://app.filebot.net/icon.png</iconUrl>
 		<dependencies>
diff --git a/installer/chocolatey/tools/chocolateyInstall.ps1 b/installer/chocolatey/tools/chocolateyInstall.ps1
index 3f97af3c..19f06ddf 100644
--- a/installer/chocolatey/tools/chocolateyInstall.ps1
+++ b/installer/chocolatey/tools/chocolateyInstall.ps1
@@ -1,9 +1,9 @@
-$name = 'filebot'
+$name = '@{package.name}'
 $type = 'msi'
 $silent = '/quiet'
 
-$url32 = 'http://downloads.sourceforge.net/project/filebot/filebot/FileBot_@{version}/FileBot_@{version}_x86.msi'
-$url64 = 'http://downloads.sourceforge.net/project/filebot/filebot/FileBot_@{version}/FileBot_@{version}_x64.msi'
+$url32 = 'http://downloads.sourceforge.net/project/filebot/filebot/@{release}/@{release}_x86.msi'
+$url64 = 'http://downloads.sourceforge.net/project/filebot/filebot/@{release}/@{release}_x64.msi'
 $checksum32 = '@{x86.msi.sha256}'
 $checksum64 = '@{x64.msi.sha256}'
 $algorithm = 'sha256'
diff --git a/installer/deb/control/control b/installer/deb/control/control
index 1361ddfa..5693f716 100644
--- a/installer/deb/control/control
+++ b/installer/deb/control/control
@@ -1,8 +1,9 @@
-Package: filebot
-Version: @{version}
+Package: @{package.name}
+Version: @{application.version}
 Architecture: @{deb.arch}
-Maintainer: Reinhard Pointner <maintainer@filebot.net>
-Description: The ultimate TV and Movie Renamer
-Homepage: http://www.filebot.net/
+Maintainer: @{package.maintainer}
+Description: @{package.synopsis}
+ @{package.description}
+Homepage: @{package.homepage}
 Section: utils
 Priority: extra
diff --git a/installer/deb/deb/FileBot.desktop b/installer/deb/deb/FileBot.desktop
index 9967c4f6..ee9eb30c 100644
--- a/installer/deb/deb/FileBot.desktop
+++ b/installer/deb/deb/FileBot.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
-Name=FileBot
-Comment=The ultimate TV and Movie Renamer
+Name=@{application.name}
+Comment=@{package.synopsis}
 Type=Application
 Exec=@{deb.prefix}/share/filebot/filebot.sh
 Icon=@{deb.prefix}/share/filebot/icon.svg
 Terminal=false
 StartupNotify=true
-Categories=AudioVideo;Video;FileTools
+Categories=@{gnome.application.categories}
diff --git a/installer/msi/filebot.platform.launcher.l4j.ini b/installer/msi/filebot.platform.launcher.l4j.ini
index 068347b0..5ebad4c7 100644
--- a/installer/msi/filebot.platform.launcher.l4j.ini
+++ b/installer/msi/filebot.platform.launcher.l4j.ini
@@ -11,8 +11,6 @@
 
 # network settings
 -Djava.net.useSystemProxies=true
--Dsun.net.client.defaultConnectTimeout=10000
--Dsun.net.client.defaultReadTimeout=60000
 
 # do not use native shell for move/copy operations
 -DuseNativeShell=false
diff --git a/installer/msi/filebot-wix.xml b/installer/msi/filebot.wix
similarity index 64%
rename from installer/msi/filebot-wix.xml
rename to installer/msi/filebot.wix
index a9b9aef5..b1a6cf4f 100644
--- a/installer/msi/filebot-wix.xml
+++ b/installer/msi/filebot.wix
@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- These variables define the Windows Installer  product code and upgrade code.   -->
-<?define ProductName = "FileBot" ?>
-<?define Manufacturer = "Reinhard Pointner" ?>
+
+<!-- Pass in Processor Architecture via Ant Build Properties -->
+<?define Platform = "@{arch}" ?>
+
+<!-- Windows Installer product code and upgrade code -->
 <?define UpgradeCode = "86809B6B-E2E3-43EC-9351-D4D66CAF7864" ?>
 
 <!-- Set a specific product code based on the processor architecture build variable -->
-<?if $(var.arch)=x64 ?>
-	<?define Platform = "x64" ?>
+<?if $(var.Platform)=x64 ?>
 	<?define ProgramFiles = "ProgramFiles64Folder" ?>
 	<?define Win64 = "yes" ?>
 <?else ?>
-	<?define Platform = "x86" ?>
 	<?define ProgramFiles = "ProgramFilesFolder" ?>
 	<?define Win64 = "no" ?>
 <?endif ?>
 
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-	<Product Id='*' Name='$(var.ProductName)' Manufacturer='$(var.Manufacturer)' Version='$(var.releaseversion)' UpgradeCode='$(var.UpgradeCode)' Language='1033' Codepage='1252'>
+	<Product Id='*' Name='@{application.name}' Manufacturer='@{package.developer}' Version='@{application.version}' UpgradeCode='$(var.UpgradeCode)' Language='1033' Codepage='1252'>
 
-		<Package Description="FileBot Installer" Manufacturer='$(var.Manufacturer)' InstallerVersion='300' Compressed='yes' Platform="$(var.Platform)" />
+		<Package Description="FileBot Installer" Manufacturer='@{package.developer}' InstallerVersion='300' Compressed='yes' Platform="$(var.Platform)" />
 
 		<MajorUpgrade AllowDowngrades="yes" IgnoreRemoveFailure="yes" />
 
 		<Directory Id='TARGETDIR' Name='SourceDir'>
 			<Directory Id='$(var.ProgramFiles)' Name='Program Files'>
-				<Directory Id='INSTALLDIR' Name='FileBot'>
+				<Directory Id='INSTALLDIR' Name='@{application.name}'>
 
 					<Component Id='ApplicationStub' Guid='A7B21026-DA54-4AF8-9227-188565AB9C4E' Win64="$(var.Win64)">
 						<File Id='filebot.launcher.exe' Name='filebot.launcher.exe' Source='filebot.launcher.exe' KeyPath='yes'>
-							<Shortcut Id="shortcut.menu.filebot" Directory="ProgramMenuDir" Name="FileBot" Description="The ultimate TV Renamer and Subtitle Downloader" WorkingDirectory='INSTALLDIR' Icon="icon.ico" Advertise="no">
-								<ShortcutProperty Key="System.AppUserModel.ID" Value="net.filebot.FileBot" />
+							<Shortcut Id="shortcut.menu.filebot" Directory="ProgramMenuDir" Name="@{application.name}" Description="@{package.synopsis}" WorkingDirectory='INSTALLDIR' Icon="icon.ico" Advertise="no">
+								<ShortcutProperty Key="System.AppUserModel.ID" Value="@{application.name}" />
 							</Shortcut>
-							<Shortcut Id="shortcut.desktop" Directory="DesktopFolder" Name="FileBot" Description="The ultimate TV Renamer and Subtitle Downloader" WorkingDirectory='INSTALLDIR' Icon="icon.ico" Advertise="no">
-								<ShortcutProperty Key="System.AppUserModel.ID" Value="net.filebot.FileBot" />
+							<Shortcut Id="shortcut.desktop" Directory="DesktopFolder" Name="@{application.name}" Description="@{package.synopsis}" WorkingDirectory='INSTALLDIR' Icon="icon.ico" Advertise="no">
+								<ShortcutProperty Key="System.AppUserModel.ID" Value="@{application.name}" />
 							</Shortcut>
-							<Shortcut Id="shortcut.sendto" Directory="SendToFolder" Name="FileBot" Description="The ultimate TV Renamer and Subtitle Downloader" WorkingDirectory='INSTALLDIR' Icon="icon.ico" Advertise="no">
-								<ShortcutProperty Key="System.AppUserModel.ID" Value="net.filebot.FileBot" />
+							<Shortcut Id="shortcut.sendto" Directory="SendToFolder" Name="@{application.name}" Description="@{package.synopsis}" WorkingDirectory='INSTALLDIR' Icon="icon.ico" Advertise="no">
+								<ShortcutProperty Key="System.AppUserModel.ID" Value="@{application.name}" />
 							</Shortcut>
 						</File>
 						<File Id='filebot.platform.launcher.exe' Name='filebot.platform.launcher.exe' Source='filebot.platform.launcher.exe'>
@@ -57,17 +57,17 @@
 					</Component>
 
 					<Component Id='ApplicationBase' Guid='9E365344-A00C-45DE-A2A4-266412C3D06E' Win64="$(var.Win64)">
-						<File Id='FileBot.jar' Name='FileBot.jar' Source='$(var.fatjar)' KeyPath='yes' />
-						<File Id='jnidispatch.dll' Name='jnidispatch.dll' Source='$(var.jnidispatch)' />
-						<File Id='MediaInfo.dll' Name='MediaInfo.dll' Source='$(var.mediainfo)' />
-						<File Id='lib7_Zip_JBinding.dll' Name='7-Zip-JBinding.dll' Source='$(var.lib7z_binding)' />
-						<File Id='fpcalc.exe' Name='fpcalc.exe' Source='$(var.fpcalc_path)' />
+						<File Id='FileBot.jar' Name='FileBot.jar' Source='@{path.fatjar}' KeyPath='yes' />
+						<File Id='jnidispatch.dll' Name='jnidispatch.dll' Source='jnidispatch.dll' />
+						<File Id='MediaInfo.dll' Name='MediaInfo.dll' Source='MediaInfo.dll' />
+						<File Id='lib7_Zip_JBinding.dll' Name='7-Zip-JBinding.dll' Source='7-Zip-JBinding.dll' />
+						<File Id='fpcalc.exe' Name='fpcalc.exe' Source='fpcalc.exe' />
 					</Component>
 				</Directory>
 			</Directory>
 
 			<Directory Id="ProgramMenuFolder" Name="Programs">
-				<Directory Id="ProgramMenuDir" Name="FileBot">
+				<Directory Id="ProgramMenuDir" Name="@{application.name}">
 					<Component Id="ProgramMenuDir" Guid="F3F0F1CB-E282-473A-BE8E-B7D325B3B4B0">
 						<RemoveFolder Id='ProgramMenuDir' On='uninstall' />
 					</Component>
@@ -86,32 +86,32 @@
 			<ComponentRef Id='ProgramMenuDir' />
 		</Feature>
 
-		<!-- The media table defines the location that the MSI will look to find source files during         -->
+		<!-- The media table defines the location that the MSI will look to find source files during -->
 		<!-- installation or repair scenarios. In this case, the source files are in a cab file that will be -->
-		<!-- embedded directly into the MSI at build time.                                                   -->
+		<!-- embedded directly into the MSI at build time. -->
 		<Media Id='1' Cabinet='FileBot.cab' EmbedCab='yes' CompressionLevel="high" />
 
-		<!-- These properties define links that will appear in the Add/Remove Programs control panel when    -->
-		<!-- this product is installed on the system.                                                        -->
-		<Property Id="ARPURLINFOABOUT" Value="http://www.filebot.net/" />
+		<!-- These properties define links that will appear in the Add/Remove Programs control panel when -->
+		<!-- this product is installed on the system. -->
+		<Property Id="ARPURLINFOABOUT" Value="@{package.homepage}" />
 
-		<!-- This property is used as the default installation directory, and the user can change this path  -->
-		<!-- during setup. The Id must be set to WIXUI_INSTALLDIR and the value must match the directory Id  -->
-		<!-- defined above that represents the root installation directory.                                  -->
-		<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/>
+		<!-- This property is used as the default installation directory, and the user can change this path -->
+		<!-- during setup. The Id must be set to WIXUI_INSTALLDIR and the value must match the directory Id -->
+		<!-- defined above that represents the root installation directory. -->
+		<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
 
-		<!-- This UIRef element specifies what WiXUI dialog set to use for the setup UI. This package uses   -->
-		<!-- the WixUI_InstallDir dialog set, which provides a welcome page, a license agreement page, a     -->
-		<!-- page to allow changing the installation path, an installation confirmation page, a progress     -->
-		<!-- page and a completion page. Other dialog sets are available in the WiX toolset and are          -->
-		<!-- described in more detail in the WiX documentation.                                              -->
-		<UIRef Id="WixUI_InstallDir"/>
+		<!-- This UIRef element specifies what WiXUI dialog set to use for the setup UI. This package uses -->
+		<!-- the WixUI_InstallDir dialog set, which provides a welcome page, a license agreement page, a -->
+		<!-- page to allow changing the installation path, an installation confirmation page, a progress -->
+		<!-- page and a completion page. Other dialog sets are available in the WiX toolset and are -->
+		<!-- described in more detail in the WiX documentation. -->
+		<UIRef Id="WixUI_InstallDir" />
 
 		<WixVariable Id="WixUIBannerBmp" Value="banner.bmp" />
 		<WixVariable Id="WixUIDialogBmp" Value="dialog.bmp" />
 		<WixVariable Id="WixUILicenseRtf" Value="license.rtf" />
 
-		<Icon Id="icon.ico" SourceFile="../icons/shortcut.ico" />
+		<Icon Id="icon.ico" SourceFile="shortcut.ico" />
 		<Property Id="ARPPRODUCTICON" Value="icon.ico" />
 		<Property Id="REBOOT" Value="ReallySuppress" />
 		<Property Id="LicenseAccepted" Value="1" />
diff --git a/installer/portable/FileBot.l4j.ini b/installer/portable/FileBot.l4j.ini
index c4d91d14..cce97706 100644
--- a/installer/portable/FileBot.l4j.ini
+++ b/installer/portable/FileBot.l4j.ini
@@ -5,8 +5,6 @@
 
 # network settings
 -Djava.net.useSystemProxies=false
--Dsun.net.client.defaultConnectTimeout=10000
--Dsun.net.client.defaultReadTimeout=60000
 
 # do not use native shell for move/copy operations
 -DuseNativeShell=false
diff --git a/installer/snappy/setup/gui/filebot.desktop b/installer/snappy/setup/gui/filebot.desktop
index f1b9f867..4f7f8099 100755
--- a/installer/snappy/setup/gui/filebot.desktop
+++ b/installer/snappy/setup/gui/filebot.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
-Name=FileBot
-Comment=The ultimate TV and Movie Renamer / Subtitle Downloader
+Name=@{application.name}
+Comment=@{package.synopsis}
 Type=Application
 Exec=filebot
 Icon=${SNAP}/meta/gui/icon.svg
 Terminal=false
 StartupNotify=true
-Categories=AudioVideo;Video;Utility;FileTools;Java
-X-Ubuntu-Gettext-Domain=filebot
+Categories=@{gnome.application.categories}
+X-Ubuntu-Gettext-Domain=@{package.name}
diff --git a/installer/snappy/snapcraft.yaml b/installer/snappy/snapcraft.yaml
index 5fa3f885..9403fd6f 100644
--- a/installer/snappy/snapcraft.yaml
+++ b/installer/snappy/snapcraft.yaml
@@ -1,7 +1,7 @@
-name: filebot
-version: @{version}
-summary: The ultimate TV and Movie Renamer / Subtitle Downloader
-description: FileBot is the ultimate tool for organizing and renaming your movies, tv shows or anime, and music well as downloading subtitles and artwork. It's smart and just works.
+name: @{package.name}
+version: @{application.version}
+summary: @{package.synopsis}
+description: @{package.description}
 
 confinement: strict