diff --git a/Wallet.Avalonia.Desktop/Wallet.Avalonia.Desktop.csproj b/Wallet.Avalonia.Desktop/Wallet.Avalonia.Desktop.csproj
index 6d5125d..b9168bb 100644
--- a/Wallet.Avalonia.Desktop/Wallet.Avalonia.Desktop.csproj
+++ b/Wallet.Avalonia.Desktop/Wallet.Avalonia.Desktop.csproj
@@ -6,7 +6,7 @@
 		<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
 		<ApplicationManifest>app.manifest</ApplicationManifest>
 		<SelfContained>true</SelfContained>
-		<RuntimeIdentifier>win-x64</RuntimeIdentifier>
+		<RuntimeIdentifiers>win-x64;win-x86;win-arm64</RuntimeIdentifiers>
 		<ApplicationIcon>Icon.ico</ApplicationIcon>
 	</PropertyGroup>
 	<ItemGroup>
diff --git a/Wallet.Packaging/Images/LockScreenLogo.scale-200.png b/Wallet.Packaging/Images/LockScreenLogo.scale-200.png
new file mode 100644
index 0000000..735f57a
Binary files /dev/null and b/Wallet.Packaging/Images/LockScreenLogo.scale-200.png differ
diff --git a/Wallet.Packaging/Images/SplashScreen.scale-200.png b/Wallet.Packaging/Images/SplashScreen.scale-200.png
new file mode 100644
index 0000000..023e7f1
Binary files /dev/null and b/Wallet.Packaging/Images/SplashScreen.scale-200.png differ
diff --git a/Wallet.Packaging/Images/Square150x150Logo.scale-200.png b/Wallet.Packaging/Images/Square150x150Logo.scale-200.png
new file mode 100644
index 0000000..af49fec
Binary files /dev/null and b/Wallet.Packaging/Images/Square150x150Logo.scale-200.png differ
diff --git a/Wallet.Packaging/Images/Square44x44Logo.scale-200.png b/Wallet.Packaging/Images/Square44x44Logo.scale-200.png
new file mode 100644
index 0000000..ce342a2
Binary files /dev/null and b/Wallet.Packaging/Images/Square44x44Logo.scale-200.png differ
diff --git a/Wallet.Packaging/Images/Square44x44Logo.targetsize-24_altform-unplated.png b/Wallet.Packaging/Images/Square44x44Logo.targetsize-24_altform-unplated.png
new file mode 100644
index 0000000..f6c02ce
Binary files /dev/null and b/Wallet.Packaging/Images/Square44x44Logo.targetsize-24_altform-unplated.png differ
diff --git a/Wallet.Packaging/Images/StoreLogo.png b/Wallet.Packaging/Images/StoreLogo.png
new file mode 100644
index 0000000..7385b56
Binary files /dev/null and b/Wallet.Packaging/Images/StoreLogo.png differ
diff --git a/Wallet.Packaging/Images/Wide310x150Logo.scale-200.png b/Wallet.Packaging/Images/Wide310x150Logo.scale-200.png
new file mode 100644
index 0000000..288995b
Binary files /dev/null and b/Wallet.Packaging/Images/Wide310x150Logo.scale-200.png differ
diff --git a/Wallet.Packaging/Package.appxmanifest b/Wallet.Packaging/Package.appxmanifest
new file mode 100644
index 0000000..90bef3a
--- /dev/null
+++ b/Wallet.Packaging/Package.appxmanifest
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Package
+  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
+  IgnorableNamespaces="uap rescap">
+
+  <Identity
+    Name="4c473010-e2ea-4723-856b-3fa1ec7f08b2"
+    Publisher="CN=Walleby"
+    Version="1.0.2.0" />
+
+  <Properties>
+    <DisplayName>Walleby</DisplayName>
+    <PublisherDisplayName>Walleby</PublisherDisplayName>
+    <Logo>Images\StoreLogo.png</Logo>
+  </Properties>
+
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14393.0" MaxVersionTested="10.0.14393.0" />
+  </Dependencies>
+
+  <Resources>
+    <Resource Language="x-generate"/>
+  </Resources>
+
+  <Applications>
+    <Application Id="App"
+      Executable="$targetnametoken$.exe"
+      EntryPoint="$targetentrypoint$">
+      <uap:VisualElements
+        DisplayName="Walleby"
+        Description="Alpha Preview"
+        BackgroundColor="transparent"
+        Square150x150Logo="Images\Square150x150Logo.png"
+        Square44x44Logo="Images\Square44x44Logo.png">
+        <uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png" />
+        <uap:SplashScreen Image="Images\SplashScreen.png" />
+      </uap:VisualElements>
+    </Application>
+  </Applications>
+
+  <Capabilities>
+    <Capability Name="internetClient" />
+    <rescap:Capability Name="runFullTrust" />
+  </Capabilities>
+</Package>
diff --git a/Wallet.Packaging/Wallet.Packaging.wapproj b/Wallet.Packaging/Wallet.Packaging.wapproj
new file mode 100644
index 0000000..e48e85f
--- /dev/null
+++ b/Wallet.Packaging/Wallet.Packaging.wapproj
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
+    <VisualStudioVersion>15.0</VisualStudioVersion>
+  </PropertyGroup>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x86">
+      <Configuration>Debug</Configuration>
+      <Platform>x86</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x86">
+      <Configuration>Release</Configuration>
+      <Platform>x86</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|AnyCPU">
+      <Configuration>Debug</Configuration>
+      <Platform>AnyCPU</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|AnyCPU">
+      <Configuration>Release</Configuration>
+      <Platform>AnyCPU</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup>
+    <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
+  </PropertyGroup>
+  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
+  <PropertyGroup>
+    <ProjectGuid>15e27789-c562-4422-a40a-48bcefbbea92</ProjectGuid>
+    <TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
+    <NoWarn>$(NoWarn);NU1702</NoWarn>
+    <EntryPointProjectUniqueName>..\Wallet.Avalonia.Desktop\Wallet.Avalonia.Desktop.csproj</EntryPointProjectUniqueName>
+    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
+    <PackageCertificateThumbprint>565D394FABB7B8BEB2CC1EA6EC5A83D93AAC5CA8</PackageCertificateThumbprint>
+    <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
+    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
+    <GenerateTestArtifacts>True</GenerateTestArtifacts>
+    <AppxBundlePlatforms>x64</AppxBundlePlatforms>
+    <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
+    <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <DefaultLanguage>en-GB</DefaultLanguage>
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <DefaultLanguage>en-GB</DefaultLanguage>
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <DefaultLanguage>en-GB</DefaultLanguage>
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DefaultLanguage>en-GB</DefaultLanguage>
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DefaultLanguage>en-GB</DefaultLanguage>
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <DefaultLanguage>en-GB</DefaultLanguage>
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <DefaultLanguage>en-GB</DefaultLanguage>
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
+    <DefaultLanguage>en-GB</DefaultLanguage>
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
+    <DefaultLanguage>en-GB</DefaultLanguage>
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <DefaultLanguage>en-GB</DefaultLanguage>
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <ItemGroup>
+    <AppxManifest Include="Package.appxmanifest">
+      <SubType>Designer</SubType>
+    </AppxManifest>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Images\SplashScreen.scale-200.png" />
+    <Content Include="Images\LockScreenLogo.scale-200.png" />
+    <Content Include="Images\Square150x150Logo.scale-200.png" />
+    <Content Include="Images\Square44x44Logo.scale-200.png" />
+    <Content Include="Images\Square44x44Logo.targetsize-24_altform-unplated.png" />
+    <Content Include="Images\StoreLogo.png" />
+    <Content Include="Images\Wide310x150Logo.scale-200.png" />
+    <None Include="Wallet.Packaging_TemporaryKey.pfx" />
+  </ItemGroup>
+  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" PrivateAssets="all" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Wallet.Avalonia.Desktop\Wallet.Avalonia.Desktop.csproj" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Wallet.sln b/Wallet.sln
index fbec48b..f6c59da 100644
--- a/Wallet.sln
+++ b/Wallet.sln
@@ -19,44 +19,212 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wallet.Avalonia.Desktop", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wallet.Avalonia", "Wallet.Avalonia\Wallet.Avalonia.csproj", "{6281FAAD-ACE3-448C-9E57-0B0A86964F0D}"
 EndProject
+Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "Wallet.Packaging", "Wallet.Packaging\Wallet.Packaging.wapproj", "{15E27789-C562-4422-A40A-48BCEFBBEA92}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|ARM = Debug|ARM
+		Debug|ARM64 = Debug|ARM64
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|ARM = Release|ARM
+		Release|ARM64 = Release|ARM64
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{D6AAB1E0-7E3E-4E0B-A70D-D23DC9CE50C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D6AAB1E0-7E3E-4E0B-A70D-D23DC9CE50C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D6AAB1E0-7E3E-4E0B-A70D-D23DC9CE50C7}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{D6AAB1E0-7E3E-4E0B-A70D-D23DC9CE50C7}.Debug|ARM.Build.0 = Debug|Any CPU
+		{D6AAB1E0-7E3E-4E0B-A70D-D23DC9CE50C7}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{D6AAB1E0-7E3E-4E0B-A70D-D23DC9CE50C7}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{D6AAB1E0-7E3E-4E0B-A70D-D23DC9CE50C7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D6AAB1E0-7E3E-4E0B-A70D-D23DC9CE50C7}.Debug|x64.Build.0 = Debug|Any CPU
+		{D6AAB1E0-7E3E-4E0B-A70D-D23DC9CE50C7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D6AAB1E0-7E3E-4E0B-A70D-D23DC9CE50C7}.Debug|x86.Build.0 = Debug|Any CPU
 		{D6AAB1E0-7E3E-4E0B-A70D-D23DC9CE50C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D6AAB1E0-7E3E-4E0B-A70D-D23DC9CE50C7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D6AAB1E0-7E3E-4E0B-A70D-D23DC9CE50C7}.Release|ARM.ActiveCfg = Release|Any CPU
