New startup window.

Instructions/WelcomePageInstructions.md

@@ -0,0 +1,16 @@
+This is a design document for new welcome page for users who have no accounts defined in the database.
+ 
+Right now we welcome our users in WelcomePage if they have no accounts defined. Navigation is like ShellWindow -> MailAppShell -> WelcomePage. This allows users to access ManageAccountsPage from the side bar since mail app shell has this navigation option. 
+We don't want this anymore. Here are the instructions to define new welcome page (or initial startup wizard page):
+
+- ShellWindow should not be used to navigate this new welcome page.
+- Create a new WelcomeWindow and navigate to WelcomePage. You can remove all the content inside the existing welcome page because we are doing a new welcome page.
+- In App.xaml.cs, we must check if the user has accounts defined or not. If no accounts, create this new window and activate it.
+- In this Window I want to highlight a few things. It should clearly say that this is a native Windows application that supports Mail and Calendar.
+- Design is not important at the moment, but make sure to follow Windows fluent design guidelines.
+- In this page users must be able to
+
++ Go to manage accounts page
++ Show the latest version changelog. We have this new "What's new" dialog, but resolve the latest json for the update and show it on the page as well using the same FlipView. You can make this a UserControl maybe. It'll be exactly the same, except "Get started" button should not be visible when the control is loaded in WelcomePage.
++ Some details from the About page like version, github page, donation link etc. would be great. We can show it here in new WelcomePage too.
+

Wino.Core.Domain/BasicTypesJsonContext.cs

@@ -10,5 +10,6 @@ namespace Wino.Core.Domain;
 [JsonSerializable(typeof(List<string>))]
 [JsonSerializable(typeof(bool))]
 [JsonSerializable(typeof(UpdateNotes))]
+[JsonSerializable(typeof(UpdateMigration))]
 [JsonSerializable(typeof(List<UpdateNoteSection>))]
 public partial class BasicTypesJsonContext : JsonSerializerContext;

Wino.Core.Domain/Enums/WinoPage.cs

@@ -34,5 +34,6 @@ public enum WinoPage
     CalendarAccountSettingsPage,
     EventDetailsPage,
     SignatureAndEncryptionPage,
-    StoragePage
+    StoragePage,
+    WelcomePageV2
 }

Wino.Core.Domain/Interfaces/INewThemeService.cs

@@ -37,4 +37,10 @@ public interface INewThemeService : IInitializeAsync
 
     // Backdrop management
     List<BackdropTypeWrapper> GetAvailableBackdropTypes();
+
+    /// <summary>
+    /// Re-applies the current theme (backdrop, root theme, accent, caption colors)
+    /// to the currently active window. Use after a window transition.
+    /// </summary>
+    Task ApplyThemeToActiveWindowAsync();
 }

Wino.Core.Domain/Interfaces/IUpdateManager.cs

@@ -9,6 +9,9 @@ public interface IUpdateManager
     /// <summary>Loads and parses the update notes for the current version from the bundled asset file.</summary>
     Task<UpdateNotes> GetLatestUpdateNotesAsync();
 
+    /// <summary>Loads and parses the app feature highlights from the bundled asset file.</summary>
+    Task<List<UpdateNoteSection>> GetFeaturesAsync();
+
     /// <summary>Returns true if the current version's update notes have not yet been shown to the user.</summary>
     bool ShouldShowUpdateNotes();
 

Wino.Core.Domain/Models/Updates/UpdateMigration.cs

@@ -0,0 +1,12 @@
+using System.Text.Json.Serialization;
+
+namespace Wino.Core.Domain.Models.Updates;
+
+public class UpdateMigration
+{
+    [JsonPropertyName("titleKey")]
+    public string TitleKey { get; set; } = string.Empty;
+
+    [JsonPropertyName("descriptionKey")]
+    public string DescriptionKey { get; set; } = string.Empty;
+}

Wino.Core.Domain/Models/Updates/UpdateNotes.cs

@@ -5,8 +5,11 @@ namespace Wino.Core.Domain.Models.Updates;
 
 public class UpdateNotes
 {
-    [JsonPropertyName("hasMigrations")]
-    public bool HasMigrations { get; set; }
+    [JsonPropertyName("hasPendingMigrations")]
+    public bool HasPendingMigrations { get; set; }
+
+    [JsonPropertyName("migration")]
+    public UpdateMigration Migration { get; set; } = new();
 
     [JsonPropertyName("sections")]
     public List<UpdateNoteSection> Sections { get; set; } = [];

Wino.Core.Domain/Translations/en_US/resources.json

@@ -985,6 +985,24 @@
     "CalendarAccountSettings_PrimaryCalendar": "Primary Calendar",
     "CalendarAccountSettings_PrimaryCalendarDescription": "Mark this calendar as the primary calendar for the account",
     "WhatIsNew_GetStartedButton": "Get Started",
+    "WhatIsNew_ContinueAnywayButton": "Continue anyway",
+    "WhatIsNew_PreparingForNewVersionButton": "Preparing for new version...",
+    "WhatIsNew_MigrationPreparing_Title": "Preparing your data",
+    "WhatIsNew_MigrationPreparing_Description": "Wino is applying update migrations. Please wait while we prepare your account data for this release.",
+    "WhatIsNew_MigrationFailedMessage": "Applying migrations failed with error code {0}. You may continue to use the application. However, if you encounter serious issues please re-install the application.",
     "WhatIsNew_MigrationNotification_Title": "Wino Mail Updated",
-    "WhatIsNew_MigrationNotification_Message": "Open the app to complete the update and see what's new."
+    "WhatIsNew_MigrationNotification_Message": "Open the app to complete the update and see what's new.",
+    "WelcomeWindow_Title": "Welcome to Wino Mail",
+    "WelcomeWindow_Subtitle": "A native Windows experience for Mail and Calendar.",
+    "WelcomeWindow_WhatsNewTitle": "Latest changes",
+    "WelcomeWindow_FeaturesTitle": "Features",
+    "WelcomeWindow_WhatsNewTab": "What's New",
+    "WelcomeWindow_FeaturesTab": "Features",
+    "WelcomeWindow_GetStartedButton": "Get started by adding an account",
+    "WelcomeWindow_GetStartedDescription": "Add your Outlook, Gmail, or IMAP account to get started with Wino Mail.",
+    "WelcomeWindow_SetupTitle": "Set up your account",
+    "WelcomeWindow_SetupSubtitle": "Choose your email provider to get started",
+    "WelcomeWindow_AddAccountButton": "Add account",
+    "WelcomeWindow_SkipForNow": "Skip for now — I'll set it up later",
+    "WelcomeWindow_AppDescription": "A fast, focused inbox — redesigned for Windows 11"
 }

Wino.Core.Domain/Translator.cs

@@ -7,4 +7,7 @@ namespace Wino.Core.Domain;
 /// All translations generated automatically by the source generator.
 /// </summary>
 [TranslatorGen]
-public partial class Translator;
+public partial class Translator
+{
+    public static string GetTranslatedString(string key) => Resources.GetTranslatedString(key);
+}

Wino.Mail.ViewModels/AccountManagementViewModel.cs

@@ -331,6 +331,8 @@ public partial class AccountManagementViewModel : AccountManagementPageViewModel
         }
     }
 
