diff --git a/.gitignore b/.gitignore
index 86a3ba44..8220c0c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,7 @@ website/data/
 
 *.sh
 *.cmd
+
+*.cer
+*.pfx
+*.pvk
diff --git a/build.xml b/build.xml
index a1d3b056..ebd67034 100644
--- a/build.xml
+++ b/build.xml
@@ -583,7 +583,7 @@
 	<target name="appx" description="Build Windows 10 package" depends="revision">
 		<copy tofile="${dir.dist}/appx/FileBot.jar" file="${path.fatjar}" />
 		<copy todir="${dir.dist}/appx">
-			<fileset dir="${dir.installer}/appx" includes="*.exe, *.ini, *.properties, *.png" />
+			<fileset dir="${dir.installer}/appx" excludes="*.xml, *.ini" />
 			<fileset dir="${dir.lib}/native/win32-x64" />
 		</copy>
 
@@ -606,7 +606,7 @@
 		</copy-replace>
 
 		<exec executable="makeappx" dir="${dir.dist}" failonerror="yes">
-			<arg line="pack /d appx /p ${release}_r${revision}.appx" />
+			<arg line="pack /v /o /d appx /p ${release}_r${revision}.appx" />
 		</exec>
 	</target>
 
diff --git a/installer/ant/ant.properties b/installer/ant/ant.properties
index 411602db..1484ac87 100644
--- a/installer/ant/ant.properties
+++ b/installer/ant/ant.properties
@@ -19,6 +19,10 @@ package.description: FileBot is the ultimate tool for organizing and renaming yo
 package.tags: Mass Renamer, Rename TV shows, Rename movies, Organize media files, Fetch Subtitles, Check SFV files, Plex Media Server, Kodi Media Center, TheTVDB, TheMovieDB, OpenSubtitles
 package.homepage: http://www.filebot.net/
 
+# Distribution-specific Package Information
+microsoft.application.name: PointPlanck.FileBot
+microsoft.application.publisher: CN=761A0D2B-9B86-4FE4-B664-18E4E0AFC3F1
+
 # Platform-specific Package Information
 mac.application.category: public.app-category.utilities
 gnome.application.categories: AudioVideo;Video;Utility;FileTools
diff --git a/installer/appx/AppxManifest.xml b/installer/appx/AppxManifest.xml
index ab8b0d4a..cbc87136 100644
--- a/installer/appx/AppxManifest.xml
+++ b/installer/appx/AppxManifest.xml
@@ -7,9 +7,9 @@
 	xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10">
 
 	<Identity
-		Name="PointPlanck.FileBot"
+		Name="@{microsoft.application.name}"
 		ProcessorArchitecture="x64"
-		Publisher="CN=761A0D2B-9B86-4FE4-B664-18E4E0AFC3F1"
+		Publisher="@{microsoft.application.publisher}"
 		Version="@{application.version}.0"
 	/>
 
@@ -17,11 +17,11 @@
 		<DisplayName>@{application.name}</DisplayName>
 		<PublisherDisplayName>@{package.company}</PublisherDisplayName>
 		<Description>@{package.description}</Description>
-		<Logo>icon.png</Logo>
+		<Logo>Assets\StoreLogo.png</Logo>
 	</Properties>
 
 	<Resources>
-		<Resource Language="en-us" />
+		<Resource Language="en-US" />
 	</Resources>
 
 	<Dependencies>
@@ -33,20 +33,17 @@
 	</Capabilities>
 
 	<Applications>
-		<Application Id="@{package.name}" Executable="filebot.launcher.exe" EntryPoint="Windows.FullTrustApplication">
-			<uap:VisualElements
-				DisplayName="@{application.name}"
-				Description="@{package.synopsis}"
-				BackgroundColor="transparent"
-				Square44x44Logo="icon44.png"
-				Square150x150Logo="icon150.png"
-			/>
+		<Application Id="@{package.identifier}" Executable="filebot.launcher.exe" EntryPoint="Windows.FullTrustApplication">
+			<uap:VisualElements DisplayName="@{application.name}" Description="@{package.synopsis}" BackgroundColor="transparent" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" >
+				<uap:DefaultTile ShortName="@{application.name}" Wide310x150Logo="Assets\Wide310x150Logo.png" Square310x310Logo="Assets\Square310x310Logo.png" Square71x71Logo="Assets\Square71x71Logo.png">
+					<uap:ShowNameOnTiles>
+						<uap:ShowOn Tile="square150x150Logo" />
+						<uap:ShowOn Tile="wide310x150Logo" />
+						<uap:ShowOn Tile="square310x310Logo" />
+					</uap:ShowNameOnTiles>
+				</uap:DefaultTile>
+			</uap:VisualElements>
 			<Extensions>
