diff --git a/Wino.Mail.WinUI/App.xaml b/Wino.Mail.WinUI/App.xaml
index 91ce2c63..c478b509 100644
--- a/Wino.Mail.WinUI/App.xaml
+++ b/Wino.Mail.WinUI/App.xaml
@@ -1,16 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <Application
-    x:Class="Wino.Mail.WinUI.App"
+    x:Class="Wino.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Wino.Mail.WinUI">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/Styles/Converters.xaml" />
+                <ResourceDictionary Source="/Styles/FontIcons.xaml" />
+                <ResourceDictionary Source="/Styles/Colors.xaml" />
+                <ResourceDictionary Source="/Styles/ContentPresenters.xaml" />
+                <ResourceDictionary Source="/Styles/ImagePreviewControl.xaml" />
+
                 <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
-                <!-- Other merged dictionaries here -->
             </ResourceDictionary.MergedDictionaries>
-            <!-- Other app resources here -->
+            <!--  Other app resources here  -->
         </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/Wino.Mail.WinUI/App.xaml.cs b/Wino.Mail.WinUI/App.xaml.cs
index 00a3ebf8..1cafd8bd 100644
--- a/Wino.Mail.WinUI/App.xaml.cs
+++ b/Wino.Mail.WinUI/App.xaml.cs
@@ -1,45 +1,19 @@
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
 using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using Microsoft.UI.Xaml.Shapes;
-using Windows.ApplicationModel;
-using Windows.ApplicationModel.Activation;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 
-// To learn more about WinUI, the WinUI project structure,
-// and more about our project templates, see: http://aka.ms/winui-project-info.
-
-namespace Wino.Mail.WinUI
+namespace Wino
 {
-    /// <summary>
-    /// Provides application-specific behavior to supplement the default Application class.
-    /// </summary>
     public partial class App : Application
     {
-        /// <summary>
-        /// Initializes the singleton application object.  This is the first line of authored code
-        /// executed, and as such is the logical equivalent of main() or WinMain().
-        /// </summary>
+        public new static App Current => (App)Application.Current;
+        public IServiceProvider Services { get; }
+
         public App()
         {
             this.InitializeComponent();
         }
 
-        /// <summary>
-        /// Invoked when the application is launched.
-        /// </summary>
-        /// <param name="args">Details about the launch request and process.</param>
-        protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs args)
+        protected override void OnLaunched(LaunchActivatedEventArgs args)
         {
             m_window = new MainWindow();
             m_window.Activate();
diff --git a/Wino.Mail.WinUI/BasePage.cs b/Wino.Mail.WinUI/BasePage.cs
new file mode 100644
index 00000000..6ad7c7e6
--- /dev/null
+++ b/Wino.Mail.WinUI/BasePage.cs
@@ -0,0 +1,79 @@
+using System;
+using System.Diagnostics;
+using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Navigation;
+using Wino.Core.Messages.Shell;
+using Wino.Core.UWP;
+using Wino.Mail;
+using Wino.Mail.ViewModels;
+
+namespace Wino
+{
+    public class BasePage : Page, IRecipient<LanguageChanged>
+    {
+        public UIElement ShellContent
+        {
+            get { return (UIElement)GetValue(ShellContentProperty); }
+            set { SetValue(ShellContentProperty, value); }
+        }
+
+        public static readonly DependencyProperty ShellContentProperty = DependencyProperty.Register(nameof(ShellContent), typeof(UIElement), typeof(BasePage), new PropertyMetadata(null));
+
+        public void Receive(LanguageChanged message)
+        {
+            OnLanguageChanged();
+        }
+
+        public virtual void OnLanguageChanged() { }
+    }
+
+    public abstract class BasePage<T> : BasePage where T : BaseViewModel
+    {
+        public T ViewModel { get; } = App.Current.Services.GetService<T>();
+
+        protected BasePage()
+        {
+            ViewModel.Dispatcher = new UWPDispatcher(Dispatcher);
+        }
+
+        ~BasePage()
+        {
+            Debug.WriteLine($"Disposed {this.GetType().Name}");
+        }
+
+        protected override void OnNavigatedTo(NavigationEventArgs e)
+        {
+            base.OnNavigatedTo(e);
+
+            var mode = GetNavigationMode(e.NavigationMode);
+            var parameter = e.Parameter;
+
+            WeakReferenceMessenger.Default.UnregisterAll(this);
+            WeakReferenceMessenger.Default.RegisterAll(this);
+
+            ViewModel.OnNavigatedTo(mode, parameter);
+        }
+
+        protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
+        {
+            base.OnNavigatingFrom(e);
+
+            var mode = GetNavigationMode(e.NavigationMode);
+            var parameter = e.Parameter;
+
+            WeakReferenceMessenger.Default.UnregisterAll(this);
+
+            ViewModel.OnNavigatedFrom(mode, parameter);
+
+            GC.Collect();
+        }
+
+        private Core.Domain.Models.Navigation.NavigationMode GetNavigationMode(NavigationMode mode)
+        {
+            return (Core.Domain.Models.Navigation.NavigationMode)mode;
+        }
+    }
+}
diff --git a/Wino.Mail.WinUI/MainWindow.xaml b/Wino.Mail.WinUI/MainWindow.xaml
index f2224366..515c497c 100644
--- a/Wino.Mail.WinUI/MainWindow.xaml
+++ b/Wino.Mail.WinUI/MainWindow.xaml
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <Window
-    x:Class="Wino.Mail.WinUI.MainWindow"
+    x:Class="Wino.MainWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Wino.Mail.WinUI"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
+    <StackPanel
+        Orientation="Horizontal"
+        HorizontalAlignment="Center"
+        VerticalAlignment="Center">
         <Button x:Name="myButton" Click="myButton_Click">Click Me</Button>
     </StackPanel>
 </Window>
diff --git a/Wino.Mail.WinUI/MainWindow.xaml.cs b/Wino.Mail.WinUI/MainWindow.xaml.cs
index 2cc21a35..f8efa0be 100644
--- a/Wino.Mail.WinUI/MainWindow.xaml.cs
+++ b/Wino.Mail.WinUI/MainWindow.xaml.cs
@@ -1,31 +1,13 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
 using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 
-// To learn more about WinUI, the WinUI project structure,
-// and more about our project templates, see: http://aka.ms/winui-project-info.
 
-namespace Wino.Mail.WinUI
+namespace Wino
 {
-    /// <summary>
-    /// An empty window that can be used on its own or navigated to within a Frame.
-    /// </summary>
     public sealed partial class MainWindow : Window
     {
         public MainWindow()
         {
-            this.InitializeComponent();
+            InitializeComponent();
         }
 
         private void myButton_Click(object sender, RoutedEventArgs e)
diff --git a/Wino.Mail.WinUI/Views/Abstract/AboutPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/AboutPageAbstract.cs
new file mode 100644
index 00000000..16d785c5
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/AboutPageAbstract.cs
@@ -0,0 +1,8 @@
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+    public abstract class AboutPageAbstract : BasePage<AboutPageViewModel>
+    {
+    }
+}
diff --git a/Wino.Mail.WinUI/Views/Abstract/AccountDetailsPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/AccountDetailsPageAbstract.cs
new file mode 100644
index 00000000..036ff394
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/AccountDetailsPageAbstract.cs
@@ -0,0 +1,8 @@
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+    public abstract class AccountDetailsPageAbstract : BasePage<AccountDetailsPageViewModel>
+    {
+    }
+}
diff --git a/Wino.Mail.WinUI/Views/Abstract/AccountManagementPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/AccountManagementPageAbstract.cs
new file mode 100644
index 00000000..1b6f6a72
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/AccountManagementPageAbstract.cs
@@ -0,0 +1,9 @@
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+    public abstract class AccountManagementPageAbstract : BasePage<AccountManagementViewModel>
+    {
+
+    }
+}
diff --git a/Wino.Mail.WinUI/Views/Abstract/AppShellAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/AppShellAbstract.cs
new file mode 100644
index 00000000..5817c572
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/AppShellAbstract.cs
@@ -0,0 +1,8 @@
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+    public abstract class AppShellAbstract : BasePage<AppShellViewModel>
+    {
+    }
+}
diff --git a/Wino.Mail.WinUI/Views/Abstract/ComposePageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/ComposePageAbstract.cs
new file mode 100644
index 00000000..fbe85077
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/ComposePageAbstract.cs
@@ -0,0 +1,8 @@
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+    public abstract class ComposePageAbstract : BasePage<ComposePageViewModel>
+    {
+    }
+}
diff --git a/Wino.Mail.WinUI/Views/Abstract/IdlePageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/IdlePageAbstract.cs
new file mode 100644
index 00000000..9e28d8ff
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/IdlePageAbstract.cs
@@ -0,0 +1,8 @@
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+    public abstract class IdlePageAbstract : BasePage<IdlePageViewModel>
+    {
+    }
+}
diff --git a/Wino.Mail.WinUI/Views/Abstract/LanguageTimePageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/LanguageTimePageAbstract.cs
new file mode 100644
index 00000000..492966d4
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/LanguageTimePageAbstract.cs
@@ -0,0 +1,6 @@
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+    public abstract class LanguageTimePageAbstract : BasePage<LanguageTimePageViewModel> { }
+}
diff --git a/Wino.Mail.WinUI/Views/Abstract/MailListPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/MailListPageAbstract.cs
new file mode 100644
index 00000000..70a4cb4c
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/MailListPageAbstract.cs
@@ -0,0 +1,9 @@
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+    public class MailListPageAbstract : BasePage<MailListPageViewModel>
+    {
+
+    }
+}
diff --git a/Wino.Mail.WinUI/Views/Abstract/MailRenderingPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/MailRenderingPageAbstract.cs
new file mode 100644
index 00000000..761712f4
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/MailRenderingPageAbstract.cs
@@ -0,0 +1,26 @@
+using Microsoft.UI.Xaml;
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+    public abstract class MailRenderingPageAbstract : BasePage<MailRenderingPageViewModel>
+    {
+        public bool IsDarkEditor
+        {
+            get { return (bool)GetValue(IsDarkEditorProperty); }
+            set { SetValue(IsDarkEditorProperty, value); }
+        }
+
+        public static readonly DependencyProperty IsDarkEditorProperty = DependencyProperty.Register(nameof(IsDarkEditor), typeof(bool), typeof(MailRenderingPageAbstract), new PropertyMetadata(false, OnIsComposerDarkModeChanged));
+
+        private static void OnIsComposerDarkModeChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
+        {
+            if (obj is MailRenderingPageAbstract page)
+            {
+                page.OnEditorThemeChanged();
+            }
+        }
+
+        public virtual void OnEditorThemeChanged() { }
+    }
+}
diff --git a/Wino.Mail.WinUI/Views/Abstract/MergedAccountDetailsPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/MergedAccountDetailsPageAbstract.cs
new file mode 100644
index 00000000..29f1a364
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/MergedAccountDetailsPageAbstract.cs
@@ -0,0 +1,8 @@
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+    public abstract class MergedAccountDetailsPageAbstract : BasePage<MergedAccountDetailsPageViewModel>
+    {
+    }
+}
diff --git a/Wino.Mail.WinUI/Views/Abstract/MessageListPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/MessageListPageAbstract.cs
new file mode 100644
index 00000000..d474c4be
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/MessageListPageAbstract.cs
@@ -0,0 +1,6 @@
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+    public abstract class MessageListPageAbstract : BasePage<MessageListPageViewModel> { }
+}
diff --git a/Wino.Mail.WinUI/Views/Abstract/NewAccountManagementPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/NewAccountManagementPageAbstract.cs
new file mode 100644
index 00000000..cdd8b272
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/NewAccountManagementPageAbstract.cs
@@ -0,0 +1,8 @@
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+    public abstract class NewAccountManagementPageAbstract : BasePage<NewAccountManagementPageViewModel>
+    {
+    }
+}
diff --git a/Wino.Mail.WinUI/Views/Abstract/PersonalizationPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/PersonalizationPageAbstract.cs
new file mode 100644
index 00000000..ca4d0da0
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/PersonalizationPageAbstract.cs
@@ -0,0 +1,10 @@
+using Windows.UI.Xaml;
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+    public abstract class PersonalizationPageAbstract : SettingsPageBase<PersonalizationPageViewModel>
+    {
+        
+    }
+}
diff --git a/Wino.Mail.WinUI/Views/Abstract/ReadingPanePageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/ReadingPanePageAbstract.cs
new file mode 100644
index 00000000..01ab1f48
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/ReadingPanePageAbstract.cs
@@ -0,0 +1,6 @@
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+    public abstract class ReadingPanePageAbstract : BasePage<ReadingPanePageViewModel> { }
+}
diff --git a/Wino.Mail.WinUI/Views/Abstract/SettingOptionsPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/SettingOptionsPageAbstract.cs
new file mode 100644
index 00000000..c9939223
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/SettingOptionsPageAbstract.cs
@@ -0,0 +1,8 @@
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+    public abstract class SettingOptionsPageAbstract : SettingsPageBase<SettingOptionsPageViewModel>
+    {
+    }
+}
diff --git a/Wino.Mail.WinUI/Views/Abstract/SettingsPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/SettingsPageAbstract.cs
new file mode 100644
index 00000000..5abe8aed
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/SettingsPageAbstract.cs
@@ -0,0 +1,6 @@
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+    public abstract class SettingsPageAbstract : BasePage<SettingsPageViewModel> { }
+}
diff --git a/Wino.Mail.WinUI/Views/Abstract/SettingsPageBase.cs b/Wino.Mail.WinUI/Views/Abstract/SettingsPageBase.cs
new file mode 100644
index 00000000..bfec3aa2
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/SettingsPageBase.cs
@@ -0,0 +1,16 @@
+using Microsoft.UI.Xaml;
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+    public class SettingsPageBase<T> : BasePage<T> where T : BaseViewModel
+    {
+        public string Title
+        {
+            get { return (string)GetValue(TitleProperty); }
+            set { SetValue(TitleProperty, value); }
+        }
+
+        public static readonly DependencyProperty TitleProperty = DependencyProperty.Register(nameof(Title), typeof(string), typeof(SettingsPageBase<T>), new PropertyMetadata(string.Empty));
+    }
+}
diff --git a/Wino.Mail.WinUI/Views/Abstract/SignatureManagementPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/SignatureManagementPageAbstract.cs
new file mode 100644
index 00000000..22936f9c
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/SignatureManagementPageAbstract.cs
@@ -0,0 +1,6 @@
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+    public abstract class SignatureManagementPageAbstract : BasePage<SignatureManagementPageViewModel> { }
+}
diff --git a/Wino.Mail.WinUI/Views/Abstract/WelcomePageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/WelcomePageAbstract.cs
new file mode 100644
index 00000000..17959876
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/WelcomePageAbstract.cs
@@ -0,0 +1,9 @@
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract
+{
+    public abstract class WelcomePageAbstract : BasePage<WelcomePageViewModel>
+    {
+
+    }
+}
diff --git a/Wino.Mail.WinUI/Wino.Mail.WinUI.csproj b/Wino.Mail.WinUI/Wino.Mail.WinUI.csproj
index 0944549f..5ec0ba57 100644
--- a/Wino.Mail.WinUI/Wino.Mail.WinUI.csproj
+++ b/Wino.Mail.WinUI/Wino.Mail.WinUI.csproj
@@ -1,9 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <RootNamespace>Wino.Mail.WinUI</RootNamespace>
+    <RootNamespace>Wino</RootNamespace>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <Platforms>x86;x64;ARM64</Platforms>
     <RuntimeIdentifiers Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) &gt;= 8">win-x86;win-x64;win-arm64</RuntimeIdentifiers>
