diff --git a/FluentTerminal.App.Services/Dialogs/IAboutDialog.cs b/FluentTerminal.App.Services/Dialogs/IAboutDialog.cs
new file mode 100644
index 0000000..fed922c
--- /dev/null
+++ b/FluentTerminal.App.Services/Dialogs/IAboutDialog.cs
@@ -0,0 +1,9 @@
+using System.Threading.Tasks;
+
+namespace FluentTerminal.App.Services.Dialogs
+{
+    public interface IAboutDialog
+    {
+        Task ShowAsync();
+    }
+}
diff --git a/FluentTerminal.App.Services/IDialogService.cs b/FluentTerminal.App.Services/IDialogService.cs
index 8a5c446..8d7aeb6 100644
--- a/FluentTerminal.App.Services/IDialogService.cs
+++ b/FluentTerminal.App.Services/IDialogService.cs
@@ -23,5 +23,7 @@ namespace FluentTerminal.App.Services
         Task<ShellProfile> ShowCustomCommandDialogAsync(ShellProfile input = null);
 
         Task<SshProfile> ShowSshProfileSelectionDialogAsync();
+
+        Task ShowAboutDialogAsync();
     }
 }
\ No newline at end of file
diff --git a/FluentTerminal.App.Services/Implementation/DialogService.cs b/FluentTerminal.App.Services/Implementation/DialogService.cs
index 5184270..a67ad06 100644
--- a/FluentTerminal.App.Services/Implementation/DialogService.cs
+++ b/FluentTerminal.App.Services/Implementation/DialogService.cs
@@ -14,12 +14,14 @@ namespace FluentTerminal.App.Services.Implementation
         private readonly Func<ISshConnectionInfoDialog> _sshConnectionInfoDialogFactory;
         private readonly Func<ICustomCommandDialog> _customCommandDialogFactory;
         private readonly Func<ISshProfileSelectionDialog> _sshProfileSelectionDialogFactory;
+        private readonly Func<IAboutDialog> _aboutDialogFactory;
 
         public DialogService(Func<IShellProfileSelectionDialog> shellProfileSelectionDialogFactory,
             Func<IMessageDialog> messageDialogFactory, Func<ICreateKeyBindingDialog> createKeyBindingDialogFactory,
             Func<IInputDialog> inputDialogFactory, Func<ISshConnectionInfoDialog> sshConnectionInfoDialogFactory,
             Func<ICustomCommandDialog> customCommandDialogFactory,
-            Func<ISshProfileSelectionDialog> sshProfileSelectionDialogFactory)
+            Func<ISshProfileSelectionDialog> sshProfileSelectionDialogFactory,
+            Func<IAboutDialog> aboutDialogFactory)
         {
             _shellProfileSelectionDialogFactory = shellProfileSelectionDialogFactory;
             _messageDialogFactory = messageDialogFactory;
@@ -28,6 +30,7 @@ namespace FluentTerminal.App.Services.Implementation
             _sshConnectionInfoDialogFactory = sshConnectionInfoDialogFactory;
             _customCommandDialogFactory = customCommandDialogFactory;
             _sshProfileSelectionDialogFactory = sshProfileSelectionDialogFactory;
+            _aboutDialogFactory = aboutDialogFactory;
         }
 
         public Task<KeyBinding> ShowCreateKeyBindingDialog()
@@ -93,5 +96,12 @@ namespace FluentTerminal.App.Services.Implementation
 
             return dialog.SelectProfile();
         }
+
+        public Task ShowAboutDialogAsync()
+        {
+            var dialog = _aboutDialogFactory();
+
+            return dialog.ShowAsync();
+        }
     }
 }
\ No newline at end of file
diff --git a/FluentTerminal.App.ViewModels/MainViewModel.cs b/FluentTerminal.App.ViewModels/MainViewModel.cs
index e7aeb0b..73226e3 100644
--- a/FluentTerminal.App.ViewModels/MainViewModel.cs
+++ b/FluentTerminal.App.ViewModels/MainViewModel.cs
@@ -1,6 +1,7 @@
 using FluentTerminal.App.Services;
 using FluentTerminal.App.Services.EventArgs;
 using FluentTerminal.App.Services.Utilities;
+using FluentTerminal.App.ViewModels.Infrastructure;
 using FluentTerminal.Models;
 using FluentTerminal.Models.Enums;
 using GalaSoft.MvvmLight;
@@ -97,7 +98,7 @@ namespace FluentTerminal.App.ViewModels
             AddLocalShellCommand = new RelayCommand(async () => await AddLocalTabAsync());
             AddSshShellCommand = new RelayCommand(async () => await AddSshTabAsync());
             AddQuickShellCommand = new RelayCommand(async () => await AddCustomCommandTabAsync());
-            ShowAboutCommand = new RelayCommand(ShowAbout);
+            ShowAboutCommand = new AsyncCommand(ShowAbout);
             ShowSettingsCommand = new RelayCommand(ShowSettings);
 
             ApplicationView.CloseRequested += OnCloseRequest;
@@ -163,8 +164,6 @@ namespace FluentTerminal.App.ViewModels
 
         public event EventHandler ShowSettingsRequested;
 
-        public event EventHandler ShowAboutRequested;
-
         public event EventHandler ActivatedMv;
 
         public event EventHandler<TerminalViewModel> TabTearedOff;
@@ -245,7 +244,7 @@ namespace FluentTerminal.App.ViewModels
             }
         }
 
-        public RelayCommand ShowAboutCommand { get; private set; }
+        public IAsyncCommand ShowAboutCommand { get; private set; }
 
         public RelayCommand ShowSettingsCommand { get; private set; }
 
@@ -611,9 +610,9 @@ namespace FluentTerminal.App.ViewModels
             SelectedTerminal = Terminals[previousIndex];
         }
 
-        private void ShowAbout()
+        private Task ShowAbout()
         {
-            ShowAboutRequested?.Invoke(this, EventArgs.Empty);
+            return _dialogService.ShowAboutDialogAsync();
         }
 
         private void ShowSettings()