-				<uap3:Extension Category="windows.appExecutionAlias" Executable="filebot.exe" EntryPoint="Windows.FullTrustApplication">
-					<uap3:AppExecutionAlias>
-						<desktop:ExecutionAlias Alias="filebot.exe" />
-					</uap3:AppExecutionAlias>
-				</uap3:Extension>
 				<uap3:Extension Category="windows.appExecutionAlias" Executable="filebot.launcher.exe" EntryPoint="Windows.FullTrustApplication">
 					<uap3:AppExecutionAlias>
 						<desktop:ExecutionAlias Alias="filebot.launcher.exe" />
@@ -54,6 +51,24 @@
 				</uap3:Extension>
 			</Extensions>
 		</Application>
+		<Application Id="@{package.identifier}.Command" Executable="filebot.exe" EntryPoint="Windows.FullTrustApplication">
+			<uap:VisualElements DisplayName="@{application.name} (console)" Description="Run @{application.name} with Console" AppListEntry="none" BackgroundColor="black" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" >
+				<uap:DefaultTile ShortName="@{application.name} (console)" Wide310x150Logo="Assets\Wide310x150Logo.png" Square310x310Logo="Assets\Square310x310Logo.png" Square71x71Logo="Assets\Square71x71Logo.png">
+					<uap:ShowNameOnTiles>
+						<uap:ShowOn Tile="square150x150Logo" />
+						<uap:ShowOn Tile="wide310x150Logo" />
+						<uap:ShowOn Tile="square310x310Logo" />
+					</uap:ShowNameOnTiles>
+				</uap:DefaultTile>
+			</uap:VisualElements>
+			<Extensions>
+				<uap3:Extension Category="windows.appExecutionAlias" Executable="filebot.exe" EntryPoint="Windows.FullTrustApplication">
+					<uap3:AppExecutionAlias>
+						<desktop:ExecutionAlias Alias="filebot.exe" />
+					</uap3:AppExecutionAlias>
+				</uap3:Extension>
+			</Extensions>
+		</Application>
 	</Applications>
 
 </Package>