@@ -11,9 +11,99 @@
     <PublishProfile>win-$(Platform).pubxml</PublishProfile>
     <UseWinUI>true</UseWinUI>
     <EnableMsixTooling>true</EnableMsixTooling>
+	<WindowsSdkPackageVersion>10.0.19041.35-preview</WindowsSdkPackageVersion>
   </PropertyGroup>
 
   <ItemGroup>
+    <Compile Include="..\Wino.Mail\Behaviors\BindableCommandBarBehavior.cs" Link="Behaviors\BindableCommandBarBehavior.cs" />
+    <Compile Include="..\Wino.Mail\Behaviors\CreateMailNavigationItemBehavior.cs" Link="Behaviors\CreateMailNavigationItemBehavior.cs" />
+    <Compile Include="..\Wino.Mail\Controls\AccountNavigationItem.cs" Link="Controls\AccountNavigationItem.cs" />
+    <Compile Include="..\Wino.Mail\Controls\Advanced\WinoAppTitleBar.xaml.cs" Link="Controls\Advanced\WinoAppTitleBar.xaml.cs" />
+    <Compile Include="..\Wino.Mail\Controls\Advanced\WinoListView.cs" Link="Controls\Advanced\WinoListView.cs" />
+    <Compile Include="..\Wino.Mail\Controls\ControlConstants.cs" Link="Controls\ControlConstants.cs" />
+    <Compile Include="..\Wino.Mail\Controls\ImagePreviewControl.cs" Link="Controls\ImagePreviewControl.cs" />
+    <Compile Include="..\Wino.Mail\Controls\MailItemDisplayInformationControl.xaml.cs" Link="Controls\MailItemDisplayInformationControl.xaml.cs" />
+    <Compile Include="..\Wino.Mail\Controls\RendererCommandBar.cs" Link="Controls\RendererCommandBar.cs" />
+    <Compile Include="..\Wino.Mail\Controls\SettingsMenuItemControl.cs" Link="Controls\SettingsMenuItemControl.cs" />
+    <Compile Include="..\Wino.Mail\Controls\WinoFontIcon.cs" Link="Controls\WinoFontIcon.cs" />
+    <Compile Include="..\Wino.Mail\Controls\WinoFontIconSource.cs" Link="Controls\WinoFontIconSource.cs" />
+    <Compile Include="..\Wino.Mail\Controls\WinoInfoBar.cs" Link="Controls\WinoInfoBar.cs" />
+    <Compile Include="..\Wino.Mail\Controls\WinoNavigationViewItem.cs" Link="Controls\WinoNavigationViewItem.cs" />
+    <Compile Include="..\Wino.Mail\Controls\WinoPivotControl.xaml.cs" Link="Controls\WinoPivotControl.xaml.cs" />
+    <Compile Include="..\Wino.Mail\Controls\WinoSwipeControlItems.cs" Link="Controls\WinoSwipeControlItems.cs" />
+    <Compile Include="..\Wino.Mail\Converters\ReverseBooleanConverter.cs" Link="Converters\ReverseBooleanConverter.cs" />
+    <Compile Include="..\Wino.Mail\Converters\ReverseBooleanToVisibilityConverter.cs" Link="Converters\ReverseBooleanToVisibilityConverter.cs" />
+    <Compile Include="..\Wino.Mail\Dialogs\AccountCreationDialog.xaml.cs" Link="Dialogs\AccountCreationDialog.xaml.cs" />
+    <Compile Include="..\Wino.Mail\Dialogs\AccountEditDialog.xaml.cs" Link="Dialogs\AccountEditDialog.xaml.cs" />
+    <Compile Include="..\Wino.Mail\Dialogs\AccountPickerDialog.xaml.cs" Link="Dialogs\AccountPickerDialog.xaml.cs" />
+    <Compile Include="..\Wino.Mail\Dialogs\AccountReorderDialog.xaml.cs" Link="Dialogs\AccountReorderDialog.xaml.cs" />
+    <Compile Include="..\Wino.Mail\Dialogs\BaseAccountCreationDialog.cs" Link="Dialogs\BaseAccountCreationDialog.cs" />
+    <Compile Include="..\Wino.Mail\Dialogs\ConfirmationDialog.xaml.cs" Link="Dialogs\ConfirmationDialog.xaml.cs" />
+    <Compile Include="..\Wino.Mail\Dialogs\CustomThemeBuilderDialog.xaml.cs" Link="Dialogs\CustomThemeBuilderDialog.xaml.cs" />
+    <Compile Include="..\Wino.Mail\Dialogs\MoveMailDialog.xaml.cs" Link="Dialogs\MoveMailDialog.xaml.cs" />
+    <Compile Include="..\Wino.Mail\Dialogs\NewAccountDialog.xaml.cs" Link="Dialogs\NewAccountDialog.xaml.cs" />
+    <Compile Include="..\Wino.Mail\Dialogs\NewImapSetupDialog.xaml.cs" Link="Dialogs\NewImapSetupDialog.xaml.cs" />
+    <Compile Include="..\Wino.Mail\Dialogs\SignatureEditorDialog.xaml.cs" Link="Dialogs\SignatureEditorDialog.xaml.cs" />
+    <Compile Include="..\Wino.Mail\Dialogs\StoreRatingDialog.xaml.cs" Link="Dialogs\StoreRatingDialog.xaml.cs" />
+    <Compile Include="..\Wino.Mail\Dialogs\SystemFolderConfigurationDialog.xaml.cs" Link="Dialogs\SystemFolderConfigurationDialog.xaml.cs" />
+    <Compile Include="..\Wino.Mail\Dialogs\TextInputDialog.xaml.cs" Link="Dialogs\TextInputDialog.xaml.cs" />
+    <Compile Include="..\Wino.Mail\Dialogs\WinoMessageDialog.xaml.cs" Link="Dialogs\WinoMessageDialog.xaml.cs" />
+    <Compile Include="..\Wino.Mail\Extensions\AnimationExtensions.cs" Link="Extensions\AnimationExtensions.cs" />
+    <Compile Include="..\Wino.Mail\Extensions\CompositionEnums.cs" Link="Extensions\CompositionEnums.cs" />
+    <Compile Include="..\Wino.Mail\Extensions\CompositionExtensions.Implicit.cs" Link="Extensions\CompositionExtensions.Implicit.cs" />
+    <Compile Include="..\Wino.Mail\Extensions\CompositionExtensions.Size.cs" Link="Extensions\CompositionExtensions.Size.cs" />
+    <Compile Include="..\Wino.Mail\Extensions\EnumerableExtensions.cs" Link="Extensions\EnumerableExtensions.cs" />
+    <Compile Include="..\Wino.Mail\Extensions\MimeKitExtensions.cs" Link="Extensions\MimeKitExtensions.cs" />
+    <Compile Include="..\Wino.Mail\Extensions\UIExtensions.cs" Link="Extensions\UIExtensions.cs" />
+    <Compile Include="..\Wino.Mail\Extensions\UtilExtensions.cs" Link="Extensions\UtilExtensions.cs" />
+    <Compile Include="..\Wino.Mail\Helpers\JsonHelpers.cs" Link="Helpers\JsonHelpers.cs" />
+    <Compile Include="..\Wino.Mail\Helpers\SettingsStorageExtensions.cs" Link="Helpers\SettingsStorageExtensions.cs" />
+    <Compile Include="..\Wino.Mail\Helpers\WinoVisualTreeHelper.cs" Link="Helpers\WinoVisualTreeHelper.cs" />
+    <Compile Include="..\Wino.Mail\Helpers\XamlHelpers.cs" Link="Helpers\XamlHelpers.cs" />
+    <Compile Include="..\Wino.Mail\MenuFlyouts\AccountSelectorFlyout.cs" Link="MenuFlyouts\AccountSelectorFlyout.cs" />
+    <Compile Include="..\Wino.Mail\MenuFlyouts\FilterMenuFlyout.cs" Link="MenuFlyouts\FilterMenuFlyout.cs" />
+    <Compile Include="..\Wino.Mail\MenuFlyouts\FolderOperationFlyout.cs" Link="MenuFlyouts\FolderOperationFlyout.cs" />
+    <Compile Include="..\Wino.Mail\MenuFlyouts\FolderOperationMenuFlyoutItem.cs" Link="MenuFlyouts\FolderOperationMenuFlyoutItem.cs" />
+    <Compile Include="..\Wino.Mail\MenuFlyouts\MailOperationFlyout.cs" Link="MenuFlyouts\MailOperationFlyout.cs" />
+    <Compile Include="..\Wino.Mail\MenuFlyouts\MailOperationMenuFlyoutItem.cs" Link="MenuFlyouts\MailOperationMenuFlyoutItem.cs" />
+    <Compile Include="..\Wino.Mail\MenuFlyouts\MoveButtonFlyout.cs" Link="MenuFlyouts\MoveButtonFlyout.cs" />
+    <Compile Include="..\Wino.Mail\MenuFlyouts\RendererCommandBarItem.cs" Link="MenuFlyouts\RendererCommandBarItem.cs" />
+    <Compile Include="..\Wino.Mail\MenuFlyouts\WinoOperationFlyout.cs" Link="MenuFlyouts\WinoOperationFlyout.cs" />
+    <Compile Include="..\Wino.Mail\MenuFlyouts\WinoOperationFlyoutItem.cs" Link="MenuFlyouts\WinoOperationFlyoutItem.cs" />
+    <Compile Include="..\Wino.Mail\Selectors\AccountProviderViewModelTemplateSelector.cs" Link="Selectors\AccountProviderViewModelTemplateSelector.cs" />
+    <Compile Include="..\Wino.Mail\Selectors\AccountReorderTemplateSelector.cs" Link="Selectors\AccountReorderTemplateSelector.cs" />
+    <Compile Include="..\Wino.Mail\Selectors\AppThemePreviewTemplateSelector.cs" Link="Selectors\AppThemePreviewTemplateSelector.cs" />
+    <Compile Include="..\Wino.Mail\Selectors\FileAttachmentTypeSelector.cs" Link="Selectors\FileAttachmentTypeSelector.cs" />
+    <Compile Include="..\Wino.Mail\Selectors\MailItemContainerStyleSelector.cs" Link="Selectors\MailItemContainerStyleSelector.cs" />
+    <Compile Include="..\Wino.Mail\Selectors\MailItemDisplayModePreviewTemplateSelector.cs" Link="Selectors\MailItemDisplayModePreviewTemplateSelector.cs" />
+    <Compile Include="..\Wino.Mail\Selectors\MailItemDisplaySelector.cs" Link="Selectors\MailItemDisplaySelector.cs" />
+    <Compile Include="..\Wino.Mail\Selectors\NavigationMenuTemplateSelector.cs" Link="Selectors\NavigationMenuTemplateSelector.cs" />
+    <Compile Include="..\Wino.Mail\Selectors\RendererCommandBarItemTemplateSelector.cs" Link="Selectors\RendererCommandBarItemTemplateSelector.cs" />
+    <Compile Include="..\Wino.Mail\Services\ApplicationResourceManager.cs" Link="Services\ApplicationResourceManager.cs" />
+    <Compile Include="..\Wino.Mail\Services\LaunchProtocolService.cs" Link="Services\LaunchProtocolService.cs" />
+    <Compile Include="..\Wino.Mail\Services\PreferencesService.cs" Link="Services\PreferencesService.cs" />
+    <Compile Include="..\Wino.Mail\Services\StatePersistenceService.cs" Link="Services\StatePersistenceService.cs" />
+    <Compile Include="..\Wino.Mail\Services\ToastActivationService.cs" Link="Services\ToastActivationService.cs" />
+    <Compile Include="..\Wino.Mail\Views\ImapSetup\AdvancedImapSetupPage.xaml.cs" Link="Views\ImapSetup\AdvancedImapSetupPage.xaml.cs" />
+    <Compile Include="..\Wino.Mail\Views\ImapSetup\ImapConnectionFailedPage.xaml.cs" Link="Views\ImapSetup\ImapConnectionFailedPage.xaml.cs" />
+    <Compile Include="..\Wino.Mail\Views\ImapSetup\PreparingImapFoldersPage.xaml.cs" Link="Views\ImapSetup\PreparingImapFoldersPage.xaml.cs" />
+    <Compile Include="..\Wino.Mail\Views\ImapSetup\TestingImapConnectionPage.xaml.cs" Link="Views\ImapSetup\TestingImapConnectionPage.xaml.cs" />
+    <Compile Include="..\Wino.Mail\Views\ImapSetup\WelcomeImapSetupPage.xaml.cs" Link="Views\ImapSetup\WelcomeImapSetupPage.xaml.cs" />
+    <Compile Include="..\Wino.Mail\Views\Settings\SignatureManagementPage.xaml.cs" Link="Views\Settings\SignatureManagementPage.xaml.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="..\Wino.Mail\BackgroundImages\Acrylic.jpg" Link="BackgroundImages\Acrylic.jpg" />
+    <Content Include="..\Wino.Mail\BackgroundImages\Clouds.jpg" Link="BackgroundImages\Clouds.jpg" />
+    <Content Include="..\Wino.Mail\BackgroundImages\Forest.jpg" Link="BackgroundImages\Forest.jpg" />
+    <Content Include="..\Wino.Mail\BackgroundImages\Garden.jpg" Link="BackgroundImages\Garden.jpg" />
+    <Content Include="..\Wino.Mail\BackgroundImages\Mica.jpg" Link="BackgroundImages\Mica.jpg" />
+    <Content Include="..\Wino.Mail\BackgroundImages\Nighty.jpg" Link="BackgroundImages\Nighty.jpg" />
+    <Content Include="..\Wino.Mail\BackgroundImages\Snowflake.jpg" Link="BackgroundImages\Snowflake.jpg" />
+    <Content Include="..\Wino.Mail\JS\editor.html" Link="JS\editor.html" />
+    <Content Include="..\Wino.Mail\JS\global.css" Link="JS\global.css" />
+    <Content Include="..\Wino.Mail\JS\libs\jodit.min.css" Link="JS\libs\jodit.min.css" />
+    <Content Include="..\Wino.Mail\JS\reader.html" Link="JS\reader.html" />
     <Content Include="Assets\SplashScreen.scale-200.png" />
     <Content Include="Assets\LockScreenLogo.scale-200.png" />
     <Content Include="Assets\Square150x150Logo.scale-200.png" />