diff --git a/FluentTerminal.App.ViewModels/SettingsViewModel.cs b/FluentTerminal.App.ViewModels/SettingsViewModel.cs
index aa6950a..89ef5d2 100644
--- a/FluentTerminal.App.ViewModels/SettingsViewModel.cs
+++ b/FluentTerminal.App.ViewModels/SettingsViewModel.cs
@@ -9,10 +9,9 @@ namespace FluentTerminal.App.ViewModels
     {
         public SettingsViewModel(ISettingsService settingsService, IDefaultValueProvider defaultValueProvider, IDialogService dialogService,
             ITrayProcessCommunicationService trayProcessCommunicationService, IThemeParserFactory themeParserFactory, ISystemFontService systemFontService,
-            IFileSystemService fileSystemService, IStartupTaskService startupTaskService, IUpdateService updateService, IApplicationView applicationView, 
+            IFileSystemService fileSystemService, IStartupTaskService startupTaskService, IApplicationView applicationView,
             IApplicationLanguageService applicationLanguageService, ApplicationDataContainers containers)
         {
-            About = new AboutPageViewModel(updateService, applicationView);
             KeyBindings = new KeyBindingsPageViewModel(settingsService, dialogService, trayProcessCommunicationService);
             General = new GeneralPageViewModel(settingsService, dialogService, defaultValueProvider, startupTaskService, applicationLanguageService, trayProcessCommunicationService, fileSystemService);
             Profiles = new ProfilesPageViewModel(settingsService, dialogService, defaultValueProvider, fileSystemService, applicationView);
@@ -24,7 +23,6 @@ namespace FluentTerminal.App.ViewModels
         }
 
         public event EventHandler Closed;
-        public event EventHandler AboutPageRequested;
 
         public GeneralPageViewModel General { get; }
         public KeyBindingsPageViewModel KeyBindings { get; }
@@ -32,14 +30,8 @@ namespace FluentTerminal.App.ViewModels
         public TerminalPageViewModel Terminal { get; }
         public ThemesPageViewModel Themes { get; }
         public MousePageViewModel Mouse { get; }
-        public AboutPageViewModel About { get; }
         public SshProfilesPageViewModel SshProfiles { get; }
 
-        public void NavigateToAboutPage()
-        {
-            AboutPageRequested?.Invoke(this, EventArgs.Empty);
-        }
-
         public void Close()
         {
             Closed?.Invoke(this, EventArgs.Empty);
diff --git a/FluentTerminal.App/App.xaml.cs b/FluentTerminal.App/App.xaml.cs
index 7b70000..046d1f6 100755
--- a/FluentTerminal.App/App.xaml.cs
+++ b/FluentTerminal.App/App.xaml.cs
@@ -96,6 +96,7 @@ namespace FluentTerminal.App
             builder.RegisterType<SshProfileSelectionDialog>().As<ISshProfileSelectionDialog>().InstancePerDependency();
             builder.RegisterType<CreateKeyBindingDialog>().As<ICreateKeyBindingDialog>().InstancePerDependency();
             builder.RegisterType<InputDialog>().As<IInputDialog>().InstancePerDependency();
+            builder.RegisterType<AboutDialog>().As<IAboutDialog>().InstancePerDependency();
             builder.RegisterType<MessageDialogAdapter>().As<IMessageDialog>().InstancePerDependency();
             builder.RegisterType<SshInfoDialog>().As<ISshConnectionInfoDialog>().InstancePerDependency();
             builder.RegisterType<CustomCommandDialog>().As<ICustomCommandDialog>().InstancePerDependency();
@@ -529,7 +530,6 @@ namespace FluentTerminal.App
                     mainViewModel.Closed += OnMainViewModelClosed;
                     mainViewModel.NewWindowRequested += OnNewWindowRequested;
                     mainViewModel.ShowSettingsRequested += OnShowSettingsRequested;
-                    mainViewModel.ShowAboutRequested += OnShowAboutRequested;
                     mainViewModel.ActivatedMv += OnMainViewActivated;
                     mainViewModel.TabTearedOff += OnTabTearOff;
                     _mainViewModels.Add(mainViewModel);
@@ -547,7 +547,6 @@ namespace FluentTerminal.App
             viewModel.Closed += OnMainViewModelClosed;
             viewModel.NewWindowRequested += OnNewWindowRequested;
             viewModel.ShowSettingsRequested += OnShowSettingsRequested;
-            viewModel.ShowAboutRequested += OnShowAboutRequested;
             viewModel.ActivatedMv += OnMainViewActivated;
             viewModel.TabTearedOff += OnTabTearOff;
             _mainViewModels.Add(viewModel);
@@ -599,7 +598,6 @@ namespace FluentTerminal.App
                 viewModel.Closed -= OnMainViewModelClosed;
                 viewModel.NewWindowRequested -= OnNewWindowRequested;
                 viewModel.ShowSettingsRequested -= OnShowSettingsRequested;
-                viewModel.ShowAboutRequested -= OnShowAboutRequested;
                 viewModel.ActivatedMv -= OnMainViewActivated;
                 viewModel.TabTearedOff -= OnTabTearOff;
                 if (_activeWindowId == viewModel.ApplicationView.Id)
@@ -699,22 +697,11 @@ namespace FluentTerminal.App
             _settingsWindowId = null;
         }
 
-        private void OnShowAboutRequested(object sender, EventArgs e)
-        {
-            ShowAbout().ConfigureAwait(true);
-        }
-
         private async void OnShowSettingsRequested(object sender, EventArgs e)
         {
             await ShowSettings().ConfigureAwait(true);
         }
 
-        private async Task ShowAbout()
-        {
-            await ShowSettings().ConfigureAwait(true);
-            _settingsViewModel.NavigateToAboutPage();
-        }
-
         private async Task CreateTerminal(ShellProfile profile, NewTerminalLocation location, ActivationViewSwitcher viewSwitcher = null)
         {
             async Task ShowAsStandaloneAsync(MainViewModel viewModel)
diff --git a/FluentTerminal.App/Dialogs/AboutDialog.xaml b/FluentTerminal.App/Dialogs/AboutDialog.xaml
new file mode 100644
index 0000000..cb4edcb
--- /dev/null
+++ b/FluentTerminal.App/Dialogs/AboutDialog.xaml
@@ -0,0 +1,57 @@
+<ContentDialog
+    x:Class="FluentTerminal.App.Dialogs.AboutDialog"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    x:Uid="AboutDialog"
+    Title="About"
+    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
+    CloseButtonClick="ContentDialog_CloseButtonClick"
+    CloseButtonText="Close"
+    DefaultButton="Close"
+    mc:Ignorable="d">
+
+    <StackPanel>
+        <Grid Margin="0,6,0,8">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="8" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+            <Viewbox
+                Grid.Column="0"
+                Width="50"
+                Height="50"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Top">
+                <Image Source="/Images/AppIcons/StoreLogo.scale-400.png" Stretch="None" />
+            </Viewbox>
+            <StackPanel Grid.Column="2">
+                <TextBlock Style="{StaticResource TitleTextBlockStyle}" Text="Fluent Terminal" />
+                <TextBlock>
+                    <Run x:Name="CurrentVersion" />
+                    <Run>-</Run>
+                    <Hyperlink x:Name="ReleaseNotesHyperlink">
+                        <Run x:Uid="ReleaseNotes" Text="Release notes" />
+                    </Hyperlink>
+                </TextBlock>
+            </StackPanel>
+        </Grid>
+
+        <TextBlock>
+            <Hyperlink NavigateUri="https://github.com/felixse/FluentTerminal">
+                <Run Text="GitHub" />
+            </Hyperlink>
+        </TextBlock>
+
+        <TextBlock>
+            <Hyperlink NavigateUri="https://github.com/felixse/FluentTerminal/blob/master/LICENSE">
+                <Run x:Uid="License" />
+            </Hyperlink>
+        </TextBlock>
+
+        <TextBlock x:Name="CreatedBy" Margin="0,24,0,0" />
+
+    </StackPanel>
+</ContentDialog>
diff --git a/FluentTerminal.App/Dialogs/AboutDialog.xaml.cs b/FluentTerminal.App/Dialogs/AboutDialog.xaml.cs
new file mode 100644
index 0000000..fa614bc
--- /dev/null
+++ b/FluentTerminal.App/Dialogs/AboutDialog.xaml.cs
@@ -0,0 +1,38 @@
+using FluentTerminal.App.Services;
+using FluentTerminal.App.Services.Dialogs;
+using FluentTerminal.App.Utilities;
+using System;
+using System.Threading.Tasks;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Documents;
+
+namespace FluentTerminal.App.Dialogs
+{
+    public sealed partial class AboutDialog : ContentDialog, IAboutDialog
+    {
+        public AboutDialog(ISettingsService settingsService, IUpdateService updateService)
+        {
+            this.InitializeComponent();
+            var currentTheme = settingsService.GetCurrentTheme();
+            RequestedTheme = ContrastHelper.GetIdealThemeForBackgroundColor(currentTheme.Colors.Background);
+
+            CreatedBy.Inlines.Add(new Run { Text = "Created by " });
+            CreatedBy.Inlines.Add(new Italic { Inlines = { new Run { Text = "felixse " } } });
+            CreatedBy.Inlines.Add(new Run { Text = "and " });
+            CreatedBy.Inlines.Add(new Hyperlink { Inlines = { new Run { Text = "contributors" } }, NavigateUri = new Uri("https://github.com/felixse/FluentTerminal/graphs/contributors") });
+
+            CurrentVersion.Text = updateService.GetCurrentVersion().ToString();
+            ReleaseNotesHyperlink.NavigateUri = new Uri("https://github.com/felixse/FluentTerminal/releases/tag/" + CurrentVersion.Text);
+        }
+
+        public new Task ShowAsync()
+        {
+            return base.ShowAsync().AsTask();
+        }
+
+        private void ContentDialog_CloseButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
+        {
+            Hide();
+        }
+    }
+}
diff --git a/FluentTerminal.App/Dialogs/InputDialog.xaml.cs b/FluentTerminal.App/Dialogs/InputDialog.xaml.cs
index 52187ee..9910791 100644
--- a/FluentTerminal.App/Dialogs/InputDialog.xaml.cs
+++ b/FluentTerminal.App/Dialogs/InputDialog.xaml.cs
@@ -5,6 +5,8 @@ using System;
 using Windows.UI.Xaml.Input;
 using Windows.System;
 using FluentTerminal.App.Services.Utilities;
+using FluentTerminal.App.Services;
+using FluentTerminal.App.Utilities;
 
 namespace FluentTerminal.App.Dialogs
 {
@@ -14,11 +16,13 @@ namespace FluentTerminal.App.Dialogs
         private bool EnterPressed = false;
         public string Input { get; private set; }
 
-        public InputDialog()
+        public InputDialog(ISettingsService settingsService)
         {
             this.InitializeComponent();
             this.PrimaryButtonText = I18N.Translate("OK");
             this.CloseButtonText = I18N.Translate("Cancel");
+            var currentTheme = settingsService.GetCurrentTheme();
+            RequestedTheme = ContrastHelper.GetIdealThemeForBackgroundColor(currentTheme.Colors.Background);
         }
 
         public async Task<string> GetInput()
diff --git a/FluentTerminal.App/FluentTerminal.App.csproj b/FluentTerminal.App/FluentTerminal.App.csproj
index 6896024..6e7b013 100644
--- a/FluentTerminal.App/FluentTerminal.App.csproj
+++ b/FluentTerminal.App/FluentTerminal.App.csproj
@@ -134,6 +134,9 @@
     <Compile Include="Converters\TrueToBoldConverter.cs" />
     <Compile Include="Converters\TrueToVisibleConverter.cs" />
     <Compile Include="Adapters\MessageDialogAdapter.cs" />
+    <Compile Include="Dialogs\AboutDialog.xaml.cs">
+      <DependentUpon>AboutDialog.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Utilities\InteractiveSurface.cs" />
     <Compile Include="ViewModels\CommandItemViewModel.cs" />
     <Compile Include="Dialogs\CustomCommandDialog.xaml.cs">
@@ -182,9 +185,6 @@
     <Compile Include="Views\SettingsPage.xaml.cs">
       <DependentUpon>SettingsPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\SettingsPages\About.xaml.cs">
-      <DependentUpon>About.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Views\SettingsPages\MouseSettings.xaml.cs">
       <DependentUpon>MouseSettings.xaml</DependentUpon>
     </Compile>
@@ -259,6 +259,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Page Include="Dialogs\AboutDialog.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Dialogs\CustomCommandDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -308,10 +312,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\SettingsPages\About.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Views\SettingsPages\MouseSettings.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -416,6 +416,47 @@
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Store|x86'">
+    <OutputPath>bin\x86\Store\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <LangVersion>7.1</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Store|ARM'">
+    <OutputPath>bin\ARM\Store\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>ARM</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Store|x64'">
+    <OutputPath>bin\x64\Store\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <LangVersion>7.1</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>
diff --git a/FluentTerminal.App/Strings/de/Resources.resw b/FluentTerminal.App/Strings/de/Resources.resw
index 8e36ed3..faec8e8 100644
--- a/FluentTerminal.App/Strings/de/Resources.resw
+++ b/FluentTerminal.App/Strings/de/Resources.resw
@@ -117,9 +117,10 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="About.Text" xml:space="preserve">
+  <data name="AboutDialog.Title" xml:space="preserve">
     <value>Über</value>
-    <comment>MainPage.xaml</comment>
+    <comment>MainPage.xaml
+Fuzzy</comment>
   </data>
   <data name="Background.Content" xml:space="preserve">
     <value>Hintergrund</value>
@@ -129,9 +130,10 @@
     <value>Blau</value>
     <comment>TabBar.xaml</comment>
   </data>
-  <data name="Close.Text" xml:space="preserve">
+  <data name="AboutDialog.CloseButtonText" xml:space="preserve">
     <value>Schließen</value>
-    <comment>TabBar.xaml</comment>
+    <comment>TabBar.xaml
+Fuzzy</comment>
   </data>
   <data name="ConfirmWindowClosing.Header" xml:space="preserve">
     <value>Nachfragen bevor Fenster geschlossen wird</value>
diff --git a/FluentTerminal.App/Strings/en/Resources.resw b/FluentTerminal.App/Strings/en/Resources.resw
index 871af85..6f7db5e 100644
--- a/FluentTerminal.App/Strings/en/Resources.resw
+++ b/FluentTerminal.App/Strings/en/Resources.resw
@@ -117,9 +117,10 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="About.Text" xml:space="preserve">
+  <data name="AboutDialog.Title" xml:space="preserve">
     <value>About</value>
-    <comment>MainPage.xaml</comment>
+    <comment>MainPage.xaml
+Fuzzy</comment>
   </data>
   <data name="Background.Content" xml:space="preserve">
     <value>Background</value>
@@ -130,9 +131,10 @@
     <comment>TabBar.xaml
 Fuzzy</comment>
   </data>
-  <data name="Close.Text" xml:space="preserve">
+  <data name="AboutDialog.CloseButtonText" xml:space="preserve">
     <value>Close</value>
-    <comment>TabBar.xaml</comment>
+    <comment>TabBar.xaml
+Fuzzy</comment>
   </data>
   <data name="ConfirmWindowClosing.Header" xml:space="preserve">
     <value>Ask before closing windows</value>
diff --git a/FluentTerminal.App/Strings/es/Resources.resw b/FluentTerminal.App/Strings/es/Resources.resw
index 9adde66..3564709 100644
--- a/FluentTerminal.App/Strings/es/Resources.resw
+++ b/FluentTerminal.App/Strings/es/Resources.resw
@@ -117,9 +117,10 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="About.Text" xml:space="preserve">
+  <data name="AboutDialog.Title" xml:space="preserve">
     <value>Acerca de...</value>
-    <comment>MainPage.xaml</comment>
+    <comment>MainPage.xaml
+Fuzzy</comment>
   </data>
   <data name="Background.Content" xml:space="preserve">
     <value>Fondo</value>
@@ -129,9 +130,10 @@
     <value>Azul</value>
     <comment>TabBar.xaml</comment>
   </data>
-  <data name="Close.Text" xml:space="preserve">
+  <data name="AboutDialog.CloseButtonText" xml:space="preserve">
     <value>Cerrar</value>
-    <comment>TabBar.xaml</comment>
+    <comment>TabBar.xaml
+Fuzzy</comment>
   </data>
   <data name="ConfirmWindowClosing.Header" xml:space="preserve">
     <value>Preguntar antes de cerrar las ventanas</value>
diff --git a/FluentTerminal.App/Strings/fr/Resources.resw b/FluentTerminal.App/Strings/fr/Resources.resw
index 6be03aa..a3ba98b 100644
--- a/FluentTerminal.App/Strings/fr/Resources.resw
+++ b/FluentTerminal.App/Strings/fr/Resources.resw
@@ -117,9 +117,10 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="About.Text" xml:space="preserve">
+  <data name="AboutDialog.Title" xml:space="preserve">
     <value>A propos</value>
-    <comment>MainPage.xaml</comment>
+    <comment>MainPage.xaml
+Fuzzy</comment>
   </data>
   <data name="Background.Content" xml:space="preserve">
     <value>Fond</value>
@@ -130,9 +131,10 @@
     <comment>TabBar.xaml
 Fuzzy</comment>
   </data>
-  <data name="Close.Text" xml:space="preserve">
+  <data name="AboutDialog.CloseButtonText" xml:space="preserve">
     <value>Fermer</value>
-    <comment>TabBar.xaml</comment>
+    <comment>TabBar.xaml
+Fuzzy</comment>
   </data>
   <data name="ConfirmWindowClosing.Header" xml:space="preserve">
     <value>Demander avant de fermer la fenêtre</value>
diff --git a/FluentTerminal.App/Strings/ru/Resources.resw b/FluentTerminal.App/Strings/ru/Resources.resw
index 342cdd4..222b4e2 100644
--- a/FluentTerminal.App/Strings/ru/Resources.resw
+++ b/FluentTerminal.App/Strings/ru/Resources.resw
@@ -117,9 +117,10 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="About.Text" xml:space="preserve">
+  <data name="AboutDialog.Title" xml:space="preserve">
     <value>О программе</value>
-    <comment>MainPage.xaml</comment>
+    <comment>MainPage.xaml
+Fuzzy</comment>
   </data>
   <data name="Background.Content" xml:space="preserve">
     <value>Фон</value>
@@ -129,9 +130,10 @@
     <value>Синий</value>
     <comment>TabBar.xaml</comment>
   </data>
-  <data name="Close.Text" xml:space="preserve">
+  <data name="AboutDialog.CloseButtonText" xml:space="preserve">
     <value>Закрыть</value>
-    <comment>TabBar.xaml</comment>
+    <comment>TabBar.xaml
+Fuzzy</comment>
   </data>
   <data name="ConfirmWindowClosing.Header" xml:space="preserve">
     <value>Подтверждать закрытие окон</value>
diff --git a/FluentTerminal.App/Strings/zh-CN/Resources.resw b/FluentTerminal.App/Strings/zh-CN/Resources.resw
index 2a78472..c324e74 100644
--- a/FluentTerminal.App/Strings/zh-CN/Resources.resw
+++ b/FluentTerminal.App/Strings/zh-CN/Resources.resw
@@ -117,9 +117,10 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="About.Text" xml:space="preserve">
+  <data name="AboutDialog.Title" xml:space="preserve">
     <value>关于</value>
-    <comment>MainPage.xaml</comment>
+    <comment>MainPage.xaml
+Fuzzy</comment>
   </data>
   <data name="Background.Content" xml:space="preserve">
     <value>背景色</value>
@@ -129,9 +130,10 @@
     <value>蓝色</value>
     <comment>TabBar.xaml</comment>
   </data>
-  <data name="Close.Text" xml:space="preserve">
+  <data name="AboutDialog.CloseButtonText" xml:space="preserve">
     <value>关闭</value>
-    <comment>TabBar.xaml</comment>
+    <comment>TabBar.xaml
+Fuzzy</comment>
   </data>
   <data name="ConfirmWindowClosing.Header" xml:space="preserve">
     <value>在关闭窗口之前询问</value>
diff --git a/FluentTerminal.App/Views/MainPage.xaml b/FluentTerminal.App/Views/MainPage.xaml
index f2ceb2c..c2e8c3c 100644
--- a/FluentTerminal.App/Views/MainPage.xaml
+++ b/FluentTerminal.App/Views/MainPage.xaml
@@ -54,16 +54,12 @@
                                 <SymbolIcon Symbol="Add" />
                             </MenuFlyoutItem.Icon>
                         </MenuFlyoutItem>
-                        <MenuFlyoutItem
-                            Command="{x:Bind ViewModel.AddSshShellCommand}"
-                            x:Uid="NewSshTab">
+                        <MenuFlyoutItem x:Uid="NewSshTab" Command="{x:Bind ViewModel.AddSshShellCommand}">
                             <MenuFlyoutItem.Icon>
                                 <SymbolIcon Symbol="Add" />
                             </MenuFlyoutItem.Icon>
                         </MenuFlyoutItem>
-                        <MenuFlyoutItem
-                            Command="{x:Bind ViewModel.AddQuickShellCommand}"
-                            x:Uid="NewQuickTab">
+                        <MenuFlyoutItem x:Uid="NewQuickTab" Command="{x:Bind ViewModel.AddQuickShellCommand}">
                             <MenuFlyoutItem.Icon>
                                 <SymbolIcon Symbol="Add" />
                             </MenuFlyoutItem.Icon>
@@ -73,9 +69,7 @@
                                 <SymbolIcon Symbol="Setting" />
                             </MenuFlyoutItem.Icon>
                         </MenuFlyoutItem>
-                        <MenuFlyoutItem
-                            Command="{x:Bind ViewModel.ShowAboutCommand}"
-                            x:Uid="About">
+                        <MenuFlyoutItem Command="{x:Bind ViewModel.ShowAboutCommand}" Text="{x:Bind Converter={StaticResource I18NConverter}, ConverterParameter=AboutDialog.Title}">
                             <MenuFlyoutItem.Icon>
                                 <FontIcon
                                     FontFamily="Segoe MDL2 Assets"
@@ -188,11 +182,16 @@
                     TextWrapping="NoWrap"
                     Visibility="{x:Bind ViewModel.ShowTabsOnTop, Mode=OneWay, Converter={StaticResource FalseToVisibleConverter}}" />
             </RelativePanel>
-            <Rectangle x:Name="TabDropArea" Fill="LightGray" Opacity="0.2" Grid.Column="1" HorizontalAlignment="Stretch"
-                       AllowDrop="True"
-                       DragEnter="TabDropArea_DragEnter"
-                       Drop="TabDropArea_Drop"
-                       Visibility="{x:Bind DraggingHappensFromAnotherWindow, Mode=TwoWay, Converter={StaticResource TrueToVisibleConverter}}"/>
+            <Rectangle
+                x:Name="TabDropArea"
+                Grid.Column="1"
+                HorizontalAlignment="Stretch"
+                AllowDrop="True"
+                DragEnter="TabDropArea_DragEnter"
+                Drop="TabDropArea_Drop"
+                Fill="LightGray"
+                Opacity="0.2"
+                Visibility="{x:Bind DraggingHappensFromAnotherWindow, Mode=TwoWay, Converter={StaticResource TrueToVisibleConverter}}" />
             <views:TabBar
                 x:Name="TopTabBar"
                 Grid.Column="1"
@@ -200,11 +199,11 @@
                 AddCommand="{x:Bind ViewModel.AddLocalShellCommand}"
                 ItemsSource="{x:Bind ViewModel.Terminals, Mode=OneWay}"
                 SelectedItem="{x:Bind ViewModel.SelectedTerminal, Mode=TwoWay}"
-                Visibility="{x:Bind ViewModel.ShowTabsOnTop, Mode=OneWay}"
                 TabDraggedOutside="TabBar_TabDraggedOutside"
-                TabWindowChanged="TabView_Drop"
+                TabDraggingChanged="TabBar_TabDraggingChanged"
                 TabDraggingCompleted="TabBar_TabDraggingCompleted"
-                TabDraggingChanged="TabBar_TabDraggingChanged" />
+                TabWindowChanged="TabView_Drop"
+                Visibility="{x:Bind ViewModel.ShowTabsOnTop, Mode=OneWay}" />
         </Grid>
         <ContentControl
             x:Name="TerminalContainer"
@@ -212,13 +211,20 @@
             HorizontalContentAlignment="Stretch"
             VerticalContentAlignment="Stretch"
             Content="{x:Bind ViewModel.SelectedTerminal, Mode=OneWay, Converter={StaticResource TerminalViewModelToViewConverter}}" />
-        <Rectangle Fill="LightGray" Opacity="0.01" Grid.Row="1"
-                       Visibility="{x:Bind DraggingHappens, Mode=TwoWay, Converter={StaticResource TrueToVisibleConverter}}"/>
-        <Rectangle Fill="LightGray" Opacity="0.2" Grid.Row="2" HorizontalAlignment="Stretch"
-                       AllowDrop="True"
-                       DragEnter="TabDropArea_DragEnter"
-                       Drop="TabDropArea_Drop"
-                       Visibility="{x:Bind DraggingHappensFromAnotherWindow, Mode=TwoWay, Converter={StaticResource TrueToVisibleConverter}}"/>
+        <Rectangle
+            Grid.Row="1"
+            Fill="LightGray"
+            Opacity="0.01"
+            Visibility="{x:Bind DraggingHappens, Mode=TwoWay, Converter={StaticResource TrueToVisibleConverter}}" />
+        <Rectangle
+            Grid.Row="2"
+            HorizontalAlignment="Stretch"
+            AllowDrop="True"
+            DragEnter="TabDropArea_DragEnter"
+            Drop="TabDropArea_Drop"
+            Fill="LightGray"
+            Opacity="0.2"
+            Visibility="{x:Bind DraggingHappensFromAnotherWindow, Mode=TwoWay, Converter={StaticResource TrueToVisibleConverter}}" />
         <views:TabBar
             x:Name="BottomTabBar"
             Grid.Row="2"
@@ -226,10 +232,10 @@
             AddCommand="{x:Bind ViewModel.AddLocalShellCommand}"
             ItemsSource="{x:Bind ViewModel.Terminals, Mode=OneWay}"
             SelectedItem="{x:Bind ViewModel.SelectedTerminal, Mode=TwoWay}"
-            Visibility="{x:Bind ViewModel.ShowTabsOnBottom, Mode=OneWay}"
             TabDraggedOutside="TabBar_TabDraggedOutside"
-            TabWindowChanged="TabView_Drop"
+            TabDraggingChanged="TabBar_TabDraggingChanged"
             TabDraggingCompleted="TabBar_TabDraggingCompleted"
-            TabDraggingChanged="TabBar_TabDraggingChanged" />
+            TabWindowChanged="TabView_Drop"
+            Visibility="{x:Bind ViewModel.ShowTabsOnBottom, Mode=OneWay}" />
     </Grid>
 </Page>
\ No newline at end of file
diff --git a/FluentTerminal.App/Views/SettingsPage.xaml b/FluentTerminal.App/Views/SettingsPage.xaml
index b762fb5..824627f 100644
--- a/FluentTerminal.App/Views/SettingsPage.xaml
+++ b/FluentTerminal.App/Views/SettingsPage.xaml
@@ -109,19 +109,6 @@
                     x:Uid="Setting_Hidden"
                     Visibility="Collapsed" />
             </controls:NavigationView.MenuItems>
-            <controls:NavigationView.PaneFooter>
-                <controls:NavigationViewItem
-                    x:Uid="Setting_About"
-                    Content="About"
-                    Tapped="AboutTapped">
-                    <controls:NavigationViewItem.Icon>
-                        <FontIcon
-                            FontFamily="Segoe MDL2 Assets"
-                            Glyph="&#xE946;"
-                            ToolTipService.ToolTip="About" />
-                    </controls:NavigationViewItem.Icon>
-                </controls:NavigationViewItem>
-            </controls:NavigationView.PaneFooter>
             <Grid Margin="0,-32,0,0" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
                 <Frame x:Name="ContentFrame" />
                 <TextBlock
diff --git a/FluentTerminal.App/Views/SettingsPage.xaml.cs b/FluentTerminal.App/Views/SettingsPage.xaml.cs
index 70b8b1a..e946373 100644
--- a/FluentTerminal.App/Views/SettingsPage.xaml.cs
+++ b/FluentTerminal.App/Views/SettingsPage.xaml.cs
@@ -2,7 +2,6 @@
 using FluentTerminal.App.Utilities;
 using FluentTerminal.App.ViewModels;
 using FluentTerminal.App.Views.SettingsPages;
-using System;
 using System.Linq;
 using Windows.ApplicationModel.Core;
 using Windows.Foundation;
@@ -11,7 +10,6 @@ using Windows.UI.Core.Preview;
 using Windows.UI.ViewManagement;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Input;
 using Windows.UI.Xaml.Navigation;
 using MUXC = Microsoft.UI.Xaml.Controls;
 
@@ -73,20 +71,9 @@ namespace FluentTerminal.App.Views
             if (e.Parameter is SettingsViewModel viewModel)
             {
                 ViewModel = viewModel;
-                ViewModel.AboutPageRequested += OnAboutPageRequested;
             }
         }
 
-        private void OnAboutPageRequested(object sender, System.EventArgs e)
-        {
-            _dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
-            {
-                // Deselect item in NavigationView (https://stackoverflow.com/a/49082640/4132379)
-                NavigationView.SelectedItem = Setting_Hidden;
-                ContentFrame.Navigate(typeof(About), ViewModel.About);
-            });
-        }
-
         private void NavigationView_Loaded(object sender, RoutedEventArgs e)
         {
             NavigationView.SelectedItem = NavigationView.MenuItems.Cast<MUXC.NavigationViewItemBase>().FirstOrDefault(m => m.Tag.ToString() == "general");
@@ -137,11 +124,6 @@ namespace FluentTerminal.App.Views
             }
         }
 