+    public Task StartAddNewAccountAsync() => AddNewAccountAsync();
+
     private async Task ValidateSpecialImapConnectivityAsync(CustomServerInformation serverInformation)
     {
         var connectivityResult = await SynchronizationManager.Instance

Wino.Mail.ViewModels/WelcomePageV2ViewModel.cs

@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Messaging;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Navigation;
+using Wino.Core.Domain.Models.Updates;
+using Wino.Messaging.Client.Navigation;
+
+namespace Wino.Mail.ViewModels;
+
+public partial class WelcomePageV2ViewModel : MailBaseViewModel
+{
+    private readonly IUpdateManager _updateManager;
+
+    [ObservableProperty]
+    public partial List<UpdateNoteSection> UpdateSections { get; set; } = [];
+
+    public WelcomePageV2ViewModel(IUpdateManager updateManager)
+    {
+        _updateManager = updateManager;
+    }
+
+    public override async void OnNavigatedTo(NavigationMode mode, object parameters)
+    {
+        base.OnNavigatedTo(mode, parameters);
+
+        try
+        {
+            var updateNotes = await _updateManager.GetLatestUpdateNotesAsync();
+            UpdateSections = updateNotes.Sections;
+        }
+        catch (Exception)
+        {
+            UpdateSections = [];
+        }
+    }
+
+    [RelayCommand]
+    private void GetStarted()
+    {
+        Messenger.Send(new GetStartedFromWelcomeRequested());
+    }
+}

Wino.Mail.ViewModels/WelcomePageViewModel.cs

@@ -1,37 +1,69 @@
-using System;
+using System;
+using System.Collections.Generic;
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Models.Navigation;
+using Wino.Core.Domain.Models.Updates;
 
 namespace Wino.Mail.ViewModels;
 
 public partial class WelcomePageViewModel : MailBaseViewModel
 {
-    public const string VersionFile = "vnext.md";
-    private readonly IMailDialogService _dialogService;
-    private readonly IFileService _fileService;
+    private readonly IUpdateManager _updateManager;
+    private readonly INativeAppService _nativeAppService;
+    private readonly INavigationService _navigationService;
 
     [ObservableProperty]
-    public partial string CurrentVersionNotes { get; set; } = string.Empty;
+    public partial string VersionDisplay { get; set; } = string.Empty;
 
-    public WelcomePageViewModel(IMailDialogService dialogService, IFileService fileService)
+    [ObservableProperty]
+    public partial List<UpdateNoteSection> UpdateSections { get; set; } = [];
+
+    [ObservableProperty]
+    public partial List<UpdateNoteSection> FeatureSections { get; set; } = [];
+
+    public string GitHubUrl => "https://github.com/bkaankose/Wino-Mail/";
+    public string PaypalUrl => "https://paypal.me/bkaankose?country.x=PL&locale.x=en_US";
+
+    public WelcomePageViewModel(IUpdateManager updateManager,
+                                INativeAppService nativeAppService,
+                                INavigationService navigationService)
     {
-        _dialogService = dialogService;
-        _fileService = fileService;
+        _updateManager = updateManager;
+        _nativeAppService = nativeAppService;
+        _navigationService = navigationService;
     }
 
     public override async void OnNavigatedTo(NavigationMode mode, object parameters)
     {
         base.OnNavigatedTo(mode, parameters);
 
+        VersionDisplay = $"{Translator.SettingsAboutVersion}{_nativeAppService.GetFullAppVersion()}";
+
         try
         {
-            CurrentVersionNotes = await _fileService.GetFileContentByApplicationUriAsync($"ms-appx:///Assets/ReleaseNotes/{VersionFile}");
+            var updateNotes = await _updateManager.GetLatestUpdateNotesAsync();
+            UpdateSections = updateNotes.Sections;
         }
         catch (Exception)
         {
-            _dialogService.InfoBarMessage(Translator.GeneralTitle_Error, "Can't find the patch notes.", Core.Domain.Enums.InfoBarMessageType.Information);
+            UpdateSections = [];
+        }
+
+        try
+        {
+            FeatureSections = await _updateManager.GetFeaturesAsync();
+        }
+        catch (Exception)
+        {
+            FeatureSections = [];
         }
     }
+
+    [RelayCommand]
+    private void NavigateManageAccounts()
+        => _navigationService.Navigate(WinoPage.ManageAccountsPage, null, NavigationReferenceFrame.ShellFrame, NavigationTransitionType.DrillIn);
 }

Wino.Mail.WinUI/App.xaml.cs

@@ -21,14 +21,17 @@ using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Calendar;
 using Wino.Core.Domain.Models.MailItem;
+using Wino.Core.Domain.Models.Navigation;
 using Wino.Core.Domain.Models.Synchronization;
 using Wino.Core.Domain.Models.Updates;
 using Wino.Mail.Services;
 using Wino.Mail.ViewModels;
 using Wino.Mail.WinUI.Activation;
 using Wino.Mail.WinUI.Interfaces;
+using Wino.Mail.WinUI.Models;
 using Wino.Mail.WinUI.Services;
 using Wino.Messaging.Client.Accounts;
+using Wino.Messaging.Client.Navigation;
 using Wino.Messaging.Server;
 using Wino.Messaging.UI;
 using Wino.Services;
@@ -37,13 +40,16 @@ namespace Wino.Mail.WinUI;
 
 public partial class App : WinoApplication,
     IRecipient<NewMailSynchronizationRequested>,
-    IRecipient<NewCalendarSynchronizationRequested>
+    IRecipient<NewCalendarSynchronizationRequested>,
+    IRecipient<AccountCreatedMessage>,
+    IRecipient<GetStartedFromWelcomeRequested>
 {
     private const int InboxSyncsPerFullSync = 20;
     private const string ToggleDefaultModeLaunchArgument = "--mode=toggle-default";
     private ISynchronizationManager? _synchronizationManager;
     private IPreferencesService? _preferencesService;
     private IAccountService? _accountService;
+    private bool _windowManagerConfigured;
     private CancellationTokenSource? _autoSynchronizationLoopCts;
     private readonly SemaphoreSlim _autoSynchronizationSemaphore = new(1, 1);
     private readonly Dictionary<Guid, int> _inboxSyncCounters = [];
@@ -58,6 +64,52 @@ public partial class App : WinoApplication,
         RegisterRecipients();
     }
 
+    private void EnsureWindowManagerConfigured()
+    {
+        if (_windowManagerConfigured)
+            return;
+
+        var windowManager = Services.GetRequiredService<IWinoWindowManager>();
+        windowManager.ActiveWindowChanged -= OnActiveWindowChanged;
+        windowManager.ActiveWindowChanged += OnActiveWindowChanged;
+        windowManager.WindowRemoved -= OnManagedWindowRemoved;
+        windowManager.WindowRemoved += OnManagedWindowRemoved;
+
+        var nativeAppService = Services.GetRequiredService<INativeAppService>();
+        nativeAppService.GetCoreWindowHwnd = () =>
+        {
+            var window = windowManager.ActiveWindow
+                         ?? windowManager.GetWindow(WinoWindowKind.Shell)
+                         ?? windowManager.GetWindow(WinoWindowKind.Welcome)
+                         ?? MainWindow;
+
+            return window == null
+                ? IntPtr.Zero
+                : WinRT.Interop.WindowNative.GetWindowHandle(window);
+        };
+
+        _windowManagerConfigured = true;
+    }
+
+    private void OnActiveWindowChanged(object? sender, WindowEx? window)
+    {
+        if (window == null)
+            return;
+
+        MainWindow = window;
+        InitializeNavigationDispatcher();
+    }
+
+    private void OnManagedWindowRemoved(object? sender, WindowEx window)
+    {
+        var windowManager = Services.GetRequiredService<IWinoWindowManager>();
+        MainWindow = windowManager.ActiveWindow
+                     ?? windowManager.GetWindow(WinoWindowKind.Shell)
+                     ?? windowManager.GetWindow(WinoWindowKind.Welcome);
+
+        InitializeNavigationDispatcher();
+    }
+
     public bool IsNotificationActivation(out AppNotificationActivatedEventArgs args)
     {
         var activationArgs = AppInstance.GetCurrent().GetActivatedEventArgs();
@@ -93,6 +145,7 @@ public partial class App : WinoApplication,
         services.AddTransient(typeof(MailRenderingPageViewModel));
         services.AddTransient(typeof(AccountManagementViewModel));
         services.AddTransient(typeof(WelcomePageViewModel));
+        services.AddTransient(typeof(WelcomePageV2ViewModel));
 
         services.AddTransient(typeof(ComposePageViewModel));
         services.AddTransient(typeof(IdlePageViewModel));
@@ -153,11 +206,22 @@ public partial class App : WinoApplication,
         _synchronizationManager = Services.GetRequiredService<ISynchronizationManager>();
         _preferencesService = Services.GetRequiredService<IPreferencesService>();
         _accountService = Services.GetRequiredService<IAccountService>();
+        EnsureWindowManagerConfigured();
+
+        var hasAnyAccount = (await _accountService.GetAccountsAsync()).Any();
+        if (!IsStartupTaskLaunch() && !hasAnyAccount)
+        {
+            CreateWelcomeWindow();
+            await NewThemeService.InitializeAsync();
+            MainWindow?.Activate();
+            LogActivation("Welcome window created and activated.");
+            return;
+        }
 
         // Check whether the new version requires a migration before starting sync.
         var updateManager = Services.GetRequiredService<IUpdateManager>();
         var updateNotes = await updateManager.GetLatestUpdateNotesAsync();
-        bool hasPendingMigration = updateNotes.HasMigrations && updateManager.HasPendingMigrations();
+        bool hasPendingMigration = updateNotes.HasPendingMigrations && updateManager.HasPendingMigrations();
 
         _preferencesService.PreferenceChanged -= PreferencesServiceChanged;
         _preferencesService.PreferenceChanged += PreferencesServiceChanged;
@@ -462,10 +526,19 @@ public partial class App : WinoApplication,
         // Initialize theme service after window is created.
         await NewThemeService.InitializeAsync();
 
-        MainWindow?.Activate();
+        if (MainWindow != null)
+            Services.GetRequiredService<IWinoWindowManager>().ActivateWindow(MainWindow);
+
         LogActivation("Window created and activated.");
     }
 
+    public Task OpenManageAccountsFromWelcomeAsync()
+    {
+        Services.GetRequiredService<INavigationService>()
+            .Navigate(WinoPage.ManageAccountsPage, null, NavigationReferenceFrame.ShellFrame, NavigationTransitionType.DrillIn);
+        return Task.CompletedTask;
+    }
+
     /// <summary>
     /// Creates the main window without activating it.
     /// Used for both normal launch and startup task launch (tray only).
@@ -474,15 +547,15 @@ public partial class App : WinoApplication,
     {
         LogActivation("Creating main window.");
 
-        MainWindow = new ShellWindow();
+        var windowManager = Services.GetRequiredService<IWinoWindowManager>();
+        MainWindow = windowManager.CreateWindow(WinoWindowKind.Shell, () => new ShellWindow());
         InitializeNavigationDispatcher();
 
-        var nativeAppService = Services.GetRequiredService<INativeAppService>();
-        nativeAppService.GetCoreWindowHwnd = () => WinRT.Interop.WindowNative.GetWindowHandle(MainWindow);
-
         if (MainWindow is not IWinoShellWindow shellWindow)
             throw new ArgumentException("MainWindow must implement IWinoShellWindow");
 
+        windowManager.SetPrimaryNavigationFrame(WinoWindowKind.Shell, shellWindow.GetMainFrame());
+
         var activationArgs = AppInstance.GetCurrent().GetActivatedEventArgs();
 
         if (activationArgs.Kind == ExtendedActivationKind.Launch &&
@@ -508,6 +581,21 @@ public partial class App : WinoApplication,
         shellWindow.HandleAppActivation(args?.Arguments, GetCurrentLaunchTileId(), Environment.CommandLine);
     }
 
+    private void CreateWelcomeWindow()
+    {
+        LogActivation("Creating welcome window.");
+
+        var windowManager = Services.GetRequiredService<IWinoWindowManager>();
+        MainWindow = windowManager.CreateWindow(WinoWindowKind.Welcome, () => new WelcomeWindow());
+        if (MainWindow is WelcomeWindow welcomeWindow)
+            windowManager.SetPrimaryNavigationFrame(WinoWindowKind.Welcome, welcomeWindow.GetRootFrame());
+
+        InitializeNavigationDispatcher();
+
+        Services.GetRequiredService<INavigationService>()
+            .Navigate(WinoPage.WelcomePageV2, null, NavigationReferenceFrame.ShellFrame, NavigationTransitionType.None);
+    }
+
     private void InitializeNavigationDispatcher()
     {
         if (MainWindow == null)
@@ -521,18 +609,25 @@ public partial class App : WinoApplication,
 
     private void EnsureMainWindowVisibleAndForeground()
     {
-        if (MainWindow == null)
+        var windowManager = Services.GetRequiredService<IWinoWindowManager>();
+        var currentWindow = windowManager.ActiveWindow
+                            ?? windowManager.GetWindow(WinoWindowKind.Shell)
+                            ?? windowManager.GetWindow(WinoWindowKind.Welcome)
+                            ?? MainWindow;
+
+        if (currentWindow == null)
             return;
 
-        MainWindow.Show();
-        MainWindow.BringToFront();
-        MainWindow.Activate();
+        MainWindow = currentWindow;
+        windowManager.ActivateWindow(currentWindow);
     }
 
     private void RegisterRecipients()
     {
         WeakReferenceMessenger.Default.Register<NewMailSynchronizationRequested>(this);
         WeakReferenceMessenger.Default.Register<NewCalendarSynchronizationRequested>(this);
+        WeakReferenceMessenger.Default.Register<AccountCreatedMessage>(this);
+        WeakReferenceMessenger.Default.Register<GetStartedFromWelcomeRequested>(this);
     }
 
     public async void Receive(NewMailSynchronizationRequested message)
@@ -585,6 +680,41 @@ public partial class App : WinoApplication,
         }
     }
 
+    public void Receive(AccountCreatedMessage message)
+    {
+        var windowManager = Services.GetRequiredService<IWinoWindowManager>();
+
+        // Only transition when the account was created from the WelcomeWindow.
+        if (windowManager.GetWindow(WinoWindowKind.Welcome) == null)
+            return;
+
+        MainWindow?.DispatcherQueue?.TryEnqueue(async () =>
+        {
+            // Create and activate ShellWindow — ActiveWindowChanged fires and rebinds the dispatcher.
+            CreateWindow(null);
+            windowManager.HideWindow(WinoWindowKind.Welcome);
+            await NewThemeService.ApplyThemeToActiveWindowAsync();
+            MainWindow?.Activate();
+            RestartAutoSynchronizationLoop();
+        });
+    }
+
+    public void Receive(GetStartedFromWelcomeRequested message)
+    {
+        var windowManager = Services.GetRequiredService<IWinoWindowManager>();
+
+        if (windowManager.GetWindow(WinoWindowKind.Welcome) == null)
+            return;
+
+        MainWindow?.DispatcherQueue?.TryEnqueue(async () =>
+        {
+            CreateWindow(null);
+            windowManager.HideWindow(WinoWindowKind.Welcome);
+            await NewThemeService.ApplyThemeToActiveWindowAsync();
+            MainWindow?.Activate();
+        });
+    }
+
     private static string GetSynchronizationFailureMessage(MailSynchronizationType synchronizationType, string? exceptionMessage)
     {
         if (!string.IsNullOrWhiteSpace(exceptionMessage))

Wino.Mail.WinUI/Assets/UpdateNotes/Images/Calendar.svg

@@ -0,0 +1,54 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128" width="128" height="128">
+  <defs>
+    <linearGradient id="cal-body" x1="0" y1="0" x2="0" y2="1">
+      <stop offset="0%" stop-color="#EFF6FF"/>
+      <stop offset="100%" stop-color="#DBEAFE"/>
+    </linearGradient>
+    <linearGradient id="cal-header" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0%" stop-color="#60A5FA"/>
+      <stop offset="100%" stop-color="#2563EB"/>
+    </linearGradient>
+    <linearGradient id="cal-today" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0%" stop-color="#818CF8"/>
+      <stop offset="100%" stop-color="#4F46E5"/>
+    </linearGradient>
+    <filter id="cal-shadow" x="-10%" y="-10%" width="120%" height="130%">
+      <feDropShadow dx="0" dy="4" stdDeviation="6" flood-color="#2563EB" flood-opacity="0.18"/>
+    </filter>
+  </defs>
+
+  <!-- Body -->
+  <rect x="10" y="22" width="108" height="96" rx="14" fill="url(#cal-body)" filter="url(#cal-shadow)"/>
+
+  <!-- Header band -->
+  <rect x="10" y="22" width="108" height="34" rx="14" fill="url(#cal-header)"/>
+  <rect x="10" y="42" width="108" height="14" fill="url(#cal-header)"/>
+
+  <!-- Ring binders -->
+  <rect x="37" y="12" width="10" height="24" rx="5" fill="#93C5FD"/>
+  <rect x="81" y="12" width="10" height="24" rx="5" fill="#93C5FD"/>
+  <rect x="39" y="14" width="6" height="20" rx="3" fill="#1D4ED8"/>
+  <rect x="83" y="14" width="6" height="20" rx="3" fill="#1D4ED8"/>
+
+  <!-- Month label -->
+  <text x="64" y="43" text-anchor="middle" font-family="Segoe UI Variable, Segoe UI, sans-serif" font-size="13" font-weight="600" fill="white" opacity="0.95">MARCH</text>
+
+  <!-- Grid: row 1 -->
+  <rect x="18" y="64" width="16" height="14" rx="5" fill="white" opacity="0.55"/>
+  <rect x="40" y="64" width="16" height="14" rx="5" fill="white" opacity="0.55"/>
+  <rect x="62" y="64" width="16" height="14" rx="5" fill="white" opacity="0.55"/>
+  <rect x="84" y="64" width="16" height="14" rx="5" fill="white" opacity="0.55"/>
+  <rect x="106" y="64" width="12" height="14" rx="5" fill="white" opacity="0.55"/>
+
+  <!-- Grid: row 2 (today highlighted) -->
+  <rect x="18" y="84" width="16" height="14" rx="5" fill="white" opacity="0.55"/>
+  <rect x="40" y="84" width="16" height="14" rx="5" fill="url(#cal-today)"/>
+  <rect x="62" y="84" width="16" height="14" rx="5" fill="white" opacity="0.55"/>
+  <rect x="84" y="84" width="16" height="14" rx="5" fill="white" opacity="0.55"/>
+  <rect x="106" y="84" width="12" height="14" rx="5" fill="white" opacity="0.55"/>
+
+  <!-- Grid: row 3 (partial) -->
+  <rect x="18" y="104" width="16" height="10" rx="5" fill="white" opacity="0.35"/>
+  <rect x="40" y="104" width="16" height="10" rx="5" fill="white" opacity="0.35"/>
+  <rect x="62" y="104" width="16" height="10" rx="5" fill="white" opacity="0.35"/>
+</svg>

Wino.Mail.WinUI/Assets/UpdateNotes/Images/Customize.svg

@@ -0,0 +1,49 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128" width="128" height="128">
+  <defs>
+    <linearGradient id="cu-palette" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0%" stop-color="#FDF4FF"/>
+      <stop offset="100%" stop-color="#F3E8FF"/>
+    </linearGradient>
+    <linearGradient id="cu-handle" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0%" stop-color="#A78BFA"/>
+      <stop offset="100%" stop-color="#7C3AED"/>
+    </linearGradient>
+    <filter id="cu-shadow" x="-10%" y="-10%" width="130%" height="130%">
+      <feDropShadow dx="0" dy="4" stdDeviation="7" flood-color="#7C3AED" flood-opacity="0.2"/>
+    </filter>
+  </defs>
+
+  <!-- Palette body -->
+  <path d="M64 12 C38 12 18 30 18 54 C18 68 26 76 36 80 C46 84 46 92 50 98 C54 104 60 108 68 106 C82 104 110 88 110 60 C110 34 90 12 64 12 Z"
+        fill="url(#cu-palette)" filter="url(#cu-shadow)"/>
+
+  <!-- Palette thumb hole -->
+  <circle cx="78" cy="96" r="10" fill="#E9D5FF"/>
+  <circle cx="78" cy="96" r="6" fill="white" opacity="0.6"/>
+
+  <!-- Color swatches -->
+  <!-- Red -->
+  <circle cx="38" cy="44" r="11" fill="#F87171"/>
+  <circle cx="38" cy="44" r="11" fill="white" opacity="0.15"/>
+
+  <!-- Orange -->
+  <circle cx="62" cy="28" r="11" fill="#FB923C"/>
+  <circle cx="62" cy="28" r="11" fill="white" opacity="0.15"/>
+
+  <!-- Blue -->
+  <circle cx="87" cy="34" r="11" fill="#60A5FA"/>
+  <circle cx="87" cy="34" r="11" fill="white" opacity="0.15"/>
+
+  <!-- Green -->
+  <circle cx="100" cy="56" r="11" fill="#4ADE80"/>
+  <circle cx="100" cy="56" r="11" fill="white" opacity="0.15"/>
+
+  <!-- Purple -->
+  <circle cx="92" cy="80" r="11" fill="#A78BFA"/>
+  <circle cx="92" cy="80" r="11" fill="white" opacity="0.15"/>
+
+  <!-- Brush -->
+  <rect x="22" y="72" width="8" height="36" rx="4" fill="url(#cu-handle)" transform="rotate(-40 26 90)"/>
+  <path d="M8 110 C8 110 14 106 18 112 C16 116 10 116 8 110 Z" fill="#F87171"/>
+  <path d="M10 112 C10 112 14 109 17 113" fill="none" stroke="#FCA5A5" stroke-width="1.5" stroke-linecap="round"/>
+</svg>

Wino.Mail.WinUI/Assets/UpdateNotes/Images/Mail.svg

@@ -0,0 +1,51 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128" width="128" height="128">
+  <defs>
+    <linearGradient id="ml-env" x1="0" y1="0" x2="0" y2="1">
+      <stop offset="0%" stop-color="#F0F9FF"/>
+      <stop offset="100%" stop-color="#BAE6FD"/>
+    </linearGradient>
+    <linearGradient id="ml-flap" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0%" stop-color="#38BDF8"/>
+      <stop offset="100%" stop-color="#0284C7"/>
+    </linearGradient>
+    <linearGradient id="ml-dot1" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0%" stop-color="#4ADE80"/>
+      <stop offset="100%" stop-color="#16A34A"/>
+    </linearGradient>
+    <linearGradient id="ml-dot2" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0%" stop-color="#F87171"/>
+      <stop offset="100%" stop-color="#DC2626"/>
+    </linearGradient>
+    <linearGradient id="ml-dot3" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0%" stop-color="#A78BFA"/>
+      <stop offset="100%" stop-color="#7C3AED"/>
+    </linearGradient>
+    <filter id="ml-shadow" x="-10%" y="-10%" width="130%" height="130%">
+      <feDropShadow dx="0" dy="4" stdDeviation="7" flood-color="#0284C7" flood-opacity="0.2"/>
+    </filter>
+  </defs>
+
+  <!-- Envelope body -->
+  <rect x="14" y="30" width="100" height="70" rx="12" fill="url(#ml-env)" filter="url(#ml-shadow)"/>
+
+  <!-- Envelope flap (closed) -->
+  <path d="M14 42 L64 68 L114 42 L114 38 A12 12 0 0 0 102 26 L26 26 A12 12 0 0 0 14 38 Z"
+        fill="url(#ml-flap)"/>
+
+  <!-- Fold line on front -->
+  <path d="M14 46 L64 71 L114 46" fill="none" stroke="#7DD3FC" stroke-width="1.2" opacity="0.6"/>
+
+  <!-- Body content lines -->
+  <rect x="28" y="76" width="50" height="5" rx="2.5" fill="#0EA5E9" opacity="0.3"/>
+  <rect x="28" y="86" width="36" height="5" rx="2.5" fill="#0EA5E9" opacity="0.2"/>
+
+  <!-- Provider dots (Outlook=blue, Gmail=red, IMAP=purple) -->
+  <circle cx="90" cy="81" r="11" fill="url(#ml-dot1)" stroke="white" stroke-width="2"/>
+  <text x="90" y="86" text-anchor="middle" font-family="Segoe UI Variable, Segoe UI, sans-serif" font-size="11" font-weight="700" fill="white">G</text>
+
+  <circle cx="90" cy="81" r="11" fill="url(#ml-dot2)" stroke="white" stroke-width="2" transform="translate(-26,0)"/>
+  <text x="64" y="86" text-anchor="middle" font-family="Segoe UI Variable, Segoe UI, sans-serif" font-size="10" font-weight="700" fill="white">O</text>
+
+  <circle cx="90" cy="81" r="11" fill="url(#ml-dot3)" stroke="white" stroke-width="2" transform="translate(-52,0)"/>
+  <text x="38" y="86" text-anchor="middle" font-family="Segoe UI Variable, Segoe UI, sans-serif" font-size="10" font-weight="700" fill="white">@</text>
+</svg>

Wino.Mail.WinUI/Assets/UpdateNotes/Images/More.svg

@@ -0,0 +1,48 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128" width="128" height="128">
+  <defs>
+    <linearGradient id="mo-star1" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0%" stop-color="#FCD34D"/>
+      <stop offset="100%" stop-color="#F59E0B"/>
+    </linearGradient>
+    <linearGradient id="mo-star2" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0%" stop-color="#93C5FD"/>
+      <stop offset="100%" stop-color="#3B82F6"/>
+    </linearGradient>
+    <linearGradient id="mo-star3" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0%" stop-color="#C4B5FD"/>
+      <stop offset="100%" stop-color="#7C3AED"/>
+    </linearGradient>
+    <filter id="mo-glow1" x="-30%" y="-30%" width="160%" height="160%">
+      <feDropShadow dx="0" dy="3" stdDeviation="5" flood-color="#F59E0B" flood-opacity="0.4"/>
+    </filter>
+    <filter id="mo-glow2" x="-30%" y="-30%" width="160%" height="160%">
+      <feDropShadow dx="0" dy="2" stdDeviation="4" flood-color="#3B82F6" flood-opacity="0.35"/>
+    </filter>
+    <filter id="mo-glow3" x="-30%" y="-30%" width="160%" height="160%">
+      <feDropShadow dx="0" dy="2" stdDeviation="4" flood-color="#7C3AED" flood-opacity="0.35"/>
+    </filter>
+  </defs>
+
+  <!-- Large center star -->
+  <polygon points="64,14 70,50 106,56 70,62 64,98 58,62 22,56 58,50"
+           fill="url(#mo-star1)" filter="url(#mo-glow1)"/>
+
+  <!-- Star highlight -->
+  <polygon points="64,20 68.5,48 92,52 68.5,56 64,84 59.5,56 36,52 59.5,48"
+           fill="white" opacity="0.18"/>
+
+  <!-- Small star top-right -->
+  <polygon points="98,18 100.5,28 110,30 100.5,32 98,42 95.5,32 86,30 95.5,28"
+           fill="url(#mo-star2)" filter="url(#mo-glow2)"/>
+
+  <!-- Small star bottom-left -->
+  <polygon points="28,82 30,90 38,92 30,94 28,102 26,94 18,92 26,90"
+           fill="url(#mo-star3)" filter="url(#mo-glow3)"/>
+
+  <!-- Tiny sparkle dots -->
+  <circle cx="104" cy="66" r="3" fill="#FCD34D" opacity="0.8"/>
+  <circle cx="22" cy="44" r="2.5" fill="#93C5FD" opacity="0.8"/>
+  <circle cx="110" cy="90" r="2" fill="#C4B5FD" opacity="0.7"/>
+  <circle cx="18" cy="106" r="2" fill="#FCD34D" opacity="0.6"/>
+  <circle cx="64" cy="108" r="2.5" fill="#93C5FD" opacity="0.6"/>
+</svg>

Wino.Mail.WinUI/Assets/UpdateNotes/Images/Notification.svg

@@ -0,0 +1,45 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128" width="128" height="128">
+  <defs>
+    <linearGradient id="nb-bell" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0%" stop-color="#FCD34D"/>
+      <stop offset="100%" stop-color="#D97706"/>
+    </linearGradient>
+    <linearGradient id="nb-badge" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0%" stop-color="#F87171"/>
+      <stop offset="100%" stop-color="#DC2626"/>
+    </linearGradient>
+    <linearGradient id="nb-action" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0%" stop-color="#60A5FA"/>
+      <stop offset="100%" stop-color="#2563EB"/>
+    </linearGradient>
+    <filter id="nb-glow" x="-20%" y="-20%" width="140%" height="140%">
+      <feDropShadow dx="0" dy="4" stdDeviation="7" flood-color="#D97706" flood-opacity="0.3"/>
+    </filter>
+  </defs>
+
+  <!-- Bell body -->
+  <path d="M64 14 C64 14 40 18 38 52 L34 80 L94 80 L90 52 C88 18 64 14 64 14 Z"
+        fill="url(#nb-bell)" filter="url(#nb-glow)"/>
+
+  <!-- Bell highlight -->
+  <path d="M64 18 C64 18 52 22 50 46 L48 64 L72 64 C72 46 66 24 64 18 Z"
+        fill="white" opacity="0.2"/>
+
+  <!-- Bell base / clapper mount -->
+  <rect x="30" y="78" width="68" height="10" rx="5" fill="#B45309"/>
+
+  <!-- Clapper -->
+  <circle cx="64" cy="100" r="8" fill="#92400E"/>
+  <rect x="61" y="88" width="6" height="14" rx="3" fill="#B45309"/>
+
+  <!-- Notification badge -->
+  <circle cx="92" cy="26" r="13" fill="url(#nb-badge)"/>
+  <text x="92" y="31" text-anchor="middle" font-family="Segoe UI Variable, Segoe UI, sans-serif" font-size="13" font-weight="700" fill="white">3</text>
+
+  <!-- Action buttons (toast-like) -->
+  <rect x="20" y="98" width="38" height="18" rx="7" fill="url(#nb-action)"/>
+  <text x="39" y="111" text-anchor="middle" font-family="Segoe UI Variable, Segoe UI, sans-serif" font-size="9" font-weight="600" fill="white">Archive</text>
+
+  <rect x="64" y="98" width="38" height="18" rx="7" fill="white" stroke="#E5E7EB" stroke-width="1"/>
+  <text x="83" y="111" text-anchor="middle" font-family="Segoe UI Variable, Segoe UI, sans-serif" font-size="9" font-weight="600" fill="#374151">Delete</text>
+</svg>

Wino.Mail.WinUI/Assets/UpdateNotes/Images/Security.svg

@@ -0,0 +1,43 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128" width="128" height="128">
+  <defs>
+    <linearGradient id="sh-outer" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0%" stop-color="#6EE7B7"/>
+      <stop offset="100%" stop-color="#059669"/>
+    </linearGradient>
+    <linearGradient id="sh-inner" x1="0" y1="0" x2="0" y2="1">
+      <stop offset="0%" stop-color="#A7F3D0" stop-opacity="0.9"/>
+      <stop offset="100%" stop-color="#34D399" stop-opacity="0.6"/>
+    </linearGradient>
+    <linearGradient id="sh-lock" x1="0" y1="0" x2="0" y2="1">
+      <stop offset="0%" stop-color="#ECFDF5"/>
+      <stop offset="100%" stop-color="#D1FAE5"/>
+    </linearGradient>
+    <filter id="sh-glow" x="-20%" y="-20%" width="140%" height="140%">
+      <feDropShadow dx="0" dy="4" stdDeviation="8" flood-color="#059669" flood-opacity="0.25"/>
+    </filter>
+  </defs>
+
+  <!-- Shield outer -->
+  <path d="M64 10 L106 28 L106 68 C106 92 86 112 64 118 C42 112 22 92 22 68 L22 28 Z"
+        fill="url(#sh-outer)" filter="url(#sh-glow)"/>
+
+  <!-- Shield inner highlight -->
+  <path d="M64 18 L100 34 L100 68 C100 88 83 106 64 112 C45 106 28 88 28 68 L28 34 Z"
+        fill="url(#sh-inner)" opacity="0.6"/>
+
+  <!-- Lock body -->
+  <rect x="50" y="62" width="28" height="22" rx="6" fill="url(#sh-lock)"/>
+
+  <!-- Lock shackle -->
+  <path d="M56 62 L56 54 A8 8 0 0 1 72 54 L72 62"
+        fill="none" stroke="white" stroke-width="5" stroke-linecap="round"/>
+
+  <!-- Keyhole -->
+  <circle cx="64" cy="71" r="4" fill="#059669"/>
+  <rect x="62" y="72" width="4" height="7" rx="2" fill="#059669"/>
+
+  <!-- Check sparkles -->
+  <circle cx="94" cy="28" r="3" fill="white" opacity="0.7"/>
+  <circle cx="106" cy="44" r="2" fill="white" opacity="0.5"/>
+  <circle cx="34" cy="44" r="2" fill="white" opacity="0.5"/>
+</svg>

Wino.Mail.WinUI/Assets/UpdateNotes/Images/Thread.svg

@@ -0,0 +1,49 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128" width="128" height="128">
+  <defs>
+    <linearGradient id="th-env3" x1="0" y1="0" x2="0" y2="1">
+      <stop offset="0%" stop-color="#E0E7FF"/>
+      <stop offset="100%" stop-color="#C7D2FE"/>
+    </linearGradient>
+    <linearGradient id="th-env2" x1="0" y1="0" x2="0" y2="1">
+      <stop offset="0%" stop-color="#EDE9FE"/>
+      <stop offset="100%" stop-color="#DDD6FE"/>
+    </linearGradient>
+    <linearGradient id="th-env1" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0%" stop-color="#818CF8"/>
+      <stop offset="100%" stop-color="#4F46E5"/>
+    </linearGradient>
+    <linearGradient id="th-flap" x1="0" y1="0" x2="0" y2="1">
+      <stop offset="0%" stop-color="#6366F1"/>
+      <stop offset="100%" stop-color="#4338CA"/>
+    </linearGradient>
+    <filter id="th-shadow" x="-10%" y="-10%" width="130%" height="130%">
+      <feDropShadow dx="0" dy="4" stdDeviation="6" flood-color="#4F46E5" flood-opacity="0.2"/>
+    </filter>
+  </defs>
+
+  <!-- Back envelope (bottom-most) -->
+  <rect x="18" y="38" width="80" height="52" rx="8" fill="url(#th-env3)" opacity="0.8"/>
+  <path d="M18 46 L58 66 L98 46" fill="none" stroke="#A5B4FC" stroke-width="1.5" stroke-linejoin="round"/>
+
+  <!-- Middle envelope -->
+  <rect x="24" y="30" width="80" height="52" rx="8" fill="url(#th-env2)" opacity="0.9"/>
+  <path d="M24 38 L64 58 L104 38" fill="none" stroke="#C4B5FD" stroke-width="1.5" stroke-linejoin="round"/>
+
+  <!-- Front envelope -->
+  <rect x="30" y="22" width="80" height="52" rx="10" fill="url(#th-env1)" filter="url(#th-shadow)"/>
+
+  <!-- Front flap (triangle) -->
+  <path d="M30 32 L70 52 L110 32 L110 30 A10 10 0 0 0 100 22 L40 22 A10 10 0 0 0 30 30 Z"
+        fill="url(#th-flap)"/>
+
+  <!-- Dividing line on front -->
+  <path d="M30 38 L70 57 L110 38" fill="none" stroke="#818CF8" stroke-width="1" opacity="0.5"/>
+
+  <!-- Lines in body -->
+  <rect x="42" y="56" width="40" height="4" rx="2" fill="white" opacity="0.35"/>
+  <rect x="42" y="64" width="28" height="4" rx="2" fill="white" opacity="0.25"/>
+
+  <!-- Reply indicator dot -->
+  <circle cx="100" cy="84" r="12" fill="#4F46E5"/>
+  <path d="M95 84 L101 78 M101 78 L101 90 M101 78 L107 84" fill="none" stroke="white" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

Wino.Mail.WinUI/Assets/UpdateNotes/features.json

@@ -0,0 +1,44 @@
+[
+    {
+        "title": "# Outlook, Gmail & IMAP/SMTP",
+        "description": "Connect all your email accounts in one place. Wino supports Microsoft Outlook (Office 365), Gmail, and any standard IMAP/SMTP server — giving you a unified inbox experience.",
+        "imageUrl": "ms-appx:///Assets/UpdateNotes/Images/Mail.svg",
+        "imageWidth": 128,
+        "imageHeight": 128
+    },
+    {
+        "title": "# Calendar with CalDAV Support",
+        "description": "Manage your schedule alongside your emails. Create local calendars or connect to remote CalDAV-compatible servers. View, create, and respond to events and invitations.",
+        "imageUrl": "ms-appx:///Assets/UpdateNotes/Images/Calendar.svg",
+        "imageWidth": 128,
+        "imageHeight": 128
+    },
+    {
+        "title": "# S/MIME Signing & Encryption",
+        "description": "Keep your communications secure. Sign and encrypt emails with personal certificates to ensure your messages are authentic and private.",
+        "imageUrl": "ms-appx:///Assets/UpdateNotes/Images/Security.svg",
+        "imageWidth": 128,
+        "imageHeight": 128
+    },
+    {
+        "title": "# Conversation Threading",
+        "description": "Follow discussions with ease. Emails are grouped by conversation thread so you never lose context in long email chains.",
+        "imageUrl": "ms-appx:///Assets/UpdateNotes/Images/Thread.svg",
+        "imageWidth": 128,
+        "imageHeight": 128
+    },
+    {
+        "title": "# Actionable Notifications",
+        "description": "Stay productive without switching apps. Mark as read, delete, or archive emails directly from Windows toast notifications.",
+        "imageUrl": "ms-appx:///Assets/UpdateNotes/Images/Notification.svg",
+        "imageWidth": 128,
+        "imageHeight": 128
+    },
+    {
+        "title": "# Rich Customization",
+        "description": "Make Wino yours. Choose from built-in themes, create custom themes with your own wallpapers and accent colors, configure swipe actions, and set keyboard shortcuts.",
+        "imageUrl": "ms-appx:///Assets/UpdateNotes/Images/Customize.svg",
+        "imageWidth": 128,
+        "imageHeight": 128
+    }
+]

Wino.Mail.WinUI/Assets/UpdateNotes/vnext.json

@@ -1,38 +1,42 @@
 {
-    "hasMigrations": false,
+    "hasPendingMigrations": true,
+    "migration": {
+        "titleKey": "WhatIsNew_MigrationPreparing_Title",
+        "descriptionKey": "WhatIsNew_MigrationPreparing_Description"
+    },
     "sections": [
         {
             "title": "# Wino Calendar is here!",
             "description": "You can now create local or remote CalDAV-compatible calendars, manage recurring events, and respond to invitations — all from within Wino.",
-            "imageUrl": "ms-appx:///Assets/AboutPageTile.png",
+            "imageUrl": "ms-appx:///Assets/UpdateNotes/Images/Calendar.svg",
             "imageWidth": 128,
             "imageHeight": 128
         },
         {
             "title": "# S/MIME Signing & Encryption",
             "description": "Wino now supports signing and encrypting your emails with personal certificates. Keep your communications secure and verifiable.",
-            "imageUrl": "ms-appx:///Assets/AboutPageTile.png",
+            "imageUrl": "ms-appx:///Assets/UpdateNotes/Images/Security.svg",
             "imageWidth": 128,
             "imageHeight": 128
         },
         {
             "title": "# Threaded Mail View",
             "description": "Emails are now grouped by conversation, making it easier to follow long discussions without losing context.",
-            "imageUrl": "ms-appx:///Assets/AboutPageTile.png",
+            "imageUrl": "ms-appx:///Assets/UpdateNotes/Images/Thread.svg",
             "imageWidth": 128,
             "imageHeight": 128
         },
         {
             "title": "# Smarter Notifications",
             "description": "Act on your emails directly from toast notifications — mark as read, delete, or archive without opening the app.",
-            "imageUrl": "ms-appx:///Assets/AboutPageTile.png",
+            "imageUrl": "ms-appx:///Assets/UpdateNotes/Images/Notification.svg",
             "imageWidth": 128,
             "imageHeight": 128
         },
         {
             "title": "# And much more...",
             "description": "Folder management, swipe actions, keyboard shortcuts, a custom print dialog, and significant performance improvements are all included in this release.\n\nThank you for using Wino Mail!",
-            "imageUrl": "ms-appx:///Assets/AboutPageTile.png",
+            "imageUrl": "ms-appx:///Assets/UpdateNotes/Images/More.svg",
             "imageWidth": 128,
             "imageHeight": 128
         }

Wino.Mail.WinUI/Controls/UpdateNotesFlipViewControl.xaml

@@ -0,0 +1,50 @@
+<UserControl
+    x:Class="Wino.Mail.WinUI.Controls.UpdateNotesFlipViewControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:models="using:Wino.Core.Domain.Models.Updates"
+    mc:Ignorable="d">
+
+    <Grid RowSpacing="12">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+
+        <FlipView
+            x:Name="UpdateFlipView"
+            ItemsSource="{x:Bind Sections, Mode=OneWay}"
+            SelectionChanged="OnFlipViewSelectionChanged">
+            <FlipView.ItemTemplate>
+                <DataTemplate x:DataType="models:UpdateNoteSection">
+                    <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
+                        <StackPanel Padding="8" Spacing="12">
+                            <controls:MarkdownTextBlock
+                                HorizontalAlignment="Center"
+                                Text="{x:Bind Title, Mode=OneTime}" />
+                            <Image
+                                Width="{x:Bind ActualImageWidth, Mode=OneTime}"
+                                Height="{x:Bind ActualImageHeight, Mode=OneTime}"
+                                HorizontalAlignment="Center"
+                                Source="{x:Bind ImageUrl, Mode=OneTime}"
+                                Stretch="Uniform" />
+                            <controls:MarkdownTextBlock
+                                HorizontalAlignment="Stretch"
+                                Text="{x:Bind Description, Mode=OneTime}" />
+                        </StackPanel>
+                    </ScrollViewer>
+                </DataTemplate>
+            </FlipView.ItemTemplate>
+        </FlipView>
+
+        <PipsPager
+            x:Name="FlipViewPager"
+            Grid.Row="1"
+            HorizontalAlignment="Center"
+            SelectedPageIndex="0"
+            SelectedIndexChanged="OnPipsPagerSelectedIndexChanged" />
+    </Grid>
+</UserControl>

Wino.Mail.WinUI/Controls/UpdateNotesFlipViewControl.xaml.cs

@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Wino.Core.Domain.Models.Updates;
+
+namespace Wino.Mail.WinUI.Controls;
+
+public sealed partial class UpdateNotesFlipViewControl : UserControl
+{
+    public event EventHandler<int>? SelectedIndexChanged;
+
+    public int SelectedIndex => UpdateFlipView.SelectedIndex;
+
+    public IList<UpdateNoteSection>? Sections
+    {
+        get { return (IList<UpdateNoteSection>?)GetValue(SectionsProperty); }
+        set { SetValue(SectionsProperty, value); }
+    }
+
+    public static readonly DependencyProperty SectionsProperty =
+        DependencyProperty.Register(nameof(Sections),
+            typeof(IList<UpdateNoteSection>),
+            typeof(UpdateNotesFlipViewControl),
+            new PropertyMetadata(null, OnSectionsChanged));
+
+    public UpdateNotesFlipViewControl()
+    {
+        InitializeComponent();
+    }
+
+    private static void OnSectionsChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is UpdateNotesFlipViewControl control)
+            control.UpdatePager();
+    }
+
+    private void OnFlipViewSelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        FlipViewPager.SelectedPageIndex = UpdateFlipView.SelectedIndex;
+        SelectedIndexChanged?.Invoke(this, UpdateFlipView.SelectedIndex);
+        UpdatePager();
+    }
+
+    private void OnPipsPagerSelectedIndexChanged(PipsPager sender, PipsPagerSelectedIndexChangedEventArgs args)
+    {
+        UpdateFlipView.SelectedIndex = sender.SelectedPageIndex;
+    }
+
+    private void UpdatePager()
+    {
+        FlipViewPager.NumberOfPages = Sections?.Count ?? 0;
+    }
+}

Wino.Mail.WinUI/CoreUWPContainerSetup.cs

@@ -18,6 +18,7 @@ public static class CoreUWPContainerSetup
         services.AddSingleton<IDispatcher>(provider => provider.GetRequiredService<WinUIDispatcher>());
 
         services.AddSingleton<IUnderlyingThemeService, UnderlyingThemeService>();
+        services.AddSingleton<IWinoWindowManager, WinoWindowManager>();
         services.AddSingleton<INativeAppService, NativeAppService>();
         services.AddSingleton<IStoreManagementService, StoreManagementService>();
         services.AddSingleton<IPreferencesService, PreferencesService>();

Wino.Mail.WinUI/Dialogs/WhatIsNewDialog.xaml

@@ -2,11 +2,10 @@
     x:Class="Wino.Dialogs.WhatIsNewDialog"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:Wino.Mail.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:domain="using:Wino.Core.Domain"
-    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
-    xmlns:models="using:Wino.Core.Domain.Models.Updates"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     HorizontalContentAlignment="Stretch"
     VerticalContentAlignment="Stretch"
     Style="{StaticResource WinoDialogStyle}"
@@ -26,45 +25,42 @@
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
 
-        <FlipView
-            x:Name="UpdateFlipView"
-            ItemsSource="{x:Bind Sections, Mode=OneTime}"
-            SelectionChanged="OnFlipViewSelectionChanged">
-            <FlipView.ItemTemplate>
-                <DataTemplate x:DataType="models:UpdateNoteSection">
-                    <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
-                        <StackPanel Spacing="16" Padding="12,8">
-                            <controls:MarkdownTextBlock
-                                Text="{x:Bind Title, Mode=OneTime}"
-                                HorizontalAlignment="Center" />
-                            <Image
-                                Source="{x:Bind ImageUrl, Mode=OneTime}"
-                                Width="{x:Bind ActualImageWidth, Mode=OneTime}"
-                                Height="{x:Bind ActualImageHeight, Mode=OneTime}"
-                                HorizontalAlignment="Center"
-                                Stretch="Uniform" />
-                            <controls:MarkdownTextBlock
-                                Text="{x:Bind Description, Mode=OneTime}"
-                                HorizontalAlignment="Stretch" />
-                        </StackPanel>
-                    </ScrollViewer>
-                </DataTemplate>
-            </FlipView.ItemTemplate>
-        </FlipView>
+        <controls:UpdateNotesFlipViewControl x:Name="UpdateNotesControl" Sections="{x:Bind Sections, Mode=OneTime}" />
 
-        <PipsPager
-            x:Name="FlipViewPager"
+        <StackPanel
+            x:Name="MigrationPanel"
             Grid.Row="1"
-            HorizontalAlignment="Center"
-            SelectedPageIndex="0"
-            SelectedIndexChanged="OnPipsPagerSelectedIndexChanged" />
+            Spacing="8"
+            Visibility="Collapsed">
+            <TextBlock x:Name="MigrationTitleText" Style="{StaticResource BodyStrongTextBlockStyle}" />
+            <TextBlock x:Name="MigrationDescriptionText" TextWrapping="WrapWholeWords" />
+            <ProgressBar
+                x:Name="MigrationProgressBar"
+                IsIndeterminate="True"
+                Visibility="Collapsed" />
+            <TextBlock
+                x:Name="MigrationErrorText"
+                Foreground="{ThemeResource SystemFillColorCriticalBrush}"
+                TextWrapping="WrapWholeWords"
+                Visibility="Collapsed" />
+        </StackPanel>
 
-        <Button
-            x:Name="GetStartedButton"
+        <StackPanel
             Grid.Row="2"
             HorizontalAlignment="Right"
+            VerticalAlignment="Center"
+            Orientation="Horizontal"
+            Spacing="8">
+            <Button
+                x:Name="ContinueAnywayButton"
+                Click="OnContinueAnywayClicked"
+                Content="{x:Bind domain:Translator.WhatIsNew_ContinueAnywayButton}"
+                Visibility="Collapsed" />
+            <Button
+                x:Name="GetStartedButton"
+                Click="OnGetStartedClicked"
                 Content="{x:Bind domain:Translator.WhatIsNew_GetStartedButton}"
-            Visibility="Collapsed"
-            Click="OnGetStartedClicked" />
+                Visibility="Collapsed" />
+        </StackPanel>
     </Grid>
 </ContentDialog>

Wino.Mail.WinUI/Dialogs/WhatIsNewDialog.xaml.cs

@@ -2,8 +2,7 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Input;
-using Windows.System;
+using Wino.Core.Domain;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Updates;
 
@@ -12,61 +11,93 @@ namespace Wino.Dialogs;
 public sealed partial class WhatIsNewDialog : ContentDialog
 {
     private readonly IUpdateManager _updateManager;
+    private readonly UpdateNotes _notes;
 
     public List<UpdateNoteSection> Sections { get; }
 
+    private bool _canClose = false;
+
     public WhatIsNewDialog(UpdateNotes notes, IUpdateManager updateManager)
     {
         InitializeComponent();
 
+        _notes = notes;
         _updateManager = updateManager;
         Sections = notes.Sections;
 
-        // Set the number of pages in the pip pager after sections are assigned.
-        FlipViewPager.NumberOfPages = Sections.Count;
-
         // Show the Get Started button immediately when there is only one page.
-        if (Sections.Count <= 1)
-            GetStartedButton.Visibility = Visibility.Visible;
+        UpdateNotesControl.SelectedIndexChanged += OnUpdateSectionChanged;
+        UpdateGetStartedButtonVisibility(UpdateNotesControl.SelectedIndex);
+
+        InitializeMigrationStatus();
+        Closing += OnDialogClosing;
     }
 
-    protected override void OnKeyDown(KeyRoutedEventArgs e)
+    private void OnUpdateSectionChanged(object? sender, int selectedIndex)
+        => UpdateGetStartedButtonVisibility(selectedIndex);
+
+    private void UpdateGetStartedButtonVisibility(int selectedIndex)
     {
-        // Block ESC key to prevent accidental dismissal.
-        if (e.Key == VirtualKey.Escape)
-        {
-            e.Handled = true;
-            return;
-        }
-
-        base.OnKeyDown(e);
-    }
-
-    private void OnFlipViewSelectionChanged(object sender, SelectionChangedEventArgs e)
-    {
-        int selectedIndex = UpdateFlipView.SelectedIndex;
-
-        // Keep pip pager in sync with the flip view.
-        FlipViewPager.SelectedPageIndex = selectedIndex;
-
-        // Show Get Started button only on the last page.
         GetStartedButton.Visibility = selectedIndex == Sections.Count - 1
             ? Visibility.Visible
             : Visibility.Collapsed;
     }
 
-    private void OnPipsPagerSelectedIndexChanged(PipsPager sender, PipsPagerSelectedIndexChangedEventArgs args)
+    private void InitializeMigrationStatus()
     {
-        UpdateFlipView.SelectedIndex = sender.SelectedPageIndex;
+        if (!_notes.HasPendingMigrations ||
+            string.IsNullOrWhiteSpace(_notes.Migration.TitleKey) ||
+            string.IsNullOrWhiteSpace(_notes.Migration.DescriptionKey))
+            return;
+
+        MigrationTitleText.Text = Translator.GetTranslatedString(_notes.Migration.TitleKey);
+        MigrationDescriptionText.Text = Translator.GetTranslatedString(_notes.Migration.DescriptionKey);
+    }
+
+    private void OnDialogClosing(ContentDialog sender, ContentDialogClosingEventArgs args)
+    {
+        // Only allow closing when Get Started button was clicked.
+        if (!_canClose)
+            args.Cancel = true;
     }
 
     private async void OnGetStartedClicked(object sender, RoutedEventArgs e)
     {
         GetStartedButton.IsEnabled = false;
+        ContinueAnywayButton.Visibility = Visibility.Collapsed;
+        MigrationErrorText.Visibility = Visibility.Collapsed;
 
+        if (_notes.HasPendingMigrations)
+        {
+            GetStartedButton.Content = Translator.WhatIsNew_PreparingForNewVersionButton;
+            MigrationPanel.Visibility = Visibility.Visible;
+            MigrationProgressBar.Visibility = Visibility.Visible;
+        }
+
+        try
+        {
             await _updateManager.RunPendingMigrationsAsync();
             _updateManager.MarkUpdateNotesAsSeen();
+        }
+        catch (System.Exception ex)
+        {
+            MigrationProgressBar.Visibility = Visibility.Collapsed;
+            MigrationErrorText.Text = string.Format(Translator.WhatIsNew_MigrationFailedMessage, ex.GetType().Name);
+            MigrationErrorText.Visibility = Visibility.Visible;
+            ContinueAnywayButton.Visibility = Visibility.Visible;
+            GetStartedButton.IsEnabled = true;
+            GetStartedButton.Content = Translator.WhatIsNew_GetStartedButton;
+            return;
+        }
 
+        _canClose = true;
+        Hide();
+    }
+
+    private void OnContinueAnywayClicked(object sender, RoutedEventArgs e)
+    {
+        _updateManager.MarkUpdateNotesAsSeen();
+        _canClose = true;
         Hide();
     }
 }

Wino.Mail.WinUI/Interfaces/IWinoWindowManager.cs

@@ -0,0 +1,24 @@
+using System;
+using Microsoft.UI.Xaml.Controls;
+using WinUIEx;
+using Wino.Mail.WinUI.Models;
+
+namespace Wino.Mail.WinUI.Interfaces;
+
+public interface IWinoWindowManager
+{
+    event EventHandler<WindowEx?> ActiveWindowChanged;
+    event EventHandler<WindowEx> WindowRemoved;
+
+    WindowEx? ActiveWindow { get; }
+    WindowEx CreateWindow(WinoWindowKind kind, Func<WindowEx> factory, string? name = null);
+    WindowEx? GetWindow(WinoWindowKind kind, string? name = null);
+    WindowEx? GetWindow(string name);
+    void ActivateWindow(WindowEx window);
+    bool ActivateWindow(WinoWindowKind kind, string? name = null);
+    void HideWindow(WindowEx window);
+    bool HideWindow(WinoWindowKind kind, string? name = null);
+    void SetPrimaryNavigationFrame(WinoWindowKind kind, Frame frame, string? name = null);
+    Frame? GetPrimaryNavigationFrame(WinoWindowKind kind, string? name = null);
+    void CloseAllWindows();
+}

Wino.Mail.WinUI/Models/WinoWindowKind.cs

@@ -0,0 +1,7 @@
+namespace Wino.Mail.WinUI.Models;
+
+public enum WinoWindowKind
+{
+    Shell,
+    Welcome
+}

Wino.Mail.WinUI/Services/NavigationService.cs

@@ -13,6 +13,7 @@ using Wino.Mail.ViewModels.Data;
 using Wino.Mail.ViewModels.Messages;
 using Wino.Mail.WinUI;
 using Wino.Mail.WinUI.Interfaces;
+using Wino.Mail.WinUI.Models;
 using Wino.Mail.WinUI.Services;
 using Wino.Mail.WinUI.Views.Calendar;
 using Wino.Messaging.Client.Mails;
@@ -29,6 +30,7 @@ public class NavigationService : NavigationServiceBase, INavigationService
 {
     private readonly IStatePersistanceService _statePersistanceService;
     private readonly IDispatcher _dispatcher;
+    private readonly IWinoWindowManager _windowManager;
 
     private WinoPage[] _renderingPageTypes = new WinoPage[]
     {
@@ -42,7 +44,8 @@ public class NavigationService : NavigationServiceBase, INavigationService
         WinoPage.MailRenderingPage,
         WinoPage.ComposePage,
         WinoPage.IdlePage,
-        WinoPage.WelcomePage
+        WinoPage.WelcomePage,
+        WinoPage.WelcomePageV2
     ];
 
     private static readonly WinoPage[] CalendarOnlyPages =
@@ -51,10 +54,11 @@ public class NavigationService : NavigationServiceBase, INavigationService
         WinoPage.EventDetailsPage
     ];
 
-    public NavigationService(IStatePersistanceService statePersistanceService, IDispatcher dispatcher)
+    public NavigationService(IStatePersistanceService statePersistanceService, IDispatcher dispatcher, IWinoWindowManager windowManager)
     {
         _statePersistanceService = statePersistanceService;
         _dispatcher = dispatcher;
+        _windowManager = windowManager;
     }
 
     private bool IsOnNavigationThread()
@@ -101,6 +105,7 @@ public class NavigationService : NavigationServiceBase, INavigationService
             WinoPage.MailListPage => typeof(MailListPage),
             WinoPage.SettingsPage => typeof(SettingsPage),
             WinoPage.WelcomePage => typeof(WelcomePage),
+            WinoPage.WelcomePageV2 => typeof(WelcomePageV2),
             WinoPage.SettingOptionsPage => typeof(SettingOptionsPage),
             WinoPage.AppPreferencesPage => typeof(AppPreferencesPage),
             WinoPage.AliasManagementPage => typeof(AliasManagementPage),
@@ -120,19 +125,45 @@ public class NavigationService : NavigationServiceBase, INavigationService
     }
 
     public Frame GetCoreFrame(NavigationReferenceFrame frameType)
