diff --git a/Wino.Core.Domain/Models/Accounts/ProviderDetail.cs b/Wino.Core.Domain/Models/Accounts/ProviderDetail.cs
index c5449892..226b35a4 100644
--- a/Wino.Core.Domain/Models/Accounts/ProviderDetail.cs
+++ b/Wino.Core.Domain/Models/Accounts/ProviderDetail.cs
@@ -17,11 +17,11 @@ public class ProviderDetail : IProviderDetail
         {
             if (SpecialImapProvider == SpecialImapProvider.None)
             {
-                return $"/Wino.Core.UWP/Assets/Providers/{Type}.png";
+                return $"/Wino.Core.WinUI/Assets/Providers/{Type}.png";
             }
             else
             {
-                return $"/Wino.Core.UWP/Assets/Providers/{SpecialImapProvider}.png";
+                return $"/Wino.Core.WinUI/Assets/Providers/{SpecialImapProvider}.png";
             }
         }
     }
diff --git a/Wino.Core.WinUI/AppThemes/Clouds.xaml b/Wino.Core.WinUI/AppThemes/Clouds.xaml
index 75210457..eb77ee44 100644
--- a/Wino.Core.WinUI/AppThemes/Clouds.xaml
+++ b/Wino.Core.WinUI/AppThemes/Clouds.xaml
@@ -4,7 +4,7 @@
     xmlns:xaml="using:Microsoft.UI.Xaml">
 
     <x:String x:Key="ThemeName">Clouds</x:String>
-    <x:String x:Key="ThemeBackgroundImage">ms-appx:///Wino.Core.UWP/BackgroundImages/Clouds.jpg</x:String>
+    <x:String x:Key="ThemeBackgroundImage">ms-appx:///Wino.Core.WinUI/BackgroundImages/Clouds.jpg</x:String>
     <x:Boolean x:Key="UseMica">False</x:Boolean>
 
     <ImageBrush x:Key="WinoApplicationBackgroundColor" ImageSource="{StaticResource ThemeBackgroundImage}" />
diff --git a/Wino.Core.WinUI/AppThemes/Forest.xaml b/Wino.Core.WinUI/AppThemes/Forest.xaml
index c39bfdf6..9584b11f 100644
--- a/Wino.Core.WinUI/AppThemes/Forest.xaml
+++ b/Wino.Core.WinUI/AppThemes/Forest.xaml
@@ -4,7 +4,7 @@
     xmlns:xaml="using:Microsoft.UI.Xaml">
 
     <x:String x:Key="ThemeName">Forest</x:String>
-    <x:String x:Key="ThemeBackgroundImage">ms-appx:///Wino.Core.UWP/BackgroundImages/Forest.jpg</x:String>
+    <x:String x:Key="ThemeBackgroundImage">ms-appx:///Wino.Core.WinUI/BackgroundImages/Forest.jpg</x:String>
     <x:Boolean x:Key="UseMica">False</x:Boolean>
 
     <ImageBrush x:Key="WinoApplicationBackgroundColor" ImageSource="{StaticResource ThemeBackgroundImage}" />
diff --git a/Wino.Core.WinUI/AppThemes/Garden.xaml b/Wino.Core.WinUI/AppThemes/Garden.xaml
index b3763e48..84e057a6 100644
--- a/Wino.Core.WinUI/AppThemes/Garden.xaml
+++ b/Wino.Core.WinUI/AppThemes/Garden.xaml
@@ -4,7 +4,7 @@
     xmlns:xaml="using:Microsoft.UI.Xaml">
 
     <x:String x:Key="ThemeName">Garden</x:String>
-    <x:String x:Key="ThemeBackgroundImage">ms-appx:///Wino.Core.UWP/BackgroundImages/Garden.jpg</x:String>
+    <x:String x:Key="ThemeBackgroundImage">ms-appx:///Wino.Core.WinUI/BackgroundImages/Garden.jpg</x:String>
     <x:Boolean x:Key="UseMica">False</x:Boolean>
 
     <ImageBrush x:Key="WinoApplicationBackgroundColor" ImageSource="{StaticResource ThemeBackgroundImage}" />
diff --git a/Wino.Core.WinUI/AppThemes/Nighty.xaml b/Wino.Core.WinUI/AppThemes/Nighty.xaml
index 99c94e63..f6cdcb91 100644
--- a/Wino.Core.WinUI/AppThemes/Nighty.xaml
+++ b/Wino.Core.WinUI/AppThemes/Nighty.xaml
@@ -4,7 +4,7 @@
     xmlns:xaml="using:Microsoft.UI.Xaml">
 
     <x:String x:Key="ThemeName">Nighty</x:String>
-    <x:String x:Key="ThemeBackgroundImage">ms-appx:///Wino.Core.UWP/BackgroundImages/Nighty.jpg</x:String>
+    <x:String x:Key="ThemeBackgroundImage">ms-appx:///Wino.Core.WinUI/BackgroundImages/Nighty.jpg</x:String>
     <x:Boolean x:Key="UseMica">False</x:Boolean>
 
     <ImageBrush x:Key="WinoApplicationBackgroundColor" ImageSource="{StaticResource ThemeBackgroundImage}" />
diff --git a/Wino.Core.WinUI/AppThemes/Snowflake.xaml b/Wino.Core.WinUI/AppThemes/Snowflake.xaml
index 63631e04..0f4450ae 100644
--- a/Wino.Core.WinUI/AppThemes/Snowflake.xaml
+++ b/Wino.Core.WinUI/AppThemes/Snowflake.xaml
@@ -4,7 +4,7 @@
     xmlns:xaml="using:Microsoft.UI.Xaml">
 
     <x:String x:Key="ThemeName">Snowflake</x:String>
-    <x:String x:Key="ThemeBackgroundImage">ms-appx:///Wino.Core.UWP/BackgroundImages/Snowflake.jpg</x:String>
+    <x:String x:Key="ThemeBackgroundImage">ms-appx:///Wino.Core.WinUI/BackgroundImages/Snowflake.jpg</x:String>
     <x:Boolean x:Key="UseMica">False</x:Boolean>
 
     <ImageBrush x:Key="WinoApplicationBackgroundColor" ImageSource="{StaticResource ThemeBackgroundImage}" />
diff --git a/Wino.Core.WinUI/BasePage.cs b/Wino.Core.WinUI/BasePage.cs
index 74835584..f25a7c9c 100644
--- a/Wino.Core.WinUI/BasePage.cs
+++ b/Wino.Core.WinUI/BasePage.cs
@@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Navigation;
 using Wino.Core.ViewModels;
 using Wino.Messaging.Client.Shell;
 
