diff --git a/.gitignore b/.gitignore
index b90eda8..3060859 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,5 +39,6 @@ project.lock.json
 AppPackages/
 BundleArtifacts/
 *.DotSettings
+/ModernKeePass/Win81App_TemporaryKey.pfx
 /ModernKeePass/Win81App_StoreKey.pfx
-.sonarqube/
\ No newline at end of file
+.sonarqube/
diff --git a/ModernKeePass/Package.StoreAssociation.xml b/ModernKeePass/Package.StoreAssociation.xml
index 886d5a0..ae0db88 100644
--- a/ModernKeePass/Package.StoreAssociation.xml
+++ b/ModernKeePass/Package.StoreAssociation.xml
@@ -368,23 +368,33 @@
     <BundleInfo>
       <PackageInfo>
         <OsMinVersion>6.3.0.0</OsMinVersion>
-        <PackageArchitecture>Neutral</PackageArchitecture>
-        <PackageMaxArchitectureVersion>1.15.2557.0</PackageMaxArchitectureVersion>
+        <PackageArchitecture>X64</PackageArchitecture>
+        <PackageMaxArchitectureVersion>1.20.640.0</PackageMaxArchitectureVersion>
+      </PackageInfo>
+      <PackageInfo>
+        <OsMinVersion>6.3.0.0</OsMinVersion>
+        <PackageArchitecture>X86</PackageArchitecture>
+        <PackageMaxArchitectureVersion>1.20.640.0</PackageMaxArchitectureVersion>
+      </PackageInfo>
+      <PackageInfo>
+        <OsMinVersion>6.3.0.0</OsMinVersion>
+        <PackageArchitecture>Arm</PackageArchitecture>
+        <PackageMaxArchitectureVersion>1.20.640.0</PackageMaxArchitectureVersion>
       </PackageInfo>
       <PackageInfo>
         <OsMinVersion>6.3.0.0</OsMinVersion>
         <PackageArchitecture>Neutral</PackageArchitecture>
-        <PackageMaxArchitectureVersion>1.15.2557.0</PackageMaxArchitectureVersion>
+        <PackageMaxArchitectureVersion>1.20.640.0</PackageMaxArchitectureVersion>
       </PackageInfo>
       <PackageInfo>
         <OsMinVersion>6.3.0.0</OsMinVersion>
         <PackageArchitecture>Neutral</PackageArchitecture>
-        <PackageMaxArchitectureVersion>1.15.2557.0</PackageMaxArchitectureVersion>
+        <PackageMaxArchitectureVersion>1.20.640.0</PackageMaxArchitectureVersion>
       </PackageInfo>
       <PackageInfo>
         <OsMinVersion>6.3.0.0</OsMinVersion>
         <PackageArchitecture>Neutral</PackageArchitecture>
-        <PackageMaxArchitectureVersion>1.15.2557.0</PackageMaxArchitectureVersion>
+        <PackageMaxArchitectureVersion>1.20.640.0</PackageMaxArchitectureVersion>
       </PackageInfo>
     </BundleInfo>
   </PackageInfoList>
diff --git a/ModernKeePass/Package.appxmanifest b/ModernKeePass/Package.appxmanifest
index 71a429c..6c058cb 100644
--- a/ModernKeePass/Package.appxmanifest
+++ b/ModernKeePass/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest">
-  <Identity Name="wismna.ModernKeePass" Publisher="CN=0719A91A-C322-4EE0-A257-E60733EECF06" Version="1.21.0.12" />
+  <Identity Name="wismna.ModernKeePass" Publisher="CN=0719A91A-C322-4EE0-A257-E60733EECF06" Version="1.21.0.18" />
   <Properties>
     <DisplayName>ModernKeePass</DisplayName>
     <PublisherDisplayName>wismna</PublisherDisplayName>
diff --git a/ModernKeePass/Win81App.csproj b/ModernKeePass/Win81App.csproj
index 089ff4a..4ec1f7a 100644
--- a/ModernKeePass/Win81App.csproj
+++ b/ModernKeePass/Win81App.csproj
@@ -353,8 +353,8 @@
       <HintPath>..\packages\Portable.BouncyCastle.1.8.5\lib\netstandard1.0\BouncyCastle.Crypto.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="CommonServiceLocator, Version=2.0.5.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
-      <HintPath>..\packages\CommonServiceLocator.2.0.5\lib\netstandard1.0\CommonServiceLocator.dll</HintPath>
+    <Reference Include="CommonServiceLocator, Version=2.0.6.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
+      <HintPath>..\packages\CommonServiceLocator.2.0.6\lib\netstandard1.0\CommonServiceLocator.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="FluentValidation, Version=8.0.0.0, Culture=neutral, PublicKeyToken=7de548da2fbae0f0, processorArchitecture=MSIL">
diff --git a/ModernKeePass/packages.config b/ModernKeePass/packages.config
index 3686573..164b135 100644
--- a/ModernKeePass/packages.config
+++ b/ModernKeePass/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="AutoMapper" version="5.2.0" targetFramework="win81" />
   <package id="AutoMapper.Extensions.Microsoft.DependencyInjection" version="1.2.0" targetFramework="win81" />
-  <package id="CommonServiceLocator" version="2.0.5" targetFramework="win81" />
+  <package id="CommonServiceLocator" version="2.0.6" targetFramework="win81" />
   <package id="FluentValidation" version="8.6.2" targetFramework="win81" />
   <package id="HockeySDK.Core" version="4.1.6" targetFramework="win81" />
   <package id="HockeySDK.WINRT" version="4.1.6" targetFramework="win81" />