-        => ExecuteOnNavigationThread(() => GetCoreFrameInternal(frameType));
+        => ExecuteOnNavigationThread(() => GetCoreFrameInternal(frameType) ?? throw new ArgumentException($"Frame '{frameType}' cannot be resolved."));
 
-    private Frame GetCoreFrameInternal(NavigationReferenceFrame frameType)
+    private Frame? GetCoreFrameInternal(NavigationReferenceFrame frameType, WinoWindowKind? requestedWindowKind = null)
     {
-        if (WinoApplication.MainWindow is not IWinoShellWindow shellWindow) throw new ArgumentException("MainWindow must implement IWinoShellWindow");
-        if (shellWindow.GetMainFrame() is not Frame mainFrame) throw new ArgumentException("MainFrame cannot be null.");
+        if (frameType == NavigationReferenceFrame.ShellFrame)
+        {
+            if (requestedWindowKind.HasValue)
+                return _windowManager.GetPrimaryNavigationFrame(requestedWindowKind.Value);
 
-        if (frameType == NavigationReferenceFrame.ShellFrame) return shellWindow.GetMainFrame();
+            var activeWindow = _windowManager.ActiveWindow;
+            if (activeWindow != null)
+            {
+                var activeShellWindow = _windowManager.GetWindow(WinoWindowKind.Shell);
+                if (ReferenceEquals(activeWindow, activeShellWindow))
+                    return _windowManager.GetPrimaryNavigationFrame(WinoWindowKind.Shell);
 
-        var contentRoot = mainFrame.Content as UIElement;
-        if (contentRoot == null) return mainFrame;
+                var activeWelcomeWindow = _windowManager.GetWindow(WinoWindowKind.Welcome);
+                if (ReferenceEquals(activeWindow, activeWelcomeWindow))
+                    return _windowManager.GetPrimaryNavigationFrame(WinoWindowKind.Welcome);
+            }
 
-        return WinoVisualTreeHelper.GetChildObject<Frame>(contentRoot, frameType.ToString()) ?? mainFrame;
+            return _windowManager.GetPrimaryNavigationFrame(WinoWindowKind.Shell)
+                ?? _windowManager.GetPrimaryNavigationFrame(WinoWindowKind.Welcome);
+        }
+
+        var mainFrame = _windowManager.GetPrimaryNavigationFrame(WinoWindowKind.Shell);
+        if (mainFrame == null)
+            return null;
+
+        var contentRoot = mainFrame.Content as FrameworkElement;
+        if (contentRoot == null) return null;
+
+        // Use FindName first — it works immediately after InitializeComponent(),
+        // before the visual tree is built by the layout pass.
+        if (contentRoot.FindName(frameType.ToString()) is Frame namedFrame)
+            return namedFrame;
+
+        // Fall back to visual tree search for deeply nested frames (e.g. RenderingFrame).
+        return WinoVisualTreeHelper.GetChildObject<Frame>(contentRoot, frameType.ToString());
     }
 
     public bool ChangeApplicationMode(WinoApplicationMode mode)
@@ -211,14 +242,22 @@ public class NavigationService : NavigationServiceBase, INavigationService
         _statePersistanceService.IsReadingMail = _renderingPageTypes.Contains(page);
         _statePersistanceService.IsEventDetailsVisible = page == WinoPage.EventDetailsPage;
 
-        Frame innerShellFrame = GetCoreFrameInternal(NavigationReferenceFrame.InnerShellFrame);
+        Frame? innerShellFrame = GetCoreFrameInternal(NavigationReferenceFrame.InnerShellFrame);
+        if (innerShellFrame == null && frame == NavigationReferenceFrame.ShellFrame)
+        {
+            var requestedFrame = GetCoreFrameInternal(NavigationReferenceFrame.ShellFrame, WinoWindowKind.Welcome);
+            if (requestedFrame == null)
+                return false;
+
+            return requestedFrame.Navigate(pageType, parameter, GetNavigationTransitionInfo(transition));
+        }
 
         if (innerShellFrame != null)
         {
             // Calendar navigations.
             if (currentApplicationMode == WinoApplicationMode.Calendar)
             {
-                var currentFrameType = GetCurrentFrameType(ref innerShellFrame);
+                var currentFrameType = GetCurrentFrameType(innerShellFrame);
 
                 if (page == WinoPage.CalendarPage &&
                     parameter is CalendarPageNavigationArgs calendarNavigationArgs)
@@ -247,7 +286,7 @@ public class NavigationService : NavigationServiceBase, INavigationService
             else
             {
                 // Mail navigations.
-                var currentFrameType = GetCurrentFrameType(ref innerShellFrame);
+                var currentFrameType = GetCurrentFrameType(innerShellFrame);
                 bool isMailListingPageActive = currentFrameType != null && currentFrameType == typeof(MailListPage);
 
                 // Active page is mail list page and we are refreshing the folder.

Wino.Mail.WinUI/Services/NavigationServiceBase.cs

@@ -17,10 +17,10 @@ public class NavigationServiceBase
         };
     }
 
-    public Type? GetCurrentFrameType(ref Frame _frame)
+    public Type? GetCurrentFrameType(Frame frame)
     {
-        if (_frame != null && _frame.Content != null)
-            return _frame.Content.GetType();
+        if (frame != null && frame.Content != null)
+            return frame.Content.GetType();
 
         return null;
     }

Wino.Mail.WinUI/Services/NewThemeService.cs

@@ -62,6 +62,7 @@ public class NewThemeService : INewThemeService
     private readonly IConfigurationService _configurationService;
     private readonly IUnderlyingThemeService _underlyingThemeService;
     private readonly IApplicationResourceManager<ResourceDictionary> _applicationResourceManager;
+    private readonly IWinoWindowManager _windowManager;
 
     private List<AppThemeBase> preDefinedThemes { get; set; } = new List<AppThemeBase>()
     {
@@ -75,11 +76,13 @@ public class NewThemeService : INewThemeService
 
     public NewThemeService(IConfigurationService configurationService,
                           IUnderlyingThemeService underlyingThemeService,
-                          IApplicationResourceManager<ResourceDictionary> applicationResourceManager)
+                          IApplicationResourceManager<ResourceDictionary> applicationResourceManager,
+                          IWinoWindowManager windowManager)
     {
         _configurationService = configurationService;
         _underlyingThemeService = underlyingThemeService;
         _applicationResourceManager = applicationResourceManager;
+        _windowManager = windowManager;
     }
 
     /// <summary>
@@ -89,11 +92,17 @@ public class NewThemeService : INewThemeService
     {
         get
         {
-            return GetShellRootContent().RequestedTheme.ToWinoElementTheme();
+            var rootContent = TryGetShellRootContent();
+            if (rootContent == null)
+                return _configurationService.Get(UnderlyingThemeService.SelectedAppThemeKey, ApplicationElementTheme.Default);
+
+            return rootContent.RequestedTheme.ToWinoElementTheme();
         }
         set
         {
-            GetShellRootContent().RequestedTheme = value.ToWindowsElementTheme();
+            var rootContent = TryGetShellRootContent();
+            if (rootContent != null)
+                rootContent.RequestedTheme = value.ToWindowsElementTheme();
 
             _configurationService.Set(UnderlyingThemeService.SelectedAppThemeKey, value);
 
@@ -115,9 +124,10 @@ public class NewThemeService : INewThemeService
 
             _configurationService.Set(CurrentApplicationThemeKey, value);
 
-            if (WinoApplication.MainWindow != null)
+            var window = GetThemeWindow();
+            if (window != null)
             {
-                WinoApplication.MainWindow.DispatcherQueue.TryEnqueue(async () =>
+                window.DispatcherQueue.TryEnqueue(async () =>
                 {
                     await ApplyCustomThemeAsync(false);
                 });
@@ -154,9 +164,10 @@ public class NewThemeService : INewThemeService
             currentBackdropType = value;
             _configurationService.Set(WindowBackdropTypeKey, (int)value);
 
-            if (WinoApplication.MainWindow != null)
+            var window = GetThemeWindow();
+            if (window != null)
             {
-                WinoApplication.MainWindow.DispatcherQueue.TryEnqueue(() =>
+                window.DispatcherQueue.TryEnqueue(() =>
                 {
                     ApplyBackdrop(value);
                 });
@@ -176,7 +187,17 @@ public class NewThemeService : INewThemeService
         }
     }
 
-    public FrameworkElement GetShellRootContent() => (WinoApplication.MainWindow as IWinoShellWindow)?.GetRootContent() ?? throw new Exception("No root content found");
+    public FrameworkElement GetShellRootContent()
+    {
+        var window = GetThemeWindow();
+        if (window is IWinoShellWindow shellWindow)
+            return shellWindow.GetRootContent();
+
+        if (window?.Content is FrameworkElement frameworkElement)
+            return frameworkElement;
+
+        throw new Exception("No root content found");
+    }
 
     private bool isInitialized = false;
 
@@ -210,9 +231,9 @@ public class NewThemeService : INewThemeService
 
     public void ApplyBackdrop(WindowBackdropType backdropType)
     {
-        if (WinoApplication.MainWindow is not WindowEx windowEx)
+        if (GetThemeWindow() is not WindowEx windowEx)
         {
-            Debug.WriteLine("MainWindow is not WindowEx, cannot apply backdrop");
+            Debug.WriteLine("No active WindowEx found, cannot apply backdrop");
             return;
         }
 
@@ -267,7 +288,7 @@ public class NewThemeService : INewThemeService
 
     private void NotifyThemeUpdate()
     {
-        if (GetShellRootContent() is not UIElement rootContent) return;
+        if (TryGetShellRootContent() is not UIElement rootContent) return;
 
         _ = rootContent.DispatcherQueue.EnqueueAsync(() =>
         {
@@ -283,9 +304,12 @@ public class NewThemeService : INewThemeService
 
     public void UpdateSystemCaptionButtonColors()
     {
-        GetShellRootContent().DispatcherQueue.TryEnqueue(() =>
+        var rootContent = TryGetShellRootContent();
+        if (rootContent == null) return;
+
+        rootContent.DispatcherQueue.TryEnqueue(() =>
         {
-            if (WinoApplication.MainWindow is not WindowEx mainWindow) return;
+            if (GetThemeWindow() is not WindowEx mainWindow) return;
 
             var titleBar = mainWindow.AppWindow.TitleBar;
             if (titleBar == null) return;
@@ -353,8 +377,7 @@ public class NewThemeService : INewThemeService
 
     private void RefreshThemeResource()
     {
-        var mainApplicationFrame = GetShellRootContent();
-
+        var mainApplicationFrame = TryGetShellRootContent();
         if (mainApplicationFrame == null) return;
 
         if (mainApplicationFrame.RequestedTheme == ElementTheme.Dark)
@@ -648,4 +671,26 @@ public class NewThemeService : INewThemeService
             new BackdropTypeWrapper(WindowBackdropType.AcrylicThin, "Acrylic Thin")
         };
     }
+
+    private WindowEx? GetThemeWindow() => _windowManager.ActiveWindow ?? WinoApplication.MainWindow;
+
+    private FrameworkElement? TryGetShellRootContent()
+    {
+        var window = GetThemeWindow();
+        if (window == null)
+            return null;
+
+        if (window is IWinoShellWindow shellWindow)
+            return shellWindow.GetRootContent();
+
+        return window.Content as FrameworkElement;
+    }
+
+    public async Task ApplyThemeToActiveWindowAsync()
+    {
+        ApplyBackdrop(currentBackdropType);
+        RootTheme = _configurationService.Get(UnderlyingThemeService.SelectedAppThemeKey, ApplicationElementTheme.Default);
+        await ApplyCustomThemeAsync(false);
+        UpdateSystemCaptionButtonColors();
+    }
 }

Wino.Mail.WinUI/Services/WinoWindowManager.cs

@@ -0,0 +1,235 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using WinUIEx;
+using Wino.Mail.WinUI.Interfaces;
+using Wino.Mail.WinUI.Models;
+
+namespace Wino.Mail.WinUI.Services;
+
+public class WinoWindowManager : IWinoWindowManager
+{
+    public event EventHandler<WindowEx?>? ActiveWindowChanged;
+    public event EventHandler<WindowEx>? WindowRemoved;
+
+    private readonly object _syncLock = new();
+    private readonly Dictionary<(WinoWindowKind Kind, string Name), WindowEx> _windows = [];
+    private readonly Dictionary<WindowEx, (WinoWindowKind Kind, string Name)> _windowKeys = [];
+    private readonly Dictionary<(WinoWindowKind Kind, string Name), Frame> _primaryNavigationFrames = [];
+
+    public WindowEx? ActiveWindow { get; private set; }
+
+    public WindowEx CreateWindow(WinoWindowKind kind, Func<WindowEx> factory, string? name = null)
+    {
+        var key = CreateKey(kind, name);
+
+        lock (_syncLock)
+        {
+            if (_windows.TryGetValue(key, out var existingWindow))
+            {
+                ActiveWindow = existingWindow;
+                ActiveWindowChanged?.Invoke(this, existingWindow);
+                return existingWindow;
+            }
+        }
+
+        var newWindow = factory();
+
+        lock (_syncLock)
+        {
+            if (_windows.TryGetValue(key, out var existingWindow))
+            {
+                ActiveWindow = existingWindow;
+                ActiveWindowChanged?.Invoke(this, existingWindow);
+                return existingWindow;
+            }
+
+            TrackWindow(key, newWindow);
+            ActiveWindow = newWindow;
+            ActiveWindowChanged?.Invoke(this, newWindow);
+            return newWindow;
+        }
+    }
+
+    public WindowEx? GetWindow(WinoWindowKind kind, string? name = null)
+    {
+        lock (_syncLock)
+        {
+            _windows.TryGetValue(CreateKey(kind, name), out var window);
+            return window;
+        }
+    }
+
+    public WindowEx? GetWindow(string name)
+    {
+        var normalizedName = NormalizeName(name);
+
+        lock (_syncLock)
+        {
+            return _windows
+                .Where(x => x.Key.Name.Equals(normalizedName, StringComparison.OrdinalIgnoreCase))
+                .Select(x => x.Value)
+                .FirstOrDefault();
+        }
+    }
+
+    public void ActivateWindow(WindowEx window)
+    {
+        window.Show();
+        window.BringToFront();
+        window.Activate();
+
+        lock (_syncLock)
+        {
+            ActiveWindow = window;
+        }
+
+        ActiveWindowChanged?.Invoke(this, window);
+    }
+
+    public bool ActivateWindow(WinoWindowKind kind, string? name = null)
+    {
+        var window = GetWindow(kind, name);
+        if (window == null)
+            return false;
+
+        ActivateWindow(window);
+        return true;
+    }
+
+    public void HideWindow(WindowEx window)
+    {
+        window.Hide();
+
+        lock (_syncLock)
+        {
+            if (ReferenceEquals(ActiveWindow, window))
+            {
+                ActiveWindow = null;
+                ActiveWindowChanged?.Invoke(this, null);
+            }
+        }
+    }
+
+    public bool HideWindow(WinoWindowKind kind, string? name = null)
+    {
+        var window = GetWindow(kind, name);
+        if (window == null)
+            return false;
+
+        HideWindow(window);
+        return true;
+    }
+
+    public void SetPrimaryNavigationFrame(WinoWindowKind kind, Frame frame, string? name = null)
+    {
+        lock (_syncLock)
+        {
+            _primaryNavigationFrames[CreateKey(kind, name)] = frame;
+        }
+    }
+
+    public Frame? GetPrimaryNavigationFrame(WinoWindowKind kind, string? name = null)
+    {
+        lock (_syncLock)
+        {
+            _primaryNavigationFrames.TryGetValue(CreateKey(kind, name), out var frame);
+            return frame;
+        }
+    }
+
+    private void TrackWindow((WinoWindowKind Kind, string Name) key, WindowEx window)
+    {
+        _windows[key] = window;
+        _windowKeys[window] = key;
+        window.Activated += WindowActivated;
+        window.Closed += WindowClosed;
+    }
+
+    private void WindowActivated(object sender, WindowActivatedEventArgs args)
+    {
+        if (sender is not WindowEx window)
+            return;
+
+        if (args.WindowActivationState == WindowActivationState.Deactivated)
+            return;
+
+        lock (_syncLock)
+        {
+            if (_windowKeys.ContainsKey(window))
+            {
+                ActiveWindow = window;
+                ActiveWindowChanged?.Invoke(this, window);
+            }
+        }
+    }
+
+    private void WindowClosed(object sender, WindowEventArgs args)
+    {
+        if (sender is not WindowEx window)
+            return;
+
+        lock (_syncLock)
+        {
+            if (!_windowKeys.TryGetValue(window, out var key))
+                return;
+
+            window.Activated -= WindowActivated;
+            window.Closed -= WindowClosed;
+
+            _windowKeys.Remove(window);
+            _windows.Remove(key);
+            _primaryNavigationFrames.Remove(key);
+            WindowRemoved?.Invoke(this, window);
+
+            if (ReferenceEquals(ActiveWindow, window))
+            {
+                ActiveWindow = null;
+                ActiveWindowChanged?.Invoke(this, null);
+            }
+        }
+    }
+
+    public void CloseAllWindows()
+    {
+        List<WindowEx> windows;
+        lock (_syncLock)
+        {
+            windows = _windows.Values.Distinct().ToList();
+        }
+
+        foreach (var window in windows)
+        {
+            try
+            {
+                window.Activated -= WindowActivated;
+                window.Closed -= WindowClosed;
+                window.Close();
+            }
+            catch
+            {
+                // Best effort shutdown for all tracked windows.
+            }
+        }
+
+        lock (_syncLock)
+        {
+            _windowKeys.Clear();
+            _windows.Clear();
+            _primaryNavigationFrames.Clear();
+            ActiveWindow = null;
+        }
+
+        ActiveWindowChanged?.Invoke(this, null);
+    }
+
+    private static (WinoWindowKind Kind, string Name) CreateKey(WinoWindowKind kind, string? name)
+    {
+        var resolvedName = NormalizeName(name ?? kind.ToString());
+        return (kind, string.IsNullOrWhiteSpace(resolvedName) ? kind.ToString() : resolvedName);
+    }
+
+    private static string NormalizeName(string name) => name.Trim();
+}

Wino.Mail.WinUI/ShellWindow.xaml.cs

@@ -291,8 +291,8 @@ public sealed partial class ShellWindow : WindowEx, IWinoShellWindow,
 
         UnregisterRecipients();
 
-        // Close the window
-        Close();
+        var windowManager = WinoApplication.Current.Services.GetService<IWinoWindowManager>();
+        windowManager?.CloseAllWindows();
 
         // Exit the application
         Application.Current.Exit();

Wino.Mail.WinUI/Views/Abstract/WelcomePageV2Abstract.cs

@@ -0,0 +1,9 @@
+using Wino.Mail.WinUI;
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract;
+
+public abstract class WelcomePageV2Abstract : BasePage<WelcomePageV2ViewModel>
+{
+
+}

Wino.Mail.WinUI/Views/Account/ImapCalDavSettingsPage.xaml

@@ -10,45 +10,57 @@
 
     <ScrollViewer>
         <StackPanel
-            MaxWidth="1040"
-            Padding="24,20,24,24"
-            Spacing="16">
+            MaxWidth="860"
+            Padding="36,28,36,36"
+            HorizontalAlignment="Center"
+            Spacing="24">
+
+            <!--  Page Header  -->
             <StackPanel Spacing="4">
                 <TextBlock
-                    FontSize="30"
+                    FontSize="28"
                     FontWeight="SemiBold"
                     Text="{x:Bind ViewModel.PageTitle, Mode=OneWay}" />
                 <TextBlock
-                    Opacity="0.85"
+                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                    Style="{StaticResource BodyTextBlockStyle}"
                     Text="{x:Bind ViewModel.SubtitleText, Mode=OneWay}"
                     TextWrapping="WrapWholeWords" />
                 <TextBlock
-                    Opacity="0.85"
+                    Foreground="{ThemeResource TextFillColorTertiaryBrush}"
+                    Style="{StaticResource CaptionTextBlockStyle}"
                     Text="{x:Bind ViewModel.ProviderHint, Mode=OneWay}"
-                    TextWrapping="WrapWholeWords" />
+                    TextWrapping="WrapWholeWords"
+                    Visibility="{x:Bind ViewModel.HasProviderHint, Mode=OneWay}" />
             </StackPanel>
 
+            <!--  Setup Mode Selector  -->
             <SelectorBar x:Name="SetupModeSelector" SelectionChanged="OnSetupModeSelectionChanged">
                 <SelectorBarItem Icon="Library" Text="{x:Bind ViewModel.BasicTabText, Mode=OneWay}" />
                 <SelectorBarItem Icon="Setting" Text="{x:Bind ViewModel.AdvancedTabText, Mode=OneWay}" />
             </SelectorBar>
 
+            <!--  Basic Setup Card  -->
             <Border
-                Padding="16"
+                Padding="20"
                 Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
                 BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
                 BorderThickness="1"
-                CornerRadius="12"
+                CornerRadius="8"
                 Visibility="{x:Bind helpers:XamlHelpers.ReverseBoolToVisibilityConverter(ViewModel.IsAdvancedSetupSelected), Mode=OneWay}">
-                <StackPanel Spacing="12">
+                <StackPanel Spacing="16">
+                    <StackPanel Spacing="2">
                         <TextBlock
-                        FontSize="19"
+                            FontSize="16"
                             FontWeight="SemiBold"
                             Text="{x:Bind ViewModel.BasicSectionTitleText, Mode=OneWay}" />
                         <TextBlock
-                        Opacity="0.75"
+                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                            Style="{StaticResource CaptionTextBlockStyle}"
                             Text="{x:Bind ViewModel.BasicSectionDescriptionText, Mode=OneWay}"
                             TextWrapping="WrapWholeWords" />
+                    </StackPanel>
+
                     <Grid ColumnSpacing="12">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*" />
@@ -65,103 +77,166 @@
                             PlaceholderText="{x:Bind ViewModel.EmailAddressPlaceholderText, Mode=OneWay}"
                             Text="{x:Bind ViewModel.EmailAddress, Mode=TwoWay}" />
                     </Grid>
-                    <PasswordBox Header="{x:Bind ViewModel.PasswordHeaderText, Mode=OneWay}" Password="{x:Bind ViewModel.Password, Mode=TwoWay}" />
-                    <CheckBox Content="{x:Bind ViewModel.EnableCalendarSupportText, Mode=OneWay}" IsChecked="{x:Bind ViewModel.IsCalendarSupportEnabled, Mode=TwoWay}" />
+
+                    <PasswordBox
+                        Header="{x:Bind ViewModel.PasswordHeaderText, Mode=OneWay}"
+                        Password="{x:Bind ViewModel.Password, Mode=TwoWay}" />
+
+                    <CheckBox
+                        Content="{x:Bind ViewModel.EnableCalendarSupportText, Mode=OneWay}"
+                        IsChecked="{x:Bind ViewModel.IsCalendarSupportEnabled, Mode=TwoWay}" />
+
                     <Button
                         HorizontalAlignment="Left"
                         Command="{x:Bind ViewModel.AutoDiscoverSettingsCommand}"
-                        Content="{x:Bind ViewModel.AutoDiscoverButtonText, Mode=OneWay}" />
+                        Content="{x:Bind ViewModel.AutoDiscoverButtonText, Mode=OneWay}"
+                        Style="{ThemeResource AccentButtonStyle}" />
                 </StackPanel>
             </Border>
 
+            <!--  Advanced Setup Card  -->
             <Border
-                Padding="16"
+                Padding="20"
                 Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
                 BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
                 BorderThickness="1"
-                CornerRadius="12"
+                CornerRadius="8"
                 Visibility="{x:Bind helpers:XamlHelpers.ReverseBoolToVisibilityConverter(ViewModel.IsBasicSetupSelected), Mode=OneWay}">
-                <StackPanel Spacing="14">
+                <StackPanel Spacing="20">
+                    <StackPanel Spacing="2">
                         <TextBlock
-                        FontSize="19"
+                            FontSize="16"
                             FontWeight="SemiBold"
                             Text="{x:Bind ViewModel.AdvancedSectionTitleText, Mode=OneWay}" />
                         <TextBlock
-                        Opacity="0.75"
+                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                            Style="{StaticResource CaptionTextBlockStyle}"
                             Text="{x:Bind ViewModel.AdvancedSectionDescriptionText, Mode=OneWay}"
                             TextWrapping="WrapWholeWords" />
+                    </StackPanel>
 
-                    <Grid ColumnSpacing="18">
+                    <Grid ColumnSpacing="24">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*" />
                             <ColumnDefinition Width="*" />
                         </Grid.ColumnDefinitions>
 
-                        <StackPanel Spacing="8">
+                        <!--  Incoming (IMAP) Settings  -->
+                        <Border
+                            Padding="16"
+                            Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}"
+                            CornerRadius="6">
+                            <StackPanel Spacing="10">
+                                <StackPanel Orientation="Horizontal" Spacing="8">
+                                    <FontIcon FontSize="14" Glyph="&#xE896;" />
                                     <TextBlock FontWeight="SemiBold" Text="{x:Bind ViewModel.IncomingSectionTitleText, Mode=OneWay}" />
-                            <TextBox Header="{x:Bind ViewModel.IncomingServerHeaderText, Mode=OneWay}" Text="{x:Bind ViewModel.IncomingServer, Mode=TwoWay}" />
-                            <TextBox Header="{x:Bind ViewModel.PortHeaderText, Mode=OneWay}" Text="{x:Bind ViewModel.IncomingServerPort, Mode=TwoWay}" />
-                            <TextBox Header="{x:Bind ViewModel.IncomingUsernameHeaderText, Mode=OneWay}" Text="{x:Bind ViewModel.IncomingServerUsername, Mode=TwoWay}" />
-                            <PasswordBox Header="{x:Bind ViewModel.IncomingPasswordHeaderText, Mode=OneWay}" Password="{x:Bind ViewModel.IncomingServerPassword, Mode=TwoWay}" />
+                                </StackPanel>
+                                <TextBox
+                                    Header="{x:Bind ViewModel.IncomingServerHeaderText, Mode=OneWay}"
+                                    Text="{x:Bind ViewModel.IncomingServer, Mode=TwoWay}" />
+                                <TextBox
+                                    Header="{x:Bind ViewModel.PortHeaderText, Mode=OneWay}"
+                                    Text="{x:Bind ViewModel.IncomingServerPort, Mode=TwoWay}" />
+                                <TextBox
+                                    Header="{x:Bind ViewModel.IncomingUsernameHeaderText, Mode=OneWay}"
+                                    Text="{x:Bind ViewModel.IncomingServerUsername, Mode=TwoWay}" />
+                                <PasswordBox
+                                    Header="{x:Bind ViewModel.IncomingPasswordHeaderText, Mode=OneWay}"
+                                    Password="{x:Bind ViewModel.IncomingServerPassword, Mode=TwoWay}" />
                                 <ComboBox
+                                    HorizontalAlignment="Stretch"
                                     Header="{x:Bind ViewModel.ConnectionSecurityHeaderText, Mode=OneWay}"
                                     ItemsSource="{x:Bind ViewModel.AvailableConnectionSecurityDisplayNames}"
                                     SelectedIndex="{x:Bind ViewModel.SelectedIncomingServerConnectionSecurityIndex, Mode=TwoWay}" />
                                 <ComboBox
+                                    HorizontalAlignment="Stretch"
                                     Header="{x:Bind ViewModel.AuthenticationMethodHeaderText, Mode=OneWay}"
                                     ItemsSource="{x:Bind ViewModel.AvailableAuthenticationMethodDisplayNames}"
                                     SelectedIndex="{x:Bind ViewModel.SelectedIncomingServerAuthenticationMethodIndex, Mode=TwoWay}" />
                             </StackPanel>
+                        </Border>
 
-                        <StackPanel Grid.Column="1" Spacing="8">
+                        <!--  Outgoing (SMTP) Settings  -->
+                        <Border
+                            Grid.Column="1"
+                            Padding="16"
+                            Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}"
+                            CornerRadius="6">
+                            <StackPanel Spacing="10">
+                                <StackPanel Orientation="Horizontal" Spacing="8">
+                                    <FontIcon FontSize="14" Glyph="&#xE898;" />
                                     <TextBlock FontWeight="SemiBold" Text="{x:Bind ViewModel.OutgoingSectionTitleText, Mode=OneWay}" />
-                            <TextBox Header="{x:Bind ViewModel.OutgoingServerHeaderText, Mode=OneWay}" Text="{x:Bind ViewModel.OutgoingServer, Mode=TwoWay}" />
-                            <TextBox Header="{x:Bind ViewModel.PortHeaderText, Mode=OneWay}" Text="{x:Bind ViewModel.OutgoingServerPort, Mode=TwoWay}" />
-                            <TextBox Header="{x:Bind ViewModel.OutgoingUsernameHeaderText, Mode=OneWay}" Text="{x:Bind ViewModel.OutgoingServerUsername, Mode=TwoWay}" />
-                            <PasswordBox Header="{x:Bind ViewModel.OutgoingPasswordHeaderText, Mode=OneWay}" Password="{x:Bind ViewModel.OutgoingServerPassword, Mode=TwoWay}" />
+                                </StackPanel>
+                                <TextBox
+                                    Header="{x:Bind ViewModel.OutgoingServerHeaderText, Mode=OneWay}"
+                                    Text="{x:Bind ViewModel.OutgoingServer, Mode=TwoWay}" />
+                                <TextBox
+                                    Header="{x:Bind ViewModel.PortHeaderText, Mode=OneWay}"
+                                    Text="{x:Bind ViewModel.OutgoingServerPort, Mode=TwoWay}" />
+                                <TextBox
+                                    Header="{x:Bind ViewModel.OutgoingUsernameHeaderText, Mode=OneWay}"
+                                    Text="{x:Bind ViewModel.OutgoingServerUsername, Mode=TwoWay}" />
+                                <PasswordBox
+                                    Header="{x:Bind ViewModel.OutgoingPasswordHeaderText, Mode=OneWay}"
+                                    Password="{x:Bind ViewModel.OutgoingServerPassword, Mode=TwoWay}" />
                                 <ComboBox
+                                    HorizontalAlignment="Stretch"
                                     Header="{x:Bind ViewModel.ConnectionSecurityHeaderText, Mode=OneWay}"
                                     ItemsSource="{x:Bind ViewModel.AvailableConnectionSecurityDisplayNames}"
                                     SelectedIndex="{x:Bind ViewModel.SelectedOutgoingServerConnectionSecurityIndex, Mode=TwoWay}" />
                                 <ComboBox
+                                    HorizontalAlignment="Stretch"
                                     Header="{x:Bind ViewModel.AuthenticationMethodHeaderText, Mode=OneWay}"
                                     ItemsSource="{x:Bind ViewModel.AvailableAuthenticationMethodDisplayNames}"
                                     SelectedIndex="{x:Bind ViewModel.SelectedOutgoingServerAuthenticationMethodIndex, Mode=TwoWay}" />
                             </StackPanel>
+                        </Border>
                     </Grid>
                 </StackPanel>
             </Border>
 
+            <!--  Calendar Settings Card  -->
             <Border
-                Padding="16"
+                Padding="20"
                 Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
                 BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
                 BorderThickness="1"
-                CornerRadius="12">
-                <StackPanel Spacing="12">
+                CornerRadius="8">
+                <StackPanel Spacing="16">
+                    <StackPanel Spacing="2">
+                        <StackPanel Orientation="Horizontal" Spacing="8">
+                            <FontIcon FontSize="16" Glyph="&#xE787;" />
                             <TextBlock
-                        FontSize="19"
+                                FontSize="16"
                                 FontWeight="SemiBold"
                                 Text="{x:Bind ViewModel.CalendarSectionTitleText, Mode=OneWay}" />
+                        </StackPanel>
                         <TextBlock
-                        Opacity="0.75"
+                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                            Style="{StaticResource CaptionTextBlockStyle}"
                             Text="{x:Bind ViewModel.CalendarSectionDescriptionText, Mode=OneWay}"
                             TextWrapping="WrapWholeWords" />
+                    </StackPanel>
+
                     <ComboBox
+                        HorizontalAlignment="Stretch"
                         Header="{x:Bind ViewModel.CalendarModeHeaderText, Mode=OneWay}"
                         IsEnabled="{x:Bind ViewModel.IsCalendarModeSelectionVisible, Mode=OneWay}"
                         ItemsSource="{x:Bind ViewModel.AvailableCalendarSupportModeTitles}"
                         SelectedIndex="{x:Bind ViewModel.SelectedCalendarSupportModeIndex, Mode=TwoWay}" />
+
                     <TextBlock
-                        Opacity="0.8"
+                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                        Style="{StaticResource CaptionTextBlockStyle}"
                         Text="{x:Bind ViewModel.SelectedCalendarSupportDescription, Mode=OneWay}"
                         TextWrapping="WrapWholeWords" />
-                    <Button
-                        HorizontalAlignment="Left"
+
+                    <HyperlinkButton
                         Command="{x:Bind ViewModel.ShowLocalCalendarExplanationCommand}"
                         Content="{x:Bind ViewModel.LocalCalendarLearnMoreText, Mode=OneWay}"
                         IsEnabled="{x:Bind ViewModel.IsLocalCalendarModeSelected, Mode=OneWay}" />
-                    <Grid ColumnSpacing="12">
+
+                    <Grid ColumnSpacing="12" Visibility="{x:Bind ViewModel.IsCalDavSettingsVisible, Mode=OneWay}">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="2*" />
                             <ColumnDefinition Width="*" />
@@ -169,22 +244,22 @@
                         <TextBox
                             Grid.Column="0"
                             Header="{x:Bind ViewModel.CalDavServiceUrlHeaderText, Mode=OneWay}"
-                            IsEnabled="{x:Bind ViewModel.IsCalDavSettingsVisible, Mode=OneWay}"
                             Text="{x:Bind ViewModel.CalDavServiceUrl, Mode=TwoWay}" />
                         <TextBox
                             Grid.Column="1"
                             Header="{x:Bind ViewModel.CalDavUsernameHeaderText, Mode=OneWay}"
-                            IsEnabled="{x:Bind ViewModel.IsCalDavSettingsVisible, Mode=OneWay}"
                             Text="{x:Bind ViewModel.CalDavUsername, Mode=TwoWay}" />
                     </Grid>
+
                     <PasswordBox
                         Header="{x:Bind ViewModel.CalDavPasswordHeaderText, Mode=OneWay}"
-                        IsEnabled="{x:Bind ViewModel.IsCalDavSettingsVisible, Mode=OneWay}"
-                        Password="{x:Bind ViewModel.CalDavPassword, Mode=TwoWay}" />
+                        Password="{x:Bind ViewModel.CalDavPassword, Mode=TwoWay}"
+                        Visibility="{x:Bind ViewModel.IsCalDavSettingsVisible, Mode=OneWay}" />
                 </StackPanel>
             </Border>
 
-            <Grid ColumnSpacing="8">
+            <!--  Action Bar  -->
+            <Grid Margin="0,4,0,0" ColumnSpacing="8">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" />
                     <ColumnDefinition Width="Auto" />

Wino.Mail.WinUI/Views/WelcomePage.xaml

@@ -5,20 +5,110 @@
     xmlns:abstract="using:Wino.Views.Abstract"
     xmlns:controls="using:CommunityToolkit.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:domain="using:Wino.Core.Domain"
+    xmlns:localControls="using:Wino.Mail.WinUI.Controls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Style="{StaticResource PageStyle}"
     mc:Ignorable="d">
 
-    <Border Style="{StaticResource PageRootBorderStyle}">
-        <Grid Padding="15">
-            <ScrollViewer>
-                <controls:MarkdownTextBlock
-                    Margin="0,0,16,0"
-                    CharacterSpacing="12"
-                    Config="{x:Bind _config, Mode=OneTime}"
-                    FontSize="16"
-                    Text="{x:Bind ViewModel.CurrentVersionNotes, Mode=OneWay}" />
-            </ScrollViewer>
+    <Grid Padding="32,24" RowSpacing="16">
+        <Grid.RowDefinitions>
+            <!--  Header  -->
+            <RowDefinition Height="Auto" />
+            <!--  CTA Button  -->
+            <RowDefinition Height="Auto" />
+            <!--  Segmented Tabs + FlipView content  -->
+            <RowDefinition Height="*" />
+            <!--  Footer  -->
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+
+        <!--  Header  -->
+        <StackPanel Grid.Row="0" Spacing="4">
+            <TextBlock
+                FontSize="28"
+                FontWeight="SemiBold"
+                Text="{x:Bind domain:Translator.WelcomeWindow_Title}" />
+            <TextBlock
+                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                Style="{StaticResource BodyTextBlockStyle}"
+                Text="{x:Bind domain:Translator.WelcomeWindow_Subtitle}"
+                TextWrapping="Wrap" />
+        </StackPanel>
+
+        <!--  Get Started CTA  -->
+        <Button
+            Grid.Row="1"
+            Padding="24,12"
+            HorizontalAlignment="Stretch"
+            Command="{x:Bind ViewModel.NavigateManageAccountsCommand}"
+            Style="{StaticResource AccentButtonStyle}">
+            <StackPanel Spacing="4">
+                <TextBlock
+                    FontSize="14"
+                    FontWeight="SemiBold"
+                    HorizontalTextAlignment="Center"
+                    Text="{x:Bind domain:Translator.WelcomeWindow_GetStartedButton}" />
+                <TextBlock
+                    FontSize="12"
+                    Foreground="{ThemeResource TextOnAccentFillColorPrimaryBrush}"
+                    Opacity="0.8"
+                    Text="{x:Bind domain:Translator.WelcomeWindow_GetStartedDescription}" />
+            </StackPanel>
+        </Button>
+
+        <!--  Tabs + Content  -->
+        <Grid Grid.Row="2" RowSpacing="12">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+
+            <!--  Segmented Control  -->
+            <controls:Segmented
+                x:Name="TabSegmented"
+                HorizontalAlignment="Center"
+                SelectionChanged="OnTabSelectionChanged">
+                <controls:SegmentedItem Content="{x:Bind domain:Translator.WelcomeWindow_FeaturesTab}" />
+                <controls:SegmentedItem Content="{x:Bind domain:Translator.WelcomeWindow_WhatsNewTab}" />
+            </controls:Segmented>
+
+            <!--  Features FlipView  -->
+            <localControls:UpdateNotesFlipViewControl
+                x:Name="FeaturesFlipView"
+                Grid.Row="1"
+                Sections="{x:Bind ViewModel.FeatureSections, Mode=OneWay}"
+                Visibility="Visible" />
+
+            <!--  What's New FlipView  -->
+            <localControls:UpdateNotesFlipViewControl
+                x:Name="WhatsNewFlipView"
+                Grid.Row="1"
+                Sections="{x:Bind ViewModel.UpdateSections, Mode=OneWay}"
+                Visibility="Collapsed" />
+        </Grid>
+
+        <!--  Footer  -->
+        <Grid Grid.Row="3" Padding="0,8,0,0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+
+            <TextBlock
+                VerticalAlignment="Center"
+                Foreground="{ThemeResource TextFillColorTertiaryBrush}"
+                Style="{StaticResource CaptionTextBlockStyle}"
+                Text="{x:Bind ViewModel.VersionDisplay, Mode=OneWay}" />
+
+            <StackPanel
+                Grid.Column="1"
+                Orientation="Horizontal"
+                Spacing="8">
+                <HyperlinkButton Content="{x:Bind domain:Translator.SettingsAboutGithub_Title}" NavigateUri="{x:Bind ViewModel.GitHubUrl, Mode=OneWay}" />
+                <HyperlinkButton Content="{x:Bind domain:Translator.SettingsPaypal_Title}" NavigateUri="{x:Bind ViewModel.PaypalUrl, Mode=OneWay}" />
+            </StackPanel>
+        </Grid>
     </Grid>
-    </Border>
 
 </abstract:WelcomePageAbstract>

Wino.Mail.WinUI/Views/WelcomePage.xaml.cs

@@ -1,3 +1,5 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
 using CommunityToolkit.WinUI.Controls;
 using Wino.Views.Abstract;
 
@@ -5,12 +7,19 @@ namespace Wino.Views;
 
 public sealed partial class WelcomePage : WelcomePageAbstract
 {
-    private readonly MarkdownConfig _config;
-
     public WelcomePage()
     {
         InitializeComponent();
+    }
 
-        _config = new MarkdownConfig();
+    private void OnTabSelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        if (sender is not Segmented segmented)
+            return;
+
+        bool isFeaturesTab = segmented.SelectedIndex == 0;
+
+        FeaturesFlipView.Visibility = isFeaturesTab ? Visibility.Visible : Visibility.Collapsed;
+        WhatsNewFlipView.Visibility = isFeaturesTab ? Visibility.Collapsed : Visibility.Visible;
     }
 }

Wino.Mail.WinUI/Views/WelcomePageV2.xaml

@@ -0,0 +1,152 @@
+<abstract:WelcomePageV2Abstract
+    x:Class="Wino.Views.WelcomePageV2"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:abstract="using:Wino.Views.Abstract"
+    xmlns:controls="using:CommunityToolkit.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"
+    xmlns:models="using:Wino.Core.Domain.Models.Updates"
+    mc:Ignorable="d">
+
+    <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
+        <Grid
+            MaxWidth="900"
+            Margin="0,48,0,40"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            RowSpacing="32">
+
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+
+            <!--  Brand  -->
+            <StackPanel HorizontalAlignment="Center" Spacing="4">
+                <Image
+                    Width="128"
+                    Height="128"
+                    Margin="0,0,0,12"
+                    HorizontalAlignment="Center"
+                    Source="ms-appx:///Assets/AppEntries/MailAssets/Square150x150Logo.scale-100.png"
+                    Stretch="Uniform" />
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    FontSize="28"
+                    FontWeight="SemiBold"
+                    Text="{x:Bind domain:Translator.WelcomeWindow_Title}" />
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                    Style="{StaticResource BodyTextBlockStyle}"
+                    Text="{x:Bind domain:Translator.WelcomeWindow_AppDescription}" />
+            </StackPanel>
+
+            <!--  FlipView  -->
+            <Grid
+                Grid.Row="1"
+                MaxHeight="300"
+                VerticalAlignment="Center">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+
+                <Border
+                    Padding="0"
+                    VerticalAlignment="Center"
+                    Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                    BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                    BorderThickness="1"
+                    CornerRadius="12">
+                    <FlipView
+                        x:Name="UpdateFlipView"
+                        MinHeight="200"
+                        Background="Transparent"
+                        ItemsSource="{x:Bind ViewModel.UpdateSections, Mode=OneWay}"
+                        SelectionChanged="OnFlipViewSelectionChanged">
+                        <FlipView.ItemTemplate>
+                            <DataTemplate x:DataType="models:UpdateNoteSection">
+                                <Grid Padding="48,40" ColumnSpacing="40">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="200" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+
+                                    <!--  Illustration  -->
+                                    <Border Height="160" CornerRadius="8">
+                                        <Image
+                                            Width="{x:Bind ActualImageWidth, Mode=OneTime}"
+                                            Height="{x:Bind ActualImageHeight, Mode=OneTime}"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            Source="{x:Bind ImageUrl, Mode=OneTime}"
+                                            Stretch="Uniform" />
+                                    </Border>
+
+                                    <!--  Content  -->
+                                    <StackPanel
+                                        Grid.Column="1"
+                                        VerticalAlignment="Center"
+                                        Spacing="8">
+                                        <controls:MarkdownTextBlock Text="{x:Bind Title, Mode=OneTime}" />
+                                        <controls:MarkdownTextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="{x:Bind Description, Mode=OneTime}" />
+                                    </StackPanel>
+                                </Grid>
+                            </DataTemplate>
+                        </FlipView.ItemTemplate>
+                    </FlipView>
+                </Border>
+
+                <!--  PipsPager  -->
+                <PipsPager
+                    x:Name="FlipViewPager"
+                    Grid.Row="1"
+                    Margin="0,16,0,0"
+                    HorizontalAlignment="Center"
+                    NumberOfPages="{x:Bind ViewModel.UpdateSections.Count, Mode=OneWay}"
+                    SelectedIndexChanged="OnPipsPagerSelectedIndexChanged"
+                    SelectedPageIndex="0" />
+            </Grid>
+
+            <!--  Divider  -->
+            <Border
+                Grid.Row="2"
+                Height="1"
+                HorizontalAlignment="Stretch"
+                Background="{ThemeResource DividerStrokeColorDefaultBrush}" />
+
+            <!--  Get Started  -->
+            <StackPanel
+                Grid.Row="3"
+                MaxWidth="600"
+                HorizontalAlignment="Center"
+                Spacing="8">
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                    Style="{StaticResource BodyTextBlockStyle}"
+                    Text="{x:Bind domain:Translator.WelcomeWindow_GetStartedDescription}" />
+
+                <Button
+                    MinWidth="240"
+                    Padding="12,10"
+                    HorizontalAlignment="Center"
+                    Command="{x:Bind ViewModel.GetStartedCommand}"
+                    Style="{StaticResource AccentButtonStyle}">
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        FontSize="14"
+                        FontWeight="SemiBold"
+                        Text="{x:Bind domain:Translator.WelcomeWindow_GetStartedButton}" />
+                </Button>
+            </StackPanel>
+
+        </Grid>
+    </ScrollViewer>
+
+</abstract:WelcomePageV2Abstract>

Wino.Mail.WinUI/Views/WelcomePageV2.xaml.cs

@@ -0,0 +1,22 @@
+using Microsoft.UI.Xaml.Controls;
+using Wino.Views.Abstract;
+
+namespace Wino.Views;
+
+public sealed partial class WelcomePageV2 : WelcomePageV2Abstract
+{
+    public WelcomePageV2()
+    {
+        InitializeComponent();
+    }
+
+    private void OnFlipViewSelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        FlipViewPager.SelectedPageIndex = UpdateFlipView.SelectedIndex;
+    }
+
+    private void OnPipsPagerSelectedIndexChanged(PipsPager sender, PipsPagerSelectedIndexChangedEventArgs args)
+    {
+        UpdateFlipView.SelectedIndex = sender.SelectedPageIndex;
+    }
+}

Wino.Mail.WinUI/WelcomeWindow.xaml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<winuiex:WindowEx
+    x:Class="Wino.Mail.WinUI.WelcomeWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:winuiex="using:WinUIEx"
+    mc:Ignorable="d">
+
+    <Grid Background="{ThemeResource WinoApplicationBackgroundColor}">
+        <Frame x:Name="RootFrame" />
+    </Grid>
+</winuiex:WindowEx>

Wino.Mail.WinUI/WelcomeWindow.xaml.cs

@@ -0,0 +1,40 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.UI.Windowing;
+using Microsoft.UI.Xaml.Controls;
+using Wino.Core.Domain.Interfaces;
+using WinUIEx;
+
+namespace Wino.Mail.WinUI;
+
+public sealed partial class WelcomeWindow : WindowEx
+{
+    public Frame GetRootFrame() => RootFrame;
+
+    public WelcomeWindow()
+    {
+        InitializeComponent();
+
+        MinWidth = 980;
+        MinHeight = 900;
+        Title = "Wino Mail";
+        this.SetIcon("Assets/Wino_Icon.ico");
+
+        ConfigureWindowChrome();
+    }
+
+    private void ConfigureWindowChrome()
+    {
+        AppWindow.TitleBar.ExtendsContentIntoTitleBar = true;
+
+        Width = 980;
+        Height = 720;
+
+        //this.IsResizable = false;
+        //this.IsMaximizable = false;
+
+        this.CenterOnScreen();
+
+        var themeService = WinoApplication.Current.Services.GetService<INewThemeService>();
+        themeService?.UpdateSystemCaptionButtonColors();
+    }
+}

Wino.Mail.WinUI/Wino.Mail.WinUI.csproj

@@ -98,6 +98,13 @@
   </ItemGroup>
   <ItemGroup>
     <None Remove="Assets\CalendarWide310x150Logo.png" />
+    <None Remove="Assets\UpdateNotes\Images\Calendar.svg" />
+    <None Remove="Assets\UpdateNotes\Images\Security.svg" />
+    <None Remove="Assets\UpdateNotes\Images\Thread.svg" />
+    <None Remove="Assets\UpdateNotes\Images\Notification.svg" />
+    <None Remove="Assets\UpdateNotes\Images\More.svg" />
+    <None Remove="Assets\UpdateNotes\Images\Mail.svg" />
+    <None Remove="Assets\UpdateNotes\Images\Customize.svg" />
     <None Remove="BackgroundImages\Acrylic.jpg" />
     <None Remove="BackgroundImages\Clouds.jpg" />
     <None Remove="BackgroundImages\Forest.jpg" />
@@ -143,6 +150,14 @@
     <Content Include="AppThemes\TestTheme.xaml" />
     <Content Include="Assets\ReleaseNotes\vnext.md" />
     <Content Include="Assets\UpdateNotes\vnext.json" />
+    <Content Include="Assets\UpdateNotes\features.json" />
+    <Content Include="Assets\UpdateNotes\Images\Calendar.svg" />
+    <Content Include="Assets\UpdateNotes\Images\Security.svg" />
+    <Content Include="Assets\UpdateNotes\Images\Thread.svg" />
+    <Content Include="Assets\UpdateNotes\Images\Notification.svg" />
+    <Content Include="Assets\UpdateNotes\Images\More.svg" />
+    <Content Include="Assets\UpdateNotes\Images\Mail.svg" />
+    <Content Include="Assets\UpdateNotes\Images\Customize.svg" />
     <Content Include="Assets\Wino_Icon.ico" />
     <Content Include="BackgroundImages\Acrylic.jpg" />
     <Content Include="BackgroundImages\Clouds.jpg" />

Wino.Messages/Client/Navigation/GetStartedFromWelcomeRequested.cs

@@ -0,0 +1,7 @@
+namespace Wino.Messaging.Client.Navigation;
+
+/// <summary>
+/// User clicked "Get Started" on the welcome page.
+/// App should close the welcome window and open the shell window.
+/// </summary>
+public record GetStartedFromWelcomeRequested;

Wino.Services/Migrations/VNextDelayMigration.cs

@@ -0,0 +1,11 @@
+using System.Threading.Tasks;
+using Wino.Core.Domain.Interfaces;
+
+namespace Wino.Services.Migrations;
+
+public class VNextDelayMigration : IAppMigration
+{
+    public string MigrationId => "vnext-delay";
+
+    public Task ExecuteAsync() => Task.Delay(3000);
+}

Wino.Services/UpdateManager.cs

@@ -6,12 +6,14 @@ using System.Threading.Tasks;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Updates;
+using Wino.Services.Migrations;
 
 namespace Wino.Services;
 
 public class UpdateManager : IUpdateManager
 {
     private const string UpdateNotesResourcePath = "ms-appx:///Assets/UpdateNotes/vnext.json";
+    private const string FeaturesResourcePath = "ms-appx:///Assets/UpdateNotes/features.json";
     private const string UpdateNotesSeenKeyFormat = "UpdateNotes_{0}_Shown";
     private const string MigrationCompletedKeyFormat = "Migration_{0}_Completed";
 
@@ -21,6 +23,7 @@ public class UpdateManager : IUpdateManager
     private readonly List<IAppMigration> _migrations = [];
 
     private string _versionSeenKey = string.Empty;
+    private UpdateNotes _latestUpdateNotes = new();
 
     public UpdateManager(IFileService fileService,
                          IConfigurationService configurationService,
@@ -29,6 +32,7 @@ public class UpdateManager : IUpdateManager
         _fileService = fileService;
         _configurationService = configurationService;
         _nativeAppService = nativeAppService;
+        _migrations.Add(new VNextDelayMigration());
     }
 
     private string GetVersionSeenKey()
@@ -50,27 +54,61 @@ public class UpdateManager : IUpdateManager
             var json = await _fileService.GetFileContentByApplicationUriAsync(UpdateNotesResourcePath);
 
             if (string.IsNullOrEmpty(json))
-                return new UpdateNotes();
+            {
+                _latestUpdateNotes = new UpdateNotes();
+                return _latestUpdateNotes;
+            }
 
-            return JsonSerializer.Deserialize(json, BasicTypesJsonContext.Default.UpdateNotes) ?? new UpdateNotes();
+            _latestUpdateNotes = JsonSerializer.Deserialize(json, BasicTypesJsonContext.Default.UpdateNotes) ?? new UpdateNotes();
+            return _latestUpdateNotes;
         }
         catch (Exception)
         {
-            return new UpdateNotes();
+            _latestUpdateNotes = new UpdateNotes();
+            return _latestUpdateNotes;
         }
     }
 
+    // T
     public bool ShouldShowUpdateNotes()
         => !_configurationService.Get(GetVersionSeenKey(), false);
 
+    public async Task<List<UpdateNoteSection>> GetFeaturesAsync()
+    {
+        try
+        {
+            var json = await _fileService.GetFileContentByApplicationUriAsync(FeaturesResourcePath);
+
+            if (string.IsNullOrEmpty(json))
+                return [];
+
+            return JsonSerializer.Deserialize(json, BasicTypesJsonContext.Default.ListUpdateNoteSection) ?? [];
+        }
+        catch (Exception)
+        {
+            return [];
+        }
+    }
+
     public void MarkUpdateNotesAsSeen()
         => _configurationService.Set(GetVersionSeenKey(), true);
 
     public bool HasPendingMigrations()
-        => _migrations.Any(m => !_configurationService.Get(string.Format(MigrationCompletedKeyFormat, m.MigrationId), false));
+    {
+        if (!_latestUpdateNotes.HasPendingMigrations)
+            return false;
+
+        return _migrations.Any(m => !_configurationService.Get(string.Format(MigrationCompletedKeyFormat, m.MigrationId), false));
+    }
 
     public async Task RunPendingMigrationsAsync()
     {
+        if (!_latestUpdateNotes.HasPendingMigrations)
+            _latestUpdateNotes = await GetLatestUpdateNotesAsync();
+
+        if (!_latestUpdateNotes.HasPendingMigrations)
+            return;
+
         foreach (var migration in _migrations)
         {
             var key = string.Format(MigrationCompletedKeyFormat, migration.MigrationId);