\ No newline at end of file
diff --git a/installer/appx/Assets/Square150x150Logo.png b/installer/appx/Assets/Square150x150Logo.png
new file mode 100644
index 00000000..573cc9df
Binary files /dev/null and b/installer/appx/Assets/Square150x150Logo.png differ
diff --git a/installer/appx/Assets/Square150x150Logo.scale-100.png b/installer/appx/Assets/Square150x150Logo.scale-100.png
new file mode 100644
index 00000000..573cc9df
Binary files /dev/null and b/installer/appx/Assets/Square150x150Logo.scale-100.png differ
diff --git a/installer/appx/Assets/Square150x150Logo.scale-125.png b/installer/appx/Assets/Square150x150Logo.scale-125.png
new file mode 100644
index 00000000..db7838c7
Binary files /dev/null and b/installer/appx/Assets/Square150x150Logo.scale-125.png differ
diff --git a/installer/appx/Assets/Square150x150Logo.scale-150.png b/installer/appx/Assets/Square150x150Logo.scale-150.png
new file mode 100644
index 00000000..be48a398
Binary files /dev/null and b/installer/appx/Assets/Square150x150Logo.scale-150.png differ
diff --git a/installer/appx/Assets/Square150x150Logo.scale-200.png b/installer/appx/Assets/Square150x150Logo.scale-200.png
new file mode 100644
index 00000000..14b5534f
Binary files /dev/null and b/installer/appx/Assets/Square150x150Logo.scale-200.png differ
diff --git a/installer/appx/Assets/Square150x150Logo.scale-400.png b/installer/appx/Assets/Square150x150Logo.scale-400.png
new file mode 100644
index 00000000..e55e382c
Binary files /dev/null and b/installer/appx/Assets/Square150x150Logo.scale-400.png differ
diff --git a/installer/appx/Assets/Square310x310Logo.png b/installer/appx/Assets/Square310x310Logo.png
new file mode 100644
index 00000000..75e79c0f
Binary files /dev/null and b/installer/appx/Assets/Square310x310Logo.png differ
diff --git a/installer/appx/Assets/Square310x310Logo.scale-100.png b/installer/appx/Assets/Square310x310Logo.scale-100.png
new file mode 100644
index 00000000..75e79c0f
Binary files /dev/null and b/installer/appx/Assets/Square310x310Logo.scale-100.png differ
diff --git a/installer/appx/Assets/Square310x310Logo.scale-125.png b/installer/appx/Assets/Square310x310Logo.scale-125.png
new file mode 100644
index 00000000..6b26db57
Binary files /dev/null and b/installer/appx/Assets/Square310x310Logo.scale-125.png differ
diff --git a/installer/appx/Assets/Square310x310Logo.scale-150.png b/installer/appx/Assets/Square310x310Logo.scale-150.png
new file mode 100644
index 00000000..e00b4962
Binary files /dev/null and b/installer/appx/Assets/Square310x310Logo.scale-150.png differ
diff --git a/installer/appx/Assets/Square310x310Logo.scale-200.png b/installer/appx/Assets/Square310x310Logo.scale-200.png
new file mode 100644
index 00000000..086ac165
Binary files /dev/null and b/installer/appx/Assets/Square310x310Logo.scale-200.png differ
diff --git a/installer/appx/Assets/Square310x310Logo.scale-400.png b/installer/appx/Assets/Square310x310Logo.scale-400.png
new file mode 100644
index 00000000..45e8771c
Binary files /dev/null and b/installer/appx/Assets/Square310x310Logo.scale-400.png differ
diff --git a/installer/appx/icon44.png b/installer/appx/Assets/Square44x44Logo.png
similarity index 100%
rename from installer/appx/icon44.png
rename to installer/appx/Assets/Square44x44Logo.png
diff --git a/installer/appx/Assets/Square44x44Logo.scale-100.png b/installer/appx/Assets/Square44x44Logo.scale-100.png
new file mode 100644
index 00000000..4d2e0e07
Binary files /dev/null and b/installer/appx/Assets/Square44x44Logo.scale-100.png differ
diff --git a/installer/appx/Assets/Square44x44Logo.scale-125.png b/installer/appx/Assets/Square44x44Logo.scale-125.png
new file mode 100644
index 00000000..8bf0eeee
Binary files /dev/null and b/installer/appx/Assets/Square44x44Logo.scale-125.png differ
diff --git a/installer/appx/Assets/Square44x44Logo.scale-150.png b/installer/appx/Assets/Square44x44Logo.scale-150.png
new file mode 100644
index 00000000..6b2f501b
Binary files /dev/null and b/installer/appx/Assets/Square44x44Logo.scale-150.png differ
diff --git a/installer/appx/Assets/Square44x44Logo.scale-200.png b/installer/appx/Assets/Square44x44Logo.scale-200.png
new file mode 100644
index 00000000..bfafb273
Binary files /dev/null and b/installer/appx/Assets/Square44x44Logo.scale-200.png differ
diff --git a/installer/appx/Assets/Square44x44Logo.scale-400.png b/installer/appx/Assets/Square44x44Logo.scale-400.png
new file mode 100644
index 00000000..33bb1c11
Binary files /dev/null and b/installer/appx/Assets/Square44x44Logo.scale-400.png differ
diff --git a/installer/appx/Assets/Square44x44Logo.targetsize-16.png b/installer/appx/Assets/Square44x44Logo.targetsize-16.png
new file mode 100644
index 00000000..c758e2aa
Binary files /dev/null and b/installer/appx/Assets/Square44x44Logo.targetsize-16.png differ
diff --git a/installer/appx/Assets/Square44x44Logo.targetsize-16_altform-unplated.png b/installer/appx/Assets/Square44x44Logo.targetsize-16_altform-unplated.png
new file mode 100644
index 00000000..8f095243
Binary files /dev/null and b/installer/appx/Assets/Square44x44Logo.targetsize-16_altform-unplated.png differ
diff --git a/installer/appx/Assets/Square44x44Logo.targetsize-24.png b/installer/appx/Assets/Square44x44Logo.targetsize-24.png
new file mode 100644
index 00000000..5c095bbc
Binary files /dev/null and b/installer/appx/Assets/Square44x44Logo.targetsize-24.png differ
diff --git a/installer/appx/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/installer/appx/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
new file mode 100644
index 00000000..d46f68de
Binary files /dev/null and b/installer/appx/Assets/Square44x44Logo.targetsize-24_altform-unplated.png differ
diff --git a/installer/appx/Assets/Square44x44Logo.targetsize-256.png b/installer/appx/Assets/Square44x44Logo.targetsize-256.png
new file mode 100644
index 00000000..f8f8a98d
Binary files /dev/null and b/installer/appx/Assets/Square44x44Logo.targetsize-256.png differ
diff --git a/installer/appx/Assets/Square44x44Logo.targetsize-256_altform-unplated.png b/installer/appx/Assets/Square44x44Logo.targetsize-256_altform-unplated.png
new file mode 100644
index 00000000..0a0a916d
Binary files /dev/null and b/installer/appx/Assets/Square44x44Logo.targetsize-256_altform-unplated.png differ
diff --git a/installer/appx/Assets/Square44x44Logo.targetsize-32.png b/installer/appx/Assets/Square44x44Logo.targetsize-32.png
new file mode 100644
index 00000000..26e97e7b
Binary files /dev/null and b/installer/appx/Assets/Square44x44Logo.targetsize-32.png differ
diff --git a/installer/appx/Assets/Square44x44Logo.targetsize-32_altform-unplated.png b/installer/appx/Assets/Square44x44Logo.targetsize-32_altform-unplated.png
new file mode 100644
index 00000000..d2266181
Binary files /dev/null and b/installer/appx/Assets/Square44x44Logo.targetsize-32_altform-unplated.png differ
diff --git a/installer/appx/Assets/Square44x44Logo.targetsize-44.png b/installer/appx/Assets/Square44x44Logo.targetsize-44.png
new file mode 100644
index 00000000..4d2e0e07
Binary files /dev/null and b/installer/appx/Assets/Square44x44Logo.targetsize-44.png differ
diff --git a/installer/appx/Assets/Square44x44Logo.targetsize-44_altform-unplated.png b/installer/appx/Assets/Square44x44Logo.targetsize-44_altform-unplated.png
new file mode 100644
index 00000000..59fc8c27
Binary files /dev/null and b/installer/appx/Assets/Square44x44Logo.targetsize-44_altform-unplated.png differ
diff --git a/installer/appx/Assets/Square44x44Logo.targetsize-48.png b/installer/appx/Assets/Square44x44Logo.targetsize-48.png
new file mode 100644
index 00000000..62191792
Binary files /dev/null and b/installer/appx/Assets/Square44x44Logo.targetsize-48.png differ
diff --git a/installer/appx/Assets/Square44x44Logo.targetsize-48_altform-unplated.png b/installer/appx/Assets/Square44x44Logo.targetsize-48_altform-unplated.png
new file mode 100644
index 00000000..e149fae0
Binary files /dev/null and b/installer/appx/Assets/Square44x44Logo.targetsize-48_altform-unplated.png differ
diff --git a/installer/appx/Assets/Square71x71Logo.png b/installer/appx/Assets/Square71x71Logo.png
new file mode 100644
index 00000000..107eef4a
Binary files /dev/null and b/installer/appx/Assets/Square71x71Logo.png differ
diff --git a/installer/appx/Assets/Square71x71Logo.scale-100.png b/installer/appx/Assets/Square71x71Logo.scale-100.png
new file mode 100644
index 00000000..107eef4a
Binary files /dev/null and b/installer/appx/Assets/Square71x71Logo.scale-100.png differ
diff --git a/installer/appx/Assets/Square71x71Logo.scale-125.png b/installer/appx/Assets/Square71x71Logo.scale-125.png
new file mode 100644
index 00000000..36397247
Binary files /dev/null and b/installer/appx/Assets/Square71x71Logo.scale-125.png differ
diff --git a/installer/appx/Assets/Square71x71Logo.scale-150.png b/installer/appx/Assets/Square71x71Logo.scale-150.png
new file mode 100644
index 00000000..9d86297d
Binary files /dev/null and b/installer/appx/Assets/Square71x71Logo.scale-150.png differ
diff --git a/installer/appx/Assets/Square71x71Logo.scale-200.png b/installer/appx/Assets/Square71x71Logo.scale-200.png
new file mode 100644
index 00000000..ee66e9ca
Binary files /dev/null and b/installer/appx/Assets/Square71x71Logo.scale-200.png differ
diff --git a/installer/appx/Assets/Square71x71Logo.scale-400.png b/installer/appx/Assets/Square71x71Logo.scale-400.png
new file mode 100644
index 00000000..9315a45e
Binary files /dev/null and b/installer/appx/Assets/Square71x71Logo.scale-400.png differ
diff --git a/installer/appx/Assets/StoreLogo.png b/installer/appx/Assets/StoreLogo.png
new file mode 100644
index 00000000..3571ded1
Binary files /dev/null and b/installer/appx/Assets/StoreLogo.png differ
diff --git a/installer/appx/Assets/StoreLogo.scale-100.png b/installer/appx/Assets/StoreLogo.scale-100.png
new file mode 100644
index 00000000..cf1e09a6
Binary files /dev/null and b/installer/appx/Assets/StoreLogo.scale-100.png differ
diff --git a/installer/appx/Assets/StoreLogo.scale-125.png b/installer/appx/Assets/StoreLogo.scale-125.png
new file mode 100644
index 00000000..183f0f39
Binary files /dev/null and b/installer/appx/Assets/StoreLogo.scale-125.png differ
diff --git a/installer/appx/Assets/StoreLogo.scale-150.png b/installer/appx/Assets/StoreLogo.scale-150.png
new file mode 100644
index 00000000..1b05c2a2
Binary files /dev/null and b/installer/appx/Assets/StoreLogo.scale-150.png differ
diff --git a/installer/appx/Assets/StoreLogo.scale-200.png b/installer/appx/Assets/StoreLogo.scale-200.png
new file mode 100644
index 00000000..f69be61e
Binary files /dev/null and b/installer/appx/Assets/StoreLogo.scale-200.png differ
diff --git a/installer/appx/Assets/StoreLogo.scale-400.png b/installer/appx/Assets/StoreLogo.scale-400.png
new file mode 100644
index 00000000..3571ded1
Binary files /dev/null and b/installer/appx/Assets/StoreLogo.scale-400.png differ
diff --git a/installer/appx/Assets/Wide310x150Logo.png b/installer/appx/Assets/Wide310x150Logo.png
new file mode 100644
index 00000000..af5a50fb
Binary files /dev/null and b/installer/appx/Assets/Wide310x150Logo.png differ
diff --git a/installer/appx/Assets/Wide310x150Logo.scale-100.png b/installer/appx/Assets/Wide310x150Logo.scale-100.png
new file mode 100644
index 00000000..af5a50fb
Binary files /dev/null and b/installer/appx/Assets/Wide310x150Logo.scale-100.png differ
diff --git a/installer/appx/Assets/Wide310x150Logo.scale-125.png b/installer/appx/Assets/Wide310x150Logo.scale-125.png
new file mode 100644
index 00000000..1e96c85f
Binary files /dev/null and b/installer/appx/Assets/Wide310x150Logo.scale-125.png differ
diff --git a/installer/appx/Assets/Wide310x150Logo.scale-150.png b/installer/appx/Assets/Wide310x150Logo.scale-150.png
new file mode 100644
index 00000000..1b8684dd
Binary files /dev/null and b/installer/appx/Assets/Wide310x150Logo.scale-150.png differ
diff --git a/installer/appx/Assets/Wide310x150Logo.scale-200.png b/installer/appx/Assets/Wide310x150Logo.scale-200.png
new file mode 100644
index 00000000..02563bf8
Binary files /dev/null and b/installer/appx/Assets/Wide310x150Logo.scale-200.png differ
diff --git a/installer/appx/Assets/Wide310x150Logo.scale-400.png b/installer/appx/Assets/Wide310x150Logo.scale-400.png
new file mode 100644
index 00000000..5b3927b4
Binary files /dev/null and b/installer/appx/Assets/Wide310x150Logo.scale-400.png differ
diff --git a/installer/appx/filebot.l4j.ini b/installer/appx/filebot.l4j.ini
index 046f9989..57334417 100644
--- a/installer/appx/filebot.l4j.ini
+++ b/installer/appx/filebot.l4j.ini
@@ -32,4 +32,4 @@
 -Djava.util.logging.config.file="%EXEDIR%\logging.properties"
 
 # force Application User Model ID for Windows Store
--Dnet.filebot.AppUserModelID=PointPlanck.FileBot
+-Dnet.filebot.AppUserModelID=@{microsoft.application.name}
diff --git a/installer/appx/filebot.launcher.l4j.ini b/installer/appx/filebot.launcher.l4j.ini
index 7eaa15ec..1202e1d2 100644
--- a/installer/appx/filebot.launcher.l4j.ini
+++ b/installer/appx/filebot.launcher.l4j.ini
@@ -32,4 +32,4 @@
 -Djava.util.logging.config.file="%EXEDIR%\logging.properties"
 
 # force Application User Model ID for Windows Store
--Dnet.filebot.AppUserModelID=PointPlanck.FileBot
+-Dnet.filebot.AppUserModelID=@{microsoft.application.name}
diff --git a/installer/appx/icon.png b/installer/appx/icon.png
deleted file mode 100644
index 3dcd7504..00000000
Binary files a/installer/appx/icon.png and /dev/null differ
diff --git a/installer/appx/icon150.png b/installer/appx/icon150.png
deleted file mode 100644
index 79822a5a..00000000
Binary files a/installer/appx/icon150.png and /dev/null differ