-        private void AboutTapped(object sender, TappedRoutedEventArgs e)
-        {
-            OnAboutPageRequested(sender, EventArgs.Empty);
-        }
-
         private void SettingsPage_CloseRequested(object sender, SystemNavigationCloseRequestedPreviewEventArgs e)
         {
             ViewModel.Close();
diff --git a/FluentTerminal.App/Views/SettingsPages/About.xaml b/FluentTerminal.App/Views/SettingsPages/About.xaml
deleted file mode 100644
index 8e3b1de..0000000
--- a/FluentTerminal.App/Views/SettingsPages/About.xaml
+++ /dev/null
@@ -1,106 +0,0 @@
-<Page
-    x:Class="FluentTerminal.App.Views.SettingsPages.About"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
-    mc:Ignorable="d">
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="32" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-        <Grid Grid.Row="1" Margin="{StaticResource HeaderMargin}">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition />
-                <ColumnDefinition />
-            </Grid.ColumnDefinitions>
-            <TextBlock
-                x:Uid="About"
-                Margin="0,10,0,0"
-                VerticalAlignment="Center"
-                FontSize="28"
-                Style="{StaticResource TitleTextBlockStyle}"
-                Text="About" />
-            <CommandBar
-                Grid.Column="1"
-                HorizontalAlignment="Right"
-                VerticalAlignment="Top"
-                Background="{ThemeResource SystemControlBackgroundAltHighBrush}"
-                DefaultLabelPosition="Right">
-                <AppBarButton
-                    x:Uid="CheckUpdates"
-                    Command="{x:Bind ViewModel.CheckForUpdatesCommand}"
-                    Icon="Sync"
-                    Label="Check for updates" />
-            </CommandBar>
-        </Grid>
-        <ScrollViewer Grid.Row="2">
-            <Grid Margin="{StaticResource ContainerMargin}">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="*" />
-                    <RowDefinition Height="*" />
-                </Grid.RowDefinitions>
-                <StackPanel Grid.Row="0">
-                    <Viewbox
-                        Width="100"
-                        Height="100"
-                        Margin="{StaticResource ItemMargin}"
-                        HorizontalAlignment="Left">
-                        <Image Source="/Images/AppIcons/StoreLogo.scale-400_altform-lightunplated.png" Stretch="None" />
-                    </Viewbox>
-                    <StackPanel Margin="{StaticResource ItemMargin}">
-                        <TextBlock
-                            x:Uid="CurrentVersion"
-                            Margin="0,0,0,8"
-                            Text="Current version" />
-                        <TextBlock>
-                            <Run Text="{x:Bind ViewModel.CurrentVersion}" />
-                            -<Hyperlink NavigateUri="{x:Bind ViewModel.CurrentVersionReleaseNotesURL}">
-                                <Run x:Uid="ReleaseNotes" Text="Release notes" />
-                            </Hyperlink>
-                        </TextBlock>
-                    </StackPanel>
-
-                    <StackPanel Margin="{StaticResource ItemMargin}">
-                        <TextBlock
-                            x:Uid="LatestVersion"
-                            Margin="0,0,0,8"
-                            Text="Latest version" />
-                        <StackPanel Orientation="Horizontal" Visibility="{x:Bind ViewModel.LatestVersionLoading, Mode=OneWay, Converter={StaticResource TrueToVisibleConverter}}">
-                            <ProgressRing Margin="0,0,8,0" IsActive="True" />
-                            <TextBlock><Italic>
-                                    <Run x:Uid="CheckingUpdates" Text="Checking for updates..." />
-                                </Italic></TextBlock>
-                        </StackPanel>
-                        <TextBlock Visibility="{x:Bind ViewModel.LatestVersionNotFound, Mode=OneWay, Converter={StaticResource TrueToVisibleConverter}}">
-                            <Italic>Not found</Italic>
-                        </TextBlock>
-                        <TextBlock Visibility="{x:Bind ViewModel.LatestVersionFound, Mode=OneWay, Converter={StaticResource TrueToVisibleConverter}}">
-                            <Run Text="{x:Bind ViewModel.LatestVersion, Mode=OneWay}" />
-                            -<Hyperlink NavigateUri="{x:Bind ViewModel.LatestVersionReleaseNotesURL, Mode=OneWay}">
-                                <Run x:Uid="ReleaseNotes" Text="Release notes" />
-                            </Hyperlink>
-                        </TextBlock>
-                    </StackPanel>
-
-                    <StackPanel Margin="{StaticResource ItemMargin}">
-                        <TextBlock
-                            x:Uid="License"
-                            Margin="0,0,0,8"
-                            Text="License" />
-                        <TextBlock><Hyperlink NavigateUri="https://github.com/felixse/FluentTerminal/blob/master/LICENSE">GNU General Public License v3.0</Hyperlink></TextBlock>
-                    </StackPanel>
-                </StackPanel>
-                <StackPanel
-                    Grid.Row="1"
-                    Margin="0,72,0,0"
-                    VerticalAlignment="Bottom">
-                    <TextBlock x:Name="CreatedBy" />
-                </StackPanel>
-            </Grid>
-        </ScrollViewer>
-    </Grid>
-</Page>
diff --git a/FluentTerminal.App/Views/SettingsPages/About.xaml.cs b/FluentTerminal.App/Views/SettingsPages/About.xaml.cs
deleted file mode 100644
index 21f5c06..0000000
--- a/FluentTerminal.App/Views/SettingsPages/About.xaml.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using FluentTerminal.App.ViewModels.Settings;
-using System;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Documents;
-using Windows.UI.Xaml.Navigation;
-
-namespace FluentTerminal.App.Views.SettingsPages
-{
-    public sealed partial class About : Page
-    {
-        public AboutPageViewModel ViewModel { get; private set; }
-
-        public About()
-        {
-            InitializeComponent();
-            CreatedBy.Inlines.Add(new Run { Text = "Created by " });
-            CreatedBy.Inlines.Add(new Italic { Inlines = { new Run { Text = "felixse " } } });
-            CreatedBy.Inlines.Add(new Run { Text = "and " });
-            CreatedBy.Inlines.Add(new Hyperlink { Inlines = { new Run { Text = "contributors" } }, NavigateUri = new Uri("https://github.com/felixse/FluentTerminal/graphs/contributors") });
-        }
-
-        protected override void OnNavigatedTo(NavigationEventArgs e)
-        {
-            if (e.Parameter is AboutPageViewModel viewModel)
-            {
-                ViewModel = viewModel;
-            }
-            ViewModel.OnNavigatedTo();
-        }
-    }
-}
\ No newline at end of file
diff --git a/FluentTerminal.Package/FluentTerminal.Package.wapproj b/FluentTerminal.Package/FluentTerminal.Package.wapproj
index 4cf113e..cd69ad8 100644
--- a/FluentTerminal.Package/FluentTerminal.Package.wapproj
+++ b/FluentTerminal.Package/FluentTerminal.Package.wapproj
@@ -44,6 +44,26 @@
       <Configuration>Release</Configuration>
       <Platform>AnyCPU</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Store|AnyCPU">
+      <Configuration>Store</Configuration>
+      <Platform>AnyCPU</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Store|ARM">
+      <Configuration>Store</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Store|ARM64">
+      <Configuration>Store</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Store|x64">
+      <Configuration>Store</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Store|x86">
+      <Configuration>Store</Configuration>
+      <Platform>x86</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Configuration">
     <PostBuildEvent>
diff --git a/FluentTerminal.RuntimeComponent/FluentTerminal.RuntimeComponent.csproj b/FluentTerminal.RuntimeComponent/FluentTerminal.RuntimeComponent.csproj
index 923442f..d3ed65a 100644
--- a/FluentTerminal.RuntimeComponent/FluentTerminal.RuntimeComponent.csproj
+++ b/FluentTerminal.RuntimeComponent/FluentTerminal.RuntimeComponent.csproj
@@ -120,6 +120,53 @@
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Store|AnyCPU'">
+    <OutputPath>bin\Store\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Store|x86'">
+    <OutputPath>bin\x86\Store\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Store|ARM'">
+    <OutputPath>bin\ARM\Store\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>ARM</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Store|x64'">
+    <OutputPath>bin\x64\Store\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/FluentTerminal.SystemTray/FluentTerminal.SystemTray.csproj b/FluentTerminal.SystemTray/FluentTerminal.SystemTray.csproj
index ab6e692..ed023fc 100644
--- a/FluentTerminal.SystemTray/FluentTerminal.SystemTray.csproj
+++ b/FluentTerminal.SystemTray/FluentTerminal.SystemTray.csproj
@@ -76,6 +76,39 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Store|AnyCPU'">
+    <OutputPath>bin\Store\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.1</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Store|x64'">
+    <OutputPath>bin\x64\Store\</OutputPath>
+    <DefineConstants>TRACE;X64</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.1</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Store|x86'">
+    <OutputPath>bin\x86\Store\</OutputPath>
+    <DefineConstants>TRACE;STORE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <LangVersion>7.1</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/FluentTerminal.SystemTray/Program.cs b/FluentTerminal.SystemTray/Program.cs
index 5116a50..a8a426a 100644
--- a/FluentTerminal.SystemTray/Program.cs
+++ b/FluentTerminal.SystemTray/Program.cs
@@ -87,8 +87,9 @@ namespace FluentTerminal.SystemTray
                     appCommunicationService.StartAppServiceConnection();
                 }
 
