diff --git a/Wino.Server.NET8/Program.cs b/Wino.Server.NET8/Program.cs
index f7933cc0..0af86fd2 100644
--- a/Wino.Server.NET8/Program.cs
+++ b/Wino.Server.NET8/Program.cs
@@ -24,7 +24,7 @@ namespace Wino.Server
                     var context = new DispatcherQueueSynchronizationContext(
                         DispatcherQueue.GetForCurrentThread());
                     SynchronizationContext.SetSynchronizationContext(context);
-                    new App();
+                    new ServerApp();
                 });
             }
         }
diff --git a/Wino.Server.NET8/App.xaml b/Wino.Server.NET8/ServerApp.xaml
similarity index 93%
rename from Wino.Server.NET8/App.xaml
rename to Wino.Server.NET8/ServerApp.xaml
index 5058d6b7..62f2c276 100644
--- a/Wino.Server.NET8/App.xaml
+++ b/Wino.Server.NET8/ServerApp.xaml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Application
-    x:Class="Wino.Server.NET8.App"
+    x:Class="Wino.Server.NET8.ServerApp"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:Wino.Server.NET8"
diff --git a/Wino.Server.NET8/App.xaml.cs b/Wino.Server.NET8/ServerApp.xaml.cs
similarity index 95%
rename from Wino.Server.NET8/App.xaml.cs
rename to Wino.Server.NET8/ServerApp.xaml.cs
index 1b6b410d..fb8d709c 100644
--- a/Wino.Server.NET8/App.xaml.cs
+++ b/Wino.Server.NET8/ServerApp.xaml.cs
@@ -13,16 +13,16 @@ using Wino.Services;
 
 namespace Wino.Server.NET8
 {
-    public partial class App : Application
+    public partial class ServerApp : Application
     {
-        public new static App Current => (App)Application.Current;
+        public new static ServerApp Current => (ServerApp)Application.Current;
 
         private const string WinoServerAppName = "Wino.Server";
 
         public TaskbarIcon TrayIcon { get; private set; }
         public bool HandleClosedEvents { get; set; } = true;
         public IServiceProvider Services { get; private set; }
-        public App()
+        public ServerApp()
         {
             InitializeComponent();
         }
diff --git a/Wino.Server.NET8/ServerContext.cs b/Wino.Server.NET8/ServerContext.cs
index 5471c501..d6c19a3e 100644
--- a/Wino.Server.NET8/ServerContext.cs
+++ b/Wino.Server.NET8/ServerContext.cs
@@ -108,13 +108,13 @@ namespace Wino.Server
 
         public async Task TestOutlookSynchronizer()
         {
-            var accountService = App.Current.Services.GetService<IAccountService>();
+            var accountService = ServerApp.Current.Services.GetService<IAccountService>();
 
             var accs = await accountService.GetAccountsAsync();
             var acc = accs.ElementAt(0);
 
-            var authenticator = App.Current.Services.GetService<OutlookAuthenticator>();
-            var processor = App.Current.Services.GetService<IOutlookChangeProcessor>();
+            var authenticator = ServerApp.Current.Services.GetService<OutlookAuthenticator>();
+            var processor = ServerApp.Current.Services.GetService<IOutlookChangeProcessor>();
 
             var sync = new OutlookSynchronizer(acc, authenticator, processor);
 
diff --git a/Wino.Server.NET8/Wino.Server.NET8.csproj b/Wino.Server.NET8/Wino.Server.NET8.csproj
index 7a31aadc..ee14cc28 100644
--- a/Wino.Server.NET8/Wino.Server.NET8.csproj
+++ b/Wino.Server.NET8/Wino.Server.NET8.csproj
@@ -1,18 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <RootNamespace>Wino.Server</RootNamespace>
     <ApplicationManifest>app.manifest</ApplicationManifest>
+	  
     <Platforms>x86;x64;ARM64</Platforms>
-	<SelfContained>true</SelfContained>
-    <RuntimeIdentifiers Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) &gt;= 8">win-x86;win-x64;win-arm64</RuntimeIdentifiers>
-    <RuntimeIdentifiers Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) &lt; 8">win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
+	<RuntimeIdentifiers Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) &gt;= 8">win-x86;win-x64;win-arm64</RuntimeIdentifiers>
+	<RuntimeIdentifiers Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) &lt; 8">win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
+	<WindowsSdkPackageVersion>10.0.19041.35-preview</WindowsSdkPackageVersion>
+	  
     <PublishProfile>win-$(Platform).pubxml</PublishProfile>
     <UseWinUI>true</UseWinUI>
+
     <EnableMsixTooling>true</EnableMsixTooling>
-	<DisableEmbeddedXbf>false</DisableEmbeddedXbf>
+
+    <SupportedOSPlatformVersion>10.0.22621.0</SupportedOSPlatformVersion>
   </PropertyGroup>
 
 	<!-- Disable XAML generated main to enable single activation. -->
@@ -36,13 +40,15 @@
 	</PropertyGroup>
 	
   <ItemGroup>
+	<ApplicationDefinition Include="ServerApp.xaml" SubType="Designer" />
     <None Remove="app.manifest" />
     <None Remove="Assets\Wino_Icon.ico" />
     <None Remove="TrayIconResources.xaml" />
   </ItemGroup>
 	
   <ItemGroup>
-    <Page Remove="App.xaml" />
+	  <None Remove="ServerApp.xaml" />
+	  <Page Remove="ServerApp.xaml" />
   </ItemGroup>
 
   <ItemGroup>