@@ -24,8 +114,13 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="ColorHashSharp" Version="1.0.0" />
+    <PackageReference Include="CommunityToolkit.WinUI.Animations" Version="8.0.240109" />
+    <PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.0.240109" />
+    <PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.0.240109" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240627000" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240701003-experimental2" />
+    <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>
 
@@ -37,6 +132,121 @@
   <ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
     <ProjectCapability Include="Msix" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Wino.BackgroundTasks\Wino.BackgroundTasks.NET8.csproj" />
+    <ProjectReference Include="..\Wino.Core.Domain\Wino.Core.Domain.NET8.csproj" />
+    <ProjectReference Include="..\Wino.Core.UWP\Wino.Core.WinUI.csproj" />
+    <ProjectReference Include="..\Wino.Core\Wino.Core.NET8.csproj" />
+    <ProjectReference Include="..\Wino.Mail.ViewModels\Wino.Mail.ViewModels.NET8.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Activation\" />
+    <Folder Include="Controls\Advanced\" />
+    <Folder Include="Converters\" />
+    <Folder Include="Helpers\" />
+    <Folder Include="Extensions\" />
+    <Folder Include="BackgroundImages\" />
+    <Folder Include="Behaviors\" />
+    <Folder Include="JS\libs\" />
+    <Folder Include="MenuFlyouts\" />
+    <Folder Include="Dialogs\" />
+    <Folder Include="Services\" />
+    <Folder Include="Selectors\" />
+    <Folder Include="Styles\" />
+    <Folder Include="Views\ImapSetup\" />
+    <Folder Include="Views\Settings\" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\Wino.Mail\JS\editor.js" Link="JS\editor.js" />
+    <None Include="..\Wino.Mail\JS\libs\darkreader.js" Link="JS\libs\darkreader.js" />
+    <None Include="..\Wino.Mail\JS\libs\jodit.min.js" Link="JS\libs\jodit.min.js" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="..\Wino.Mail\Controls\Advanced\WinoAppTitleBar.xaml" Link="Controls\Advanced\WinoAppTitleBar.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="..\Wino.Mail\Controls\MailItemDisplayInformationControl.xaml" Link="Controls\MailItemDisplayInformationControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="..\Wino.Mail\Controls\WinoPivotControl.xaml" Link="Controls\WinoPivotControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="..\Wino.Mail\Dialogs\AccountCreationDialog.xaml" Link="Dialogs\AccountCreationDialog.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="..\Wino.Mail\Dialogs\AccountEditDialog.xaml" Link="Dialogs\AccountEditDialog.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="..\Wino.Mail\Dialogs\AccountPickerDialog.xaml" Link="Dialogs\AccountPickerDialog.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="..\Wino.Mail\Dialogs\AccountReorderDialog.xaml" Link="Dialogs\AccountReorderDialog.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="..\Wino.Mail\Dialogs\ConfirmationDialog.xaml" Link="Dialogs\ConfirmationDialog.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="..\Wino.Mail\Dialogs\CustomThemeBuilderDialog.xaml" Link="Dialogs\CustomThemeBuilderDialog.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="..\Wino.Mail\Dialogs\MoveMailDialog.xaml" Link="Dialogs\MoveMailDialog.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="..\Wino.Mail\Dialogs\NewAccountDialog.xaml" Link="Dialogs\NewAccountDialog.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="..\Wino.Mail\Dialogs\NewImapSetupDialog.xaml" Link="Dialogs\NewImapSetupDialog.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="..\Wino.Mail\Dialogs\SignatureEditorDialog.xaml" Link="Dialogs\SignatureEditorDialog.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="..\Wino.Mail\Dialogs\StoreRatingDialog.xaml" Link="Dialogs\StoreRatingDialog.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="..\Wino.Mail\Dialogs\SystemFolderConfigurationDialog.xaml" Link="Dialogs\SystemFolderConfigurationDialog.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="..\Wino.Mail\Dialogs\TextInputDialog.xaml" Link="Dialogs\TextInputDialog.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="..\Wino.Mail\Dialogs\WinoMessageDialog.xaml" Link="Dialogs\WinoMessageDialog.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="..\Wino.Mail\Styles\Colors.xaml" Link="Styles\Colors.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="..\Wino.Mail\Styles\ContentPresenters.xaml" Link="Styles\ContentPresenters.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="..\Wino.Mail\Styles\Converters.xaml" Link="Styles\Converters.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="..\Wino.Mail\Styles\FontIcons.xaml" Link="Styles\FontIcons.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="..\Wino.Mail\Styles\ImagePreviewControl.xaml" Link="Styles\ImagePreviewControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="..\Wino.Mail\Views\ImapSetup\AdvancedImapSetupPage.xaml" Link="Views\ImapSetup\AdvancedImapSetupPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="..\Wino.Mail\Views\ImapSetup\ImapConnectionFailedPage.xaml" Link="Views\ImapSetup\ImapConnectionFailedPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="..\Wino.Mail\Views\ImapSetup\PreparingImapFoldersPage.xaml" Link="Views\ImapSetup\PreparingImapFoldersPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="..\Wino.Mail\Views\ImapSetup\TestingImapConnectionPage.xaml" Link="Views\ImapSetup\TestingImapConnectionPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="..\Wino.Mail\Views\ImapSetup\WelcomeImapSetupPage.xaml" Link="Views\ImapSetup\WelcomeImapSetupPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="..\Wino.Mail\Views\Settings\SignatureManagementPage.xaml" Link="Views\Settings\SignatureManagementPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
 
   <!--
     Defining the "HasPackageAndPublishMenuAddedByProject" property here allows the Solution