+		{D6AAB1E0-7E3E-4E0B-A70D-D23DC9CE50C7}.Release|ARM.Build.0 = Release|Any CPU
+		{D6AAB1E0-7E3E-4E0B-A70D-D23DC9CE50C7}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{D6AAB1E0-7E3E-4E0B-A70D-D23DC9CE50C7}.Release|ARM64.Build.0 = Release|Any CPU
+		{D6AAB1E0-7E3E-4E0B-A70D-D23DC9CE50C7}.Release|x64.ActiveCfg = Release|Any CPU
+		{D6AAB1E0-7E3E-4E0B-A70D-D23DC9CE50C7}.Release|x64.Build.0 = Release|Any CPU
+		{D6AAB1E0-7E3E-4E0B-A70D-D23DC9CE50C7}.Release|x86.ActiveCfg = Release|Any CPU
+		{D6AAB1E0-7E3E-4E0B-A70D-D23DC9CE50C7}.Release|x86.Build.0 = Release|Any CPU
 		{E2E3E066-869A-40A4-8F22-657E4AD3718C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E2E3E066-869A-40A4-8F22-657E4AD3718C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E2E3E066-869A-40A4-8F22-657E4AD3718C}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{E2E3E066-869A-40A4-8F22-657E4AD3718C}.Debug|ARM.Build.0 = Debug|Any CPU
