From 9ba5f7368a852a94f57cea273ac086464b17c473 Mon Sep 17 00:00:00 2001
From: Marcel Wagner <marcel.alex.wagner@outlook.com>
Date: Sat, 21 Oct 2023 22:02:55 +0200
Subject: [PATCH] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit 220426eaae00523472b0fd4f2a25c17cb232522d
Author: Marcel Wagner <marcel.alex.wagner@outlook.com>
Date:   Tue Oct 17 20:40:21 2023 +0200

    Fix sample presenter not properly determing if its empty (#1374)

    <!--- Provide a general summary of your changes in the Title above -->
    <!--- Describe your changes in detail -->
    The sample presenter did not properly determine if it was empty
    resulting in it not hiding despite it being empty.
    <!--- Why is this change required? What problem does it solve? -->
    <!--- If it fixes an open issue, please link to the issue here. -->
    Fixes #1373
    <!--- Please describe in detail how you tested your changes. -->
    <!--- Include details of your testing environment, and the tests you ran
    to -->
    <!--- see how your change affects other areas of the code, etc. -->
    <!--- What types of changes does your code introduce? Put an `x` in all
    the boxes that apply: -->
    - [x] Bug fix (non-breaking change which fixes an issue)
    - [ ] New feature (non-breaking change which adds functionality)
    - [ ] Breaking change (fix or feature that would cause existing
    functionality to change)

commit b78b8a52cbd5463e27b5474330f4f1b4b0b5e3c5
Author: Marcel Wagner <marcel.alex.wagner@outlook.com>
Date:   Tue Oct 17 20:35:26 2023 +0200

    Fix Selection Indicator for GridView sample (#1385)

    <!--- Provide a general summary of your changes in the Title above -->
    <!--- Describe your changes in detail -->
    Due to a missing BasedOn, the selection indicator and other interface
    characteristics where missing on the custom layout sample.
    <!--- Why is this change required? What problem does it solve? -->
    <!--- If it fixes an open issue, please link to the issue here. -->
    Fixes #1072
    <!--- Please describe in detail how you tested your changes. -->
    <!--- Include details of your testing environment, and the tests you ran
    to -->
    <!--- see how your change affects other areas of the code, etc. -->
    <!--- What types of changes does your code introduce? Put an `x` in all
    the boxes that apply: -->
    - [x] Bug fix (non-breaking change which fixes an issue)
    - [ ] New feature (non-breaking change which adds functionality)
    - [ ] Breaking change (fix or feature that would cause existing
    functionality to change)

commit 09424a9014c490d3d09300a02fadc5874bd2e552
Author: Karen <7976322+karkarl@users.noreply.github.com>
Date:   Mon Oct 16 17:41:14 2023 -0700

    Refactor IconsPage ItemsRepeater to ItemsView (#1376)

    <!--- Provide a general summary of your changes in the Title above -->
    <!--- Describe your changes in detail -->
    The ItemsRepeater for IconsPage has too many accessibility issues
    including lack of keyboard navigation and narrator announcement.
    Refactored to ItemsView that has all of it built in.

    Also added Narrator announcement when filtered items have changed.
    <!--- Why is this change required? What problem does it solve? -->
    <!--- If it fixes an open issue, please link to the issue here. -->
    [Bug
    44661633](https://microsoft.visualstudio.com/DefaultCollection/OS/_workitems/edit/44661633):
    [WinUI Accessibility: Design guidance -> Icons]: Unable to navigate and
    access the Icons present under “Fluent Icons Library” using keyboard.

    [Bug
    44661471](https://microsoft.visualstudio.com/DefaultCollection/OS/_workitems/edit/44661471):
    [WinUI Accessibility: Design guidance -> Icons]: Screen reader fails to
    announce regarding the available suggestions.
    <!--- Please describe in detail how you tested your changes. -->
    <!--- Include details of your testing environment, and the tests you ran
    to -->
    <!--- see how your change affects other areas of the code, etc. -->
    Manual verification
    <!--- What types of changes does your code introduce? Put an `x` in all
    the boxes that apply: -->
    - [x] Bug fix (non-breaking change which fixes an issue)
    - [ ] New feature (non-breaking change which adds functionality)
    - [ ] Breaking change (fix or feature that would cause existing
    functionality to change)

commit 85d39457ed482a9a24b0bea0dd8f9ec530b03827
Author: Marcel Wagner <marcel.alex.wagner@outlook.com>
Date:   Tue Oct 17 01:26:29 2023 +0200

    Update infobadge samples to be more accessible (#1311)

    <!--- Provide a general summary of your changes in the Title above -->
    <!--- Describe your changes in detail -->
    <!--- Why is this change required? What problem does it solve? -->
    <!--- If it fixes an open issue, please link to the issue here. -->
    Fixes #769
    <!--- Please describe in detail how you tested your changes. -->
    <!--- Include details of your testing environment, and the tests you ran
    to -->
    <!--- see how your change affects other areas of the code, etc. -->
    <!--- What types of changes does your code introduce? Put an `x` in all
    the boxes that apply: -->
    - [x] Bug fix (non-breaking change which fixes an issue)
    - [ ] New feature (non-breaking change which adds functionality)
    - [ ] Breaking change (fix or feature that would cause existing
    functionality to change)

commit a735e5096553e0f84d2596a024334cfad7d38866
Author: Marcel Wagner <marcel.alex.wagner@outlook.com>
Date:   Tue Oct 17 00:55:19 2023 +0200

    Rename NewControls page to Homepage (#1381)

    <!--- Provide a general summary of your changes in the Title above -->
    <!--- Describe your changes in detail -->
    Renames the NewControls page to HomePage since the menu item is called
    "Home" and showing new control samples is no longer its only purpose.
    <!--- Why is this change required? What problem does it solve? -->
    <!--- If it fixes an open issue, please link to the issue here. -->
    Part of #1279
    <!--- Please describe in detail how you tested your changes. -->
    <!--- Include details of your testing environment, and the tests you ran
    to -->
    <!--- see how your change affects other areas of the code, etc. -->
    <!--- What types of changes does your code introduce? Put an `x` in all
    the boxes that apply: -->
    - [ ] Bug fix (non-breaking change which fixes an issue)
    - [ ] New feature (non-breaking change which adds functionality)
    - [ ] Breaking change (fix or feature that would cause existing
    functionality to change)

commit cd00c137bef96592f16829adb695d70a964017cf
Author: Marcel Wagner <marcel.alex.wagner@outlook.com>
Date:   Tue Oct 17 00:53:49 2023 +0200

    Update ListView sample code to match used resources (#1383)

    <!--- Provide a general summary of your changes in the Title above -->
    <!--- Describe your changes in detail -->
    The brushes used for the messaging sample were out of date which this PR
    addresses.
    <!--- Why is this change required? What problem does it solve? -->
    <!--- If it fixes an open issue, please link to the issue here. -->
    <!--- Please describe in detail how you tested your changes. -->
    <!--- Include details of your testing environment, and the tests you ran
    to -->
    <!--- see how your change affects other areas of the code, etc. -->
    <!--- What types of changes does your code introduce? Put an `x` in all
    the boxes that apply: -->
    - [ ] Bug fix (non-breaking change which fixes an issue)
    - [ ] New feature (non-breaking change which adds functionality)
    - [ ] Breaking change (fix or feature that would cause existing
    functionality to change)

commit afd79ceb9eda12f1aa8f7797b32138c566f38181
Author: Ranjesh <28935693+ranjeshj@users.noreply.github.com>
Date:   Mon Oct 16 09:24:53 2023 -0700

    Add ToString method to view model in StandardUICommand sample so accessibility name does not default to data type name. (#1382)

    Without a ToString, accessibility tools end up using the TypeName.

    ![image](https://github.com/microsoft/WinUI-Gallery/assets/28935693/6604dc35-626d-484d-b300-4c366acdb6fd)

    After fix:

    ![image](https://github.com/microsoft/WinUI-Gallery/assets/28935693/d809ffdd-7532-4177-a5a5-06a81fa21ac5)

commit b1572ee7c87b1a2c361215b9ac8c4cd96dc56ce8
Author: Karen <7976322+karkarl@users.noreply.github.com>
Date:   Wed Oct 11 13:51:39 2023 -0700

    P1 Accessibility Fixes (#1380)

    <!--- Provide a general summary of your changes in the Title above -->
    <!--- Describe your changes in detail -->
    Miscellaneous p1 accessibility fixes:

    - [Bug
    44661786](https://microsoft.visualstudio.com/DefaultCollection/OS/_workitems/edit/44661786):
    [WinUI Accessibility: Design guidance -> Accessibility-> Keyboard
    support]: Screen reader is announcing incorrect information about the
    shortcuts.
    - [Bug
    46762667](https://microsoft.visualstudio.com/DefaultCollection/OS/_workitems/edit/46762667):
    [WinUI 3 Gallery: Item View]: Screen reader fails to announce the label
    for the radio buttons present in under 'Layout' group.
    - [Bug
    46763238](https://microsoft.visualstudio.com/DefaultCollection/OS/_workitems/edit/46763238):
    [WinUI 3 Gallery: Progress Ring]: Accessibility name and visual name is
    not same for working toggle button present under 'Toggle Work' group.
    - [Bug
    46818786](https://microsoft.visualstudio.com/DefaultCollection/OS/_workitems/edit/46818786):
    [WinUI 3 Gallery: Clipboard]: Screen reader is not announcing the
    success message after activating the 'Copy Text to the Clipboard'
    button.
    - [Bug
    46818852](https://microsoft.visualstudio.com/DefaultCollection/OS/_workitems/edit/46818852):
    [WinUI 3 Gallery: FilePicker]: Screen reader is not announcing the
    success message after activating the 'Open a file/Open a picture/Save a
    file' button.
    - [Bug
    46820249](https://microsoft.visualstudio.com/DefaultCollection/OS/_workitems/edit/46820249):
    [WinUI 3 Gallery: Design Guidance: Color]: Upon invoking 'Copy brush
    name' button screen reader is on mute and there is no visual changes.
    - [Bug
    46820807](https://microsoft.visualstudio.com/DefaultCollection/OS/_workitems/edit/46820807):
    [WinUI 3 Gallery: Typography]: Some parts of right side of the screen is
    getting truncated in High DPI mode also not having scroll bar to scroll
    towards right.
    - [Bug
    46821911](https://microsoft.visualstudio.com/DefaultCollection/OS/_workitems/edit/46821911):
    [WinUI 3 Gallery: List View]: Text present beside the images which
    present under 'List view with image' heading is getting truncated in
    normal mode.
    - [Bug
    46825231](https://microsoft.visualstudio.com/DefaultCollection/OS/_workitems/edit/46825231):
    [WinUI 3 Gallery: Connected Animation]: Text present beside the images
    which present in 'Connected Animation' card is getting truncated in
    normal mode.
    - [Bug
    41570653](https://microsoft.visualstudio.com/DefaultCollection/OS/_workitems/edit/41570653):
    [WinUI Accessibility-> Left Navigation Pane]: No success information
    announced by screen reader, when user invokes open/close navigation
    button.
    - [Bug
    41597549](https://microsoft.visualstudio.com/DefaultCollection/OS/_workitems/edit/41597549):
    [WinUI Gallery] WinUI Accessibility-> TeachingTip: Unable to navigate to
    the image present in "Quickly reference this sample!" dialog using caps
    arrow keys.
    <!--- What types of changes does your code introduce? Put an `x` in all
    the boxes that apply: -->
    - [x] Bug fix (non-breaking change which fixes an issue)
    - [ ] New feature (non-breaking change which adds functionality)
    - [ ] Breaking change (fix or feature that would cause existing
    functionality to change)

commit 9a2c60b4a5f6fa39bb0d63cabb42976f9511dd27
Author: Karen <7976322+karkarl@users.noreply.github.com>
Date:   Wed Oct 11 12:32:02 2023 -0700

    Add Test to Scan All Pages for Axe Issues (#1361)

    <!--- Provide a general summary of your changes in the Title above -->
    <!--- Describe your changes in detail -->
    - Add a test that physically navigates to each page via NavView and
    check for Axe issues.
    - Utilizes DynamicData attribute to create grouped tests based on
    section category (ie. TreeView parent)
    - This also tests for run-time crashes with each page.
    - Miscellaneous Axe fixes.
    <!--- What types of changes does your code introduce? Put an `x` in all
    the boxes that apply: -->
    - [ ] Bug fix (non-breaking change which fixes an issue)
    - [x] New feature (non-breaking change which adds functionality)
    - [ ] Breaking change (fix or feature that would cause existing
    functionality to change)

commit 1d237241853b788e3f551a5a2de6f47fc5693a2f
Author: Marcel Wagner <marcel.alex.wagner@outlook.com>
Date:   Wed Oct 11 02:31:01 2023 +0200

    Cleanup unnecessary code (#1299)

commit 20cd4578ea899f5b42e44daa0fdc51d1a1696158
Author: Scott Jones <scottj1s@gmail.com>
Date:   Tue Oct 10 17:30:05 2023 -0700

    Update to WinAppSDK 1.4.2 and remove temporary workaround for including version info without dupe warnings (#1379)

commit c2fd30d7841299af4b0cc68748123abd4af11cb2
Author: Scott Jones <scottj1s@gmail.com>
Date:   Tue Oct 10 10:47:39 2023 -0700

    Set TrimMode explicitly back to partial for .NET 7 compat (#1378)

    See:

    https://learn.microsoft.com/en-us/dotnet/core/deploying/trimming/trimming-options?pivots=dotnet-7-0

commit f72609f238dab5d2ad499ddf15a86542d4f4d330
Author: Pratik Anand <pratik.preet@gmail.com>
Date:   Tue Oct 3 12:29:10 2023 -0700

    Clickable Interactive control sample for custom titlebar (#1360)

    With 1.4 changes, WinUI 3 custom titlebar now uses appwindow titlebar + nonclientinputpointersource apis under the hood. This opens up new possibilities like allowing clickable interactive controls like textbox, button in the titlebar area, surrounded by draggable region on both left and the right sides.

    This code adds a sample to titlebar page which shows users how to create interactive controls in winui 3 titlebar. It also demonstrates the power of mixing and matching high level winui 3 custom titlebar apis and low level nonclient apis.

commit 5a96afc71bfb633be0200d38c2a2ee14750ef2c8
Author: Andrew KeepCoding <andrewkeepcoding@gmail.com>
Date:   Thu Sep 28 19:31:59 2023 +0900

    Fix issue that crashes the app when navigating to SemanticZoomPage (#1363)

commit 9650e4eed1eb7beda53b20be2d53f8d5098ab02a
Author: Marcel Wagner <marcel.alex.wagner@outlook.com>
Date:   Thu Sep 28 12:31:39 2023 +0200

    Switch .NET 7 (#1115)

commit 8f1b4259f79f8a01669fcc5eac9c7007387495fa
Author: Marcel Wagner <marcel.alex.wagner@outlook.com>
Date:   Thu Sep 28 12:31:22 2023 +0200

    First round of UWP link replacement (#1347)

    Co-authored-by: Bob Pulliam <bpulliam@microsoft.com>

commit 1fcd8edcfc6cc942a175d519c55a4cfd2f96a4f0
Author: Steve <hez2010@outlook.com>
Date:   Thu Sep 28 05:21:29 2023 +0900

    Fix division by zero (#1366)

    <!--- Provide a general summary of your changes in the Title above -->
    Fix division by zero exception when the window is too narrow.
    Fixes #1365
    <!--- What types of changes does your code introduce? Put an `x` in all
    the boxes that apply: -->
    - [x] Bug fix (non-breaking change which fixes an issue)
    - [ ] New feature (non-breaking change which adds functionality)
    - [ ] Breaking change (fix or feature that would cause existing
    functionality to change)

commit cbfc1fbee1aa4450e3e1fc5294f1d2a6717570b4
Author: Scott Jones <scottj1s@gmail.com>
Date:   Sun Sep 24 04:55:17 2023 -0700

    Fixes for WinUI submodule compatibility (#1362)

commit 398af50b49909bcc3ef180bb81006ffa7bc406ac
Author: Scott Jones <scottj1s@gmail.com>
Date:   Wed Sep 20 04:03:02 2023 -0700

    Update to WinAppSDK 1.4.1 and remove menu theme workaround (#1359)

commit 9c80909c39abb195cd0ab4f1bfcb690c98afa4ea
Author: Mike Crider <45052236+codendone@users.noreply.github.com>
Date:   Mon Sep 18 21:42:15 2023 -0700

    Added a "Capture element / camera preview" page in the Media section. (#1357)
    `CaptureElement` from UWP XAML does not exist in WinAppSDK, but
    `MediaPlayerElement` can be used in its place. The change adds a new
    sample page to demonstrate how this can be done.

    Note: Currently this page just reuses the same icon as the
    MediaPlayerElement page. Ideally at some point we'll get a camera icon
    which could be used here instead.
    Demonstrate the couple of calls to get from a `MediaCapture` to an
    `IMediaPlaybackSource` necessary to display the capture in a
    MediaPlayerElement. This also demonstrates basic creation of a
    `MediaCapture` to provide an end-to-end sample. This sample should help
    address questions in microsoft/microsoft-ui-xaml#4710 and
    microsoft/microsoft-ui-xaml#8214.
    Ad-hoc testing and testing with Accessibility Insights for Windows tool.
    - [ ] Bug fix (non-breaking change which fixes an issue)
    - [x] New feature (non-breaking change which adds functionality)
    - [ ] Breaking change (fix or feature that would cause existing
    functionality to change)

commit 258d8c8b033b456689675b5f76cf66f62d5c300a
Merge: 46137e8 6d4d692
Author: Karen <7976322+karkarl@users.noreply.github.com>
Date:   Mon Sep 18 14:14:37 2023 -0700

    Merge pull request #1354 from ghost1372/AcrylicKind

    Add new Desktop Acrylic kind (Base and Thin)

commit 6d4d692084c8254107a48bb0ab518be5ecc7aca9
Author: Mahdi Hosseini <mahdidvb72@gmail.com>
Date:   Tue Sep 19 00:17:19 2023 +0330

    fix indent

commit 41df384ffad6f1b76156c5ae63bd1a03c2e133be
Author: Mahdi Hosseini <mahdidvb72@gmail.com>
Date:   Sat Sep 9 14:11:01 2023 +0330

    Add Missing Sample for Desktop Acrylic

commit 05d2c8077ef4d8f5c1beebc7f817bdeae43a4c58
Author: Mahdi Hosseini <mahdidvb72@gmail.com>
Date:   Sat Sep 9 14:03:42 2023 +0330

    Update SystemBackdropsSample

commit 97afe684e3ad8be471af4eef8d4a73d6c79339ee
Author: Mahdi Hosseini <mahdidvb72@gmail.com>
Date:   Sat Sep 9 14:03:14 2023 +0330

    Add DesktopAcrylic Kind (Base, Thin)

commit 46137e8d182d6eea1af95bae643507fde2577186
Author: Karen <7976322+karkarl@users.noreply.github.com>
Date:   Fri Sep 8 17:15:16 2023 -0700

    WinUI Gallery 2.2.0.0 Release (#1353)

commit eb7171181e0c358736ea00e829c8a99dcf34b0f8
Merge: 10d21fb 6f42854
Author: Scott Jones <scottj1s@gmail.com>
Date:   Fri Sep 8 11:22:05 2023 -0700

    Merge pull request #1352 from microsoft/scottj1s/disable_r2r

    disable ReadyToRun as it was mistakenly trimming Microsoft.UI.Xaml.Controls.ScrollView from Microsoft.WinUI.dll

commit 6f42854c9c75da10aa507de600f2e5d2ef349faa
Author: Scott Jones <sjones@microsoft.com>
Date:   Fri Sep 8 11:05:21 2023 -0700

    disable ReadyToRun as it was mistakenly trimming Microsoft.UI.Xaml.Controls.ScrollView from Microsoft.WinUI.dll
---
 UITests/AxeHelper.cs                          |   3 +-
 UITests/Tests/AxeScanAllTests.cs              | 116 ++++++
 UITests/Tests/Button.cs                       |   6 -
 UITests/Tests/CheckBox.cs                     |   6 -
 UITests/Tests/ComboBox.cs                     |   8 -
 UITests/Tests/DatePicker.cs                   |   6 -
 UITests/Tests/MediaPlayerElement.cs           |   6 -
 UITests/Tests/PersonPicture.cs                |   6 -
 UITests/Tests/ProgressBar.cs                  |   6 -
 UITests/Tests/RadioButton.cs                  |   6 -
 UITests/Tests/Slider.cs                       |   6 -
 UITests/Tests/TextBlock.cs                    |   6 -
 UITests/Tests/TextBox.cs                      |   6 -
 UITests/Tests/ToggleButton.cs                 |   6 -
 UITests/Tests/ToggleSwitch.cs                 |   6 -
 UITests/UITests.csproj                        |  11 +
 WinUIGallery/App.xaml.cs                      |   9 +-
 .../Assets/ControlImages/Placeholder.png      | Bin 0 -> 5368 bytes
 WinUIGallery/Common/ActivityFeedLayout.cs     |   6 +-
 WinUIGallery/Common/Category.cs               |   3 +-
 .../Common/ColorSlideTransitionHelper.cs      |   7 +-
 .../Common/MenuItemTemplateSelector.cs        |   4 +-
 WinUIGallery/Common/Win32.cs                  |   1 -
 WinUIGallery/Common/WrapPanel.cs              |   4 +-
 .../CollectionPage.xaml                       |   9 +-
 .../CollectionPage.xaml.cs                    |  12 +-
 WinUIGallery/ContentIncludes.props            |   7 +-
 .../AnnotatedScrollBarPage.xaml.cs            |   3 +-
 .../ControlPages/AppBarSeparatorPage.xaml.cs  |  11 -
 .../AppBarToggleButtonPage.xaml.cs            |  11 -
 .../CaptureElementPreviewPage.xaml            |  31 ++
 .../CaptureElementPreviewPage.xaml.cs         | 130 ++++++
 .../ControlPages/ClipboardPage.xaml.cs        |   5 +
 .../ControlPages/ComboBoxPage.xaml.cs         |   2 +-
 .../ControlPages/CommandBarPage.xaml.cs       |   1 -
 .../CreateMultipleWindowsPage.xaml.cs         |   9 +-
 .../AccessibilityKeyboardPage.xaml            |   3 +
 .../DesignGuidance/IconsPage.xaml             |  66 ++-
 .../DesignGuidance/IconsPage.xaml.cs          |  48 +--
 .../DesignGuidance/TypographyPage.xaml        | 366 +++++++++--------
 .../ControlPages/FilePickerPage.xaml.cs       |  13 +-
 WinUIGallery/ControlPages/GridViewPage.xaml   |   4 +-
 WinUIGallery/ControlPages/InfoBadgePage.xaml  |  22 +-
 .../ControlPages/ItemsRepeaterPage.xaml       |   1 -
 .../ControlPages/ItemsRepeaterPage.xaml.cs    |  30 --
 WinUIGallery/ControlPages/ItemsViewPage.xaml  |  11 +-
 WinUIGallery/ControlPages/ListViewPage.xaml   |   9 +-
 .../ControlPages/ListViewPage.xaml.cs         |  12 +
 WinUIGallery/ControlPages/MenuBarPage.xaml    |   6 +-
 WinUIGallery/ControlPages/MenuBarPage.xaml.cs |  14 +-
 WinUIGallery/ControlPages/MenuFlyoutPage.xaml |  12 +-
 .../ControlPages/MenuFlyoutPage.xaml.cs       |  15 +-
 .../ControlPages/NavigationViewPage.xaml.cs   |  31 --
 .../ControlPages/ProgressRingPage.xaml        |   2 +-
 .../ControlPages/PullToRefreshPage.xaml.cs    |   3 +-
 .../ControlPages/RichEditBoxPage.xaml.cs      |  16 +-
 .../ControlPages/RichTextBlockPage.xaml       |   6 +-
 .../ControlPages/ScrollViewerPage.xaml.cs     |  28 +-
 .../ControlPages/SplitViewPage.xaml.cs        |  22 -
 .../ControlPages/StandardUICommandPage.xaml   |   2 +-
 .../StandardUICommandPage.xaml.cs             |  13 +-
 .../ControlPages/SystemBackdropsPage.xaml     |   5 +
 .../ControlPages/SystemBackdropsPage.xaml.cs  |   9 +-
 WinUIGallery/ControlPages/TitleBarPage.xaml   |  53 ++-
 .../ControlPages/TitleBarPage.xaml.cs         |  94 ++++-
 .../ItemsRepeaterSample3_xaml.txt             |   1 -
 .../Media/CaptureElementPreviewSample_cs.txt  |  48 +++
 .../CaptureElementPreviewSample_xaml.txt      |  10 +
 .../ConnectedAnimationSample1_cs.txt          |   3 +-
 .../SystemBackdropsSample1.txt                |   4 +-
 .../SystemBackdropsSample2.txt                |   4 +-
 .../RichEditBox/RichEditBoxSample3_cs.txt     |   2 +-
 .../Window/CreateWindowSample1.txt            |   2 +-
 .../Window/TitleBar/TitleBarSample2.txt       |   4 +-
 .../Window/TitleBar/TitleBarSample3.txt       |  22 +
 WinUIGallery/Controls/ControlExample.xaml     |   2 +-
 .../Controls/DesignGuidance/ColorTile.xaml.cs |   2 +
 WinUIGallery/Controls/HeaderTile.xaml.cs      |  31 --
 WinUIGallery/Controls/PageHeader.xaml         |   2 +-
 .../Controls/SampleCodePresenter.xaml.cs      |   9 +-
 WinUIGallery/DataModel/ControlInfoData.json   |  55 ++-
 WinUIGallery/Directory.Build.props            |   2 +
 WinUIGallery/Directory.Build.targets          |   4 +-
 WinUIGallery/Helper/NavigationHelper.cs       |  80 ----
 WinUIGallery/Helper/ThemeHelper.cs            |   3 -
 WinUIGallery/Helper/TitleBarHelper.cs         |  25 +-
 WinUIGallery/Helper/WindowHelper.cs           |  15 +
 .../{NewControlsPage.xaml => HomePage.xaml}   |   2 +-
 ...wControlsPage.xaml.cs => HomePage.xaml.cs} |   4 +-
 WinUIGallery/IdleSynchronizer.cs              | 118 +-----
 WinUIGallery/ItemsPageBase.cs                 |   1 -
 .../Navigation/NavigationRootPage.xaml        |  11 +-
 .../Navigation/NavigationRootPage.xaml.cs     |  24 +-
 WinUIGallery/Package.Dev.appxmanifest         |   2 +-
 WinUIGallery/Package.appxmanifest             |   2 +-
 WinUIGallery/Properties/AssemblyInfo.cs       |   4 +-
 .../win10-arm64-unpackaged.pubxml             |  10 +-
 .../PublishProfiles/win10-arm64.pubxml        |  10 +-
 .../win10-x64-unpackaged.pubxml               |  10 +-
 .../PublishProfiles/win10-x64.pubxml          |  10 +-
 .../win10-x86-unpackaged.pubxml               |  10 +-
 .../PublishProfiles/win10-x86.pubxml          |  10 +-
 .../SampleSystemBackdropsWindow.xaml.cs       |  38 +-
 WinUIGallery/Strings/en-US/Resources.resw     |   4 +-
 .../TabViewWindowingSamplePage.xaml.cs        | 383 ++++++++----------
 WinUIGallery/WinUIGallery.csproj              |  18 +-
 ...override.targets => net7.override.targets} |   0
 WinUIGallery/standalone.props                 |   4 +-
 nuget.config                                  |   2 +-
 109 files changed, 1262 insertions(+), 1136 deletions(-)
 create mode 100644 UITests/Tests/AxeScanAllTests.cs
 create mode 100644 WinUIGallery/Assets/ControlImages/Placeholder.png
 create mode 100644 WinUIGallery/ControlPages/CaptureElementPreviewPage.xaml
 create mode 100644 WinUIGallery/ControlPages/CaptureElementPreviewPage.xaml.cs
 create mode 100644 WinUIGallery/ControlPagesSampleCode/Media/CaptureElementPreviewSample_cs.txt
 create mode 100644 WinUIGallery/ControlPagesSampleCode/Media/CaptureElementPreviewSample_xaml.txt
 create mode 100644 WinUIGallery/ControlPagesSampleCode/Window/TitleBar/TitleBarSample3.txt
 rename WinUIGallery/{NewControlsPage.xaml => HomePage.xaml} (99%)
 rename WinUIGallery/{NewControlsPage.xaml.cs => HomePage.xaml.cs} (96%)
 rename WinUIGallery/{net6.override.targets => net7.override.targets} (100%)

diff --git a/UITests/AxeHelper.cs b/UITests/AxeHelper.cs
index 089c4c094..2397bb39f 100644
--- a/UITests/AxeHelper.cs
+++ b/UITests/AxeHelper.cs
@@ -45,7 +45,8 @@ public static void AssertNoAccessibilityErrors()
 				.Where(rule => rule.Rule.ID != RuleId.SiblingUniqueAndFocusable);
             if (testResult.Any())
 			{
-				var mappedResult = testResult.Select(result => "Element " + result.Element.Properties["ControlType"] + " violated rule '" + result.Rule.Description + "'.");
+				var mappedResult = testResult.Select(result =>
+				"Element " + result.Element.Properties["ControlType"] + " violated rule '" + result.Rule.Description + "'.");
 				Assert.Fail("Failed with the following accessibility errors \r\n" + string.Join("\r\n", mappedResult));
 			}
 		}
diff --git a/UITests/Tests/AxeScanAllTests.cs b/UITests/Tests/AxeScanAllTests.cs
new file mode 100644
index 000000000..e642f6913
--- /dev/null
+++ b/UITests/Tests/AxeScanAllTests.cs
@@ -0,0 +1,116 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestPlatform;
+using OpenQA.Selenium.Appium.Windows;
+using System;
+using System.Linq;
+using System.Text.Json;
+using System.IO;
+using System.Collections.ObjectModel;
+using System.Collections;
+using System.Collections.Generic;
+using System.Xml;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace UITests.Tests
+{
+    [TestClass]
+    public class AxeScanAll : TestBase
+    {       
+        public static readonly string jsonUri = "ControlInfoData.json";
+        public static new WindowsDriver<WindowsElement> Session => SessionManager.Session;
+
+        public static string[] ExclusionList =
+        {
+            "WebView2", // 46668961: Web contents from WebView2 are throwing null BoundingRectangle errors.
+            "Icons" // https://github.com/CommunityToolkit/Windows/issues/240 External toolkit SettingsExpander does not pass Axe testing
+        };
+
+        public class ControlInfoData
+        {
+            public List<Group> Groups { get; set; }
+        }
+
+        public class Group
+        {
+            [JsonProperty("UniqueId")]
+            public string UniqueId { get; set; }
+          
+            [JsonProperty("Items")]
+            public List<Item> Items { get; set; }
+        }
+
+        public class Item
+        {
+            [JsonProperty("UniqueId")]
+            public string UniqueId { get; set; }
+        }
+
+        private static IEnumerable<object[]> TestData()
+        {
+            var testCases = new List<object[]>();
+
+            string jsonContent = System.IO.File.ReadAllText(jsonUri);
+            var controlInfoData = JsonConvert.DeserializeObject<ControlInfoData>(jsonContent);
+
+            foreach (var group in controlInfoData.Groups)
+            {
+                var sectionName = group.UniqueId;
+
+                // Select all row names within the current table
+                var items = group.Items;
+
+                foreach (var item in items)
+                {
+                    var pageName = item.UniqueId;
+
+                    // Skip pages in the exclusion list.
+                    if (ExclusionList.Contains(pageName))
+                    {
+                        continue;
+                    }
+                    testCases.Add(new object[] { sectionName, pageName });
+                }
+            }
+
+            return testCases;
+        }
+
+        [ClassInitialize]
+        public static void ClassInitialize(TestContext context)
+        {
+        }
+
+        [TestMethod]
+        [DynamicData(nameof(TestData), DynamicDataSourceType.Method, DynamicDataDisplayName = nameof(GetCustomDynamicDataDisplayName))]
+        [TestProperty("Description", "Scan pages in the WinUIGallery for accessibility issues.")]
+        public void ValidatePageAccessibilityWithAxe(string sectionName, string pageName)
+        {
+            try
+            {
+                // Click into page and check for accessibility issues.
+                var page = Session.FindElementByAccessibilityId(pageName);
+                page.Click();
+
+                AxeHelper.AssertNoAccessibilityErrors();
+            }
+            catch
+            {
+                // If element is not found, expand tree view as it is nested.
+                var section = Session.FindElementByAccessibilityId(sectionName);
+                section.Click();
+
+                // Click into page and check for accessibility issues.
+                var page = Session.FindElementByAccessibilityId(pageName);
+                page.Click();
+
+                AxeHelper.AssertNoAccessibilityErrors();
+            }
+        }
+
+        public static string GetCustomDynamicDataDisplayName(MethodInfo methodInfo, object[] data)
+        {
+            return string.Format("Validate{0}PageAccessibility", data[1]);
+        }
+    }
+}
diff --git a/UITests/Tests/Button.cs b/UITests/Tests/Button.cs
index 1baa850db..09c0993b5 100644
--- a/UITests/Tests/Button.cs
+++ b/UITests/Tests/Button.cs
@@ -32,12 +32,6 @@ public static void ClassInitialize(TestContext context)
             Assert.IsNotNull(buttonElement);
         }
 
-        [TestMethod]
-        public void ValidateAccessibilityWithAxe()
-        {
-            AxeHelper.AssertNoAccessibilityErrors();
-        }
-
 		[TestMethod]
         public void Button_Click()
         {
diff --git a/UITests/Tests/CheckBox.cs b/UITests/Tests/CheckBox.cs
index ad626d57b..06630d9d0 100644
--- a/UITests/Tests/CheckBox.cs
+++ b/UITests/Tests/CheckBox.cs
@@ -34,12 +34,6 @@ public static void ClassInitialize(TestContext context)
             Assert.IsNotNull(checkBoxElement2);
         }
 
-		[TestMethod]
-		public void ValidateAccessibilityWithAxe()
-		{
-			AxeHelper.AssertNoAccessibilityErrors();
-		}
-
 		[TestMethod]
         public void Click()
         {
diff --git a/UITests/Tests/ComboBox.cs b/UITests/Tests/ComboBox.cs
index 3921663b1..0497730b2 100644
--- a/UITests/Tests/ComboBox.cs
+++ b/UITests/Tests/ComboBox.cs
@@ -36,17 +36,9 @@ public static void ClassInitialize(TestContext context)
             Assert.IsNotNull(comboBoxElement2);
         }
 
-		[TestMethod]
-		public void ValidateAccessibilityWithAxe()
-		{
-			AxeHelper.AssertNoAccessibilityErrors();
-		}
-
 		[TestMethod]
         public void Click()
         {
-
-
             // Click comboBoxElement1 to show the list and simply dismiss it
             var originalSelectedItem = comboBoxElement1.Text;
             comboBoxElement1.Click();
diff --git a/UITests/Tests/DatePicker.cs b/UITests/Tests/DatePicker.cs
index 11cf6abe6..2f9fce9d2 100644
--- a/UITests/Tests/DatePicker.cs
+++ b/UITests/Tests/DatePicker.cs
@@ -37,12 +37,6 @@ public static void ClassInitialize(TestContext context)
             Assert.IsNotNull(datePickerElement2);
         }
 
-		[TestMethod]
-		public void ValidateAccessibilityWithAxe()
-		{
-			AxeHelper.AssertNoAccessibilityErrors();
-		}
-
 		[TestMethod]
         public void Click()
         {
diff --git a/UITests/Tests/MediaPlayerElement.cs b/UITests/Tests/MediaPlayerElement.cs
index 24d6a4b16..a6203814f 100644
--- a/UITests/Tests/MediaPlayerElement.cs
+++ b/UITests/Tests/MediaPlayerElement.cs
@@ -35,12 +35,6 @@ public static void ClassInitialize(TestContext context)
 			GetElementByName("MediaPlayerElement").Click();
 		}
 
-		[TestMethod]
-		public void ValidateAccessibilityWithAxe()
-		{
-			AxeHelper.AssertNoAccessibilityErrors();
-		}
-
 		[TestMethod]
         public void PlayMedia()
         {
diff --git a/UITests/Tests/PersonPicture.cs b/UITests/Tests/PersonPicture.cs
index 22596fd33..83e91390f 100644
--- a/UITests/Tests/PersonPicture.cs
+++ b/UITests/Tests/PersonPicture.cs
@@ -28,12 +28,6 @@ public static void ClassInitialize(TestContext context)
 			OpenControlPage("PersonPicture");
 		}
 
-		[TestMethod]
-		public void ValidateAccessibilityWithAxe()
-		{
-			AxeHelper.AssertNoAccessibilityErrors();
-		}
-
 		[TestMethod]
 		public void SwitchOptions()
 		{
diff --git a/UITests/Tests/ProgressBar.cs b/UITests/Tests/ProgressBar.cs
index 25a01df2d..fc0194aa7 100644
--- a/UITests/Tests/ProgressBar.cs
+++ b/UITests/Tests/ProgressBar.cs
@@ -37,12 +37,6 @@ public static void ClassInitialize(TestContext context)
             Assert.IsNotNull(clickAndHoldButton);
 		}
 
-		[TestMethod]
-		public void ValidateAccessibilityWithAxe()
-		{
-			AxeHelper.AssertNoAccessibilityErrors();
-		}
-
 		[TestMethod]
         public void Displayed()
         {
diff --git a/UITests/Tests/RadioButton.cs b/UITests/Tests/RadioButton.cs
index 8f16ae2c7..cc28a8515 100644
--- a/UITests/Tests/RadioButton.cs
+++ b/UITests/Tests/RadioButton.cs
@@ -36,12 +36,6 @@ public static void ClassInitialize(TestContext context)
             Assert.IsNotNull(radioButtonElement2);
         }
 
-		[TestMethod]
-		public void ValidateAccessibilityWithAxe()
-		{
-			AxeHelper.AssertNoAccessibilityErrors();
-		}
-
 		[TestMethod]
         public void Click()
         {
diff --git a/UITests/Tests/Slider.cs b/UITests/Tests/Slider.cs
index 61df44aa4..6579ff7f3 100644
--- a/UITests/Tests/Slider.cs
+++ b/UITests/Tests/Slider.cs
@@ -36,12 +36,6 @@ public static void ClassInitialize(TestContext context)
             Assert.IsNotNull(sliderElement2);
         }
 
-		[TestMethod]
-		public void ValidateAccessibilityWithAxe()
-		{
-			AxeHelper.AssertNoAccessibilityErrors();
-		}
-
 		[TestMethod]
         public void Click()
         {
diff --git a/UITests/Tests/TextBlock.cs b/UITests/Tests/TextBlock.cs
index b597e7af5..f9f35cc8a 100644
--- a/UITests/Tests/TextBlock.cs
+++ b/UITests/Tests/TextBlock.cs
@@ -37,12 +37,6 @@ public static void ClassInitialize(TestContext context)
             Assert.IsNotNull(textBlockElement2);
         }
 
-		[TestMethod]
-		public void ValidateAccessibilityWithAxe()
-		{
-			AxeHelper.AssertNoAccessibilityErrors();
-		}
-
 		[TestMethod]
         public void Displayed()
         {
diff --git a/UITests/Tests/TextBox.cs b/UITests/Tests/TextBox.cs
index 863e572e0..6be2550f6 100644
--- a/UITests/Tests/TextBox.cs
+++ b/UITests/Tests/TextBox.cs
@@ -38,12 +38,6 @@ public static void ClassInitialize(TestContext context)
             Assert.IsNotNull(textBoxElement2);
         }
 
-		[TestMethod]
-		public void ValidateAccessibilityWithAxe()
-		{
-			AxeHelper.AssertNoAccessibilityErrors();
-		}
-
 		[TestMethod]
         public void Clear()
         {
diff --git a/UITests/Tests/ToggleButton.cs b/UITests/Tests/ToggleButton.cs
index 62ed86a66..588544873 100644
--- a/UITests/Tests/ToggleButton.cs
+++ b/UITests/Tests/ToggleButton.cs
@@ -33,12 +33,6 @@ public static void ClassInitialize(TestContext context)
             Assert.IsNotNull(toggleButtonElement);
         }
 
-		[TestMethod]
-		public void ValidateAccessibilityWithAxe()
-		{
-			AxeHelper.AssertNoAccessibilityErrors();
-		}
-
 		[TestMethod]
         public void Click()
         {
diff --git a/UITests/Tests/ToggleSwitch.cs b/UITests/Tests/ToggleSwitch.cs
index da5445c09..db22e3b1c 100644
--- a/UITests/Tests/ToggleSwitch.cs
+++ b/UITests/Tests/ToggleSwitch.cs
@@ -33,12 +33,6 @@ public static void ClassInitialize(TestContext context)
             Assert.IsNotNull(toggleSwitchElement);
         }
 
-		[TestMethod]
-		public void ValidateAccessibilityWithAxe()
-		{
-			AxeHelper.AssertNoAccessibilityErrors();
-		}
-
 		[TestMethod]
         public void Click()
         {
diff --git a/UITests/UITests.csproj b/UITests/UITests.csproj
index 9994eb5a2..7c6e325d3 100644
--- a/UITests/UITests.csproj
+++ b/UITests/UITests.csproj
@@ -8,6 +8,13 @@
         <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
     </PropertyGroup>
 
+    <!-- Build output related paths -->
+    <PropertyGroup>
+        <ProjectRoot>$(MSBuildThisFileDirectory)..\</ProjectRoot>
+        <ArtifactsBinRoot>$(MSBuildThisFileDirectory)\bin\</ArtifactsBinRoot>
+        <TestBinplaceDestinationPath>\$(Platform)\$(Configuration)\$(TargetFramework)</TestBinplaceDestinationPath>
+    </PropertyGroup>
+
     <ItemGroup>
         <PackageReference Include="Appium.WebDriver" Version="4.4.0" />
         <PackageReference Include="Axe.Windows" Version="2.1.0" />
@@ -15,4 +22,8 @@
         <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
         <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
     </ItemGroup>
+
+  <Target Name="CopyControlInfoData" AfterTargets="AfterBuild">
+      <Copy SourceFiles="$(ProjectRoot)\WinUIGallery\DataModel\ControlInfoData.json" DestinationFiles="$(ArtifactsBinRoot)\$(TestBinplaceDestinationPath)\ControlInfoData.json" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/WinUIGallery/App.xaml.cs b/WinUIGallery/App.xaml.cs
index 81fd71318..854573932 100644
--- a/WinUIGallery/App.xaml.cs
+++ b/WinUIGallery/App.xaml.cs
@@ -113,11 +113,6 @@ protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs ar
             startupWindow = WindowHelper.CreateWindow();
             startupWindow.ExtendsContentIntoTitleBar = true;
 #if DEBUG
-            //if (System.Diagnostics.Debugger.IsAttached)
-            //{
-            //    this.DebugSettings.EnableFrameRateCounter = true;
-            //}
-
             if (System.Diagnostics.Debugger.IsAttached)
             {
                 this.DebugSettings.BindingFailed += DebugSettings_BindingFailed;
@@ -150,7 +145,7 @@ private async void EnsureWindow(IActivatedEventArgs args = null)
 
             ThemeHelper.Initialize();
 
-            Type targetPageType = typeof(NewControlsPage);
+            Type targetPageType = typeof(HomePage);
             string targetPageArguments = string.Empty;
 
             if (args != null)
@@ -203,7 +198,7 @@ private async void EnsureWindow(IActivatedEventArgs args = null)
             NavigationRootPage rootPage = StartupWindow.Content as NavigationRootPage;
             rootPage.Navigate(targetPageType, targetPageArguments);
 
-            if (targetPageType == typeof(NewControlsPage))
+            if (targetPageType == typeof(HomePage))
             {
                 ((Microsoft.UI.Xaml.Controls.NavigationViewItem)((NavigationRootPage)App.StartupWindow.Content).NavigationView.MenuItems[0]).IsSelected = true;
             }
diff --git a/WinUIGallery/Assets/ControlImages/Placeholder.png b/WinUIGallery/Assets/ControlImages/Placeholder.png
new file mode 100644
index 0000000000000000000000000000000000000000..16894dac6297ac130a947599873bbac386d846ba
GIT binary patch
literal 5368
zcmV<U6bI{xP)<h;3K|Lk000e1NJLTq002$^002)21^@s6MfUT!00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH6pcwlK~#7F?Oc0|
z9@TZf_j~Ue8$SdTN`iM;d+quG#iUXns*tLRBEmmaA+>1~0u%=Wc6J>oaUUxerAcXO
zLZiB>y&H@`EEs`;*9K#d&Dz0_7{?|ePAsru2_qtu-SzIb`|bCfn{)2-+?iS1>wPB5
zwZ^mG%$+;;{^mS>=iEEP*ze2lOyRI4?!5EPB<yiZw6(P**fcAgO{0PUZQQsqx#8db
z^Oj^Lbwj0Gojueyu;bvt-N%m|J63}#0h=aex&SAo47T(WPd@$KR5JaL5Q0@}0V|iQ
ztXL>){_eN`xfP_a`tr*!BY1*MahVRlalK^$wDwFUyNc^x1p$Cpt+7(E%7zMs&Q0Im
za3375z*c2bT#{^Riv;c3Yp=~dy5WiTY%aGdk>HGTvw;}G??f^I`{c5l|Ku+l&zwHF
zYjALI%B60~Bo0)OV?of?tbJ^2DwDaJCtP<BI8;}&)v5t27AtIUsL;9nxy|>TJ$tqc
z)oN^t%2Y`lKY8+G0=C?v|MEn8CY!w*fr@*K+~_S=l9vR@Te$ef#*fdO+BGmRfM=$}
zVN3;Z9K0t#e*AcL_1b>|o0gF_%>op6fmU1GClU$RCzdVzqZ=E}oc{Uipth*8ldiUt
zs;XK&(R*gU^<UrLnog%zjU;L08mqQgYC&MtwooX%u>HCJyC2kc(jCTR5=#jh*tE>I
zp8WpS6o6*^>G`j+py@_f5>z&uO|kmAx>a|6`N4K*Gpz~pq?Jj#8Is%6r%z|Uw)U}(
z^aa!tVZt*MF!MK8XO!9|mD)BfTHf$R*DFSCC&lJXhN?=ry87y?a}TwAvmHQNITC0J
z8w(o&&>VLqfP(?5ZB4M^aG4E(w|)A_f4v`0l>p@0`E2HRl!;bV=?Gw-UDNXTRs@am
zG*b{53JyXhe+yxc3sTQOh|-sY_OiJ&tDjM~a^0gF+u;Faq3sFRqzSzN+MUgtH_M11
zo6UOaX#i2bLr#&ZDAQ^o+z~362wnmo1QO*$3aHBR#v=#c*+nj&kTOxg;aHQvvob0o
z$gT=YS-8Zhqq1w<B1g{(awo3qB$8Z47&qShXAM6-_|EI_-~!-^69V3Z0Ed!>pgp+u
z(e`vi(tK%Rv4FYro;(U#)5@Y#T`hS?l5hONpEqo4-#lTGH{KT1I)XJ{2XdRut#m>b
zGWd*zh9jtkhU80u$?0)t=<LG~(qUj?0J18j3LD4|c5dFZQ6>i9Ty;Dh#&|jh4w9Cb
zKYxB^&AP|8LY8Btf7;n5VZDKH|MYLS*~{b>p(o~Q3!3bLl)6+Z!7|x2n|axcm1|nt
zI^aYaj;D}-v+)`%8=oTcX-IBYKaA>`ky#E}1l2bdRzDF@NwxC<3@JHjTgkDCGNO_<
zG&t1xO6QjQKmGL65>q^H%&I#cHcnCwNp2r`Y-=Wm0lUd=Fx5xmIR#O%IQwRRv_Hct
z%DC4Kl|s^l^0r8Q5}1-oEW3We^2Sfkp2oz0VABLR84;|0_!}r`cl$O?l{hC5GH=YM
zy^M))1#&E6syMCb5k0vj0lZ`~x$L^8rH$_$?%t&v98-ib78_^M-8luC$=sSzkOvzT
zDtAf<N_z<z*2fGbq1S6WDTw=xs=4Zm3e7m!ycE0avig+|wzO?Ev2C2RUThhQ#3j)Y
ztbcrCdkR1^CM`Sw_2)<c`YK7!Sc1zL0Z&A<+xlriY^M-bEY-8rJWr>j8Wt>V+`Ff1
z*Wts51@Js}NrPvjFOuBCmTh^gtpgo_$(Q+(p$#^Rvq4n#s6+`CF9bYd%Y*?(_;>X0
z6KTe#;TxKkHSFE9W7kbL-6YPOIWuat9hIu;&P(t4#CM+FnyJgl*wZ|4Pj!Sp0;7^q
z&}jSQ0_M{d@2K+(q$V?+phklBTZU#bw#AgxjNGc*|L)$7Q>RX4E=6reOGlCj+5<>A
zG9(FUDFwd(K{Y30B#e03ICWHQn**l35uA;!7NR+f$&88!^weXi$_m4U7mn_K{T~|}
z8%r?tc+qnhqmj4-W*!~@N07>pBqSN7@n}L2SqX^2r?yIj)Y44MxaL9<Dx5@7$G~Dd
zv<MMn;)qoG9Y}H#Nph0a)zz=M`7ds32hfb<U6e3gtc{Zq!2@dmw5*ae9yZq2IgBLo
zg4%HJxCs4<liaYhnG&#Q&Ms>Iv<pE{wJpXwn8X9xyk#r?v~k~_o#-%vi*Xni0!}&t
zoWi^JYposWoN@%rA2+c;EIQB;fV3H1J3!+d*~nK42ePqsbUwnI<Q^rWN<msQURO&X
zlH}_aERo=8l6+o=aUoTe%M$JfNz0(5*&aI;u%<Xhz4TbU&8TTOTSA>n1azv#v{B|?
z<J<|ey-+G{TH^W`bFpng<?}LX4rArt{OvvMIA+++>o7*rXBn^`J$f{K&jV{aGDvO{
z(X<c+i-!grW&ZJ$LP`vygY(amAI#+DVyQ{wTHO!EqGp9Tdo0@v+@yD@TxI#e!Ok~c
z*@m&Lne>j_AXZgzV&%w@Be^eqc{NB{#(GcXr3luX@-zyJLsW1UtF6ioc~u#UG5D&Q
zucAisBl79G;sN8@3EjuoT+S^~297NAdDk^9Y5dj4r+3|U+ikHnF9MuNcdvd#WjP$N
z^~KAdfnqU*GZvQ>k3o?RM%drR3`M~V-!NLAN6)*Cdp$7eD$d<yF1B6L*!}jdUANwP
zYb2BG**KImbjxl3@!uUb_Oy1%b;7q-EYwM7TWn0p2!#+@HN1L0k>%F35lPe6dH@Rt
zn(+GQ|IIybYpyo^H|I1U7?vSjNvBv{F1PZpZeP`L=+L3eEw|j_<@1shv@Kh<<XSgu
z?8sy=B4Dx9A+89gH>9(^O1rC#XsD-e=mh0>UOR%DfRkBy75*fT7)h!HkzjI$i_l0k
zpjLx*T1+{7zU-RMFKq03wX+MQ&Pbja9bd6xMe46_zpHh|%=+(0)ZK0DO~ajxL<tle
zZ97=V8xk|*OB1=ClYJnB_nS&s=%(Rb*?Nu_8uIN`un)%T2SgZ{2rZUi&Ne^H2J`t1
zCyu<i>BA2{ECZ;*sA}@;*|Ql4qaKRfTt73ap3Lv3`_u9ctu7eeP{z-~kAZnl!m6^a
zA5bb`n-RW5QS~JK6hwX9@qmoMwQbrpeGul}`aWu%Ugp7kKA+NSUs%d?x>zh`pzh}k
zNdEjM1;<CrK2c(O)bn$`(3iNl<Az}o^<zXiiEHMJdG^*mWD&X#XD%uf?jq{tIbjN3
z|MdgI1wL}MKp=tqT&Yw-euwFI>l`>#NEC~uPb!r_=IdoJOrEBBrev(XgoFVi2H)1#
zpgC~KfEe>61`h<nzcX$Dr98r+MO%>$JuIQz@e<Sbzz80ZHYw?-rnMTYRBAF2P=$Rh
zsD4bHg8@!}7*=|I{p)AS#fsGJK&zPphdC7_IwCv}ok|Laq16W-Qn84wA?+*Kbk_=U
zfgQ9t9XJrFn)=e{KX}(U(vAiVi7+nOE|)8;1U9Zxfh@|vz_u%{xWZ;nlH}nhPaHe+
zv&GB5aD677UX)0xQ|OwlT?*SH&RJNOCD`bZZ0DWYnZL~u>W%U51UCxn2k7A#mXS`g
zkQNv~VycH!oO$EIbEs)GNH<jgv=V|=ECFyhOE&o0(RX+J`zN1#QebNFwn&EhA%6D$
zj}I(Zd_zMzoo$xOsNy;&VmeEYbDN}7lEZx)!Zj8=+Jg5}5Q%X+;$#GisJ$Ry*g@Go
zk-DVMhF8{%dID(0;gXzM9PH0`?S13<7SPCkrtF&x{wV>*6^%tOfajiT|6XfvZ*Nzr
zSeDD>17fq{#5+P_1sx)_A<p0%&m~yYrujE;e;Py2on~sTrP>N?O?5)iMQ7W{Sqm7d
zW*`DN&Po|y4Jb>{P|^Ub9eZ~_-+I+mSM?!iz;$ihN+nJJJ7$o77xne^)x$s9yMNKr
z6%E-8NS>VJh(0+hU_^F8QIaPWkrF;fblQ1uLVR^4ZrEznQdke^=5<}u7BKTL^aGcY
zRt}^+D*|x1&-V{>?f&5p*3XzRqxZAVJ{yMWmG16t+l&{h>PZVxE|+m1oc!r~-A&EQ
z8`GK0LIjVYy%V7v7$fRO2I_TI51ohXT1W>eZuG(!;JF8+vy1+HqgfPp7vywOO3@KW
z?^#ix!8Vv5*tz?)XIh|QFKFN}#P1b|7;1hG!u?dhAiu+{KAX+XU3Kr;P4ni?yCaiJ
z%ak+YEV3}rvx9<paG7%|5^#aFFJ1b)z9QVN0X-~XOgkgbAy9j2etL1YTg{0c(}4!+
zIdHCP_iNi)XU&?`J9qBf0tgd2gUDP&1UOPq8Z)rf8StQ?J8&@zE^3iO;o&j(G7}dT
z(a^`2Cf|9CBsH$iNS-rnPf6Rt+1DD{w2D&CQVeLY4MQ|#ok1KpBNb_yA#E=D`ub`o
z-a803?~fbOX!G<sG;R}%Ec6J7N^&PTJVYxfIE2uX^CJ3a<A5ZRY5o+9$h&Y(#KfTJ
z3{cWa;0T6`7?0+6fO@uGe);9SkUAfRt-{WeKEKeMgMbNJY5U*_R1v%d%}X1Bsw`A%
zd37zSwxr|a2qC4;uroU-9xI7q)$=+Qb6og3$$V!MXh#s}7weRy;rkLp`GKx|yI(*@
z&<B7Op*m)M&pYRE!C5ZjFu+I(Xc)jdbf9VR^7)eI5prxEtu@pk!_Py5j{fE$$x{-_
zL)RGM?bQ`tCqhJ5{}$>^#ERz#fT!jAyAJMqb$y{wKu2H*?geM|FLruR-WnPXfU4Bq
zfA7%#>zkJ;k}Ro;&0V<x5SwO)FIdFW+Scts5u>v1oZV^EIJqSS%~s?}+Axf&f=$Da
z5>rJbNpAbQ_PyEJil9Ml1KLGRN{?pki0smpS6&&Q&3pgYq5aKE(B|cu%|wnRoK!9K
zm4Xp2%9L>*@h0SNng}p|a!!vqnWVnd*f?p^P(6*Lm7Js@XdnzdP*w6YHj1|qIU7Y0
z>Rl`Z8`CRDRpxx@o`;^AJ!kG0bKq^0NhN(&l|lqHoPwebK}0A71%^nPt<RXtvByXy
zQ;~rUqe?1_k~VDs$ZglQR;Xqq?SeKfTt>C%1~Z>bg=S@#*&l+Z)%Vi2|842(?dd|%
z$0w`SW(3jrU&lzo#8<+lcfwPSLfy<AV2s!;bv<^4yVE3Abv(_ahET$W3nPMdQ8q1H
zE_GpH08Rq|EFgH>pWWQr+ta%f?FV|TK*xb52$iuUGXrOYrZ_1x07}3EeLZ6~O~iCd
z)GP*GoNVd~8GF{WdMeMUY?=WLC<m%%0V4vae@QP3k4jZziX_Q1XU?1fVcP7wzVh&<
z*|TTgkp;C?FKf8x;`v+8W@#@Oh-lA*yV7_BXE}XGVCE)Nz^*|nm87&O%F(~`%^lCS
zKwtYHcpqY;v}thzA4`$Kg0U^wlG>>cesZ93(NafM&huE}B7(>~D)F8+4@E)(&nimE
zQ)%w14x>uLDiK*2%y$83Qa!J^=9<E~b?eGBV84_yR*5qX14RoZuO6P}oPW5lWz+1r
zb7Xj?90rShvqt{*|I>9;&rk|OSs{B3&6xz!EGX}ZsiAU75!<p>&x75swgRyoHRU*8
z8S@Jw+F@WvDquUXV|~weJhlE@Z(kR79KD*fK|x^W3yj?|#MGL6L4XYbW%kx*8rv2S
z%AwzDK+w>(A!z&dbhZF!)~2y>`T)XszFAXkYHGrc6(Bt8dHMOxtq5L8&SBKFRFDiU
zBY-g$0ZK3mvT!wtGr)7w5d=!oFzzhb)KFeJ0(4%$03=V_zJ2?+eKlgtsv1*FN@@md
zQf+5}!^q@Pa!p3Uu6iP**t1v6o_BwfRFg?QY07~Q#Hi;m*fg-WFtL)C>IvG=0~0KT
zk3RYc8Nj%HYGd4iGb9<`C4jU{Jsg^|@~dCpG-uwNJJOjH<ny>C$<9-T0gK^vmWOZ`
z5$M<xCs&Hal8y)lc6RT1u>~Y;Ty0vojQbnX#^&h{sz{sH`ONoP`+9n$%|lyM(<Ird
zq#!D3L{T`YG@Mx-Ln*6Caw}6qFtIXhB7(vEjy+w^8qkKv)24;XM8AS9c`9tR4^A98
z(6n%QgGs|DXaYs3rSw?LVH!B#vrvMl9E>ElXwyuVLsE{x9q+u^Ddz}GmIKn=6ZT<)
zi3Tnp`|5|kII(~J^-CbD0^lW0V!$lwQx%EQGMa+NA95)IQV!&4IQMA-b}4DC;KBPy
zYG^_~A2bop!7F4ALna1boAdWyUHjCm%V&QvSC;}wbBO^OPr1-cxTU5NG?Gul)DTdP
z{cpY40tp99LQV>3SSI{~Et>dN!QL2~*Zbl#|I^xk?p#-KxT+Ha#)xri*HlrGCe<@g
zl18WShQNEiwewj?IS6Qz^4*b1`_c_?C>&4)ye)F7-XC`U|N3)%!1GE~yDErgPK-y8
zp9Ip&5^w=bNs`+NhEY4Z-|B3|*pvC>c1)qv#g++I)tLLqcfkx*x$7&BNS=r9S4pRl
zP^o}G=v7m8j-cY%G*Hj=xm>QNzrWwi5lreQ(Wc^SUIIT~2H*v-ui;virbRbg2M(jz
z#icq4DFb%pJ<Afbs!Vt9fBU6xfK9`B&*5|D&P|F<3zw<-ew;9`JA$fJPXc(KZ(KY-
znMya~$(pulRp~h^8aOFw2wE$GhEsS`1sawq`_v<@QGs26DJh%)`uR_fc3(TcxgnWI
zH{-GdY18x?H3Tg`FxYkA?HADzNS@Z#)`qE}Df>$6RDUBAOE7QVJOLc6dg_B?2mas>
z8|N{eTBepJR3(7<f&2^a?tST-WMXB^`LwZ?=>VL-w^xoIKaR=J%E!O_#gCFH{w@>A
z-l3uVJ3T$W+H!F3tL;c`q3$q9T4gFF&6LUZsv{PB0Rud3vbVQ43tI-%7uT%_@U+#z
z!9n9W$34sOTVM3T<OBi;`z&mAOhp>_H%1-P?z7#~t#AZUf8X4E=X}~|#_!7*%WnXN
WIKOL*+5%Dl0000<MNUMnLSTY3T`<G|

literal 0
HcmV?d00001

diff --git a/WinUIGallery/Common/ActivityFeedLayout.cs b/WinUIGallery/Common/ActivityFeedLayout.cs
index 545569c18..b1c43e29a 100644
--- a/WinUIGallery/Common/ActivityFeedLayout.cs
+++ b/WinUIGallery/Common/ActivityFeedLayout.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Windows.Foundation;
 using Microsoft.UI.Xaml;
@@ -95,8 +95,7 @@ private static void OnPropertyChanged(DependencyObject obj, DependencyPropertyCh
         protected override void InitializeForContextCore(VirtualizingLayoutContext context)
         {
             base.InitializeForContextCore(context);
-
-            if (!(context.LayoutState is ActivityFeedLayoutState state))
+            if (!(context.LayoutState is ActivityFeedLayoutState))
             {
                 // Store any state we might need since (in theory) the layout could be in use by multiple
                 // elements simultaneously
@@ -169,7 +168,6 @@ protected override Size MeasureOverride(VirtualizingLayoutContext context, Size
                 for (int columnIndex = 0; columnIndex < 3; columnIndex++)
                 {
                     var index = firstItemIndex + columnIndex;
-                    var rect = boundsForCurrentRow[index % 3];
                     var container = context.GetOrCreateElementAt(index);
 
                     container.Measure(
diff --git a/WinUIGallery/Common/Category.cs b/WinUIGallery/Common/Category.cs
index da3221461..291e3e46b 100644
--- a/WinUIGallery/Common/Category.cs
+++ b/WinUIGallery/Common/Category.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.UI.Xaml.Controls;
 
 namespace AppUIBasics.Common
@@ -11,7 +11,6 @@ public class Category : CategoryBase
         public string Name { get; set; }
         public string Tooltip { get; set; }
         public Symbol Glyph { get; set; }
-        //public Type TargetType { get; set; }
     }
 
     public class Separator : CategoryBase { }
diff --git a/WinUIGallery/Common/ColorSlideTransitionHelper.cs b/WinUIGallery/Common/ColorSlideTransitionHelper.cs
index c8bf477a4..6c337c783 100644
--- a/WinUIGallery/Common/ColorSlideTransitionHelper.cs
+++ b/WinUIGallery/Common/ColorSlideTransitionHelper.cs
@@ -1,4 +1,4 @@
-//*********************************************************
+//*********************************************************
 //
 // Copyright (c) Microsoft. All rights reserved.
 // This code is licensed under the MIT License (MIT).
@@ -25,7 +25,6 @@ public class ColorSlideTransitionHelper
     {
         #region Member variables
 
-        UIElement hostForVisual;
         Compositor _compositor;
         ContainerVisual _containerForVisuals;
         ScalarKeyFrameAnimation _slideAnimation;
@@ -42,10 +41,6 @@ public class ColorSlideTransitionHelper
         /// </summary>
         public ColorSlideTransitionHelper(UIElement hostForVisual)
         {
-
-
-            this.hostForVisual = hostForVisual;
-
             // we have an element in the XAML tree that will host our Visuals
             var visual = ElementCompositionPreview.GetElementVisual(hostForVisual);
             _compositor = visual.Compositor;
diff --git a/WinUIGallery/Common/MenuItemTemplateSelector.cs b/WinUIGallery/Common/MenuItemTemplateSelector.cs
index 62e30580f..6ae43e0f9 100644
--- a/WinUIGallery/Common/MenuItemTemplateSelector.cs
+++ b/WinUIGallery/Common/MenuItemTemplateSelector.cs
@@ -1,4 +1,4 @@
-using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Markup;
 using System;
@@ -11,8 +11,6 @@ class MenuItemTemplateSelector : DataTemplateSelector
     {
         public DataTemplate ItemTemplate { get; set; }
 
-        //public string PaneTitle { get; set; }
-
         protected override DataTemplate SelectTemplateCore(object item)
         {
             return item is Separator ? SeparatorTemplate : item is Header ? HeaderTemplate : ItemTemplate;
diff --git a/WinUIGallery/Common/Win32.cs b/WinUIGallery/Common/Win32.cs
index 6fa9424e6..1146c78a1 100644
--- a/WinUIGallery/Common/Win32.cs
+++ b/WinUIGallery/Common/Win32.cs
@@ -19,7 +19,6 @@ internal static class Win32
 
         public const int WM_ACTIVATE = 0x0006;
         public const int WA_ACTIVE = 0x01;
-        //static int WA_CLICKACTIVE = 0x02;
         public const int WA_INACTIVE = 0x00;
 
         public const int WM_SETICON = 0x0080;
diff --git a/WinUIGallery/Common/WrapPanel.cs b/WinUIGallery/Common/WrapPanel.cs
index 5a2c1b26d..914e2dc25 100644
--- a/WinUIGallery/Common/WrapPanel.cs
+++ b/WinUIGallery/Common/WrapPanel.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
@@ -38,7 +38,6 @@ public class WrapPanel : Panel
         /// within a <see cref="T:WinRTXamlToolkit.Controls.WrapPanel" />.  The
         /// default value is <see cref="F:System.Double.NaN" />.
         /// </value>
-        //[TypeConverter(typeof(LengthConverter))]
         public double ItemHeight
         {
             get { return (double)GetValue(ItemHeightProperty); }
@@ -73,7 +72,6 @@ public double ItemHeight
         /// contained in a <see cref="T:WinRTXamlToolkit.Controls.WrapPanel" />.
         /// The default value is <see cref="F:System.Double.NaN" />.
         /// </value>
-        //[TypeConverter(typeof(LengthConverter))]
         public double ItemWidth
         {
             get { return (double)GetValue(ItemWidthProperty); }
diff --git a/WinUIGallery/ConnectedAnimationPages/CollectionPage.xaml b/WinUIGallery/ConnectedAnimationPages/CollectionPage.xaml
index 7f8686b0a..d179cceb3 100644
--- a/WinUIGallery/ConnectedAnimationPages/CollectionPage.xaml
+++ b/WinUIGallery/ConnectedAnimationPages/CollectionPage.xaml
@@ -1,4 +1,4 @@
-<Page
+<Page
     x:Class="AppUIBasics.ConnectedAnimationPages.CollectionPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -30,13 +30,12 @@
                             <StackPanel Orientation="Horizontal">
                                 <TextBlock Text="Views: " Style="{ThemeResource CaptionTextBlockStyle}" FontWeight="Bold"/>
                                 <TextBlock Text="{x:Bind Views}" Style="{ThemeResource CaptionTextBlockStyle}" Margin="5,0,0,0"/>
-                            </StackPanel>
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock Text="Likes: " Style="{ThemeResource CaptionTextBlockStyle}" FontWeight="Bold"/>
+
+                                <TextBlock Text="Likes: " Style="{ThemeResource CaptionTextBlockStyle}" FontWeight="Bold" Margin="8,0,0,0"/>
                                 <TextBlock Text="{x:Bind Likes}" Style="{ThemeResource CaptionTextBlockStyle}" Margin="5,0,0,0"/>
                             </StackPanel>
                             <StackPanel Orientation="Horizontal">
-                                <TextBlock Text="{x:Bind Description}" Style="{ThemeResource BodyTextBlockStyle}" FontStyle="Italic" Margin="0,12,0,0" TextTrimming="CharacterEllipsis" MaxWidth="500" MaxLines="1"/>
+                                <TextBlock Text="{x:Bind Description}" Style="{ThemeResource BodyTextBlockStyle}" FontStyle="Italic" Margin="0,8,0,0" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" MaxWidth="500" MaxHeight="40" IsTextTrimmedChanged="TextBlock_IsTextTrimmedChanged"/>
                             </StackPanel>
 
                         </StackPanel>
diff --git a/WinUIGallery/ConnectedAnimationPages/CollectionPage.xaml.cs b/WinUIGallery/ConnectedAnimationPages/CollectionPage.xaml.cs
index 5577dfed4..b852a902c 100644
--- a/WinUIGallery/ConnectedAnimationPages/CollectionPage.xaml.cs
+++ b/WinUIGallery/ConnectedAnimationPages/CollectionPage.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media.Animation;
@@ -59,8 +59,7 @@ private void collection_ItemClick(object sender, ItemClickEventArgs e)
                 // Prepare the connected animation.
                 // Notice that the stored item is passed in, as well as the name of the connected element. 
                 // The animation will actually start on the Detailed info page.
-                var animation = collection.PrepareConnectedAnimation("ForwardConnectedAnimation", _storeditem, "connectedElement");
-
+                collection.PrepareConnectedAnimation("ForwardConnectedAnimation", _storeditem, "connectedElement");
             }
 
             // Navigate to the DetailedInfoPage.
@@ -68,5 +67,12 @@ private void collection_ItemClick(object sender, ItemClickEventArgs e)
             Frame.Navigate(typeof(DetailedInfoPage), _storeditem, new SuppressNavigationTransitionInfo());
         }
 
+        private void TextBlock_IsTextTrimmedChanged(TextBlock sender, IsTextTrimmedChangedEventArgs args)
+        {
+            var textBlock = sender as TextBlock;
+            var text = textBlock.IsTextTrimmed ? textBlock.Text : string.Empty;
+
+            ToolTipService.SetToolTip(textBlock, text);
+        }
     }
 }
diff --git a/WinUIGallery/ContentIncludes.props b/WinUIGallery/ContentIncludes.props
index c886bc462..467eb0f1e 100644
--- a/WinUIGallery/ContentIncludes.props
+++ b/WinUIGallery/ContentIncludes.props
@@ -103,6 +103,7 @@
     <Content Include="Assets\ControlImages\Button.png" />
     <Content Include="Assets\ControlImages\CalendarDatePicker.png" />
     <Content Include="Assets\ControlImages\CalendarView.png" />
+    <!-- TODO: Need a camera capture icon. -->
     <Content Include="Assets\ControlImages\Canvas.png" />
     <Content Include="Assets\ControlImages\Checkbox.png" />
     <Content Include="Assets\ControlImages\Clipboard.png" />
@@ -150,6 +151,7 @@
     <Content Include="Assets\ControlImages\PersonPicture.png" />
     <Content Include="Assets\ControlImages\PipsPager.png" />
     <Content Include="Assets\ControlImages\Pivot.png" />
+    <Content Include="Assets\ControlImages\Placeholder.png" />
     <Content Include="Assets\ControlImages\ProgressBar.png" />
     <Content Include="Assets\ControlImages\ProgressRing.png" />
     <Content Include="Assets\ControlImages\PullToRefresh.png" />
@@ -302,6 +304,8 @@
     <Content Include="ControlPagesSampleCode\ListView\ListViewSample4_cs.txt" />
     <Content Include="ControlPagesSampleCode\ListView\ListViewSample4_xaml.txt" />
     <Content Include="ControlPagesSampleCode\ListView\ListViewStickyHeaderSample_xaml.txt" />
+    <Content Include="ControlPagesSampleCode\Media\CaptureElementPreviewSample_cs.txt" />
+    <Content Include="ControlPagesSampleCode\Media\CaptureElementPreviewSample_xaml.txt" />
     <Content Include="ControlPagesSampleCode\MenuBar\MenuBarSample1.txt" />
     <Content Include="ControlPagesSampleCode\MenuBar\MenuBarSample2.txt" />
     <Content Include="ControlPagesSampleCode\MenuBar\MenuBarSample3.txt" />
@@ -368,7 +372,8 @@
     <Content Include="ControlPagesSampleCode\Window\CreateWindowSample1.txt" />
     <Content Include="ControlPagesSampleCode\Window\TitleBar\TitleBarSample1.txt" />
     <Content Include="ControlPagesSampleCode\Window\TitleBar\TitleBarSample2.txt" />
+    <Content Include="ControlPagesSampleCode\Window\TitleBar\TitleBarSample3.txt" />
     <Content Include="Common\ReadMe.txt" />
     <Content Include="DataModel\ControlInfoData.json" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/WinUIGallery/ControlPages/AnnotatedScrollBarPage.xaml.cs b/WinUIGallery/ControlPages/AnnotatedScrollBarPage.xaml.cs
index 5f0336140..e66687201 100644
--- a/WinUIGallery/ControlPages/AnnotatedScrollBarPage.xaml.cs
+++ b/WinUIGallery/ControlPages/AnnotatedScrollBarPage.xaml.cs
@@ -8,6 +8,7 @@
 //
 //*********************************************************
 
+using System;
 using System.Collections.ObjectModel;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Controls.Primitives;
@@ -181,7 +182,7 @@ private string GetItemColor(int itemIndex)
 
         private int GetItemsPerRow()
         {
-            return (itemsRepeater == null || itemsRepeater.ActualWidth == 0) ? 1 : (int) (itemsRepeater.ActualWidth / ItemWidth);
+            return (itemsRepeater == null || itemsRepeater.ActualWidth == 0) ? 1 : (int) Math.Max(itemsRepeater.ActualWidth / ItemWidth, 1);
         }
     }
 }
diff --git a/WinUIGallery/ControlPages/AppBarSeparatorPage.xaml.cs b/WinUIGallery/ControlPages/AppBarSeparatorPage.xaml.cs
index f3c7b0267..5d5810848 100644
--- a/WinUIGallery/ControlPages/AppBarSeparatorPage.xaml.cs
+++ b/WinUIGallery/ControlPages/AppBarSeparatorPage.xaml.cs
@@ -20,16 +20,5 @@ public AppBarSeparatorPage()
         {
             this.InitializeComponent();
         }
-        private void CompactButton_Click(object sender, RoutedEventArgs e)
-        {
-            if ((sender as AppBarToggleButton).IsChecked == true)
-            {
-                Control1.DefaultLabelPosition = CommandBarDefaultLabelPosition.Collapsed;
-            }
-            else
-            {
-                Control1.DefaultLabelPosition = CommandBarDefaultLabelPosition.Bottom;
-            }
-        }
     }
 }
diff --git a/WinUIGallery/ControlPages/AppBarToggleButtonPage.xaml.cs b/WinUIGallery/ControlPages/AppBarToggleButtonPage.xaml.cs
index fed643b34..195750aa8 100644
--- a/WinUIGallery/ControlPages/AppBarToggleButtonPage.xaml.cs
+++ b/WinUIGallery/ControlPages/AppBarToggleButtonPage.xaml.cs
@@ -21,17 +21,6 @@ public AppBarToggleButtonPage()
             this.InitializeComponent();
         }
 
-        private void CompactButton_Click(object sender, RoutedEventArgs e)
-        {
-            if (sender is ToggleButton toggle && toggle.IsChecked != null)
-            {
-                Button1.IsCompact =
-                Button2.IsCompact =
-                Button3.IsCompact =
-                Button4.IsCompact = (bool)toggle.IsChecked;
-            }
-        }
-
         private void AppBarButton_Click(object sender, RoutedEventArgs e)
         {
             if (sender is AppBarToggleButton b)
diff --git a/WinUIGallery/ControlPages/CaptureElementPreviewPage.xaml b/WinUIGallery/ControlPages/CaptureElementPreviewPage.xaml
new file mode 100644
index 000000000..918b45f76
--- /dev/null
+++ b/WinUIGallery/ControlPages/CaptureElementPreviewPage.xaml
@@ -0,0 +1,31 @@
+<Page x:Class="AppUIBasics.ControlPages.CaptureElementPreviewPage"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="using:AppUIBasics"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d">
+    <StackPanel>
+        <local:ControlExample x:Name="Example1" HeaderText="A MediaCapture preview displayed via a MediaPlayerElement." XamlSource="Media/CaptureElementPreviewSample_xaml.txt" CSharpSource="Media/CaptureElementPreviewSample_cs.txt">
+            <local:ControlExample.Example>
+                <Grid RowDefinitions="Auto,*" ColumnDefinitions="*,100"  MinWidth="400" MinHeight="300" RowSpacing="10" ColumnSpacing="4">
+                    <TextBlock x:Name="frameSourceName" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center"/>
+                    <MediaPlayerElement x:Name="captureElement" Grid.Row="1" Grid.Column="0" Stretch="Uniform" AutoPlay="True" />
+                    <TextBlock x:Name="capturedText" Visibility="Collapsed" Grid.Row="0" Grid.Column="1" VerticalAlignment="Center" Text="Captured:" />
+                    <Grid x:Name="captureContainer" Grid.Row="1" Grid.Column="1">
+                        <ScrollViewer VerticalScrollMode="Enabled">
+                            <StackPanel x:Name="snapshots" Spacing="2"/>
+                        </ScrollViewer>
+                    </Grid>
+                </Grid>
+            </local:ControlExample.Example>
+            <local:ControlExample.Options>
+                <StackPanel>
+                    <ToggleSwitch x:Name="mirrorSwitch" Header="Mirror preview" IsOn="False" Toggled="MirrorToggleSwitch_Toggled" ToolTipService.ToolTip="Mirrors only the preview, not captured photos"/>
+                    <Button x:Name="captureButton" Content="Capture Photo" Click="CapturePhoto_Click" />
+                </StackPanel>
+            </local:ControlExample.Options>
+            <local:ControlExample.Substitutions>
+                <local:ControlExampleSubstitution Key="MirrorPreview" Value="{x:Bind MirrorTextReplacement, Mode=OneWay}"/>
+            </local:ControlExample.Substitutions>
+        </local:ControlExample>
+    </StackPanel>
+</Page>
diff --git a/WinUIGallery/ControlPages/CaptureElementPreviewPage.xaml.cs b/WinUIGallery/ControlPages/CaptureElementPreviewPage.xaml.cs
new file mode 100644
index 000000000..b1871de87
--- /dev/null
+++ b/WinUIGallery/ControlPages/CaptureElementPreviewPage.xaml.cs
@@ -0,0 +1,130 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using Windows.Media.Capture.Frames;
+using Windows.Media.Capture;
+using Microsoft.UI.Xaml.Media.Imaging;
+using Windows.Media.MediaProperties;
+using Windows.Storage.Streams;
+using System.ComponentModel;
+using AppUIBasics.Helper;
+
+namespace AppUIBasics.ControlPages
+{
+    public sealed partial class CaptureElementPreviewPage : Page, INotifyPropertyChanged
+    {
+        public CaptureElementPreviewPage()
+        {
+            this.InitializeComponent();
+
+            StartCaptureElement();
+
+            // Move the ScrollViewer from the captureContainer under an ExpandToFillContainer.
+            // This will allow the snapshots column to use all available height without
+            // influencing the height.
+            var expandToFillContainer = new ExpandToFillContainer();
+            var sv = captureContainer.Children[0];
+            captureContainer.Children.Remove(sv);
+            captureContainer.Children.Add(expandToFillContainer);
+            expandToFillContainer.Children.Add(sv);
+        }
+
+        private MediaFrameSourceGroup mediaFrameSourceGroup;
+        private MediaCapture mediaCapture;
+
+        async private void StartCaptureElement()
+        {
+            var groups = await MediaFrameSourceGroup.FindAllAsync();
+            if (groups.Count == 0)
+            {
+                frameSourceName.Text = "No camera devices found.";
+                return;
+            }
+            mediaFrameSourceGroup = groups.First();
+
+            frameSourceName.Text = "Viewing: " + mediaFrameSourceGroup.DisplayName;
+            mediaCapture = new MediaCapture();
+            var mediaCaptureInitializationSettings = new MediaCaptureInitializationSettings()
+            {
+                SourceGroup = this.mediaFrameSourceGroup,
+                SharingMode = MediaCaptureSharingMode.SharedReadOnly,
+                StreamingCaptureMode = StreamingCaptureMode.Video,
+                MemoryPreference = MediaCaptureMemoryPreference.Cpu
+            };
+            await mediaCapture.InitializeAsync(mediaCaptureInitializationSettings);
+
+            // Set the MediaPlayerElement's Source property to the MediaSource for the mediaCapture.
+            var frameSource = mediaCapture.FrameSources[this.mediaFrameSourceGroup.SourceInfos[0].Id];
+            captureElement.Source = Windows.Media.Core.MediaSource.CreateFromMediaFrameSource(frameSource);
+        }
+
+        public string MirrorTextReplacement = ""; // starts not mirrored, so no text in that case
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        public void OnPropertyChanged(string PropertyName)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(PropertyName));
+        }
+
+        private void MirrorToggleSwitch_Toggled(object sender, RoutedEventArgs e)
+        {
+            if (mirrorSwitch.IsOn)
+            {
+                captureElement.RenderTransform = new ScaleTransform() { ScaleX = -1 };
+                captureElement.RenderTransformOrigin = new Point(0.5, 0.5);
+                MirrorTextReplacement =
+                    "\n" +
+                    "        // Mirror the preview\n" +
+                    "        captureElement.RenderTransform = new ScaleTransform() { ScaleX = -1 };\n" +
+                    "        captureElement.RenderTransformOrigin = new Point(0.5, 0.5);\n";
+            }
+            else
+            {
+                captureElement.RenderTransform = null;
+                MirrorTextReplacement = "";
+            }
+            OnPropertyChanged("MirrorTextReplacement");
+        }
+
+        async private void CapturePhoto_Click(object sender, RoutedEventArgs e)
+        {
+            // Capture a photo to a stream
+            var imgFormat = ImageEncodingProperties.CreateJpeg();
+            var stream = new InMemoryRandomAccessStream();
+            await mediaCapture.CapturePhotoToStreamAsync(imgFormat, stream);
+            stream.Seek(0);
+
+            // Show the photo in an Image element
+            BitmapImage bmpImage = new BitmapImage();
+            await bmpImage.SetSourceAsync(stream);
+            var image = new Image() { Source = bmpImage };
+            snapshots.Children.Insert(0, image);
+
+            capturedText.Visibility = Visibility.Visible;
+
+            UIHelper.AnnounceActionForAccessibility(captureButton, "Photo successfully captured.", "CameraPreviewSampleCaptureNotificationId");
+        }
+    }
+
+    class ExpandToFillContainer : Grid
+    {
+        protected override Size MeasureOverride(Size availableSize)
+        {
+            // Measure with the minimum height so it will just expand to whatever space is available.
+            var desiredSize = base.MeasureOverride(new Size(availableSize.Width, 100));
+            return desiredSize;
+        }
+    }
+}
diff --git a/WinUIGallery/ControlPages/ClipboardPage.xaml.cs b/WinUIGallery/ControlPages/ClipboardPage.xaml.cs
index f5a84a8a0..11b6d9a22 100644
--- a/WinUIGallery/ControlPages/ClipboardPage.xaml.cs
+++ b/WinUIGallery/ControlPages/ClipboardPage.xaml.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using System.Xml.Linq;
+using AppUIBasics.Helper;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Windows.ApplicationModel.DataTransfer;
@@ -26,6 +27,8 @@ private void CopyText_Click(object sender, RoutedEventArgs args)
             package.SetText(textToCopy);
             Clipboard.SetContent(package);
 
+            UIHelper.AnnounceActionForAccessibility(sender as Button, "Text copied to clipboard", "TextCopiedSuccessNotificationId");
+
             VisualStateManager.GoToState(this, "ConfirmationClipboardVisible", false);
             Microsoft.UI.Dispatching.DispatcherQueue dispatcherQueue = Microsoft.UI.Dispatching.DispatcherQueue.GetForCurrentThread();
 
@@ -48,6 +51,8 @@ private async void PasteText_Click(object sender, RoutedEventArgs args)
             {
                 var text = await package.GetTextAsync();
                 PasteClipboard2.Text = text;
+
+                UIHelper.AnnounceActionForAccessibility(sender as Button, "Text pasted from clipboard", "TextPastedSuccessNotificationId");
             }
 
         }
diff --git a/WinUIGallery/ControlPages/ComboBoxPage.xaml.cs b/WinUIGallery/ControlPages/ComboBoxPage.xaml.cs
index 713827ba9..dc3e84f30 100644
--- a/WinUIGallery/ControlPages/ComboBoxPage.xaml.cs
+++ b/WinUIGallery/ControlPages/ComboBoxPage.xaml.cs
@@ -112,7 +112,7 @@ private void Combo3_TextSubmitted(ComboBox sender, ComboBoxTextSubmittedEventArg
                 dialog.CloseButtonText = "Close";
                 dialog.DefaultButton = ContentDialogButton.Close;
                 dialog.XamlRoot = sender.XamlRoot;
-                var task = dialog.ShowAsync();
+                _ = dialog.ShowAsync();
             }
 
             // Mark the event as handled so the framework doesn’t update the selected item automatically. 
diff --git a/WinUIGallery/ControlPages/CommandBarPage.xaml.cs b/WinUIGallery/ControlPages/CommandBarPage.xaml.cs
index b1bcfc7b7..475b7dfbd 100644
--- a/WinUIGallery/ControlPages/CommandBarPage.xaml.cs
+++ b/WinUIGallery/ControlPages/CommandBarPage.xaml.cs
@@ -58,7 +58,6 @@ private void CloseButton_Click(object sender, RoutedEventArgs e)
 
         private void OnElementClicked(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
         {
-            var selectedFlyoutItem = sender as AppBarButton;
             SelectedOptionText.Text = "You clicked: " + (sender as AppBarButton).Label;
         }
 
diff --git a/WinUIGallery/ControlPages/CreateMultipleWindowsPage.xaml.cs b/WinUIGallery/ControlPages/CreateMultipleWindowsPage.xaml.cs
index 3c51681b8..616732cce 100644
--- a/WinUIGallery/ControlPages/CreateMultipleWindowsPage.xaml.cs
+++ b/WinUIGallery/ControlPages/CreateMultipleWindowsPage.xaml.cs
@@ -1,4 +1,4 @@
-//*********************************************************
+//*********************************************************
 //
 // Copyright (c) Microsoft. All rights reserved.
 // THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF
@@ -23,11 +23,6 @@ public CreateMultipleWindowsPage()
             this.InitializeComponent();
         }
 
-        private void List_GotFocus(object sender, RoutedEventArgs e)
-        {
-            Control1.StartBringIntoView();
-        }
-
         private void createNewWindow_Click(object sender, RoutedEventArgs e)
         {
             var newWindow = WindowHelper.CreateWindow();
@@ -36,7 +31,7 @@ private void createNewWindow_Click(object sender, RoutedEventArgs e)
             newWindow.Content = rootPage;
             newWindow.Activate();
 
-            var targetPageType = typeof(NewControlsPage);
+            var targetPageType = typeof(HomePage);
             string targetPageArguments = string.Empty;
             rootPage.Navigate(targetPageType, targetPageArguments);
         }
diff --git a/WinUIGallery/ControlPages/DesignGuidance/AccessibilityKeyboardPage.xaml b/WinUIGallery/ControlPages/DesignGuidance/AccessibilityKeyboardPage.xaml
index 4267e12cb..027b1064f 100644
--- a/WinUIGallery/ControlPages/DesignGuidance/AccessibilityKeyboardPage.xaml
+++ b/WinUIGallery/ControlPages/DesignGuidance/AccessibilityKeyboardPage.xaml
@@ -470,6 +470,7 @@
                     <Button
                         Grid.Row="1"
                         Click="MakeRedButton_Click"
+                        AutomationProperties.AcceleratorKey="Ctrl+R"
                         Content="Red">
                         <Button.KeyboardAccelerators>
                             <KeyboardAccelerator Key="R" Modifiers="Control" />
@@ -480,6 +481,7 @@
                         Grid.Row="1"
                         Grid.Column="1"
                         Click="MakeBlueButton_Click"
+                        AutomationProperties.AcceleratorKey="Ctrl+B"
                         Content="Blue">
                         <Button.KeyboardAccelerators>
                             <KeyboardAccelerator Key="B" Modifiers="Control" />
@@ -496,6 +498,7 @@
                         Grid.Column="2"
                         Click="MakeChartreuseButton_Click"
                         Content="Chartreuse"
+                        AutomationProperties.AcceleratorKey="Ctrl+G"
                         ToolTipService.ToolTip="A greenish-yellow (Ctrl+G)">
                         <Button.KeyboardAccelerators>
                             <KeyboardAccelerator Key="G" Modifiers="Control" />
diff --git a/WinUIGallery/ControlPages/DesignGuidance/IconsPage.xaml b/WinUIGallery/ControlPages/DesignGuidance/IconsPage.xaml
index 15f78bf2d..62da45b9d 100644
--- a/WinUIGallery/ControlPages/DesignGuidance/IconsPage.xaml
+++ b/WinUIGallery/ControlPages/DesignGuidance/IconsPage.xaml
@@ -41,37 +41,15 @@
         </Style>
 
         <DataTemplate x:Key="IconTemplate">
-            <UserControl PointerPressed="Icons_TemplatePointerPressed">
-                <Grid
-                    x:Name="IconTemplateRoot"
-                    Width="96"
-                    Height="96"
-                    Margin="4"
-                    HorizontalAlignment="Stretch"
-                    x:DefaultBindMode="OneWay"
-                    Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-                    BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-                    BorderThickness="1"
-                    CornerRadius="4"
-                    ToolTipService.ToolTip="{Binding Name}">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="*" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="*" />
-                    </Grid.RowDefinitions>
-
-                    <VisualStateManager.VisualStateGroups>
-                        <VisualStateGroup x:Name="SelectionState">
-                            <VisualState x:Name="Default" />
-                            <VisualState x:Name="Selected">
-                                <VisualState.Setters>
-                                    <Setter Target="IconTemplateRoot.Background" Value="{ThemeResource AccentFillColorDefaultBrush}" />
-                                    <Setter Target="IconGlyph.Foreground" Value="{ThemeResource TextOnAccentFillColorPrimaryBrush}" />
-                                    <Setter Target="IconName.Foreground" Value="{ThemeResource TextOnAccentFillColorPrimaryBrush}" />
-                                </VisualState.Setters>
-                            </VisualState>
-                        </VisualStateGroup>
-                    </VisualStateManager.VisualStateGroups>
+            <ItemContainer
+                AutomationProperties.Name="{Binding Name}"
+                ToolTipService.ToolTip="{Binding Name}"
+                Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                Width="96"
+                Height="96"
+                Margin="4">
+                <Grid>
                     <!--  Icon  -->
                     <Viewbox
                         Grid.Row="1"
@@ -98,7 +76,7 @@
                         TextTrimming="CharacterEllipsis"
                         TextWrapping="NoWrap" />
                 </Grid>
-            </UserControl>
+            </ItemContainer>
         </DataTemplate>
     </Page.Resources>
 
@@ -110,6 +88,7 @@
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
         <TextBlock Text="With the release of Windows 11, Segoe Fluent Icons is the recommended icon font." />
+
         <toolkit:SettingsExpander
             Grid.Row="1"
             Header="Instructions on how to use Segoe Fluent Icons"
@@ -134,7 +113,8 @@
                             <Paragraph>
                                 If you don't specify a FontFamily,
                                 or you specify a FontFamily that is not available on the system at runtime,
-                                the <Hyperlink NavigateUri="https://learn.microsoft.com/uwp/api/windows.ui.xaml.controls.fonticon">FontIcon</Hyperlink> falls back to the default font family defined by the SymbolThemeFontFamily resource.</Paragraph>
+                                the <Hyperlink NavigateUri="https://learn.microsoft.com/windows/windows-app-sdk/api/winrt/microsoft.ui.xaml.controls.fonticon">FontIcon</Hyperlink> falls back to the default font family defined by the SymbolThemeFontFamily resource.
+                            </Paragraph>
                             <Paragraph>
                                 An icon with a 16-epx font size is the equivalent of a 16x16-epx icon, to make sizing and positioning more predictable.
                                 For optimal appearance, use these specific sizes: 16, 20, 24, 32, 40, 48, and 64. Deviating from these font sizes could lead to less crisp or blurry outcomes.
@@ -154,6 +134,7 @@
             Spacing="8">
             <TextBlock Style="{ThemeResource BodyStrongTextBlockStyle}" Text="Fluent Icons Library" />
             <AutoSuggestBox
+                x:Name="IconsAutoSuggestBox"
                 MinWidth="304"
                 MaxWidth="320"
                 HorizontalAlignment="Left"
@@ -165,7 +146,8 @@
         <controls1:SampleThemeListener
             Grid.Row="3"
             MaxHeight="600"
-            VerticalAlignment="Top">
+            VerticalAlignment="Top"
+            IsTabStop="True">
             <Grid
                 Background="{ThemeResource ControlExampleDisplayBrush}"
                 BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
@@ -180,18 +162,18 @@
                     HorizontalAlignment="Stretch"
                     VerticalAlignment="Stretch"
                     AutomationProperties.Name="Icons">
-                    <ItemsRepeater
-                        x:Name="IconsRepeater"
+                    <ItemsView
+                        x:Name="IconsItemsView"
                         MinWidth="100"
                         Margin="0,0,0,36"
                         HorizontalAlignment="Stretch"
-                        ElementIndexChanged="IconsRepeater_ElementIndexChanged"
-                        ElementPrepared="IconsRepeater_ElementPrepared"
-                        ItemTemplate="{StaticResource IconTemplate}">
-                        <ItemsRepeater.Layout>
+                        SelectionChanged="IconsItemsView_SelectionChanged"
+                        ItemTemplate="{StaticResource IconTemplate}"
+                        TabFocusNavigation="Once">
+                        <ItemsView.Layout>
                             <UniformGridLayout Orientation="Horizontal" />
-                        </ItemsRepeater.Layout>
-                    </ItemsRepeater>
+                        </ItemsView.Layout>
+                    </ItemsView>
                 </ScrollViewer>
 
                 <Grid
diff --git a/WinUIGallery/ControlPages/DesignGuidance/IconsPage.xaml.cs b/WinUIGallery/ControlPages/DesignGuidance/IconsPage.xaml.cs
index 66029dbb5..f653ba7da 100644
--- a/WinUIGallery/ControlPages/DesignGuidance/IconsPage.xaml.cs
+++ b/WinUIGallery/ControlPages/DesignGuidance/IconsPage.xaml.cs
@@ -13,6 +13,7 @@
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading.Tasks;
+using AppUIBasics.Helper;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
@@ -48,10 +49,10 @@ public IconsPage()
             // Fill filtered items
             IconsDataSource.Icons.ForEach(item => FilteredItems.Add(item));
             this.InitializeComponent();
-            IconsRepeater.Loaded += ItemsGridView_Loaded;
+            IconsItemsView.Loaded += IconsItemsView_Loaded;
         }
 
-        private void ItemsGridView_Loaded(object sender, RoutedEventArgs e)
+        private void IconsItemsView_Loaded(object sender, RoutedEventArgs e)
         {
             // Delegate loading of icons, so we have smooth navigating to this page
             // and not unnecessarily block UI Thread
@@ -59,7 +60,7 @@ private void ItemsGridView_Loaded(object sender, RoutedEventArgs e)
             {
                 _ = DispatcherQueue.TryEnqueue(Microsoft.UI.Dispatching.DispatcherQueuePriority.High, () =>
                 {
-                    IconsRepeater.ItemsSource = FilteredItems;
+                    IconsItemsView.ItemsSource = FilteredItems;
                     SelectedItem = FilteredItems[0];
                     SetSampleCodePresenterCode(FilteredItems[0]);
                 });
@@ -93,41 +94,30 @@ public void Filter(string search)
                     FilteredItems.Add(item);
                 }
             }
-            if (FilteredItems.Count > 0)
+
+            string outputString;
+            var filteredItemsCount = FilteredItems.Count;
+
+            if (filteredItemsCount > 0)
             {
                 SelectedItem = FilteredItems[0];
+                outputString = filteredItemsCount > 1 ? filteredItemsCount + " icons found." : "1 icon found.";
             }
-        }
-
-        private void Icons_TemplatePointerPressed(object sender, PointerRoutedEventArgs e)
-        {
-            var oldIndex = FilteredItems.IndexOf(SelectedItem);
-            var previousItem = IconsRepeater.TryGetElement(oldIndex);
-            if(previousItem != null)
+            else
             {
-                MoveToSelectionState(previousItem, false);
+                outputString = "No icon found.";
             }
 
-            var itemIndex = IconsRepeater.GetElementIndex(sender as UIElement);
-            SelectedItem = FilteredItems[itemIndex != -1 ? itemIndex : 0];
-            MoveToSelectionState(sender as UIElement, true);
+            UIHelper.AnnounceActionForAccessibility(IconsAutoSuggestBox, outputString, "AutoSuggestBoxNumberIconsFoundId");
         }
 
-        private static void MoveToSelectionState(UIElement previousItem, bool isSelected)
+        private void IconsItemsView_SelectionChanged(ItemsView sender, ItemsViewSelectionChangedEventArgs args)
         {
-            VisualStateManager.GoToState(previousItem as Control, isSelected ? "Selected" : "Default", false);
-        }
-
-        private void IconsRepeater_ElementIndexChanged(ItemsRepeater sender, ItemsRepeaterElementIndexChangedEventArgs args)
-        {
-            var newItem = FilteredItems[args.NewIndex];
-            MoveToSelectionState(args.Element, newItem == SelectedItem);
-        }
-
-        private void IconsRepeater_ElementPrepared(ItemsRepeater sender, ItemsRepeaterElementPreparedEventArgs args)
-        {
-            var newItem = FilteredItems[args.Index];
-            MoveToSelectionState(args.Element, newItem == SelectedItem);
+            if (IconsItemsView.CurrentItemIndex != -1)
+            {
+                SelectedItem = FilteredItems[IconsItemsView.CurrentItemIndex];
+            }
+            
         }
     }
 }
diff --git a/WinUIGallery/ControlPages/DesignGuidance/TypographyPage.xaml b/WinUIGallery/ControlPages/DesignGuidance/TypographyPage.xaml
index 87015f269..4ae7544f6 100644
--- a/WinUIGallery/ControlPages/DesignGuidance/TypographyPage.xaml
+++ b/WinUIGallery/ControlPages/DesignGuidance/TypographyPage.xaml
@@ -50,191 +50,197 @@
             HeaderText="Type ramp"
             XamlSource="Typography/TypographySample_xaml.txt">
             <StackPanel HorizontalAlignment="Stretch" Orientation="Vertical">
-                <Canvas Height="450">
-                    <Image
-                        Height="450"
-                        Canvas.ZIndex="0"
-                        Source="{ThemeResource HeaderImage}" />
-                    <Button
-                        x:Name="ShowTypographyButton1"
-                        Canvas.Left="650"
-                        Canvas.Top="60"
-                        Padding="4"
-                        HorizontalAlignment="Right"
-                        VerticalAlignment="Top"
-                        AutomationProperties.Name="Show typography"
-                        Canvas.ZIndex="1"
-                        Click="ShowTypographyButtonClick1"
-                        ToolTipService.ToolTip="Caption">
-                        <FontIcon FontSize="16" Glyph="&#xE946;" />
-                    </Button>
-                    <TeachingTip
-                        x:Name="ShowTypographyInfoTooltip1"
-                        Title="Caption"
-                        Target="{x:Bind ShowTypographyButton1}" />
+                <ScrollViewer Height="450" HorizontalScrollMode="Auto" HorizontalScrollBarVisibility="Auto">
+                    <Canvas Height="450" Width="750">
+                        <Image
+                            Height="450"
+                            Canvas.ZIndex="0"
+                            Source="{ThemeResource HeaderImage}" />
+                        <Button
+                            x:Name="ShowTypographyButton1"
+                            Canvas.Left="650"
+                            Canvas.Top="60"
+                            Padding="4"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Top"
+                            AutomationProperties.Name="Show typography"
+                            Canvas.ZIndex="1"
+                            Click="ShowTypographyButtonClick1"
+                            ToolTipService.ToolTip="Caption">
+                            <FontIcon FontSize="16" Glyph="&#xE946;" />
+                        </Button>
+                        <TeachingTip
+                            x:Name="ShowTypographyInfoTooltip1"
+                            Title="Caption"
+                            Target="{x:Bind ShowTypographyButton1}" />
 
-                    <!--  Body Teaching tip  -->
-                    <Button
-                        x:Name="ShowTypographyButton2"
-                        Canvas.Left="190"
-                        Canvas.Top="280"
-                        Padding="4"
-                        HorizontalAlignment="Right"
-                        VerticalAlignment="Top"
-                        AutomationProperties.Name="Show typography"
-                        Canvas.ZIndex="1"
-                        Click="ShowTypographyButtonClick2"
-                        ToolTipService.ToolTip="Body">
-                        <FontIcon FontSize="16" Glyph="&#xE946;" />
-                    </Button>
-                    <TeachingTip
-                        x:Name="ShowTypographyInfoTooltip2"
-                        Title="Body"
-                        Target="{x:Bind ShowTypographyButton2}" />
+                        <!--  Body Teaching tip  -->
+                        <Button
+                            x:Name="ShowTypographyButton2"
+                            Canvas.Left="190"
+                            Canvas.Top="280"
+                            Padding="4"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Top"
+                            AutomationProperties.Name="Show typography"
+                            Canvas.ZIndex="1"
+                            Click="ShowTypographyButtonClick2"
+                            ToolTipService.ToolTip="Body">
+                            <FontIcon FontSize="16" Glyph="&#xE946;" />
+                        </Button>
+                        <TeachingTip
+                            x:Name="ShowTypographyInfoTooltip2"
+                            Title="Body"
+                            Target="{x:Bind ShowTypographyButton2}" />
 
-                    <!--  Body Strong Teaching tip  -->
-                    <Button
-                        x:Name="ShowTypographyButton3"
-                        Canvas.Left="83"
-                        Canvas.Top="245"
-                        Padding="4"
-                        HorizontalAlignment="Right"
-                        VerticalAlignment="Top"
-                        AutomationProperties.Name="Show typography"
-                        Canvas.ZIndex="1"
-                        Click="ShowTypographyButtonClick3"
-                        ToolTipService.ToolTip="Body Strong">
-                        <FontIcon FontSize="16" Glyph="&#xE946;" />
-                    </Button>
-                    <TeachingTip
-                        x:Name="ShowTypographyInfoTooltip3"
-                        Title="Body Strong"
-                        Target="{x:Bind ShowTypographyButton3}" />
+                        <!--  Body Strong Teaching tip  -->
+                        <Button
+                            x:Name="ShowTypographyButton3"
+                            Canvas.Left="83"
+                            Canvas.Top="245"
+                            Padding="4"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Top"
+                            AutomationProperties.Name="Show typography"
+                            Canvas.ZIndex="1"
+                            Click="ShowTypographyButtonClick3"
+                            ToolTipService.ToolTip="Body Strong">
+                            <FontIcon FontSize="16" Glyph="&#xE946;" />
+                        </Button>
+                        <TeachingTip
+                            x:Name="ShowTypographyInfoTooltip3"
+                            Title="Body Strong"
+                            Target="{x:Bind ShowTypographyButton3}" />
 
-                    <!--  Title Teaching tip  -->
-                    <Button
-                        x:Name="ShowTypographyButton4"
-                        Canvas.Left="320"
-                        Canvas.Top="20"
-                        Padding="4"
-                        HorizontalAlignment="Right"
-                        VerticalAlignment="Top"
-                        AutomationProperties.Name="Show typography"
-                        Canvas.ZIndex="1"
-                        Click="ShowTypographyButtonClick4"
-                        ToolTipService.ToolTip="Title">
-                        <FontIcon FontSize="16" Glyph="&#xE946;" />
-                    </Button>
-                    <TeachingTip
-                        x:Name="ShowTypographyInfoTooltip4"
-                        Title="Title"
-                        Target="{x:Bind ShowTypographyButton4}" />
+                        <!--  Title Teaching tip  -->
+                        <Button
+                            x:Name="ShowTypographyButton4"
+                            Canvas.Left="320"
+                            Canvas.Top="20"
+                            Padding="4"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Top"
+                            AutomationProperties.Name="Show typography"
+                            Canvas.ZIndex="1"
+                            Click="ShowTypographyButtonClick4"
+                            ToolTipService.ToolTip="Title">
+                            <FontIcon FontSize="16" Glyph="&#xE946;" />
+                        </Button>
+                        <TeachingTip
+                            x:Name="ShowTypographyInfoTooltip4"
+                            Title="Title"
+                            Target="{x:Bind ShowTypographyButton4}" />
 
-                    <!--  Display Teaching tip  -->
-                    <Button
-                        x:Name="ShowTypographyButton5"
-                        Canvas.Left="160"
-                        Canvas.Top="110"
-                        Padding="4"
-                        HorizontalAlignment="Right"
-                        VerticalAlignment="Top"
-                        AutomationProperties.Name="Show typography"
-                        Canvas.ZIndex="1"
-                        Click="ShowTypographyButtonClick5">
-                        <FontIcon FontSize="16" Glyph="&#xE946;" />
-                    </Button>
-                    <TeachingTip
-                        x:Name="ShowTypographyInfoTooltip5"
-                        Title="Display"
-                        Target="{x:Bind ShowTypographyButton5}" />
+                        <!--  Display Teaching tip  -->
+                        <Button
+                            x:Name="ShowTypographyButton5"
+                            Canvas.Left="160"
+                            Canvas.Top="110"
+                            Padding="4"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Top"
+                            AutomationProperties.Name="Show typography"
+                            Canvas.ZIndex="1"
+                            Click="ShowTypographyButtonClick5">
+                            <FontIcon FontSize="16" Glyph="&#xE946;" />
+                        </Button>
+                        <TeachingTip
+                            x:Name="ShowTypographyInfoTooltip5"
+                            Title="Display"
+                            Target="{x:Bind ShowTypographyButton5}" />
+                    </Canvas>
+                </ScrollViewer>
 
-                </Canvas>
-                <Grid Margin="0,48,0,24" HorizontalAlignment="Stretch">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="286" />
-                        <ColumnDefinition Width="156" />
-                        <ColumnDefinition Width="140" />
-                        <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-                    <TextBlock
-                        Margin="24,0,0,0"
-                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                        Style="{StaticResource CaptionTextBlockStyle}"
-                        Text="Example" />
-                    <TextBlock
-                        Grid.Column="1"
-                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                        Style="{StaticResource CaptionTextBlockStyle}"
-                        Text="Variable Font" />
-                    <TextBlock
-                        Grid.Column="2"
-                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                        Style="{StaticResource CaptionTextBlockStyle}"
-                        Text="Size / Line height" />
-                    <TextBlock
-                        Grid.Column="3"
-                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                        Style="{StaticResource CaptionTextBlockStyle}"
-                        Text="Style" />
-                </Grid>
-                <controls:TypographyControl
-                    HorizontalAlignment="Stretch"
-                    Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-                    Example="Caption"
-                    ExampleStyle="{StaticResource CaptionTextBlockStyle}"
-                    ResourceName="CaptionTextBlockStyle"
-                    SizeLinHeight="12/16 epx"
-                    VariableFont="Small, Regular"
-                    Weight="400" />
-                <controls:TypographyControl
-                    Example="Body"
-                    ExampleStyle="{StaticResource BodyTextBlockStyle}"
-                    ResourceName="BodyTextBlockStyle"
-                    SizeLinHeight="14/20 epx"
-                    VariableFont="Text, Regular"
-                    Weight="400" />
-                <controls:TypographyControl
-                    Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-                    Example="Body Strong"
-                    ExampleStyle="{StaticResource BodyStrongTextBlockStyle}"
-                    ResourceName="BodyStrongTextBlockStyle"
-                    SizeLinHeight="14/20 epx"
-                    VariableFont="Text, SemiBold"
-                    Weight="600" />
-                <controls:TypographyControl
-                    Height="76"
-                    Example="Subtitle"
-                    ExampleStyle="{StaticResource SubtitleTextBlockStyle}"
-                    ResourceName="SubtitleTextBlockStyle"
-                    SizeLinHeight="20/28 epx"
-                    VariableFont="Display, SemiBold"
-                    Weight="600" />
-                <controls:TypographyControl
-                    Height="86"
-                    Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-                    Example="Title"
-                    ExampleStyle="{StaticResource TitleTextBlockStyle}"
-                    ResourceName="TitleTextBlockStyle"
-                    SizeLinHeight="28/36 epx"
-                    VariableFont="Display, SemiBold"
-                    Weight="600" />
-                <controls:TypographyControl
-                    Height="98"
-                    Example="Title Large"
-                    ExampleStyle="{StaticResource TitleLargeTextBlockStyle}"
-                    ResourceName="TitleLargeTextBlockStyle"
-                    SizeLinHeight="40/52 epx"
-                    VariableFont="Display, SemiBold"
-                    Weight="600" />
-                <controls:TypographyControl
-                    Height="106"
-                    Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-                    Example="Display"
-                    ExampleStyle="{StaticResource DisplayTextBlockStyle}"
-                    ResourceName="DisplayTextBlockStyle"
-                    SizeLinHeight="68/92 epx"
-                    VariableFont="Display, SemiBold"
-                    Weight="600" />
+                <ScrollViewer HorizontalScrollMode="Auto" HorizontalScrollBarVisibility="Auto">
+                    <StackPanel>
+                        <Grid Margin="0,48,0,24" HorizontalAlignment="Stretch">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="286" />
+                                <ColumnDefinition Width="156" />
+                                <ColumnDefinition Width="140" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <TextBlock
+                                Margin="24,0,0,0"
+                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                Style="{StaticResource CaptionTextBlockStyle}"
+                                Text="Example" />
+                            <TextBlock
+                                Grid.Column="1"
+                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                Style="{StaticResource CaptionTextBlockStyle}"
+                                Text="Variable Font" />
+                            <TextBlock
+                                Grid.Column="2"
+                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                Style="{StaticResource CaptionTextBlockStyle}"
+                                Text="Size / Line height" />
+                            <TextBlock
+                                Grid.Column="3"
+                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                Style="{StaticResource CaptionTextBlockStyle}"
+                                Text="Style" />
+                        </Grid>
+                        <controls:TypographyControl
+                            HorizontalAlignment="Stretch"
+                            Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                            Example="Caption"
+                            ExampleStyle="{StaticResource CaptionTextBlockStyle}"
+                            ResourceName="CaptionTextBlockStyle"
+                            SizeLinHeight="12/16 epx"
+                            VariableFont="Small, Regular"
+                            Weight="400" />
+                        <controls:TypographyControl
+                            Example="Body"
+                            ExampleStyle="{StaticResource BodyTextBlockStyle}"
+                            ResourceName="BodyTextBlockStyle"
+                            SizeLinHeight="14/20 epx"
+                            VariableFont="Text, Regular"
+                            Weight="400" />
+                        <controls:TypographyControl
+                            Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                            Example="Body Strong"
+                            ExampleStyle="{StaticResource BodyStrongTextBlockStyle}"
+                            ResourceName="BodyStrongTextBlockStyle"
+                            SizeLinHeight="14/20 epx"
+                            VariableFont="Text, SemiBold"
+                            Weight="600" />
+                        <controls:TypographyControl
+                            Height="76"
+                            Example="Subtitle"
+                            ExampleStyle="{StaticResource SubtitleTextBlockStyle}"
+                            ResourceName="SubtitleTextBlockStyle"
+                            SizeLinHeight="20/28 epx"
+                            VariableFont="Display, SemiBold"
+                            Weight="600" />
+                        <controls:TypographyControl
+                            Height="86"
+                            Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                            Example="Title"
+                            ExampleStyle="{StaticResource TitleTextBlockStyle}"
+                            ResourceName="TitleTextBlockStyle"
+                            SizeLinHeight="28/36 epx"
+                            VariableFont="Display, SemiBold"
+                            Weight="600" />
+                        <controls:TypographyControl
+                            Height="98"
+                            Example="Title Large"
+                            ExampleStyle="{StaticResource TitleLargeTextBlockStyle}"
+                            ResourceName="TitleLargeTextBlockStyle"
+                            SizeLinHeight="40/52 epx"
+                            VariableFont="Display, SemiBold"
+                            Weight="600" />
+                        <controls:TypographyControl
+                            Height="106"
+                            Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                            Example="Display"
+                            ExampleStyle="{StaticResource DisplayTextBlockStyle}"
+                            ResourceName="DisplayTextBlockStyle"
+                            SizeLinHeight="68/92 epx"
+                            VariableFont="Display, SemiBold"
+                            Weight="600" />
+                    </StackPanel>
+                </ScrollViewer>
             </StackPanel>
         </local:ControlExample>
     </Grid>
diff --git a/WinUIGallery/ControlPages/FilePickerPage.xaml.cs b/WinUIGallery/ControlPages/FilePickerPage.xaml.cs
index 01308d481..f0a393996 100644
--- a/WinUIGallery/ControlPages/FilePickerPage.xaml.cs
+++ b/WinUIGallery/ControlPages/FilePickerPage.xaml.cs
@@ -60,12 +60,14 @@ private async void PickAFileButton_Click(object sender, RoutedEventArgs e)
                 
                 span.Inlines.Add(run1);
                 span.Inlines.Add(run2);
-                PickAFileOutputTextBlock.Inlines.Add(span);     
+                PickAFileOutputTextBlock.Inlines.Add(span);
             }
             else
             {
                 PickAFileOutputTextBlock.Text = "Operation cancelled.";
             }
+
+            UIHelper.AnnounceActionForAccessibility(sender as Button, PickAFileOutputTextBlock.Text, "FilePickedNotificationId");
         }
         private async void PickAPhotoButton_Click(object sender, RoutedEventArgs e)
         {
@@ -111,6 +113,8 @@ private async void PickAPhotoButton_Click(object sender, RoutedEventArgs e)
             {
                 PickAPhotoOutputTextBlock.Text = "Operation cancelled.";
             }
+
+            UIHelper.AnnounceActionForAccessibility(sender as Button, PickAPhotoOutputTextBlock.Text, "PhotoPickedNotificationId");
         }
 
         private async void PickFilesButton_Click(object sender, RoutedEventArgs e)
@@ -159,6 +163,8 @@ private async void PickFilesButton_Click(object sender, RoutedEventArgs e)
             {
                 PickFilesOutputTextBlock.Text = "Operation cancelled.";
             }
+
+            UIHelper.AnnounceActionForAccessibility(sender as Button, PickFilesOutputTextBlock.Text, "FilesPickedNotificationId");
         }
 
         private async void PickFolderButton_Click(object sender, RoutedEventArgs e)
@@ -204,6 +210,8 @@ private async void PickFolderButton_Click(object sender, RoutedEventArgs e)
             {
                 PickFolderOutputTextBlock.Text = "Operation cancelled.";
             }
+
+            UIHelper.AnnounceActionForAccessibility(sender as Button, PickFolderOutputTextBlock.Text, "FolderPickedNotificationId");
         }
 
         private async void SaveFileButton_Click(object sender, RoutedEventArgs e)
@@ -269,7 +277,8 @@ private async void SaveFileButton_Click(object sender, RoutedEventArgs e)
             {
                 SaveFileOutputTextBlock.Text = "Operation cancelled.";
             }
-        }
 
+            UIHelper.AnnounceActionForAccessibility(sender as Button, SaveFileOutputTextBlock.Text, "FileSavedNotificationId");
+        }
     }
 }
diff --git a/WinUIGallery/ControlPages/GridViewPage.xaml b/WinUIGallery/ControlPages/GridViewPage.xaml
index 14af410c2..26996faf7 100644
--- a/WinUIGallery/ControlPages/GridViewPage.xaml
+++ b/WinUIGallery/ControlPages/GridViewPage.xaml
@@ -104,7 +104,7 @@
                 <GridView x:Name="StyledGrid"
                           ItemTemplate="{StaticResource ImageOverlayTemplate}">
                     <GridView.ItemContainerStyle>
-                        <Style TargetType="GridViewItem">
+                        <Style TargetType="GridViewItem" BasedOn="{StaticResource DefaultGridViewItemStyle}">
                             <Setter Property="Margin" Value="5"/>
                         </Style>
                     </GridView.ItemContainerStyle>
@@ -155,7 +155,7 @@ some parts of the GridViewItems (i.e. the margins). --&gt;
     ItemTemplate="{StaticResource ImageOverlayTemplate}"&gt;
 
     &lt;GridView.ItemContainerStyle&gt;
-        &lt;Style TargetType="GridViewItem"&gt;
+        &lt;Style TargetType="GridViewItem" BasedOn="{StaticResource DefaultGridViewItemStyle}"&gt;
             &lt;Setter Property="Margin" Value="$(ColMargin), $(RowMargin), $(ColMargin), $(RowMargin)"/&gt;
         &lt;/Style&gt;
     &lt;/GridView.ItemContainerStyle&gt;
diff --git a/WinUIGallery/ControlPages/InfoBadgePage.xaml b/WinUIGallery/ControlPages/InfoBadgePage.xaml
index e9f32e00f..8b555c112 100644
--- a/WinUIGallery/ControlPages/InfoBadgePage.xaml
+++ b/WinUIGallery/ControlPages/InfoBadgePage.xaml
@@ -31,7 +31,7 @@
                         <NavigationView.MenuItems>
                             <NavigationViewItem Content="Home" Icon="Home"/>
                             <NavigationViewItem Content="Account" Icon="Contact"/>
-                            <NavigationViewItem x:Name="InboxPage" Content="Inbox" Icon="Mail">
+                            <NavigationViewItem x:Name="InboxPage" Content="Inbox" Icon="Mail" AutomationProperties.Name="Inbox, 5 notifications">
                                 <NavigationViewItem.InfoBadge>
                                     <InfoBadge x:Name="infoBadge1" Value="5" Opacity="{x:Bind InfoBadgeOpacity, Mode=OneWay}"/>
                                 </NavigationViewItem.InfoBadge>
@@ -55,7 +55,7 @@
 
             <local:ControlExample.Xaml>
                 <x:String xml:space="preserve">
-&lt;NavigationViewItem x:Name="InboxPage" Content="Inbox" Icon="Mail"&gt;
+&lt;NavigationViewItem x:Name="InboxPage" Content="Inbox" Icon="Mail" AutomationProperties.Name="Inbox, 5 notifications"&gt;
     &lt;NavigationViewItem.InfoBadge&gt;
         &lt;InfoBadge x:Name="infoBadge1" Value="5" Opacity="{x:Bind InfoBadgeOpacity, Mode=OneWay}"/&gt;
     &lt;/NavigationViewItem.InfoBadge&gt;
@@ -67,9 +67,11 @@
         <local:ControlExample x:Name="Example2" HeaderText="Different InfoBadge Styles" HorizontalContentAlignment="Stretch" >
             <local:ControlExample.Example>
                 <StackPanel Orientation="Horizontal" contract5Present:Spacing="20" HorizontalAlignment="Center">
-                    <InfoBadge x:Name="infoBadge2" Style="{StaticResource AttentionIconInfoBadgeStyle}" HorizontalAlignment="Right"/>
+                    <InfoBadge x:Name="infoBadge2" Style="{StaticResource AttentionIconInfoBadgeStyle}" HorizontalAlignment="Right"
+                        AutomationProperties.Name="Warning badge" AutomationProperties.AutomationControlType="Image"/>
                     <InfoBadge x:Name="infoBadge3" Style="{StaticResource AttentionValueInfoBadgeStyle}" HorizontalAlignment="Right" Value="10"/>
-                    <InfoBadge x:Name="infoBadge4" Style="{StaticResource AttentionDotInfoBadgeStyle}" VerticalAlignment="Center"/>
+                    <InfoBadge x:Name="infoBadge4" Style="{StaticResource AttentionDotInfoBadgeStyle}" VerticalAlignment="Center"
+                        AutomationProperties.Name="Notification badge" AutomationProperties.AutomationControlType="Image"/>
                 </StackPanel>
 
             </local:ControlExample.Example>
@@ -86,9 +88,13 @@
 
             <local:ControlExample.Xaml>
                 <x:String xml:space="preserve">
-&lt;InfoBadge x:Name="infoBadge2" Style="{StaticResource $(Style)IconInfoBadgeStyle}" /&gt;
-&lt;InfoBadge x:Name="infoBadge3" Style="{StaticResource $(Style)ValueInfoBadgeStyle}" Value="10" /&gt;
-&lt;InfoBadge x:Name="infoBadge4" Style="{StaticResource $(Style)DotInfoBadgeStyle}" /&gt;
+&lt;StackPanel Orientation="Horizontal" contract5Present:Spacing="20" HorizontalAlignment="Center"/&gt;
+    &lt;InfoBadge x:Name="infoBadge2" Style="{StaticResource $(Style)IconInfoBadgeStyle}" HorizontalAlignment="Right"
+        AutomationProperties.Name="Warning badge" AutomationProperties.AutomationControlType="Image"/&gt;
+    &lt;InfoBadge x:Name="infoBadge3" Style="{StaticResource $(Style)ValueInfoBadgeStyle}" HorizontalAlignment="Right" Value="10" /&gt;
+    &lt;InfoBadge x:Name="infoBadge4" Style="{StaticResource $(Style)DotInfoBadgeStyle}" VerticalAlignment="Center"
+        AutomationProperties.Name="Notification badge" AutomationProperties.AutomationControlType="Image"/&gt;
+&lt;/StackPanel&gt;
                 </x:String>
             </local:ControlExample.Xaml>
 
@@ -99,7 +105,7 @@
 
         <local:ControlExample x:Name="Example3" HeaderText="Placing an InfoBadge Inside Another Control" HorizontalContentAlignment="Stretch" >
             <local:ControlExample.Example>
-                <Button Padding="0" Width="200" Height="60" ToolTipService.ToolTip="Refresh required"
+                <Button x:Name="Example3Button" AutomationProperties.Name="Example3Button" Padding="0" Width="200" Height="60" ToolTipService.ToolTip="Refresh required"
                         HorizontalAlignment="Center" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch">
                     <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Width="Auto" Height="Auto">
                         <SymbolIcon Symbol="Sync" HorizontalAlignment="Center"/>
diff --git a/WinUIGallery/ControlPages/ItemsRepeaterPage.xaml b/WinUIGallery/ControlPages/ItemsRepeaterPage.xaml
index 8e8776a6e..5d113f41d 100644
--- a/WinUIGallery/ControlPages/ItemsRepeaterPage.xaml
+++ b/WinUIGallery/ControlPages/ItemsRepeaterPage.xaml
@@ -293,7 +293,6 @@ private void InitializeData()
                                         Click="OnAnimatedItemClicked"
                                         GotFocus="OnAnimatedItemGotFocus"
                                         HorizontalAlignment="Stretch"
-                                        Loaded="GetButtonSize"
                                         Foreground="{ThemeResource TextFillColorInverseBrush}">
                             </Button>
                         </DataTemplate>
diff --git a/WinUIGallery/ControlPages/ItemsRepeaterPage.xaml.cs b/WinUIGallery/ControlPages/ItemsRepeaterPage.xaml.cs
index 82bea3597..eca2b7f2f 100644
--- a/WinUIGallery/ControlPages/ItemsRepeaterPage.xaml.cs
+++ b/WinUIGallery/ControlPages/ItemsRepeaterPage.xaml.cs
@@ -25,8 +25,6 @@ public sealed partial class ItemsRepeaterPage : ItemsPageBase
         public List<Recipe> staticRecipeData;
         private bool IsSortDescending = false;
 
-        private double AnimatedBtnHeight;
-        private Thickness AnimatedBtnMargin;
         private Button LastSelectedColorButton;
         private int PreviouslyFocusedAnimatedScrollRepeaterIndex = -1;
 
@@ -316,13 +314,6 @@ private void OnElementPrepared(Microsoft.UI.Xaml.Controls.ItemsRepeater sender,
             item.StartAnimation("CenterPoint", centerPointExpression);
         }
 
-        private void GetButtonSize(object sender, RoutedEventArgs e)
-        {
-            Button AnimatedBtn = sender as Button;
-            AnimatedBtnHeight = AnimatedBtn.ActualHeight;
-            AnimatedBtnMargin = AnimatedBtn.Margin;
-        }
-
         private void SetUIANamesForSelectedEntry(Button selectedItem)
         {
             if (LastSelectedColorButton != null && LastSelectedColorButton.Content is string content)
@@ -334,27 +325,6 @@ private void SetUIANamesForSelectedEntry(Button selectedItem)
             LastSelectedColorButton = selectedItem;
         }
 
-        // Find centerpoint of ScrollViewer
-        private double CenterPointOfViewportInExtent()
-        {
-            return Animated_ScrollViewer.VerticalOffset + Animated_ScrollViewer.ViewportHeight / 2;
-        }
-
-        // Find index of the item that's at the center of the viewport
-        private int GetSelectedIndexFromViewport()
-        {
-            int selectedItemIndex = (int)Math.Floor(CenterPointOfViewportInExtent() / ((double)AnimatedBtnMargin.Top + AnimatedBtnHeight));
-            selectedItemIndex %= animatedScrollRepeater.ItemsSourceView.Count;
-            return selectedItemIndex;
-        }
-
-        // Return item that's currently in center of viewport
-        private object GetSelectedItemFromViewport()
-        {
-            var selectedIndex = GetSelectedIndexFromViewport();
-            var selectedElement = animatedScrollRepeater.TryGetElement(selectedIndex) as Button;
-            return selectedElement;
-        }
 
         // ==========================================================================
         // VariedImageSize Layout with Filtering/Sorting
diff --git a/WinUIGallery/ControlPages/ItemsViewPage.xaml b/WinUIGallery/ControlPages/ItemsViewPage.xaml
index 6da2b0b89..e1bbaaf29 100644
--- a/WinUIGallery/ControlPages/ItemsViewPage.xaml
+++ b/WinUIGallery/ControlPages/ItemsViewPage.xaml
@@ -137,24 +137,25 @@ private void BasicItemsView_ItemInvoked(ItemsView sender, ItemsViewItemInvokedEv
                         </Style>
                     </StackPanel.Resources>
 
-                    <TextBlock Margin="0,15,0,10" Text="Layout" FontWeight="SemiBold"/>
-                    
-                    <RadioButtons>
+                    <RadioButtons Header="Layout" FontWeight="SemiBold">
                         <RadioButton
                             Checked="RbLayout_Checked"
                             Content="LinedFlowLayout"
                             GroupName="ItemsViewLayouts"
+                            FontWeight="Normal"
                             IsChecked="True"/>
 
                         <RadioButton
                             Checked="RbLayout_Checked"
                             Content="UniformGridLayout"
-                            GroupName="ItemsViewLayouts"/>
+                            GroupName="ItemsViewLayouts"
+                            FontWeight="Normal"/>
 
                         <RadioButton
                             Checked="RbLayout_Checked"
                             Content="StackLayout"
-                            GroupName="ItemsViewLayouts"/>
+                            GroupName="ItemsViewLayouts"
+                            FontWeight="Normal"/>
                     </RadioButtons>
 
                     <StackPanel x:Name="spLinedFlowLayoutOptions" MinHeight="300">
diff --git a/WinUIGallery/ControlPages/ListViewPage.xaml b/WinUIGallery/ControlPages/ListViewPage.xaml
index 690f71129..7265f18a1 100644
--- a/WinUIGallery/ControlPages/ListViewPage.xaml
+++ b/WinUIGallery/ControlPages/ListViewPage.xaml
@@ -337,9 +337,9 @@ source code for the WinUI Gallery. -->
 sent or received, and those values are bound in the DataTemplate.--&gt;
 &lt;DataTemplate x:Key="MessageViewTemplate" x:DataType="local1:Message"&gt;
     &lt;Grid Height="Auto" Margin="4" HorizontalAlignment="{x:Bind MsgAlignment}"&gt;
-        &lt;StackPanel MinHeight="75" Width="350" Padding="10, 0, 0, 10" Background="{x:Bind BgColor}" CornerRadius="{StaticResource ControlCornerRadius}"&gt;
-            &lt;TextBlock Text="{x:Bind MsgText}" Padding="0, 10, 0, 0" FontSize="20" Foreground="{ThemeResource SystemControlForegroundAltHighBrush}"/&gt;
-            &lt;TextBlock Text="{x:Bind MsgDateTime}" Padding="0, 0, 0, 10" FontSize="15" Foreground="{ThemeResource SystemControlForegroundAltMediumHighBrush}"/&gt;
+        &lt;StackPanel MinHeight="75" Width="350" Padding="10, 0, 0, 10" Background="{ThemeResource SystemColorHighlightColor}" CornerRadius="{StaticResource ControlCornerRadius}"&gt;
+            &lt;TextBlock Text="{x:Bind MsgText}" Padding="0, 10, 0, 0" FontSize="20" Foreground="{ThemeResource SystemColorHighlightTextColor}"/&gt;
+            &lt;TextBlock Text="{x:Bind MsgDateTime}" Padding="0, 0, 0, 10" FontSize="15" Foreground="{ThemeResource SystemColorHighlightTextColor}"/&gt;
         &lt;/StackPanel&gt;
     &lt;/Grid&gt;
 &lt;/DataTemplate&gt;
@@ -378,7 +378,8 @@ sent or received, and those values are bound in the DataTemplate.--&gt;
                                 <TextBlock Text="{x:Bind Title}" FontSize="14" FontWeight="SemiBold" Style="{ThemeResource BaseTextBlockStyle}"
                                            HorizontalAlignment="Left" Margin="0,0,0,6" LineHeight="20"/>
                                 <TextBlock Text="{x:Bind Description}" FontFamily="Segoe UI" FontWeight="Normal" Style="{ThemeResource BodyTextBlockStyle}"
-                                           TextTrimming="CharacterEllipsis" Width="350" TextWrapping="NoWrap"/>
+                                           Width="350" MaxHeight="60" Margin="0,0,0,10"
+                                           TextTrimming="CharacterEllipsis" TextWrapping="Wrap" IsTextTrimmedChanged="TextBlock_IsTextTrimmedChanged"/>
                                 <StackPanel Orientation="Horizontal">
                                     <TextBlock Text="{x:Bind Views}" Style="{ThemeResource CaptionTextBlockStyle}" Margin="0"/>
                                     <TextBlock Text=" Views " Style="{ThemeResource CaptionTextBlockStyle}"/>
diff --git a/WinUIGallery/ControlPages/ListViewPage.xaml.cs b/WinUIGallery/ControlPages/ListViewPage.xaml.cs
index 00a811d7b..f74c596b5 100644
--- a/WinUIGallery/ControlPages/ListViewPage.xaml.cs
+++ b/WinUIGallery/ControlPages/ListViewPage.xaml.cs
@@ -323,6 +323,18 @@ private void MessageReceived(object sender, RoutedEventArgs e)
                 new Message("Message " + ++messageNumber, DateTime.Now, HorizontalAlignment.Left)
                 );
         }
+
+        //===================================================================================================================
+        // ListView with Images Sample
+        //===================================================================================================================
+
+        private void TextBlock_IsTextTrimmedChanged(TextBlock sender, IsTextTrimmedChangedEventArgs args)
+        {
+            var textBlock = sender as TextBlock;
+            var text = textBlock.IsTextTrimmed ? textBlock.Text : string.Empty;
+
+            ToolTipService.SetToolTip(textBlock, text);
+        }
     }
 
     public class Message
diff --git a/WinUIGallery/ControlPages/MenuBarPage.xaml b/WinUIGallery/ControlPages/MenuBarPage.xaml
index a1eb2b234..281f8b3a1 100644
--- a/WinUIGallery/ControlPages/MenuBarPage.xaml
+++ b/WinUIGallery/ControlPages/MenuBarPage.xaml
@@ -12,7 +12,7 @@
                               XamlSource="MenuBar\MenuBarSample1.txt">
             <StackPanel>
                 <TextBlock x:Name="SelectedOptionText" Text="" />
-                <MenuBar LayoutUpdated="MenuBar_LayoutUpdated"  x:Name="Example1">
+                <MenuBar x:Name="Example1">
                     <MenuBarItem Title="File">
                         <MenuFlyoutItem x:Name="o1" Text="New" Click="OnElementClicked"/>
                         <MenuFlyoutItem x:Name="o2" Text="Open" Click="OnElementClicked"/>
@@ -38,7 +38,7 @@
                               XamlSource="Menubar\MenuBarSample3.txt">
             <StackPanel>
                 <TextBlock x:Name="SelectedOptionText1" Text="" />
-                <MenuBar LayoutUpdated="MenuBar_LayoutUpdated" x:Name="Example2">
+                <MenuBar x:Name="Example2">
                     <MenuBarItem Title="File">
                         <MenuFlyoutItem x:Name ="t2" Text="New" Click="OnElementClicked">
                             <MenuFlyoutItem.KeyboardAccelerators>
@@ -101,7 +101,7 @@
                               XamlSource="MenuBar\MenuBarSample2.txt">
             <StackPanel>
                 <TextBlock x:Name="SelectedOptionText2" Text="" />
-                <MenuBar LayoutUpdated="MenuBar_LayoutUpdated" x:Name="Example3">
+                <MenuBar x:Name="Example3">
                     <MenuBarItem Title="File">
                         <MenuFlyoutSubItem Text="New">
                             <MenuFlyoutItem x:Name="z1" Text="Plain Text Document" Click="OnElementClicked"/>
diff --git a/WinUIGallery/ControlPages/MenuBarPage.xaml.cs b/WinUIGallery/ControlPages/MenuBarPage.xaml.cs
index 3ad806772..4c1dc1005 100644
--- a/WinUIGallery/ControlPages/MenuBarPage.xaml.cs
+++ b/WinUIGallery/ControlPages/MenuBarPage.xaml.cs
@@ -1,5 +1,4 @@
-using AppUIBasics.Helper;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -39,15 +38,6 @@ private void OnElementClicked(object sender, Microsoft.UI.Xaml.RoutedEventArgs e
             {
                 SelectedOptionText2.Text = "You clicked: " + (sender as MenuFlyoutItem).Text;
             }
-        }
-
-        // Workaround for known issue with menu themes in WinAppSDK 1.4 (#8678, #8756)
-        private void MenuBar_LayoutUpdated(object sender, object e)
-        {
-            foreach (var popup in VisualTreeHelper.GetOpenPopupsForXamlRoot(this.XamlRoot))
-            {
-                popup.RequestedTheme = ThemeHelper.RootTheme;
-            }
-        }
+        }
     }
 }
diff --git a/WinUIGallery/ControlPages/MenuFlyoutPage.xaml b/WinUIGallery/ControlPages/MenuFlyoutPage.xaml
index fe11972b4..d907ce671 100644
--- a/WinUIGallery/ControlPages/MenuFlyoutPage.xaml
+++ b/WinUIGallery/ControlPages/MenuFlyoutPage.xaml
@@ -1,4 +1,4 @@
-<!--
+<!--
 //*********************************************************
 //
 // Copyright (c) Microsoft. All rights reserved.
@@ -19,7 +19,7 @@
             <StackPanel x:Name="Control1" Orientation="Horizontal">
                 <AppBarButton Icon="Sort" IsCompact="True" ToolTipService.ToolTip="Sort" AutomationProperties.Name="Sort">
                     <Button.Flyout>
-                        <MenuFlyout Opened="MenuFlyout_Opened">
+                        <MenuFlyout>
                             <MenuFlyoutItem Text="By rating" Click="MenuFlyoutItem_Click" Tag="rating" />
                             <MenuFlyoutItem Text="By match" Click="MenuFlyoutItem_Click" Tag="match" />
                             <MenuFlyoutItem Text="By distance" Click="MenuFlyoutItem_Click" Tag="distance" />
@@ -46,7 +46,7 @@
                 HeaderText="A MenuFlyout with ToggleMenuFlyoutItems and MenuFlyoutSeparator.">
             <Button x:Name="Control2" Content="Options">
                 <Button.Flyout>
-                    <MenuFlyout  Opened="MenuFlyout_Opened">
+                    <MenuFlyout>
                         <MenuFlyoutItem Text="Reset" />
                         <MenuFlyoutSeparator />
                         <ToggleMenuFlyoutItem x:Name="RepeatToggleMenuFlyoutItem" Text="Repeat" IsChecked="True" />
@@ -76,7 +76,7 @@
         <local:ControlExample x:Name="Example3" HeaderText="A MenuFlyout with cascading menus.">
             <Button x:Name="Control3" Content="File Options">
                 <Button.Flyout>
-                    <MenuFlyout  Opened="MenuFlyout_Opened">
+                    <MenuFlyout>
                         <MenuFlyoutItem Text="Open" />
                         <MenuFlyoutSubItem Text="Send to">
                             <MenuFlyoutItem Text="Bluetooth" />
@@ -115,7 +115,7 @@
                 HeaderText="A MenuFlyout with icons.">
             <Button x:Name="Control4" Content="Edit Options">
                 <Button.Flyout>
-                    <MenuFlyout  Opened="MenuFlyout_Opened">
+                    <MenuFlyout>
                         <MenuFlyoutItem Text="Share">
                             <MenuFlyoutItem.Icon>
                                 <FontIcon Glyph="&#xE72D;" />
@@ -154,7 +154,7 @@
                 HeaderText="A MenuFlyout with icons and Keyboard Accelerators." FontFamily="Segoe UI" Loaded="Example5_Loaded">
             <Button x:Name="Control5" Content="Edit Options">
                 <Button.Flyout>
-                    <MenuFlyout  Opened="MenuFlyout_Opened">
+                    <MenuFlyout>
                         <MenuFlyoutItem Text="Share">
                             <MenuFlyoutItem.Icon>
                                 <FontIcon Glyph="&#xE72D;" />
diff --git a/WinUIGallery/ControlPages/MenuFlyoutPage.xaml.cs b/WinUIGallery/ControlPages/MenuFlyoutPage.xaml.cs
index f70297c67..2f30c8528 100644
--- a/WinUIGallery/ControlPages/MenuFlyoutPage.xaml.cs
+++ b/WinUIGallery/ControlPages/MenuFlyoutPage.xaml.cs
@@ -1,4 +1,4 @@
-//*********************************************************
+//*********************************************************
 //
 // Copyright (c) Microsoft. All rights reserved.
 // THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF
@@ -7,12 +7,10 @@
 // PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.
 //
 //*********************************************************
-using AppUIBasics.Helper;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Controls.Primitives;
 using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
 
 namespace AppUIBasics.ControlPages
 {
@@ -47,15 +45,6 @@ private void MenuFlyoutItem_Click(object sender, RoutedEventArgs e)
         private void Example5_Loaded(object sender, RoutedEventArgs e)
         {
 
-        }
-
-        // Workaround for known issue with menu themes in WinAppSDK 1.4 (#8678, #8756)
-        private void MenuFlyout_Opened(object sender, object e)
-        {
-            foreach (var popup in VisualTreeHelper.GetOpenPopupsForXamlRoot(this.XamlRoot))
-            {
-                popup.RequestedTheme = ThemeHelper.RootTheme;
-            }
-        }
+        }
     }
 }
diff --git a/WinUIGallery/ControlPages/NavigationViewPage.xaml.cs b/WinUIGallery/ControlPages/NavigationViewPage.xaml.cs
index c8475945d..bd8562663 100644
--- a/WinUIGallery/ControlPages/NavigationViewPage.xaml.cs
+++ b/WinUIGallery/ControlPages/NavigationViewPage.xaml.cs
@@ -198,37 +198,6 @@ private void NavigationView_SelectionChanged9(Microsoft.UI.Xaml.Controls.Navigat
             contentFrame9.Navigate(pageType, null, args.RecommendedNavigationTransitionInfo);
         }
 
-        private void databindHeader_Checked(object sender, RoutedEventArgs e)
-        {
-            Categories = new ObservableCollection<CategoryBase>()
-            {
-                new Header { Name = "Header1 "},
-                new Category { Name = "Category 1", Glyph = Symbol.Home, Tooltip = "This is category 1" },
-                new Category { Name = "Category 2", Glyph = Symbol.Keyboard, Tooltip = "This is category 2" },
-                new Separator(),
-                new Header { Name = "Header2 "},
-                new Category {Name = "Category 3", Glyph = Symbol.Library, Tooltip = "This is category 3" },
-                new Category {Name = "Category 4", Glyph = Symbol.Mail, Tooltip = "This is category 3" }
-            };
-        }
-
-        private void databindHeader_Checked_Unchecked(object sender, RoutedEventArgs e)
-        {
-            Categories = new ObservableCollection<CategoryBase>()
-            {
-                new Category { Name = "Category 1", Glyph = Symbol.Home, Tooltip = "This is category 1" },
-                new Category { Name = "Category 2", Glyph = Symbol.Keyboard, Tooltip = "This is category 2" },
-                new Category {Name = "Category 3", Glyph = Symbol.Library, Tooltip = "This is category 3" },
-                new Category {Name = "Category 4", Glyph = Symbol.Mail, Tooltip = "This is category 3" }
-            };
-        }
-
-        private void Grid_ManipulationDelta1(object sender, Microsoft.UI.Xaml.Input.ManipulationDeltaRoutedEventArgs e)
-        {
-            var grid = sender as Grid;
-            grid.Width = grid.ActualWidth + e.Delta.Translation.X;
-        }
-
         private void headerCheck_Click(object sender, RoutedEventArgs e)
         {
             nvSample.AlwaysShowHeader = (sender as CheckBox).IsChecked == true ? true : false;
diff --git a/WinUIGallery/ControlPages/ProgressRingPage.xaml b/WinUIGallery/ControlPages/ProgressRingPage.xaml
index 10b8faee6..6b05f51cf 100644
--- a/WinUIGallery/ControlPages/ProgressRingPage.xaml
+++ b/WinUIGallery/ControlPages/ProgressRingPage.xaml
@@ -24,7 +24,7 @@
             <ProgressRing x:Name="ProgressRing1" IsActive="{x:Bind ProgressToggle.IsOn, Mode=OneWay}" AutomationProperties.Name="Progress image" Height="60" Width="60" VerticalAlignment="Top" Margin="10,10,0,0"/>
             <local:ControlExample.Options>
                 <StackPanel>
-                    <ToggleSwitch x:Name="ProgressToggle" AutomationProperties.Name="Progress options" Header="Toggle work" OffContent="Do work" OnContent="Working" IsOn="True" />
+                    <ToggleSwitch x:Name="ProgressToggle" AutomationProperties.Name="Progress Options" Header="Progress Options" OffContent="Do work" OnContent="Working" IsOn="True" />
                     <ComboBox x:Name="BackgroundComboBox1" SelectionChanged="Background_SelectionChanged"  Header="Background color" PlaceholderText="Pick a color" Width="200">
                         <x:String>Transparent</x:String>
                         <x:String>LightGray</x:String>
diff --git a/WinUIGallery/ControlPages/PullToRefreshPage.xaml.cs b/WinUIGallery/ControlPages/PullToRefreshPage.xaml.cs
index d3ccae256..833b52523 100644
--- a/WinUIGallery/ControlPages/PullToRefreshPage.xaml.cs
+++ b/WinUIGallery/ControlPages/PullToRefreshPage.xaml.cs
@@ -118,7 +118,6 @@ public PullToRefreshPage()
         private void PullToRefreshPage_Loaded(object sender, RoutedEventArgs e)
         {
             visualizerContentVisual = ElementCompositionPreview.GetElementVisual(rv2.Content);
-
             this.Loaded -= PullToRefreshPage_Loaded;
         }
 
@@ -200,7 +199,7 @@ private void rc2_RefreshRequested(RefreshContainer sender, RefreshRequestedEvent
 
         private void rv2_RefreshStateChanged(RefreshVisualizer sender, RefreshStateChangedEventArgs args)
         {
-            //visualizerContentVisual.StopAnimation("RotationAngle");
+            visualizerContentVisual.StopAnimation("RotationAngle");
         }
     }
 }
diff --git a/WinUIGallery/ControlPages/RichEditBoxPage.xaml.cs b/WinUIGallery/ControlPages/RichEditBoxPage.xaml.cs
index 49589c791..6a2c40902 100644
--- a/WinUIGallery/ControlPages/RichEditBoxPage.xaml.cs
+++ b/WinUIGallery/ControlPages/RichEditBoxPage.xaml.cs
@@ -188,7 +188,7 @@ private void FindBoxRemoveHighlights()
 
         private void Editor_GotFocus(object sender, RoutedEventArgs e)
         {
-            editor.Document.GetText(TextGetOptions.UseCrlf, out string currentRawText);
+            editor.Document.GetText(TextGetOptions.UseCrlf, out _);
             
             // reset colors to correct defaults for Focused state
             ITextRange documentRange = editor.Document.GetRange(0, TextConstants.MaxUnitCount);
@@ -200,18 +200,6 @@ private void Editor_GotFocus(object sender, RoutedEventArgs e)
             }
         }
 
-        private void Page_SizeChanged(object sender, SizeChangedEventArgs e)
-        {
-            if (e.NewSize.Width <= 768)
-            {
-                editor.Width = e.NewSize.Width - 20;
-            }
-            else
-            {
-                editor.Width = e.NewSize.Width - 100;
-            }
-        }
-
         private void REBCustom_Loaded(object sender, RoutedEventArgs e)
         {
             // Prior to UniversalApiContract 7, RichEditBox did not have a default ContextFlyout set.
@@ -243,4 +231,4 @@ private void Editor_TextChanged(object sender, RoutedEventArgs e)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/WinUIGallery/ControlPages/RichTextBlockPage.xaml b/WinUIGallery/ControlPages/RichTextBlockPage.xaml
index 5839c3463..1cafdb09f 100644
--- a/WinUIGallery/ControlPages/RichTextBlockPage.xaml
+++ b/WinUIGallery/ControlPages/RichTextBlockPage.xaml
@@ -64,11 +64,11 @@
                             TextAlignment="Justify" Margin="12,0">
                         <Paragraph>Linked text containers allow text which does not fit in one element to overflow into a different element on the page. Creative use of linked text containers enables basic multicolumn support and other advanced page layouts.</Paragraph>
                         <Paragraph>Duis sed nulla metus, id hendrerit velit. Curabitur dolor purus, bibendum eu cursus lacinia, interdum vel augue. Aenean euismod eros et sapien vehicula dictum. Duis ullamcorper, turpis nec feugiat tincidunt, dui erat luctus risus, aliquam accumsan lacus est vel quam. Nunc lacus massa, varius eget accumsan id, congue sed orci. Duis dignissim hendrerit egestas. Proin ut turpis magna, sit amet porta erat. Nunc semper metus nec magna imperdiet nec vestibulum dui fringilla. Sed sed ante libero, nec porttitor mi. Ut luctus, neque vitae placerat egestas, urna leo auctor magna, sit amet ultricies ipsum felis quis sapien. Proin eleifend varius dui, at vestibulum nunc consectetur nec. Mauris nulla elit, ultrices a sodales non, aliquam ac est. Quisque sit amet risus nulla. Quisque vestibulum posuere velit, vitae vestibulum eros scelerisque sit amet. In in risus est, at laoreet dolor. Nullam aliquet pellentesque convallis. Ut vel tincidunt nulla. Mauris auctor tincidunt auctor.
-              Aenean orci ante, vulputate ac sagittis sit amet, consequat at mi. Morbi elementum purus consectetur nisi adipiscing vitae blandit sapien placerat. Aliquam adipiscing tortor non sem lobortis consectetur mattis felis rhoncus. Nunc eu nunc rhoncus arcu sollicitudin ultrices. In vulputate eros in mauris aliquam id dignissim nisl laoreet.</Paragraph>
+                          Aenean orci ante, vulputate ac sagittis sit amet, consequat at mi. Morbi elementum purus consectetur nisi adipiscing vitae blandit sapien placerat. Aliquam adipiscing tortor non sem lobortis consectetur mattis felis rhoncus. Nunc eu nunc rhoncus arcu sollicitudin ultrices. In vulputate eros in mauris aliquam id dignissim nisl laoreet.</Paragraph>
                     </RichTextBlock>
-                    <RichTextBlockOverflow x:Name="firstOverflowContainer" Grid.Column="1"
+                    <RichTextBlockOverflow x:Name="firstOverflowContainer" AutomationProperties.Name="firstOverflowContainer" Grid.Column="1"
                             OverflowContentTarget="{x:Bind secondOverflowContainer}" Margin="12,0" />
-                    <RichTextBlockOverflow x:Name="secondOverflowContainer" Grid.Column="2" Margin="12,0" />
+                    <RichTextBlockOverflow x:Name="secondOverflowContainer" AutomationProperties.Name="secondOverflowContainer" Grid.Column="2" Margin="12,0" />
                 </Grid>
             </local:ControlExample.Example>
             <local:ControlExample.Xaml>
diff --git a/WinUIGallery/ControlPages/ScrollViewerPage.xaml.cs b/WinUIGallery/ControlPages/ScrollViewerPage.xaml.cs
index 3fd868873..b32f9239f 100644
--- a/WinUIGallery/ControlPages/ScrollViewerPage.xaml.cs
+++ b/WinUIGallery/ControlPages/ScrollViewerPage.xaml.cs
@@ -10,6 +10,7 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Input;
 
 namespace AppUIBasics.ControlPages
 {
@@ -26,13 +27,13 @@ private void ZoomModeComboBox_SelectionChanged(object sender, SelectionChangedEv
             if (ScrollViewerControl != null && ZoomSlider != null)
             {
                 if (sender is ComboBox cb)
-                {
+                {
                     ScrollViewerControl.ZoomMode = (ZoomMode)cb.SelectedIndex;
-                    ZoomSlider.IsEnabled = cb.SelectedIndex == 1;
+                    ZoomSlider.IsEnabled = cb.SelectedIndex == 1;
 
-                    if (!ZoomSlider.IsEnabled)
-                    {
-                        ScrollViewerControl.ZoomToFactor(2.0f);
+                    if (!ZoomSlider.IsEnabled)
+                    {
+                        ScrollViewerControl.ZoomToFactor(2.0f);
                     }
                 }
             }
@@ -62,7 +63,7 @@ private void hsbvCombo_SelectionChanged(object sender, SelectionChangedEventArgs
             if (ScrollViewerControl != null)
             {
                 if (sender is ComboBox cb)
-                {
+                {
                     ScrollViewerControl.HorizontalScrollBarVisibility = (ScrollBarVisibility)cb.SelectedIndex;
                 }
             }
@@ -73,7 +74,7 @@ private void vsmCombo_SelectionChanged(object sender, SelectionChangedEventArgs
             if (ScrollViewerControl != null)
             {
                 if (sender is ComboBox cb)
-                {
+                {
                     ScrollViewerControl.VerticalScrollMode = (ScrollMode)cb.SelectedIndex;
                 }
             }
@@ -84,17 +85,22 @@ private void vsbvCombo_SelectionChanged(object sender, SelectionChangedEventArgs
             if (ScrollViewerControl != null)
             {
                 if (sender is ComboBox cb)
-                {
+                {
                     ScrollViewerControl.VerticalScrollBarVisibility = (ScrollBarVisibility)cb.SelectedIndex;
                 }
             }
         }
 
+        private void ScrollViewerControl_ManipulationCompleted(object sender, ManipulationCompletedRoutedEventArgs e)
+        {
+            ZoomSlider.Value = ScrollViewerControl.ZoomFactor;
+        }
+
         private void ScrollViewerControl_ViewChanged(object sender, ScrollViewerViewChangedEventArgs e)
         {
-            if (!e.IsIntermediate)
-            {
-                ZoomSlider.Value = ScrollViewerControl.ZoomFactor;
+            if (!e.IsIntermediate)
+            {
+                ZoomSlider.Value = ScrollViewerControl.ZoomFactor;
             }
         }
     }
diff --git a/WinUIGallery/ControlPages/SplitViewPage.xaml.cs b/WinUIGallery/ControlPages/SplitViewPage.xaml.cs
index a054a6c41..31b84dbcf 100644
--- a/WinUIGallery/ControlPages/SplitViewPage.xaml.cs
+++ b/WinUIGallery/ControlPages/SplitViewPage.xaml.cs
@@ -39,28 +39,6 @@ public SplitViewPage()
             this.InitializeComponent();
         }
 
-        private void togglePaneButton_Click(object sender, RoutedEventArgs e)
-        {
-            Window window = WindowHelper.GetWindowForElement(this);
-            if (window.Bounds.Width >= 640)
-            {
-                if (splitView.IsPaneOpen)
-                {
-                    splitView.DisplayMode = SplitViewDisplayMode.CompactOverlay;
-                    splitView.IsPaneOpen = false;
-                }
-                else
-                {
-                    splitView.IsPaneOpen = true;
-                    splitView.DisplayMode = SplitViewDisplayMode.Inline;
-                }
-            }
-            else
-            {
-                splitView.IsPaneOpen = !splitView.IsPaneOpen;
-            }
-        }
-
         private void NavLinksList_ItemClick(object sender, ItemClickEventArgs e)
         {
             content.Text = (e.ClickedItem as NavLink).Label + " Page";
diff --git a/WinUIGallery/ControlPages/StandardUICommandPage.xaml b/WinUIGallery/ControlPages/StandardUICommandPage.xaml
index cb9b7e8e6..c1a2f7563 100644
--- a/WinUIGallery/ControlPages/StandardUICommandPage.xaml
+++ b/WinUIGallery/ControlPages/StandardUICommandPage.xaml
@@ -54,7 +54,7 @@
                     </MenuBarItem>
                 </MenuBar>
 
-                <ListView x:Name="ListViewRight" Grid.Row="2" Height="500" Loaded="ListView_Loaded" ContainerContentChanging="ListViewRight_ContainerContentChanging" IsItemClickEnabled="True" SelectionMode="Single" SelectionChanged="ListView_SelectionChanged" ItemContainerStyle="{StaticResource HorizontalSwipe}">
+                <ListView x:Name="ListViewRight" Grid.Row="2" Height="500" Loaded="ListView_Loaded" ContainerContentChanging="ListViewRight_ContainerContentChanging" IsItemClickEnabled="True" SelectionMode="Single" ItemContainerStyle="{StaticResource HorizontalSwipe}">
                     <ListView.ItemTemplate>
                         <DataTemplate x:DataType="local2:ListItemData">
                             <UserControl PointerEntered="ListViewSwipeContainer_PointerEntered" PointerExited="ListViewSwipeContainer_PointerExited">
diff --git a/WinUIGallery/ControlPages/StandardUICommandPage.xaml.cs b/WinUIGallery/ControlPages/StandardUICommandPage.xaml.cs
index ca8ae0b5a..b0419adc5 100644
--- a/WinUIGallery/ControlPages/StandardUICommandPage.xaml.cs
+++ b/WinUIGallery/ControlPages/StandardUICommandPage.xaml.cs
@@ -13,6 +13,11 @@ public class ListItemData
     {
         public string Text { get; set; }
         public ICommand Command { get; set; }
+
+        public override string ToString()
+        {
+            return Text;
+        }
     }
 
     public sealed partial class StandardUICommandPage : Page
@@ -49,14 +54,6 @@ private void ListView_Loaded(object sender, RoutedEventArgs e)
             listView.ItemsSource = collection;
         }
 
-        private void ListView_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (ListViewRight.SelectedIndex != -1)
-            {
-                var item = collection[ListViewRight.SelectedIndex];
-            }
-        }
-
         private void ListViewSwipeContainer_PointerEntered(object sender, PointerRoutedEventArgs e)
         {
             if (e.Pointer.PointerDeviceType == Microsoft.UI.Input.PointerDeviceType.Mouse || e.Pointer.PointerDeviceType == Microsoft.UI.Input.PointerDeviceType.Pen)
diff --git a/WinUIGallery/ControlPages/SystemBackdropsPage.xaml b/WinUIGallery/ControlPages/SystemBackdropsPage.xaml
index 198954ca3..324888ae7 100644
--- a/WinUIGallery/ControlPages/SystemBackdropsPage.xaml
+++ b/WinUIGallery/ControlPages/SystemBackdropsPage.xaml
@@ -50,6 +50,11 @@
             <Button Click="createBuiltInAcrylicWindow_Click">Create Window with built-in Acrylic</Button>
         </local:ControlExample>
 
+        <local:ControlExample HeaderText="Create a window with a customizable Desktop Acrylic system backdrop."
+                              CSharpSource="SystemBackdrops\SystemBackdropsSample2.txt">
+            <Button Click="createCustomDesktopAcrylicWindow_Click">Create Window with customizable Desktop Acrylic</Button>
+        </local:ControlExample>
+
         <local:ControlExample HeaderText="Helper class to ensure a Windows.System.DispatcherQueue exists."
                               CSharpSource="SystemBackdrops\SystemBackdropsEnsureSystemDQC.txt">
             <TextBlock Text="A Windows.System.DispatcherQueue must exist on the thread to use MicaController or DesktopAcrylicController. This helper class exposes and uses the underlying create function." TextWrapping="WrapWholeWords" />
diff --git a/WinUIGallery/ControlPages/SystemBackdropsPage.xaml.cs b/WinUIGallery/ControlPages/SystemBackdropsPage.xaml.cs
index 20b16eacf..c62db42d3 100644
--- a/WinUIGallery/ControlPages/SystemBackdropsPage.xaml.cs
+++ b/WinUIGallery/ControlPages/SystemBackdropsPage.xaml.cs
@@ -40,7 +40,14 @@ private void createCustomMicaWindow_Click(object sender, RoutedEventArgs e)
         private void createBuiltInAcrylicWindow_Click(object sender, RoutedEventArgs e)
         {
             var newWindow = new AppUIBasics.SamplePages.SampleSystemBackdropsWindow();
-            newWindow.SetBackdrop(AppUIBasics.SamplePages.SampleSystemBackdropsWindow.BackdropType.DesktopAcrylic);
+            newWindow.SetBackdrop(AppUIBasics.SamplePages.SampleSystemBackdropsWindow.BackdropType.DesktopAcrylicBase);
+            newWindow.Activate();
+        }
+
+        private void createCustomDesktopAcrylicWindow_Click(object sender, RoutedEventArgs e)
+        {
+            var newWindow = new AppUIBasics.SamplePages.SampleSystemBackdropsWindow();
+            newWindow.SetBackdrop(AppUIBasics.SamplePages.SampleSystemBackdropsWindow.BackdropType.DesktopAcrylicBase);
             newWindow.Activate();
         }
     }
diff --git a/WinUIGallery/ControlPages/TitleBarPage.xaml b/WinUIGallery/ControlPages/TitleBarPage.xaml
index 4a090fa0b..115c049fd 100644
--- a/WinUIGallery/ControlPages/TitleBarPage.xaml
+++ b/WinUIGallery/ControlPages/TitleBarPage.xaml
@@ -26,13 +26,35 @@
     </Page.Resources>
 
     <StackPanel>
+        <local:ControlExample HeaderText="Default titlebar (when no user defined titlebar is set)"
+                              CSharpSource="Window\TitleBar\TitleBarSample2.txt">
+            <local: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></LineBreak>
+                        This is the recommended way of using TitleBar apis and covers most common scenarios.
+                        <LineBreak></LineBreak>
+                        It can be applied by just calling ExtendsContentIntoTitleBar api. This internally calls SetTitleBar api with null argument and provides the default case.
+                        <LineBreak></LineBreak>
+                        Use the button below to toggle between system titlebar and default custom titlebar.
+                    </TextBlock>
+                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch" VerticalAlignment="Top" Spacing="20">
+                        <Button x:Name="defaultTitleBar" Click="defaultTitleBar_Click"></Button>
+                    </StackPanel>
+                </StackPanel>
+            </local:ControlExample.Example>
+        </local:ControlExample>
         <local:ControlExample HeaderText="User defined UIElement as custom titlebar for the window"
                               CSharpSource="Window/TitleBar/TitleBarSample1.txt">
             <local:ControlExample.Example>
                 <StackPanel Orientation="Vertical" Spacing="10">
                     <TextBlock TextWrapping="WrapWholeWords">
-                        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. <LineBreak></LineBreak>
+                        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></LineBreak>
                         The Background and Foreground Color dropdowns set the foreground and background of titlebar and caption buttons respectively.
+                        <LineBreak></LineBreak>
+                        Use the button below to toggle between system titlebar and custom WinUI titlebar.
                     </TextBlock>
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch" VerticalAlignment="Top" Spacing="10">
                         <Button x:Name="customTitleBar" Click="customTitleBar_Click"></Button>
@@ -64,7 +86,8 @@
                                             <Rectangle Fill="Green" AutomationProperties.Name="Green"/>
                                             <Rectangle Fill="Blue" AutomationProperties.Name="Blue"/>
                                             <Rectangle Fill="White" AutomationProperties.Name="White"/>
-                                            <Rectangle Fill="Black" AutomationProperties.Name="Black"/>                                        </GridView.Items>
+                                            <Rectangle Fill="Black" AutomationProperties.Name="Black"/>
+                                        </GridView.Items>
                                     </GridView>
 
                                 </Flyout>
@@ -111,23 +134,33 @@
             </local:ControlExample.Example>
 
         </local:ControlExample>
-        <local:ControlExample HeaderText="Fallback titlebar when no user defined titlebar is set"
-                              CSharpSource="Window/TitleBar/TitleBarSample2.txt">
+        <local:ControlExample HeaderText="Titlebar Customizations : Interactive controls in Titlebar (non client) area"
+                              CSharpSource="Window\TitleBar\TitleBarSample3.txt">
             <local:ControlExample.Example>
                 <StackPanel Orientation="Vertical" Spacing="10">
                     <TextBlock TextWrapping="WrapWholeWords">
-                        WinUI provides a fallback titlebar in case where user doesn't want to provide a uielement for setting the titlebar.
-                        A small horizontal section next to min/max/close caption buttons is chosen as the fallback titlebar.
-                         <LineBreak></LineBreak>
-                        It can be applied by just calling ExtendsContentIntoTitleBar api only and not calling SetTitleBar afterwards. It can also be manually triggered by calling SetTitleBar api with null arument.
+                        WinUI custom titlebar now hosting interactive clickable controls within non client region of the window, when using custom titlebar.
                         <LineBreak></LineBreak>
-                        Use the Color dropdown controls in the section above to change color of the fallback titlebar.
+                        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
+                        <Italic>Microsoft.UI.NonClientInputPointerSource apis</Italic>
+                        <LineBreak></LineBreak>
+                        <LineBreak></LineBreak>
+                        WinUI allows  <Bold> mix and match </Bold> of higher level WinUI custom titlebar apis with lower level AppWindow and NonClientInputPointerSource 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></LineBreak>
+                        Use the button below to toggle between system titlebar and default custom titlebar.
                     </TextBlock>
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch" VerticalAlignment="Top" Spacing="20">
-                        <Button x:Name="defaultTitleBar" Click="defaultTitleBar_Click"></Button>
+                        <Button x:Name="addInteractiveElements" Click="AddInteractiveElements_Click">Add interactive control to titlebar</Button>
                     </StackPanel>
                 </StackPanel>
             </local:ControlExample.Example>
         </local:ControlExample>
+
     </StackPanel>
 </Page>
diff --git a/WinUIGallery/ControlPages/TitleBarPage.xaml.cs b/WinUIGallery/ControlPages/TitleBarPage.xaml.cs
index 1ad7a489e..48afc7865 100644
--- a/WinUIGallery/ControlPages/TitleBarPage.xaml.cs
+++ b/WinUIGallery/ControlPages/TitleBarPage.xaml.cs
@@ -15,6 +15,12 @@
 using WinUIGallery.DesktopWap.Helper;
 using Microsoft.UI.Xaml.Shapes;
 using System.Threading.Tasks;
+using Microsoft.UI.Windowing;
+using Microsoft.UI.Xaml.Navigation;
+using Microsoft.UI.Input;
+using System.IO;
+using Windows.Foundation;
+using System;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
@@ -29,7 +35,8 @@ namespace AppUIBasics.ControlPages
     public sealed partial class TitleBarPage : Page
     {
         private Windows.UI.Color currentBgColor = Colors.Transparent;
-        private Windows.UI.Color currentFgColor = Colors.Black;
+        private Windows.UI.Color currentFgColor = ThemeHelper.ActualTheme == ElementTheme.Dark ? Colors.White : Colors.Black;
+        private bool sizeChangedEventHandlerAdded = false;
 
         public TitleBarPage()
         {
@@ -41,11 +48,17 @@ public TitleBarPage()
             };
         }
 
+        protected override void OnNavigatedFrom(NavigationEventArgs e)
+        {
+            ResetTitlebarSettings();
+        }
+
+
 
-        private void SetTitleBar(UIElement titlebar)
+        private void SetTitleBar(UIElement titlebar, bool forceCustomTitlebar = false)
         {
             var window = WindowHelper.GetWindowForElement(this as UIElement);
-            if (!window.ExtendsContentIntoTitleBar)
+            if (forceCustomTitlebar || !window.ExtendsContentIntoTitleBar)
             {
                 window.ExtendsContentIntoTitleBar = true;
                 window.SetTitleBar(titlebar);
@@ -60,18 +73,43 @@ private void SetTitleBar(UIElement titlebar)
             UpdateTitleBarColor();
         }
 
+        private void ResetTitlebarSettings()
+        {
+            var window = WindowHelper.GetWindowForElement(this as UIElement);
+            UIElement titleBarElement = UIHelper.FindElementByName(this as UIElement, "AppTitleBar");
+            SetTitleBar(titleBarElement, 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";
+                customTitleBar.Content = "Reset to System TitleBar";
+                defaultTitleBar.Content = "Reset to System TitleBar";
             }
             else
             {
                 customTitleBar.Content = "Set Custom TitleBar";
-                defaultTitleBar.Content = "Set Fallback Custom TitleBar";
+                defaultTitleBar.Content = "Set Default Custom TitleBar";
             }
 
         }
@@ -117,7 +155,6 @@ private void customTitleBar_Click(object sender, RoutedEventArgs e)
         {
             UIElement titleBarElement = UIHelper.FindElementByName(sender as UIElement, "AppTitleBar");
             SetTitleBar(titleBarElement);
-
             // announce visual change to automation
             UIHelper.AnnounceActionForAccessibility(sender as UIElement, "TitleBar size and width changed", "TitleBarChangedNotificationActivityId");
         }
@@ -128,5 +165,48 @@ private void defaultTitleBar_Click(object sender, RoutedEventArgs e)
             // announce visual change to automation
             UIHelper.AnnounceActionForAccessibility(sender as UIElement, "TitleBar size and width changed", "TitleBarChangedNotificationActivityId");
         }
+
+        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)
+                {
+                    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)
+                        {
+                            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);
+                        }
+                    };
+                }
+                txtBoxNonClientArea.Width += 1; //to trigger size changed event
+            }
+            // announce visual change to automation
+            UIHelper.AnnounceActionForAccessibility(sender as UIElement, "TitleBar size and width changed", "TitleBarChangedNotificationActivityId");
+        }
+       
     }
 }
diff --git a/WinUIGallery/ControlPagesSampleCode/ItemsRepeater/ItemsRepeaterSample3_xaml.txt b/WinUIGallery/ControlPagesSampleCode/ItemsRepeater/ItemsRepeaterSample3_xaml.txt
index a77f0f637..939916af0 100644
--- a/WinUIGallery/ControlPagesSampleCode/ItemsRepeater/ItemsRepeaterSample3_xaml.txt
+++ b/WinUIGallery/ControlPagesSampleCode/ItemsRepeater/ItemsRepeaterSample3_xaml.txt
@@ -22,7 +22,6 @@ color-changing rectangle besides it. -->
                             Click="Animated_GotItem" 
                             GotFocus="Animated_GotItem" 
                             HorizontalAlignment="Stretch"
-                            Loaded="GetButtonSize"
                             Foreground="{ThemeResource ButtonForeground}"/>
                 </DataTemplate>
             </ItemsRepeater.ItemTemplate>
diff --git a/WinUIGallery/ControlPagesSampleCode/Media/CaptureElementPreviewSample_cs.txt b/WinUIGallery/ControlPagesSampleCode/Media/CaptureElementPreviewSample_cs.txt
new file mode 100644
index 000000000..3b6e0ecd6
--- /dev/null
+++ b/WinUIGallery/ControlPagesSampleCode/Media/CaptureElementPreviewSample_cs.txt
@@ -0,0 +1,48 @@
+using Windows.Media.Capture.Frames;
+using Windows.Media.Capture;
+
+    private MediaFrameSourceGroup mediaFrameSourceGroup;
+    private MediaCapture mediaCapture;
+
+    async private void StartCaptureElement()
+    {
+        var groups = await MediaFrameSourceGroup.FindAllAsync();
+        if (groups.Count == 0)
+        {
+            frameSourceName.Text = "No camera devices found.";
+            return;
+        }
+        mediaFrameSourceGroup = groups.First();
+
+        frameSourceName.Text = "Viewing: " + mediaFrameSourceGroup.DisplayName;
+        mediaCapture = new MediaCapture();
+        var mediaCaptureInitializationSettings = new MediaCaptureInitializationSettings()
+        {
+            SourceGroup = this.mediaFrameSourceGroup,
+            SharingMode = MediaCaptureSharingMode.SharedReadOnly,
+            StreamingCaptureMode = StreamingCaptureMode.Video,
+            MemoryPreference = MediaCaptureMemoryPreference.Cpu
+        };
+        await mediaCapture.InitializeAsync(mediaCaptureInitializationSettings);
+
+        // Set the MediaPlayerElement's Source property to the MediaSource for the mediaCapture.
+        var frameSource = mediaCapture.FrameSources[this.mediaFrameSourceGroup.SourceInfos[0].Id];
+        captureElement.Source = Windows.Media.Core.MediaSource.CreateFromMediaFrameSource(frameSource);
+$(MirrorPreview)    }
+
+    async private void CapturePhoto_Click(object sender, RoutedEventArgs e)
+    {
+        // Capture a photo to a stream
+        var imgFormat = ImageEncodingProperties.CreateJpeg();
+        var stream = new InMemoryRandomAccessStream();
+        await mediaCapture.CapturePhotoToStreamAsync(imgFormat, stream);
+        stream.Seek(0);
+
+        // Show the photo in an Image element
+        BitmapImage bmpImage = new BitmapImage();
+        await bmpImage.SetSourceAsync(stream);
+        var image = new Image() { Source = bmpImage };
+        snapshots.Children.Insert(0, image);
+
+        capturedText.Visibility = Visibility.Visible;
+    }
diff --git a/WinUIGallery/ControlPagesSampleCode/Media/CaptureElementPreviewSample_xaml.txt b/WinUIGallery/ControlPagesSampleCode/Media/CaptureElementPreviewSample_xaml.txt
new file mode 100644
index 000000000..bbc4e453d
--- /dev/null
+++ b/WinUIGallery/ControlPagesSampleCode/Media/CaptureElementPreviewSample_xaml.txt
@@ -0,0 +1,10 @@
+<Grid RowDefinitions="Auto,*" ColumnDefinitions="*,100"  MinWidth="400" MinHeight="300" RowSpacing="10" ColumnSpacing="4">
+    <TextBlock x:Name="frameSourceName" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center"/>
+    <MediaPlayerElement x:Name="captureElement" Grid.Row="1" Grid.Column="0" Stretch="Uniform" AutoPlay="True" />
+    <TextBlock x:Name="capturedText" Visibility="Collapsed" Grid.Row="0" Grid.Column="1" VerticalAlignment="Center" Text="Captured:" />
+    <Grid x:Name="captureContainer" Grid.Row="1" Grid.Column="1">
+        <ScrollViewer VerticalScrollMode="Enabled">
+            <StackPanel x:Name="snapshots" Spacing="2"/>
+        </ScrollViewer>
+    </Grid>
+</Grid>
diff --git a/WinUIGallery/ControlPagesSampleCode/Motion/ConnectedAnimation/ConnectedAnimationSample1_cs.txt b/WinUIGallery/ControlPagesSampleCode/Motion/ConnectedAnimation/ConnectedAnimationSample1_cs.txt
index dcd9af9db..a3b36842d 100644
--- a/WinUIGallery/ControlPagesSampleCode/Motion/ConnectedAnimation/ConnectedAnimationSample1_cs.txt
+++ b/WinUIGallery/ControlPagesSampleCode/Motion/ConnectedAnimation/ConnectedAnimationSample1_cs.txt
@@ -54,8 +54,7 @@ public sealed partial class CollectionPage : Page
             // Prepare the connected animation.
             // Notice that the stored item is passed in, as well as the name of the connected element. 
             // The animation will actually start on the Detailed info page.
-            var animation = collection.PrepareConnectedAnimation("ForwardConnectedAnimation", _storeditem, "connectedElement");
-
+            collection.PrepareConnectedAnimation("ForwardConnectedAnimation", _storeditem, "connectedElement");
         }
 
         // Navigate to the DetailedInfoPage.
diff --git a/WinUIGallery/ControlPagesSampleCode/SystemBackdrops/SystemBackdropsSample1.txt b/WinUIGallery/ControlPagesSampleCode/SystemBackdrops/SystemBackdropsSample1.txt
index 357e01e7c..5606bd3b5 100644
--- a/WinUIGallery/ControlPagesSampleCode/SystemBackdrops/SystemBackdropsSample1.txt
+++ b/WinUIGallery/ControlPagesSampleCode/SystemBackdrops/SystemBackdropsSample1.txt
@@ -5,7 +5,7 @@ WindowsSystemDispatcherQueueHelper m_wsdqHelper; // See separate sample below fo
 Microsoft.UI.Composition.SystemBackdrops.MicaController m_micaController;
 Microsoft.UI.Composition.SystemBackdrops.SystemBackdropConfiguration m_configurationSource;
 
-bool TrySetMicaBackdrop()
+bool TrySetMicaBackdrop(bool useMicaAlt)
 {
     if (Microsoft.UI.Composition.SystemBackdrops.MicaController.IsSupported())
     {
@@ -24,6 +24,8 @@ bool TrySetMicaBackdrop()
 
         m_micaController = new Microsoft.UI.Composition.SystemBackdrops.MicaController();
 
+        m_micaController.Kind = useMicaAlt ? Microsoft.UI.Composition.SystemBackdrops.MicaKind.BaseAlt : Microsoft.UI.Composition.SystemBackdrops.MicaKind.Base;
+
         // Enable the system backdrop.
         // Note: Be sure to have "using WinRT;" to support the Window.As<...>() call.
         m_micaController.AddSystemBackdropTarget(this.As<Microsoft.UI.Composition.ICompositionSupportsSystemBackdrop>());
diff --git a/WinUIGallery/ControlPagesSampleCode/SystemBackdrops/SystemBackdropsSample2.txt b/WinUIGallery/ControlPagesSampleCode/SystemBackdrops/SystemBackdropsSample2.txt
index 0a14ad08a..f47c55ac2 100644
--- a/WinUIGallery/ControlPagesSampleCode/SystemBackdrops/SystemBackdropsSample2.txt
+++ b/WinUIGallery/ControlPagesSampleCode/SystemBackdrops/SystemBackdropsSample2.txt
@@ -5,7 +5,7 @@ WindowsSystemDispatcherQueueHelper m_wsdqHelper; // See separate sample below fo
 Microsoft.UI.Composition.SystemBackdrops.DesktopAcrylicController m_acrylicController;
 Microsoft.UI.Composition.SystemBackdrops.SystemBackdropConfiguration m_configurationSource;
 
-bool TrySetAcrylicBackdrop()
+bool TrySetAcrylicBackdrop(bool useAcrylicThin)
 {
     if (Microsoft.UI.Composition.SystemBackdrops.DesktopAcrylicController.IsSupported())
     {
@@ -24,6 +24,8 @@ bool TrySetAcrylicBackdrop()
 
         m_acrylicController = new Microsoft.UI.Composition.SystemBackdrops.DesktopAcrylicController();
 
+        m_acrylicController.Kind = useAcrylicThin ? Microsoft.UI.Composition.SystemBackdrops.DesktopAcrylicKind.Thin : Microsoft.UI.Composition.SystemBackdrops.DesktopAcrylicKind.Base;
+
         // Enable the system backdrop.
         // Note: Be sure to have "using WinRT;" to support the Window.As<...>() call.
         m_acrylicController.AddSystemBackdropTarget(this.As<Microsoft.UI.Composition.ICompositionSupportsSystemBackdrop>());
diff --git a/WinUIGallery/ControlPagesSampleCode/Text/RichEditBox/RichEditBoxSample3_cs.txt b/WinUIGallery/ControlPagesSampleCode/Text/RichEditBox/RichEditBoxSample3_cs.txt
index 9ee56c174..3e43ca381 100644
--- a/WinUIGallery/ControlPagesSampleCode/Text/RichEditBox/RichEditBoxSample3_cs.txt
+++ b/WinUIGallery/ControlPagesSampleCode/Text/RichEditBox/RichEditBoxSample3_cs.txt
@@ -111,7 +111,7 @@ private void FindBoxRemoveHighlights()
 
 private void Editor_GotFocus(object sender, RoutedEventArgs e)
 {
-    editor.Document.GetText(TextGetOptions.UseCrlf, out string currentRawText);
+    editor.Document.GetText(TextGetOptions.UseCrlf, out _);
             
     // reset colors to correct defaults for Focused state
     ITextRange documentRange = editor.Document.GetRange(0, TextConstants.MaxUnitCount);
diff --git a/WinUIGallery/ControlPagesSampleCode/Window/CreateWindowSample1.txt b/WinUIGallery/ControlPagesSampleCode/Window/CreateWindowSample1.txt
index 7f5890faf..938d39d2f 100644
--- a/WinUIGallery/ControlPagesSampleCode/Window/CreateWindowSample1.txt
+++ b/WinUIGallery/ControlPagesSampleCode/Window/CreateWindowSample1.txt
@@ -6,6 +6,6 @@ newWindow.Content = rootPage;
 newWindow.Activate();
 
 // C# code to navigate in the new window
-var targetPageType = typeof(NewControlsPage);
+var targetPageType = typeof(HomePage);
 string targetPageArguments = string.Empty;
 rootPage.Navigate(targetPageType, targetPageArguments);
\ No newline at end of file
diff --git a/WinUIGallery/ControlPagesSampleCode/Window/TitleBar/TitleBarSample2.txt b/WinUIGallery/ControlPagesSampleCode/Window/TitleBar/TitleBarSample2.txt
index 752e3b23f..d6bcc6eaf 100644
--- a/WinUIGallery/ControlPagesSampleCode/Window/TitleBar/TitleBarSample2.txt
+++ b/WinUIGallery/ControlPagesSampleCode/Window/TitleBar/TitleBarSample2.txt
@@ -1,4 +1,4 @@
-// no UIElement is set for titlebar, fallback titlebar is created
+// no UIElement is set for titlebar, default titlebar is created which extends to entire non client area
 Window window = App.MainWindow;
 window.ExtendsContentIntoTitleBar = true;
-window.SetTitleBar(null);  // this line is optional as by it is null by default
+// window.SetTitleBar(null);  // optional line as not setting any UIElement as titlebar is same as setting null as titlebar
diff --git a/WinUIGallery/ControlPagesSampleCode/Window/TitleBar/TitleBarSample3.txt b/WinUIGallery/ControlPagesSampleCode/Window/TitleBar/TitleBarSample3.txt
new file mode 100644
index 000000000..f3afd4b40
--- /dev/null
+++ b/WinUIGallery/ControlPagesSampleCode/Window/TitleBar/TitleBarSample3.txt
@@ -0,0 +1,22 @@
+Window window = App.MainWindow;
+window.ExtendsContentIntoTitleBar = true;
+window.SetTitleBar(AppTitleBar);
+var nonClientInputSrc = InputNonClientPointerSource.GetForWindowId(window.AppWindow.Id);
+
+// textbox on titlebar area
+var txtBoxNonClientArea = UIHelper.FindElementByName(sender as UIElement, "AppTitleBarTextBox") as FrameworkElement;
+GeneralTransform transformTxtBox = txtBoxNonClientArea.TransformToVisual(null);
+Rect bounds = transformTxtBox.TransformBounds(new Rect(0, 0, txtBoxNonClientArea.ActualWidth, txtBoxNonClientArea.ActualHeight));
+
+// Windows.Graphics.RectInt32[] rects defines the area which allows click throughs in custom titlebar 
+// it is non dpi-aware client coordinates. Hence, we convert dpi aware coordinates to non-dpi coordinates
+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 rects = new Windows.Graphics.RectInt32[] { transparentRect };
+
+nonClientInputSrc.SetRegionRects(NonClientRegionKind.Passthrough, rects); // areas defined will be click through and can host button and textboxes
diff --git a/WinUIGallery/Controls/ControlExample.xaml b/WinUIGallery/Controls/ControlExample.xaml
index c62b28310..6b2e8c008 100644
--- a/WinUIGallery/Controls/ControlExample.xaml
+++ b/WinUIGallery/Controls/ControlExample.xaml
@@ -80,7 +80,7 @@
             IsTextSelectionEnabled="True"
             Visibility="Collapsed">
             <Paragraph>
-                This sample requires a later version of Windows to be fully functional. Learn more about version adaptive apps:<Hyperlink NavigateUri="https://learn.microsoft.com/windows/uwp/debug-test-perf/version-adaptive-apps">https://learn.microsoft.com/windows/uwp/debug-test-perf/version-adaptive-apps</Hyperlink>
+                This sample requires a later version of Windows to be fully functional.
             </Paragraph>
         </RichTextBlock>
 
diff --git a/WinUIGallery/Controls/DesignGuidance/ColorTile.xaml.cs b/WinUIGallery/Controls/DesignGuidance/ColorTile.xaml.cs
index 5e66dbc69..0e757b94f 100644
--- a/WinUIGallery/Controls/DesignGuidance/ColorTile.xaml.cs
+++ b/WinUIGallery/Controls/DesignGuidance/ColorTile.xaml.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation and Contributors.
 // Licensed under the MIT License.
 
+using AppUIBasics.Helper;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
@@ -75,6 +76,7 @@ private void CopyBrushNameButton_Click(object sender, RoutedEventArgs e)
             package.SetText(ColorBrushName);
             Clipboard.SetContent(package);
 
+            UIHelper.AnnounceActionForAccessibility(sender as Button, "Brush name copied to clipboard", "BrushNameCopiedSuccessNotificationId");
         }
     }
 }
diff --git a/WinUIGallery/Controls/HeaderTile.xaml.cs b/WinUIGallery/Controls/HeaderTile.xaml.cs
index 3a5c643bf..2f58e80f4 100644
--- a/WinUIGallery/Controls/HeaderTile.xaml.cs
+++ b/WinUIGallery/Controls/HeaderTile.xaml.cs
@@ -22,9 +22,6 @@ namespace AppUIBasics.Controls
 {
     public sealed partial class HeaderTile : UserControl
     {
-        Compositor _compositor = Microsoft.UI.Xaml.Media.CompositionTarget.GetCompositorForCurrentThread();
-        private SpringVector3NaturalMotionAnimation _springAnimation;
-
         public string Title
         {
             get { return (string)GetValue(TitleProperty); }
@@ -66,33 +63,5 @@ public HeaderTile()
         {
             this.InitializeComponent();
         }
-
-        private void Element_PointerEntered(object sender, PointerRoutedEventArgs e)
-        {
-            CreateOrUpdateSpringAnimation(1.1f);
-            (sender as UIElement).CenterPoint = new Vector3(70, 40, 1f);
-            (sender as UIElement).StartAnimation(_springAnimation);
-        }
-
-        private void Element_PointerExited(object sender, PointerRoutedEventArgs e)
-        {
-            CreateOrUpdateSpringAnimation(1.0f);
-            (sender as UIElement).CenterPoint = new Vector3(70, 40, 1f);
-            (sender as UIElement).StartAnimation(_springAnimation);
-        }
-
-        private void CreateOrUpdateSpringAnimation(float finalValue)
-        {
-            if (_springAnimation == null)
-            {
-                if (_compositor != null)
-                {
-                    _springAnimation = _compositor.CreateSpringVector3Animation();
-                    _springAnimation.Target = "Scale";
-                }
-            }
-
-            _springAnimation.FinalValue = new Vector3(finalValue);
-        }
     }
 }
diff --git a/WinUIGallery/Controls/PageHeader.xaml b/WinUIGallery/Controls/PageHeader.xaml
index c1e606c91..6e68235f1 100644
--- a/WinUIGallery/Controls/PageHeader.xaml
+++ b/WinUIGallery/Controls/PageHeader.xaml
@@ -142,7 +142,7 @@
                             Subtitle="Share with others or paste this link into the Run dialog to open the app to this page directly."
                             Target="{x:Bind CopyLinkButton}">
                             <TeachingTip.HeroContent>
-                                <Image Source="/Assets/CopyLinkTeachingTip.png" />
+                                <Image Source="/Assets/CopyLinkTeachingTip.png" AutomationProperties.Name="Image of copied text in Run Dialog."/>
                             </TeachingTip.HeroContent>
                         </TeachingTip>
                     </local:CopyButton.Resources>
diff --git a/WinUIGallery/Controls/SampleCodePresenter.xaml.cs b/WinUIGallery/Controls/SampleCodePresenter.xaml.cs
index 129127c4f..0c61cd4ef 100644
--- a/WinUIGallery/Controls/SampleCodePresenter.xaml.cs
+++ b/WinUIGallery/Controls/SampleCodePresenter.xaml.cs
@@ -25,6 +25,7 @@
 using AppUIBasics.Common;
 using System.Reflection;
 using System.IO;
+using Microsoft.UI.Xaml.Automation;
 
 namespace AppUIBasics.Controls
 {
@@ -66,7 +67,7 @@ public IList<ControlExampleSubstitution> Substitutions
             set { SetValue(SubstitutionsProperty, value); }
         }
 
-        public bool IsEmpty => Code.Length == 0 && CodeSourceFile == null;
+        public bool IsEmpty => string.IsNullOrEmpty(Code) && string.IsNullOrEmpty(CodeSourceFile);
 
         private string actualCode = "";
         private static Regex SubstitutionPattern = new Regex(@"\$\(([^\)]+)\)");
@@ -87,7 +88,7 @@ private static void OnDependencyPropertyChanged(DependencyObject target, Depende
 
         private void ReevaluateVisibility()
         {
-            if (Code.Length == 0 && CodeSourceFile == null)
+            if (IsEmpty)
             {
                 Visibility = Visibility.Collapsed;
             }
@@ -226,6 +227,10 @@ private void FormatAndRenderSampleFromString(string sampleString, ContentPresent
 
             actualCode = sampleString;
 
+            var name = GetSampleLanguageVisualState() == "InlineSample" ? actualCode : SampleHeader.Text;
+            var automationName = "Copy " + name + " Code";
+            AutomationProperties.SetName(CopyCodeButton, automationName);
+
 
             var formatter = GenerateRichTextFormatter();
             if (SampleType == SampleCodePresenterType.Inline)
diff --git a/WinUIGallery/DataModel/ControlInfoData.json b/WinUIGallery/DataModel/ControlInfoData.json
index 9ea25af16..9e480e4c7 100644
--- a/WinUIGallery/DataModel/ControlInfoData.json
+++ b/WinUIGallery/DataModel/ControlInfoData.json
@@ -56,7 +56,8 @@
             {
               "Title": "Colors in Windows 11",
               "Uri": "https://learn.microsoft.com/windows/apps/design/signature-experiences/color"
-            },{
+            },
+            {
               "Title": "Windows UI Toolkit (Figma)",
               "Uri": "https://www.figma.com/community/file/1159947337437047524"
             },
@@ -65,10 +66,20 @@
               "Uri": "https://github.com/microsoft/microsoft-ui-xaml/blob/main/dev/CommonStyles/Common_themeresources_any.xaml"
             }
           ]
-        },
+        }
+      ]
+    },
+    {
+      "UniqueId": "AccessibilityItem",
+      "Title": "Accessibility",
+      "ImagePath": "ms-appx:///Assets/ControlImages/Placeholder.png",
+      "ImageIconPath": "ms-appx:///Assets/ControlIcons/DefaultIcon.png",
+      "IsSpecialSection": true,
+      "Folder": "Accessibility",
+      "Items": [
         {
           "UniqueId": "AccessibilityColorContrast",
-          "Title": "Color contrast",
+          "Title": "Color Contrast",
           "ImagePath": "ms-appx:///Assets/ControlImages/AppBarSeparator.png",
           "ImageIconPath": "ms-appx:///Assets/ControlIcons/AppBarSeparatorIcon.png",
           "HideSourceCodeAndRelatedControls": true,
@@ -85,7 +96,7 @@
         },
         {
           "UniqueId": "AccessibilityKeyboard",
-          "Title": "Keyboard support",
+          "Title": "Keyboard Support",
           "ImagePath": "ms-appx:///Assets/ControlImages/AppBarSeparator.png",
           "ImageIconPath": "ms-appx:///Assets/ControlIcons/AppBarSeparatorIcon.png",
           "HideSourceCodeAndRelatedControls": true,
@@ -126,7 +137,7 @@
         },
         {
           "UniqueId": "AccessibilityScreenReader",
-          "Title": "Screen reader support",
+          "Title": "Screen Reader Support",
           "ImagePath": "ms-appx:///Assets/ControlImages/AppBarSeparator.png",
           "ImageIconPath": "ms-appx:///Assets/ControlIcons/AppBarSeparatorIcon.png",
           "HideSourceCodeAndRelatedControls": true,
@@ -534,7 +545,7 @@
           "ApiNamespace": "Microsoft.UI.Xaml.Controls",
           "Subtitle": "A control that presents a collection of items using various layouts.",
           "ImagePath": "ms-appx:///Assets/ControlImages/ItemsView.png",
-          "ImageIconPath": "ms-appx:///Assets/ControlIcons/ItemsViewIcon.png",
+          "ImageIconPath": "ms-appx:///Assets/ControlIcons/DefaultIcon.png",
           "Description": "The ItemsView lets you show a collection of items using scrollable & swappable layouts.",
           "Content": "<p><b>ItemsView</b> can contain a collection of items of any type. To populate the view, set the <b>ItemsSource</b> property to a data source.</p><p>Set a <b>Layout</b> to define how the items are laid out.</p><p>Set an <b>ItemTemplate</b> to define the look of individual items.</p><p>Look at the <i>ItemsViewPage.xaml</i> file in Visual Studio to see the full code for this page.</p>",
           "IsNew": true,
@@ -1428,8 +1439,8 @@
           "Title": "AnnotatedScrollBar",
           "ApiNamespace": "Microsoft.UI.Xaml.Controls",
           "Subtitle": "A control that extends a regular vertical scrollbar's functionality for an easy navigation through large collections.",
-          "ImagePath": "ms-appx:///Assets/ControlImages/AnnotatedScrollBar.png",
-          "ImageIconPath": "ms-appx:///Assets/ControlIcons/AnnotatedScrollBarIcon.png",
+          "ImagePath": "ms-appx:///Assets/ControlImages/Placeholder.png",
+          "ImageIconPath": "ms-appx:///Assets/ControlIcons/DefaultIcon.png",
           "Description": "The AnnotatedScrollBar lets you navigate through a large collection of items via a clickable rail with labels which act as markers.",
           "Content": "<p><b>AnnotatedScrollBar</b> can be connected to a scrollable container, like a ScrollView, via its <b>ScrollController</b> property.</p><p>Populate the <b>Labels</b> property with special values that act as markers.</p><p>Set the <b>LabelTemplate</b> and <b>DetailLabelTemplate</b> data templates to define the labels' and more granular tooltips' looks.</p><p>Look at the <i>AnnotatedScrollBarPage.xaml</i> file in Visual Studio to see the full code for this page.</p>",
           "IsNew": true,
@@ -1475,7 +1486,7 @@
           "ApiNamespace": "Microsoft.UI.Xaml.Controls",
           "Subtitle": "A container control that lets the user pan and zoom its content.",
           "ImagePath": "ms-appx:///Assets/ControlImages/ScrollView.png",
-          "ImageIconPath": "ms-appx:///Assets/ControlIcons/ScrollViewIcon.png",
+          "ImageIconPath": "ms-appx:///Assets/ControlIcons/DefaultIcon.png",
           "Description": "A ScrollView lets a user scroll, pan, and zoom to see content that's larger than the viewable area. The ItemsView has a ScrollView built into its control template to provide automatic scrolling.",
           "Content": "<p>Look at the <i>ScrollViewPage.xaml</i> file in Visual Studio to see the full code for this page.</p>",
           "IsNew": true,
@@ -2011,6 +2022,24 @@
             }
           ]
         },
+        {
+          "UniqueId": "CaptureElementPreview",
+          "Title": "Capture Element / Camera Preview",
+          "Subtitle": "A sample for doing a camera preview.",
+          "ImagePath": "ms-appx:///Assets/ControlImages/MediaPlayerElement.png",
+          "ImageIconPath": "ms-appx:///Assets/ControlIcons/MediaElementIcon.png",
+          "Description": "You can use a MediaPlayerElement control to show a camera preview with a MediaCapture object.",
+          "IsNew": true,
+          "Docs": [
+            {
+              "Title": "MediaCapture - API",
+              "Uri": "https://learn.microsoft.com/uwp/api/windows.media.capture.mediacapture"
+            }
+          ],
+          "RelatedControls": [
+            "MediaPlayerElement"
+          ]
+        },
         {
           "UniqueId": "Image",
           "Title": "Image",
@@ -2711,15 +2740,11 @@
             },
             {
               "Title": "Composition Animation - API",
-              "Uri": "https://learn.microsoft.com/windows/uwp/composition/composition-animation"
+              "Uri": "https://learn.microsoft.com/windows/apps/windows-app-sdk/composition"
             },
             {
               "Title": "Guidelines - Xaml Property Animations",
               "Uri": "https://learn.microsoft.com/windows/apps/design/motion/xaml-property-animations"
-            },
-            {
-              "Title": "Using the Visual Layer with XAML",
-              "Uri": "https://learn.microsoft.com/windows/uwp/composition/using-the-visual-layer-with-xaml"
             }
           ],
           "RelatedControls": [
@@ -2814,7 +2839,7 @@
           "Subtitle": "An example showing a custom UIElement used as the titlebar for the app's window.",
           "ImagePath": "ms-appx:///Assets/ControlImages/TitleBar.png",
           "ImageIconPath": "ms-appx:///Assets/ControlIcons/DefaultIcon.png",
-          "Description": "This sample shows how to use a custom UIElement as titlebar for app's window.",
+          "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.",
           "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": [
diff --git a/WinUIGallery/Directory.Build.props b/WinUIGallery/Directory.Build.props
index 39faf6040..73bd14dbf 100644
--- a/WinUIGallery/Directory.Build.props
+++ b/WinUIGallery/Directory.Build.props
@@ -3,6 +3,8 @@
   <PropertyGroup>
     <!-- We have two projects in the same directory here, so we'll add a differentiator folder to output directories. -->
     <GenerateProjectSpecificOutputFolder>true</GenerateProjectSpecificOutputFolder>
+    <!-- Work around DefaultElementAnimator.cs compiler error from missing experimental types -->
+    <MUXFinalRelease>true</MUXFinalRelease>
   </PropertyGroup>
     
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../')))" />
diff --git a/WinUIGallery/Directory.Build.targets b/WinUIGallery/Directory.Build.targets
index 02e07802b..f2130e3c0 100644
--- a/WinUIGallery/Directory.Build.targets
+++ b/WinUIGallery/Directory.Build.targets
@@ -5,5 +5,7 @@
     <!-- These are set in Directory.Build.targets because we need to import the publish profile first -->
     <AppxPackageName>WinUIGallery.Desktop</AppxPackageName>
   </PropertyGroup>
-  <Import Project="net6.override.targets" Condition="'$(MSBuildRuntimeType)' == 'Core'" />
+
+  <Import Project="net7.override.targets" Condition="'$(MSBuildRuntimeType)' == 'Core'" />
+
 </Project>
\ No newline at end of file
diff --git a/WinUIGallery/Helper/NavigationHelper.cs b/WinUIGallery/Helper/NavigationHelper.cs
index a35735ae7..d4565c98e 100644
--- a/WinUIGallery/Helper/NavigationHelper.cs
+++ b/WinUIGallery/Helper/NavigationHelper.cs
@@ -215,17 +215,6 @@ private bool TryGoBack()
             return navigated;
         }
 
-        private bool TryGoForward()
-        {
-            bool navigated = false;
-            if (this.Frame.CanGoForward)
-            {
-                this.Frame.GoForward();
-                navigated = true;
-            }
-            return navigated;
-        }
-
         private void UpdateBackButton()
         {
             if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 6))
@@ -234,75 +223,6 @@ private void UpdateBackButton()
                 this.CurrentNavView.IsBackEnabled = this.Frame.CanGoBack ? true : false;
             }
         }
-
-        // /// <summary>
-        // /// Invoked on every keystroke, including system keys such as Alt key combinations.
-        // /// Used to detect keyboard navigation between pages even when the page itself
-        // /// doesn't have focus.
-        // /// </summary>
-        // /// <param name="sender">Instance that triggered the event.</param>
-        // /// <param name="e">Event data describing the conditions that led to the event.</param>
-        // private void CoreDispatcher_AcceleratorKeyActivated(DispatcherQueue sender,
-        //     AcceleratorKeyEventArgs e)
-        // {
-        //     var virtualKey = e.VirtualKey;
-
-        //     // Only investigate further when Left, Right, or the dedicated Previous or Next keys
-        //     // are pressed
-        //     if ((e.EventType == CoreAcceleratorKeyEventType.SystemKeyDown ||
-        //         e.EventType == CoreAcceleratorKeyEventType.KeyDown) &&
-        //         (virtualKey == VirtualKey.Left || virtualKey == VirtualKey.Right ||
-        //         (int)virtualKey == 166 || (int)virtualKey == 167))
-        //     {
-        //         var downState = CoreVirtualKeyStates.Down;
-        //         bool menuKey = (Microsoft.UI.Input.InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Menu) & downState) == downState;
-        //         bool controlKey = (Microsoft.UI.Input.InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Control) & downState) == downState;
-        //         bool shiftKey = (Microsoft.UI.Input.InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Shift) & downState) == downState;
-        //         bool noModifiers = !menuKey && !controlKey && !shiftKey;
-        //         bool onlyAlt = menuKey && !controlKey && !shiftKey;
-
-        //         if (((int)virtualKey == 166 && noModifiers) ||
-        //             (virtualKey == VirtualKey.Left && onlyAlt))
-        //         {
-        //             // When the previous key or Alt+Left are pressed navigate back
-        //             e.Handled = TryGoBack();
-        //         }
-        //         else if (((int)virtualKey == 167 && noModifiers) ||
-        //             (virtualKey == VirtualKey.Right && onlyAlt))
-        //         {
-        //             // When the next key or Alt+Right are pressed navigate forward
-        //             e.Handled = TryGoForward();
-        //         }
-        //     }
-        // }
-
-        // /// <summary>
-        // /// Invoked on every mouse click, touch screen tap, or equivalent interaction.
-        // /// Used to detect browser-style next and previous mouse button clicks
-        // /// to navigate between pages.
-        // /// </summary>
-        // /// <param name="sender">Instance that triggered the event.</param>
-        // /// <param name="e">Event data describing the conditions that led to the event.</param>
-        // private void CoreWindow_PointerPressed(CoreWindow sender,
-        //     PointerEventArgs e)
-        // {
-        //     var properties = e.CurrentPoint.Properties;
-
-        //     // Ignore button chords with the left, right, and middle buttons
-        //     if (properties.IsLeftButtonPressed || properties.IsRightButtonPressed ||
-        //         properties.IsMiddleButtonPressed)
-        //         return;
-
-        //     // If back or forward are pressed (but not both) navigate appropriately
-        //     bool backPressed = properties.IsXButton1Pressed;
-        //     bool forwardPressed = properties.IsXButton2Pressed;
-        //     if (backPressed ^ forwardPressed)
-        //     {
-        //         e.Handled = true;
-        //         if (backPressed) this.TryGoBack();
-        //         if (forwardPressed) this.TryGoForward();
-        //     }
-        // }
     }
 
     /// <summary>
diff --git a/WinUIGallery/Helper/ThemeHelper.cs b/WinUIGallery/Helper/ThemeHelper.cs
index cb2f6e5ea..9a6df40cf 100644
--- a/WinUIGallery/Helper/ThemeHelper.cs
+++ b/WinUIGallery/Helper/ThemeHelper.cs
@@ -13,7 +13,6 @@ public static class ThemeHelper
     {
         private const string SelectedAppThemeKey = "SelectedAppTheme";
 
-        private static Window CurrentApplicationWindow;
         /// <summary>
         /// Gets the current actual theme of the app based on the requested theme of the
         /// root element, or if that value is Default, the requested theme of the Application.
@@ -75,8 +74,6 @@ public static void Initialize()
         {
             if (NativeHelper.IsAppPackaged)
             {
-                // Save reference as this might be null when the user is in another app
-                CurrentApplicationWindow = App.StartupWindow;
                 string savedTheme = ApplicationData.Current.LocalSettings.Values[SelectedAppThemeKey]?.ToString();
 
                 if (savedTheme != null)
diff --git a/WinUIGallery/Helper/TitleBarHelper.cs b/WinUIGallery/Helper/TitleBarHelper.cs
index 2217b5a88..81a05ca01 100644
--- a/WinUIGallery/Helper/TitleBarHelper.cs
+++ b/WinUIGallery/Helper/TitleBarHelper.cs
@@ -19,30 +19,13 @@
 
 namespace WinUIGallery.DesktopWap.Helper
 {
+
     internal class TitleBarHelper
     {
-
-        private static void triggerTitleBarRepaint(Window window)
-        {
-            // to trigger repaint tracking task id 38044406
-            var hwnd = WinRT.Interop.WindowNative.GetWindowHandle(window);
-            var activeWindow = AppUIBasics.Win32.GetActiveWindow();
-            if (hwnd == activeWindow)
-            {
-                AppUIBasics.Win32.SendMessage(hwnd, AppUIBasics.Win32.WM_ACTIVATE, AppUIBasics.Win32.WA_INACTIVE, IntPtr.Zero);
-                AppUIBasics.Win32.SendMessage(hwnd, AppUIBasics.Win32.WM_ACTIVATE, AppUIBasics.Win32.WA_ACTIVE, IntPtr.Zero);
-            }
-            else
-            {
-                AppUIBasics.Win32.SendMessage(hwnd, AppUIBasics.Win32.WM_ACTIVATE, AppUIBasics.Win32.WA_ACTIVE, IntPtr.Zero);
-                AppUIBasics.Win32.SendMessage(hwnd, AppUIBasics.Win32.WM_ACTIVATE, AppUIBasics.Win32.WA_INACTIVE, IntPtr.Zero);
-            }
-
-        }
-
+        // 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 res = Application.Current.Resources;
             var frame = (Application.Current as AppUIBasics.App).GetRootFrame() as FrameworkElement;
             Windows.UI.Color color;
             if (frame.ActualTheme == ElementTheme.Dark)
@@ -61,7 +44,7 @@ public static void SetCaptionButtonColors(Window window, Windows.UI.Color color)
         {
             var res = Application.Current.Resources;
             res["WindowCaptionForeground"] = color;
-            triggerTitleBarRepaint(window);
+            window.AppWindow.TitleBar.ButtonForegroundColor = color;
         }
     }
 }
diff --git a/WinUIGallery/Helper/WindowHelper.cs b/WinUIGallery/Helper/WindowHelper.cs
index 5398cb12e..5bb134e30 100644
--- a/WinUIGallery/Helper/WindowHelper.cs
+++ b/WinUIGallery/Helper/WindowHelper.cs
@@ -66,6 +66,21 @@ static public Window GetWindowForElement(UIElement element)
             }
             return null;
         }
+        // get dpi for an element
+        static public double GetRasterizationScaleForElement(UIElement element)
+        {
+            if (element.XamlRoot != null)
+            {
+                foreach (Window window in _activeWindows)
+                {
+                    if (element.XamlRoot == window.Content.XamlRoot)
+                    {
+                        return element.XamlRoot.RasterizationScale;
+                    }
+                }
+            }
+            return 0.0;
+        }
 
         static public List<Window> ActiveWindows { get { return _activeWindows; }}
 
diff --git a/WinUIGallery/NewControlsPage.xaml b/WinUIGallery/HomePage.xaml
similarity index 99%
rename from WinUIGallery/NewControlsPage.xaml
rename to WinUIGallery/HomePage.xaml
index 191f39ea4..89c0d08de 100644
--- a/WinUIGallery/NewControlsPage.xaml
+++ b/WinUIGallery/HomePage.xaml
@@ -10,7 +10,7 @@
     //*********************************************************
 -->
 <local:ItemsPageBase
-    x:Class="AppUIBasics.NewControlsPage"
+    x:Class="AppUIBasics.HomePage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:AppUIBasics.Controls"
diff --git a/WinUIGallery/NewControlsPage.xaml.cs b/WinUIGallery/HomePage.xaml.cs
similarity index 96%
rename from WinUIGallery/NewControlsPage.xaml.cs
rename to WinUIGallery/HomePage.xaml.cs
index b2b8cef36..168d6225a 100644
--- a/WinUIGallery/NewControlsPage.xaml.cs
+++ b/WinUIGallery/HomePage.xaml.cs
@@ -15,9 +15,9 @@
 
 namespace AppUIBasics
 {
-    public sealed partial class NewControlsPage : ItemsPageBase
+    public sealed partial class HomePage : ItemsPageBase
     {
-        public NewControlsPage()
+        public HomePage()
         {
             this.InitializeComponent();
         }
diff --git a/WinUIGallery/IdleSynchronizer.cs b/WinUIGallery/IdleSynchronizer.cs
index 3c02b1807..dc1092973 100644
--- a/WinUIGallery/IdleSynchronizer.cs
+++ b/WinUIGallery/IdleSynchronizer.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using AppUIBasics.Helper;
@@ -25,8 +25,6 @@ class IdleSynchronizer
         const string s_rootVisualResetHandleName = "RootVisualReset";
         const string s_imageDecodingIdleHandleName = "ImageDecodingIdle";
         const string s_fontDownloadsIdleHandleName = "FontDownloadsIdle";
-        const string s_hasBuildTreeWorksHandleName = "HasBuildTreeWorks";
-        const string s_buildTreeServiceDrainedHandleName = "BuildTreeServiceDrained";
 
         private DispatcherQueue m_dispatcherQueue = null;
 
@@ -37,8 +35,6 @@ class IdleSynchronizer
         private Handle m_rootVisualResetHandle;
         private Handle m_imageDecodingIdleHandle;
         private Handle m_fontDownloadsIdleHandle;
-        private Handle m_hasBuildTreeWorksHandle;
-        private Handle m_buildTreeServiceDrainedHandle;
 
         private bool m_waitForAnimationsIsDisabled = false;
         private bool m_isRS2OrHigherInitialized = false;
@@ -71,11 +67,6 @@ private Handle OpenNamedEvent(uint processId, uint threadId, string eventNamePre
             return handle;
         }
 
-        private Handle OpenNamedEvent(uint threadId, string eventNamePrefix)
-        {
-            return OpenNamedEvent(NativeMethods.GetCurrentProcessId(), threadId, eventNamePrefix);
-        }
-
         private Handle OpenNamedEvent(DispatcherQueue dispatcherQueue, string eventNamePrefix)
         {
             return OpenNamedEvent(NativeMethods.GetCurrentProcessId(), GetUIThreadId(dispatcherQueue), eventNamePrefix);
@@ -134,8 +125,6 @@ private IdleSynchronizer(DispatcherQueue dispatcherQueue)
             m_rootVisualResetHandle = OpenNamedEvent(m_dispatcherQueue, s_rootVisualResetHandleName);
             m_imageDecodingIdleHandle = OpenNamedEvent(m_dispatcherQueue, s_imageDecodingIdleHandleName);
             m_fontDownloadsIdleHandle = OpenNamedEvent(m_dispatcherQueue, s_fontDownloadsIdleHandleName);
-            m_hasBuildTreeWorksHandle = OpenNamedEvent(m_dispatcherQueue, s_hasBuildTreeWorksHandleName);
-            m_buildTreeServiceDrainedHandle = OpenNamedEvent(m_dispatcherQueue, s_buildTreeServiceDrainedHandleName);
         }
 
         public static void Init()
@@ -152,8 +141,7 @@ public static void Init()
 
         public static void Wait()
         {
-            string logMessage;
-            Wait(out logMessage);
+            Wait(out _);
         }
 
         public static void Wait(out string logMessage)
@@ -168,8 +156,7 @@ public static void Wait(out string logMessage)
 
         public static string TryWait()
         {
-            string logMessage;
-            return Instance.WaitInternal(out logMessage);
+            return Instance.WaitInternal(out _);
         }
 
         public static string TryWait(out string logMessage)
@@ -193,8 +180,6 @@ public void AddLog(string message)
         private string WaitInternal(out string logMessage)
         {
             logMessage = string.Empty;
-            string errorString = string.Empty;
-
             if (m_dispatcherQueue.HasThreadAccess)
             {
                 return "Cannot wait for UI thread idle from the UI thread.";
@@ -206,11 +191,9 @@ private string WaitInternal(out string logMessage)
             bool isIdle = false;
             while (!isIdle)
             {
-                bool hadAnimations = true;
-                bool hadDeferredAnimationOperations = true;
                 bool hadBuildTreeWork = false;
 
-                errorString = WaitForRootVisualReset();
+                var errorString = WaitForRootVisualReset();
                 if (errorString.Length > 0) { return errorString; }
                 AddLog("After WaitForRootVisualReset");
 
@@ -228,6 +211,7 @@ private string WaitInternal(out string logMessage)
                 WaitForIdleDispatcher();
                 AddLog("After WaitForIdleDispatcher");
 
+                bool hadAnimations;
                 // At this point, we know that the UI thread is idle - now we need to make sure
                 // that XAML isn't animating anything.
                 // TODO 27870237: Remove this #if once BuildTreeServiceDrained is properly signaled in WinUI desktop apps.
@@ -246,6 +230,7 @@ private string WaitInternal(out string logMessage)
                     hadAnimations = false;
                 }
 
+                bool hadDeferredAnimationOperations;
                 errorString = WaitForDeferredAnimationOperationsComplete(out hadDeferredAnimationOperations);
                 if (errorString.Length > 0) { return errorString; }
                 AddLog("After WaitForDeferredAnimationOperationsComplete");
@@ -324,70 +309,6 @@ void WaitForIdleDispatcher()
             shouldContinueEvent.WaitOne(s_defaultWaitForEventMs);
         }
 
-        string WaitForBuildTreeServiceWork(out bool hadBuildTreeWork)
-        {
-            hadBuildTreeWork = false;
-            bool hasBuildTreeWork = true;
-
-            // We want to avoid an infinite loop, so we'll iterate 20 times before concluding that
-            // we probably are never going to become idle.
-            int waitCount = 20;
-
-            while (hasBuildTreeWork && waitCount-- > 0)
-            {
-                if (!NativeMethods.ResetEvent(m_buildTreeServiceDrainedHandle.NativeHandle))
-                {
-                    return "Failed to reset BuildTreeServiceDrained handle.";
-                }
-
-                AutoResetEvent layoutUpdatedEvent = new AutoResetEvent(false);
-
-                m_dispatcherQueue.TryEnqueue(
-                    DispatcherQueuePriority.Normal,
-                    new DispatcherQueueHandler(() =>
-                    {
-                        foreach (Window window in WindowHelper.ActiveWindows)
-                        {
-                            if (window.Content != null)
-                            {
-                                window.Content.UpdateLayout();
-                            }
-                        }
-
-                        layoutUpdatedEvent.Set();
-                    }));
-
-                layoutUpdatedEvent.WaitOne(s_defaultWaitForEventMs);
-
-                // This will be signaled if and only if Jupiter plans to at some point in the near
-                // future set the BuildTreeServiceDrained event.
-                uint waitResult = NativeMethods.WaitForSingleObject(m_hasBuildTreeWorksHandle.NativeHandle, 0);
-
-                if (waitResult != NativeMethods.WAIT_OBJECT_0 && waitResult != NativeMethods.WAIT_TIMEOUT)
-                {
-                    return "HasBuildTreeWork handle wait returned an invalid value.";
-                }
-
-                hasBuildTreeWork = (waitResult == NativeMethods.WAIT_OBJECT_0);
-                AddLog("HasBuildTreeWork? " + hasBuildTreeWork);
-
-                if (hasBuildTreeWork)
-                {
-                    AddLog("Waiting for BuildTreeService to finish...");
-                    waitResult = NativeMethods.WaitForSingleObject(m_buildTreeServiceDrainedHandle.NativeHandle, 10000);
-
-                    if (waitResult != NativeMethods.WAIT_OBJECT_0 && waitResult != NativeMethods.WAIT_TIMEOUT)
-                    {
-                        return "Wait for build tree service failed";
-                    }
-                    AddLog("BuildTreeService drained");
-                }
-            }
-
-            hadBuildTreeWork = hasBuildTreeWork;
-            return string.Empty;
-        }
-
         string WaitForAnimationsComplete(out bool hadAnimations)
         {
             hadAnimations = false;
@@ -473,31 +394,6 @@ string WaitForDeferredAnimationOperationsComplete(out bool hadDeferredAnimationO
             return string.Empty;
         }
 
-        private void SynchronouslyTickUIThread(uint ticks)
-        {
-            for (uint i = 0; i < ticks; i++)
-            {
-                AutoResetEvent tickCompleteEvent = new AutoResetEvent(false);
-
-                m_dispatcherQueue.TryEnqueue(
-                    DispatcherQueuePriority.Normal,
-                    new DispatcherQueueHandler(() =>
-                    {
-                        EventHandler<object> renderingHandler = null;
-
-                        renderingHandler = (object sender, object args) =>
-                        {
-                            CompositionTarget.Rendering -= renderingHandler;
-                            tickCompleteEvent.Set();
-                        };
-
-                        CompositionTarget.Rendering += renderingHandler;
-                    }));
-
-                tickCompleteEvent.WaitOne(s_defaultWaitForEventMs);
-            }
-        }
-
         private bool IsRS2OrHigher()
         {
             if (!m_isRS2OrHigherInitialized)
@@ -596,4 +492,4 @@ public enum SyncObjectAccess : uint
         TIMER_MODIFY_STATE = 0x00000002,
         TIMER_QUERY_STATE = 0x00000001
     }
-}
\ No newline at end of file
+}
diff --git a/WinUIGallery/ItemsPageBase.cs b/WinUIGallery/ItemsPageBase.cs
index fea644e78..9ff58503f 100644
--- a/WinUIGallery/ItemsPageBase.cs
+++ b/WinUIGallery/ItemsPageBase.cs
@@ -59,7 +59,6 @@ protected void OnItemGridViewContainerContentChanging(ListViewBase sender, Conta
 
         protected void OnItemGridViewItemClick(object sender, ItemClickEventArgs e)
         {
-            var gridView = (GridView)sender;
             var item = (ControlInfoDataItem)e.ClickedItem;
 
             _itemId = item.UniqueId;
diff --git a/WinUIGallery/Navigation/NavigationRootPage.xaml b/WinUIGallery/Navigation/NavigationRootPage.xaml
index 7e9b30071..9aa820534 100644
--- a/WinUIGallery/Navigation/NavigationRootPage.xaml
+++ b/WinUIGallery/Navigation/NavigationRootPage.xaml
@@ -67,6 +67,7 @@
                     VerticalAlignment="Center"
                     Style="{StaticResource CaptionTextBlockStyle}"
                     Text="{x:Bind AppTitleText}" />
+                <TextBox x:Name="AppTitleBarTextBox" MinWidth="300" Height="40" Margin="16,0,0,0" Visibility="Collapsed"  PlaceholderText="Enter any text" /> 
             </StackPanel>
         </Border>
 
@@ -186,29 +187,31 @@
                 Navigating="OnRootFrameNavigating" />
             <NavigationView.MenuItems>
                 <NavigationViewItem
-                    x:Name="NewControlsItem"
+                    x:Name="Home"
+                    AutomationProperties.AutomationId="Home"
                     Content="Home"
                     Icon="Home" />
 
                 <NavigationViewItem
                     x:Name="DesignGuidanceItem"
+                    AutomationProperties.AutomationId="Design_Guidance"
                     Content="Design guidance"
                     Tag="Design Guidance">
                     <NavigationViewItem.Icon>
                         <FontIcon Glyph="&#xEB3C;" />
                     </NavigationViewItem.Icon>
                     <NavigationViewItem.MenuItems>
-                        <NavigationViewItem x:Name="TypographyItem" Content="Typography" Tag="Typography">
+                        <NavigationViewItem x:Name="TypographyItem" AutomationProperties.AutomationId="Typography" Content="Typography" Tag="Typography">
                             <NavigationViewItem.Icon>
                                 <FontIcon Glyph="&#xE8D2;" />
                             </NavigationViewItem.Icon>
                         </NavigationViewItem>
-                        <NavigationViewItem x:Name="IconsItem" Content="Icons" Tag="Icons">
+                        <NavigationViewItem x:Name="IconsItem" AutomationProperties.AutomationId="Icons" Content="Icons" Tag="Icons">
                             <NavigationViewItem.Icon>
                                 <FontIcon Glyph="&#xED58;" />
                             </NavigationViewItem.Icon>
                         </NavigationViewItem>
-                        <NavigationViewItem x:Name="ColorsItem" Content="Colors" Tag="Colors">
+                        <NavigationViewItem x:Name="ColorsItem" AutomationProperties.AutomationId="Colors" Content="Colors" Tag="Colors">
                             <NavigationViewItem.Icon>
                                 <FontIcon Glyph="&#xE790;" />
                             </NavigationViewItem.Icon>
diff --git a/WinUIGallery/Navigation/NavigationRootPage.xaml.cs b/WinUIGallery/Navigation/NavigationRootPage.xaml.cs
index 15d7dcd0c..98c09932d 100644
--- a/WinUIGallery/Navigation/NavigationRootPage.xaml.cs
+++ b/WinUIGallery/Navigation/NavigationRootPage.xaml.cs
@@ -21,6 +21,7 @@
 using Microsoft.UI.Xaml.Automation;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Navigation;
 using Windows.Foundation;
 using Windows.System.Profile;
@@ -210,6 +211,7 @@ private void AddNavigationMenuItems()
                 itemGroup.ContextFlyout = new MenuFlyout() { Items = { groupMenuFlyoutItem } };
 
                 AutomationProperties.SetName(itemGroup, group.Title);
+                AutomationProperties.SetAutomationId(itemGroup, group.UniqueId);
 
                 foreach (var item in group.Items)
                 {
@@ -221,12 +223,13 @@ private void AddNavigationMenuItems()
 
                     itemGroup.MenuItems.Add(itemInGroup);
                     AutomationProperties.SetName(itemInGroup, item.Title);
+                    AutomationProperties.SetAutomationId(itemInGroup, item.UniqueId);
                 }
 
                 NavigationViewControl.MenuItems.Add(itemGroup);
             }
 
-            NewControlsItem.Loaded += OnNewControlsMenuItemLoaded;
+            Home.Loaded += OnHomeMenuItemLoaded;
         }
 
         private void OnMenuFlyoutItemClick(object sender, RoutedEventArgs e)
@@ -264,7 +267,7 @@ private void SetDeviceFamily()
             DeviceFamily = parsedDeviceType;
         }
 
-        private void OnNewControlsMenuItemLoaded(object sender, RoutedEventArgs e)
+        private void OnHomeMenuItemLoaded(object sender, RoutedEventArgs e)
         {
             if ( NavigationViewControl.DisplayMode == NavigationViewDisplayMode.Expanded)
             {
@@ -276,6 +279,17 @@ private void OnNavigationViewControlLoaded(object sender, RoutedEventArgs e)
         {
             // Delay necessary to ensure NavigationView visual state can match navigation
             Task.Delay(500).ContinueWith(_ => this.NavigationViewLoaded?.Invoke(), TaskScheduler.FromCurrentSynchronizationContext());
+
+            var navigationView = sender as NavigationView;
+            navigationView.RegisterPropertyChangedCallback(NavigationView.IsPaneOpenProperty, OnIsPaneOpenChanged);
+        }
+
+        private void OnIsPaneOpenChanged(DependencyObject sender, DependencyProperty dp)
+        {
+            var navigationView = sender as NavigationView;
+            var announcementText = navigationView.IsPaneOpen ? "Navigation Pane Opened" : "Navigation Pane Closed";
+
+            UIHelper.AnnounceActionForAccessibility(navigationView, announcementText, "NavigationViewPaneIsOpenChangeNotificationId");
         }
 
         private void OnNavigationViewSelectionChanged(NavigationView sender, NavigationViewSelectionChangedEventArgs args)
@@ -297,11 +311,11 @@ private void OnNavigationViewSelectionChanged(NavigationView sender, NavigationV
                         Navigate(typeof(AllControlsPage));
                     }
                 }
-                else if (selectedItem == NewControlsItem)
+                else if (selectedItem == Home)
                 {
-                    if (rootFrame.CurrentSourcePageType != typeof(NewControlsPage))
+                    if (rootFrame.CurrentSourcePageType != typeof(HomePage))
                     {
-                        Navigate(typeof(NewControlsPage));
+                        Navigate(typeof(HomePage));
                     }
                 }
                 else if (selectedItem == DesignGuidanceItem || selectedItem == AccessibilityItem)
diff --git a/WinUIGallery/Package.Dev.appxmanifest b/WinUIGallery/Package.Dev.appxmanifest
index 376fb3ffd..8570c1bae 100644
--- a/WinUIGallery/Package.Dev.appxmanifest
+++ b/WinUIGallery/Package.Dev.appxmanifest
@@ -7,7 +7,7 @@
     xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
     IgnorableNamespaces="uap mp uap3">
   <!--Note: package version and assembly version must be kept in sync-->
-  <Identity Name="Microsoft.WinUI3ControlsGallery.Debug" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" Version="2.1.0.0" />
+  <Identity Name="Microsoft.WinUI3ControlsGallery.Debug" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" Version="2.2.0.0" />
   <mp:PhoneIdentity PhoneProductId="863667e0-667a-4bb4-ac52-c59656c7333a" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>WinUI 3 Gallery Dev</DisplayName>
diff --git a/WinUIGallery/Package.appxmanifest b/WinUIGallery/Package.appxmanifest
index 0f54f79d7..a4b84cf71 100644
--- a/WinUIGallery/Package.appxmanifest
+++ b/WinUIGallery/Package.appxmanifest
@@ -7,7 +7,7 @@
     xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
     IgnorableNamespaces="uap mp uap3">
   <!--Note: package version and assembly version must be kept in sync-->
-  <Identity Name="Microsoft.WinUI3ControlsGallery" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" Version="2.1.0.0" />
+  <Identity Name="Microsoft.WinUI3ControlsGallery" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" Version="2.2.0.0" />
   <mp:PhoneIdentity PhoneProductId="863667e0-667a-4bb4-ac52-c59656c7333a" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>WinUI 3 Gallery</DisplayName>
diff --git a/WinUIGallery/Properties/AssemblyInfo.cs b/WinUIGallery/Properties/AssemblyInfo.cs
index 378eef0fa..99bab15c3 100644
--- a/WinUIGallery/Properties/AssemblyInfo.cs
+++ b/WinUIGallery/Properties/AssemblyInfo.cs
@@ -25,6 +25,6 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 // Note: package version and assembly version must be kept in sync
-[assembly: AssemblyVersion("2.1.0.0")]
-[assembly: AssemblyFileVersion("2.1.0.0")]
+[assembly: AssemblyVersion("2.2.0.0")]
+[assembly: AssemblyFileVersion("2.2.0.0")]
 [assembly: ComVisible(false)]
diff --git a/WinUIGallery/Properties/PublishProfiles/win10-arm64-unpackaged.pubxml b/WinUIGallery/Properties/PublishProfiles/win10-arm64-unpackaged.pubxml
index f7ce80a46..234387866 100644
--- a/WinUIGallery/Properties/PublishProfiles/win10-arm64-unpackaged.pubxml
+++ b/WinUIGallery/Properties/PublishProfiles/win10-arm64-unpackaged.pubxml
@@ -7,10 +7,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishProtocol>FileSystem</PublishProtocol>
     <Platform>ARM64</Platform>
     <RuntimeIdentifier>win10-arm64</RuntimeIdentifier>
-    <SelfContained>true</SelfContained>
+    <!--NOTE: this refers to .NET (not WinAppSDK) self-containment which must always be true, 
+        since there is no Windows framework package available for .NET 5+ -->
+    <SelfContained>True</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
     <PublishAppxPackage>False</PublishAppxPackage>
-    <PublishReadyToRun>$(Optimized)</PublishReadyToRun>
+    <PublishReadyToRun>False</PublishReadyToRun>
     <PublishTrimmed>$(Optimized)</PublishTrimmed>
+    <!--With .NET 7, trimming mode default changed from partial to full which is more 
+        aggressive and includes all assemblies, not just those that have explicitly opted
+        into trimming, causing application errors.-->
+    <TrimMode>partial</TrimMode>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/WinUIGallery/Properties/PublishProfiles/win10-arm64.pubxml b/WinUIGallery/Properties/PublishProfiles/win10-arm64.pubxml
index fc9dd1110..7777f0dc8 100644
--- a/WinUIGallery/Properties/PublishProfiles/win10-arm64.pubxml
+++ b/WinUIGallery/Properties/PublishProfiles/win10-arm64.pubxml
@@ -7,10 +7,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishProtocol>FileSystem</PublishProtocol>
     <Platform>ARM64</Platform>
     <RuntimeIdentifier>win10-arm64</RuntimeIdentifier>
-    <SelfContained>true</SelfContained>
+    <!--NOTE: this refers to .NET (not WinAppSDK) self-containment which must always be true, 
+        since there is no Windows framework package available for .NET 5+ -->
+    <SelfContained>True</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
     <PublishAppxPackage>True</PublishAppxPackage>
-    <PublishReadyToRun>$(Optimized)</PublishReadyToRun>
+    <PublishReadyToRun>False</PublishReadyToRun>
     <PublishTrimmed>$(Optimized)</PublishTrimmed>
+    <!--With .NET 7, trimming mode default changed from partial to full which is more 
+        aggressive and includes all assemblies, not just those that have explicitly opted
+        into trimming, causing application errors.-->
+    <TrimMode>partial</TrimMode>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/WinUIGallery/Properties/PublishProfiles/win10-x64-unpackaged.pubxml b/WinUIGallery/Properties/PublishProfiles/win10-x64-unpackaged.pubxml
index f414c5b0d..0b74be333 100644
--- a/WinUIGallery/Properties/PublishProfiles/win10-x64-unpackaged.pubxml
+++ b/WinUIGallery/Properties/PublishProfiles/win10-x64-unpackaged.pubxml
@@ -7,10 +7,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishProtocol>FileSystem</PublishProtocol>
     <Platform>x64</Platform>
     <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
-    <SelfContained>true</SelfContained>
+    <!--NOTE: this refers to .NET (not WinAppSDK) self-containment which must always be true, 
+        since there is no Windows framework package available for .NET 5+ -->
+    <SelfContained>True</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
     <PublishAppxPackage>False</PublishAppxPackage>
-    <PublishReadyToRun>$(Optimized)</PublishReadyToRun>
+    <PublishReadyToRun>False</PublishReadyToRun>
     <PublishTrimmed>$(Optimized)</PublishTrimmed>
+    <!--With .NET 7, trimming mode default changed from partial to full which is more 
+        aggressive and includes all assemblies, not just those that have explicitly opted
+        into trimming, causing application errors.-->
+    <TrimMode>partial</TrimMode>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/WinUIGallery/Properties/PublishProfiles/win10-x64.pubxml b/WinUIGallery/Properties/PublishProfiles/win10-x64.pubxml
index 157e4475f..0ba94cf14 100644
--- a/WinUIGallery/Properties/PublishProfiles/win10-x64.pubxml
+++ b/WinUIGallery/Properties/PublishProfiles/win10-x64.pubxml
@@ -7,10 +7,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishProtocol>FileSystem</PublishProtocol>
     <Platform>x64</Platform>
     <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
-    <SelfContained>true</SelfContained>
+    <!--NOTE: this refers to .NET (not WinAppSDK) self-containment which must always be true, 
+        since there is no Windows framework package available for .NET 5+ -->
+    <SelfContained>True</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
     <PublishAppxPackage>True</PublishAppxPackage>
-    <PublishReadyToRun>$(Optimized)</PublishReadyToRun>
+    <PublishReadyToRun>False</PublishReadyToRun>
     <PublishTrimmed>$(Optimized)</PublishTrimmed>
+    <!--With .NET 7, trimming mode default changed from partial to full which is more 
+        aggressive and includes all assemblies, not just those that have explicitly opted
+        into trimming, causing application errors.-->
+    <TrimMode>partial</TrimMode>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/WinUIGallery/Properties/PublishProfiles/win10-x86-unpackaged.pubxml b/WinUIGallery/Properties/PublishProfiles/win10-x86-unpackaged.pubxml
index da5cdcfb8..2bda3fa70 100644
--- a/WinUIGallery/Properties/PublishProfiles/win10-x86-unpackaged.pubxml
+++ b/WinUIGallery/Properties/PublishProfiles/win10-x86-unpackaged.pubxml
@@ -7,10 +7,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishProtocol>FileSystem</PublishProtocol>
     <Platform>x86</Platform>
     <RuntimeIdentifier>win10-x86</RuntimeIdentifier>
-    <SelfContained>true</SelfContained>
+    <!--NOTE: this refers to .NET (not WinAppSDK) self-containment which must always be true, 
+        since there is no Windows framework package available for .NET 5+ -->
+    <SelfContained>True</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
     <PublishAppxPackage>False</PublishAppxPackage>
-    <PublishReadyToRun>$(Optimized)</PublishReadyToRun>
+    <PublishReadyToRun>False</PublishReadyToRun>
     <PublishTrimmed>$(Optimized)</PublishTrimmed>
+    <!--With .NET 7, trimming mode default changed from partial to full which is more 
+        aggressive and includes all assemblies, not just those that have explicitly opted
+        into trimming, causing application errors.-->
+    <TrimMode>partial</TrimMode>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/WinUIGallery/Properties/PublishProfiles/win10-x86.pubxml b/WinUIGallery/Properties/PublishProfiles/win10-x86.pubxml
index 847c4c474..8319695f4 100644
--- a/WinUIGallery/Properties/PublishProfiles/win10-x86.pubxml
+++ b/WinUIGallery/Properties/PublishProfiles/win10-x86.pubxml
@@ -7,10 +7,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishProtocol>FileSystem</PublishProtocol>
     <Platform>x86</Platform>
     <RuntimeIdentifier>win10-x86</RuntimeIdentifier>
-    <SelfContained>true</SelfContained>
+    <!--NOTE: this refers to .NET (not WinAppSDK) self-containment which must always be true, 
+        since there is no Windows framework package available for .NET 5+ -->
+    <SelfContained>True</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
     <PublishAppxPackage>True</PublishAppxPackage>
-    <PublishReadyToRun>$(Optimized)</PublishReadyToRun>
+    <PublishReadyToRun>False</PublishReadyToRun>
     <PublishTrimmed>$(Optimized)</PublishTrimmed>
+    <!--With .NET 7, trimming mode default changed from partial to full which is more 
+        aggressive and includes all assemblies, not just those that have explicitly opted
+        into trimming, causing application errors.-->
+    <TrimMode>partial</TrimMode>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/WinUIGallery/SamplePages/SampleSystemBackdropsWindow.xaml.cs b/WinUIGallery/SamplePages/SampleSystemBackdropsWindow.xaml.cs
index 487c4049c..66148b84f 100644
--- a/WinUIGallery/SamplePages/SampleSystemBackdropsWindow.xaml.cs
+++ b/WinUIGallery/SamplePages/SampleSystemBackdropsWindow.xaml.cs
@@ -64,7 +64,8 @@ public enum BackdropType
         {
             Mica,
             MicaAlt,
-            DesktopAcrylic,
+            DesktopAcrylicBase,
+            DesktopAcrylicThin,
             DefaultColor,
         }
 
@@ -112,7 +113,7 @@ public void SetBackdrop(BackdropType type)
                 else
                 {
                     // Mica isn't supported. Try Acrylic.
-                    type = BackdropType.DesktopAcrylic;
+                    type = BackdropType.DesktopAcrylicBase;
                     tbChangeStatus.Text += "  Mica isn't supported. Trying Acrylic.";
                 }
             }
@@ -126,23 +127,37 @@ public void SetBackdrop(BackdropType type)
                 else
                 {
                     // MicaAlt isn't supported. Try Acrylic.
-                    type = BackdropType.DesktopAcrylic;
+                    type = BackdropType.DesktopAcrylicBase;
                     tbChangeStatus.Text += "  MicaAlt isn't supported. Trying Acrylic.";
                 }
             }
-            if (type == BackdropType.DesktopAcrylic)
+            if (type == BackdropType.DesktopAcrylicBase)
             {
-                if (TrySetAcrylicBackdrop())
+                if (TrySetAcrylicBackdrop(false))
                 {
-                    tbCurrentBackdrop.Text = "Custom Acrylic";
+                    tbCurrentBackdrop.Text = "Custom Acrylic (Base)";
                     m_currentBackdrop = type;
                 }
                 else
                 {
                     // Acrylic isn't supported, so take the next option, which is DefaultColor, which is already set.
-                    tbChangeStatus.Text += "  Acrylic isn't supported. Switching to default color.";
+                    tbChangeStatus.Text += "  Acrylic Base isn't supported. Switching to default color.";
                 }
             }
+            if (type == BackdropType.DesktopAcrylicThin)
+            {
+                if (TrySetAcrylicBackdrop(true))
+                {
+                    tbCurrentBackdrop.Text = "Custom Acrylic (Thin)";
+                    m_currentBackdrop = type;
+                }
+                else
+                {
+                    // Acrylic isn't supported, so take the next option, which is DefaultColor, which is already set.
+                    tbChangeStatus.Text += "  Acrylic Thin isn't supported. Switching to default color.";
+                }
+            }
+            
              // announce visual change to automation
             UIHelper.AnnounceActionForAccessibility(btnChangeBackdrop, $"Background changed to {tbCurrentBackdrop.Text}", "BackgroundChangedNotificationActivityId");
         }
@@ -175,7 +190,7 @@ bool TrySetMicaBackdrop(bool useMicaAlt)
             return false; // Mica is not supported on this system.
         }
 
-        bool TrySetAcrylicBackdrop()
+        bool TrySetAcrylicBackdrop(bool useAcrylicThin)
         {
             if (Microsoft.UI.Composition.SystemBackdrops.DesktopAcrylicController.IsSupported())
             {
@@ -191,6 +206,8 @@ bool TrySetAcrylicBackdrop()
 
                 m_acrylicController = new Microsoft.UI.Composition.SystemBackdrops.DesktopAcrylicController();
 
+                m_acrylicController.Kind = useAcrylicThin ? Microsoft.UI.Composition.SystemBackdrops.DesktopAcrylicKind.Thin : Microsoft.UI.Composition.SystemBackdrops.DesktopAcrylicKind.Base;
+
                 // Enable the system backdrop.
                 // Note: Be sure to have "using WinRT;" to support the Window.As<...>() call.
                 m_acrylicController.AddSystemBackdropTarget(this.As<Microsoft.UI.Composition.ICompositionSupportsSystemBackdrop>());
@@ -248,8 +265,9 @@ void ChangeBackdropButton_Click(object sender, RoutedEventArgs e)
             switch (m_currentBackdrop)
             {
                 case BackdropType.Mica:           newType = BackdropType.MicaAlt; break;
-                case BackdropType.MicaAlt:        newType = BackdropType.DesktopAcrylic; break;
-                case BackdropType.DesktopAcrylic: newType = BackdropType.DefaultColor; break;
+                case BackdropType.MicaAlt:        newType = BackdropType.DesktopAcrylicBase; break;
+                case BackdropType.DesktopAcrylicBase: newType = BackdropType.DesktopAcrylicThin; break;
+                case BackdropType.DesktopAcrylicThin: newType = BackdropType.DefaultColor; break;
                 default:
                 case BackdropType.DefaultColor:   newType = BackdropType.Mica; break;
             }
diff --git a/WinUIGallery/Strings/en-US/Resources.resw b/WinUIGallery/Strings/en-US/Resources.resw
index 12ff01ae8..e7a53bf84 100644
--- a/WinUIGallery/Strings/en-US/Resources.resw
+++ b/WinUIGallery/Strings/en-US/Resources.resw
@@ -223,10 +223,10 @@
   <data name="InputValidationPage_ZipCodeField.PlaceholderText" xml:space="preserve">
     <value>Enter ZIP code</value>
   </data>
-  <data name="NewControlsPage_PageHeader.Title" xml:space="preserve">
+  <data name="HomePage_PageHeader.Title" xml:space="preserve">
     <value>What's New</value>
   </data>
-  <data name="NewControlsPage_SmallHeader.Text" xml:space="preserve">
+  <data name="HomePage_SmallHeader.Text" xml:space="preserve">
     <value>What's New</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/WinUIGallery/TabViewPages/TabViewWindowingSamplePage.xaml.cs b/WinUIGallery/TabViewPages/TabViewWindowingSamplePage.xaml.cs
index a473be8bf..9d53b846f 100644
--- a/WinUIGallery/TabViewPages/TabViewWindowingSamplePage.xaml.cs
+++ b/WinUIGallery/TabViewPages/TabViewWindowingSamplePage.xaml.cs
@@ -1,177 +1,152 @@
-using System;
-using Windows.ApplicationModel.Core;
-using Windows.ApplicationModel.DataTransfer;
-using Windows.Foundation.Metadata;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Hosting;
-using Microsoft.UI.Xaml.Navigation;
-using Microsoft.UI.Windowing;
-using AppUIBasics.Helper;
+using System;
+using Windows.ApplicationModel.Core;
+using Windows.ApplicationModel.DataTransfer;
+using Windows.Foundation.Metadata;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Hosting;
+using Microsoft.UI.Xaml.Navigation;
+using Microsoft.UI.Windowing;
+using AppUIBasics.Helper;
 using System.Threading;
 using Microsoft.UI.Dispatching;
 using System.Threading.Tasks;
 using Windows.System;
 using DispatcherQueueHandler = Microsoft.UI.Dispatching.DispatcherQueueHandler;
 
-namespace AppUIBasics.TabViewPages
-{
-    public sealed partial class TabViewWindowingSamplePage : Page
-    {
-        private const string DataIdentifier = "MyTabItem";
-        public TabViewWindowingSamplePage()
-        {
-            this.InitializeComponent();
-
-            Tabs.TabItemsChanged += Tabs_TabItemsChanged;
-
-            Loaded += TabViewWindowingSamplePage_Loaded;
-        }
-
-        private void TabViewWindowingSamplePage_Loaded(object sender, RoutedEventArgs e)
-        {
-            var currentWindow = WindowHelper.GetWindowForElement(this);
-            currentWindow.ExtendsContentIntoTitleBar = true;
-            currentWindow.SetTitleBar(CustomDragRegion);
-            CustomDragRegion.MinWidth = 188;
-        }
-
-        private void Tabs_TabItemsChanged(TabView sender, Windows.Foundation.Collections.IVectorChangedEventArgs args)
-        {
-            // If there are no more tabs, close the window.
-            if (sender.TabItems.Count == 0)
-            {
-                WindowHelper.GetWindowForElement(this).Close();
-            }
-            // If there is only one tab left, disable dragging and reordering of Tabs.
-            else if (sender.TabItems.Count == 1)
-            {
-                sender.CanReorderTabs = false;
-                sender.CanDragTabs = false;
-            }
-            else
-            {
-                sender.CanReorderTabs = true;
-                sender.CanDragTabs = true;
-            }
-        }
-
-        protected override void OnNavigatedTo(NavigationEventArgs e)
-        {
-            base.OnNavigatedTo(e);
-
-            SetupWindow();
-        }
-
-        void SetupWindow()
-        {
-
-            // Main Window -- add some default items
-            for (int i = 0; i < 3; i++)
-            {
-                Tabs.TabItems.Add(new TabViewItem() { IconSource = new Microsoft.UI.Xaml.Controls.SymbolIconSource() { Symbol = Symbol.Placeholder }, Header = $"Item {i}", Content = new MyTabContentControl() { DataContext = $"Page {i}" } });
-            }
-
-            Tabs.SelectedIndex = 0;
-        }
-
-        private void CoreTitleBar_LayoutMetricsChanged(CoreApplicationViewTitleBar sender, object args)
-        {
-            // To ensure that the tabs in the titlebar are not occluded by shell
-            // content, we must ensure that we account for left and right overlays.
-            // In LTR layouts, the right inset includes the caption buttons and the
-            // drag region, which is flipped in RTL.
-
-            // The SystemOverlayLeftInset and SystemOverlayRightInset values are
-            // in terms of physical left and right. Therefore, we need to flip
-            // then when our flow direction is RTL.
-            if (FlowDirection == FlowDirection.LeftToRight)
-            {
-                CustomDragRegion.MinWidth = sender.SystemOverlayRightInset;
-                ShellTitleBarInset.MinWidth = sender.SystemOverlayLeftInset;
-            }
-            else
-            {
-                CustomDragRegion.MinWidth = sender.SystemOverlayLeftInset;
-                ShellTitleBarInset.MinWidth = sender.SystemOverlayRightInset;
-            }
-
-            // Ensure that the height of the custom regions are the same as the titlebar.
-            CustomDragRegion.Height = ShellTitleBarInset.Height = sender.Height;
-        }
-
-        public void AddTabToTabs(TabViewItem tab)
-        {
-            Tabs.TabItems.Add(tab);
-        }
-
-        // Create a new Window once the Tab is dragged outside.
-        private void Tabs_TabDroppedOutside(TabView sender, TabViewTabDroppedOutsideEventArgs args)
-        {
-            var newPage = new TabViewWindowingSamplePage();
-
-            Tabs.TabItems.Remove(args.Tab);
-            newPage.AddTabToTabs(args.Tab);
-
-            var newWindow = WindowHelper.CreateWindow();
-            newWindow.ExtendsContentIntoTitleBar = true;
-            newWindow.Content = newPage;
-
-            newWindow.Activate();
-        }
-
-        private void Tabs_TabDragStarting(TabView sender, TabViewTabDragStartingEventArgs args)
-        {
-            // We can only drag one tab at a time, so grab the first one...
-            var firstItem = args.Tab;
-
-            // ... set the drag data to the tab...
-            args.Data.Properties.Add(DataIdentifier, firstItem);
-
-            // ... and indicate that we can move it
-            args.Data.RequestedOperation = DataPackageOperation.Move;
-        }
-
-        private async void Tabs_TabStripDrop(object sender, DragEventArgs e)
-        {
-            // This event is called when we're dragging between different TabViews
-            // It is responsible for handling the drop of the item into the second TabView
-
-            if (e.DataView.Properties.TryGetValue(DataIdentifier, out object obj))
-            {
-                // Ensure that the obj property is set before continuing.
-                if (obj == null)
-                {
-                    return;
-                }
-
-                var destinationTabView = sender as TabView;
-                var destinationItems = destinationTabView.TabItems;
-
-                if (destinationItems != null)
-                {
-                    // First we need to get the position in the List to drop to
-                    var index = -1;
-
-                    // Determine which items in the list our pointer is between.
-                    for (int i = 0; i < destinationTabView.TabItems.Count; i++)
-                    {
-                        var item = destinationTabView.ContainerFromIndex(i) as TabViewItem;
-
-                        if (e.GetPosition(item).X - item.ActualWidth < 0)
-                        {
-                            index = i;
-                            break;
-                        }
+namespace AppUIBasics.TabViewPages
+{
+    public sealed partial class TabViewWindowingSamplePage : Page
+    {
+        private const string DataIdentifier = "MyTabItem";
+        public TabViewWindowingSamplePage()
+        {
+            this.InitializeComponent();
+
+            Tabs.TabItemsChanged += Tabs_TabItemsChanged;
+
+            Loaded += TabViewWindowingSamplePage_Loaded;
+        }
+
+        private void TabViewWindowingSamplePage_Loaded(object sender, RoutedEventArgs e)
+        {
+            var currentWindow = WindowHelper.GetWindowForElement(this);
+            currentWindow.ExtendsContentIntoTitleBar = true;
+            currentWindow.SetTitleBar(CustomDragRegion);
+            CustomDragRegion.MinWidth = 188;
+        }
+
+        private void Tabs_TabItemsChanged(TabView sender, Windows.Foundation.Collections.IVectorChangedEventArgs args)
+        {
+            // If there are no more tabs, close the window.
+            if (sender.TabItems.Count == 0)
+            {
+                WindowHelper.GetWindowForElement(this).Close();
+            }
+            // If there is only one tab left, disable dragging and reordering of Tabs.
+            else if (sender.TabItems.Count == 1)
+            {
+                sender.CanReorderTabs = false;
+                sender.CanDragTabs = false;
+            }
+            else
+            {
+                sender.CanReorderTabs = true;
+                sender.CanDragTabs = true;
+            }
+        }
+
+        protected override void OnNavigatedTo(NavigationEventArgs e)
+        {
+            base.OnNavigatedTo(e);
+
+            SetupWindow();
+        }
+
+        void SetupWindow()
+        {
+
+            // Main Window -- add some default items
+            for (int i = 0; i < 3; i++)
+            {
+                Tabs.TabItems.Add(new TabViewItem() { IconSource = new Microsoft.UI.Xaml.Controls.SymbolIconSource() { Symbol = Symbol.Placeholder }, Header = $"Item {i}", Content = new MyTabContentControl() { DataContext = $"Page {i}" } });
+            }
+
+            Tabs.SelectedIndex = 0;
+        }
+
+        public void AddTabToTabs(TabViewItem tab)
+        {
+            Tabs.TabItems.Add(tab);
+        }
+
+        // Create a new Window once the Tab is dragged outside.
+        private void Tabs_TabDroppedOutside(TabView sender, TabViewTabDroppedOutsideEventArgs args)
+        {
+            var newPage = new TabViewWindowingSamplePage();
+
+            Tabs.TabItems.Remove(args.Tab);
+            newPage.AddTabToTabs(args.Tab);
+
+            var newWindow = WindowHelper.CreateWindow();
+            newWindow.ExtendsContentIntoTitleBar = true;
+            newWindow.Content = newPage;
+
+            newWindow.Activate();
+        }
+
+        private void Tabs_TabDragStarting(TabView sender, TabViewTabDragStartingEventArgs args)
+        {
+            // We can only drag one tab at a time, so grab the first one...
+            var firstItem = args.Tab;
+
+            // ... set the drag data to the tab...
+            args.Data.Properties.Add(DataIdentifier, firstItem);
+
+            // ... and indicate that we can move it
+            args.Data.RequestedOperation = DataPackageOperation.Move;
+        }
+
+        private async void Tabs_TabStripDrop(object sender, DragEventArgs e)
+        {
+            // This event is called when we're dragging between different TabViews
+            // It is responsible for handling the drop of the item into the second TabView
+
+            if (e.DataView.Properties.TryGetValue(DataIdentifier, out object obj))
+            {
+                // Ensure that the obj property is set before continuing.
+                if (obj == null)
+                {
+                    return;
+                }
+
+                var destinationTabView = sender as TabView;
+                var destinationItems = destinationTabView.TabItems;
+
+                if (destinationItems != null)
+                {
+                    // First we need to get the position in the List to drop to
+                    var index = -1;
+
+                    // Determine which items in the list our pointer is between.
+                    for (int i = 0; i < destinationTabView.TabItems.Count; i++)
+                    {
+                        var item = destinationTabView.ContainerFromIndex(i) as TabViewItem;
+
+                        if (e.GetPosition(item).X - item.ActualWidth < 0)
+                        {
+                            index = i;
+                            break;
+                        }
                     }
 
                     // The TabViewItem can only be in one tree at a time. Before moving it to the new TabView, remove it from the old.
                     // Note that this call can happen on a different thread if moving across windows. So make sure you call methods on
                     // the same thread as where the UI Elements were created.
 
-                    object header = null;
-                    object dataContext = null;
+                    object header = null;
+                    object dataContext = null;
                     var element = (obj as UIElement);
 
                     var taskCompletionSource = new TaskCompletionSource();
@@ -190,25 +165,25 @@ private async void Tabs_TabStripDrop(object sender, DragEventArgs e)
                         }));
 
                     await taskCompletionSource.Task;
-
-                    var insertedItem = CreateNewTVI(header.ToString(), dataContext.ToString());
-                    if (index < 0)
-                    {
-                        // We didn't find a transition point, so we're at the end of the list
-                        destinationItems.Add(insertedItem);
-                    }
-                    else if (index < destinationTabView.TabItems.Count)
-                    {
-                        // Otherwise, insert at the provided index.
-                        destinationItems.Insert(index, insertedItem);
-                    }
-
-                    // Select the newly dragged tab
-                    destinationTabView.SelectedItem = insertedItem;
-                }
-            }
-        }
-
+
+                    var insertedItem = CreateNewTVI(header.ToString(), dataContext.ToString());
+                    if (index < 0)
+                    {
+                        // We didn't find a transition point, so we're at the end of the list
+                        destinationItems.Add(insertedItem);
+                    }
+                    else if (index < destinationTabView.TabItems.Count)
+                    {
+                        // Otherwise, insert at the provided index.
+                        destinationItems.Insert(index, insertedItem);
+                    }
+
+                    // Select the newly dragged tab
+                    destinationTabView.SelectedItem = insertedItem;
+                }
+            }
+        }
+
         private TabViewItem CreateNewTVI(string header, string dataContext)
         {
             var newTab = new TabViewItem()
@@ -225,26 +200,26 @@ private TabViewItem CreateNewTVI(string header, string dataContext)
             };
 
             return newTab;
-        }
-
-        // This method prevents the TabView from handling things that aren't text (ie. files, images, etc.)
-        private void Tabs_TabStripDragOver(object sender, DragEventArgs e)
-        {
-            if (e.DataView.Properties.ContainsKey(DataIdentifier))
-            {
-                e.AcceptedOperation = DataPackageOperation.Move;
-            }
-        }
-
-        private void Tabs_AddTabButtonClick(TabView sender, object args)
-        {
-            var tab = CreateNewTVI("New Item", "New Item");
-            sender.TabItems.Add(tab);
-        }
-
-        private void Tabs_TabCloseRequested(TabView sender, TabViewTabCloseRequestedEventArgs args)
-        {
-            sender.TabItems.Remove(args.Tab);
-        }
-    }
-}
+        }
+
+        // This method prevents the TabView from handling things that aren't text (ie. files, images, etc.)
+        private void Tabs_TabStripDragOver(object sender, DragEventArgs e)
+        {
+            if (e.DataView.Properties.ContainsKey(DataIdentifier))
+            {
+                e.AcceptedOperation = DataPackageOperation.Move;
+            }
+        }
+
+        private void Tabs_AddTabButtonClick(TabView sender, object args)
+        {
+            var tab = CreateNewTVI("New Item", "New Item");
+            sender.TabItems.Add(tab);
+        }
+
+        private void Tabs_TabCloseRequested(TabView sender, TabViewTabCloseRequestedEventArgs args)
+        {
+            sender.TabItems.Remove(args.Tab);
+        }
+    }
+}
diff --git a/WinUIGallery/WinUIGallery.csproj b/WinUIGallery/WinUIGallery.csproj
index 0ab4b6832..cd4d7d7d7 100644
--- a/WinUIGallery/WinUIGallery.csproj
+++ b/WinUIGallery/WinUIGallery.csproj
@@ -28,7 +28,7 @@
         <Optimized Condition="'$(Configuration)' == 'Debug-Unpackaged' Or '$(Configuration)' == 'Debug'">false</Optimized>
         <SingleProject>true</SingleProject>
         <SingleProject Condition="'$(SolutionName)' == 'WinUIGallery.DesktopWap'">false</SingleProject>
-        <!--<WindowsAppSdkSelfContained>true</WindowsAppSdkSelfContained>-->
+        <WindowsAppSdkIncludeVersionInfo>true</WindowsAppSdkIncludeVersionInfo>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(Packaged)' != 'true' and '$(SingleProject)'=='true'">
@@ -248,20 +248,4 @@
     </ItemGroup>
     <Import Project="ContentIncludes.props" />
 
-    <!-- Workaround to ensure WindowsAppSDK-VersionInfo.cs is included in project exactly once, before any compilation -->
-    <PropertyGroup>
-        <ExplicitlyIncludeVersionInfo Condition="'$(WindowsAppSdkSelfContained)'=='true' or '$(SingleProject)'!='true'">true</ExplicitlyIncludeVersionInfo>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(ExplicitlyIncludeVersionInfo)'!='true'">
-        <CoreCompileDependsOn Condition="'$(Packaged)'=='true'">$(CoreCompileDependsOn);GenerateDeploymentManagerCS</CoreCompileDependsOn>
-        <CoreCompileDependsOn Condition="'$(Packaged)'!='true'">$(CoreCompileDependsOn);GenerateBootstrapCS</CoreCompileDependsOn>
-    </PropertyGroup>
-    <ItemGroup>
-        <Compile Condition="'$(ExplicitlyIncludeVersionInfo)'=='true'" Include="$(MicrosoftWindowsAppSDKPackageDir)include\WindowsAppSDK-VersionInfo.cs" />
-    </ItemGroup>
-    <!-- When WindowsAppSdkIncludeVersionInfo supported, above workaround can be replaced with this: -->
-    <PropertyGroup>
-        <WindowsAppSdkIncludeVersionInfo>true</WindowsAppSdkIncludeVersionInfo>
-    </PropertyGroup>
-
 </Project>
\ No newline at end of file
diff --git a/WinUIGallery/net6.override.targets b/WinUIGallery/net7.override.targets
similarity index 100%
rename from WinUIGallery/net6.override.targets
rename to WinUIGallery/net7.override.targets
diff --git a/WinUIGallery/standalone.props b/WinUIGallery/standalone.props
index ab367c245..f3bcd37d4 100644
--- a/WinUIGallery/standalone.props
+++ b/WinUIGallery/standalone.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <!-- The NuGet versions of dependencies to build against. -->
-    <WindowsAppSdkPackageVersion>1.4.230822000</WindowsAppSdkPackageVersion>
-    <SamplesTargetFrameworkMoniker>net6.0-windows10.0.19041.0</SamplesTargetFrameworkMoniker>
+    <SamplesTargetFrameworkMoniker>net7.0-windows10.0.19041.0</SamplesTargetFrameworkMoniker>
+    <WindowsAppSdkPackageVersion>1.4.231008000</WindowsAppSdkPackageVersion>
     <MicrosoftNETCoreUniversalWindowsPlatformVersion>6.2.11</MicrosoftNETCoreUniversalWindowsPlatformVersion>
     <GraphicsWin2DVersion>1.0.4</GraphicsWin2DVersion>
     <ColorCodeVersion>2.0.13</ColorCodeVersion>
diff --git a/nuget.config b/nuget.config
index d1cfd30da..e793689e0 100644
--- a/nuget.config
+++ b/nuget.config
@@ -11,7 +11,7 @@
     <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
 
     <!-- a local directory to allow testing nupkg files without pushing to a remote feed -->
-    <add key="packagestore" value="packagestore" />
+    <add key="gallerystore" value="packagestore" />
   </packageSources>
   <activePackageSource>
     <add key="All" value="(Aggregate source)" />