diff --git a/Wino.Mail/Behaviors/BindableCommandBarBehavior.cs b/Wino.Mail/Behaviors/BindableCommandBarBehavior.cs
index afb917fa..cc0b1737 100644
--- a/Wino.Mail/Behaviors/BindableCommandBarBehavior.cs
+++ b/Wino.Mail/Behaviors/BindableCommandBarBehavior.cs
@@ -1,14 +1,22 @@
 using System.Collections;
 using System.Collections.Specialized;
 using System.Windows.Input;
+
 using Microsoft.Xaml.Interactivity;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
 using Wino.Controls;
 using Wino.Core.Domain.Models.Menus;
 using Wino.Helpers;
 
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+
+#endif
 namespace Wino.Behaviors
 {
     public class BindableCommandBarBehavior : Behavior<CommandBar>
diff --git a/Wino.Mail/Behaviors/CreateMailNavigationItemBehavior.cs b/Wino.Mail/Behaviors/CreateMailNavigationItemBehavior.cs
index 6726a351..02452c57 100644
--- a/Wino.Mail/Behaviors/CreateMailNavigationItemBehavior.cs
+++ b/Wino.Mail/Behaviors/CreateMailNavigationItemBehavior.cs
@@ -1,9 +1,15 @@
 using System.Collections.ObjectModel;
 using Microsoft.Xaml.Interactivity;
-using Windows.UI.Xaml;
+
 using Wino.Controls;
 using Wino.Core.MenuItems;
 
+#if NET8_0
+using Microsoft.UI.Xaml;
+#else
+using Windows.UI.Xaml;
+#endif
+
 namespace Wino.Behaviors
 {
     public class CreateMailNavigationItemBehavior : Behavior<WinoNavigationViewItem>
diff --git a/Wino.Mail/Controls/AccountNavigationItem.cs b/Wino.Mail/Controls/AccountNavigationItem.cs
index d19e3f6f..0676da6e 100644
--- a/Wino.Mail/Controls/AccountNavigationItem.cs
+++ b/Wino.Mail/Controls/AccountNavigationItem.cs
@@ -1,8 +1,16 @@
 using System.Numerics;
 using Microsoft.UI.Xaml.Controls;
-using Windows.UI.Xaml;
+
 using Wino.Core.Domain.Interfaces;
 
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Shapes;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Shapes;
+#endif
 namespace Wino.Controls
 {
     public class AccountNavigationItem : WinoNavigationViewItem
@@ -28,7 +36,7 @@ namespace Wino.Controls
         private const string PART_SelectionIndicator = "CustomSelectionIndicator";
 
         private ItemsRepeater _itemsRepeater;
-        private Windows.UI.Xaml.Shapes.Rectangle _selectionIndicator;
+        private Rectangle _selectionIndicator;
 
         public AccountNavigationItem()
         {
@@ -40,7 +48,7 @@ namespace Wino.Controls
             base.OnApplyTemplate();
 
             _itemsRepeater = GetTemplateChild(PART_NavigationViewItemMenuItemsHost) as ItemsRepeater;
-            _selectionIndicator = GetTemplateChild(PART_SelectionIndicator) as Windows.UI.Xaml.Shapes.Rectangle;
+            _selectionIndicator = GetTemplateChild(PART_SelectionIndicator) as Rectangle;
 
             if (_itemsRepeater == null) return;
 
diff --git a/Wino.Mail/Controls/Advanced/WinoAppTitleBar.xaml.cs b/Wino.Mail/Controls/Advanced/WinoAppTitleBar.xaml.cs
index 3bd62e93..2d145b44 100644
--- a/Wino.Mail/Controls/Advanced/WinoAppTitleBar.xaml.cs
+++ b/Wino.Mail/Controls/Advanced/WinoAppTitleBar.xaml.cs
@@ -1,7 +1,12 @@
 using Windows.Foundation;
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-
+#endif
 namespace Wino.Controls.Advanced
 {
     public sealed partial class WinoAppTitleBar : UserControl
diff --git a/Wino.Mail/Controls/Advanced/WinoListView.cs b/Wino.Mail/Controls/Advanced/WinoListView.cs
index a1f7ece3..9a96414e 100644
--- a/Wino.Mail/Controls/Advanced/WinoListView.cs
+++ b/Wino.Mail/Controls/Advanced/WinoListView.cs
@@ -5,14 +5,22 @@ using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.UI.Xaml.Controls;
 using MoreLinq;
 using Serilog;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Models.MailItem;
 using Wino.Extensions;
 using Wino.Mail.ViewModels.Data;
 using Wino.Mail.ViewModels.Messages;
 
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Input;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Input;
+#endif
 namespace Wino.Controls.Advanced
 {
     /// <summary>
@@ -114,7 +122,7 @@ namespace Wino.Controls.Advanced
             }
         }
 
-        private void ProcessDelKey(UIElement sender, Windows.UI.Xaml.Input.ProcessKeyboardAcceleratorEventArgs args)
+        private void ProcessDelKey(UIElement sender, ProcessKeyboardAcceleratorEventArgs args)
         {
             if (args.Key == Windows.System.VirtualKey.Delete)
             {
diff --git a/Wino.Mail/Controls/ImagePreviewControl.cs b/Wino.Mail/Controls/ImagePreviewControl.cs
index 9c0fa0db..966b984a 100644
--- a/Wino.Mail/Controls/ImagePreviewControl.cs
+++ b/Wino.Mail/Controls/ImagePreviewControl.cs
@@ -2,12 +2,22 @@
 using System.Text.RegularExpressions;
 using Fernandezja.ColorHashSharp;
 using Windows.UI;
+
+using Wino.Core.Services;
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Media.Imaging;
+using Microsoft.UI.Xaml.Shapes;
+#else
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Media;
 using Windows.UI.Xaml.Media.Imaging;
 using Windows.UI.Xaml.Shapes;
-using Wino.Core.Services;
+#endif
 
 namespace Wino.Controls
 {
diff --git a/Wino.Mail/Controls/MailItemDisplayInformationControl.xaml.cs b/Wino.Mail/Controls/MailItemDisplayInformationControl.xaml.cs
index 4aee47b7..f6f65652 100644
--- a/Wino.Mail/Controls/MailItemDisplayInformationControl.xaml.cs
+++ b/Wino.Mail/Controls/MailItemDisplayInformationControl.xaml.cs
@@ -3,14 +3,19 @@ using System.ComponentModel;
 using System.Numerics;
 using System.Windows.Input;
 using Microsoft.UI.Xaml.Controls;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Input;
+
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Models.MailItem;
 using Wino.Extensions;
 using Wino.Mail.ViewModels.Data;
-
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Input;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Input;
+#endif
 namespace Wino.Controls
 {
     public sealed partial class MailItemDisplayInformationControl : UserControl, INotifyPropertyChanged
@@ -214,7 +219,7 @@ namespace Wino.Controls
             RootContainerVisualWrapper.SizeChanged += (s, e) => leftBackgroundVisual.Size = e.NewSize.ToVector2();
         }
 
-        private void ControlPointerEntered(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs e)
+        private void ControlPointerEntered(object sender, PointerRoutedEventArgs e)
         {
             if (IsHoverActionsEnabled)
             {
@@ -222,7 +227,7 @@ namespace Wino.Controls
             }
         }
 
-        private void ControlPointerExited(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs e)
+        private void ControlPointerExited(object sender, PointerRoutedEventArgs e)
         {
             if (IsHoverActionsEnabled)
             {
diff --git a/Wino.Mail/Controls/RendererCommandBar.cs b/Wino.Mail/Controls/RendererCommandBar.cs
index 693a7597..6bf58e71 100644
--- a/Wino.Mail/Controls/RendererCommandBar.cs
+++ b/Wino.Mail/Controls/RendererCommandBar.cs
@@ -2,13 +2,18 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Windows.Input;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Models.Menus;
 using Wino.Helpers;
 using Wino.MenuFlyouts;
-
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+#endif
 namespace Wino.Controls
 {
     public class RendererCommandBar : CommandBar, IDisposable
diff --git a/Wino.Mail/Controls/SettingsMenuItemControl.cs b/Wino.Mail/Controls/SettingsMenuItemControl.cs
index b37b45f7..3f5ee019 100644
--- a/Wino.Mail/Controls/SettingsMenuItemControl.cs
+++ b/Wino.Mail/Controls/SettingsMenuItemControl.cs
@@ -1,8 +1,12 @@
-using System;
-using System.Windows.Input;
+using System.Windows.Input;
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-
+#endif
 namespace Wino.Controls
 {
     /// <summary>
diff --git a/Wino.Mail/Controls/WinoFontIcon.cs b/Wino.Mail/Controls/WinoFontIcon.cs
index ba5c9cc3..f5d411d3 100644
--- a/Wino.Mail/Controls/WinoFontIcon.cs
+++ b/Wino.Mail/Controls/WinoFontIcon.cs
@@ -1,5 +1,13 @@
-using Windows.UI.Xaml;
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
+#else
 using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Media;
+#endif
 
 namespace Wino.Controls
 {
@@ -76,7 +84,7 @@ namespace Wino.Controls
 
         public WinoFontIcon()
         {
-            FontFamily = new Windows.UI.Xaml.Media.FontFamily("ms-appx:///Assets/WinoIcons.ttf#WinoIcons");
+            FontFamily = new FontFamily("ms-appx:///Assets/WinoIcons.ttf#WinoIcons");
             FontSize = 32;
         }
 
diff --git a/Wino.Mail/Controls/WinoFontIconSource.cs b/Wino.Mail/Controls/WinoFontIconSource.cs
index 150bf2d8..907d5c9f 100644
--- a/Wino.Mail/Controls/WinoFontIconSource.cs
+++ b/Wino.Mail/Controls/WinoFontIconSource.cs
@@ -1,5 +1,12 @@
-using Windows.UI.Xaml;
+
 
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Media;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Media;
+#endif
 namespace Wino.Controls
 {
     public class WinoFontIconSource : Microsoft.UI.Xaml.Controls.FontIconSource
@@ -14,7 +21,7 @@ namespace Wino.Controls
 
         public WinoFontIconSource()
         {
-            FontFamily = new Windows.UI.Xaml.Media.FontFamily("ms-appx:///Assets/WinoIcons.ttf#WinoIcons");
+            FontFamily = new FontFamily("ms-appx:///Assets/WinoIcons.ttf#WinoIcons");
             FontSize = 32;
         }
 
diff --git a/Wino.Mail/Controls/WinoInfoBar.cs b/Wino.Mail/Controls/WinoInfoBar.cs
index 6f2e288e..fe62d30b 100644
--- a/Wino.Mail/Controls/WinoInfoBar.cs
+++ b/Wino.Mail/Controls/WinoInfoBar.cs
@@ -1,10 +1,16 @@
 using System;
 using System.Numerics;
-using CommunityToolkit.WinUI.Animations;
-using Microsoft.UI.Xaml.Controls;
-using Windows.UI.Xaml;
-using Wino.Core.Domain.Enums;
 
+using Microsoft.UI.Xaml.Controls;
+
+using Wino.Core.Domain.Enums;
+using CommunityToolkit.WinUI.Animations;
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+#else
+using Windows.UI.Xaml;
+#endif
 namespace Wino.Controls
 {
     public class WinoInfoBar : InfoBar
diff --git a/Wino.Mail/Controls/WinoNavigationViewItem.cs b/Wino.Mail/Controls/WinoNavigationViewItem.cs
index e28070b8..0a7b44fb 100644
--- a/Wino.Mail/Controls/WinoNavigationViewItem.cs
+++ b/Wino.Mail/Controls/WinoNavigationViewItem.cs
@@ -1,8 +1,13 @@
 using System.Numerics;
 using Microsoft.UI.Xaml.Controls;
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Hosting;
+#else
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Hosting;
-
+#endif
 namespace Wino.Controls
 {
     public class WinoNavigationViewItem : NavigationViewItem
diff --git a/Wino.Mail/Controls/WinoPivotControl.xaml.cs b/Wino.Mail/Controls/WinoPivotControl.xaml.cs
index 975871bc..05df02ba 100644
--- a/Wino.Mail/Controls/WinoPivotControl.xaml.cs
+++ b/Wino.Mail/Controls/WinoPivotControl.xaml.cs
@@ -1,13 +1,17 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
-using System.Linq;
 using System.Numerics;
-using System.Runtime.InteropServices.WindowsRuntime;
 using System.Threading.Tasks;
 using Windows.Foundation;
-using Windows.Foundation.Collections;
+
+using Wino.Extensions;
+#if NET8_0
+using Microsoft.UI;
+using Microsoft.UI.Composition;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
+#else
 using Windows.UI;
 using Windows.UI.Composition;
 using Windows.UI.Xaml;
@@ -17,8 +21,7 @@ using Windows.UI.Xaml.Data;
 using Windows.UI.Xaml.Input;
 using Windows.UI.Xaml.Media;
 using Windows.UI.Xaml.Navigation;
-using Wino.Extensions;
-
+#endif
 namespace Wino.Controls
 {
     // TODO: Memory leak with FolderPivot bindings.
@@ -131,7 +134,7 @@ namespace Wino.Controls
             {
                 // Get selected item container position
                 // TODO: It's bad...
-                while(PivotHeaders.ContainerFromItem(PivotHeaders.SelectedItem) == null)
+                while (PivotHeaders.ContainerFromItem(PivotHeaders.SelectedItem) == null)
                 {
                     await Task.Delay(100);
                 }
diff --git a/Wino.Mail/Controls/WinoSwipeControlItems.cs b/Wino.Mail/Controls/WinoSwipeControlItems.cs
index eb5cef74..5f3256e3 100644
--- a/Wino.Mail/Controls/WinoSwipeControlItems.cs
+++ b/Wino.Mail/Controls/WinoSwipeControlItems.cs
@@ -1,11 +1,16 @@
 using System.Linq;
 using Microsoft.UI.Xaml.Controls;
-using Windows.UI.Xaml;
+
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Models.MailItem;
 using Wino.Helpers;
 using Wino.Mail.ViewModels.Data;
 
+#if NET8_0
+using Microsoft.UI.Xaml;
+#else
+using Windows.UI.Xaml;
+#endif
 namespace Wino.Controls
 {
     public class WinoSwipeControlItems : SwipeItems
diff --git a/Wino.Mail/Converters/ReverseBooleanConverter.cs b/Wino.Mail/Converters/ReverseBooleanConverter.cs
index d706e0a5..3dd07334 100644
--- a/Wino.Mail/Converters/ReverseBooleanConverter.cs
+++ b/Wino.Mail/Converters/ReverseBooleanConverter.cs
@@ -1,9 +1,11 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+
+
+#if NET8_0
+using Microsoft.UI.Xaml.Data;
+#else
 using Windows.UI.Xaml.Data;
+#endif
 
 namespace Wino.Converters
 {
diff --git a/Wino.Mail/Converters/ReverseBooleanToVisibilityConverter.cs b/Wino.Mail/Converters/ReverseBooleanToVisibilityConverter.cs
index 04eaf98d..7ab054a9 100644
--- a/Wino.Mail/Converters/ReverseBooleanToVisibilityConverter.cs
+++ b/Wino.Mail/Converters/ReverseBooleanToVisibilityConverter.cs
@@ -1,10 +1,13 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Windows.UI.Xaml;
+
+
+#if NET8_0
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml;
+#else
 using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml;
+#endif
 
 namespace Wino.Converters
 {
diff --git a/Wino.Mail/Dialogs/AccountEditDialog.xaml.cs b/Wino.Mail/Dialogs/AccountEditDialog.xaml.cs
index e158b8b3..0ea7efce 100644
--- a/Wino.Mail/Dialogs/AccountEditDialog.xaml.cs
+++ b/Wino.Mail/Dialogs/AccountEditDialog.xaml.cs
@@ -1,6 +1,11 @@
-using Windows.UI.Xaml.Controls;
+
 using Wino.Core.Domain.Entities;
 
+#if NET8_0
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml.Controls;
+#endif
 namespace Wino.Dialogs
 {
     public sealed partial class AccountEditDialog : ContentDialog
diff --git a/Wino.Mail/Dialogs/AccountPickerDialog.xaml.cs b/Wino.Mail/Dialogs/AccountPickerDialog.xaml.cs
index 9b4c46c4..c2fb892e 100644
--- a/Wino.Mail/Dialogs/AccountPickerDialog.xaml.cs
+++ b/Wino.Mail/Dialogs/AccountPickerDialog.xaml.cs
@@ -1,7 +1,12 @@
 using System.Collections.Generic;
-using Windows.UI.Xaml.Controls;
 using Wino.Core.Domain.Entities;
 
+#if NET8_0
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml.Controls;
+#endif
+
 namespace Wino.Dialogs
 {
     public sealed partial class AccountPickerDialog : ContentDialog
diff --git a/Wino.Mail/Dialogs/AccountReorderDialog.xaml.cs b/Wino.Mail/Dialogs/AccountReorderDialog.xaml.cs
index c5433c7e..735db769 100644
--- a/Wino.Mail/Dialogs/AccountReorderDialog.xaml.cs
+++ b/Wino.Mail/Dialogs/AccountReorderDialog.xaml.cs
@@ -1,9 +1,13 @@
 using System.Collections.ObjectModel;
 using System.Linq;
 using Microsoft.Extensions.DependencyInjection;
-using Windows.UI.Xaml.Controls;
 using Wino.Core.Domain.Interfaces;
 
+#if NET8_0
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml.Controls;
+#endif
 namespace Wino.Dialogs
 {
     public sealed partial class AccountReorderDialog : ContentDialog
diff --git a/Wino.Mail/Dialogs/BaseAccountCreationDialog.cs b/Wino.Mail/Dialogs/BaseAccountCreationDialog.cs
index 9c928793..9aff2468 100644
--- a/Wino.Mail/Dialogs/BaseAccountCreationDialog.cs
+++ b/Wino.Mail/Dialogs/BaseAccountCreationDialog.cs
@@ -1,8 +1,14 @@
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+#endif
 namespace Wino.Dialogs
 {
     public abstract class BaseAccountCreationDialog : ContentDialog, IAccountCreationDialog
diff --git a/Wino.Mail/Dialogs/ConfirmationDialog.xaml.cs b/Wino.Mail/Dialogs/ConfirmationDialog.xaml.cs
index a2257157..b0dc5b1a 100644
--- a/Wino.Mail/Dialogs/ConfirmationDialog.xaml.cs
+++ b/Wino.Mail/Dialogs/ConfirmationDialog.xaml.cs
@@ -1,8 +1,14 @@
 using System.Threading.Tasks;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
 using Wino.Core.Domain.Interfaces;
 
+#if NET8_0
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml;
+#else
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml;
+#endif
+
 namespace Wino.Dialogs
 {
     public sealed partial class ConfirmationDialog : ContentDialog, IConfirmationDialog
diff --git a/Wino.Mail/Dialogs/CustomThemeBuilderDialog.xaml.cs b/Wino.Mail/Dialogs/CustomThemeBuilderDialog.xaml.cs
index 633fce37..8c0054e9 100644
--- a/Wino.Mail/Dialogs/CustomThemeBuilderDialog.xaml.cs
+++ b/Wino.Mail/Dialogs/CustomThemeBuilderDialog.xaml.cs
@@ -1,10 +1,17 @@
 using System;
 using CommunityToolkit.WinUI.Helpers;
 using Microsoft.Extensions.DependencyInjection;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Media;
 using Wino.Core.Domain.Interfaces;
-using Wino.Services;
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
+#else
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Media;
+#endif
 
 namespace Wino.Dialogs
 {
@@ -43,7 +50,7 @@ namespace Wino.Dialogs
             }
         }
 
-        private async void BrowseWallpaperClicked(object sender, Windows.UI.Xaml.RoutedEventArgs e)
+        private async void BrowseWallpaperClicked(object sender, RoutedEventArgs e)
         {
             var dialogService = App.Current.Services.GetService<IDialogService>();
 
diff --git a/Wino.Mail/Dialogs/MoveMailDialog.xaml.cs b/Wino.Mail/Dialogs/MoveMailDialog.xaml.cs
index 4c0d92a6..7cfcb998 100644
--- a/Wino.Mail/Dialogs/MoveMailDialog.xaml.cs
+++ b/Wino.Mail/Dialogs/MoveMailDialog.xaml.cs
@@ -1,9 +1,15 @@
 using System.Collections.Generic;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Models.Folders;
 
+#if NET8_0
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml;
+#else
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml;
+#endif
+
 namespace Wino.Dialogs
 {
     public sealed partial class MoveMailDialog : ContentDialog
diff --git a/Wino.Mail/Dialogs/NewAccountDialog.xaml.cs b/Wino.Mail/Dialogs/NewAccountDialog.xaml.cs
index 2ed4a7e7..a2e4f0e8 100644
--- a/Wino.Mail/Dialogs/NewAccountDialog.xaml.cs
+++ b/Wino.Mail/Dialogs/NewAccountDialog.xaml.cs
@@ -1,9 +1,15 @@
 using System.Collections.Generic;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Accounts;
 
+#if NET8_0
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml;
+#else
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml;
+#endif
+
 namespace Wino.Dialogs
 {
     public sealed partial class NewAccountDialog : ContentDialog
diff --git a/Wino.Mail/Dialogs/NewImapSetupDialog.xaml.cs b/Wino.Mail/Dialogs/NewImapSetupDialog.xaml.cs
index d0746c83..9bfceacd 100644
--- a/Wino.Mail/Dialogs/NewImapSetupDialog.xaml.cs
+++ b/Wino.Mail/Dialogs/NewImapSetupDialog.xaml.cs
@@ -1,14 +1,22 @@
 using System;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.Messaging;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Media.Animation;
+
 using Wino.Core.Domain.Entities;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Messages.Mails;
 using Wino.Views.ImapSetup;
 
+
+#if NET8_0
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media.Animation;
+#else
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Media.Animation;
+#endif
+
 namespace Wino.Dialogs
 {
     public enum ImapSetupState
diff --git a/Wino.Mail/Dialogs/SignatureEditorDialog.xaml.cs b/Wino.Mail/Dialogs/SignatureEditorDialog.xaml.cs
index 753ae356..d4108506 100644
--- a/Wino.Mail/Dialogs/SignatureEditorDialog.xaml.cs
+++ b/Wino.Mail/Dialogs/SignatureEditorDialog.xaml.cs
@@ -5,14 +5,22 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Web.WebView2.Core;
 using Newtonsoft.Json;
 using Windows.UI.ViewManagement.Core;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+
 using Wino.Core.Domain;
 using Wino.Core.Domain.Entities;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Requests;
 using Wino.Views.Settings;
 
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+#endif
+
 namespace Wino.Dialogs
 {
     public sealed partial class SignatureEditorDialog : ContentDialog
diff --git a/Wino.Mail/Dialogs/StoreRatingDialog.xaml.cs b/Wino.Mail/Dialogs/StoreRatingDialog.xaml.cs
index eb6a771b..8d025c2c 100644
--- a/Wino.Mail/Dialogs/StoreRatingDialog.xaml.cs
+++ b/Wino.Mail/Dialogs/StoreRatingDialog.xaml.cs
@@ -1,6 +1,10 @@
-using Windows.UI.Xaml.Controls;
-using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Interfaces;
 
+#if NET8_0
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml.Controls;
+#endif
 namespace Wino.Dialogs
 {
     public sealed partial class StoreRatingDialog : ContentDialog, IStoreRatingDialog
diff --git a/Wino.Mail/Dialogs/SystemFolderConfigurationDialog.xaml.cs b/Wino.Mail/Dialogs/SystemFolderConfigurationDialog.xaml.cs
index 70aee9d5..c19e3532 100644
--- a/Wino.Mail/Dialogs/SystemFolderConfigurationDialog.xaml.cs
+++ b/Wino.Mail/Dialogs/SystemFolderConfigurationDialog.xaml.cs
@@ -1,12 +1,15 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Windows.UI.Xaml.Controls;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Entities;
 using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Exceptions;
 
+#if NET8_0
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml.Controls;
+#endif
 namespace Wino.Dialogs
 {
     public sealed partial class SystemFolderConfigurationDialog : ContentDialog
diff --git a/Wino.Mail/Dialogs/TextInputDialog.xaml.cs b/Wino.Mail/Dialogs/TextInputDialog.xaml.cs
index 443505d2..0e75d0f7 100644
--- a/Wino.Mail/Dialogs/TextInputDialog.xaml.cs
+++ b/Wino.Mail/Dialogs/TextInputDialog.xaml.cs
@@ -1,5 +1,11 @@
-using Windows.UI.Xaml;
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
+#endif
 
 namespace Wino.Dialogs
 {
diff --git a/Wino.Mail/Dialogs/WinoMessageDialog.xaml.cs b/Wino.Mail/Dialogs/WinoMessageDialog.xaml.cs
index 4e30b9b9..b4a90600 100644
--- a/Wino.Mail/Dialogs/WinoMessageDialog.xaml.cs
+++ b/Wino.Mail/Dialogs/WinoMessageDialog.xaml.cs
@@ -1,7 +1,12 @@
 using System.Threading.Tasks;
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-
+#endif
 namespace Wino.Dialogs
 {
     public sealed partial class WinoMessageDialog : ContentDialog
diff --git a/Wino.Mail/Extensions/AnimationExtensions.cs b/Wino.Mail/Extensions/AnimationExtensions.cs
index 6ad7cb8a..da45280c 100644
--- a/Wino.Mail/Extensions/AnimationExtensions.cs
+++ b/Wino.Mail/Extensions/AnimationExtensions.cs
@@ -1,13 +1,16 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Numerics;
-using System.Text;
-using System.Threading.Tasks;
-using Windows.UI.Composition;
+
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Media.Animation;
+using Microsoft.UI.Composition;
+#else
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Media.Animation;
-
+using Windows.UI.Composition;
+#endif
 namespace Wino.Extensions
 {
     public static class AnimationExtensions
diff --git a/Wino.Mail/Extensions/CompositionEnums.cs b/Wino.Mail/Extensions/CompositionEnums.cs
index 4ac01d05..d307311e 100644
--- a/Wino.Mail/Extensions/CompositionEnums.cs
+++ b/Wino.Mail/Extensions/CompositionEnums.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Wino.Extensions
 {
diff --git a/Wino.Mail/Extensions/CompositionExtensions.Implicit.cs b/Wino.Mail/Extensions/CompositionExtensions.Implicit.cs
index d043fd45..b61608db 100644
--- a/Wino.Mail/Extensions/CompositionExtensions.Implicit.cs
+++ b/Wino.Mail/Extensions/CompositionExtensions.Implicit.cs
@@ -1,13 +1,15 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Numerics;
-using System.Text;
-using System.Threading.Tasks;
-using Windows.UI.Composition;
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Hosting;
+using Microsoft.UI.Composition;
+#else
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Hosting;
-
+using Windows.UI.Composition;
+#endif
 namespace Wino.Extensions
 {
     public static partial class CompositionExtensions
diff --git a/Wino.Mail/Extensions/CompositionExtensions.Size.cs b/Wino.Mail/Extensions/CompositionExtensions.Size.cs
index 42adf0af..0f634f27 100644
--- a/Wino.Mail/Extensions/CompositionExtensions.Size.cs
+++ b/Wino.Mail/Extensions/CompositionExtensions.Size.cs
@@ -1,9 +1,15 @@
 using System;
 using System.Numerics;
 using System.Threading.Tasks;
-using Windows.UI.Composition;
-using Windows.UI.Xaml;
 
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Composition;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Composition;
+#endif
 namespace Wino.Extensions
 {
     public static partial class CompositionExtensions
@@ -51,7 +57,6 @@ namespace Wino.Extensions
             {
                 to = Vector2.One;
             }
-
             visual.StartAnimation("Size",
                 compositor.CreateVector2KeyFrameAnimation(from, to.Value, duration, delay, easing, iterationBehavior));
 
diff --git a/Wino.Mail/Extensions/MimeKitExtensions.cs b/Wino.Mail/Extensions/MimeKitExtensions.cs
index 1e400e16..d642444f 100644
--- a/Wino.Mail/Extensions/MimeKitExtensions.cs
+++ b/Wino.Mail/Extensions/MimeKitExtensions.cs
@@ -1,7 +1,6 @@
-using System.IO;
-using System.Threading.Tasks;
-using Microsoft.Toolkit.Uwp.Helpers;
+using System.Threading.Tasks;
 using Windows.Storage;
+using Wino.Helpers;
 using Wino.Mail.ViewModels.Data;
 
 namespace Wino.Extensions
diff --git a/Wino.Mail/Extensions/UtilExtensions.cs b/Wino.Mail/Extensions/UtilExtensions.cs
index bfbea266..807b8db1 100644
--- a/Wino.Mail/Extensions/UtilExtensions.cs
+++ b/Wino.Mail/Extensions/UtilExtensions.cs
@@ -2,12 +2,21 @@
 using System.Collections.Generic;
 using System.Linq;
 using Windows.Foundation;
-using Windows.UI.Composition;
+
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Hosting;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Composition;
+#else
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Hosting;
 using Windows.UI.Xaml.Media;
-
+using Windows.UI.Composition;
+#endif
 namespace Wino.Extensions
 {
     public static class UtilExtensions
diff --git a/Wino.Mail/Helpers/WinoVisualTreeHelper.cs b/Wino.Mail/Helpers/WinoVisualTreeHelper.cs
index ded3482e..5d47dba5 100644
--- a/Wino.Mail/Helpers/WinoVisualTreeHelper.cs
+++ b/Wino.Mail/Helpers/WinoVisualTreeHelper.cs
@@ -1,10 +1,18 @@
-using System;
+
+
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Media;
+#else
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Media;
+#endif
 
 namespace Wino.Helpers
 {
diff --git a/Wino.Mail/Helpers/XamlHelpers.cs b/Wino.Mail/Helpers/XamlHelpers.cs
index 9d7d5149..72ba29f7 100644
--- a/Wino.Mail/Helpers/XamlHelpers.cs
+++ b/Wino.Mail/Helpers/XamlHelpers.cs
@@ -1,19 +1,33 @@
 using System;
 using System.Linq;
-using Microsoft.Toolkit.Uwp.Helpers;
 using Microsoft.UI.Xaml.Controls;
-using Windows.UI;
-using Windows.UI.Text;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Markup;
-using Windows.UI.Xaml.Media;
+
 using Wino.Controls;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Models.MailItem;
 using Wino.Core.Domain.Models.Reader;
+using Windows.UI.Text;
 
+
+
+#if NET8_0
+using Microsoft.UI;
+using Microsoft.UI.Text;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Markup;
+using Microsoft.UI.Xaml.Media;
+using CommunityToolkit.WinUI.Helpers;
+using Microsoft.UI.Xaml.Shapes;
+#else
+using Windows.UI;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Markup;
+using Windows.UI.Xaml.Media;
+using Microsoft.Toolkit.Uwp.Helpers;
+using Windows.UI.Xaml.Shapes;
+#endif
 namespace Wino.Helpers
 {
     public static class XamlHelpers
@@ -276,7 +290,7 @@ namespace Wino.Helpers
             "<Path " +
             "xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation'>" +
             "<Path.Data>" + pathMarkup + "</Path.Data></Path>";
-            var path = XamlReader.Load(xaml) as Windows.UI.Xaml.Shapes.Path;
+            var path = XamlReader.Load(xaml) as Path;
 
             Geometry geometry = path.Data;
             path.Data = null;
diff --git a/Wino.Mail/MenuFlyouts/AccountSelectorFlyout.cs b/Wino.Mail/MenuFlyouts/AccountSelectorFlyout.cs
index 134623f1..4d3ab259 100644
--- a/Wino.Mail/MenuFlyouts/AccountSelectorFlyout.cs
+++ b/Wino.Mail/MenuFlyouts/AccountSelectorFlyout.cs
@@ -2,11 +2,19 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Windows.UI.Xaml.Controls;
+
 using Wino.Controls;
 using Wino.Core.Domain.Entities;
 using Wino.Helpers;
 
+#if NET8_0
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml;
+#else
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml;
+#endif
+
 namespace Wino.MenuFlyouts
 {
     public class AccountSelectorFlyout : MenuFlyout, IDisposable
@@ -40,7 +48,7 @@ namespace Wino.MenuFlyouts
             }
         }
 
-        private async void AccountClicked(object sender, Windows.UI.Xaml.RoutedEventArgs e)
+        private async void AccountClicked(object sender, RoutedEventArgs e)
         {
             if (sender is MenuFlyoutItem menuItem && menuItem.Tag is string accountAddress)
             {
diff --git a/Wino.Mail/MenuFlyouts/FilterMenuFlyout.cs b/Wino.Mail/MenuFlyouts/FilterMenuFlyout.cs
index 67530eb6..6901dca3 100644
--- a/Wino.Mail/MenuFlyouts/FilterMenuFlyout.cs
+++ b/Wino.Mail/MenuFlyouts/FilterMenuFlyout.cs
@@ -1,12 +1,17 @@
 using System.Collections.Generic;
 using System.Linq;
 using CommunityToolkit.Mvvm.Input;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
 using Wino.Controls;
 using Wino.Core.Domain.Models.Reader;
 using Wino.Helpers;
 
+#if NET8_0
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml;
+#else
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml;
+#endif
 namespace Wino.MenuFlyouts
 {
     public class FilterMenuFlyout : MenuFlyout
diff --git a/Wino.Mail/MenuFlyouts/FolderOperationFlyout.cs b/Wino.Mail/MenuFlyouts/FolderOperationFlyout.cs
index c3ef1f51..69482907 100644
--- a/Wino.Mail/MenuFlyouts/FolderOperationFlyout.cs
+++ b/Wino.Mail/MenuFlyouts/FolderOperationFlyout.cs
@@ -1,9 +1,15 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Windows.UI.Xaml.Controls;
+
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Models.Folders;
 
+#if NET8_0
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml.Controls;
+#endif
+
 namespace Wino.MenuFlyouts.Context
 {
     public class FolderOperationFlyout : WinoOperationFlyout<FolderOperationMenuItem>
diff --git a/Wino.Mail/MenuFlyouts/MailOperationFlyout.cs b/Wino.Mail/MenuFlyouts/MailOperationFlyout.cs
index a5982881..83a89954 100644
--- a/Wino.Mail/MenuFlyouts/MailOperationFlyout.cs
+++ b/Wino.Mail/MenuFlyouts/MailOperationFlyout.cs
@@ -1,9 +1,15 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Windows.UI.Xaml.Controls;
+
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Models.Menus;
 
+
+#if NET8_0
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml.Controls;
+#endif
 namespace Wino.MenuFlyouts.Context
 {
     public class MailOperationFlyout : WinoOperationFlyout<MailOperationMenuItem>
diff --git a/Wino.Mail/MenuFlyouts/MoveButtonFlyout.cs b/Wino.Mail/MenuFlyouts/MoveButtonFlyout.cs
index cee02589..c7d737b8 100644
--- a/Wino.Mail/MenuFlyouts/MoveButtonFlyout.cs
+++ b/Wino.Mail/MenuFlyouts/MoveButtonFlyout.cs
@@ -2,9 +2,15 @@
 using System.Collections.Generic;
 using System.Linq;
 using Windows.Foundation;
+using Wino.Core.Domain.Entities;
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using Wino.Core.Domain.Entities;
+#endif
 
 namespace Wino.MenuFlyouts
 {
diff --git a/Wino.Mail/MenuFlyouts/RendererCommandBarItem.cs b/Wino.Mail/MenuFlyouts/RendererCommandBarItem.cs
index 7e4b20d4..1ff9eb58 100644
--- a/Wino.Mail/MenuFlyouts/RendererCommandBarItem.cs
+++ b/Wino.Mail/MenuFlyouts/RendererCommandBarItem.cs
@@ -1,10 +1,16 @@
 using System;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+
 using Wino.Controls;
 using Wino.Core.Domain.Enums;
 using Wino.Helpers;
 
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+#endif
 namespace Wino.MenuFlyouts
 {
     public class RendererCommandBarItem : AppBarButton, IDisposable
@@ -26,7 +32,7 @@ namespace Wino.MenuFlyouts
             Click += MenuClicked;
         }
 
-        private void MenuClicked(object sender, Windows.UI.Xaml.RoutedEventArgs e)
+        private void MenuClicked(object sender, RoutedEventArgs e)
         {
             Clicked(Operation);
         }
diff --git a/Wino.Mail/MenuFlyouts/WinoOperationFlyout.cs b/Wino.Mail/MenuFlyouts/WinoOperationFlyout.cs
index 6ecd9996..9882ddf9 100644
--- a/Wino.Mail/MenuFlyouts/WinoOperationFlyout.cs
+++ b/Wino.Mail/MenuFlyouts/WinoOperationFlyout.cs
@@ -1,8 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Windows.UI.Xaml.Controls;
 
+#if NET8_0
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+#else
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+#endif
 namespace Wino.MenuFlyouts
 {
     public class WinoOperationFlyout<TActionType> : MenuFlyout, IDisposable where TActionType : class
@@ -22,7 +28,7 @@ namespace Wino.MenuFlyouts
             Closing += FlyoutClosing;
         }
 
-        private void FlyoutClosing(Windows.UI.Xaml.Controls.Primitives.FlyoutBase sender, Windows.UI.Xaml.Controls.Primitives.FlyoutBaseClosingEventArgs args)
+        private void FlyoutClosing(FlyoutBase sender, FlyoutBaseClosingEventArgs args)
         {
             Closing -= FlyoutClosing;
 
diff --git a/Wino.Mail/MenuFlyouts/WinoOperationFlyoutItem.cs b/Wino.Mail/MenuFlyouts/WinoOperationFlyoutItem.cs
index ab0fdc04..3161f2a4 100644
--- a/Wino.Mail/MenuFlyouts/WinoOperationFlyoutItem.cs
+++ b/Wino.Mail/MenuFlyouts/WinoOperationFlyoutItem.cs
@@ -1,12 +1,19 @@
 using System;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+
 using Wino.Controls;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Folders;
 using Wino.Core.Domain.Models.Menus;
 using Wino.Helpers;
 
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+#endif
+
 namespace Wino.MenuFlyouts
 {
     public class WinoOperationFlyoutItem<TOperationMenuItem> : MenuFlyoutItem, IDisposable where TOperationMenuItem : IMenuOperation
@@ -45,7 +52,7 @@ namespace Wino.MenuFlyouts
             Click += MenuClicked;
         }
 
-        private void MenuClicked(object sender, Windows.UI.Xaml.RoutedEventArgs e)
+        private void MenuClicked(object sender, RoutedEventArgs e)
         {
             Clicked(Operation);
         }
diff --git a/Wino.Mail/Selectors/AccountProviderViewModelTemplateSelector.cs b/Wino.Mail/Selectors/AccountProviderViewModelTemplateSelector.cs
index 73b71c4e..f1a242fa 100644
--- a/Wino.Mail/Selectors/AccountProviderViewModelTemplateSelector.cs
+++ b/Wino.Mail/Selectors/AccountProviderViewModelTemplateSelector.cs
@@ -1,7 +1,14 @@
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+
 using Wino.Mail.ViewModels.Data;
 
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+#endif
+
 namespace Wino.Selectors
 {
     public class AccountProviderViewModelTemplateSelector : DataTemplateSelector
diff --git a/Wino.Mail/Selectors/AccountReorderTemplateSelector.cs b/Wino.Mail/Selectors/AccountReorderTemplateSelector.cs
index 07574892..53dd3d6a 100644
--- a/Wino.Mail/Selectors/AccountReorderTemplateSelector.cs
+++ b/Wino.Mail/Selectors/AccountReorderTemplateSelector.cs
@@ -1,7 +1,14 @@
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+
 using Wino.Mail.ViewModels.Data;
 
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+#endif
+
 namespace Wino.Selectors
 {
     public class AccountReorderTemplateSelector : DataTemplateSelector
diff --git a/Wino.Mail/Selectors/AppThemePreviewTemplateSelector.cs b/Wino.Mail/Selectors/AppThemePreviewTemplateSelector.cs
index f3afe31e..7d27b96d 100644
--- a/Wino.Mail/Selectors/AppThemePreviewTemplateSelector.cs
+++ b/Wino.Mail/Selectors/AppThemePreviewTemplateSelector.cs
@@ -1,7 +1,14 @@
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+
 using Wino.Core.UWP.Models.Personalization;
 
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+#endif
+
 namespace Wino.Selectors
 {
     public class AppThemePreviewTemplateSelector : DataTemplateSelector
diff --git a/Wino.Mail/Selectors/FileAttachmentTypeSelector.cs b/Wino.Mail/Selectors/FileAttachmentTypeSelector.cs
index e117fcd2..ac5e8441 100644
--- a/Wino.Mail/Selectors/FileAttachmentTypeSelector.cs
+++ b/Wino.Mail/Selectors/FileAttachmentTypeSelector.cs
@@ -1,11 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Wino.Core.Domain.Enums;
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using Wino.Core.Domain.Enums;
+#endif
 
 namespace Wino.Selectors
 {
diff --git a/Wino.Mail/Selectors/MailItemContainerStyleSelector.cs b/Wino.Mail/Selectors/MailItemContainerStyleSelector.cs
index 17959c3f..131f4895 100644
--- a/Wino.Mail/Selectors/MailItemContainerStyleSelector.cs
+++ b/Wino.Mail/Selectors/MailItemContainerStyleSelector.cs
@@ -1,7 +1,14 @@
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+
 using Wino.Mail.ViewModels.Data;
 
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+#endif
+
 namespace Wino.Selectors
 {
     public class MailItemContainerStyleSelector : StyleSelector
diff --git a/Wino.Mail/Selectors/MailItemDisplayModePreviewTemplateSelector.cs b/Wino.Mail/Selectors/MailItemDisplayModePreviewTemplateSelector.cs
index 55949830..0d2692ac 100644
--- a/Wino.Mail/Selectors/MailItemDisplayModePreviewTemplateSelector.cs
+++ b/Wino.Mail/Selectors/MailItemDisplayModePreviewTemplateSelector.cs
@@ -1,7 +1,14 @@
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+
 using Wino.Core.Domain.Enums;
 
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+#endif
+
 namespace Wino.Selectors
 {
     /// <summary>
diff --git a/Wino.Mail/Selectors/MailItemDisplaySelector.cs b/Wino.Mail/Selectors/MailItemDisplaySelector.cs
index fe7a3cf1..cca31237 100644
--- a/Wino.Mail/Selectors/MailItemDisplaySelector.cs
+++ b/Wino.Mail/Selectors/MailItemDisplaySelector.cs
@@ -1,6 +1,12 @@
-using Windows.UI.Xaml;
+using Wino.Mail.ViewModels.Data;
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using Wino.Mail.ViewModels.Data;
+#endif
 
 namespace Wino.Selectors
 {
diff --git a/Wino.Mail/Selectors/NavigationMenuTemplateSelector.cs b/Wino.Mail/Selectors/NavigationMenuTemplateSelector.cs
index ce929a30..5e3518f6 100644
--- a/Wino.Mail/Selectors/NavigationMenuTemplateSelector.cs
+++ b/Wino.Mail/Selectors/NavigationMenuTemplateSelector.cs
@@ -1,7 +1,14 @@
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+
 using Wino.Core.MenuItems;
 
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+#endif
+
 namespace Wino.Selectors
 {
     public class NavigationMenuTemplateSelector : DataTemplateSelector
diff --git a/Wino.Mail/Selectors/RendererCommandBarItemTemplateSelector.cs b/Wino.Mail/Selectors/RendererCommandBarItemTemplateSelector.cs
index 2ad2dd67..22b55425 100644
--- a/Wino.Mail/Selectors/RendererCommandBarItemTemplateSelector.cs
+++ b/Wino.Mail/Selectors/RendererCommandBarItemTemplateSelector.cs
@@ -1,8 +1,13 @@
-using Windows.Graphics.Printing.OptionDetails;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Models.Menus;
+
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Models.Menus;
+#endif
 
 namespace Wino.Selectors
 {
diff --git a/Wino.Mail/Services/ApplicationResourceManager.cs b/Wino.Mail/Services/ApplicationResourceManager.cs
index 24ef610b..58a773f2 100644
--- a/Wino.Mail/Services/ApplicationResourceManager.cs
+++ b/Wino.Mail/Services/ApplicationResourceManager.cs
@@ -1,7 +1,11 @@
 using System.Linq;
-using Windows.UI.Xaml;
 using Wino.Core.Domain.Interfaces;
 
+#if NET8_0
+using Microsoft.UI.Xaml;
+#else
+using Windows.UI.Xaml;
+#endif
 namespace Wino.Services
 {
     public class ApplicationResourceManager : IApplicationResourceManager<ResourceDictionary>
diff --git a/Wino.Mail/Views/ImapSetup/AdvancedImapSetupPage.xaml.cs b/Wino.Mail/Views/ImapSetup/AdvancedImapSetupPage.xaml.cs
index 5dff0f3e..49591483 100644
--- a/Wino.Mail/Views/ImapSetup/AdvancedImapSetupPage.xaml.cs
+++ b/Wino.Mail/Views/ImapSetup/AdvancedImapSetupPage.xaml.cs
@@ -1,15 +1,22 @@
 using System;
 using System.Collections.Generic;
 using CommunityToolkit.Mvvm.Messaging;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Navigation;
+
 using Wino.Core.Domain;
 using Wino.Core.Domain.Entities;
 using Wino.Core.Domain.Models.Accounts;
 using Wino.Core.Domain.Models.AutoDiscovery;
 using Wino.Core.Messages.Mails;
 
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Navigation;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Navigation;
+#endif
 
 namespace Wino.Views.ImapSetup
 {
diff --git a/Wino.Mail/Views/ImapSetup/ImapConnectionFailedPage.xaml.cs b/Wino.Mail/Views/ImapSetup/ImapConnectionFailedPage.xaml.cs
index b0331ebf..432098c8 100644
--- a/Wino.Mail/Views/ImapSetup/ImapConnectionFailedPage.xaml.cs
+++ b/Wino.Mail/Views/ImapSetup/ImapConnectionFailedPage.xaml.cs
@@ -1,13 +1,20 @@
 using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.Extensions.DependencyInjection;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Navigation;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Exceptions;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Messages.Mails;
 
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Navigation;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Navigation;
+#endif
+
 namespace Wino.Views.ImapSetup
 {
     public sealed partial class ImapConnectionFailedPage : Page
diff --git a/Wino.Mail/Views/ImapSetup/PreparingImapFoldersPage.xaml.cs b/Wino.Mail/Views/ImapSetup/PreparingImapFoldersPage.xaml.cs
index 4939d9bd..82e069ec 100644
--- a/Wino.Mail/Views/ImapSetup/PreparingImapFoldersPage.xaml.cs
+++ b/Wino.Mail/Views/ImapSetup/PreparingImapFoldersPage.xaml.cs
@@ -1,25 +1,13 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
+
+#if NET8_0
+using Microsoft.UI.Xaml.Controls;
+#else
 using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
-
-// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
+#endif
 
 namespace Wino.Views.ImapSetup
 {
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
+
     public sealed partial class PreparingImapFoldersPage : Page
     {
         public PreparingImapFoldersPage()
diff --git a/Wino.Mail/Views/ImapSetup/TestingImapConnectionPage.xaml.cs b/Wino.Mail/Views/ImapSetup/TestingImapConnectionPage.xaml.cs
index ff8028b8..129acb22 100644
--- a/Wino.Mail/Views/ImapSetup/TestingImapConnectionPage.xaml.cs
+++ b/Wino.Mail/Views/ImapSetup/TestingImapConnectionPage.xaml.cs
@@ -2,15 +2,19 @@
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.Extensions.DependencyInjection;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Navigation;
 using Wino.Core.Domain.Entities;
 using Wino.Core.Domain.Exceptions;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.AutoDiscovery;
 using Wino.Core.Messages.Mails;
 
-
+#if NET8_0
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Navigation;
+#else
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Navigation;
+#endif
 namespace Wino.Views.ImapSetup
 {
     public sealed partial class TestingImapConnectionPage : Page
diff --git a/Wino.Mail/Views/ImapSetup/WelcomeImapSetupPage.xaml.cs b/Wino.Mail/Views/ImapSetup/WelcomeImapSetupPage.xaml.cs
index 042821ba..cb44c4f3 100644
--- a/Wino.Mail/Views/ImapSetup/WelcomeImapSetupPage.xaml.cs
+++ b/Wino.Mail/Views/ImapSetup/WelcomeImapSetupPage.xaml.cs
@@ -2,16 +2,21 @@
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.Extensions.DependencyInjection;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Navigation;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Entities;
 using Wino.Core.Domain.Exceptions;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.AutoDiscovery;
 using Wino.Core.Messages.Mails;
-
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Navigation;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Navigation;
+#endif
 
 namespace Wino.Views.ImapSetup
 {