+		{E2E3E066-869A-40A4-8F22-657E4AD3718C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{E2E3E066-869A-40A4-8F22-657E4AD3718C}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{E2E3E066-869A-40A4-8F22-657E4AD3718C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E2E3E066-869A-40A4-8F22-657E4AD3718C}.Debug|x64.Build.0 = Debug|Any CPU
+		{E2E3E066-869A-40A4-8F22-657E4AD3718C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E2E3E066-869A-40A4-8F22-657E4AD3718C}.Debug|x86.Build.0 = Debug|Any CPU
 		{E2E3E066-869A-40A4-8F22-657E4AD3718C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E2E3E066-869A-40A4-8F22-657E4AD3718C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E2E3E066-869A-40A4-8F22-657E4AD3718C}.Release|ARM.ActiveCfg = Release|Any CPU
+		{E2E3E066-869A-40A4-8F22-657E4AD3718C}.Release|ARM.Build.0 = Release|Any CPU
+		{E2E3E066-869A-40A4-8F22-657E4AD3718C}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{E2E3E066-869A-40A4-8F22-657E4AD3718C}.Release|ARM64.Build.0 = Release|Any CPU
+		{E2E3E066-869A-40A4-8F22-657E4AD3718C}.Release|x64.ActiveCfg = Release|Any CPU
+		{E2E3E066-869A-40A4-8F22-657E4AD3718C}.Release|x64.Build.0 = Release|Any CPU
+		{E2E3E066-869A-40A4-8F22-657E4AD3718C}.Release|x86.ActiveCfg = Release|Any CPU
+		{E2E3E066-869A-40A4-8F22-657E4AD3718C}.Release|x86.Build.0 = Release|Any CPU
 		{6EB99311-D120-4BE3-971C-BFC5BA94F9A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6EB99311-D120-4BE3-971C-BFC5BA94F9A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6EB99311-D120-4BE3-971C-BFC5BA94F9A1}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{6EB99311-D120-4BE3-971C-BFC5BA94F9A1}.Debug|ARM.Build.0 = Debug|Any CPU
+		{6EB99311-D120-4BE3-971C-BFC5BA94F9A1}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{6EB99311-D120-4BE3-971C-BFC5BA94F9A1}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{6EB99311-D120-4BE3-971C-BFC5BA94F9A1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6EB99311-D120-4BE3-971C-BFC5BA94F9A1}.Debug|x64.Build.0 = Debug|Any CPU
+		{6EB99311-D120-4BE3-971C-BFC5BA94F9A1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6EB99311-D120-4BE3-971C-BFC5BA94F9A1}.Debug|x86.Build.0 = Debug|Any CPU
 		{6EB99311-D120-4BE3-971C-BFC5BA94F9A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6EB99311-D120-4BE3-971C-BFC5BA94F9A1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6EB99311-D120-4BE3-971C-BFC5BA94F9A1}.Release|ARM.ActiveCfg = Release|Any CPU
+		{6EB99311-D120-4BE3-971C-BFC5BA94F9A1}.Release|ARM.Build.0 = Release|Any CPU
+		{6EB99311-D120-4BE3-971C-BFC5BA94F9A1}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{6EB99311-D120-4BE3-971C-BFC5BA94F9A1}.Release|ARM64.Build.0 = Release|Any CPU
+		{6EB99311-D120-4BE3-971C-BFC5BA94F9A1}.Release|x64.ActiveCfg = Release|Any CPU
+		{6EB99311-D120-4BE3-971C-BFC5BA94F9A1}.Release|x64.Build.0 = Release|Any CPU
+		{6EB99311-D120-4BE3-971C-BFC5BA94F9A1}.Release|x86.ActiveCfg = Release|Any CPU
+		{6EB99311-D120-4BE3-971C-BFC5BA94F9A1}.Release|x86.Build.0 = Release|Any CPU
 		{716E252B-B758-4134-9D34-50FC42B414C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{716E252B-B758-4134-9D34-50FC42B414C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{716E252B-B758-4134-9D34-50FC42B414C6}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{716E252B-B758-4134-9D34-50FC42B414C6}.Debug|ARM.Build.0 = Debug|Any CPU
+		{716E252B-B758-4134-9D34-50FC42B414C6}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{716E252B-B758-4134-9D34-50FC42B414C6}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{716E252B-B758-4134-9D34-50FC42B414C6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{716E252B-B758-4134-9D34-50FC42B414C6}.Debug|x64.Build.0 = Debug|Any CPU
+		{716E252B-B758-4134-9D34-50FC42B414C6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{716E252B-B758-4134-9D34-50FC42B414C6}.Debug|x86.Build.0 = Debug|Any CPU
 		{716E252B-B758-4134-9D34-50FC42B414C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{716E252B-B758-4134-9D34-50FC42B414C6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{716E252B-B758-4134-9D34-50FC42B414C6}.Release|ARM.ActiveCfg = Release|Any CPU
+		{716E252B-B758-4134-9D34-50FC42B414C6}.Release|ARM.Build.0 = Release|Any CPU
+		{716E252B-B758-4134-9D34-50FC42B414C6}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{716E252B-B758-4134-9D34-50FC42B414C6}.Release|ARM64.Build.0 = Release|Any CPU
+		{716E252B-B758-4134-9D34-50FC42B414C6}.Release|x64.ActiveCfg = Release|Any CPU
+		{716E252B-B758-4134-9D34-50FC42B414C6}.Release|x64.Build.0 = Release|Any CPU
+		{716E252B-B758-4134-9D34-50FC42B414C6}.Release|x86.ActiveCfg = Release|Any CPU
+		{716E252B-B758-4134-9D34-50FC42B414C6}.Release|x86.Build.0 = Release|Any CPU
 		{DB82E675-832E-49C2-BB9E-55FBF1492ED7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DB82E675-832E-49C2-BB9E-55FBF1492ED7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DB82E675-832E-49C2-BB9E-55FBF1492ED7}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{DB82E675-832E-49C2-BB9E-55FBF1492ED7}.Debug|ARM.Build.0 = Debug|Any CPU
+		{DB82E675-832E-49C2-BB9E-55FBF1492ED7}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{DB82E675-832E-49C2-BB9E-55FBF1492ED7}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{DB82E675-832E-49C2-BB9E-55FBF1492ED7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DB82E675-832E-49C2-BB9E-55FBF1492ED7}.Debug|x64.Build.0 = Debug|Any CPU
+		{DB82E675-832E-49C2-BB9E-55FBF1492ED7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DB82E675-832E-49C2-BB9E-55FBF1492ED7}.Debug|x86.Build.0 = Debug|Any CPU
 		{DB82E675-832E-49C2-BB9E-55FBF1492ED7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DB82E675-832E-49C2-BB9E-55FBF1492ED7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DB82E675-832E-49C2-BB9E-55FBF1492ED7}.Release|ARM.ActiveCfg = Release|Any CPU
+		{DB82E675-832E-49C2-BB9E-55FBF1492ED7}.Release|ARM.Build.0 = Release|Any CPU
+		{DB82E675-832E-49C2-BB9E-55FBF1492ED7}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{DB82E675-832E-49C2-BB9E-55FBF1492ED7}.Release|ARM64.Build.0 = Release|Any CPU
+		{DB82E675-832E-49C2-BB9E-55FBF1492ED7}.Release|x64.ActiveCfg = Release|Any CPU
+		{DB82E675-832E-49C2-BB9E-55FBF1492ED7}.Release|x64.Build.0 = Release|Any CPU
+		{DB82E675-832E-49C2-BB9E-55FBF1492ED7}.Release|x86.ActiveCfg = Release|Any CPU
+		{DB82E675-832E-49C2-BB9E-55FBF1492ED7}.Release|x86.Build.0 = Release|Any CPU
 		{A9EF73B4-E2F7-4D8E-A964-840BE8FC87A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A9EF73B4-E2F7-4D8E-A964-840BE8FC87A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A9EF73B4-E2F7-4D8E-A964-840BE8FC87A1}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{A9EF73B4-E2F7-4D8E-A964-840BE8FC87A1}.Debug|ARM.Build.0 = Debug|Any CPU
+		{A9EF73B4-E2F7-4D8E-A964-840BE8FC87A1}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{A9EF73B4-E2F7-4D8E-A964-840BE8FC87A1}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{A9EF73B4-E2F7-4D8E-A964-840BE8FC87A1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A9EF73B4-E2F7-4D8E-A964-840BE8FC87A1}.Debug|x64.Build.0 = Debug|Any CPU
+		{A9EF73B4-E2F7-4D8E-A964-840BE8FC87A1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A9EF73B4-E2F7-4D8E-A964-840BE8FC87A1}.Debug|x86.Build.0 = Debug|Any CPU
 		{A9EF73B4-E2F7-4D8E-A964-840BE8FC87A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A9EF73B4-E2F7-4D8E-A964-840BE8FC87A1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A9EF73B4-E2F7-4D8E-A964-840BE8FC87A1}.Release|ARM.ActiveCfg = Release|Any CPU
+		{A9EF73B4-E2F7-4D8E-A964-840BE8FC87A1}.Release|ARM.Build.0 = Release|Any CPU
+		{A9EF73B4-E2F7-4D8E-A964-840BE8FC87A1}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{A9EF73B4-E2F7-4D8E-A964-840BE8FC87A1}.Release|ARM64.Build.0 = Release|Any CPU
+		{A9EF73B4-E2F7-4D8E-A964-840BE8FC87A1}.Release|x64.ActiveCfg = Release|Any CPU
+		{A9EF73B4-E2F7-4D8E-A964-840BE8FC87A1}.Release|x64.Build.0 = Release|Any CPU
+		{A9EF73B4-E2F7-4D8E-A964-840BE8FC87A1}.Release|x86.ActiveCfg = Release|Any CPU
+		{A9EF73B4-E2F7-4D8E-A964-840BE8FC87A1}.Release|x86.Build.0 = Release|Any CPU
 		{6389F851-F78F-411D-AB0A-9370A686B539}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6389F851-F78F-411D-AB0A-9370A686B539}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6389F851-F78F-411D-AB0A-9370A686B539}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{6389F851-F78F-411D-AB0A-9370A686B539}.Debug|ARM.Build.0 = Debug|Any CPU
+		{6389F851-F78F-411D-AB0A-9370A686B539}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{6389F851-F78F-411D-AB0A-9370A686B539}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{6389F851-F78F-411D-AB0A-9370A686B539}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6389F851-F78F-411D-AB0A-9370A686B539}.Debug|x64.Build.0 = Debug|Any CPU
+		{6389F851-F78F-411D-AB0A-9370A686B539}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6389F851-F78F-411D-AB0A-9370A686B539}.Debug|x86.Build.0 = Debug|Any CPU
 		{6389F851-F78F-411D-AB0A-9370A686B539}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6389F851-F78F-411D-AB0A-9370A686B539}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6389F851-F78F-411D-AB0A-9370A686B539}.Release|ARM.ActiveCfg = Release|Any CPU
+		{6389F851-F78F-411D-AB0A-9370A686B539}.Release|ARM.Build.0 = Release|Any CPU
+		{6389F851-F78F-411D-AB0A-9370A686B539}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{6389F851-F78F-411D-AB0A-9370A686B539}.Release|ARM64.Build.0 = Release|Any CPU
+		{6389F851-F78F-411D-AB0A-9370A686B539}.Release|x64.ActiveCfg = Release|Any CPU
+		{6389F851-F78F-411D-AB0A-9370A686B539}.Release|x64.Build.0 = Release|Any CPU
+		{6389F851-F78F-411D-AB0A-9370A686B539}.Release|x86.ActiveCfg = Release|Any CPU
+		{6389F851-F78F-411D-AB0A-9370A686B539}.Release|x86.Build.0 = Release|Any CPU
 		{6281FAAD-ACE3-448C-9E57-0B0A86964F0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6281FAAD-ACE3-448C-9E57-0B0A86964F0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6281FAAD-ACE3-448C-9E57-0B0A86964F0D}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{6281FAAD-ACE3-448C-9E57-0B0A86964F0D}.Debug|ARM.Build.0 = Debug|Any CPU
+		{6281FAAD-ACE3-448C-9E57-0B0A86964F0D}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{6281FAAD-ACE3-448C-9E57-0B0A86964F0D}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{6281FAAD-ACE3-448C-9E57-0B0A86964F0D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6281FAAD-ACE3-448C-9E57-0B0A86964F0D}.Debug|x64.Build.0 = Debug|Any CPU
+		{6281FAAD-ACE3-448C-9E57-0B0A86964F0D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6281FAAD-ACE3-448C-9E57-0B0A86964F0D}.Debug|x86.Build.0 = Debug|Any CPU
 		{6281FAAD-ACE3-448C-9E57-0B0A86964F0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6281FAAD-ACE3-448C-9E57-0B0A86964F0D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6281FAAD-ACE3-448C-9E57-0B0A86964F0D}.Release|ARM.ActiveCfg = Release|Any CPU
+		{6281FAAD-ACE3-448C-9E57-0B0A86964F0D}.Release|ARM.Build.0 = Release|Any CPU
+		{6281FAAD-ACE3-448C-9E57-0B0A86964F0D}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{6281FAAD-ACE3-448C-9E57-0B0A86964F0D}.Release|ARM64.Build.0 = Release|Any CPU
+		{6281FAAD-ACE3-448C-9E57-0B0A86964F0D}.Release|x64.ActiveCfg = Release|Any CPU
+		{6281FAAD-ACE3-448C-9E57-0B0A86964F0D}.Release|x64.Build.0 = Release|Any CPU
+		{6281FAAD-ACE3-448C-9E57-0B0A86964F0D}.Release|x86.ActiveCfg = Release|Any CPU
+		{6281FAAD-ACE3-448C-9E57-0B0A86964F0D}.Release|x86.Build.0 = Release|Any CPU
+		{15E27789-C562-4422-A40A-48BCEFBBEA92}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{15E27789-C562-4422-A40A-48BCEFBBEA92}.Debug|Any CPU.Build.0 = Debug|x64
+		{15E27789-C562-4422-A40A-48BCEFBBEA92}.Debug|Any CPU.Deploy.0 = Debug|x64
+		{15E27789-C562-4422-A40A-48BCEFBBEA92}.Debug|ARM.ActiveCfg = Debug|ARM
+		{15E27789-C562-4422-A40A-48BCEFBBEA92}.Debug|ARM.Build.0 = Debug|ARM
+		{15E27789-C562-4422-A40A-48BCEFBBEA92}.Debug|ARM.Deploy.0 = Debug|ARM
+		{15E27789-C562-4422-A40A-48BCEFBBEA92}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{15E27789-C562-4422-A40A-48BCEFBBEA92}.Debug|ARM64.Build.0 = Debug|ARM64
+		{15E27789-C562-4422-A40A-48BCEFBBEA92}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{15E27789-C562-4422-A40A-48BCEFBBEA92}.Debug|x64.ActiveCfg = Debug|x64
+		{15E27789-C562-4422-A40A-48BCEFBBEA92}.Debug|x64.Build.0 = Debug|x64
+		{15E27789-C562-4422-A40A-48BCEFBBEA92}.Debug|x64.Deploy.0 = Debug|x64
+		{15E27789-C562-4422-A40A-48BCEFBBEA92}.Debug|x86.ActiveCfg = Debug|x86
+		{15E27789-C562-4422-A40A-48BCEFBBEA92}.Debug|x86.Build.0 = Debug|x86
+		{15E27789-C562-4422-A40A-48BCEFBBEA92}.Debug|x86.Deploy.0 = Debug|x86
+		{15E27789-C562-4422-A40A-48BCEFBBEA92}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{15E27789-C562-4422-A40A-48BCEFBBEA92}.Release|Any CPU.Build.0 = Release|Any CPU
+		{15E27789-C562-4422-A40A-48BCEFBBEA92}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{15E27789-C562-4422-A40A-48BCEFBBEA92}.Release|ARM.ActiveCfg = Release|ARM
+		{15E27789-C562-4422-A40A-48BCEFBBEA92}.Release|ARM.Build.0 = Release|ARM
+		{15E27789-C562-4422-A40A-48BCEFBBEA92}.Release|ARM.Deploy.0 = Release|ARM
+		{15E27789-C562-4422-A40A-48BCEFBBEA92}.Release|ARM64.ActiveCfg = Release|ARM64
+		{15E27789-C562-4422-A40A-48BCEFBBEA92}.Release|ARM64.Build.0 = Release|ARM64
+		{15E27789-C562-4422-A40A-48BCEFBBEA92}.Release|ARM64.Deploy.0 = Release|ARM64
+		{15E27789-C562-4422-A40A-48BCEFBBEA92}.Release|x64.ActiveCfg = Release|x64
+		{15E27789-C562-4422-A40A-48BCEFBBEA92}.Release|x64.Build.0 = Release|x64
+		{15E27789-C562-4422-A40A-48BCEFBBEA92}.Release|x64.Deploy.0 = Release|x64
+		{15E27789-C562-4422-A40A-48BCEFBBEA92}.Release|x86.ActiveCfg = Release|x86
+		{15E27789-C562-4422-A40A-48BCEFBBEA92}.Release|x86.Build.0 = Release|x86
+		{15E27789-C562-4422-A40A-48BCEFBBEA92}.Release|x86.Deploy.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Wallet/DateEntryViewModelHandler.cs b/Wallet/DateEntryViewModelHandler.cs
index b32d637..72d9d04 100644
--- a/Wallet/DateEntryViewModelHandler.cs
+++ b/Wallet/DateEntryViewModelHandler.cs
@@ -19,7 +19,8 @@ public class DateEntryViewModelHandler(IServiceFactory serviceFactory) :
 
             double? width = configuration.Width;
 
-            if (serviceFactory.Create<DateEntryViewModel>([.. args.Parameters, configuration, label, value, width])
+            if (serviceFactory.Create<DateEntryViewModel>(args => args.Initialize(), 
+                [.. args.Parameters, configuration, label, value, width])
                 is DateEntryViewModel viewModel)
             {
                 return Task.FromResult<IItemEntryViewModel?>(viewModel);
diff --git a/Wallet/DropdownEntryViewModelHandler.cs b/Wallet/DropdownEntryViewModelHandler.cs
index 45158f4..1a8fe36 100644
--- a/Wallet/DropdownEntryViewModelHandler.cs
+++ b/Wallet/DropdownEntryViewModelHandler.cs
@@ -22,7 +22,8 @@ public class DropdownEntryViewModelHandler(IServiceFactory serviceFactory) :
 
             DropdownValueViewModel? selected = values.FirstOrDefault(x => x.Value is not null && x.Value.Equals($"{value}"));
 
-            if (serviceFactory.Create<DropdownEntryViewModel>([values, .. args.Parameters, configuration, label, value, width, selected])
+            if (serviceFactory.Create<DropdownEntryViewModel>(args => args.Initialize(),
+                [values, .. args.Parameters, configuration, label, value, width, selected])
                 is DropdownEntryViewModel viewModel)
             {
                 return Task.FromResult<IItemEntryViewModel?>(viewModel);
diff --git a/Wallet/HyperlinkEntryViewModelHandler.cs b/Wallet/HyperlinkEntryViewModelHandler.cs
index f5ceb66..e2a0e4a 100644
--- a/Wallet/HyperlinkEntryViewModelHandler.cs
+++ b/Wallet/HyperlinkEntryViewModelHandler.cs
@@ -14,7 +14,8 @@ public class HyperlinkEntryViewModelHandler(IServiceFactory serviceFactory) :
             string? value = $"{configuration.Value}" ?? "";
             double? width = configuration.Width;
 
-            if (serviceFactory.Create<HyperlinkEntryViewModel>([.. args.Parameters, configuration, label, value, width])
+            if (serviceFactory.Create<HyperlinkEntryViewModel>(args => args.Initialize(), 
+                [.. args.Parameters, configuration, label, value, width])
                 is HyperlinkEntryViewModel viewModel)
             {
                 return Task.FromResult<IItemEntryViewModel?>(viewModel);
diff --git a/Wallet/ItemCreatedHandler.cs b/Wallet/ItemCreatedHandler.cs
index 2f15bc7..aaeb8e5 100644
--- a/Wallet/ItemCreatedHandler.cs
+++ b/Wallet/ItemCreatedHandler.cs
@@ -18,7 +18,8 @@ public class ItemCreatedHandler(IServiceProvider serviceProvider,
             IServiceFactory serviceFactory = serviceScope.ServiceProvider.GetRequiredService<IServiceFactory>();
             IDecoratorService<Item<(Guid, string)>> decoratorService = serviceScope.ServiceProvider.GetRequiredService<IDecoratorService<Item<(Guid, string)>>>();
 
-            if (serviceFactory.Create<ItemNavigationViewModel>(id, name, "Description", true)
+            if (serviceFactory.Create<ItemNavigationViewModel>(args => args.Initialize(),
+                id, name, "Description", true)
                 is ItemNavigationViewModel viewModel)
             {
                 cache.Add(item);