-namespace Wino.Core.UWP;
+namespace Wino.Core.WinUI;
 
 public partial class BasePage : Page, IRecipient<LanguageChanged>
 {
diff --git a/Wino.Core.WinUI/Controls/AccountCreationDialogControl.xaml b/Wino.Core.WinUI/Controls/AccountCreationDialogControl.xaml
index ae38dd73..5f4cc520 100644
--- a/Wino.Core.WinUI/Controls/AccountCreationDialogControl.xaml
+++ b/Wino.Core.WinUI/Controls/AccountCreationDialogControl.xaml
@@ -1,10 +1,10 @@
 <UserControl
-    x:Class="Wino.Core.UWP.Controls.AccountCreationDialogControl"
+    x:Class="Wino.Core.WinUI.Controls.AccountCreationDialogControl"
     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:domain="using:Wino.Core.Domain"
-    xmlns:local="using:Wino.Core.UWP.Controls"
+    xmlns:local="using:Wino.Core.WinUI.Controls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     d:DesignHeight="300"
diff --git a/Wino.Core.WinUI/Controls/AccountCreationDialogControl.xaml.cs b/Wino.Core.WinUI/Controls/AccountCreationDialogControl.xaml.cs
index fa08c732..6c90c9a9 100644
--- a/Wino.Core.WinUI/Controls/AccountCreationDialogControl.xaml.cs
+++ b/Wino.Core.WinUI/Controls/AccountCreationDialogControl.xaml.cs
@@ -9,7 +9,7 @@ using Wino.Core.Domain.Interfaces;
 using Wino.Messaging.UI;
 
 
-namespace Wino.Core.UWP.Controls;
+namespace Wino.Core.WinUI.Controls;
 
 public sealed partial class AccountCreationDialogControl : UserControl, IRecipient<CopyAuthURLRequested>
 {
diff --git a/Wino.Core.WinUI/Controls/ControlConstants.cs b/Wino.Core.WinUI/Controls/ControlConstants.cs
index db693d77..813dbcad 100644
--- a/Wino.Core.WinUI/Controls/ControlConstants.cs
+++ b/Wino.Core.WinUI/Controls/ControlConstants.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Wino.Core.UWP.Controls;
+namespace Wino.Core.WinUI.Controls;
 
 public static class ControlConstants
 {
diff --git a/Wino.Core.WinUI/Controls/CustomWrapPanel.cs b/Wino.Core.WinUI/Controls/CustomWrapPanel.cs
index dd863ad5..55095052 100644
--- a/Wino.Core.WinUI/Controls/CustomWrapPanel.cs
+++ b/Wino.Core.WinUI/Controls/CustomWrapPanel.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Wino.Core.UWP.Controls
+namespace Wino.Core.WinUI.Controls
 {
     using Windows.Foundation;
     using Microsoft.UI.Xaml;
diff --git a/Wino.Core.WinUI/Controls/EqualGridPanel.cs b/Wino.Core.WinUI/Controls/EqualGridPanel.cs
index 653d84f4..89b37dbd 100644
--- a/Wino.Core.WinUI/Controls/EqualGridPanel.cs
+++ b/Wino.Core.WinUI/Controls/EqualGridPanel.cs
@@ -2,7 +2,7 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 
-namespace Wino.Core.UWP.Controls;
+namespace Wino.Core.WinUI.Controls;
 
 public partial class EqualGridPanel : Panel
 {
diff --git a/Wino.Core.WinUI/Controls/WinoAppTitleBar.xaml b/Wino.Core.WinUI/Controls/WinoAppTitleBar.xaml
index 4a3f5eab..b4889e19 100644
--- a/Wino.Core.WinUI/Controls/WinoAppTitleBar.xaml
+++ b/Wino.Core.WinUI/Controls/WinoAppTitleBar.xaml
@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Wino.Core.UWP.Controls.WinoAppTitleBar"
+    x:Class="Wino.Core.WinUI.Controls.WinoAppTitleBar"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
diff --git a/Wino.Core.WinUI/Controls/WinoAppTitleBar.xaml.cs b/Wino.Core.WinUI/Controls/WinoAppTitleBar.xaml.cs
index e8945435..ecb7a33c 100644
--- a/Wino.Core.WinUI/Controls/WinoAppTitleBar.xaml.cs
+++ b/Wino.Core.WinUI/Controls/WinoAppTitleBar.xaml.cs
@@ -4,7 +4,7 @@ using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Wino.Core.Domain.Enums;
 
-namespace Wino.Core.UWP.Controls;
+namespace Wino.Core.WinUI.Controls;
 
 public sealed partial class WinoAppTitleBar : UserControl
 {
diff --git a/Wino.Core.WinUI/Controls/WinoFontIcon.cs b/Wino.Core.WinUI/Controls/WinoFontIcon.cs
index 345e7853..179715c6 100644
--- a/Wino.Core.WinUI/Controls/WinoFontIcon.cs
+++ b/Wino.Core.WinUI/Controls/WinoFontIcon.cs
@@ -1,7 +1,7 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 
-namespace Wino.Core.UWP.Controls;
+namespace Wino.Core.WinUI.Controls;
 
 public enum WinoIconGlyph
 {
diff --git a/Wino.Core.WinUI/Controls/WinoFontIconSource.cs b/Wino.Core.WinUI/Controls/WinoFontIconSource.cs
index 0472c9f7..a802fc28 100644
--- a/Wino.Core.WinUI/Controls/WinoFontIconSource.cs
+++ b/Wino.Core.WinUI/Controls/WinoFontIconSource.cs
@@ -1,5 +1,5 @@
 using Microsoft.UI.Xaml;
-using Wino.Core.UWP.Controls;
+using Wino.Core.WinUI.Controls;
 
 namespace Wino.Controls;
 
diff --git a/Wino.Core.WinUI/Controls/WinoInfoBar.cs b/Wino.Core.WinUI/Controls/WinoInfoBar.cs
index c8635799..6428448a 100644
--- a/Wino.Core.WinUI/Controls/WinoInfoBar.cs
+++ b/Wino.Core.WinUI/Controls/WinoInfoBar.cs
@@ -5,7 +5,7 @@ using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml;
 using Wino.Core.Domain.Enums;
 
-namespace Wino.Core.UWP.Controls;
+namespace Wino.Core.WinUI.Controls;
 
 public partial class WinoInfoBar : InfoBar
 {
diff --git a/Wino.Core.WinUI/Controls/WinoNavigationViewItem.cs b/Wino.Core.WinUI/Controls/WinoNavigationViewItem.cs
index 84faa937..2d1c720c 100644
--- a/Wino.Core.WinUI/Controls/WinoNavigationViewItem.cs
+++ b/Wino.Core.WinUI/Controls/WinoNavigationViewItem.cs
@@ -3,7 +3,7 @@ using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Hosting;
 
-namespace Wino.Core.UWP.Controls;
+namespace Wino.Core.WinUI.Controls;
 
 public partial class WinoNavigationViewItem : NavigationViewItem
 {
diff --git a/Wino.Core.WinUI/Converters/HexToColorBrushConverter.cs b/Wino.Core.WinUI/Converters/HexToColorBrushConverter.cs
index 6b9ec6a1..cae1edb4 100644
--- a/Wino.Core.WinUI/Converters/HexToColorBrushConverter.cs
+++ b/Wino.Core.WinUI/Converters/HexToColorBrushConverter.cs
@@ -6,7 +6,7 @@ using Microsoft.UI.Xaml.Data;
 using Microsoft.UI.Xaml.Media;
 using Windows.UI;
 
-namespace Wino.Core.UWP.Converters;
+namespace Wino.Core.WinUI.Converters;
 
 public partial class HexToColorBrushConverter : IValueConverter
 {
diff --git a/Wino.Core.WinUI/CoreGeneric.xaml b/Wino.Core.WinUI/CoreGeneric.xaml
index 8bc8392d..a55a3088 100644
--- a/Wino.Core.WinUI/CoreGeneric.xaml
+++ b/Wino.Core.WinUI/CoreGeneric.xaml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ResourceDictionary
-    x:Class="Wino.Core.UWP.CoreGeneric"
+    x:Class="Wino.Core.WinUI.CoreGeneric"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:coreControls="using:Wino.Core.UWP.Controls"
-    xmlns:styles="using:Wino.Core.UWP.Styles">
+    xmlns:coreControls="using:Wino.Core.WinUI.Controls"
+    xmlns:styles="using:Wino.Core.WinUI.Styles">
 
     <ResourceDictionary.MergedDictionaries>
         <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
diff --git a/Wino.Core.WinUI/CoreGeneric.xaml.cs b/Wino.Core.WinUI/CoreGeneric.xaml.cs
index bdc34987..10f94a4f 100644
--- a/Wino.Core.WinUI/CoreGeneric.xaml.cs
+++ b/Wino.Core.WinUI/CoreGeneric.xaml.cs
@@ -1,6 +1,6 @@
 using Microsoft.UI.Xaml;
 
-namespace Wino.Core.UWP;
+namespace Wino.Core.WinUI;
 
 public partial class CoreGeneric : ResourceDictionary
 {
diff --git a/Wino.Core.WinUI/CoreUWPContainerSetup.cs b/Wino.Core.WinUI/CoreUWPContainerSetup.cs
index ed55061a..dcaa7a66 100644
--- a/Wino.Core.WinUI/CoreUWPContainerSetup.cs
+++ b/Wino.Core.WinUI/CoreUWPContainerSetup.cs
@@ -2,11 +2,11 @@
 using Microsoft.UI.Xaml;
 using Windows.ApplicationModel.AppService;
 using Wino.Core.Domain.Interfaces;
-using Wino.Core.UWP.Services;
+using Wino.Core.WinUI.Services;
 using Wino.Core.ViewModels;
 using Wino.Services;
 
-namespace Wino.Core.UWP;
+namespace Wino.Core.WinUI;
 
 public static class CoreUWPContainerSetup
 {
diff --git a/Wino.Core.WinUI/Dialogs/AccountCreationDialog.xaml b/Wino.Core.WinUI/Dialogs/AccountCreationDialog.xaml
index 6de492a6..b957392d 100644
--- a/Wino.Core.WinUI/Dialogs/AccountCreationDialog.xaml
+++ b/Wino.Core.WinUI/Dialogs/AccountCreationDialog.xaml
@@ -2,7 +2,7 @@
     x:Class="Wino.Dialogs.AccountCreationDialog"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Wino.Core.UWP.Controls"
+    xmlns:controls="using:Wino.Core.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:dialogs="using:Wino.Dialogs"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/Wino.Core.WinUI/Dialogs/CustomThemeBuilderDialog.xaml.cs b/Wino.Core.WinUI/Dialogs/CustomThemeBuilderDialog.xaml.cs
index b446fe5f..5810ab4f 100644
--- a/Wino.Core.WinUI/Dialogs/CustomThemeBuilderDialog.xaml.cs
+++ b/Wino.Core.WinUI/Dialogs/CustomThemeBuilderDialog.xaml.cs
@@ -4,7 +4,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media;
 using Wino.Core.Domain.Interfaces;
-using Wino.Core.UWP;
+using Wino.Core.WinUI;
 
 namespace Wino.Dialogs;
 
diff --git a/Wino.Core.WinUI/Dialogs/NewAccountDialog.xaml b/Wino.Core.WinUI/Dialogs/NewAccountDialog.xaml
index 1c69c70f..9dcc9ad9 100644
--- a/Wino.Core.WinUI/Dialogs/NewAccountDialog.xaml
+++ b/Wino.Core.WinUI/Dialogs/NewAccountDialog.xaml
@@ -1,5 +1,5 @@
 <ContentDialog
-    x:Class="Wino.Core.UWP.Dialogs.NewAccountDialog"
+    x:Class="Wino.Core.WinUI.Dialogs.NewAccountDialog"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:accounts="using:Wino.Core.Domain.Models.Accounts"
diff --git a/Wino.Core.WinUI/Dialogs/NewAccountDialog.xaml.cs b/Wino.Core.WinUI/Dialogs/NewAccountDialog.xaml.cs
index a14c8226..9891688d 100644
--- a/Wino.Core.WinUI/Dialogs/NewAccountDialog.xaml.cs
+++ b/Wino.Core.WinUI/Dialogs/NewAccountDialog.xaml.cs
@@ -10,7 +10,7 @@ using Wino.Core.Domain.Models.Accounts;
 using Wino.Core.ViewModels.Data;
 using Wino.Helpers;
 
-namespace Wino.Core.UWP.Dialogs;
+namespace Wino.Core.WinUI.Dialogs;
 
 public sealed partial class NewAccountDialog : ContentDialog
 {
diff --git a/Wino.Core.WinUI/Dispatcher.cs b/Wino.Core.WinUI/Dispatcher.cs
index 3a8a391c..24929c6e 100644
--- a/Wino.Core.WinUI/Dispatcher.cs
+++ b/Wino.Core.WinUI/Dispatcher.cs
@@ -4,7 +4,7 @@ using CommunityToolkit.WinUI;
 using Microsoft.UI.Dispatching;
 using Wino.Core.Domain.Interfaces;
 
-namespace Wino.Core.UWP;
+namespace Wino.Core.WinUI;
 
 public class WinUIDispatcher : IDispatcher
 {
diff --git a/Wino.Core.WinUI/Extensions/ElementThemeExtensions.cs b/Wino.Core.WinUI/Extensions/ElementThemeExtensions.cs
index 6102830f..9b60b871 100644
--- a/Wino.Core.WinUI/Extensions/ElementThemeExtensions.cs
+++ b/Wino.Core.WinUI/Extensions/ElementThemeExtensions.cs
@@ -1,7 +1,7 @@
 using Microsoft.UI.Xaml;
 using Wino.Core.Domain.Enums;
 
-namespace Wino.Core.UWP.Extensions;
+namespace Wino.Core.WinUI.Extensions;
 
 public static class ElementThemeExtensions
 {
diff --git a/Wino.Core.WinUI/Extensions/StartupTaskStateExtensions.cs b/Wino.Core.WinUI/Extensions/StartupTaskStateExtensions.cs
index 87ab5ec2..cbfc11cf 100644
--- a/Wino.Core.WinUI/Extensions/StartupTaskStateExtensions.cs
+++ b/Wino.Core.WinUI/Extensions/StartupTaskStateExtensions.cs
@@ -1,7 +1,7 @@
 using Windows.ApplicationModel;
 using Wino.Core.Domain.Enums;
 
-namespace Wino.Core.UWP.Extensions;
+namespace Wino.Core.WinUI.Extensions;
 
 public static class StartupTaskStateExtensions
 {
diff --git a/Wino.Core.WinUI/Extensions/StorageFileExtensions.cs b/Wino.Core.WinUI/Extensions/StorageFileExtensions.cs
index 7cd6f118..4e1813ea 100644
--- a/Wino.Core.WinUI/Extensions/StorageFileExtensions.cs
+++ b/Wino.Core.WinUI/Extensions/StorageFileExtensions.cs
@@ -4,7 +4,7 @@ using System.Threading.Tasks;
 using Windows.Storage;
 using Wino.Core.Domain.Models.Common;
 
-namespace Wino.Core.UWP.Extensions;
+namespace Wino.Core.WinUI.Extensions;
 
 public static class StorageFileExtensions
 {
diff --git a/Wino.Core.WinUI/Extensions/WebViewExtensions.cs b/Wino.Core.WinUI/Extensions/WebViewExtensions.cs
index 1edbe6fb..7695412d 100644
--- a/Wino.Core.WinUI/Extensions/WebViewExtensions.cs
+++ b/Wino.Core.WinUI/Extensions/WebViewExtensions.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 
-namespace Wino.Core.UWP.Extensions;
+namespace Wino.Core.WinUI.Extensions;
 
 public static class WebViewExtensions
 {
diff --git a/Wino.Core.WinUI/Helpers/XamlHelpers.cs b/Wino.Core.WinUI/Helpers/XamlHelpers.cs
index 77797c4f..da5281a0 100644
--- a/Wino.Core.WinUI/Helpers/XamlHelpers.cs
+++ b/Wino.Core.WinUI/Helpers/XamlHelpers.cs
@@ -15,7 +15,7 @@ using Wino.Core.Domain;
 using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Models.MailItem;
-using Wino.Core.UWP.Controls;
+using Wino.Core.WinUI.Controls;
 
 namespace Wino.Helpers;
 
diff --git a/Wino.Core.WinUI/Models/Personalization/CustomAppTheme.cs b/Wino.Core.WinUI/Models/Personalization/CustomAppTheme.cs
index 78049f61..a0ce1d4f 100644
--- a/Wino.Core.WinUI/Models/Personalization/CustomAppTheme.cs
+++ b/Wino.Core.WinUI/Models/Personalization/CustomAppTheme.cs
@@ -5,7 +5,7 @@ using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Models.Personalization;
 using Wino.Services;
 
-namespace Wino.Core.UWP.Models.Personalization;
+namespace Wino.Core.WinUI.Models.Personalization;
 
 /// <summary>
 /// Custom themes that are generated by users.
@@ -24,7 +24,7 @@ public class CustomAppTheme : AppThemeBase
 
     public override async Task<string> GetThemeResourceDictionaryContentAsync()
     {
-        var customAppThemeFile = await StorageFile.GetFileFromApplicationUriAsync(new Uri("ms-appx:///Wino.Core.UWP/AppThemes/Custom.xaml"));
+        var customAppThemeFile = await StorageFile.GetFileFromApplicationUriAsync(new Uri("ms-appx:///Wino.Core.WinUI/AppThemes/Custom.xaml"));
         return await FileIO.ReadTextAsync(customAppThemeFile);
     }
 }
diff --git a/Wino.Core.WinUI/Models/Personalization/PreDefinedAppTheme.cs b/Wino.Core.WinUI/Models/Personalization/PreDefinedAppTheme.cs
index 960e5722..c21eccb6 100644
--- a/Wino.Core.WinUI/Models/Personalization/PreDefinedAppTheme.cs
+++ b/Wino.Core.WinUI/Models/Personalization/PreDefinedAppTheme.cs
@@ -4,7 +4,7 @@ using Windows.Storage;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Models.Personalization;
 
-namespace Wino.Core.UWP.Models.Personalization;
+namespace Wino.Core.WinUI.Models.Personalization;
 
 /// <summary>
 ///  Forest, Nighty, Clouds etc. applies to pre-defined themes in Wino.
@@ -23,11 +23,11 @@ public class PreDefinedAppTheme : AppThemeBase
     public override AppThemeType AppThemeType => AppThemeType.PreDefined;
 
     public override string GetBackgroundPreviewImagePath()
-        => $"ms-appx:///Wino.Core.UWP/BackgroundImages/{ThemeName}.jpg";
+        => $"ms-appx:///Wino.Core.WinUI/BackgroundImages/{ThemeName}.jpg";
 
     public override async Task<string> GetThemeResourceDictionaryContentAsync()
     {
-        var xamlDictionaryFile = await StorageFile.GetFileFromApplicationUriAsync(new Uri($"ms-appx:///Wino.Core.UWP/AppThemes/{ThemeName}.xaml"));
+        var xamlDictionaryFile = await StorageFile.GetFileFromApplicationUriAsync(new Uri($"ms-appx:///Wino.Core.WinUI/AppThemes/{ThemeName}.xaml"));
         return await FileIO.ReadTextAsync(xamlDictionaryFile);
     }
 }
diff --git a/Wino.Core.WinUI/Models/Personalization/SystemAppTheme.cs b/Wino.Core.WinUI/Models/Personalization/SystemAppTheme.cs
index f836ffb0..4ae4aec9 100644
--- a/Wino.Core.WinUI/Models/Personalization/SystemAppTheme.cs
+++ b/Wino.Core.WinUI/Models/Personalization/SystemAppTheme.cs
@@ -1,7 +1,7 @@
 using System;
 using Wino.Core.Domain.Enums;
 
-namespace Wino.Core.UWP.Models.Personalization;
+namespace Wino.Core.WinUI.Models.Personalization;
 
 // Mica - Acrylic.
 public class SystemAppTheme : PreDefinedAppTheme
diff --git a/Wino.Core.WinUI/Selectors/AppThemePreviewTemplateSelector.cs b/Wino.Core.WinUI/Selectors/AppThemePreviewTemplateSelector.cs
index e2462e6e..81d87a25 100644
--- a/Wino.Core.WinUI/Selectors/AppThemePreviewTemplateSelector.cs
+++ b/Wino.Core.WinUI/Selectors/AppThemePreviewTemplateSelector.cs
@@ -1,8 +1,8 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Wino.Core.UWP.Models.Personalization;
+using Wino.Core.WinUI.Models.Personalization;
 
-namespace Wino.Core.UWP.Selectors;
+namespace Wino.Core.WinUI.Selectors;
 
 public partial class AppThemePreviewTemplateSelector : DataTemplateSelector
 {
diff --git a/Wino.Core.WinUI/Selectors/CustomWinoMessageDialogIconSelector.cs b/Wino.Core.WinUI/Selectors/CustomWinoMessageDialogIconSelector.cs
index 2187228c..721b05fe 100644
--- a/Wino.Core.WinUI/Selectors/CustomWinoMessageDialogIconSelector.cs
+++ b/Wino.Core.WinUI/Selectors/CustomWinoMessageDialogIconSelector.cs
@@ -3,7 +3,7 @@ using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Wino.Core.Domain.Enums;
 
-namespace Wino.Core.UWP.Selectors;
+namespace Wino.Core.WinUI.Selectors;
 
 public partial class CustomWinoMessageDialogIconSelector : DataTemplateSelector
 {
diff --git a/Wino.Core.WinUI/Selectors/FileAttachmentTypeSelector.cs b/Wino.Core.WinUI/Selectors/FileAttachmentTypeSelector.cs
index 79740e8d..8a5e97fd 100644
--- a/Wino.Core.WinUI/Selectors/FileAttachmentTypeSelector.cs
+++ b/Wino.Core.WinUI/Selectors/FileAttachmentTypeSelector.cs
@@ -2,7 +2,7 @@
 using Microsoft.UI.Xaml.Controls;
 using Wino.Core.Domain.Enums;
 
-namespace Wino.Core.UWP.Selectors;
+namespace Wino.Core.WinUI.Selectors;
 
 public partial class FileAttachmentTypeSelector : DataTemplateSelector
 {
diff --git a/Wino.Core.WinUI/Selectors/NavigationMenuTemplateSelector.cs b/Wino.Core.WinUI/Selectors/NavigationMenuTemplateSelector.cs
index 483db210..d3259997 100644
--- a/Wino.Core.WinUI/Selectors/NavigationMenuTemplateSelector.cs
+++ b/Wino.Core.WinUI/Selectors/NavigationMenuTemplateSelector.cs
@@ -2,7 +2,7 @@
 using Microsoft.UI.Xaml.Controls;
 using Wino.Core.Domain.MenuItems;
 
-namespace Wino.Core.UWP.Selectors;
+namespace Wino.Core.WinUI.Selectors;
 
 public partial class NavigationMenuTemplateSelector : DataTemplateSelector
 {
diff --git a/Wino.Core.WinUI/Services/ApplicationResourceManager.cs b/Wino.Core.WinUI/Services/ApplicationResourceManager.cs
index d2996d10..c47e74b0 100644
--- a/Wino.Core.WinUI/Services/ApplicationResourceManager.cs
+++ b/Wino.Core.WinUI/Services/ApplicationResourceManager.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using Microsoft.UI.Xaml;
 using Wino.Core.Domain.Interfaces;
-using Wino.Core.UWP;
+using Wino.Core.WinUI;
 
 namespace Wino.Services;
 
diff --git a/Wino.Core.WinUI/Services/ClipboardService.cs b/Wino.Core.WinUI/Services/ClipboardService.cs
index bbfb94dc..55ff635f 100644
--- a/Wino.Core.WinUI/Services/ClipboardService.cs
+++ b/Wino.Core.WinUI/Services/ClipboardService.cs
@@ -2,7 +2,7 @@
 using Windows.ApplicationModel.DataTransfer;
 using Wino.Core.Domain.Interfaces;
 
-namespace Wino.Core.UWP.Services;
+namespace Wino.Core.WinUI.Services;
 
 public class ClipboardService : IClipboardService
 {
diff --git a/Wino.Core.WinUI/Services/ConfigurationService.cs b/Wino.Core.WinUI/Services/ConfigurationService.cs
index 83d5c744..49bdae81 100644
--- a/Wino.Core.WinUI/Services/ConfigurationService.cs
+++ b/Wino.Core.WinUI/Services/ConfigurationService.cs
@@ -5,7 +5,7 @@ using Windows.Foundation.Collections;
 using Windows.Storage;
 using Wino.Core.Domain.Interfaces;
 
-namespace Wino.Core.UWP.Services;
+namespace Wino.Core.WinUI.Services;
 
 public class ConfigurationService : IConfigurationService
 {
diff --git a/Wino.Core.WinUI/Services/DialogServiceBase.cs b/Wino.Core.WinUI/Services/DialogServiceBase.cs
index 0159ba0c..68055773 100644
--- a/Wino.Core.WinUI/Services/DialogServiceBase.cs
+++ b/Wino.Core.WinUI/Services/DialogServiceBase.cs
@@ -14,12 +14,12 @@ using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Accounts;
 using Wino.Core.Domain.Models.Common;
-using Wino.Core.UWP.Dialogs;
-using Wino.Core.UWP.Extensions;
+using Wino.Core.WinUI.Dialogs;
+using Wino.Core.WinUI.Extensions;
 using Wino.Dialogs;
 using Wino.Messaging.Client.Shell;
 
-namespace Wino.Core.UWP.Services;
+namespace Wino.Core.WinUI.Services;
 
 public class DialogServiceBase : IDialogServiceBase
 {
diff --git a/Wino.Core.WinUI/Services/FileService.cs b/Wino.Core.WinUI/Services/FileService.cs
index 6a635363..45988825 100644
--- a/Wino.Core.WinUI/Services/FileService.cs
+++ b/Wino.Core.WinUI/Services/FileService.cs
@@ -6,7 +6,7 @@ using Windows.Storage;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Interfaces;
 
-namespace Wino.Core.UWP.Services;
+namespace Wino.Core.WinUI.Services;
 
 public class FileService : IFileService
 {
diff --git a/Wino.Core.WinUI/Services/KeyPressService.cs b/Wino.Core.WinUI/Services/KeyPressService.cs
index 5fe3e3f1..869d1679 100644
--- a/Wino.Core.WinUI/Services/KeyPressService.cs
+++ b/Wino.Core.WinUI/Services/KeyPressService.cs
@@ -3,7 +3,7 @@ using Windows.UI.Core;
 using Microsoft.UI.Xaml;
 using Wino.Core.Domain.Interfaces;
 
-namespace Wino.Core.UWP.Services;
+namespace Wino.Core.WinUI.Services;
 
 public class KeyPressService : IKeyPressService
 {
diff --git a/Wino.Core.WinUI/Services/NavigationServiceBase.cs b/Wino.Core.WinUI/Services/NavigationServiceBase.cs
index f476c561..1032cbeb 100644
--- a/Wino.Core.WinUI/Services/NavigationServiceBase.cs
+++ b/Wino.Core.WinUI/Services/NavigationServiceBase.cs
@@ -3,7 +3,7 @@ using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media.Animation;
 using Wino.Core.Domain.Models.Navigation;
 
-namespace Wino.Core.UWP.Services;
+namespace Wino.Core.WinUI.Services;
 
 public class NavigationServiceBase
 {
diff --git a/Wino.Core.WinUI/Services/NotificationBuilder.cs b/Wino.Core.WinUI/Services/NotificationBuilder.cs
index 73d3d7d2..9609b88a 100644
--- a/Wino.Core.WinUI/Services/NotificationBuilder.cs
+++ b/Wino.Core.WinUI/Services/NotificationBuilder.cs
@@ -15,7 +15,7 @@ using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.MailItem;
 using Wino.Messaging.UI;
 
-namespace Wino.Core.UWP.Services;
+namespace Wino.Core.WinUI.Services;
 
 // TODO: Refactor this thing. It's garbage.
 
diff --git a/Wino.Core.WinUI/Services/PreferencesService.cs b/Wino.Core.WinUI/Services/PreferencesService.cs
index 153cf504..8d14f168 100644
--- a/Wino.Core.WinUI/Services/PreferencesService.cs
+++ b/Wino.Core.WinUI/Services/PreferencesService.cs
@@ -11,7 +11,7 @@ using Wino.Core.Domain.Models.Reader;
 using Wino.Core.Domain.Translations;
 using Wino.Services;
 
-namespace Wino.Core.UWP.Services;
+namespace Wino.Core.WinUI.Services;
 
 public class PreferencesService(IConfigurationService configurationService) : ObservableObject, IPreferencesService
 {
diff --git a/Wino.Core.WinUI/Services/PrintService.cs b/Wino.Core.WinUI/Services/PrintService.cs
index b1c9a12f..92add32d 100644
--- a/Wino.Core.WinUI/Services/PrintService.cs
+++ b/Wino.Core.WinUI/Services/PrintService.cs
@@ -12,7 +12,7 @@ using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Printing;
 
-namespace Wino.Core.UWP.Services;
+namespace Wino.Core.WinUI.Services;
 
 /// <summary>
 /// Printer service that uses WinRT APIs to print PDF files.
diff --git a/Wino.Core.WinUI/Services/StartupBehaviorService.cs b/Wino.Core.WinUI/Services/StartupBehaviorService.cs
index c637699a..144e320a 100644
--- a/Wino.Core.WinUI/Services/StartupBehaviorService.cs
+++ b/Wino.Core.WinUI/Services/StartupBehaviorService.cs
@@ -4,9 +4,9 @@ using Serilog;
 using Windows.ApplicationModel;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
-using Wino.Core.UWP.Extensions;
+using Wino.Core.WinUI.Extensions;
 
-namespace Wino.Core.UWP.Services;
+namespace Wino.Core.WinUI.Services;
 
 public class StartupBehaviorService : IStartupBehaviorService
 {
diff --git a/Wino.Core.WinUI/Services/StatePersistenceService.cs b/Wino.Core.WinUI/Services/StatePersistenceService.cs
index c47d6bd1..d202c994 100644
--- a/Wino.Core.WinUI/Services/StatePersistenceService.cs
+++ b/Wino.Core.WinUI/Services/StatePersistenceService.cs
@@ -3,7 +3,7 @@ using System.ComponentModel;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
-using Wino.Core.UWP;
+using Wino.Core.WinUI;
 
 namespace Wino.Services;
 
diff --git a/Wino.Core.WinUI/Services/StoreManagementService.cs b/Wino.Core.WinUI/Services/StoreManagementService.cs
index 91fb9504..fff0aa53 100644
--- a/Wino.Core.WinUI/Services/StoreManagementService.cs
+++ b/Wino.Core.WinUI/Services/StoreManagementService.cs
@@ -5,7 +5,7 @@ using Windows.Services.Store;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Store;
 
-namespace Wino.Core.UWP.Services;
+namespace Wino.Core.WinUI.Services;
 
 public class StoreManagementService : IStoreManagementService
 {
diff --git a/Wino.Core.WinUI/Services/StoreRatingService.cs b/Wino.Core.WinUI/Services/StoreRatingService.cs
index adbd20ef..652cb92d 100644
--- a/Wino.Core.WinUI/Services/StoreRatingService.cs
+++ b/Wino.Core.WinUI/Services/StoreRatingService.cs
@@ -7,7 +7,7 @@ using Windows.System;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Interfaces;
 
-namespace Wino.Core.UWP.Services;
+namespace Wino.Core.WinUI.Services;
 
 public class StoreRatingService : IStoreRatingService
 {
diff --git a/Wino.Core.WinUI/Services/ThemeService.cs b/Wino.Core.WinUI/Services/ThemeService.cs
index 91bf8465..5a8bfbc0 100644
--- a/Wino.Core.WinUI/Services/ThemeService.cs
+++ b/Wino.Core.WinUI/Services/ThemeService.cs
@@ -21,10 +21,10 @@ using Wino.Core.Domain.Exceptions;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models;
 using Wino.Core.Domain.Models.Personalization;
-using Wino.Core.UWP;
-using Wino.Core.UWP.Extensions;
-using Wino.Core.UWP.Models.Personalization;
-using Wino.Core.UWP.Services;
+using Wino.Core.WinUI;
+using Wino.Core.WinUI.Extensions;
+using Wino.Core.WinUI.Models.Personalization;
+using Wino.Core.WinUI.Services;
 using Wino.Messaging.Client.Shell;
 
 namespace Wino.Services;
diff --git a/Wino.Core.WinUI/Services/ThumbnailService.cs b/Wino.Core.WinUI/Services/ThumbnailService.cs
index 7598252a..c6020039 100644
--- a/Wino.Core.WinUI/Services/ThumbnailService.cs
+++ b/Wino.Core.WinUI/Services/ThumbnailService.cs
@@ -13,7 +13,7 @@ using Wino.Core.Domain.Interfaces;
 using Wino.Messaging.UI;
 using Wino.Services;
 
-namespace Wino.Core.UWP.Services;
+namespace Wino.Core.WinUI.Services;
 
 public class ThumbnailService(IPreferencesService preferencesService, IDatabaseService databaseService) : IThumbnailService
 {
diff --git a/Wino.Core.WinUI/Services/UnderlyingThemeService.cs b/Wino.Core.WinUI/Services/UnderlyingThemeService.cs
index 264f7709..bc16a523 100644
--- a/Wino.Core.WinUI/Services/UnderlyingThemeService.cs
+++ b/Wino.Core.WinUI/Services/UnderlyingThemeService.cs
@@ -2,7 +2,7 @@
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 
-namespace Wino.Core.UWP.Services;
+namespace Wino.Core.WinUI.Services;
 
 public class UnderlyingThemeService : IUnderlyingThemeService
 {
diff --git a/Wino.Core.WinUI/Services/WinoServerConnectionManager.cs b/Wino.Core.WinUI/Services/WinoServerConnectionManager.cs
index 49309940..cc11c47b 100644
--- a/Wino.Core.WinUI/Services/WinoServerConnectionManager.cs
+++ b/Wino.Core.WinUI/Services/WinoServerConnectionManager.cs
@@ -22,7 +22,7 @@ using Wino.Messaging.Enums;
 using Wino.Messaging.Server;
 using Wino.Messaging.UI;
 
-namespace Wino.Core.UWP.Services;
+namespace Wino.Core.WinUI.Services;
 
 public class WinoServerConnectionManager :
     IWinoServerConnectionManager<AppServiceConnection>,
diff --git a/Wino.Core.WinUI/Styles/ContentPresenters.xaml b/Wino.Core.WinUI/Styles/ContentPresenters.xaml
index 3b1b4422..e586ff0d 100644
--- a/Wino.Core.WinUI/Styles/ContentPresenters.xaml
+++ b/Wino.Core.WinUI/Styles/ContentPresenters.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Wino.Core.UWP.Controls">
+    xmlns:controls="using:Wino.Core.WinUI.Controls">
 
     <!--  Flagged  -->
     <DataTemplate x:Key="FlaggedSymbolControlTemplate">
diff --git a/Wino.Core.WinUI/Styles/CustomMessageDialogStyles.xaml b/Wino.Core.WinUI/Styles/CustomMessageDialogStyles.xaml
index d37a275d..fdf7baa1 100644
--- a/Wino.Core.WinUI/Styles/CustomMessageDialogStyles.xaml
+++ b/Wino.Core.WinUI/Styles/CustomMessageDialogStyles.xaml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ResourceDictionary
-    x:Class="Wino.Core.UWP.Styles.CustomMessageDialogStyles"
+    x:Class="Wino.Core.WinUI.Styles.CustomMessageDialogStyles"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:dialogs="using:Wino.Dialogs"
     xmlns:domain="using:Wino.Core.Domain"
     xmlns:local="using:Wino.Styles"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-    xmlns:selectors="using:Wino.Core.UWP.Selectors">
+    xmlns:selectors="using:Wino.Core.WinUI.Selectors">
 
     <!--  Icon templates  -->
     <DataTemplate x:Key="WinoCustomMessageDialogInformationIconTemplate">
diff --git a/Wino.Core.WinUI/Styles/CustomMessageDialogStyles.xaml.cs b/Wino.Core.WinUI/Styles/CustomMessageDialogStyles.xaml.cs
index ae121634..98be9c00 100644
--- a/Wino.Core.WinUI/Styles/CustomMessageDialogStyles.xaml.cs
+++ b/Wino.Core.WinUI/Styles/CustomMessageDialogStyles.xaml.cs
@@ -1,6 +1,6 @@
 using Microsoft.UI.Xaml;
 
-namespace Wino.Core.UWP.Styles;
+namespace Wino.Core.WinUI.Styles;
 
 partial class CustomMessageDialogStyles : ResourceDictionary
 {
diff --git a/Wino.Core.WinUI/Styles/DataTemplates.xaml b/Wino.Core.WinUI/Styles/DataTemplates.xaml
index 2c2d8bf3..ec1f72a0 100644
--- a/Wino.Core.WinUI/Styles/DataTemplates.xaml
+++ b/Wino.Core.WinUI/Styles/DataTemplates.xaml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ResourceDictionary
-    x:Class="Wino.Core.UWP.Styles.DataTemplates"
+    x:Class="Wino.Core.WinUI.Styles.DataTemplates"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
-    xmlns:coreControls="using:Wino.Core.UWP.Controls"
-    xmlns:coreSelectors="using:Wino.Core.UWP.Selectors"
+    xmlns:coreControls="using:Wino.Core.WinUI.Controls"
+    xmlns:coreSelectors="using:Wino.Core.WinUI.Selectors"
     xmlns:coreViewModelData="using:Wino.Core.ViewModels.Data"
     xmlns:domain="using:Wino.Core.Domain"
     xmlns:helpers="using:Wino.Helpers"
-    xmlns:local="using:Wino.Core.UWP.Styles"
+    xmlns:local="using:Wino.Core.WinUI.Styles"
     xmlns:menu="using:Wino.Core.Domain.MenuItems"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-    xmlns:personalization="using:Wino.Core.UWP.Models.Personalization"
+    xmlns:personalization="using:Wino.Core.WinUI.Models.Personalization"
     xmlns:viewModelData="using:Wino.Mail.ViewModels.Data"
     xmlns:winuiControls="using:CommunityToolkit.WinUI.Controls">
 
diff --git a/Wino.Core.WinUI/Styles/DataTemplates.xaml.cs b/Wino.Core.WinUI/Styles/DataTemplates.xaml.cs
index 1179966d..d57cff20 100644
--- a/Wino.Core.WinUI/Styles/DataTemplates.xaml.cs
+++ b/Wino.Core.WinUI/Styles/DataTemplates.xaml.cs
@@ -1,6 +1,6 @@
 using Microsoft.UI.Xaml;
 
-namespace Wino.Core.UWP.Styles;
+namespace Wino.Core.WinUI.Styles;
 
 public partial class DataTemplates : ResourceDictionary
 {
diff --git a/Wino.Core.WinUI/Styles/IconTemplates.xaml b/Wino.Core.WinUI/Styles/IconTemplates.xaml
index 89dad769..67172286 100644
--- a/Wino.Core.WinUI/Styles/IconTemplates.xaml
+++ b/Wino.Core.WinUI/Styles/IconTemplates.xaml
@@ -1,48 +1,48 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:selectors="using:Wino.Core.UWP.Selectors">
+    xmlns:selectors="using:Wino.Core.WinUI.Selectors">
 
     <!--  Attachment Icon Templates  -->
 
     <DataTemplate x:Key="NoneTemplate">
-        <Image Source="ms-appx:///Wino.Core.UWP/Assets/FileTypes/type_none.png" />
+        <Image Source="ms-appx:///Wino.Core.WinUI/Assets/FileTypes/type_none.png" />
     </DataTemplate>
 
     <DataTemplate x:Key="ExecutableTemplate">
-        <Image Source="ms-appx:///Wino.Core.UWP/Assets/FileTypes/type_executable.png" />
+        <Image Source="ms-appx:///Wino.Core.WinUI/Assets/FileTypes/type_executable.png" />
     </DataTemplate>
 
     <DataTemplate x:Key="ImageTemplate">
-        <Image Source="ms-appx:///Wino.Core.UWP/Assets/FileTypes/type_image.png" />
+        <Image Source="ms-appx:///Wino.Core.WinUI/Assets/FileTypes/type_image.png" />
     </DataTemplate>
 
     <DataTemplate x:Key="VideoTemplate">
-        <Image Source="ms-appx:///Wino.Core.UWP/Assets/FileTypes/type_video.png" />
+        <Image Source="ms-appx:///Wino.Core.WinUI/Assets/FileTypes/type_video.png" />
     </DataTemplate>
 
     <DataTemplate x:Key="AudioTemplate">
-        <Image Source="ms-appx:///Wino.Core.UWP/Assets/FileTypes/type_audio.png" />
+        <Image Source="ms-appx:///Wino.Core.WinUI/Assets/FileTypes/type_audio.png" />
     </DataTemplate>
 
     <DataTemplate x:Key="PDFTemplate">
-        <Image Source="ms-appx:///Wino.Core.UWP/Assets/FileTypes/type_pdf.png" />
+        <Image Source="ms-appx:///Wino.Core.WinUI/Assets/FileTypes/type_pdf.png" />
     </DataTemplate>
 
     <DataTemplate x:Key="HTMLTemplate">
-        <Image Source="ms-appx:///Wino.Core.UWP/Assets/FileTypes/type_html.png" />
+        <Image Source="ms-appx:///Wino.Core.WinUI/Assets/FileTypes/type_html.png" />
     </DataTemplate>
 
     <DataTemplate x:Key="RarTemplate">
-        <Image Source="ms-appx:///Wino.Core.UWP/Assets/FileTypes/type_rar.png" />
+        <Image Source="ms-appx:///Wino.Core.WinUI/Assets/FileTypes/type_rar.png" />
     </DataTemplate>
 
     <DataTemplate x:Key="ArchiveTemplate">
-        <Image Source="ms-appx:///Wino.Core.UWP/Assets/FileTypes/type_archive.png" />
+        <Image Source="ms-appx:///Wino.Core.WinUI/Assets/FileTypes/type_archive.png" />
     </DataTemplate>
 
     <DataTemplate x:Key="OtherTemplate">
-        <Image Source="ms-appx:///Wino.Core.UWP/Assets/FileTypes/type_other.png" />
+        <Image Source="ms-appx:///Wino.Core.WinUI/Assets/FileTypes/type_other.png" />
     </DataTemplate>
 
     <selectors:FileAttachmentTypeSelector
diff --git a/Wino.Core.WinUI/Styles/SharedStyles.xaml b/Wino.Core.WinUI/Styles/SharedStyles.xaml
index 6c479cb4..ce4837f8 100644
--- a/Wino.Core.WinUI/Styles/SharedStyles.xaml
+++ b/Wino.Core.WinUI/Styles/SharedStyles.xaml
@@ -2,7 +2,7 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Wino.Core.UWP.Styles">
+    xmlns:local="using:Wino.Core.WinUI.Styles">
 
     <!--  Horizontally Stretched List View Item Container Style  -->
     <Style x:Key="StretchedItemContainerStyle" TargetType="ListViewItem">
diff --git a/Wino.Core.WinUI/Styles/WinoInfoBar.xaml b/Wino.Core.WinUI/Styles/WinoInfoBar.xaml
index 8b9452b2..6983a992 100644
--- a/Wino.Core.WinUI/Styles/WinoInfoBar.xaml
+++ b/Wino.Core.WinUI/Styles/WinoInfoBar.xaml
@@ -2,7 +2,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
-    xmlns:coreControls="using:Wino.Core.UWP.Controls"
+    xmlns:coreControls="using:Wino.Core.WinUI.Controls"
     xmlns:local="using:Microsoft.UI.Xaml.Controls"
     xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives">
     <ResourceDictionary.ThemeDictionaries>
diff --git a/Wino.Core.WinUI/Views/Abstract/ManageAccountsPageAbstract.cs b/Wino.Core.WinUI/Views/Abstract/ManageAccountsPageAbstract.cs
index 742763ad..ad542046 100644
--- a/Wino.Core.WinUI/Views/Abstract/ManageAccountsPageAbstract.cs
+++ b/Wino.Core.WinUI/Views/Abstract/ManageAccountsPageAbstract.cs
@@ -1,6 +1,6 @@
 using Wino.Core.ViewModels;
 
-namespace Wino.Core.UWP.Views.Abstract;
+namespace Wino.Core.WinUI.Views.Abstract;
 
 public abstract class ManageAccountsPageAbstract : BasePage<ManageAccountsPagePageViewModel>
 {
diff --git a/Wino.Core.WinUI/Views/Abstract/SettingsPageAbstract.cs b/Wino.Core.WinUI/Views/Abstract/SettingsPageAbstract.cs
index 3b776525..3800b720 100644
--- a/Wino.Core.WinUI/Views/Abstract/SettingsPageAbstract.cs
+++ b/Wino.Core.WinUI/Views/Abstract/SettingsPageAbstract.cs
@@ -1,4 +1,4 @@
-using Wino.Core.UWP;
+using Wino.Core.WinUI;
 using Wino.Core.ViewModels;
 
 namespace Wino.Views.Abstract;
diff --git a/Wino.Core.WinUI/Views/Abstract/SettingsPageBase.cs b/Wino.Core.WinUI/Views/Abstract/SettingsPageBase.cs
index b4246735..7ad841da 100644
--- a/Wino.Core.WinUI/Views/Abstract/SettingsPageBase.cs
+++ b/Wino.Core.WinUI/Views/Abstract/SettingsPageBase.cs
@@ -1,5 +1,5 @@
 using Microsoft.UI.Xaml;
-using Wino.Core.UWP;
+using Wino.Core.WinUI;
 using Wino.Core.ViewModels;
 
 namespace Wino.Views.Abstract;
diff --git a/Wino.Core.WinUI/Views/ManageAccountsPage.xaml b/Wino.Core.WinUI/Views/ManageAccountsPage.xaml
index 8b414196..f0ee0a97 100644
--- a/Wino.Core.WinUI/Views/ManageAccountsPage.xaml
+++ b/Wino.Core.WinUI/Views/ManageAccountsPage.xaml
@@ -2,7 +2,7 @@
     x:Class="Wino.Views.ManageAccountsPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:abstract="using:Wino.Core.UWP.Views.Abstract"
+    xmlns:abstract="using:Wino.Core.WinUI.Views.Abstract"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:helpers="using:Wino.Helpers"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/Wino.Core.WinUI/Views/ManageAccountsPage.xaml.cs b/Wino.Core.WinUI/Views/ManageAccountsPage.xaml.cs
index b9efc311..09f40e7e 100644
--- a/Wino.Core.WinUI/Views/ManageAccountsPage.xaml.cs
+++ b/Wino.Core.WinUI/Views/ManageAccountsPage.xaml.cs
@@ -7,7 +7,7 @@ using Microsoft.UI.Xaml.Media.Animation;
 using Microsoft.UI.Xaml.Navigation;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Enums;
-using Wino.Core.UWP.Views.Abstract;
+using Wino.Core.WinUI.Views.Abstract;
 using Wino.Mail.ViewModels.Data;
 using Wino.Messaging.Client.Navigation;
 using Wino.Messaging.UI;
diff --git a/Wino.Core.WinUI/WinoApplication.cs b/Wino.Core.WinUI/WinoApplication.cs
index 864e3f41..a7898eea 100644
--- a/Wino.Core.WinUI/WinoApplication.cs
+++ b/Wino.Core.WinUI/WinoApplication.cs
@@ -22,7 +22,7 @@ using Wino.Messaging.Client.Shell;
 using Wino.Services;
 using WinUIEx;
 
-namespace Wino.Core.UWP;
+namespace Wino.Core.WinUI;
 
 public abstract class WinoApplication : Application, IRecipient<LanguageChanged>
 {
diff --git a/Wino.Mail.WinUI/Activation/FileActivationHandler.cs b/Wino.Mail.WinUI/Activation/FileActivationHandler.cs
index f01b09ad..a0774bf9 100644
--- a/Wino.Mail.WinUI/Activation/FileActivationHandler.cs
+++ b/Wino.Mail.WinUI/Activation/FileActivationHandler.cs
@@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media.Animation;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
-using Wino.Core.UWP.Extensions;
+using Wino.Core.WinUI.Extensions;
 using Wino.Views;
 
 namespace Wino.Activation;
diff --git a/Wino.Mail.WinUI/App.xaml b/Wino.Mail.WinUI/App.xaml
index 42ccc5c7..02bfd708 100644
--- a/Wino.Mail.WinUI/App.xaml
+++ b/Wino.Mail.WinUI/App.xaml
@@ -5,7 +5,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:Wino.Mail.WinUI"
     xmlns:styles="using:Wino.Styles"
-    xmlns:uwp="using:Wino.Core.UWP">
+    xmlns:uwp="using:Wino.Core.WinUI">
     <uwp:WinoApplication.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
diff --git a/Wino.Mail.WinUI/App.xaml.cs b/Wino.Mail.WinUI/App.xaml.cs
index 8c154d87..33b26fd9 100644
--- a/Wino.Mail.WinUI/App.xaml.cs
+++ b/Wino.Mail.WinUI/App.xaml.cs
@@ -3,7 +3,7 @@ using System.Text;
 using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.Extensions.DependencyInjection;
 using Wino.Core.Domain.Interfaces;
-using Wino.Core.UWP;
+using Wino.Core.WinUI;
 using Wino.Core.WinUI.Interfaces;
 using Wino.Mail.Services;
 using Wino.Mail.ViewModels;
diff --git a/Wino.Mail.WinUI/AppShell.xaml b/Wino.Mail.WinUI/AppShell.xaml
index 3df3fb3d..7bb288c3 100644
--- a/Wino.Mail.WinUI/AppShell.xaml
+++ b/Wino.Mail.WinUI/AppShell.xaml
@@ -8,9 +8,9 @@
     xmlns:animations="using:CommunityToolkit.WinUI.Animations"
     xmlns:controls="using:Wino.Controls"
     xmlns:controls1="using:CommunityToolkit.WinUI.Controls"
-    xmlns:coreControls="using:Wino.Core.UWP.Controls"
-    xmlns:coreConverters="using:Wino.Core.UWP.Converters"
-    xmlns:coreSelectors="using:Wino.Core.UWP.Selectors"
+    xmlns:coreControls="using:Wino.Core.WinUI.Controls"
+    xmlns:coreConverters="using:Wino.Core.WinUI.Converters"
+    xmlns:coreSelectors="using:Wino.Core.WinUI.Selectors"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:domain="using:Wino.Core.Domain"
     xmlns:enums="using:Wino.Core.Domain.Enums"
diff --git a/Wino.Mail.WinUI/AppShell.xaml.cs b/Wino.Mail.WinUI/AppShell.xaml.cs
index 5f1fd91e..35e613a0 100644
--- a/Wino.Mail.WinUI/AppShell.xaml.cs
+++ b/Wino.Mail.WinUI/AppShell.xaml.cs
@@ -17,7 +17,7 @@ using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Folders;
 using Wino.Core.Domain.Models.MailItem;
 using Wino.Core.Domain.Models.Navigation;
-using Wino.Core.UWP.Controls;
+using Wino.Core.WinUI.Controls;
 using Wino.Extensions;
 using Wino.Mail.ViewModels.Data;
 using Wino.MenuFlyouts;
diff --git a/Wino.Mail.WinUI/Behaviors/BindableCommandBarBehavior.cs b/Wino.Mail.WinUI/Behaviors/BindableCommandBarBehavior.cs
index bc7967b1..a29e96ea 100644
--- a/Wino.Mail.WinUI/Behaviors/BindableCommandBarBehavior.cs
+++ b/Wino.Mail.WinUI/Behaviors/BindableCommandBarBehavior.cs
@@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Controls.Primitives;
 using Microsoft.Xaml.Interactivity;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Menus;
-using Wino.Core.UWP.Controls;
+using Wino.Core.WinUI.Controls;
 using Wino.Helpers;
 using Wino.Mail.WinUI;
 
diff --git a/Wino.Mail.WinUI/Behaviors/CreateMailNavigationItemBehavior.cs b/Wino.Mail.WinUI/Behaviors/CreateMailNavigationItemBehavior.cs
index 2da72d6d..87daff10 100644
--- a/Wino.Mail.WinUI/Behaviors/CreateMailNavigationItemBehavior.cs
+++ b/Wino.Mail.WinUI/Behaviors/CreateMailNavigationItemBehavior.cs
@@ -2,7 +2,7 @@
 using Microsoft.Xaml.Interactivity;
 using Microsoft.UI.Xaml;
 using Wino.Core.Domain.Interfaces;
-using Wino.Core.UWP.Controls;
+using Wino.Core.WinUI.Controls;
 
 namespace Wino.Behaviors;
 
diff --git a/Wino.Mail.WinUI/Controls/AccountNavigationItem.cs b/Wino.Mail.WinUI/Controls/AccountNavigationItem.cs
index 528733fb..19e6c4ee 100644
--- a/Wino.Mail.WinUI/Controls/AccountNavigationItem.cs
+++ b/Wino.Mail.WinUI/Controls/AccountNavigationItem.cs
@@ -2,7 +2,7 @@
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml;
 using Wino.Core.Domain.Interfaces;
-using Wino.Core.UWP.Controls;
+using Wino.Core.WinUI.Controls;
 
 namespace Wino.Controls;
 
diff --git a/Wino.Mail.WinUI/Controls/MailItemDisplayInformationControl.xaml b/Wino.Mail.WinUI/Controls/MailItemDisplayInformationControl.xaml
index 92d3332a..c3be3fa9 100644
--- a/Wino.Mail.WinUI/Controls/MailItemDisplayInformationControl.xaml
+++ b/Wino.Mail.WinUI/Controls/MailItemDisplayInformationControl.xaml
@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
     xmlns:controls="using:Wino.Controls"
-    xmlns:coreControls="using:Wino.Core.UWP.Controls"
+    xmlns:coreControls="using:Wino.Core.WinUI.Controls"
     xmlns:domain="using:Wino.Core.Domain"
     xmlns:enums="using:Wino.Core.Domain.Enums"
     xmlns:helpers="using:Wino.Helpers"
diff --git a/Wino.Mail.WinUI/Controls/WebViewEditorControl.cs b/Wino.Mail.WinUI/Controls/WebViewEditorControl.cs
index 41c0e35b..89e47fe1 100644
--- a/Wino.Mail.WinUI/Controls/WebViewEditorControl.cs
+++ b/Wino.Mail.WinUI/Controls/WebViewEditorControl.cs
@@ -12,8 +12,8 @@ using Wino.Core.Domain;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models;
 using Wino.Core.Domain.Models.Reader;
-using Wino.Core.UWP;
-using Wino.Core.UWP.Extensions;
+using Wino.Core.WinUI;
+using Wino.Core.WinUI.Extensions;
 using Wino.Mail.WinUI;
 
 namespace Wino.Mail.Controls;
diff --git a/Wino.Mail.WinUI/Dialogs/AccountReorderDialog.xaml b/Wino.Mail.WinUI/Dialogs/AccountReorderDialog.xaml
index 459463d2..b353cb00 100644
--- a/Wino.Mail.WinUI/Dialogs/AccountReorderDialog.xaml
+++ b/Wino.Mail.WinUI/Dialogs/AccountReorderDialog.xaml
@@ -3,7 +3,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:Wino.Controls"
-    xmlns:coreControls="using:Wino.Core.UWP.Controls"
+    xmlns:coreControls="using:Wino.Core.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:domain="using:Wino.Core.Domain"
     xmlns:helpers="using:Wino.Helpers"
diff --git a/Wino.Mail.WinUI/Dialogs/MoveMailDialog.xaml b/Wino.Mail.WinUI/Dialogs/MoveMailDialog.xaml
index 3b62b109..e827be38 100644
--- a/Wino.Mail.WinUI/Dialogs/MoveMailDialog.xaml
+++ b/Wino.Mail.WinUI/Dialogs/MoveMailDialog.xaml
@@ -3,7 +3,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:Wino.Controls"
-    xmlns:coreControls="using:Wino.Core.UWP.Controls"
+    xmlns:coreControls="using:Wino.Core.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:domain="using:Wino.Core.Domain"
     xmlns:folders="using:Wino.Core.Domain.Models.Folders"
diff --git a/Wino.Mail.WinUI/Dialogs/SignatureEditorDialog.xaml b/Wino.Mail.WinUI/Dialogs/SignatureEditorDialog.xaml
index 774c0e72..231a78cd 100644
--- a/Wino.Mail.WinUI/Dialogs/SignatureEditorDialog.xaml
+++ b/Wino.Mail.WinUI/Dialogs/SignatureEditorDialog.xaml
@@ -6,7 +6,7 @@
     xmlns:controls="using:Wino.Controls"
     xmlns:controls1="using:CommunityToolkit.WinUI.Controls"
     xmlns:controls2="using:Wino.Mail.Controls"
-    xmlns:coreControls="using:Wino.Core.UWP.Controls"
+    xmlns:coreControls="using:Wino.Core.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:domain="using:Wino.Core.Domain"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/Wino.Mail.WinUI/Dialogs/SystemFolderConfigurationDialog.xaml b/Wino.Mail.WinUI/Dialogs/SystemFolderConfigurationDialog.xaml
index 51f82af3..11d08020 100644
--- a/Wino.Mail.WinUI/Dialogs/SystemFolderConfigurationDialog.xaml
+++ b/Wino.Mail.WinUI/Dialogs/SystemFolderConfigurationDialog.xaml
@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:Wino.Controls"
     xmlns:controls1="using:CommunityToolkit.WinUI.Controls"
-    xmlns:coreControls="using:Wino.Core.UWP.Controls"
+    xmlns:coreControls="using:Wino.Core.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:domain="using:Wino.Core.Domain"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/Wino.Mail.WinUI/MenuFlyouts/AccountSelectorFlyout.cs b/Wino.Mail.WinUI/MenuFlyouts/AccountSelectorFlyout.cs
index ae840700..d96889d9 100644
--- a/Wino.Mail.WinUI/MenuFlyouts/AccountSelectorFlyout.cs
+++ b/Wino.Mail.WinUI/MenuFlyouts/AccountSelectorFlyout.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.UI.Xaml.Controls;
 using Wino.Core.Domain.Entities.Shared;
-using Wino.Core.UWP.Controls;
+using Wino.Core.WinUI.Controls;
 using Wino.Helpers;
 
 namespace Wino.MenuFlyouts;
diff --git a/Wino.Mail.WinUI/MenuFlyouts/FilterMenuFlyout.cs b/Wino.Mail.WinUI/MenuFlyouts/FilterMenuFlyout.cs
index 9b8f920c..e7c8111e 100644
--- a/Wino.Mail.WinUI/MenuFlyouts/FilterMenuFlyout.cs
+++ b/Wino.Mail.WinUI/MenuFlyouts/FilterMenuFlyout.cs
@@ -4,7 +4,7 @@ using CommunityToolkit.Mvvm.Input;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Wino.Core.Domain.Models.Reader;
-using Wino.Core.UWP.Controls;
+using Wino.Core.WinUI.Controls;
 using Wino.Helpers;
 
 namespace Wino.MenuFlyouts;
diff --git a/Wino.Mail.WinUI/MenuFlyouts/WinoOperationFlyoutItem.cs b/Wino.Mail.WinUI/MenuFlyouts/WinoOperationFlyoutItem.cs
index a540f780..e6857a05 100644
--- a/Wino.Mail.WinUI/MenuFlyouts/WinoOperationFlyoutItem.cs
+++ b/Wino.Mail.WinUI/MenuFlyouts/WinoOperationFlyoutItem.cs
@@ -3,7 +3,7 @@ using Microsoft.UI.Xaml.Controls;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Folders;
 using Wino.Core.Domain.Models.Menus;
-using Wino.Core.UWP.Controls;
+using Wino.Core.WinUI.Controls;
 using Wino.Helpers;
 
 namespace Wino.MenuFlyouts;
diff --git a/Wino.Mail.WinUI/Services/DialogService.cs b/Wino.Mail.WinUI/Services/DialogService.cs
index 7a28db30..506c5dbd 100644
--- a/Wino.Mail.WinUI/Services/DialogService.cs
+++ b/Wino.Mail.WinUI/Services/DialogService.cs
@@ -13,8 +13,8 @@ using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Accounts;
 using Wino.Core.Domain.Models.Folders;
 using Wino.Core.Domain.Models.Synchronization;
-using Wino.Core.UWP.Extensions;
-using Wino.Core.UWP.Services;
+using Wino.Core.WinUI.Extensions;
+using Wino.Core.WinUI.Services;
 using Wino.Dialogs;
 using Wino.Mail.Dialogs;
 using Wino.Messaging.Server;
diff --git a/Wino.Mail.WinUI/Services/NavigationService.cs b/Wino.Mail.WinUI/Services/NavigationService.cs
index ebc8a157..90498938 100644
--- a/Wino.Mail.WinUI/Services/NavigationService.cs
+++ b/Wino.Mail.WinUI/Services/NavigationService.cs
@@ -6,8 +6,8 @@ using Microsoft.UI.Xaml.Controls;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Navigation;
-using Wino.Core.UWP;
-using Wino.Core.UWP.Services;
+using Wino.Core.WinUI;
+using Wino.Core.WinUI.Services;
 using Wino.Core.WinUI.Interfaces;
 using Wino.Helpers;
 using Wino.Mail.ViewModels.Data;
diff --git a/Wino.Mail.WinUI/Views/Abstract/AboutPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/AboutPageAbstract.cs
index e2e1725f..6b9e1642 100644
--- a/Wino.Mail.WinUI/Views/Abstract/AboutPageAbstract.cs
+++ b/Wino.Mail.WinUI/Views/Abstract/AboutPageAbstract.cs
@@ -1,4 +1,4 @@
-using Wino.Core.UWP;
+using Wino.Core.WinUI;
 using Wino.Core.ViewModels;
 
 namespace Wino.Views.Abstract;
diff --git a/Wino.Mail.WinUI/Views/Abstract/AccountDetailsPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/AccountDetailsPageAbstract.cs
index 04c78aea..ded3e806 100644
--- a/Wino.Mail.WinUI/Views/Abstract/AccountDetailsPageAbstract.cs
+++ b/Wino.Mail.WinUI/Views/Abstract/AccountDetailsPageAbstract.cs
@@ -1,4 +1,4 @@
-using Wino.Core.UWP;
+using Wino.Core.WinUI;
 using Wino.Mail.ViewModels;
 
 namespace Wino.Views.Abstract;
diff --git a/Wino.Mail.WinUI/Views/Abstract/AccountManagementPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/AccountManagementPageAbstract.cs
index a5cffe05..c036ca57 100644
--- a/Wino.Mail.WinUI/Views/Abstract/AccountManagementPageAbstract.cs
+++ b/Wino.Mail.WinUI/Views/Abstract/AccountManagementPageAbstract.cs
@@ -1,4 +1,4 @@
-using Wino.Core.UWP;
+using Wino.Core.WinUI;
 using Wino.Mail.ViewModels;
 
 namespace Wino.Views.Abstract;
diff --git a/Wino.Mail.WinUI/Views/Abstract/AliasManagementPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/AliasManagementPageAbstract.cs
index 9d0052d1..f14906f5 100644
--- a/Wino.Mail.WinUI/Views/Abstract/AliasManagementPageAbstract.cs
+++ b/Wino.Mail.WinUI/Views/Abstract/AliasManagementPageAbstract.cs
@@ -1,4 +1,4 @@
-using Wino.Core.UWP;
+using Wino.Core.WinUI;
 using Wino.Mail.ViewModels;
 
 namespace Wino.Views.Abstract;
diff --git a/Wino.Mail.WinUI/Views/Abstract/AppPreferencesPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/AppPreferencesPageAbstract.cs
index 878facfa..3ae4d174 100644
--- a/Wino.Mail.WinUI/Views/Abstract/AppPreferencesPageAbstract.cs
+++ b/Wino.Mail.WinUI/Views/Abstract/AppPreferencesPageAbstract.cs
@@ -1,4 +1,4 @@
-using Wino.Core.UWP;
+using Wino.Core.WinUI;
 using Wino.Mail.ViewModels;
 
 namespace Wino.Views.Abstract;
diff --git a/Wino.Mail.WinUI/Views/Abstract/AppShellAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/AppShellAbstract.cs
index 9f1572fd..3214d581 100644
--- a/Wino.Mail.WinUI/Views/Abstract/AppShellAbstract.cs
+++ b/Wino.Mail.WinUI/Views/Abstract/AppShellAbstract.cs
@@ -1,4 +1,4 @@
-using Wino.Core.UWP;
+using Wino.Core.WinUI;
 using Wino.Mail.ViewModels;
 
 namespace Wino.Views.Abstract;
diff --git a/Wino.Mail.WinUI/Views/Abstract/ComposePageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/ComposePageAbstract.cs
index ed6c5879..389e5862 100644
--- a/Wino.Mail.WinUI/Views/Abstract/ComposePageAbstract.cs
+++ b/Wino.Mail.WinUI/Views/Abstract/ComposePageAbstract.cs
@@ -1,4 +1,4 @@
-using Wino.Core.UWP;
+using Wino.Core.WinUI;
 using Wino.Mail.ViewModels;
 
 namespace Wino.Views.Abstract;
diff --git a/Wino.Mail.WinUI/Views/Abstract/EditAccountDetailsPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/EditAccountDetailsPageAbstract.cs
index 91cf2854..6b06b8f4 100644
--- a/Wino.Mail.WinUI/Views/Abstract/EditAccountDetailsPageAbstract.cs
+++ b/Wino.Mail.WinUI/Views/Abstract/EditAccountDetailsPageAbstract.cs
@@ -1,4 +1,4 @@
-using Wino.Core.UWP;
+using Wino.Core.WinUI;
 using Wino.Mail.ViewModels;
 
 namespace Wino.Views.Abstract;
diff --git a/Wino.Mail.WinUI/Views/Abstract/IdlePageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/IdlePageAbstract.cs
index 73280adb..d8fc5476 100644
--- a/Wino.Mail.WinUI/Views/Abstract/IdlePageAbstract.cs
+++ b/Wino.Mail.WinUI/Views/Abstract/IdlePageAbstract.cs
@@ -1,4 +1,4 @@
-using Wino.Core.UWP;
+using Wino.Core.WinUI;
 using Wino.Mail.ViewModels;
 
 namespace Wino.Views.Abstract;
diff --git a/Wino.Mail.WinUI/Views/Abstract/LanguageTimePageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/LanguageTimePageAbstract.cs
index 6d739c56..aa9331f2 100644
--- a/Wino.Mail.WinUI/Views/Abstract/LanguageTimePageAbstract.cs
+++ b/Wino.Mail.WinUI/Views/Abstract/LanguageTimePageAbstract.cs
@@ -1,4 +1,4 @@
-using Wino.Core.UWP;
+using Wino.Core.WinUI;
 using Wino.Mail.ViewModels;
 
 namespace Wino.Views.Abstract;
diff --git a/Wino.Mail.WinUI/Views/Abstract/MailListPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/MailListPageAbstract.cs
index 84dfb9c0..1fc3d569 100644
--- a/Wino.Mail.WinUI/Views/Abstract/MailListPageAbstract.cs
+++ b/Wino.Mail.WinUI/Views/Abstract/MailListPageAbstract.cs
@@ -1,4 +1,4 @@
-using Wino.Core.UWP;
+using Wino.Core.WinUI;
 using Wino.Mail.ViewModels;
 
 namespace Wino.Views.Abstract;
diff --git a/Wino.Mail.WinUI/Views/Abstract/MailRenderingPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/MailRenderingPageAbstract.cs
index 417dd770..1742480c 100644
--- a/Wino.Mail.WinUI/Views/Abstract/MailRenderingPageAbstract.cs
+++ b/Wino.Mail.WinUI/Views/Abstract/MailRenderingPageAbstract.cs
@@ -1,5 +1,5 @@
 using Microsoft.UI.Xaml;
-using Wino.Core.UWP;
+using Wino.Core.WinUI;
 using Wino.Mail.ViewModels;
 
 namespace Wino.Views.Abstract;
diff --git a/Wino.Mail.WinUI/Views/Abstract/MergedAccountDetailsPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/MergedAccountDetailsPageAbstract.cs
index 6ea69ace..dab5f0f0 100644
--- a/Wino.Mail.WinUI/Views/Abstract/MergedAccountDetailsPageAbstract.cs
+++ b/Wino.Mail.WinUI/Views/Abstract/MergedAccountDetailsPageAbstract.cs
@@ -1,4 +1,4 @@
-using Wino.Core.UWP;
+using Wino.Core.WinUI;
 using Wino.Mail.ViewModels;
 
 namespace Wino.Views.Abstract;
diff --git a/Wino.Mail.WinUI/Views/Abstract/MessageListPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/MessageListPageAbstract.cs
index af6462e3..d8a05356 100644
--- a/Wino.Mail.WinUI/Views/Abstract/MessageListPageAbstract.cs
+++ b/Wino.Mail.WinUI/Views/Abstract/MessageListPageAbstract.cs
@@ -1,4 +1,4 @@
-using Wino.Core.UWP;
+using Wino.Core.WinUI;
 using Wino.Mail.ViewModels;
 
 namespace Wino.Views.Abstract;
diff --git a/Wino.Mail.WinUI/Views/Abstract/ReadComposePanePageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/ReadComposePanePageAbstract.cs
index 9af5b594..249911b2 100644
--- a/Wino.Mail.WinUI/Views/Abstract/ReadComposePanePageAbstract.cs
+++ b/Wino.Mail.WinUI/Views/Abstract/ReadComposePanePageAbstract.cs
@@ -1,4 +1,4 @@
-using Wino.Core.UWP;
+using Wino.Core.WinUI;
 using Wino.Mail.ViewModels;
 
 namespace Wino.Views.Abstract;
diff --git a/Wino.Mail.WinUI/Views/Abstract/SignatureManagementPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/SignatureManagementPageAbstract.cs
index 8130f9f0..256cb306 100644
--- a/Wino.Mail.WinUI/Views/Abstract/SignatureManagementPageAbstract.cs
+++ b/Wino.Mail.WinUI/Views/Abstract/SignatureManagementPageAbstract.cs
@@ -1,4 +1,4 @@
-using Wino.Core.UWP;
+using Wino.Core.WinUI;
 using Wino.Mail.ViewModels;
 
 namespace Wino.Views.Abstract;
diff --git a/Wino.Mail.WinUI/Views/Abstract/WelcomePageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/WelcomePageAbstract.cs
index b3844953..06fa2d36 100644
--- a/Wino.Mail.WinUI/Views/Abstract/WelcomePageAbstract.cs
+++ b/Wino.Mail.WinUI/Views/Abstract/WelcomePageAbstract.cs
@@ -1,4 +1,4 @@
-using Wino.Core.UWP;
+using Wino.Core.WinUI;
 using Wino.Mail.ViewModels;
 
 namespace Wino.Views.Abstract;
diff --git a/Wino.Mail.WinUI/Views/Account/AccountDetailsPage.xaml b/Wino.Mail.WinUI/Views/Account/AccountDetailsPage.xaml
index dccb3cd0..b090e62c 100644
--- a/Wino.Mail.WinUI/Views/Account/AccountDetailsPage.xaml
+++ b/Wino.Mail.WinUI/Views/Account/AccountDetailsPage.xaml
@@ -5,7 +5,7 @@
     xmlns:abstract="using:Wino.Views.Abstract"
     xmlns:controls="using:CommunityToolkit.WinUI.Controls"
     xmlns:controls1="using:Wino.Controls"
-    xmlns:coreControls="using:Wino.Core.UWP.Controls"
+    xmlns:coreControls="using:Wino.Core.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:domain="using:Wino.Core.Domain"
     xmlns:folders="using:Wino.Core.Domain.Models.Folders"
diff --git a/Wino.Mail.WinUI/Views/Account/AccountManagementPage.xaml b/Wino.Mail.WinUI/Views/Account/AccountManagementPage.xaml
index f738c607..55a8b33c 100644
--- a/Wino.Mail.WinUI/Views/Account/AccountManagementPage.xaml
+++ b/Wino.Mail.WinUI/Views/Account/AccountManagementPage.xaml
@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:abstract="using:Wino.Views.Abstract"
     xmlns:controls="using:Wino.Controls"
-    xmlns:coreControls="using:Wino.Core.UWP.Controls"
+    xmlns:coreControls="using:Wino.Core.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:data="using:Wino.Core.ViewModels.Data"
     xmlns:domain="using:Wino.Core.Domain"
diff --git a/Wino.Mail.WinUI/Views/Account/MergedAccountDetailsPage.xaml b/Wino.Mail.WinUI/Views/Account/MergedAccountDetailsPage.xaml
index 5c8b9813..50089547 100644
--- a/Wino.Mail.WinUI/Views/Account/MergedAccountDetailsPage.xaml
+++ b/Wino.Mail.WinUI/Views/Account/MergedAccountDetailsPage.xaml
@@ -5,7 +5,7 @@
     xmlns:abstract="using:Wino.Views.Abstract"
     xmlns:controls="using:CommunityToolkit.WinUI.Controls"
     xmlns:controls1="using:Wino.Controls"
-    xmlns:coreControls="using:Wino.Core.UWP.Controls"
+    xmlns:coreControls="using:Wino.Core.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:data="using:Wino.Mail.ViewModels.Data"
     xmlns:domain="using:Wino.Core.Domain"
diff --git a/Wino.Mail.WinUI/Views/ComposePage.xaml b/Wino.Mail.WinUI/Views/ComposePage.xaml
index 66e386f3..2c463370 100644
--- a/Wino.Mail.WinUI/Views/ComposePage.xaml
+++ b/Wino.Mail.WinUI/Views/ComposePage.xaml
@@ -5,8 +5,8 @@
     xmlns:abstract="using:Wino.Views.Abstract"
     xmlns:controls="using:Wino.Controls"
     xmlns:controls1="using:Wino.Mail.Controls"
-    xmlns:coreControls="using:Wino.Core.UWP.Controls"
-    xmlns:customcontrols="using:Wino.Core.UWP.Controls.CustomControls"
+    xmlns:coreControls="using:Wino.Core.WinUI.Controls"
+    xmlns:customcontrols="using:Wino.Core.WinUI.Controls.CustomControls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:data="using:Wino.Mail.ViewModels.Data"
     xmlns:domain="using:Wino.Core.Domain"
diff --git a/Wino.Mail.WinUI/Views/ComposePage.xaml.cs b/Wino.Mail.WinUI/Views/ComposePage.xaml.cs
index e6f1cb09..241d7244 100644
--- a/Wino.Mail.WinUI/Views/ComposePage.xaml.cs
+++ b/Wino.Mail.WinUI/Views/ComposePage.xaml.cs
@@ -19,7 +19,7 @@ using Windows.UI.Core.Preview;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Models.Reader;
-using Wino.Core.UWP.Extensions;
+using Wino.Core.WinUI.Extensions;
 using Wino.Mail.ViewModels.Data;
 using Wino.Messaging.Client.Mails;
 using Wino.Messaging.Client.Shell;
diff --git a/Wino.Mail.WinUI/Views/ImapSetup/TestingImapConnectionPage.xaml b/Wino.Mail.WinUI/Views/ImapSetup/TestingImapConnectionPage.xaml
index d63adfdf..d86df993 100644
--- a/Wino.Mail.WinUI/Views/ImapSetup/TestingImapConnectionPage.xaml
+++ b/Wino.Mail.WinUI/Views/ImapSetup/TestingImapConnectionPage.xaml
@@ -3,7 +3,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:Wino.Controls"
-    xmlns:controls1="using:Wino.Core.UWP.Controls"
+    xmlns:controls1="using:Wino.Core.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:domain="using:Wino.Core.Domain"
     xmlns:local="using:Wino.Views.ImapSetup"
diff --git a/Wino.Mail.WinUI/Views/MailListPage.xaml b/Wino.Mail.WinUI/Views/MailListPage.xaml
index f924e955..03822669 100644
--- a/Wino.Mail.WinUI/Views/MailListPage.xaml
+++ b/Wino.Mail.WinUI/Views/MailListPage.xaml
@@ -7,7 +7,7 @@
     xmlns:collections="using:CommunityToolkit.Mvvm.Collections"
     xmlns:controls="using:Wino.Controls"
     xmlns:converters="using:Wino.Converters"
-    xmlns:coreControls="using:Wino.Core.UWP.Controls"
+    xmlns:coreControls="using:Wino.Core.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:domain="using:Wino.Core.Domain"
     xmlns:enums="using:Wino.Core.Domain.Enums"
@@ -23,7 +23,7 @@
     xmlns:toolkit="using:CommunityToolkit.WinUI.Controls"
     xmlns:toolkitExt="using:CommunityToolkit.WinUI"
     xmlns:viewModelData="using:Wino.Mail.ViewModels.Data"
-    xmlns:wino="using:Wino.Core.UWP"
+    xmlns:wino="using:Wino.Core.WinUI"
     x:Name="root"
     KeyboardAcceleratorPlacementMode="Hidden"
     SizeChanged="PageSizeChanged"
diff --git a/Wino.Mail.WinUI/Views/MailRenderingPage.xaml b/Wino.Mail.WinUI/Views/MailRenderingPage.xaml
index 7bea60ec..137cb635 100644
--- a/Wino.Mail.WinUI/Views/MailRenderingPage.xaml
+++ b/Wino.Mail.WinUI/Views/MailRenderingPage.xaml
@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:abstract="using:Wino.Views.Abstract"
     xmlns:controls="using:Wino.Controls"
-    xmlns:customcontrols="using:Wino.Core.UWP.Controls.CustomControls"
+    xmlns:customcontrols="using:Wino.Core.WinUI.Controls.CustomControls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:domain="using:Wino.Core.Domain"
     xmlns:entities="using:Wino.Core.Domain.Entities.Shared"
diff --git a/Wino.Mail.WinUI/Views/MailRenderingPage.xaml.cs b/Wino.Mail.WinUI/Views/MailRenderingPage.xaml.cs
index c7b8ede8..20bfbb50 100644
--- a/Wino.Mail.WinUI/Views/MailRenderingPage.xaml.cs
+++ b/Wino.Mail.WinUI/Views/MailRenderingPage.xaml.cs
@@ -12,7 +12,7 @@ using Microsoft.Web.WebView2.Core;
 using Windows.System;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Interfaces;
-using Wino.Core.UWP.Extensions;
+using Wino.Core.WinUI.Extensions;
 using Wino.Mail.ViewModels.Data;
 using Wino.Mail.WinUI;
 using Wino.Messaging.Client.Mails;
diff --git a/Wino.Mail.WinUI/Views/Settings/EditAccountDetailsPage.xaml b/Wino.Mail.WinUI/Views/Settings/EditAccountDetailsPage.xaml
index 0578fb50..3d4ab072 100644
--- a/Wino.Mail.WinUI/Views/Settings/EditAccountDetailsPage.xaml
+++ b/Wino.Mail.WinUI/Views/Settings/EditAccountDetailsPage.xaml
@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:abstract="using:Wino.Views.Abstract"
     xmlns:controls="using:CommunityToolkit.WinUI.Controls"
-    xmlns:converters="using:Wino.Core.UWP.Converters"
+    xmlns:converters="using:Wino.Core.WinUI.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:data="using:Wino.Core.ViewModels.Data"
     xmlns:domain="using:Wino.Core.Domain"
diff --git a/Wino.Mail.WinUI/Views/Settings/PersonalizationPage.xaml b/Wino.Mail.WinUI/Views/Settings/PersonalizationPage.xaml
index 9a12d15b..9adab356 100644
--- a/Wino.Mail.WinUI/Views/Settings/PersonalizationPage.xaml
+++ b/Wino.Mail.WinUI/Views/Settings/PersonalizationPage.xaml
@@ -5,7 +5,7 @@
     xmlns:abstract="using:Wino.Views.Abstract"
     xmlns:controls="using:CommunityToolkit.WinUI.Controls"
     xmlns:controls1="using:Wino.Controls"
-    xmlns:coreSelectors="using:Wino.Core.UWP.Selectors"
+    xmlns:coreSelectors="using:Wino.Core.WinUI.Selectors"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:data="using:Wino.Core.ViewModels.Data"
     xmlns:domain="using:Wino.Core.Domain"
@@ -13,7 +13,7 @@
     xmlns:helpers="using:Wino.Helpers"
     xmlns:mailSelectors="using:Wino.Selectors"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:personalization="using:Wino.Core.UWP.Models.Personalization"
+    xmlns:personalization="using:Wino.Core.WinUI.Models.Personalization"
     xmlns:selectors="using:Wino.Selectors"
     xmlns:toolkitExt="using:CommunityToolkit.WinUI"
     xmlns:viewModelData="using:Wino.Mail.ViewModels.Data"