+#if !STORE
                 Task.Run(() => container.Resolve<IUpdateService>().CheckForUpdate());
-
+#endif
                 var settingsService = container.Resolve<ISettingsService>();
                 Task.Run(() => Utilities.MuteTerminal(settingsService.GetApplicationSettings().MuteTerminalBeeps));
                 if (settingsService.GetApplicationSettings().EnableTrayIcon)
diff --git a/FluentTerminal.sln b/FluentTerminal.sln
index 4693412..e0f49c2 100644
--- a/FluentTerminal.sln
+++ b/FluentTerminal.sln
@@ -35,6 +35,11 @@ Global
 		Release|ARM64 = Release|ARM64
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
+		Store|Any CPU = Store|Any CPU
+		Store|ARM = Store|ARM
+		Store|ARM64 = Store|ARM64
+		Store|x64 = Store|x64
+		Store|x86 = Store|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Debug|Any CPU.ActiveCfg = Debug|x86
@@ -44,7 +49,6 @@ Global
 		{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Debug|ARM64.ActiveCfg = Debug|x86
 		{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Debug|x64.ActiveCfg = Debug|x64
 		{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Debug|x64.Build.0 = Debug|x64
-		{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Debug|x64.Deploy.0 = Debug|x64
 		{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Debug|x86.ActiveCfg = Debug|x86
 		{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Debug|x86.Build.0 = Debug|x86
 		{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Debug|x86.Deploy.0 = Debug|x86
@@ -55,10 +59,19 @@ Global
 		{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Release|ARM64.ActiveCfg = Release|x86
 		{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Release|x64.ActiveCfg = Release|x64
 		{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Release|x64.Build.0 = Release|x64
-		{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Release|x64.Deploy.0 = Release|x64
 		{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Release|x86.ActiveCfg = Release|x86
 		{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Release|x86.Build.0 = Release|x86
 		{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Release|x86.Deploy.0 = Release|x86
+		{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Store|Any CPU.ActiveCfg = Store|x86
+		{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Store|ARM.ActiveCfg = Store|ARM
+		{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Store|ARM.Build.0 = Store|ARM
+		{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Store|ARM.Deploy.0 = Store|ARM
+		{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Store|ARM64.ActiveCfg = Store|x86
+		{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Store|x64.ActiveCfg = Store|x64
+		{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Store|x64.Build.0 = Store|x64
+		{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Store|x86.ActiveCfg = Store|x86
+		{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Store|x86.Build.0 = Store|x86
+		{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Store|x86.Deploy.0 = Store|x86
 		{9EDDE318-0003-4553-B6F9-3FE5473563FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9EDDE318-0003-4553-B6F9-3FE5473563FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9EDDE318-0003-4553-B6F9-3FE5473563FD}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -79,6 +92,16 @@ Global
 		{9EDDE318-0003-4553-B6F9-3FE5473563FD}.Release|x64.Build.0 = Release|x64
 		{9EDDE318-0003-4553-B6F9-3FE5473563FD}.Release|x86.ActiveCfg = Release|x86
 		{9EDDE318-0003-4553-B6F9-3FE5473563FD}.Release|x86.Build.0 = Release|x86
+		{9EDDE318-0003-4553-B6F9-3FE5473563FD}.Store|Any CPU.ActiveCfg = Store|Any CPU
+		{9EDDE318-0003-4553-B6F9-3FE5473563FD}.Store|Any CPU.Build.0 = Store|Any CPU
+		{9EDDE318-0003-4553-B6F9-3FE5473563FD}.Store|ARM.ActiveCfg = Store|Any CPU
+		{9EDDE318-0003-4553-B6F9-3FE5473563FD}.Store|ARM.Build.0 = Store|Any CPU
+		{9EDDE318-0003-4553-B6F9-3FE5473563FD}.Store|ARM64.ActiveCfg = Store|Any CPU
+		{9EDDE318-0003-4553-B6F9-3FE5473563FD}.Store|ARM64.Build.0 = Store|Any CPU
+		{9EDDE318-0003-4553-B6F9-3FE5473563FD}.Store|x64.ActiveCfg = Store|x64
+		{9EDDE318-0003-4553-B6F9-3FE5473563FD}.Store|x64.Build.0 = Store|x64
+		{9EDDE318-0003-4553-B6F9-3FE5473563FD}.Store|x86.ActiveCfg = Store|x86
+		{9EDDE318-0003-4553-B6F9-3FE5473563FD}.Store|x86.Build.0 = Store|x86
 		{BAAE6239-343F-454C-977F-F81F91715961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BAAE6239-343F-454C-977F-F81F91715961}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BAAE6239-343F-454C-977F-F81F91715961}.Debug|ARM.ActiveCfg = Debug|ARM
@@ -99,6 +122,16 @@ Global
 		{BAAE6239-343F-454C-977F-F81F91715961}.Release|x64.Build.0 = Release|x64
 		{BAAE6239-343F-454C-977F-F81F91715961}.Release|x86.ActiveCfg = Release|x86
 		{BAAE6239-343F-454C-977F-F81F91715961}.Release|x86.Build.0 = Release|x86
+		{BAAE6239-343F-454C-977F-F81F91715961}.Store|Any CPU.ActiveCfg = Store|Any CPU
+		{BAAE6239-343F-454C-977F-F81F91715961}.Store|Any CPU.Build.0 = Store|Any CPU
+		{BAAE6239-343F-454C-977F-F81F91715961}.Store|ARM.ActiveCfg = Store|ARM
+		{BAAE6239-343F-454C-977F-F81F91715961}.Store|ARM.Build.0 = Store|ARM
+		{BAAE6239-343F-454C-977F-F81F91715961}.Store|ARM64.ActiveCfg = Store|Any CPU
+		{BAAE6239-343F-454C-977F-F81F91715961}.Store|ARM64.Build.0 = Store|Any CPU
+		{BAAE6239-343F-454C-977F-F81F91715961}.Store|x64.ActiveCfg = Store|x64
+		{BAAE6239-343F-454C-977F-F81F91715961}.Store|x64.Build.0 = Store|x64
+		{BAAE6239-343F-454C-977F-F81F91715961}.Store|x86.ActiveCfg = Store|x86
+		{BAAE6239-343F-454C-977F-F81F91715961}.Store|x86.Build.0 = Store|x86
 		{5EA40453-A0AA-449E-8406-D6EA51D7E70E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5EA40453-A0AA-449E-8406-D6EA51D7E70E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5EA40453-A0AA-449E-8406-D6EA51D7E70E}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -119,6 +152,16 @@ Global
 		{5EA40453-A0AA-449E-8406-D6EA51D7E70E}.Release|x64.Build.0 = Release|Any CPU
 		{5EA40453-A0AA-449E-8406-D6EA51D7E70E}.Release|x86.ActiveCfg = Release|Any CPU
 		{5EA40453-A0AA-449E-8406-D6EA51D7E70E}.Release|x86.Build.0 = Release|Any CPU
+		{5EA40453-A0AA-449E-8406-D6EA51D7E70E}.Store|Any CPU.ActiveCfg = Store|Any CPU
+		{5EA40453-A0AA-449E-8406-D6EA51D7E70E}.Store|Any CPU.Build.0 = Store|Any CPU
+		{5EA40453-A0AA-449E-8406-D6EA51D7E70E}.Store|ARM.ActiveCfg = Store|Any CPU
+		{5EA40453-A0AA-449E-8406-D6EA51D7E70E}.Store|ARM.Build.0 = Store|Any CPU
+		{5EA40453-A0AA-449E-8406-D6EA51D7E70E}.Store|ARM64.ActiveCfg = Store|Any CPU
+		{5EA40453-A0AA-449E-8406-D6EA51D7E70E}.Store|ARM64.Build.0 = Store|Any CPU
+		{5EA40453-A0AA-449E-8406-D6EA51D7E70E}.Store|x64.ActiveCfg = Store|Any CPU
+		{5EA40453-A0AA-449E-8406-D6EA51D7E70E}.Store|x64.Build.0 = Store|Any CPU
+		{5EA40453-A0AA-449E-8406-D6EA51D7E70E}.Store|x86.ActiveCfg = Store|Any CPU
+		{5EA40453-A0AA-449E-8406-D6EA51D7E70E}.Store|x86.Build.0 = Store|Any CPU
 		{A1AD7385-F92E-46AC-A349-43DC99B1E72D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A1AD7385-F92E-46AC-A349-43DC99B1E72D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A1AD7385-F92E-46AC-A349-43DC99B1E72D}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -139,6 +182,16 @@ Global
 		{A1AD7385-F92E-46AC-A349-43DC99B1E72D}.Release|x64.Build.0 = Release|Any CPU
 		{A1AD7385-F92E-46AC-A349-43DC99B1E72D}.Release|x86.ActiveCfg = Release|Any CPU
 		{A1AD7385-F92E-46AC-A349-43DC99B1E72D}.Release|x86.Build.0 = Release|Any CPU
+		{A1AD7385-F92E-46AC-A349-43DC99B1E72D}.Store|Any CPU.ActiveCfg = Store|Any CPU
+		{A1AD7385-F92E-46AC-A349-43DC99B1E72D}.Store|Any CPU.Build.0 = Store|Any CPU
+		{A1AD7385-F92E-46AC-A349-43DC99B1E72D}.Store|ARM.ActiveCfg = Store|Any CPU
+		{A1AD7385-F92E-46AC-A349-43DC99B1E72D}.Store|ARM.Build.0 = Store|Any CPU
+		{A1AD7385-F92E-46AC-A349-43DC99B1E72D}.Store|ARM64.ActiveCfg = Store|Any CPU
+		{A1AD7385-F92E-46AC-A349-43DC99B1E72D}.Store|ARM64.Build.0 = Store|Any CPU
+		{A1AD7385-F92E-46AC-A349-43DC99B1E72D}.Store|x64.ActiveCfg = Store|Any CPU
+		{A1AD7385-F92E-46AC-A349-43DC99B1E72D}.Store|x64.Build.0 = Store|Any CPU
+		{A1AD7385-F92E-46AC-A349-43DC99B1E72D}.Store|x86.ActiveCfg = Store|Any CPU
+		{A1AD7385-F92E-46AC-A349-43DC99B1E72D}.Store|x86.Build.0 = Store|Any CPU
 		{B353EAF4-8332-4C89-B986-B0B29F7E21FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B353EAF4-8332-4C89-B986-B0B29F7E21FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B353EAF4-8332-4C89-B986-B0B29F7E21FC}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -159,6 +212,16 @@ Global
 		{B353EAF4-8332-4C89-B986-B0B29F7E21FC}.Release|x64.Build.0 = Release|Any CPU
 		{B353EAF4-8332-4C89-B986-B0B29F7E21FC}.Release|x86.ActiveCfg = Release|Any CPU
 		{B353EAF4-8332-4C89-B986-B0B29F7E21FC}.Release|x86.Build.0 = Release|Any CPU
+		{B353EAF4-8332-4C89-B986-B0B29F7E21FC}.Store|Any CPU.ActiveCfg = Store|Any CPU
+		{B353EAF4-8332-4C89-B986-B0B29F7E21FC}.Store|Any CPU.Build.0 = Store|Any CPU
+		{B353EAF4-8332-4C89-B986-B0B29F7E21FC}.Store|ARM.ActiveCfg = Store|Any CPU
+		{B353EAF4-8332-4C89-B986-B0B29F7E21FC}.Store|ARM.Build.0 = Store|Any CPU
+		{B353EAF4-8332-4C89-B986-B0B29F7E21FC}.Store|ARM64.ActiveCfg = Store|Any CPU
+		{B353EAF4-8332-4C89-B986-B0B29F7E21FC}.Store|ARM64.Build.0 = Store|Any CPU
+		{B353EAF4-8332-4C89-B986-B0B29F7E21FC}.Store|x64.ActiveCfg = Store|Any CPU
+		{B353EAF4-8332-4C89-B986-B0B29F7E21FC}.Store|x64.Build.0 = Store|Any CPU
+		{B353EAF4-8332-4C89-B986-B0B29F7E21FC}.Store|x86.ActiveCfg = Store|Any CPU
+		{B353EAF4-8332-4C89-B986-B0B29F7E21FC}.Store|x86.Build.0 = Store|Any CPU
 		{44E8E225-F46C-47EC-9290-FFA08FCCF1B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{44E8E225-F46C-47EC-9290-FFA08FCCF1B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{44E8E225-F46C-47EC-9290-FFA08FCCF1B5}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -179,6 +242,16 @@ Global
 		{44E8E225-F46C-47EC-9290-FFA08FCCF1B5}.Release|x64.Build.0 = Release|Any CPU
 		{44E8E225-F46C-47EC-9290-FFA08FCCF1B5}.Release|x86.ActiveCfg = Release|Any CPU
 		{44E8E225-F46C-47EC-9290-FFA08FCCF1B5}.Release|x86.Build.0 = Release|Any CPU
+		{44E8E225-F46C-47EC-9290-FFA08FCCF1B5}.Store|Any CPU.ActiveCfg = Store|Any CPU
+		{44E8E225-F46C-47EC-9290-FFA08FCCF1B5}.Store|Any CPU.Build.0 = Store|Any CPU
+		{44E8E225-F46C-47EC-9290-FFA08FCCF1B5}.Store|ARM.ActiveCfg = Store|Any CPU
+		{44E8E225-F46C-47EC-9290-FFA08FCCF1B5}.Store|ARM.Build.0 = Store|Any CPU
+		{44E8E225-F46C-47EC-9290-FFA08FCCF1B5}.Store|ARM64.ActiveCfg = Store|Any CPU
+		{44E8E225-F46C-47EC-9290-FFA08FCCF1B5}.Store|ARM64.Build.0 = Store|Any CPU
+		{44E8E225-F46C-47EC-9290-FFA08FCCF1B5}.Store|x64.ActiveCfg = Store|Any CPU
+		{44E8E225-F46C-47EC-9290-FFA08FCCF1B5}.Store|x64.Build.0 = Store|Any CPU
+		{44E8E225-F46C-47EC-9290-FFA08FCCF1B5}.Store|x86.ActiveCfg = Store|Any CPU
+		{44E8E225-F46C-47EC-9290-FFA08FCCF1B5}.Store|x86.Build.0 = Store|Any CPU
 		{DA0BF206-F386-404C-82DF-5EAE2F5B1AA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DA0BF206-F386-404C-82DF-5EAE2F5B1AA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DA0BF206-F386-404C-82DF-5EAE2F5B1AA5}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
@@ -209,6 +282,21 @@ Global
 		{DA0BF206-F386-404C-82DF-5EAE2F5B1AA5}.Release|x86.ActiveCfg = Release|x86
 		{DA0BF206-F386-404C-82DF-5EAE2F5B1AA5}.Release|x86.Build.0 = Release|x86
 		{DA0BF206-F386-404C-82DF-5EAE2F5B1AA5}.Release|x86.Deploy.0 = Release|x86
+		{DA0BF206-F386-404C-82DF-5EAE2F5B1AA5}.Store|Any CPU.ActiveCfg = Store|Any CPU
+		{DA0BF206-F386-404C-82DF-5EAE2F5B1AA5}.Store|Any CPU.Build.0 = Store|Any CPU
+		{DA0BF206-F386-404C-82DF-5EAE2F5B1AA5}.Store|Any CPU.Deploy.0 = Store|Any CPU
+		{DA0BF206-F386-404C-82DF-5EAE2F5B1AA5}.Store|ARM.ActiveCfg = Store|ARM
+		{DA0BF206-F386-404C-82DF-5EAE2F5B1AA5}.Store|ARM.Build.0 = Store|ARM
+		{DA0BF206-F386-404C-82DF-5EAE2F5B1AA5}.Store|ARM.Deploy.0 = Store|ARM
+		{DA0BF206-F386-404C-82DF-5EAE2F5B1AA5}.Store|ARM64.ActiveCfg = Store|ARM64
+		{DA0BF206-F386-404C-82DF-5EAE2F5B1AA5}.Store|ARM64.Build.0 = Store|ARM64
+		{DA0BF206-F386-404C-82DF-5EAE2F5B1AA5}.Store|ARM64.Deploy.0 = Store|ARM64
+		{DA0BF206-F386-404C-82DF-5EAE2F5B1AA5}.Store|x64.ActiveCfg = Store|x64
+		{DA0BF206-F386-404C-82DF-5EAE2F5B1AA5}.Store|x64.Build.0 = Store|x64
+		{DA0BF206-F386-404C-82DF-5EAE2F5B1AA5}.Store|x64.Deploy.0 = Store|x64
+		{DA0BF206-F386-404C-82DF-5EAE2F5B1AA5}.Store|x86.ActiveCfg = Store|x86
+		{DA0BF206-F386-404C-82DF-5EAE2F5B1AA5}.Store|x86.Build.0 = Store|x86
+		{DA0BF206-F386-404C-82DF-5EAE2F5B1AA5}.Store|x86.Deploy.0 = Store|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE