diff --git a/WinUIGallery/App.xaml b/WinUIGallery/App.xaml
index e0e2d8e3d..1d2895e51 100644
--- a/WinUIGallery/App.xaml
+++ b/WinUIGallery/App.xaml
@@ -25,6 +25,7 @@
                 <ResourceDictionary Source="/Styles/Grid.xaml" />
                 <ResourceDictionary Source="/Styles/GridViewItem.xaml" />
                 <ResourceDictionary Source="/Styles/TextBlock.xaml" />
+                <ResourceDictionary Source="/Styles/TitleBar.xaml" />
                 <ResourceDictionary Source="/Samples/ControlPages/Fundamentals/Controls/CounterControl.xaml" />
                 <ResourceDictionary Source="/Samples/ControlPages/Fundamentals/Controls/ValidatedPasswordBox.xaml" />
             </ResourceDictionary.MergedDictionaries>
diff --git a/WinUIGallery/App.xaml.cs b/WinUIGallery/App.xaml.cs
index a39a23bd9..bbf88c6dd 100644
--- a/WinUIGallery/App.xaml.cs
+++ b/WinUIGallery/App.xaml.cs
@@ -10,20 +10,15 @@
 using System;
 using System.Diagnostics;
 using System.Linq;
-using System.Reflection;
-using WinUIGallery.Models;
-using WinUIGallery.Helpers;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Navigation;
 using Microsoft.Windows.AppLifecycle;
-using Windows.ApplicationModel.Activation;
-using WASDK = Microsoft.WindowsAppSDK;
 using Microsoft.Windows.AppNotifications;
 using Microsoft.Windows.AppNotifications.Builder;
-using System.Collections.Generic;
-using static WinUIGallery.Helpers.Win32;
+using Windows.ApplicationModel.Activation;
+using WinUIGallery.Helpers;
 using WinUIGallery.Pages;
+using static WinUIGallery.Helpers.Win32;
 
 namespace WinUIGallery;
 
@@ -32,47 +27,11 @@ namespace WinUIGallery;
 /// </summary>
 sealed partial class App : Application
 {
-    private static Window startupWindow;
-    private static Win32WindowHelper win32WindowHelper;
+    internal static MainWindow MainWindow { get; private set; } = null!;
+
     private static int registeredKeyPressedHook = 0;
     private HookProc keyEventHook;
 
-
-    public static string WinAppSdkDetails
-    {
-        // TODO: restore patch number and version tag when WinAppSDK supports them both
-        get => string.Format("Windows App SDK {0}.{1}",
-            WASDK.Release.Major, WASDK.Release.Minor);
-    }
-
-    public static string WinAppSdkRuntimeDetails
-    {
-        get
-        {
-            try
-            {
-                // Retrieve Windows App Runtime version info dynamically
-                IEnumerable<FileVersionInfo> windowsAppRuntimeVersion =
-                    from module in Process.GetCurrentProcess().Modules.OfType<ProcessModule>()
-                    where module.FileName.EndsWith("Microsoft.WindowsAppRuntime.Insights.Resource.dll")
-                    select FileVersionInfo.GetVersionInfo(module.FileName);
-                return WinAppSdkDetails + ", Windows App Runtime " + windowsAppRuntimeVersion.First().FileVersion;
-            }
-            catch
-            {
-                return WinAppSdkDetails + $", Windows App Runtime {WASDK.Runtime.Version.Major}.{WASDK.Runtime.Version.Minor}";
-            }
-        }
-    }
-
-    /// <summary>
-    /// Get the initial window created for this app.
-    /// </summary>
-    public static Window StartupWindow
-    {
-        get => startupWindow;
-    }
-
     /// <summary>
     /// Initializes the singleton Application object. This is the first line of authored code
     /// executed, and as such is the logical equivalent of main() or WinMain().
@@ -83,22 +42,6 @@ public App()
         UnhandledException += HandleExceptions;
     }
 
-    /// <summary>
-    /// Converts a string into a enum.
-    /// </summary>
-    /// <typeparam name="TEnum">The output enum type.</typeparam>
-    /// <param name="text">The input text.</param>
-    /// <returns>The parsed enum.</returns>
-    /// <exception cref="InvalidOperationException">Thrown when the TEnum type is not a enum.</exception>
-    public static TEnum GetEnum<TEnum>(string text) where TEnum : struct
-    {
-        if (!typeof(TEnum).GetTypeInfo().IsEnum)
-        {
-            throw new InvalidOperationException("Generic parameter 'TEnum' must be an enum.");
-        }
-        return (TEnum)Enum.Parse(typeof(TEnum), text);
-    }
-
     /// <summary>
     /// Invoked when the application is launched normally by the end user.  Other entry points
     /// will be used such as when the application is launched to open a specific file.
@@ -108,11 +51,8 @@ protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs ar
     {
         IdleSynchronizer.Init();
 
-        startupWindow = WindowHelper.CreateWindow();
-        startupWindow.ExtendsContentIntoTitleBar = true;
-
-        win32WindowHelper = new Win32WindowHelper(startupWindow);
-        win32WindowHelper.SetWindowMinMaxSize(new Win32WindowHelper.POINT() { x = 500, y = 500 });
+        MainWindow = new MainWindow();
+        WindowHelper.TrackWindow(MainWindow);
 
 #if DEBUG
         if (Debugger.IsAttached)
@@ -153,9 +93,7 @@ private async void EnsureWindow()
     {
         await ControlInfoDataSource.Instance.GetGroupsAsync();
         await IconsDataSource.Instance.LoadIcons();
-
-        Frame rootFrame = GetRootFrame();
-
+        MainWindow.AddNavigationMenuItems();
         ThemeHelper.Initialize();
 
         var targetPageType = typeof(HomePage);
@@ -186,57 +124,16 @@ private async void EnsureWindow()
             }
         }
 
-        var rootPage = StartupWindow.Content as NavigationRootPage;
-        rootPage.Navigate(targetPageType, targetPageArguments);
+        MainWindow.Navigate(targetPageType, targetPageArguments);
 
         if (targetPageType == typeof(HomePage))
         {
-            var navItem = (NavigationViewItem)rootPage.NavigationView.MenuItems[0];
+            var navItem = (NavigationViewItem)MainWindow.NavigationView.MenuItems[0];
             navItem.IsSelected = true;
         }
 
         // Activate the startup window.
-        StartupWindow.Activate();
-    }
-
-    /// <summary>
-    /// Gets the frame of the StartupWindow.
-    /// </summary>
-    /// <returns>The frame of the StartupWindow.</returns>
-    /// <exception cref="Exception">Thrown if the window doesn't have a frame with the name "rootFrame".</exception>
-    public Frame GetRootFrame()
-    {
-        Frame rootFrame;
-        if (StartupWindow.Content is NavigationRootPage rootPage)
-        {
-            rootFrame = (Frame)rootPage.FindName("rootFrame");
-        }
-        else
-        {
-            rootPage = new NavigationRootPage();
-            rootFrame = (Frame)rootPage.FindName("rootFrame");
-            if (rootFrame == null)
-            {
-                throw new Exception("Root frame not found");
-            }
-            SuspensionManager.RegisterFrame(rootFrame, "AppFrame");
-            rootFrame.Language = Windows.Globalization.ApplicationLanguages.Languages[0];
-            rootFrame.NavigationFailed += OnNavigationFailed;
-
-            StartupWindow.Content = rootPage;
-        }
-
-        return rootFrame;
-    }
-
-    /// <summary>
-    /// Invoked when Navigation to a certain page fails
-    /// </summary>
-    /// <param name="sender">The Frame which failed navigation</param>
-    /// <param name="e">Details about the navigation failure</param>
-    void OnNavigationFailed(object sender, NavigationFailedEventArgs e)
-    {
-        throw new Exception("Failed to load Page " + e.SourcePageType.FullName);
+        MainWindow.Activate();
     }
 
     /// <summary>
diff --git a/WinUIGallery/Helpers/EnumHelper.cs b/WinUIGallery/Helpers/EnumHelper.cs
new file mode 100644
index 000000000..d12d8b4cb
--- /dev/null
+++ b/WinUIGallery/Helpers/EnumHelper.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Reflection;
+
+namespace WinUIGallery.Helpers;
+internal static class EnumHelper
+{
+    /// <summary>
+    /// Converts a string into a enum.
+    /// </summary>
+    /// <typeparam name="TEnum">The output enum type.</typeparam>
+    /// <param name="text">The input text.</param>
+    /// <returns>The parsed enum.</returns>
+    /// <exception cref="InvalidOperationException">Thrown when the TEnum type is not a enum.</exception>
+    public static TEnum GetEnum<TEnum>(string text) where TEnum : struct
+    {
+        if (!typeof(TEnum).GetTypeInfo().IsEnum)
+        {
+            throw new InvalidOperationException("Generic parameter 'TEnum' must be an enum.");
+        }
+        return (TEnum)Enum.Parse(typeof(TEnum), text);
+    }
+}
diff --git a/WinUIGallery/Helpers/NavigationHelper.cs b/WinUIGallery/Helpers/NavigationHelper.cs
index e321decdf..5ea74c0d7 100644
--- a/WinUIGallery/Helpers/NavigationHelper.cs
+++ b/WinUIGallery/Helpers/NavigationHelper.cs
@@ -187,11 +187,6 @@ public RootFrameNavigationHelper(Frame rootFrame, NavigationView currentNavView)
         }
 
         this.Frame = rootFrame;
-        this.Frame.Navigated += (s, e) =>
-        {
-            // Update the Back button whenever a navigation occurs.
-            UpdateBackButton();
-        };
         this.CurrentNavView = currentNavView;
 
         CurrentNavView.BackRequested += NavView_BackRequested;
@@ -296,11 +291,6 @@ private bool TryGoForward()
         }
         return navigated;
     }
-
-    private void UpdateBackButton()
-    {
-        this.CurrentNavView.IsBackEnabled = this.Frame.CanGoBack ? true : false;
-    }
 }
 
 /// <summary>
diff --git a/WinUIGallery/Helpers/NavigationOrientationHelper.cs b/WinUIGallery/Helpers/NavigationOrientationHelper.cs
index e2f834a02..b7760cbcf 100644
--- a/WinUIGallery/Helpers/NavigationOrientationHelper.cs
+++ b/WinUIGallery/Helpers/NavigationOrientationHelper.cs
@@ -29,9 +29,9 @@ public static bool IsLeftMode()
         }
     }
 
-    public static void IsLeftModeForElement(bool isLeftMode, UIElement element)
+    public static void IsLeftModeForElement(bool isLeftMode)
     {
-        UpdateNavigationViewForElement(isLeftMode, element);
+        UpdateNavigationViewForElement(isLeftMode);
         if (NativeHelper.IsAppPackaged)
         {
             ApplicationData.Current.LocalSettings.Values[IsLeftModeKey] = isLeftMode;
@@ -42,19 +42,16 @@ public static void IsLeftModeForElement(bool isLeftMode, UIElement element)
         }
     }
 
-    public static void UpdateNavigationViewForElement(bool isLeftMode, UIElement element)
+    public static void UpdateNavigationViewForElement(bool isLeftMode)
     {
-        NavigationView _navView = NavigationRootPage.GetForElement(element).NavigationView;
+        NavigationView _navView = App.MainWindow.NavigationView;
         if (isLeftMode)
         {
             _navView.PaneDisplayMode = NavigationViewPaneDisplayMode.Auto;
-            Grid.SetRow(_navView, 0);
         }
         else
         {
             _navView.PaneDisplayMode = NavigationViewPaneDisplayMode.Top;
-            Grid.SetRow(_navView, 1);
         }
     }
-    
 }
diff --git a/WinUIGallery/Helpers/ProtocolActivationClipboardHelper.cs b/WinUIGallery/Helpers/ProtocolActivationClipboardHelper.cs
index 586ed1e1e..6011da495 100644
--- a/WinUIGallery/Helpers/ProtocolActivationClipboardHelper.cs
+++ b/WinUIGallery/Helpers/ProtocolActivationClipboardHelper.cs
@@ -50,14 +50,23 @@ public static bool ShowCopyLinkTeachingTip
 
     public static void Copy(ControlInfoDataItem item)
     {
-        var uri = new Uri($"winui3gallery://item/{item.UniqueId}", UriKind.Absolute);
-        ProtocolActivationClipboardHelper.Copy(uri, $"{Package.Current.DisplayName} - {item.Title} Sample");
+        var uri = new Uri($"{GetAppName()}://item/{item.UniqueId}", UriKind.Absolute);
+        Copy(uri, $"{Package.Current.DisplayName} - {item.Title} Sample");
     }
 
     public static void Copy(ControlInfoDataGroup group)
     {
-        var uri = new Uri($"winui3gallery://category/{group.UniqueId}", UriKind.Absolute);
-        ProtocolActivationClipboardHelper.Copy(uri, $"{Package.Current.DisplayName} - {group.Title} Samples");
+        var uri = new Uri($"{GetAppName()}://category/{group.UniqueId}", UriKind.Absolute);
+        Copy(uri, $"{Package.Current.DisplayName} - {group.Title} Samples");
+    }
+
+    private static string GetAppName()
+    {
+#if DEBUG
+        return "winui3gallerydev";
+#else
+        return "winui3gallery";
+#endif
     }
 
     private static void Copy(Uri uri, string displayName)
diff --git a/WinUIGallery/Helpers/ThemeHelper.cs b/WinUIGallery/Helpers/ThemeHelper.cs
index a80d91265..d160ce80b 100644
--- a/WinUIGallery/Helpers/ThemeHelper.cs
+++ b/WinUIGallery/Helpers/ThemeHelper.cs
@@ -29,7 +29,7 @@ public static ElementTheme ActualTheme
                 }
             }
 
-            return WinUIGallery.App.GetEnum<ElementTheme>(App.Current.RequestedTheme.ToString());
+            return EnumHelper.GetEnum<ElementTheme>(App.Current.RequestedTheme.ToString());
         }
     }
 
@@ -75,7 +75,7 @@ public static void Initialize()
 
             if (savedTheme != null)
             {
-                RootTheme = WinUIGallery.App.GetEnum<ElementTheme>(savedTheme);
+                RootTheme = EnumHelper.GetEnum<ElementTheme>(savedTheme);
             }
         }
     }
diff --git a/WinUIGallery/Helpers/TitleBarHelper.cs b/WinUIGallery/Helpers/TitleBarHelper.cs
index c031867a7..5b26e12cc 100644
--- a/WinUIGallery/Helpers/TitleBarHelper.cs
+++ b/WinUIGallery/Helpers/TitleBarHelper.cs
@@ -6,11 +6,11 @@ namespace WinUIGallery.Helpers;
 
 internal class TitleBarHelper
 {
-    // workaround as Appwindow titlebar doesn't update caption button colors correctly when changed while app is running
+    // workaround as AppWindow TitleBar doesn't update caption button colors correctly when changed while app is running
     // https://task.ms/44172495
     public static Windows.UI.Color ApplySystemThemeToCaptionButtons(Window window)
     {
-        var frame = (Application.Current as WinUIGallery.App).GetRootFrame() as FrameworkElement;
+        var frame = App.MainWindow.GetRootFrame() as FrameworkElement;
         Windows.UI.Color color;
         if (frame.ActualTheme == ElementTheme.Dark)
         {
@@ -20,7 +20,7 @@ public static Windows.UI.Color ApplySystemThemeToCaptionButtons(Window window)
         {
             color = Colors.Black;
         }
-        SetCaptionButtonColors(window,color);
+        SetCaptionButtonColors(window, color);
         return color;
     }
 
diff --git a/WinUIGallery/Helpers/VersionHelper.cs b/WinUIGallery/Helpers/VersionHelper.cs
new file mode 100644
index 000000000..23e7bc3cc
--- /dev/null
+++ b/WinUIGallery/Helpers/VersionHelper.cs
@@ -0,0 +1,35 @@
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using WASDK = Microsoft.WindowsAppSDK;
+
+namespace WinUIGallery.Helpers;
+internal static class VersionHelper
+{
+    public static string WinAppSdkDetails
+    {
+        // TODO: restore patch number and version tag when WinAppSDK supports them both
+        get => string.Format("Windows App SDK {0}.{1}",
+            WASDK.Release.Major, WASDK.Release.Minor);
+    }
+
+    public static string WinAppSdkRuntimeDetails
+    {
+        get
+        {
+            try
+            {
+                // Retrieve Windows App Runtime version info dynamically
+                IEnumerable<FileVersionInfo> windowsAppRuntimeVersion =
+                    from module in Process.GetCurrentProcess().Modules.OfType<ProcessModule>()
+                    where module.FileName.EndsWith("Microsoft.WindowsAppRuntime.Insights.Resource.dll")
+                    select FileVersionInfo.GetVersionInfo(module.FileName);
+                return WinAppSdkDetails + ", Windows App Runtime " + windowsAppRuntimeVersion.First().FileVersion;
+            }
+            catch
+            {
+                return WinAppSdkDetails + $", Windows App Runtime {WASDK.Runtime.Version.Major}.{WASDK.Runtime.Version.Minor}";
+            }
+        }
+    }
+}
diff --git a/WinUIGallery/Pages/NavigationRootPage.xaml b/WinUIGallery/MainWindow.xaml
similarity index 73%
rename from WinUIGallery/Pages/NavigationRootPage.xaml
rename to WinUIGallery/MainWindow.xaml
index b12daf111..b191617d7 100644
--- a/WinUIGallery/Pages/NavigationRootPage.xaml
+++ b/WinUIGallery/MainWindow.xaml
@@ -1,63 +1,56 @@
-<!--
-    //*********************************************************
-    //
-    // Copyright (c) Microsoft. All rights reserved.
-    // THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF
-    // ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY
-    // IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR
-    // PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.
-    //
-    //*********************************************************
--->
-<Page
-    x:Class="WinUIGallery.Pages.NavigationRootPage"
+<?xml version="1.0" encoding="utf-8" ?>
+<Window
+    x:Class="WinUIGallery.MainWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    HighContrastAdjustment="None">
-
-    <Grid>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition />
-        </Grid.ColumnDefinitions>
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:WinUIGallery"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:pages="using:WinUIGallery.Pages"
+    Title="MainWindow"
+    mc:Ignorable="d">
+    <Window.SystemBackdrop>
+        <MicaBackdrop />
+    </Window.SystemBackdrop>
+    <Grid x:Name="RootGrid" Loaded="RootGrid_Loaded">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
-            <!--  TitleBar  -->
             <RowDefinition Height="*" />
-            <!--  NavView  -->
         </Grid.RowDefinitions>
-
-        <Border
-            x:Name="AppTitleBar"
-            Grid.Column="1"
-            Height="{Binding ElementName=NavigationViewControl, Path=CompactPaneLength}"
-            Margin="48,0,0,0"
-            VerticalAlignment="Stretch"
-            AutomationProperties.AutomationId="AppTitleBar"
-            Canvas.ZIndex="1"
-            IsHitTestVisible="True">
-            <StackPanel VerticalAlignment="Stretch" Orientation="Horizontal">
-                <Image
-                    Width="18"
-                    VerticalAlignment="Center"
-                    Source="ms-appx:///Assets/Tiles/BadgeLogo.png" />
-                <TextBlock
-                    x:Name="AppTitle"
-                    Margin="12,0,0,0"
+        <TitleBar
+            x:Name="titleBar"
+            Title="WinUI 3 Gallery"
+            BackRequested="TitleBar_BackRequested"
+            IsBackButtonVisible="{x:Bind rootFrame.CanGoBack, Mode=OneWay}"
+            IsPaneToggleButtonVisible="True"
+            PaneToggleRequested="TitleBar_PaneToggleRequested"
+            Style="{StaticResource StretchableContentTitleBarStyle}"
+            Subtitle="Dev">
+            <TitleBar.IconSource>
+                <ImageIconSource ImageSource="/Assets/Tiles/GalleryIcon.ico" />
+            </TitleBar.IconSource>
+            <TitleBar.CenterContent>
+                <AutoSuggestBox
+                    x:Name="controlsSearchBox"
+                    Width="320"
+                    HorizontalAlignment="Stretch"
                     VerticalAlignment="Center"
-                    Style="{StaticResource CaptionTextBlockStyle}"
-                    Text="{x:Bind AppTitleText}" />
-                <TextBox
-                    x:Name="AppTitleBarTextBox"
-                    Height="40"
-                    MinWidth="300"
-                    Margin="16,0,0,0"
-                    PlaceholderText="Enter any text"
-                    Visibility="Collapsed" />
-            </StackPanel>
-        </Border>
-
-        <Grid x:Name="AutomationHelpersPanel" Grid.Column="1">
+                    x:FieldModifier="public"
+                    KeyboardAcceleratorPlacementMode="Hidden"
+                    PlaceholderText="Search samples.."
+                    QueryIcon="Find"
+                    QuerySubmitted="OnControlsSearchBoxQuerySubmitted"
+                    TextChanged="OnControlsSearchBoxTextChanged">
+                    <AutoSuggestBox.KeyboardAccelerators>
+                        <KeyboardAccelerator
+                            Key="F"
+                            Invoked="CtrlF_Invoked"
+                            Modifiers="Control" />
+                    </AutoSuggestBox.KeyboardAccelerators>
+                </AutoSuggestBox>
+            </TitleBar.CenterContent>
+        </TitleBar>
+        <Grid x:Name="AutomationHelpersPanel" Grid.Row="1">
             <Grid.Resources>
                 <Style x:Key="AutomationHelperStyle" TargetType="Control">
                     <Setter Property="IsTabStop" Value="False" />
@@ -132,50 +125,16 @@
                 Style="{StaticResource AutomationHelperStyle}" />
         </Grid>
 
-        <!--
-            Don't set IsTitleBarAutoPaddingEnabled, since it should only be set false when we're using Window.SetTitleBar(), which isn't currently available.
-            Restore by re-applying https://github.com/microsoft/WinUI-Gallery/pull/198
-        -->
         <NavigationView
             x:Name="NavigationViewControl"
-            Grid.RowSpan="2"
-            Grid.Column="1"
+            Grid.Row="1"
             Canvas.ZIndex="0"
             DisplayModeChanged="OnPaneDisplayModeChanged"
+            IsBackButtonVisible="Collapsed"
+            IsPaneToggleButtonVisible="False"
             IsTabStop="False"
-            IsTitleBarAutoPaddingEnabled="True"
             Loaded="OnNavigationViewControlLoaded"
             SelectionChanged="OnNavigationViewSelectionChanged">
-
-            <!--  Custom TitleBar with NavigationView L-Pattern Overwriting resources  -->
-            <NavigationView.Resources>
-                <!--  This top margin is the height of the custom titleBar  -->
-                <Thickness x:Key="NavigationViewContentMargin">0,48,0,0</Thickness>
-                <Thickness x:Key="NavigationViewMinimalContentMargin">0,48,0,0</Thickness>
-                <Thickness x:Key="NavigationViewContentGridBorderThickness">1,1,0,0</Thickness>
-                <!--  This is the rounded corner on the Top left of the L Pattern  -->
-                <CornerRadius x:Key="NavigationViewContentGridCornerRadius">8,0,0,0</CornerRadius>
-            </NavigationView.Resources>
-            <NavigationView.AutoSuggestBox>
-                <AutoSuggestBox
-                    x:Name="controlsSearchBox"
-                    MinWidth="200"
-                    VerticalAlignment="Center"
-                    x:FieldModifier="public"
-                    KeyboardAcceleratorPlacementMode="Hidden"
-                    PlaceholderText="Search"
-                    QueryIcon="Find"
-                    QuerySubmitted="OnControlsSearchBoxQuerySubmitted"
-                    TextChanged="OnControlsSearchBoxTextChanged">
-                    <AutoSuggestBox.KeyboardAccelerators>
-                        <KeyboardAccelerator
-                            Key="F"
-                            Invoked="CtrlF_Invoked"
-                            Modifiers="Control" />
-                    </AutoSuggestBox.KeyboardAccelerators>
-                </AutoSuggestBox>
-            </NavigationView.AutoSuggestBox>
-
             <Frame
                 x:Name="rootFrame"
                 Navigated="OnRootFrameNavigated"
@@ -319,28 +278,5 @@
                 </NavigationViewItem>
             </NavigationView.MenuItems>
         </NavigationView>
-        <VisualStateManager.VisualStateGroups>
-            <VisualStateGroup x:Name="TitleBarStates">
-                <VisualState x:Name="Default" />
-                <VisualState x:Name="Compact">
-                    <VisualState.Setters>
-                        <Setter Target="AppTitleBar.Margin" Value="96,0,0,0" />
-                    </VisualState.Setters>
-                </VisualState>
-                <VisualState x:Name="Top">
-                    <VisualState.Setters>
-                        <Setter Target="AppTitleBar.Margin" Value="16,0,0,0" />
-                    </VisualState.Setters>
-                </VisualState>
-            </VisualStateGroup>
-            <VisualStateGroup x:Name="WindowActivationStates">
-                <VisualState x:Name="Activated" />
-                <VisualState x:Name="Deactivated">
-                    <VisualState.Setters>
-                        <Setter Target="AppTitle.Foreground" Value="{ThemeResource TextFillColorTertiaryBrush}" />
-                    </VisualState.Setters>
-                </VisualState>
-            </VisualStateGroup>
-        </VisualStateManager.VisualStateGroups>
     </Grid>
-</Page>
+</Window>
diff --git a/WinUIGallery/Pages/NavigationRootPage.xaml.cs b/WinUIGallery/MainWindow.xaml.cs
similarity index 81%
rename from WinUIGallery/Pages/NavigationRootPage.xaml.cs
rename to WinUIGallery/MainWindow.xaml.cs
index 23df4cf46..fe46d28f8 100644
--- a/WinUIGallery/Pages/NavigationRootPage.xaml.cs
+++ b/WinUIGallery/MainWindow.xaml.cs
@@ -1,152 +1,116 @@
-//*********************************************************
-//
-// Copyright (c) Microsoft. All rights reserved.
-// THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF
-// ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY
-// IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR
-// PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.
-//
-//*********************************************************
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
-using WinUIGallery.Models;
-using WinUIGallery.Helpers;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Automation;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media.Animation;
 using Microsoft.UI.Xaml.Navigation;
 using Windows.Foundation;
-using Windows.System.Profile;
 using Windows.UI.ViewManagement;
-using Microsoft.UI.Xaml.Media.Animation;
+using WinUIGallery.Helpers;
+using WinUIGallery.Models;
+using WinUIGallery.Pages;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
 
-namespace WinUIGallery.Pages;
+namespace WinUIGallery;
 
-public sealed partial class NavigationRootPage : Page
+public sealed partial class MainWindow : Window
 {
     public Windows.System.VirtualKey ArrowKey;
     public Microsoft.UI.Dispatching.DispatcherQueue dispatcherQueue;
     private RootFrameNavigationHelper _navHelper;
     private UISettings _settings;
 
-
-    public static NavigationRootPage GetForElement(object obj)
-    {
-        UIElement element = (UIElement)obj;
-        Window window = WindowHelper.GetWindowForElement(element);
-        if (window != null)
-        {
-            return (NavigationRootPage)window.Content;
-        }
-        return null;
-    }
-
-    public Microsoft.UI.Xaml.Controls.NavigationView NavigationView
+    public NavigationView NavigationView
     {
         get { return NavigationViewControl; }
     }
 
     public Action NavigationViewLoaded { get; set; }
 
-    public DeviceType DeviceFamily { get; set; }
-
-    public string AppTitleText
-    {
-        get
-        {
-#if DEBUG
-            return "WinUI 3 Gallery Dev";
-#else
-            return "WinUI 3 Gallery";
-#endif
-        }
-    }
-
-    public NavigationRootPage()
+    public MainWindow()
     {
         this.InitializeComponent();
+        SetWindowProperties();
         dispatcherQueue = Microsoft.UI.Dispatching.DispatcherQueue.GetForCurrentThread();
-
         _navHelper = new RootFrameNavigationHelper(rootFrame, NavigationViewControl);
+    }
 
-        SetDeviceFamily();
-        AddNavigationMenuItems();
-
-        this.GotFocus += (object sender, RoutedEventArgs e) =>
-        {
-            // helpful for debugging focus problems w/ keyboard & gamepad
-            if (FocusManager.GetFocusedElement() is FrameworkElement focus)
-            {
-                Debug.WriteLine("got focus: " + focus.Name + " (" + focus.GetType().ToString() + ")");
-            }
-        };
-
-        // remove the solid-colored backgrounds behind the caption controls and system back button if we are in left mode
-        // This is done when the app is loaded since before that the actual theme that is used is not "determined" yet
-        Loaded += delegate (object sender, RoutedEventArgs e)
-        {
-            NavigationOrientationHelper.UpdateNavigationViewForElement(NavigationOrientationHelper.IsLeftMode(), this);
-
-            Window window = WindowHelper.GetWindowForElement(sender as UIElement);
-            window.Title = AppTitleText;
-            window.ExtendsContentIntoTitleBar = true;
-            window.Activated += Window_Activated;
-            window.SetTitleBar(this.AppTitleBar);
-
-            AppWindow appWindow = WindowHelper.GetAppWindow(window);
-            appWindow.SetIcon("Assets/Tiles/GalleryIcon.ico");
-            appWindow.TitleBar.PreferredHeightOption = TitleBarHeightOption.Tall;
-            _settings = new UISettings();
-            _settings.ColorValuesChanged += _settings_ColorValuesChanged; // cannot use FrameworkElement.ActualThemeChanged event because the triggerTitleBarRepaint workaround no longer works
-        };
+    private void RootGrid_Loaded(object sender, RoutedEventArgs e)
+    {
+        NavigationOrientationHelper.UpdateNavigationViewForElement(NavigationOrientationHelper.IsLeftMode());
+        _settings = new UISettings();
+        _settings.ColorValuesChanged += _settings_ColorValuesChanged; // cannot use FrameworkElement.ActualThemeChanged event because the triggerTitleBarRepaint workaround no longer works
     }
 
-    private void Window_Activated(object sender, WindowActivatedEventArgs args)
+    private void SetWindowProperties()
     {
-        if (args.WindowActivationState == WindowActivationState.Deactivated)
-        {
-            VisualStateManager.GoToState(this, "Deactivated", true);
-        }
-        else
-        {
-            VisualStateManager.GoToState(this, "Activated", true);
-        }
+#if DEBUG
+        this.Title = "WinUI 3 Gallery Dev";
+        titleBar.Subtitle = "Dev";
+#else
+        this.Title = "WinUI 3 Gallery";
+#endif
+        this.ExtendsContentIntoTitleBar = true;
+        this.SetTitleBar(titleBar);
+        this.AppWindow.SetIcon("Assets/Tiles/GalleryIcon.ico");
+        this.AppWindow.TitleBar.PreferredHeightOption = TitleBarHeightOption.Tall;
+
+        // TO DO: replace this with the new MinWidth/MinHeight AppWindow APIs in 1.7 Stable
+        Win32WindowHelper win32WindowHelper = new Win32WindowHelper(this);
+        win32WindowHelper.SetWindowMinMaxSize(new Win32WindowHelper.POINT() { x = 640, y = 500 });
     }
 
     private void OnPaneDisplayModeChanged(NavigationView sender, NavigationViewDisplayModeChangedEventArgs args)
     {
         if (sender.PaneDisplayMode == NavigationViewPaneDisplayMode.Top)
         {
-            VisualStateManager.GoToState(this, "Top", true);
+            titleBar.IsPaneToggleButtonVisible = false;
         }
         else
         {
-            if (args.DisplayMode == NavigationViewDisplayMode.Minimal)
-            {
-                VisualStateManager.GoToState(this, "Compact", true);
-            }
-            else
-            {
-                VisualStateManager.GoToState(this, "Default", true);
-            }
+            titleBar.IsPaneToggleButtonVisible = true;
         }
     }
 
-    // this handles updating the caption button colors correctly when indows system theme is changed
+    /// <summary>
+    /// Gets the frame of the StartupWindow.
+    /// </summary>
+    /// <returns>The frame of the StartupWindow.</returns>
+    /// <exception cref="Exception">Thrown if the window doesn't have a frame with the name "rootFrame".</exception>
+    public Frame GetRootFrame()
+    {
+        SuspensionManager.RegisterFrame(rootFrame, "AppFrame");
+        rootFrame.Language = Windows.Globalization.ApplicationLanguages.Languages[0];
+        rootFrame.NavigationFailed += OnNavigationFailed;
+        return rootFrame;
+    }
+
+    /// <summary>
+    /// Invoked when Navigation to a certain page fails
+    /// </summary>
+    /// <param name="sender">The Frame which failed navigation</param>
+    /// <param name="e">Details about the navigation failure</param>
+    void OnNavigationFailed(object sender, NavigationFailedEventArgs e)
+    {
+        throw new Exception("Failed to load Page " + e.SourcePageType.FullName);
+    }
+    // this handles updating the caption button colors correctly when windows system theme is changed
     // while the app is open
     private void _settings_ColorValuesChanged(UISettings sender, object args)
     {
         // This calls comes off-thread, hence we will need to dispatch it to current app's thread
         dispatcherQueue.TryEnqueue(() =>
         {
-            _ = TitleBarHelper.ApplySystemThemeToCaptionButtons(App.StartupWindow);
+            _ = TitleBarHelper.ApplySystemThemeToCaptionButtons(this);
         });
     }
 
@@ -154,12 +118,7 @@ private void _settings_ColorValuesChanged(UISettings sender, object args)
     // Please call this function rather than rootFrame.Navigate to navigate the rootFrame.
     public void Navigate(Type pageType, object targetPageArguments = null, NavigationTransitionInfo navigationTransitionInfo = null)
     {
-        NavigationRootPageArgs args = new NavigationRootPageArgs
-        {
-            NavigationRootPage = this,
-            Parameter = targetPageArguments
-        };
-        rootFrame.Navigate(pageType, args, navigationTransitionInfo);
+        rootFrame.Navigate(pageType, targetPageArguments, navigationTransitionInfo);
     }
 
     public void EnsureNavigationSelection(string id)
@@ -202,7 +161,7 @@ public void EnsureNavigationSelection(string id)
         }
     }
 
-    private void AddNavigationMenuItems()
+    public void AddNavigationMenuItems()
     {
         foreach (var group in ControlInfoDataSource.Instance.Groups.OrderBy(i => i.Title).Where(i => !i.IsSpecialSection))
         {
@@ -257,21 +216,9 @@ private static IconElement GetIcon(string imagePath)
                     };
     }
 
-    private void SetDeviceFamily()
-    {
-        var familyName = AnalyticsInfo.VersionInfo.DeviceFamily;
-
-        if (!Enum.TryParse(familyName.Replace("Windows.", string.Empty), out DeviceType parsedDeviceType))
-        {
-            parsedDeviceType = DeviceType.Other;
-        }
-
-        DeviceFamily = parsedDeviceType;
-    }
-
     private void OnHomeMenuItemLoaded(object sender, RoutedEventArgs e)
     {
-        if ( NavigationViewControl.DisplayMode == NavigationViewDisplayMode.Expanded)
+        if (NavigationViewControl.DisplayMode == NavigationViewDisplayMode.Expanded)
         {
             controlsSearchBox.Focus(FocusState.Keyboard);
         }
@@ -616,18 +563,16 @@ private void WaitForDebuggerInvokerButton_Click(object sender, RoutedEventArgs e
 
     #endregion
 
-}
-
-public class NavigationRootPageArgs
-{
-    public NavigationRootPage NavigationRootPage;
-    public object Parameter;
-}
+    private void TitleBar_PaneToggleRequested(TitleBar sender, object args)
+    {
+        NavigationViewControl.IsPaneOpen = !NavigationViewControl.IsPaneOpen;
+    }
 
-public enum DeviceType
-{
-    Desktop,
-    Mobile,
-    Other,
-    Xbox
+    private void TitleBar_BackRequested(TitleBar sender, object args)
+    {
+        if (this.rootFrame.CanGoBack)
+        {
+            this.rootFrame.GoBack();
+        }
+    }
 }
diff --git a/WinUIGallery/Pages/AllControlsPage.xaml.cs b/WinUIGallery/Pages/AllControlsPage.xaml.cs
index 385a806fc..2e49597de 100644
--- a/WinUIGallery/Pages/AllControlsPage.xaml.cs
+++ b/WinUIGallery/Pages/AllControlsPage.xaml.cs
@@ -26,10 +26,10 @@ public AllControlsPage()
 
     protected override void OnNavigatedTo(NavigationEventArgs e)
     {
-        if (e.Parameter is NavigationRootPageArgs args && args.NavigationRootPage.NavigationView.MenuItems.OfType<NavigationViewItem>().FirstOrDefault(item => item.Name == "AllControlsItem") is NavigationViewItem item)
-        {
-            item.IsSelected = true;
-        }
+        //if (e.Parameter is NavigationRootPageArgs args && args.NavigationRootPage.NavigationView.MenuItems.OfType<NavigationViewItem>().FirstOrDefault(item => item.Name == "AllControlsItem") is NavigationViewItem item)
+        //{
+        //    item.IsSelected = true;
+        //}
 
         Items = ControlInfoDataSource.Instance.Groups.Where(g => !g.IsSpecialSection).SelectMany(g => g.Items).OrderBy(i => i.Title).ToList();
     }
diff --git a/WinUIGallery/Pages/HomePage.xaml b/WinUIGallery/Pages/HomePage.xaml
index 8cb8c570c..9f3877621 100644
--- a/WinUIGallery/Pages/HomePage.xaml
+++ b/WinUIGallery/Pages/HomePage.xaml
@@ -24,26 +24,6 @@
 
     <!--  This grid acts as a root panel for the page.  -->
     <Grid>
-        <VisualStateManager.VisualStateGroups>
-            <!--  Visual states reflect the application's window size  -->
-            <VisualStateGroup x:Name="LayoutVisualStates">
-                <VisualState x:Name="WideLayout">
-                    <VisualState.StateTriggers>
-                        <AdaptiveTrigger MinWindowWidth="{StaticResource Breakpoint640Plus}" />
-                    </VisualState.StateTriggers>
-                </VisualState>
-                <VisualState x:Name="NarrowLayout">
-                    <VisualState.StateTriggers>
-                        <AdaptiveTrigger MinWindowWidth="0" />
-                    </VisualState.StateTriggers>
-                    <VisualState.Setters>
-                        <Setter Target="learnMoreGrid.Margin" Value="16,36,0,36" />
-                        <Setter Target="itemGridView.Padding" Value="4,0,4,36" />
-                        <Setter Target="itemGridView.ItemContainerStyle" Value="{StaticResource IndentedGridViewItemStyleSmall}" />
-                    </VisualState.Setters>
-                </VisualState>
-            </VisualStateGroup>
-        </VisualStateManager.VisualStateGroups>
         <GridView
             x:Name="itemGridView"
             Padding="24,0,24,0"
@@ -106,5 +86,24 @@
                 </GroupStyle>
             </GridView.GroupStyle>
         </GridView>
+        <VisualStateManager.VisualStateGroups>
+            <!--  Visual states reflect the application's window size  -->
+            <VisualStateGroup x:Name="LayoutVisualStates">
+                <VisualState x:Name="WideLayout">
+                    <VisualState.StateTriggers>
+                        <AdaptiveTrigger MinWindowWidth="{StaticResource Breakpoint640Plus}" />
+                    </VisualState.StateTriggers>
+                </VisualState>
+                <VisualState x:Name="NarrowLayout">
+                    <VisualState.StateTriggers>
+                        <AdaptiveTrigger MinWindowWidth="0" />
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="itemGridView.Padding" Value="4,0,4,36" />
+                        <Setter Target="itemGridView.ItemContainerStyle" Value="{StaticResource IndentedGridViewItemStyleSmall}" />
+                    </VisualState.Setters>
+                </VisualState>
+            </VisualStateGroup>
+        </VisualStateManager.VisualStateGroups>
     </Grid>
 </local:ItemsPageBase>
diff --git a/WinUIGallery/Pages/HomePage.xaml.cs b/WinUIGallery/Pages/HomePage.xaml.cs
index dab0088c0..bdb4039f3 100644
--- a/WinUIGallery/Pages/HomePage.xaml.cs
+++ b/WinUIGallery/Pages/HomePage.xaml.cs
@@ -10,6 +10,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
+using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Navigation;
 using WinUIGallery.Helpers;
 
@@ -22,13 +23,11 @@ public HomePage()
         this.InitializeComponent();
     }
 
-    public string WinAppSdkDetails => App.WinAppSdkDetails;
+    public string WinAppSdkDetails => VersionHelper.WinAppSdkDetails;
 
     protected override void OnNavigatedTo(NavigationEventArgs e)
     {
-        NavigationRootPageArgs args = (NavigationRootPageArgs)e.Parameter;
-        var menuItem = (Microsoft.UI.Xaml.Controls.NavigationViewItem)args.NavigationRootPage.NavigationView.MenuItems.First();
-        menuItem.IsSelected = true;
+        ((NavigationViewItem)App.MainWindow.NavigationView.MenuItems.First()).IsSelected = true;
 
         Items = ControlInfoDataSource.Instance.Groups.SelectMany(g => g.Items.Where(i => i.BadgeString != null)).OrderBy(i => i.Title).ToList();
         itemsCVS.Source = FormatData();
diff --git a/WinUIGallery/Pages/ItemPage.xaml.cs b/WinUIGallery/Pages/ItemPage.xaml.cs
index a67b6f29e..695765923 100644
--- a/WinUIGallery/Pages/ItemPage.xaml.cs
+++ b/WinUIGallery/Pages/ItemPage.xaml.cs
@@ -44,45 +44,41 @@ public ItemPage()
 
     public void SetInitialVisuals()
     {
-        var navigationRootPage = NavigationRootPage.GetForElement(this);
-        if (navigationRootPage != null)
-        {
-            pageHeader.ToggleThemeAction = OnToggleTheme;
-            navigationRootPage.NavigationViewLoaded = OnNavigationViewLoaded;
-            
-            this.Focus(FocusState.Programmatic);
-        }
+        pageHeader.ToggleThemeAction = OnToggleTheme;
+        App.MainWindow.NavigationViewLoaded = OnNavigationViewLoaded;
+        this.Focus(FocusState.Programmatic);
     }
+
     private void OnNavigationViewLoaded()
     {
-        NavigationRootPage.GetForElement(this).EnsureNavigationSelection(this.Item.UniqueId);
+        App.MainWindow.EnsureNavigationSelection(this.Item.UniqueId);
     }
 
     protected override async void OnNavigatedTo(NavigationEventArgs e)
     {
-        NavigationRootPageArgs args = (NavigationRootPageArgs)e.Parameter;
-        var uniqueId = (string)args.Parameter;
-        var group = await ControlInfoDataSource.GetGroupFromItemAsync(uniqueId);
-        var item = group?.Items.FirstOrDefault(x => x.UniqueId.Equals(uniqueId));
-
-        if (item != null)
+        if (e.Parameter is string uniqueId)
         {
-            Item = item;
+            var group = await ControlInfoDataSource.GetGroupFromItemAsync(uniqueId);
+            var item = group?.Items.FirstOrDefault(x => x.UniqueId.Equals(uniqueId));
 
-            // Load control page into frame.
-            Type pageType = Type.GetType("WinUIGallery.ControlPages." + item.UniqueId + "Page");
-
-            if (pageType != null)
+            if (item != null)
             {
-                var pageName = string.IsNullOrEmpty(group.Folder) ? pageType.Name : $"{group.Folder}/{pageType.Name}";
-                pageHeader.SetControlSourceLink(WinUIBaseUrl, item.SourcePath);
-                pageHeader.SetSamplePageSourceLinks(GalleryBaseUrl, pageName);
-                System.Diagnostics.Debug.WriteLine(string.Format("[ItemPage] Navigate to {0}", pageType.ToString()));
-                this.contentFrame.Navigate(pageType);
+                Item = item;
+
+                // Load control page into frame.
+                Type pageType = Type.GetType("WinUIGallery.ControlPages." + item.UniqueId + "Page");
+
+                if (pageType != null)
+                {
+                    var pageName = string.IsNullOrEmpty(group.Folder) ? pageType.Name : $"{group.Folder}/{pageType.Name}";
+                    pageHeader.SetControlSourceLink(WinUIBaseUrl, item.SourcePath);
+                    pageHeader.SetSamplePageSourceLinks(GalleryBaseUrl, pageName);
+                    System.Diagnostics.Debug.WriteLine(string.Format("[ItemPage] Navigate to {0}", pageType.ToString()));
+                    this.contentFrame.Navigate(pageType);
+                }
+                App.MainWindow.EnsureNavigationSelection(item?.UniqueId);
             }
-            args.NavigationRootPage.EnsureNavigationSelection(item?.UniqueId);
         }
-
         base.OnNavigatedTo(e);
     }
 
@@ -94,16 +90,12 @@ protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
 
     protected override void OnNavigatedFrom(NavigationEventArgs e)
     {
-        var navigationRootPage = NavigationRootPage.GetForElement(this);
-        if (navigationRootPage != null)
-        {
-            navigationRootPage.NavigationViewLoaded = null;
-            pageHeader.ToggleThemeAction = null;
-            pageHeader.CopyLinkAction = null;
-        }
+        App.MainWindow.NavigationViewLoaded = null;
+        pageHeader.ToggleThemeAction = null;
+        pageHeader.CopyLinkAction = null;
 
-        // We use reflection to call the OnNavigatedFrom function the user leaves this page
-        // See this PR for more information: https://github.com/microsoft/WinUI-Gallery/pull/145
+        //// We use reflection to call the OnNavigatedFrom function the user leaves this page
+        //// See this PR for more information: https://github.com/microsoft/WinUI-Gallery/pull/145
         Frame contentFrameAsFrame = contentFrame as Frame;
         Page innerPage = contentFrameAsFrame.Content as Page;
         if (innerPage != null)
@@ -145,7 +137,7 @@ private void SetControlExamplesTheme(ElementTheme theme)
             {
                 controlExample.RequestedTheme = theme;
             }
-            if(controlExamples.Count() == 0)
+            if (controlExamples.Count() == 0)
             {
                 this.RequestedTheme = theme;
             }
diff --git a/WinUIGallery/Pages/ItemsPageBase.cs b/WinUIGallery/Pages/ItemsPageBase.cs
index 82f2cba20..5f328eb08 100644
--- a/WinUIGallery/Pages/ItemsPageBase.cs
+++ b/WinUIGallery/Pages/ItemsPageBase.cs
@@ -60,7 +60,7 @@ protected void OnItemGridViewItemClick(object sender, ItemClickEventArgs e)
 
         _itemId = item.UniqueId;
 
-        NavigationRootPage.GetForElement(this).Navigate(typeof(ItemPage), _itemId, new DrillInNavigationTransitionInfo());
+        App.MainWindow.Navigate(typeof(ItemPage), _itemId, new DrillInNavigationTransitionInfo());
     }
 
     protected void OnItemGridViewLoaded(object sender, RoutedEventArgs e)
diff --git a/WinUIGallery/Pages/SearchResultsPage.xaml.cs b/WinUIGallery/Pages/SearchResultsPage.xaml.cs
index 21b159fae..25028f703 100644
--- a/WinUIGallery/Pages/SearchResultsPage.xaml.cs
+++ b/WinUIGallery/Pages/SearchResultsPage.xaml.cs
@@ -44,10 +44,10 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
     {
         base.OnNavigatedTo(e);
 
-        NavigationRootPageArgs args = (NavigationRootPageArgs)e.Parameter;
-        var queryText = args.Parameter?.ToString().ToLower();
-
-        BuildFilterList(queryText);
+        if (e.Parameter is string queryText)
+        {
+            BuildFilterList(queryText);
+        }
     }
 
     protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
diff --git a/WinUIGallery/Pages/SectionPage.xaml.cs b/WinUIGallery/Pages/SectionPage.xaml.cs
index 254504121..30a0f98e7 100644
--- a/WinUIGallery/Pages/SectionPage.xaml.cs
+++ b/WinUIGallery/Pages/SectionPage.xaml.cs
@@ -8,6 +8,7 @@
 //
 //*********************************************************
 using System.Linq;
+using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Navigation;
 using WinUIGallery.Helpers;
 
@@ -27,14 +28,15 @@ public SectionPage()
     protected override async void OnNavigatedTo(NavigationEventArgs e)
     {
         base.OnNavigatedTo(e);
-        NavigationRootPageArgs args = (NavigationRootPageArgs)e.Parameter;
-        NavigationRootPage navigationRootPage = args.NavigationRootPage;
-        var group = await ControlInfoDataSource.GetGroupAsync((string)args.Parameter);
-   
-        var menuItem = (Microsoft.UI.Xaml.Controls.NavigationViewItemBase)navigationRootPage.NavigationView.MenuItems.Single(i => (string)((Microsoft.UI.Xaml.Controls.NavigationViewItemBase)i).Tag == group.UniqueId);
-        menuItem.IsSelected = true;
-        TitleTxt.Text = group.Title;
-        Items = group.Items.OrderBy(i => i.Title).ToList();
+
+        if (e.Parameter is string groupID)
+        {
+            var group = await ControlInfoDataSource.GetGroupAsync(groupID);
+
+            ((NavigationViewItemBase)App.MainWindow.NavigationView.MenuItems.Single(i => (string)((NavigationViewItemBase)i).Tag == group.UniqueId)).IsSelected = true;
+            TitleTxt.Text = group.Title;
+            Items = group.Items.OrderBy(i => i.Title).ToList();
+        }
     }
 
     protected override bool GetIsNarrowLayoutState()
diff --git a/WinUIGallery/Pages/SettingsPage.xaml.cs b/WinUIGallery/Pages/SettingsPage.xaml.cs
index 30c451f73..69649e476 100644
--- a/WinUIGallery/Pages/SettingsPage.xaml.cs
+++ b/WinUIGallery/Pages/SettingsPage.xaml.cs
@@ -32,7 +32,7 @@ public string Version
         }
     }
 
-    public string WinAppSdkRuntimeDetails => App.WinAppSdkRuntimeDetails;
+    public string WinAppSdkRuntimeDetails => VersionHelper.WinAppSdkRuntimeDetails;
     private int lastNavigationSelectionMode = 0;
 
     public SettingsPage()
@@ -62,19 +62,16 @@ private void OnSettingsPageLoaded(object sender, RoutedEventArgs e)
                 break;
         }
 
-        NavigationRootPage navigationRootPage = NavigationRootPage.GetForElement(this);
-        if (navigationRootPage != null)
+
+        if (App.MainWindow.NavigationView.PaneDisplayMode == NavigationViewPaneDisplayMode.Auto)
         {
-            if (navigationRootPage.NavigationView.PaneDisplayMode == NavigationViewPaneDisplayMode.Auto)
-            {
-                navigationLocation.SelectedIndex = 0;
-            }
-            else
-            {
-                navigationLocation.SelectedIndex = 1;
-            }
-            lastNavigationSelectionMode = navigationLocation.SelectedIndex;
+            navigationLocation.SelectedIndex = 0;
+        }
+        else
+        {
+            navigationLocation.SelectedIndex = 1;
         }
+        lastNavigationSelectionMode = navigationLocation.SelectedIndex;
 
         if (ElementSoundPlayer.State == ElementSoundPlayerState.On)
             soundToggle.IsOn = true;
@@ -89,7 +86,7 @@ private void themeMode_SelectionChanged(object sender, RoutedEventArgs e)
         string color;
         if (selectedTheme != null)
         {
-            ThemeHelper.RootTheme = App.GetEnum<ElementTheme>(selectedTheme);
+            ThemeHelper.RootTheme = EnumHelper.GetEnum<ElementTheme>(selectedTheme);
             if (selectedTheme == "Dark")
             {
                 TitleBarHelper.SetCaptionButtonColors(window, Colors.White);
@@ -102,7 +99,7 @@ private void themeMode_SelectionChanged(object sender, RoutedEventArgs e)
             }
             else
             {
-                color = TitleBarHelper.ApplySystemThemeToCaptionButtons(window) == Colors.White  ? "Dark" : "Light";
+                color = TitleBarHelper.ApplySystemThemeToCaptionButtons(window) == Colors.White ? "Dark" : "Light";
             }
             // announce visual change to automation
             UIHelper.AnnounceActionForAccessibility(sender as UIElement, $"Theme changed to {color}",
@@ -133,7 +130,7 @@ private void navigationLocation_SelectionChanged(object sender, SelectionChanged
         // need to check if this is an actual update
         if (navigationLocation.SelectedIndex != lastNavigationSelectionMode)
         {
-            NavigationOrientationHelper.IsLeftModeForElement(navigationLocation.SelectedIndex == 0, this);
+            NavigationOrientationHelper.IsLeftModeForElement(navigationLocation.SelectedIndex == 0);
             lastNavigationSelectionMode = navigationLocation.SelectedIndex;
         }
     }
@@ -152,7 +149,7 @@ private void spatialSoundBox_Toggled(object sender, RoutedEventArgs e)
 
     private void soundPageHyperlink_Click(object sender, RoutedEventArgs e)
     {
-        this.Frame.Navigate(typeof(ItemPage), new NavigationRootPageArgs() { Parameter = "Sound", NavigationRootPage = NavigationRootPage.GetForElement(this) });
+        App.MainWindow.Navigate(typeof(ItemPage), "Sound");
     }
 
     private void toCloneRepoCard_Click(object sender, RoutedEventArgs e)
diff --git a/WinUIGallery/Samples/ControlPages/BorderPage.xaml b/WinUIGallery/Samples/ControlPages/BorderPage.xaml
index bb2c99009..13e7cadac 100644
--- a/WinUIGallery/Samples/ControlPages/BorderPage.xaml
+++ b/WinUIGallery/Samples/ControlPages/BorderPage.xaml
@@ -13,7 +13,6 @@
     x:Class="WinUIGallery.ControlPages.BorderPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:common="using:WinUIGallery.Common"
     xmlns:controls="using:WinUIGallery.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/WinUIGallery/Samples/ControlPages/CanvasPage.xaml b/WinUIGallery/Samples/ControlPages/CanvasPage.xaml
index e5d0f60ab..eee00b352 100644
--- a/WinUIGallery/Samples/ControlPages/CanvasPage.xaml
+++ b/WinUIGallery/Samples/ControlPages/CanvasPage.xaml
@@ -13,7 +13,6 @@
     x:Class="WinUIGallery.ControlPages.CanvasPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:common="using:WinUIGallery.Common"
     xmlns:controls="using:WinUIGallery.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/WinUIGallery/Samples/ControlPages/CreateMultipleWindowsPage.xaml b/WinUIGallery/Samples/ControlPages/CreateMultipleWindowsPage.xaml
index dadc493c2..d8a561407 100644
--- a/WinUIGallery/Samples/ControlPages/CreateMultipleWindowsPage.xaml
+++ b/WinUIGallery/Samples/ControlPages/CreateMultipleWindowsPage.xaml
@@ -15,7 +15,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:WinUIGallery.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:data="using:WinUIGallery.Data"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
diff --git a/WinUIGallery/Samples/ControlPages/CreateMultipleWindowsPage.xaml.cs b/WinUIGallery/Samples/ControlPages/CreateMultipleWindowsPage.xaml.cs
index 6bc0a3ffd..2431a7d3b 100644
--- a/WinUIGallery/Samples/ControlPages/CreateMultipleWindowsPage.xaml.cs
+++ b/WinUIGallery/Samples/ControlPages/CreateMultipleWindowsPage.xaml.cs
@@ -23,14 +23,11 @@ public CreateMultipleWindowsPage()
 
     private void createNewWindow_Click(object sender, RoutedEventArgs e)
     {
-        var newWindow = WindowHelper.CreateWindow();
-        var rootPage = new NavigationRootPage();
-        rootPage.RequestedTheme = ThemeHelper.RootTheme;
-        newWindow.Content = rootPage;
+        var newWindow = new MainWindow();
         newWindow.Activate();
 
         var targetPageType = typeof(HomePage);
         string targetPageArguments = string.Empty;
-        rootPage.Navigate(targetPageType, targetPageArguments);
+        newWindow.Navigate(targetPageType, targetPageArguments);
     }
 }
diff --git a/WinUIGallery/Samples/ControlPages/DropDownButtonPage.xaml b/WinUIGallery/Samples/ControlPages/DropDownButtonPage.xaml
index 2938d7f0b..426c9498c 100644
--- a/WinUIGallery/Samples/ControlPages/DropDownButtonPage.xaml
+++ b/WinUIGallery/Samples/ControlPages/DropDownButtonPage.xaml
@@ -2,10 +2,8 @@
     x:Class="WinUIGallery.ControlPages.DropDownButtonPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:common="using:WinUIGallery.Common"
     xmlns:controls="using:WinUIGallery.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:data="using:WinUIGallery.Data"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
diff --git a/WinUIGallery/Samples/ControlPages/Fundamentals/XamlResourcesPage.xaml.cs b/WinUIGallery/Samples/ControlPages/Fundamentals/XamlResourcesPage.xaml.cs
index 8bca2ed8f..27159eb97 100644
--- a/WinUIGallery/Samples/ControlPages/Fundamentals/XamlResourcesPage.xaml.cs
+++ b/WinUIGallery/Samples/ControlPages/Fundamentals/XamlResourcesPage.xaml.cs
@@ -12,6 +12,6 @@ public XamlResourcesPage()
 
     private void Hyperlink_Click(Microsoft.UI.Xaml.Documents.Hyperlink sender, Microsoft.UI.Xaml.Documents.HyperlinkClickEventArgs args)
     {
-        NavigationRootPage.GetForElement(this).Navigate(typeof(ItemPage), "Color");
+        App.MainWindow.Navigate(typeof(ItemPage), "Color");
     }
 }
diff --git a/WinUIGallery/Samples/ControlPages/GridPage.xaml b/WinUIGallery/Samples/ControlPages/GridPage.xaml
index 17245b860..27ec0269e 100644
--- a/WinUIGallery/Samples/ControlPages/GridPage.xaml
+++ b/WinUIGallery/Samples/ControlPages/GridPage.xaml
@@ -13,7 +13,6 @@
     x:Class="WinUIGallery.ControlPages.GridPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:common="using:WinUIGallery.Common"
     xmlns:controls="using:WinUIGallery.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/WinUIGallery/Samples/ControlPages/HyperlinkButtonPage.xaml.cs b/WinUIGallery/Samples/ControlPages/HyperlinkButtonPage.xaml.cs
index d666718b9..4247f18ef 100644
--- a/WinUIGallery/Samples/ControlPages/HyperlinkButtonPage.xaml.cs
+++ b/WinUIGallery/Samples/ControlPages/HyperlinkButtonPage.xaml.cs
@@ -22,6 +22,6 @@ public HyperlinkButtonPage()
 
     private void GoToHyperlinkButton_Click(object sender, RoutedEventArgs e)
     {
-        NavigationRootPage.GetForElement(this).Navigate(typeof(ItemPage), "ToggleButton");
+       App.MainWindow.Navigate(typeof(ItemPage), "ToggleButton");
     }
 }
diff --git a/WinUIGallery/Samples/ControlPages/LinePage.xaml b/WinUIGallery/Samples/ControlPages/LinePage.xaml
index c4cae3d64..d7576ce36 100644
--- a/WinUIGallery/Samples/ControlPages/LinePage.xaml
+++ b/WinUIGallery/Samples/ControlPages/LinePage.xaml
@@ -15,7 +15,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:WinUIGallery.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:data="using:WinUIGallery.Data"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:wuxdata="using:Microsoft.UI.Xaml.Data"
     mc:Ignorable="d">
diff --git a/WinUIGallery/Samples/ControlPages/MenuBarPage.xaml b/WinUIGallery/Samples/ControlPages/MenuBarPage.xaml
index ea4d6416a..5aca25c32 100644
--- a/WinUIGallery/Samples/ControlPages/MenuBarPage.xaml
+++ b/WinUIGallery/Samples/ControlPages/MenuBarPage.xaml
@@ -2,10 +2,8 @@
     x:Class="WinUIGallery.ControlPages.MenuBarPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:common="using:WinUIGallery.Common"
     xmlns:controls="using:WinUIGallery.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:data="using:WinUIGallery.Data"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
     <StackPanel>
diff --git a/WinUIGallery/Samples/ControlPages/ShapePage.xaml b/WinUIGallery/Samples/ControlPages/ShapePage.xaml
index 9fefcc5bd..a1e8cf137 100644
--- a/WinUIGallery/Samples/ControlPages/ShapePage.xaml
+++ b/WinUIGallery/Samples/ControlPages/ShapePage.xaml
@@ -15,14 +15,11 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:WinUIGallery.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:data="using:WinUIGallery.Data"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:wuxdata="using:Microsoft.UI.Xaml.Data"
     mc:Ignorable="d">
 
     <StackPanel>
-
-
         <!--  ELLIPSE SAMPLE  -->
         <controls:ControlExample x:Name="Example1" HeaderText="Ellipse">
 
diff --git a/WinUIGallery/Samples/ControlPages/TimePickerPage.xaml b/WinUIGallery/Samples/ControlPages/TimePickerPage.xaml
index f478a1fb7..e96e367c5 100644
--- a/WinUIGallery/Samples/ControlPages/TimePickerPage.xaml
+++ b/WinUIGallery/Samples/ControlPages/TimePickerPage.xaml
@@ -13,7 +13,6 @@
     x:Class="WinUIGallery.ControlPages.TimePickerPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:common="using:WinUIGallery.Common"
     xmlns:controls="using:WinUIGallery.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/WinUIGallery/Samples/ControlPages/TitleBarPage.xaml b/WinUIGallery/Samples/ControlPages/TitleBarPage.xaml
index 88339cb42..5889b5821 100644
--- a/WinUIGallery/Samples/ControlPages/TitleBarPage.xaml
+++ b/WinUIGallery/Samples/ControlPages/TitleBarPage.xaml
@@ -19,234 +19,158 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:wuxdata="using:Microsoft.UI.Xaml.Data"
     mc:Ignorable="d">
+    <StackPanel Margin="0,12,0,0">
+        <RichTextBlock>
+            <Paragraph>
+                <Run>To fully customize the title bar area without using the TitleBar control, visit</Run>
+                <Hyperlink NavigateUri="https://learn.microsoft.com/windows/apps/develop/data-binding/data-binding-in-depth#xbind-and-binding-feature-comparison">Microsoft Learn</Hyperlink>
+                <Run>.</Run>
+            </Paragraph>
+        </RichTextBlock>
 
-    <Page.Resources>
-        <x:Double x:Key="SwatchSize">32</x:Double>
-    </Page.Resources>
-
-    <StackPanel>
-        <InfoBar
-            Margin="0,12"
-            IsClosable="False"
-            IsOpen="True">
-            <TextBlock>
-                TitleBar control is now available in <Hyperlink NavigateUri="https://learn.microsoft.com/windows/apps/windows-app-sdk/experimental-channel#required-c-project-changes-for-16-experimental1">Experimental</Hyperlink>
-                !
-                Preview samples for TitleBar at <Hyperlink NavigateUri="https://github.com/microsoft/WinUI-Gallery/blob/feature/TitleBarExperimental/WinUIGallery/ControlPages/TitleBarPage.xaml">feature/TitleBarExperimental</Hyperlink>
-            </TextBlock>
-
-        </InfoBar>
-
-
-
-        <controls:ControlExample CSharpSource="Window\TitleBar\TitleBarSample2.txt" HeaderText="Default titlebar (when no user defined titlebar is set)">
-            <controls:ControlExample.Example>
-                <StackPanel Orientation="Vertical" Spacing="10">
-                    <TextBlock TextWrapping="WrapWholeWords">
-                        WinUI provides a default titlebar in such cases where the user doesn't explicitly provide a uielement, for setting the titlebar. The system titlebar (Windows-provided titlebar) disappears and client area content is extended to non client area.
-                        In this default case, entire non client region (titlebar region) get system titlebar behaviors like drag regions, system menu on context click etc.<LineBreak />
-                        This is the recommended way of using TitleBar apis and covers most common scenarios.<LineBreak />
-                        It can be applied by just calling ExtendsContentIntoTitleBar api. This internally calls SetTitleBar api with null argument and provides the default case.<LineBreak />
-                        Use the button below to toggle between system titlebar and default custom titlebar.</TextBlock>
-                    <StackPanel
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Top"
-                        Orientation="Horizontal"
-                        Spacing="20">
-                        <Button x:Name="defaultTitleBar" Click="defaultTitleBar_Click" />
-                    </StackPanel>
-                </StackPanel>
-            </controls:ControlExample.Example>
-        </controls:ControlExample>
-        <controls:ControlExample CSharpSource="Window/TitleBar/TitleBarSample1.txt" HeaderText="User defined UIElement as custom titlebar for the window">
+        <controls:ControlExample HorizontalContentAlignment="Stretch" HeaderText="TitleBar configuration">
             <controls:ControlExample.Example>
-                <StackPanel Orientation="Vertical" Spacing="10">
-                    <TextBlock TextWrapping="WrapWholeWords">
-                        For finer controls, a user can set a top-level UIElement (defined as appTitleBar here) as titlebar for the window. The system titlebar disappears and the chosen uielement starts acting like the titlebar (gets all system titlebar behavior).<LineBreak />
-                        The Background and Foreground Color dropdowns set the foreground and background of titlebar and caption buttons respectively.<LineBreak />
-                        Use the button below to toggle between system titlebar and custom WinUI titlebar.</TextBlock>
-                    <StackPanel
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Top"
-                        Orientation="Horizontal"
-                        Spacing="10">
-                        <Button x:Name="customTitleBar" Click="customTitleBar_Click" />
-                        <TextBlock>Background Color</TextBlock>
-                        <SplitButton
-                            x:Name="myBgColorButton"
-                            MinWidth="0"
-                            MinHeight="0"
-                            Padding="0"
-                            VerticalAlignment="Top"
-                            AutomationProperties.Name="Background color">
-                            <Border
-                                x:Name="BackgroundColorElement"
-                                Width="{StaticResource SwatchSize}"
-                                Height="{StaticResource SwatchSize}"
-                                Margin="0"
-                                Background="Transparent"
-                                CornerRadius="4,0,0,4" />
-                            <SplitButton.Flyout>
-                                <Flyout Placement="Auto">
-                                    <GridView IsItemClickEnabled="True" ItemClick="BgGridView_ItemClick">
-                                        <GridView.ItemsPanel>
-                                            <ItemsPanelTemplate>
-                                                <ItemsWrapGrid MaximumRowsOrColumns="3" Orientation="Horizontal" />
-                                            </ItemsPanelTemplate>
-                                        </GridView.ItemsPanel>
-                                        <GridView.Resources>
-                                            <Style TargetType="Rectangle">
-                                                <Setter Property="Width" Value="{StaticResource SwatchSize}" />
-                                                <Setter Property="Height" Value="{StaticResource SwatchSize}" />
-                                                <Setter Property="RadiusX" Value="4" />
-                                                <Setter Property="RadiusY" Value="4" />
-                                            </Style>
-                                        </GridView.Resources>
-                                        <GridView.Items>
-                                            <Rectangle AutomationProperties.Name="Transparent" Fill="Transparent" />
-                                            <Rectangle AutomationProperties.Name="Red" Fill="Red" />
-                                            <Rectangle AutomationProperties.Name="Orange" Fill="Orange" />
-                                            <Rectangle AutomationProperties.Name="Yellow" Fill="Yellow" />
-                                            <Rectangle AutomationProperties.Name="Green" Fill="Green" />
-                                            <Rectangle AutomationProperties.Name="Blue" Fill="Blue" />
-                                            <Rectangle AutomationProperties.Name="White" Fill="White" />
-                                            <Rectangle AutomationProperties.Name="Black" Fill="Black" />
-                                        </GridView.Items>
-                                    </GridView>
-
-                                </Flyout>
-                            </SplitButton.Flyout>
-                        </SplitButton>
-
-                        <TextBlock>Foreground Color</TextBlock>
-                        <SplitButton
-                            x:Name="myFgColorButton"
-                            MinWidth="0"
-                            MinHeight="0"
-                            Padding="0"
-                            VerticalAlignment="Top"
-                            AutomationProperties.Name="Foreground color">
-                            <Border
-                                x:Name="ForegroundColorElement"
-                                Width="{StaticResource SwatchSize}"
-                                Height="{StaticResource SwatchSize}"
-                                Margin="0"
-                                Background="Transparent"
-                                CornerRadius="4,0,0,4" />
-                            <SplitButton.Flyout>
-                                <Flyout Placement="Auto">
-                                    <GridView IsItemClickEnabled="True" ItemClick="FgGridView_ItemClick">
-                                        <GridView.ItemsPanel>
-                                            <ItemsPanelTemplate>
-                                                <ItemsWrapGrid MaximumRowsOrColumns="3" Orientation="Horizontal" />
-                                            </ItemsPanelTemplate>
-                                        </GridView.ItemsPanel>
-                                        <GridView.Resources>
-                                            <Style TargetType="Rectangle">
-                                                <Setter Property="Width" Value="{StaticResource SwatchSize}" />
-                                                <Setter Property="Height" Value="{StaticResource SwatchSize}" />
-                                                <Setter Property="RadiusX" Value="4" />
-                                                <Setter Property="RadiusY" Value="4" />
-                                            </Style>
-                                        </GridView.Resources>
-                                        <GridView.Items>
-                                            <Rectangle AutomationProperties.Name="Transparent" Fill="Transparent" />
-                                            <Rectangle AutomationProperties.Name="Red" Fill="Red" />
-                                            <Rectangle AutomationProperties.Name="Orange" Fill="Orange" />
-                                            <Rectangle AutomationProperties.Name="Yellow" Fill="Yellow" />
-                                            <Rectangle AutomationProperties.Name="Green" Fill="Green" />
-                                            <Rectangle AutomationProperties.Name="Blue" Fill="Blue" />
-                                            <Rectangle AutomationProperties.Name="White" Fill="White" />
-                                            <Rectangle AutomationProperties.Name="Black" Fill="Black" />
-                                        </GridView.Items>
-                                    </GridView>
-
-                                </Flyout>
-                            </SplitButton.Flyout>
-                        </SplitButton>
+                <Grid
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Center"
+                    Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                    BorderBrush="{ThemeResource SurfaceStrokeColorDefaultBrush}"
+                    BorderThickness="1"
+                    CornerRadius="{StaticResource OverlayCornerRadius}">
+                    <TitleBar
+                        Title="{Binding ElementName=TitleBox, Path=Text, Mode=OneWay}"
+                        IsBackButtonVisible="{Binding ElementName=BackButtonToggle, Path=IsOn, Mode=OneWay}"
+                        IsPaneToggleButtonVisible="{Binding ElementName=PaneToggle, Path=IsOn, Mode=OneWay}"
+                        Subtitle="{Binding ElementName=SubtitleBox, Path=Text, Mode=OneWay}">
+                        <TitleBar.IconSource>
+                            <ImageIconSource ImageSource="/Assets/Tiles/GalleryIcon.ico" />
+                        </TitleBar.IconSource>
+                        <TitleBar.RightContent>
+                            <PersonPicture
+                                Width="30"
+                                Height="30"
+                                Initials="JD" />
+                        </TitleBar.RightContent>
+                        <TitleBar.CenterContent>
+                            <AutoSuggestBox
+                                Width="360"
+                                VerticalAlignment="Center"
+                                PlaceholderText="Search.."
+                                QueryIcon="Find" />
+                        </TitleBar.CenterContent>
+                    </TitleBar>
+                </Grid>
 
-                    </StackPanel>
-                </StackPanel>
             </controls:ControlExample.Example>
+            <controls:ControlExample.Options>
+                <StackPanel
+                    Width="240"
+                    Orientation="Vertical"
+                    Spacing="12">
+                    <TextBox
+                        x:Name="TitleBox"
+                        Header="Title"
+                        Text="WinUI Gallery" />
+                    <TextBox
+                        x:Name="SubtitleBox"
+                        Header="Subtitle"
+                        Text="Preview" />
+                    <ToggleSwitch
+                        x:Name="BackButtonToggle"
+                        Header="IsBackButtonVisible"
+                        IsOn="False" />
+                    <ToggleSwitch
+                        x:Name="PaneToggle"
+                        Header="IsPaneToggleButtonVisible"
+                        IsOn="False" />
+                </StackPanel>
+            </controls:ControlExample.Options>
             <controls:ControlExample.Xaml>
                 <x:String xml:space="preserve">
-&lt;!--UIElement set as titlebar--&gt;
-&lt;Border x:Name="AppTitleBar" Grid.Column="1" VerticalAlignment="Top"&gt;
-    &lt;TextBlock x:Name="AppTitle" Text="{StaticResource AppTitleName}" VerticalAlignment="Top" Margin="0,8,0,0" /&gt;
-&lt;/Border&gt;
-            </x:String>
+&lt;TitleBar
+    Title="$(Title)"
+    Subtitle=""$(Subtitle)"
+    IsBackButtonVisible="$(BackButtonVisibility)"
+    IsPaneToggleButtonVisible="$(PaneToggleVisibility)"&gt;
+    &lt;TitleBar.IconSource&gt;
+        &lt;ImageIconSource ImageSource="/Assets/Tiles/GalleryIcon.ico" /&gt;
+    &lt;/TitleBar.IconSource&gt;
+    &lt;TitleBar.CenterContent&gt;
+        &lt;AutoSuggestBox
+            Width="360"
+            VerticalAlignment="Center"
+            PlaceholderText="Search.."
+            QueryIcon="Find" /&gt;
+    &lt;/TitleBar.CenterContent&gt;
+    &lt;TitleBar.RightContent&gt;
+        &lt;PersonPicture
+            Width="30"
+            Height="30"
+            Initials="JD" /&gt;
+    &lt;/TitleBar.RightContent&gt;
+&lt;/TitleBar&gt;
+                </x:String>
             </controls:ControlExample.Xaml>
+            <controls:ControlExample.Substitutions>
+                <controls:ControlExampleSubstitution Key="Title" Value="{x:Bind TitleBox.Text, Mode=OneWay}" />
+                <controls:ControlExampleSubstitution Key="Subtitle" Value="{x:Bind SubtitleBox.Text, Mode=OneWay}" />
+                <controls:ControlExampleSubstitution Key="BackButtonVisibility" Value="{x:Bind BackButtonToggle.IsOn, Mode=OneWay}" />
+                <controls:ControlExampleSubstitution Key="PaneToggleVisibility" Value="{x:Bind PaneToggle.IsOn, Mode=OneWay}" />
+            </controls:ControlExample.Substitutions>
         </controls:ControlExample>
-        <controls:ControlExample HeaderText="Titlebar Customizations : Titlebar height">
+
+        <controls:ControlExample HorizontalContentAlignment="Stretch" HeaderText="End to end TitleBar sample">
             <controls:ControlExample.Example>
-                <StackPanel Orientation="Vertical" Spacing="10">
-                    <TextBlock TextWrapping="Wrap">
-                        WinUI custom titlebar supports setting a custom height by configuring the PreferredHeightOption property of the titlebar. This feature is useful when you need to adjust the titlebar height to match your app's design or accommodate additional content.
-                    </TextBlock>
-                    <InfoBar
-                        IsClosable="false"
-                        IsOpen="true"
-                        Severity="Warning">
-                        <TextBlock>
-                            This option will be invalid when the style of titlebar is reset to system titlebar!
-                        </TextBlock>
-                    </InfoBar>
-                    <StackPanel>
-                        <ComboBox
-                            x:Name="titlebarHeight"
-                            Header="Set titlebar height"
-                            SelectedIndex="0"
-                            SelectionChanged="TitleBarHeightComboBox_SelectionChanged">
-                            <x:String>Tall</x:String>
-                            <x:String>Standard</x:String>
-                            <x:String>Collapsed</x:String>
-                        </ComboBox>
-                    </StackPanel>
+                <StackPanel
+                    MaxWidth="560"
+                    Orientation="Vertical"
+                    Spacing="12">
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        Text="Click the button below to see an end to end sample of a TitleBar in an new window, binding some of its properties to the NavigationView and navigation frame."
+                        TextAlignment="Center"
+                        TextWrapping="WrapWholeWords" />
+                    <Button
+                        HorizontalAlignment="Center"
+                        Click="CreateTitleBarWindowClick"
+                        Content="Show sample window"
+                        Style="{StaticResource AccentButtonStyle}" />
                 </StackPanel>
             </controls:ControlExample.Example>
-            <controls:ControlExample.CSharp>
+            <controls:ControlExample.Xaml>
                 <x:String xml:space="preserve">
-// Retrieve the main window and extend its content into the title bar for custom styling.
-Window window = App.MainWindow;
-window.ExtendsContentIntoTitleBar = true;
+&lt;Grid&gt;
+    &lt;Grid.RowDefinitions&gt;
+        &lt;RowDefinition Height=&quot;Auto&quot; /&gt;
+        &lt;!--  TitleBar  --&gt;
+        &lt;RowDefinition Height=&quot;*&quot; /&gt;
+        &lt;!--  NavigationView  --&gt;
+    &lt;/Grid.RowDefinitions&gt;
 
-// Set the preferred height option for the title bar
-window.AppWindow.TitleBar.PreferredHeightOption = TitleBarHeightOption.$(TitleBarHeightOption);
+    &lt;TitleBar
+        x:Name=&quot;titleBar&quot;
+        BackRequested=&quot;TitleBar_BackRequested&quot;
+        IsBackButtonVisible=&quot;{x:Bind navFrame.CanGoBack, Mode=OneWay}&quot;
+        IsPaneToggleButtonVisible=&quot;True&quot;
+        PaneToggleRequested=&quot;TitleBar_PaneToggleRequested&quot; /&gt;
+
+    &lt;NavigationView
+        x:Name=&quot;navView&quot;
+        Grid.Row=&quot;1&quot;
+        IsBackButtonVisible=&quot;Collapsed&quot;
+        IsPaneToggleButtonVisible=&quot;False&quot;&gt;
+        &lt;NavigationView.MenuItems... /&gt;
+        &lt;Frame x:Name=&quot;navFrame&quot; /&gt;
+    &lt;/NavigationView&gt;
+&lt;/Grid&gt;
+                    </x:String>
+            </controls:ControlExample.Xaml>
+            <controls:ControlExample.CSharp>
+                <x:String xml:space="preserve">
+  this.ExtendsContentIntoTitleBar = true; // Extend the content into the title bar and hide the default titlebar
+  this.SetTitleBar(titleBar); // Set the custom title bar
                 </x:String>
             </controls:ControlExample.CSharp>
-            <controls:ControlExample.Substitutions>
-                <controls:ControlExampleSubstitution Key="TitleBarHeightOption" Value="{x:Bind titlebarHeight.SelectedItem, Mode=OneWay}" />
-            </controls:ControlExample.Substitutions>
         </controls:ControlExample>
-        <controls:ControlExample CSharpSource="Window\TitleBar\TitleBarSample3.txt" HeaderText="Titlebar Customizations : Interactive controls in Titlebar (non client) area">
-            <controls:ControlExample.Example>
-                <StackPanel Orientation="Vertical" Spacing="10">
-                    <TextBlock TextWrapping="WrapWholeWords">
-                        WinUI custom titlebar now hosting interactive clickable controls within non client region of the window, when using custom titlebar.<LineBreak />
-                        This is achieved by using lower level <Hyperlink NavigateUri="https://learn.microsoft.com/windows/windows-app-sdk/api/winrt/microsoft.ui.windowing.appwindowtitlebar">
-                            Microsoft.UI.AppWindowTitlebar
-                        </Hyperlink>
-                        and <Hyperlink NavigateUri="https://learn.microsoft.com/windows/windows-app-sdk/api/winrt/microsoft.ui.input.inputnonclientpointersource">Microsoft.UI.Input.InputNonClientPointerSource</Hyperlink>
-                        <Italic>apis</Italic>
-                        <LineBreak />
-                        <LineBreak />
-                        WinUI allows<Bold>mix and match</Bold>
-                        of higher level WinUI custom titlebar apis with lower level AppWindow and InputNonClientPointerSource apis for most cases.
-                        One exception is one should not use<Italic>Window.SetTitlebar</Italic>
-                        api along with any lower level api which also sets drag regions as it can result in unexpected behavior.
-                        If needed, set<Italic>Window.SetTitlebar</Italic>
-                        to null (default case) and proceed to use lower level apis for drag functionality.<LineBreak />
-                        Use the button below to toggle between system titlebar and default custom titlebar.</TextBlock>
-                    <StackPanel
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Top"
-                        Orientation="Horizontal"
-                        Spacing="20">
-                        <Button x:Name="addInteractiveElements" Click="AddInteractiveElements_Click">Add interactive control to titlebar</Button>
-                    </StackPanel>
-                </StackPanel>
-            </controls:ControlExample.Example>
-        </controls:ControlExample>
-
     </StackPanel>
 </Page>
diff --git a/WinUIGallery/Samples/ControlPages/TitleBarPage.xaml.cs b/WinUIGallery/Samples/ControlPages/TitleBarPage.xaml.cs
index 52492b70e..5a576b881 100644
--- a/WinUIGallery/Samples/ControlPages/TitleBarPage.xaml.cs
+++ b/WinUIGallery/Samples/ControlPages/TitleBarPage.xaml.cs
@@ -7,238 +7,22 @@
 // PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.
 //
 //*********************************************************
-using WinUIGallery.Helpers;
-using Microsoft.UI;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Shapes;
-using System.Threading.Tasks;
-using Microsoft.UI.Windowing;
-using Microsoft.UI.Xaml.Navigation;
-using Microsoft.UI.Input;
-using Windows.Foundation;
-using System;
+using WinUIGallery.Samples.SamplePages;
 
 namespace WinUIGallery.ControlPages;
 
 public sealed partial class TitleBarPage : Page
 {
-    private Windows.UI.Color currentBgColor = Colors.Transparent;
-    private Windows.UI.Color currentFgColor = ThemeHelper.ActualTheme == ElementTheme.Dark ? Colors.White : Colors.Black;
-    private bool sizeChangedEventHandlerAdded = false;
-
     public TitleBarPage()
     {
         this.InitializeComponent();
-        Loaded += (object sender, RoutedEventArgs e) =>
-        {
-            (sender as TitleBarPage).UpdateTitleBarColor();
-            UpdateButtonText();
-        };
-    }
-
-    protected override void OnNavigatedFrom(NavigationEventArgs e)
-    {
-        ResetTitlebarSettings();
-    }
-
-    private void SetTitleBar(bool forceCustomTitlebar = false)
-    {
-        var window = WindowHelper.GetWindowForElement(this as UIElement);
-        var titleBarElement = UIHelper.FindElementByName(this as UIElement, "AppTitleBar");
-        if (forceCustomTitlebar || !window.ExtendsContentIntoTitleBar)
-        {
-            titleBarElement.Visibility = Visibility.Visible;
-            window.ExtendsContentIntoTitleBar = true;
-            window.SetTitleBar(titleBarElement);
-            TitleBarHelper.SetCaptionButtonBackgroundColors(window, Colors.Transparent);
-        }
-        else
-        {
-            titleBarElement.Visibility = Visibility.Collapsed;
-            window.ExtendsContentIntoTitleBar = false;
-            TitleBarHelper.SetCaptionButtonBackgroundColors(window, null);
-        }
-        UpdateButtonText();
-        UpdateTitleBarColor();
-    }
-
-    private void ResetTitlebarSettings()
-    {
-        var window = WindowHelper.GetWindowForElement(this as UIElement);
-        SetTitleBar(forceCustomTitlebar: true);
-        ClearClickThruRegions();
-        var txtBoxNonClientArea = UIHelper.FindElementByName(this as UIElement, "AppTitleBarTextBox") as FrameworkElement;
-        txtBoxNonClientArea.Visibility = Visibility.Collapsed;
-        addInteractiveElements.Content = "Add interactive control to titlebar";
-    }
-
-    private void SetClickThruRegions(Windows.Graphics.RectInt32[] rects)
-    {
-        var window = WindowHelper.GetWindowForElement(this as UIElement);
-        var nonClientInputSrc = InputNonClientPointerSource.GetForWindowId(window.AppWindow.Id);
-        nonClientInputSrc.SetRegionRects(NonClientRegionKind.Passthrough, rects);
-    }
-
-    private void ClearClickThruRegions()
-    {
-        var window = WindowHelper.GetWindowForElement(this as UIElement);
-        var noninputsrc = InputNonClientPointerSource.GetForWindowId(window.AppWindow.Id);
-        noninputsrc.ClearRegionRects(NonClientRegionKind.Passthrough);
-    }
-
-    public void UpdateButtonText()
-    {
-        var window = WindowHelper.GetWindowForElement(this as UIElement);
-
-        if (window.ExtendsContentIntoTitleBar)
-        {
-            customTitleBar.Content = "Reset to System TitleBar";
-            defaultTitleBar.Content = "Reset to System TitleBar";
-        }
-        else
-        {
-            customTitleBar.Content = "Set Custom TitleBar";
-            defaultTitleBar.Content = "Set Default Custom TitleBar";
-        }
-
     }
 
-    private void BgGridView_ItemClick(object sender, ItemClickEventArgs e)
+    private void CreateTitleBarWindowClick(object sender, RoutedEventArgs e)
     {
-        var rect = (Rectangle)e.ClickedItem;
-        var color = ((SolidColorBrush)rect.Fill).Color;
-        BackgroundColorElement.Background = new SolidColorBrush(color);
-
-        currentBgColor = color;
-        UpdateTitleBarColor();
-
-        // Delay required to circumvent GridView bug: https://github.com/microsoft/microsoft-ui-xaml/issues/6350
-        Task.Delay(10).ContinueWith(_ => myBgColorButton.Flyout.Hide(), TaskScheduler.FromCurrentSynchronizationContext());
+        TitleBarWindow titleBarWindow = new TitleBarWindow();
+        titleBarWindow.Activate();
     }
-
-    private void FgGridView_ItemClick(object sender, ItemClickEventArgs e)
-    {
-        var rect = (Rectangle)e.ClickedItem;
-        var color = ((SolidColorBrush)rect.Fill).Color;
-
-        ForegroundColorElement.Background = new SolidColorBrush(color);
-
-        currentFgColor = color;
-        UpdateTitleBarColor();
-
-        // Delay required to circumvent GridView bug: https://github.com/microsoft/microsoft-ui-xaml/issues/6350
-        Task.Delay(10).ContinueWith(_ => myFgColorButton.Flyout.Hide(), TaskScheduler.FromCurrentSynchronizationContext());
-    }
-
-
-    public void UpdateTitleBarColor()
-    {
-        var window = WindowHelper.GetWindowForElement(this);
-        var titleBarElement = UIHelper.FindElementByName(this, "AppTitleBar");
-        var titleBarAppNameElement = UIHelper.FindElementByName(this, "AppTitle");
-
-        (titleBarElement as Border).Background = new SolidColorBrush(currentBgColor); // Changing titlebar uielement's color.
-
-        if (currentFgColor != Colors.Transparent)
-        {
-            (titleBarAppNameElement as TextBlock).Foreground = new SolidColorBrush(currentFgColor);
-        }
-        else
-        {
-            (titleBarAppNameElement as TextBlock).Foreground = Application.Current.Resources["TextFillColorPrimaryBrush"] as SolidColorBrush;
-        }
-
-        TitleBarHelper.SetCaptionButtonColors(window, currentFgColor);
-
-        if (currentBgColor == Colors.Transparent)
-        {
-            // If the current background is null, we want to revert to the default titlebar which is achieved using null as color.
-            TitleBarHelper.SetBackgroundColor(window, null);
-        }
-        else
-        {
-            TitleBarHelper.SetBackgroundColor(window, currentBgColor);
-        }
-
-        TitleBarHelper.SetForegroundColor(window, currentFgColor);
-    }
-
-    private void customTitleBar_Click(object sender, RoutedEventArgs e)
-    {
-        SetTitleBar();
-        // announce visual change to automation
-        UIHelper.AnnounceActionForAccessibility(sender as UIElement, "TitleBar size and width changed", "TitleBarChangedNotificationActivityId");
-    }
-    private void defaultTitleBar_Click(object sender, RoutedEventArgs e)
-    {
-        SetTitleBar();
-
-        // announce visual change to automation
-        UIHelper.AnnounceActionForAccessibility(sender as UIElement, "TitleBar size and width changed", "TitleBarChangedNotificationActivityId");
-    }
-
-    private void setTxtBoxAsPasthrough(FrameworkElement txtBoxNonClientArea)
-    {
-        GeneralTransform transformTxtBox = txtBoxNonClientArea.TransformToVisual(null);
-        Rect bounds = transformTxtBox.TransformBounds(new Rect(0, 0, txtBoxNonClientArea.ActualWidth, txtBoxNonClientArea.ActualHeight));
-
-        var scale = WindowHelper.GetRasterizationScaleForElement(this);
-
-        var transparentRect = new Windows.Graphics.RectInt32(
-            _X: (int)Math.Round(bounds.X * scale),
-            _Y: (int)Math.Round(bounds.Y * scale),
-            _Width: (int)Math.Round(bounds.Width * scale),
-            _Height: (int)Math.Round(bounds.Height * scale)
-        );
-        var rectArr = new Windows.Graphics.RectInt32[] { transparentRect };
-        SetClickThruRegions(rectArr);
-    }
-
-    private void TitleBarHeightComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
-    {
-        var selectedHeight = titlebarHeight.SelectedItem.ToString();
-        var window = WindowHelper.GetWindowForElement(this);
-
-        if (selectedHeight != null && window != null && window.ExtendsContentIntoTitleBar)
-        {
-            window.AppWindow.TitleBar.PreferredHeightOption = App.GetEnum<TitleBarHeightOption>(selectedHeight);
-        }
-    }
-
-    private void AddInteractiveElements_Click(object sender, RoutedEventArgs e)
-    {
-        var txtBoxNonClientArea = UIHelper.FindElementByName(sender as UIElement, "AppTitleBarTextBox") as FrameworkElement;
-
-        if (txtBoxNonClientArea.Visibility == Visibility.Visible)
-        {
-            ResetTitlebarSettings();
-        }
-        else
-        {
-            addInteractiveElements.Content = "Remove interactive control from titlebar";
-            txtBoxNonClientArea.Visibility = Visibility.Visible;
-            if (sizeChangedEventHandlerAdded)
-            {
-                setTxtBoxAsPasthrough(txtBoxNonClientArea);
-            }
-            else
-            {
-                sizeChangedEventHandlerAdded = true;
-                // run this code when textbox has been made visible and its actual width and height has been calculated
-                txtBoxNonClientArea.SizeChanged += (object sender, SizeChangedEventArgs e) =>
-                {
-                    if (txtBoxNonClientArea.Visibility != Visibility.Collapsed)
-                    {
-                        setTxtBoxAsPasthrough(txtBoxNonClientArea);
-                    }
-                };
-            }
-
-            // announce visual change to automation
-            UIHelper.AnnounceActionForAccessibility(sender as UIElement, "TitleBar size and width changed", "TitleBarChangedNotificationActivityId");
-        }
-    }
-
 }
diff --git a/WinUIGallery/Samples/Data/ControlInfoData.json b/WinUIGallery/Samples/Data/ControlInfoData.json
index 3bcc0209d..8090c96d7 100644
--- a/WinUIGallery/Samples/Data/ControlInfoData.json
+++ b/WinUIGallery/Samples/Data/ControlInfoData.json
@@ -3622,20 +3622,20 @@
         {
           "UniqueId": "TitleBar",
           "Title": "TitleBar",
-          "ApiNamespace": "Microsoft.UI.Xaml",
+          "ApiNamespace": "Microsoft.UI.Xaml.Controls",
           "Subtitle": "An example showing a custom UIElement used as the titlebar for the app's window.",
           "ImagePath": "ms-appx:///Assets/ControlImages/TitleBar.png",
-          "Description": "This sample shows how to use a custom titlebar for the app's window. There are 2 ways of doing it: using default titlebar and setting an UIElement as a custom titlebar.",
+          "Description": "The TitleBar control provides a simple way to create a modern titlebar UX with interactive content.",
           "Content": "<p>Look at the <i>TitleBarPage.xaml</i> file in Visual Studio to see the full code for this page.</p>",
           "IsUpdated": true,
           "Docs": [
             {
-              "Title": "TitleBar - API",
-              "Uri": "https://learn.microsoft.com/windows/windows-app-sdk/api/winrt/microsoft.ui.xaml.window.extendscontentintotitlebar"
+              "Title": "Title bar customization",
+              "Uri": "https://learn.microsoft.com/windows/apps/develop/title-bar"
             },
             {
-              "Title": "Guidelines",
-              "Uri": "https://learn.microsoft.com/windows/windows-app-sdk/api/winrt/microsoft.ui.xaml.window"
+              "Title": "Titl bar - design guidelines",
+              "Uri": "https://learn.microsoft.com/windows/apps/design/basics/titlebar-design"
             }
           ],
           "RelatedControls": [
diff --git a/WinUIGallery/Samples/SamplePages/ModalWindow.xaml.cs b/WinUIGallery/Samples/SamplePages/ModalWindow.xaml.cs
index cc594c813..469b2ce20 100644
--- a/WinUIGallery/Samples/SamplePages/ModalWindow.xaml.cs
+++ b/WinUIGallery/Samples/SamplePages/ModalWindow.xaml.cs
@@ -21,7 +21,7 @@ public ModalWindow()
 
         // Set this modal window's owner (the main application window).
         // The main window can be retrieved from App.xaml.cs if it's set as a static property.
-        SetOwnership(appWindow, App.StartupWindow);
+        SetOwnership(appWindow, App.MainWindow);
 
         // Make the window modal (blocks interaction with the owner window until closed).
         presenter.IsModal = true;
@@ -74,7 +74,7 @@ private void SetOwnership(AppWindow ownedAppWindow, Window ownerWindow)
     private void ModalWindow_Closed(object sender, WindowEventArgs args)
     {
         // Reactivate the main application window when the modal window closes.
-        App.StartupWindow.Activate();
+        App.MainWindow.Activate();
     }
 
     private void OKButton_Click(object sender, RoutedEventArgs e)
diff --git a/WinUIGallery/Samples/SamplePages/TitleBarWindow.xaml b/WinUIGallery/Samples/SamplePages/TitleBarWindow.xaml
new file mode 100644
index 000000000..9422d4335
--- /dev/null
+++ b/WinUIGallery/Samples/SamplePages/TitleBarWindow.xaml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Window
+    x:Class="WinUIGallery.Samples.SamplePages.TitleBarWindow"
+    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:local="using:WinUIGallery.Samples.SamplePages"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="TitleBarWindow"
+    mc:Ignorable="d">
+    <Window.SystemBackdrop>
+        <MicaBackdrop />
+    </Window.SystemBackdrop>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+        <TitleBar
+            x:Name="titleBar"
+            Title="WinUI Gallery"
+            BackRequested="TitleBar_BackRequested"
+            IsBackButtonVisible="{x:Bind navFrame.CanGoBack, Mode=OneWay}"
+            IsPaneToggleButtonVisible="True"
+            PaneToggleRequested="TitleBar_PaneToggleRequested"
+            Subtitle="TitleBar sample">
+            <TitleBar.IconSource>
+                <ImageIconSource ImageSource="/Assets/Tiles/GalleryIcon.ico" />
+            </TitleBar.IconSource>
+            <TitleBar.RightContent>
+                <PersonPicture
+                    Width="30"
+                    Height="30"
+                    Initials="JD" />
+            </TitleBar.RightContent>
+            <TitleBar.CenterContent>
+                <AutoSuggestBox
+                    Width="360"
+                    VerticalAlignment="Center"
+                    PlaceholderText="Search.."
+                    QueryIcon="Find" />
+            </TitleBar.CenterContent>
+        </TitleBar>
+        <NavigationView
+            x:Name="navView"
+            Grid.Row="1"
+            IsBackButtonVisible="Collapsed"
+            IsPaneToggleButtonVisible="False"
+            IsSettingsVisible="False"
+            SelectionChanged="navView_SelectionChanged">
+            <NavigationView.MenuItems>
+                <NavigationViewItem
+                    Content="Menu Item1"
+                    Icon="Play"
+                    Tag="SamplePage1" />
+                <NavigationViewItem
+                    Content="Menu Item2"
+                    Icon="Save"
+                    Tag="SamplePage2" />
+                <NavigationViewItem
+                    Content="Menu Item3"
+                    Icon="Refresh"
+                    Tag="SamplePage3" />
+                <NavigationViewItem
+                    Content="Menu Item4"
+                    Icon="Download"
+                    Tag="SamplePage4" />
+            </NavigationView.MenuItems>
+            <Frame x:Name="navFrame" />
+        </NavigationView>
+    </Grid>
+</Window>
diff --git a/WinUIGallery/Samples/SamplePages/TitleBarWindow.xaml.cs b/WinUIGallery/Samples/SamplePages/TitleBarWindow.xaml.cs
new file mode 100644
index 000000000..b89bebd06
--- /dev/null
+++ b/WinUIGallery/Samples/SamplePages/TitleBarWindow.xaml.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Linq;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+
+namespace WinUIGallery.Samples.SamplePages;
+
+public sealed partial class TitleBarWindow : Window
+{
+    public TitleBarWindow()
+    {
+        this.InitializeComponent();
+        this.ExtendsContentIntoTitleBar = true; // Extend the content into the title bar and hide the default title bar
+        this.AppWindow.TitleBar.PreferredHeightOption = Microsoft.UI.Windowing.TitleBarHeightOption.Tall;
+        this.SetTitleBar(titleBar); // Set the custom title bar
+        navView.SelectedItem = navView.MenuItems.OfType<NavigationViewItem>().First();
+    }
+
+    private void TitleBar_PaneToggleRequested(TitleBar sender, object args)
+    {
+        navView.IsPaneOpen = !navView.IsPaneOpen;
+    }
+
+    private void TitleBar_BackRequested(TitleBar sender, object args)
+    {
+        navFrame.GoBack();
+    }
+
+    private void navView_SelectionChanged(NavigationView sender, NavigationViewSelectionChangedEventArgs args)
+    {
+        var selectedItem = (NavigationViewItem)args.SelectedItem;
+        if (selectedItem != null)
+        {
+            string selectedItemTag = ((string)selectedItem.Tag);
+            sender.Header = "Sample Page " + selectedItemTag.Substring(selectedItemTag.Length - 1);
+            string pageName = "WinUIGallery.SamplePages." + selectedItemTag;
+            Type pageType = Type.GetType(pageName);
+            navFrame.Navigate(pageType);
+        }
+    }
+}
diff --git a/WinUIGallery/Styles/TitleBar.xaml b/WinUIGallery/Styles/TitleBar.xaml
new file mode 100644
index 000000000..5a0754d2a
--- /dev/null
+++ b/WinUIGallery/Styles/TitleBar.xaml
@@ -0,0 +1,285 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <ResourceDictionary.MergedDictionaries>
+        <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
+        <!--  Other merged dictionaries here  -->
+    </ResourceDictionary.MergedDictionaries>
+
+    <!--  TO DO: This custom style solves 2 issues: setting the HorizontalAlignment of Content to Stretch vs Center, and removing the additional margin between content and icon in Compact mode. These are 2 bugs that will be fixed in a WinUI next release and with that we can remove this custom style.  -->
+    <Style x:Key="StretchableContentTitleBarStyle" TargetType="TitleBar">
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Setter Property="Foreground" Value="{ThemeResource TitleBarForegroundBrush}" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="TitleBar">
+                    <Grid
+                        x:Name="PART_LayoutRoot"
+                        Height="{ThemeResource TitleBarCompactHeight}"
+                        Background="{TemplateBinding Background}">
+                        <Grid.ColumnDefinitions>
+                            <!--  0: Left Padding Column  -->
+                            <ColumnDefinition x:Name="LeftPaddingColumn" Width="{ThemeResource TitleBarLeftPaddingWidth}" />
+                            <!--  1: Back Button  -->
+                            <ColumnDefinition Width="Auto" />
+                            <!--  2: Pane Toggle Button  -->
+                            <ColumnDefinition Width="Auto" />
+                            <!--  3: Left Content Presenter  -->
+                            <ColumnDefinition Width="Auto" />
+                            <!--  4: Left Content Padding Column  -->
+                            <ColumnDefinition x:Name="LeftContentPaddingColumn" Width="{ThemeResource TitleBarLeftContentPaddingWidth}" />
+                            <!--  5: Icon  -->
+                            <ColumnDefinition Width="Auto" />
+                            <!--  6: Title  -->
+                            <ColumnDefinition Width="Auto" />
+                            <!--  7: Subtitle  -->
+                            <ColumnDefinition Width="Auto" />
+                            <!--  8: Center Content Presenter  -->
+                            <ColumnDefinition Width="*" />
+                            <!--  9: Right Content Presenter  -->
+                            <ColumnDefinition Width="Auto" />
+                            <!--  10: Min Drag Region  -->
+                            <ColumnDefinition Width="{ThemeResource TitleBarMinDragRegionWidth}" />
+                            <!--  11: Right Padding Column  -->
+                            <ColumnDefinition x:Name="RightPaddingColumn" Width="{ThemeResource TitleBarRightPaddingWidth}" />
+                        </Grid.ColumnDefinitions>
+
+                        <Button
+                            x:Name="PART_BackButton"
+                            Grid.Column="1"
+                            x:DeferLoadStrategy="Lazy"
+                            IsEnabled="{TemplateBinding IsBackButtonEnabled}"
+                            Style="{ThemeResource TitleBarBackButtonStyle}"
+                            ToolTipService.ToolTip="Back"
+                            Visibility="Collapsed" />
+
+                        <Button
+                            x:Name="PART_PaneToggleButton"
+                            Grid.Column="2"
+                            x:DeferLoadStrategy="Lazy"
+                            Style="{ThemeResource TitleBarPaneToggleButtonStyle}"
+                            ToolTipService.ToolTip="Navigation"
+                            Visibility="Collapsed" />
+
+                        <ContentPresenter
+                            x:Name="PART_LeftContentPresenter"
+                            Grid.Column="3"
+                            x:DeferLoadStrategy="Lazy"
+                            Content="{TemplateBinding LeftContent}"
+                            Visibility="Collapsed" />
+
+                        <Viewbox
+                            x:Name="PART_Icon"
+                            Grid.Column="5"
+                            MaxWidth="16"
+                            MaxHeight="16"
+                            Margin="0,0,16,0"
+                            VerticalAlignment="Center"
+                            x:DeferLoadStrategy="Lazy"
+                            Child="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.IconElement}"
+                            Visibility="Collapsed" />
+
+                        <TextBlock
+                            x:Name="PART_TitleText"
+                            Grid.Column="6"
+                            MinWidth="48"
+                            Margin="0,0,8,0"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            x:DeferLoadStrategy="Lazy"
+                            Foreground="{TemplateBinding Foreground}"
+                            Style="{StaticResource CaptionTextBlockStyle}"
+                            Text="{TemplateBinding Title}"
+                            TextTrimming="CharacterEllipsis"
+                            TextWrapping="NoWrap"
+                            Visibility="Collapsed" />
+
+                        <TextBlock
+                            x:Name="PART_SubtitleText"
+                            Grid.Column="7"
+                            MinWidth="48"
+                            Margin="0,0,16,0"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            x:DeferLoadStrategy="Lazy"
+                            Foreground="{ThemeResource TitleBarSubtitleForegroundBrush}"
+                            Style="{StaticResource CaptionTextBlockStyle}"
+                            Text="{TemplateBinding Subtitle}"
+                            TextTrimming="CharacterEllipsis"
+                            TextWrapping="NoWrap"
+                            Visibility="Collapsed" />
+
+                        <Grid
+                            x:Name="PART_CenterContentPresenterGrid"
+                            Grid.Column="8"
+                            x:DeferLoadStrategy="Lazy"
+                            Visibility="Collapsed">
+                            <ContentPresenter
+                                x:Name="PART_CenterContentPresenter"
+                                HorizontalAlignment="Center"
+                                Content="{TemplateBinding CenterContent}" />
+                        </Grid>
+
+                        <ContentPresenter
+                            x:Name="PART_RightContentPresenter"
+                            Grid.Column="9"
+                            x:DeferLoadStrategy="Lazy"
+                            Content="{TemplateBinding RightContent}"
+                            Visibility="Collapsed" />
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="BackButtonGroup">
+                                <VisualState x:Name="BackButtonCollapsed" />
+                                <VisualState x:Name="BackButtonVisible">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_BackButton.Visibility" Value="Visible" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="BackButtonDeactivated">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_BackButton.Visibility" Value="Visible" />
+                                        <Setter Target="PART_BackButton.Foreground" Value="{ThemeResource TitleBarDeactivatedForegroundBrush}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+
+                            <VisualStateGroup x:Name="PaneToggleButtonGroup">
+                                <VisualState x:Name="PaneToggleButtonCollapsed" />
+                                <VisualState x:Name="PaneToggleButtonVisible">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_PaneToggleButton.Visibility" Value="Visible" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="PaneToggleButtonDeactivated">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_PaneToggleButton.Visibility" Value="Visible" />
+                                        <Setter Target="PART_PaneToggleButton.Foreground" Value="{ThemeResource TitleBarDeactivatedForegroundBrush}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+
+                            <VisualStateGroup x:Name="LeftContentGroup">
+                                <VisualState x:Name="LeftContentCollapsed" />
+                                <VisualState x:Name="LeftContentVisible">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_LeftContentPresenter.Visibility" Value="Visible" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="LeftContentDeactivated">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_LeftContentPresenter.Visibility" Value="Visible" />
+                                        <Setter Target="PART_LeftContentPresenter.Opacity" Value="{ThemeResource TitleBarDeactivatedOpacity}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+
+                            <VisualStateGroup x:Name="IconGroup">
+                                <VisualState x:Name="IconCollapsed" />
+                                <VisualState x:Name="IconVisible">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_Icon.Visibility" Value="Visible" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="IconDeactivated">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_Icon.Visibility" Value="Visible" />
+                                        <Setter Target="PART_Icon.Opacity" Value="{ThemeResource TitleBarDeactivatedOpacity}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+
+                            <VisualStateGroup x:Name="TitleTextGroup">
+                                <VisualState x:Name="TitleTextCollapsed" />
+                                <VisualState x:Name="TitleTextVisible">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_TitleText.Visibility" Value="Visible" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="TitleTextDeactivated">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_TitleText.Visibility" Value="Visible" />
+                                        <Setter Target="PART_TitleText.Foreground" Value="{ThemeResource TitleBarDeactivatedForegroundBrush}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+
+                            <VisualStateGroup x:Name="SubtitleTextGroup">
+                                <VisualState x:Name="SubtitleTextCollapsed" />
+                                <VisualState x:Name="SubtitleTextVisible">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_SubtitleText.Visibility" Value="Visible" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="SubtitleTextDeactivated">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_SubtitleText.Visibility" Value="Visible" />
+                                        <Setter Target="PART_SubtitleText.Foreground" Value="{ThemeResource TitleBarSubtitleDeactivatedForegroundBrush}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+
+                            <VisualStateGroup x:Name="CenterContentGroup">
+                                <VisualState x:Name="CenterContentCollapsed" />
+                                <VisualState x:Name="CenterContentVisible">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_CenterContentPresenterGrid.Visibility" Value="Visible" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="CenterContentDeactivated">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_CenterContentPresenterGrid.Visibility" Value="Visible" />
+                                        <Setter Target="PART_CenterContentPresenterGrid.Opacity" Value="{ThemeResource TitleBarDeactivatedOpacity}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+
+                            <VisualStateGroup x:Name="RightContentGroup">
+                                <VisualState x:Name="RightContentCollapsed" />
+                                <VisualState x:Name="RightContentVisible">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_RightContentPresenter.Visibility" Value="Visible" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="RightContentDeactivated">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_RightContentPresenter.Visibility" Value="Visible" />
+                                        <Setter Target="PART_RightContentPresenter.Opacity" Value="{ThemeResource TitleBarDeactivatedOpacity}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+
+                            <VisualStateGroup x:Name="HeightGroup">
+                                <VisualState x:Name="CompactHeight" />
+                                <VisualState x:Name="ExpandedHeight">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_LayoutRoot.Height" Value="{ThemeResource TitleBarExpandedHeight}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+
+                            <VisualStateGroup x:Name="DisplayModeGroup">
+                                <VisualState x:Name="Expanded" />
+                                <VisualState x:Name="Compact">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_TitleText.Visibility" Value="Collapsed" />
+                                        <Setter Target="PART_SubtitleText.Visibility" Value="Collapsed" />
+                                        <Setter Target="PART_CenterContentPresenter.Margin" Value="0,0" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+
+                            <VisualStateGroup x:Name="LeftContentSpacingGroup">
+                                <VisualState x:Name="DefaultSpacing" />
+                                <VisualState x:Name="NegativeInsetSpacing">
+                                    <VisualState.Setters>
+                                        <Setter Target="LeftContentPaddingColumn.Width" Value="{ThemeResource TitleBarHeaderNegativeInsetPaddingWidth}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
diff --git a/WinUIGallery/WinUIGallery.csproj b/WinUIGallery/WinUIGallery.csproj
index b0eec4242..27150a930 100644
--- a/WinUIGallery/WinUIGallery.csproj
+++ b/WinUIGallery/WinUIGallery.csproj
@@ -297,6 +297,7 @@
         <None Remove="Controls\HomePageHeaderImage.xaml" />
         <None Remove="Controls\PageHeader.xaml" />
         <None Remove="Controls\SampleThemeListener.xaml" />
+        <None Remove="MainWindow.xaml" />
         <None Remove="Samples\ControlPages\Fundamentals\Controls\CounterControl.xaml" />
         <None Remove="Samples\ControlPages\Fundamentals\Controls\ValidatedPasswordBox.xaml" />
         <None Remove="Samples\ControlPages\Fundamentals\CustomUserControlsPage.xaml" />
@@ -306,11 +307,13 @@
         <None Remove="Samples\SamplePages\SampleWindow2.xaml" />
         <None Remove="Samples\SamplePages\SampleWindow5.xaml" />
         <None Remove="Samples\SamplePages\SampleWindow6.xaml" />
+        <None Remove="Samples\SamplePages\TitleBarWindow.xaml" />
         <None Remove="Styles\Button.xaml" />
         <None Remove="Styles\Grid.xaml" />
         <None Remove="Styles\GridViewItem.xaml" />
         <None Remove="Styles\ItemTemplates.xaml" />
         <None Remove="Styles\TextBlock.xaml" />
+        <None Remove="Styles\TitleBar.xaml" />
     </ItemGroup>
 
     <ItemGroup>
@@ -487,6 +490,18 @@
         <Content Include="Samples\SampleCode\CustomUserControls\CustomUserControlsSample4_xaml.txt" />
     </ItemGroup>
 
+    <ItemGroup>
+      <Page Update="Samples\SamplePages\TitleBarWindow.xaml">
+        <Generator>MSBuild:Compile</Generator>
+      </Page>
+    </ItemGroup>
+
+    <ItemGroup>
+      <Page Update="Styles\TitleBar.xaml">
+        <Generator>MSBuild:Compile</Generator>
+      </Page>
+    </ItemGroup>
+
     <ItemGroup>
       <Page Update="Samples\ControlPages\Fundamentals\Controls\ValidatedPasswordBox.xaml">
         <Generator>MSBuild:Compile</Generator>
@@ -537,6 +552,12 @@
         <Generator>MSBuild:Compile</Generator>
       </Page>
     </ItemGroup>
+
+    <ItemGroup>
+      <Page Update="MainWindow.xaml">
+        <Generator>MSBuild:Compile</Generator>
+      </Page>
+    </ItemGroup>
     <ItemGroup>
         <Page Update="Controls\CopyButton\CopyButton.xaml">
             <Generator>MSBuild:Compile</Generator>
diff --git a/standalone.props b/standalone.props
index 8738d66f4..cfb0df268 100644
--- a/standalone.props
+++ b/standalone.props
@@ -1,24 +1,24 @@
 <Project>
-  <PropertyGroup>
-    <!-- The NuGet versions of dependencies to build against. -->
-    <WindowsSdkPackageVersion>10.0.22621.42</WindowsSdkPackageVersion>
-    <WindowsAppSdkPackageVersion>1.6.250108002</WindowsAppSdkPackageVersion>
-    <MicrosoftNETCoreUniversalWindowsPlatformVersion>6.2.11</MicrosoftNETCoreUniversalWindowsPlatformVersion>
-    <GraphicsWin2DVersion>1.0.4</GraphicsWin2DVersion>
-    <ColorCodeVersion>2.0.13</ColorCodeVersion>
-    <CommunityToolkitWinUIVersion>8.0.230907</CommunityToolkitWinUIVersion>
-    <MicrosoftCsWinRTPackageVersion>2.0.3</MicrosoftCsWinRTPackageVersion>
-    <!-- We have multiple projects in the same directory, which means we need to separate their output paths-->
-    <BaseIntermediateOutputPath>obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
-    <BaseOutputPath>bin\$(MSBuildProjectName)\</BaseOutputPath>
-    <!-- 
+	<PropertyGroup>
+		<!-- The NuGet versions of dependencies to build against. -->
+		<WindowsSdkPackageVersion>10.0.22621.42</WindowsSdkPackageVersion>
+		<WindowsAppSdkPackageVersion>1.7.250208002-preview1</WindowsAppSdkPackageVersion>
+		<MicrosoftNETCoreUniversalWindowsPlatformVersion>6.2.11</MicrosoftNETCoreUniversalWindowsPlatformVersion>
+		<GraphicsWin2DVersion>1.3.2</GraphicsWin2DVersion>
+		<ColorCodeVersion>2.0.15</ColorCodeVersion>
+		<CommunityToolkitWinUIVersion>8.1.240916</CommunityToolkitWinUIVersion>
+		<MicrosoftCsWinRTPackageVersion>2.2.0</MicrosoftCsWinRTPackageVersion>
+		<!-- We have multiple projects in the same directory, which means we need to separate their output paths-->
+		<BaseIntermediateOutputPath>obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
+		<BaseOutputPath>bin\$(MSBuildProjectName)\</BaseOutputPath>
+		<!-- 
          For Desktop, the .NET SDK automatically includes every .cs file in the project directory.  It normally
          also excludes items under the obj/bin folders based on the value of BaseIntermediateOutputPath/BaseOutputPath.
          However, because we overwrite those to output to subdirectories, the outputs of the UWP WinUI Gallery
          are erroneously included.  Explicitly exclude them here
     -->
-    <DefaultItemExcludes>obj\**;bin\**;$(DefaultItemExcludes)</DefaultItemExcludes>
-    <!-- Where to place the files generated from CSWinRT from WinUIGallery.Desktop.-->
-    <GeneratedFilesDir>obj\generated</GeneratedFilesDir>
-  </PropertyGroup>
+		<DefaultItemExcludes>obj\**;bin\**;$(DefaultItemExcludes)</DefaultItemExcludes>
+		<!-- Where to place the files generated from CSWinRT from WinUIGallery.Desktop.-->
+		<GeneratedFilesDir>obj\generated</GeneratedFilesDir>
+	</PropertyGroup>
 </Project>
\ No newline at end of file