From e01ff4faf022b22ae9d53826b10dd015495bfb74 Mon Sep 17 00:00:00 2001
From: Carlos Zamora <cazamor@microsoft.com>
Date: Tue, 14 Oct 2025 11:46:31 -0700
Subject: [PATCH 01/25] Introduce SearchMetadata and navigation by name -
 SearchMetadata is unsused, but it is designed to hold information    so that
 we can navigate to a setting - Updated all pages to...    - have an x:Name on
 relevant setting containers    - have a NavigateToXArgs used in the
 OnNavigatedTo() function    - update the NavigateToXArgs to include the name
 of an element       to scroll down to    - Add BringIntoViewWhenLoaded() to
 HasScrollViewer<T> which       scrolls down to the element with a given name
 These components aren't fully hooked up together yet and there's a few TODO
 CARLOS's throughout. Main upcoming work: - indexing - runtime indexing -
 search box UI - search results UI based on
 https://github.com/microsoft/PowerToys/blob/079c69b8beced55211485c352f41308426930e47/doc/specs/settings-search.md

---
 .../TerminalSettingsEditor/Actions.cpp        |  6 ++-
 src/cascadia/TerminalSettingsEditor/Actions.h | 15 ++++++
 .../TerminalSettingsEditor/Actions.idl        |  6 +++
 .../TerminalSettingsEditor/AddProfile.cpp     |  1 +
 .../TerminalSettingsEditor/AddProfile.h       |  6 ++-
 .../TerminalSettingsEditor/AddProfile.idl     |  2 +
 .../TerminalSettingsEditor/Appearances.xaml   | 19 ++++++++
 .../TerminalSettingsEditor/ColorSchemes.cpp   |  6 ++-
 .../TerminalSettingsEditor/ColorSchemes.h     | 15 ++++++
 .../TerminalSettingsEditor/ColorSchemes.idl   |  6 +++
 .../TerminalSettingsEditor/Compatibility.cpp  |  4 +-
 .../TerminalSettingsEditor/Compatibility.h    | 15 ++++++
 .../TerminalSettingsEditor/Compatibility.idl  |  6 +++
 .../TerminalSettingsEditor/Compatibility.xaml | 13 +++--
 .../EditColorScheme.xaml                      |  2 +
 .../TerminalSettingsEditor/Extensions.cpp     |  6 ++-
 .../TerminalSettingsEditor/Extensions.h       | 15 ++++++
 .../TerminalSettingsEditor/Extensions.idl     |  6 +++
 .../TerminalSettingsEditor/Extensions.xaml    |  1 +
 .../GlobalAppearance.cpp                      |  4 +-
 .../TerminalSettingsEditor/GlobalAppearance.h | 15 ++++++
 .../GlobalAppearance.idl                      |  6 +++
 .../GlobalAppearance.xaml                     | 45 ++++++++++++------
 .../TerminalSettingsEditor/Interaction.cpp    |  4 +-
 .../TerminalSettingsEditor/Interaction.h      | 15 ++++++
 .../TerminalSettingsEditor/Interaction.idl    |  6 +++
 .../TerminalSettingsEditor/Interaction.xaml   | 47 +++++++++++++------
 .../TerminalSettingsEditor/Launch.cpp         |  5 +-
 src/cascadia/TerminalSettingsEditor/Launch.h  | 15 ++++++
 .../TerminalSettingsEditor/Launch.idl         |  6 +++
 .../TerminalSettingsEditor/Launch.xaml        | 21 ++++++---
 .../TerminalSettingsEditor/MainPage.cpp       | 30 ++++++------
 ...Microsoft.Terminal.Settings.Editor.vcxproj | 10 ++++
 ...t.Terminal.Settings.Editor.vcxproj.filters |  1 +
 .../TerminalSettingsEditor/NewTabMenu.cpp     |  6 ++-
 .../TerminalSettingsEditor/NewTabMenu.h       | 15 ++++++
 .../TerminalSettingsEditor/NewTabMenu.idl     |  6 +++
 .../TerminalSettingsEditor/ProfileViewModel.h |  7 ++-
 .../ProfileViewModel.idl                      |  1 +
 .../Profiles_Advanced.cpp                     |  1 +
 .../Profiles_Appearance.cpp                   |  3 ++
 .../Profiles_Appearance.h                     |  3 +-
 .../Profiles_Appearance.xaml                  | 18 +++++--
 .../TerminalSettingsEditor/Profiles_Base.cpp  |  1 +
 .../TerminalSettingsEditor/Profiles_Base.xaml |  9 +++-
 .../Profiles_Terminal.cpp                     |  4 +-
 .../Profiles_Terminal.xaml                    |  5 ++
 .../TerminalSettingsEditor/Rendering.cpp      |  4 +-
 .../TerminalSettingsEditor/Rendering.h        | 15 ++++++
 .../TerminalSettingsEditor/Rendering.idl      |  6 +++
 .../TerminalSettingsEditor/Rendering.xaml     |  9 ++--
 .../TerminalSettingsEditor/SearchMetadata.cpp | 45 ++++++++++++++++++
 .../TerminalSettingsEditor/SearchMetadata.h   | 40 ++++++++++++++++
 .../TerminalSettingsEditor/SearchMetadata.idl | 19 ++++++++
 src/cascadia/TerminalSettingsEditor/Utils.h   | 30 ++++++++++++
 src/cascadia/inc/cppwinrt_utils.h             | 33 +++++++++++++
 56 files changed, 580 insertions(+), 80 deletions(-)
 create mode 100644 src/cascadia/TerminalSettingsEditor/SearchMetadata.cpp
 create mode 100644 src/cascadia/TerminalSettingsEditor/SearchMetadata.h
 create mode 100644 src/cascadia/TerminalSettingsEditor/SearchMetadata.idl

diff --git a/src/cascadia/TerminalSettingsEditor/Actions.cpp b/src/cascadia/TerminalSettingsEditor/Actions.cpp
index f27d89eb27d..cf2d4a50248 100644
--- a/src/cascadia/TerminalSettingsEditor/Actions.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Actions.cpp
@@ -27,7 +27,11 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void Actions::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        _ViewModel = e.Parameter().as<Editor::ActionsViewModel>();
+        const auto args = e.Parameter().as<Editor::NavigateToActionsArgs>();
+        _ViewModel = args.ViewModel();
+
+        // TODO CARLOS: runtime indexing and retrieval support
+        BringIntoViewWhenLoaded(args.ElementToFocus());
 
         // Subscribe to the view model's FocusContainer event.
         // Use the KeyBindingViewModel or index provided in the event to focus the corresponding container
diff --git a/src/cascadia/TerminalSettingsEditor/Actions.h b/src/cascadia/TerminalSettingsEditor/Actions.h
index a79003afbfb..e4468924190 100644
--- a/src/cascadia/TerminalSettingsEditor/Actions.h
+++ b/src/cascadia/TerminalSettingsEditor/Actions.h
@@ -4,12 +4,27 @@
 #pragma once
 
 #include "Actions.g.h"
+#include "NavigateToActionsArgs.g.h"
 #include "ActionsViewModel.h"
 #include "Utils.h"
 #include "ViewModelHelpers.h"
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
+    struct NavigateToActionsArgs : NavigateToActionsArgsT<NavigateToActionsArgs>
+    {
+        NavigateToActionsArgs(Editor::ActionsViewModel vm, hstring elementToFocus = {}) :
+            _ViewModel(vm),
+            _ElementToFocus(elementToFocus) {}
+
+        Editor::ActionsViewModel ViewModel() const noexcept { return _ViewModel; }
+        hstring ElementToFocus() const noexcept { return _ElementToFocus; }
+
+    private:
+        Editor::ActionsViewModel _ViewModel{ nullptr };
+        hstring _ElementToFocus{};
+    };
+
     struct Actions : public HasScrollViewer<Actions>, ActionsT<Actions>
     {
     public:
diff --git a/src/cascadia/TerminalSettingsEditor/Actions.idl b/src/cascadia/TerminalSettingsEditor/Actions.idl
index ec7444d2410..1da06382b1f 100644
--- a/src/cascadia/TerminalSettingsEditor/Actions.idl
+++ b/src/cascadia/TerminalSettingsEditor/Actions.idl
@@ -5,6 +5,12 @@ import "ActionsViewModel.idl";
 
 namespace Microsoft.Terminal.Settings.Editor
 {
+    runtimeclass NavigateToActionsArgs
+    {
+        ActionsViewModel ViewModel { get; };
+        String ElementToFocus { get; };
+    }
+
     [default_interface] runtimeclass Actions : Windows.UI.Xaml.Controls.Page
     {
         Actions();
diff --git a/src/cascadia/TerminalSettingsEditor/AddProfile.cpp b/src/cascadia/TerminalSettingsEditor/AddProfile.cpp
index 03864e855e0..db14375ff37 100644
--- a/src/cascadia/TerminalSettingsEditor/AddProfile.cpp
+++ b/src/cascadia/TerminalSettingsEditor/AddProfile.cpp
@@ -29,6 +29,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     void AddProfile::OnNavigatedTo(const NavigationEventArgs& e)
     {
         _State = e.Parameter().as<Editor::AddProfilePageNavigationState>();
+        BringIntoViewWhenLoaded(_State.ElementToFocus());
 
         TraceLoggingWrite(
             g_hTerminalSettingsEditorProvider,
diff --git a/src/cascadia/TerminalSettingsEditor/AddProfile.h b/src/cascadia/TerminalSettingsEditor/AddProfile.h
index 7bfa0654f20..f4f7501d3cb 100644
--- a/src/cascadia/TerminalSettingsEditor/AddProfile.h
+++ b/src/cascadia/TerminalSettingsEditor/AddProfile.h
@@ -26,8 +26,9 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     struct AddProfilePageNavigationState : AddProfilePageNavigationStateT<AddProfilePageNavigationState>
     {
     public:
-        AddProfilePageNavigationState(const Model::CascadiaSettings& settings) :
-            _Settings{ settings } {}
+        AddProfilePageNavigationState(const Model::CascadiaSettings& settings, const hstring& elementToFocus = {}) :
+            _Settings{ settings },
+            _ElementToFocus{ elementToFocus } {}
 
         void RequestAddNew()
         {
@@ -42,6 +43,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         til::event<AddNewArgs> AddNew;
 
         WINRT_PROPERTY(Model::CascadiaSettings, Settings, nullptr);
+        WINRT_PROPERTY(hstring, ElementToFocus);
     };
 
     struct AddProfile : public HasScrollViewer<AddProfile>, AddProfileT<AddProfile>
diff --git a/src/cascadia/TerminalSettingsEditor/AddProfile.idl b/src/cascadia/TerminalSettingsEditor/AddProfile.idl
index 480c69bcbe1..c8d7bd85cdb 100644
--- a/src/cascadia/TerminalSettingsEditor/AddProfile.idl
+++ b/src/cascadia/TerminalSettingsEditor/AddProfile.idl
@@ -8,6 +8,8 @@ namespace Microsoft.Terminal.Settings.Editor
     runtimeclass AddProfilePageNavigationState
     {
         Microsoft.Terminal.Settings.Model.CascadiaSettings Settings;
+        String ElementToFocus { get; };
+
         void RequestAddNew();
         void RequestDuplicate(Guid profile);
         event AddNewArgs AddNew;
diff --git a/src/cascadia/TerminalSettingsEditor/Appearances.xaml b/src/cascadia/TerminalSettingsEditor/Appearances.xaml
index 23e117a8ae4..a1a7617d42f 100644
--- a/src/cascadia/TerminalSettingsEditor/Appearances.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Appearances.xaml
@@ -73,6 +73,7 @@
             <!--  Color Scheme  -->
             <!--  This currently only display the Dark color scheme, even if the user has a pair of schemes set.  -->
             <local:SettingContainer x:Uid="Profile_ColorScheme"
+                                    x:Name="ColorScheme"
                                     ClearSettingValue="{x:Bind Appearance.ClearColorScheme}"
                                     CurrentValueAccessibleName="{x:Bind Appearance.CurrentColorScheme.Name, Mode=OneWay}"
                                     HasSettingValue="{x:Bind Appearance.HasDarkColorSchemeName, Mode=OneWay}"
@@ -281,16 +282,19 @@
                 </StackPanel>
             </local:SettingContainer>
             <local:SettingContainer x:Uid="Profile_MissingFontFaces"
+                                    x:Name="MissingFontFaces"
                                     HelpText="{x:Bind Appearance.MissingFontFaces, Mode=OneWay}"
                                     Style="{StaticResource SettingContainerErrorStyle}"
                                     Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(Appearance.MissingFontFaces), Mode=OneWay}" />
             <local:SettingContainer x:Uid="Profile_ProportionalFontFaces"
+                                    x:Name="ProportionalFontFaces"
                                     HelpText="{x:Bind Appearance.ProportionalFontFaces, Mode=OneWay}"
                                     Style="{StaticResource SettingContainerWarningStyle}"
                                     Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(Appearance.ProportionalFontFaces), Mode=OneWay}" />
 
             <!--  Font Size  -->
             <local:SettingContainer x:Uid="Profile_FontSize"
+                                    x:Name="FontSize"
                                     ClearSettingValue="{x:Bind Appearance.ClearFontSize}"
                                     HasSettingValue="{x:Bind Appearance.HasFontSize, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.FontSizeOverrideSource, Mode=OneWay}"
@@ -307,6 +311,7 @@
 
             <!--  Line Height  -->
             <local:SettingContainer x:Uid="Profile_LineHeight"
+                                    x:Name="LineHeight"
                                     ClearSettingValue="{x:Bind Appearance.ClearLineHeight}"
                                     HasSettingValue="{x:Bind Appearance.HasLineHeight, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.LineHeightOverrideSource, Mode=OneWay}"
@@ -323,6 +328,7 @@
 
             <!--  Cell Width  -->
             <local:SettingContainer x:Uid="Profile_CellWidth"
+                                    x:Name="CellWidth"
                                     ClearSettingValue="{x:Bind Appearance.ClearCellWidth}"
                                     HasSettingValue="{x:Bind Appearance.HasCellWidth, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.CellWidthOverrideSource, Mode=OneWay}"
@@ -339,6 +345,7 @@
 
             <!--  Font Weight  -->
             <local:SettingContainer x:Uid="Profile_FontWeight"
+                                    x:Name="FontWeight"
                                     ClearSettingValue="{x:Bind Appearance.ClearFontWeight}"
                                     HasSettingValue="{x:Bind Appearance.HasFontWeight, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.FontWeightOverrideSource, Mode=OneWay}"
@@ -375,6 +382,7 @@
                 </StackPanel>
             </local:SettingContainer>
             <local:SettingContainer x:Uid="Profile_FontAxes"
+                                    x:Name="FontAxes"
                                     ClearSettingValue="{x:Bind Appearance.ClearFontAxes}"
                                     HasSettingValue="{x:Bind Appearance.HasFontAxes, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.FontAxesOverrideSource, Mode=OneWay}"
@@ -402,6 +410,7 @@
                 </StackPanel>
             </local:SettingContainer>
             <local:SettingContainer x:Uid="Profile_FontFeatures"
+                                    x:Name="FontFeatures"
                                     ClearSettingValue="{x:Bind Appearance.ClearFontFeatures}"
                                     HasSettingValue="{x:Bind Appearance.HasFontFeatures, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.FontFeaturesOverrideSource, Mode=OneWay}"
@@ -431,6 +440,7 @@
 
             <!--  Builtin Glyphs  -->
             <local:SettingContainer x:Uid="Profile_EnableBuiltinGlyphs"
+                                    x:Name="EnableBuiltinGlyphs"
                                     ClearSettingValue="{x:Bind Appearance.ClearEnableBuiltinGlyphs}"
                                     HasSettingValue="{x:Bind Appearance.HasEnableBuiltinGlyphs, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.EnableBuiltinGlyphsOverrideSource, Mode=OneWay}">
@@ -440,6 +450,7 @@
 
             <!--  Color Glyphs  -->
             <local:SettingContainer x:Uid="Profile_EnableColorGlyphs"
+                                    x:Name="EnableColorGlyphs"
                                     ClearSettingValue="{x:Bind Appearance.ClearEnableColorGlyphs}"
                                     HasSettingValue="{x:Bind Appearance.HasEnableColorGlyphs, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.EnableColorGlyphsOverrideSource, Mode=OneWay}">
@@ -449,6 +460,7 @@
 
             <!--  Retro Terminal Effect  -->
             <local:SettingContainer x:Uid="Profile_RetroTerminalEffect"
+                                    x:Name="RetroTerminalEffect"
                                     ClearSettingValue="{x:Bind Appearance.ClearRetroTerminalEffect}"
                                     HasSettingValue="{x:Bind Appearance.HasRetroTerminalEffect, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.RetroTerminalEffectOverrideSource, Mode=OneWay}">
@@ -458,6 +470,7 @@
 
             <!--  Adjust Indistinguishable Colors  -->
             <local:SettingContainer x:Uid="Profile_AdjustIndistinguishableColors"
+                                    x:Name="AdjustIndistinguishableColors"
                                     ClearSettingValue="{x:Bind Appearance.ClearAdjustIndistinguishableColors}"
                                     HasSettingValue="{x:Bind Appearance.HasAdjustIndistinguishableColors, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.AdjustIndistinguishableColorsOverrideSource, Mode=OneWay}">
@@ -476,6 +489,7 @@
 
             <!--  Cursor Shape  -->
             <local:SettingContainer x:Uid="Profile_CursorShape"
+                                    x:Name="CursorShape"
                                     ClearSettingValue="{x:Bind Appearance.ClearCursorShape}"
                                     HasSettingValue="{x:Bind Appearance.HasCursorShape, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.CursorShapeOverrideSource, Mode=OneWay}">
@@ -488,6 +502,7 @@
 
             <!--  Cursor Height  -->
             <local:SettingContainer x:Uid="Profile_CursorHeight"
+                                    x:Name="CursorHeight"
                                     ClearSettingValue="{x:Bind Appearance.ClearCursorHeight}"
                                     HasSettingValue="{x:Bind Appearance.HasCursorHeight, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.CursorHeightOverrideSource, Mode=OneWay}"
@@ -560,6 +575,7 @@
 
             <!--  Background Image Stretch Mode  -->
             <local:SettingContainer x:Uid="Profile_BackgroundImageStretchMode"
+                                    x:Name="BackgroundImageStretchMode"
                                     ClearSettingValue="{x:Bind Appearance.ClearBackgroundImageStretchMode}"
                                     HasSettingValue="{x:Bind Appearance.HasBackgroundImageStretchMode, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.BackgroundImageStretchModeOverrideSource, Mode=OneWay}"
@@ -573,6 +589,7 @@
 
             <!--  Background Image Alignment  -->
             <local:SettingContainer x:Uid="Profile_BackgroundImageAlignment"
+                                    x:Name="BackgroundImageAlignment"
                                     ClearSettingValue="{x:Bind Appearance.ClearBackgroundImageAlignment}"
                                     CurrentValue="{x:Bind Appearance.BackgroundImageAlignmentCurrentValue, Mode=OneWay}"
                                     HasSettingValue="{x:Bind Appearance.HasBackgroundImageAlignment, Mode=OneWay}"
@@ -761,6 +778,7 @@
 
             <!--  Background Image Opacity  -->
             <local:SettingContainer x:Uid="Profile_BackgroundImageOpacity"
+                                    x:Name="BackgroundImageOpacity"
                                     ClearSettingValue="{x:Bind Appearance.ClearBackgroundImageOpacity}"
                                     HasSettingValue="{x:Bind Appearance.HasBackgroundImageOpacity, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.BackgroundImageOpacityOverrideSource, Mode=OneWay}"
@@ -787,6 +805,7 @@
 
             <!--  Intense is bold, bright  -->
             <local:SettingContainer x:Uid="Appearance_IntenseTextStyle"
+                                    x:Name="IntenseTextStyle"
                                     ClearSettingValue="{x:Bind Appearance.ClearIntenseTextStyle}"
                                     HasSettingValue="{x:Bind Appearance.HasIntenseTextStyle, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.IntenseTextStyleOverrideSource, Mode=OneWay}">
diff --git a/src/cascadia/TerminalSettingsEditor/ColorSchemes.cpp b/src/cascadia/TerminalSettingsEditor/ColorSchemes.cpp
index 899cc5f8263..b0daa6817ee 100644
--- a/src/cascadia/TerminalSettingsEditor/ColorSchemes.cpp
+++ b/src/cascadia/TerminalSettingsEditor/ColorSchemes.cpp
@@ -35,9 +35,13 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void ColorSchemes::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        _ViewModel = e.Parameter().as<Editor::ColorSchemesPageViewModel>();
+        const auto args = e.Parameter().as<Editor::NavigateToColorSchemesArgs>();
+        _ViewModel = args.ViewModel();
         _ViewModel.CurrentPage(ColorSchemesSubPage::Base);
 
+        // TODO CARLOS: runtime indexing and retrieval support
+        BringIntoViewWhenLoaded(args.ElementToFocus());
+
         _layoutUpdatedRevoker = LayoutUpdated(winrt::auto_revoke, [this](auto /*s*/, auto /*e*/) {
             // Only let this succeed once.
             _layoutUpdatedRevoker.revoke();
diff --git a/src/cascadia/TerminalSettingsEditor/ColorSchemes.h b/src/cascadia/TerminalSettingsEditor/ColorSchemes.h
index c8e7786e8ec..37376c83477 100644
--- a/src/cascadia/TerminalSettingsEditor/ColorSchemes.h
+++ b/src/cascadia/TerminalSettingsEditor/ColorSchemes.h
@@ -5,12 +5,27 @@
 
 #include "ColorTableEntry.g.h"
 #include "ColorSchemes.g.h"
+#include "NavigateToColorSchemesArgs.g.h"
 #include "ColorSchemeViewModel.h"
 #include "ColorSchemesPageViewModel.h"
 #include "Utils.h"
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
+    struct NavigateToColorSchemesArgs : NavigateToColorSchemesArgsT<NavigateToColorSchemesArgs>
+    {
+        NavigateToColorSchemesArgs(const Editor::ColorSchemesPageViewModel& vm, const hstring& elementToFocus = {}) :
+            _ViewModel(vm),
+            _ElementToFocus(elementToFocus) {}
+
+        Editor::ColorSchemesPageViewModel ViewModel() const noexcept { return _ViewModel; }
+        hstring ElementToFocus() const noexcept { return _ElementToFocus; }
+
+    private:
+        Editor::ColorSchemesPageViewModel _ViewModel{ nullptr };
+        hstring _ElementToFocus{};
+    };
+
     struct ColorSchemes : public HasScrollViewer<ColorSchemes>, ColorSchemesT<ColorSchemes>
     {
     public:
diff --git a/src/cascadia/TerminalSettingsEditor/ColorSchemes.idl b/src/cascadia/TerminalSettingsEditor/ColorSchemes.idl
index e92408dd56e..772627f3469 100644
--- a/src/cascadia/TerminalSettingsEditor/ColorSchemes.idl
+++ b/src/cascadia/TerminalSettingsEditor/ColorSchemes.idl
@@ -6,6 +6,12 @@ import "ColorSchemesPageViewModel.idl";
 
 namespace Microsoft.Terminal.Settings.Editor
 {
+    runtimeclass NavigateToColorSchemesArgs
+    {
+        ColorSchemesPageViewModel ViewModel { get; };
+        String ElementToFocus { get; };
+    }
+
     [default_interface] runtimeclass ColorSchemes : Windows.UI.Xaml.Controls.Page, Windows.UI.Xaml.Data.INotifyPropertyChanged
     {
         ColorSchemes();
diff --git a/src/cascadia/TerminalSettingsEditor/Compatibility.cpp b/src/cascadia/TerminalSettingsEditor/Compatibility.cpp
index 9fa7b81ecfb..4e28b8802c1 100644
--- a/src/cascadia/TerminalSettingsEditor/Compatibility.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Compatibility.cpp
@@ -54,7 +54,9 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void Compatibility::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        _ViewModel = e.Parameter().as<Editor::CompatibilityViewModel>();
+        const auto args = e.Parameter().as<Editor::NavigateToCompatibilityArgs>();
+        _ViewModel = args.ViewModel();
+        BringIntoViewWhenLoaded(args.ElementToFocus());
 
         TraceLoggingWrite(
             g_hTerminalSettingsEditorProvider,
diff --git a/src/cascadia/TerminalSettingsEditor/Compatibility.h b/src/cascadia/TerminalSettingsEditor/Compatibility.h
index 54e81f52522..37a9811552b 100644
--- a/src/cascadia/TerminalSettingsEditor/Compatibility.h
+++ b/src/cascadia/TerminalSettingsEditor/Compatibility.h
@@ -4,12 +4,27 @@
 #pragma once
 
 #include "Compatibility.g.h"
+#include "NavigateToCompatibilityArgs.g.h"
 #include "CompatibilityViewModel.g.h"
 #include "ViewModelHelpers.h"
 #include "Utils.h"
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
+    struct NavigateToCompatibilityArgs : NavigateToCompatibilityArgsT<NavigateToCompatibilityArgs>
+    {
+        NavigateToCompatibilityArgs(const Editor::CompatibilityViewModel& vm, const hstring& elementToFocus = {}) :
+            _ViewModel(vm),
+            _ElementToFocus(elementToFocus) {}
+
+        Editor::CompatibilityViewModel ViewModel() const noexcept { return _ViewModel; }
+        hstring ElementToFocus() const noexcept { return _ElementToFocus; }
+
+    private:
+        Editor::CompatibilityViewModel _ViewModel{ nullptr };
+        hstring _ElementToFocus{};
+    };
+
     struct CompatibilityViewModel : CompatibilityViewModelT<CompatibilityViewModel>, ViewModelHelper<CompatibilityViewModel>
     {
     public:
diff --git a/src/cascadia/TerminalSettingsEditor/Compatibility.idl b/src/cascadia/TerminalSettingsEditor/Compatibility.idl
index b9f13ffe6e6..f107200e2e7 100644
--- a/src/cascadia/TerminalSettingsEditor/Compatibility.idl
+++ b/src/cascadia/TerminalSettingsEditor/Compatibility.idl
@@ -7,6 +7,12 @@ import "EnumEntry.idl";
 
 namespace Microsoft.Terminal.Settings.Editor
 {
+    runtimeclass NavigateToCompatibilityArgs
+    {
+        CompatibilityViewModel ViewModel { get; };
+        String ElementToFocus { get; };
+    }
+
     runtimeclass CompatibilityViewModel : Windows.UI.Xaml.Data.INotifyPropertyChanged
     {
         CompatibilityViewModel(Microsoft.Terminal.Settings.Model.CascadiaSettings settings);
diff --git a/src/cascadia/TerminalSettingsEditor/Compatibility.xaml b/src/cascadia/TerminalSettingsEditor/Compatibility.xaml
index cb666963120..39810efd003 100644
--- a/src/cascadia/TerminalSettingsEditor/Compatibility.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Compatibility.xaml
@@ -26,13 +26,15 @@
 
     <StackPanel Style="{StaticResource SettingsStackStyle}">
         <!--  Allow Headless  -->
-        <local:SettingContainer x:Uid="Globals_AllowHeadless">
+        <local:SettingContainer x:Uid="Globals_AllowHeadless"
+                                x:Name="AllowHeadless">
             <ToggleSwitch IsOn="{x:Bind ViewModel.AllowHeadless, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Text Measurement  -->
-        <local:SettingContainer x:Uid="Globals_TextMeasurement">
+        <local:SettingContainer x:Uid="Globals_TextMeasurement"
+                                x:Name="TextMeasurement">
             <ComboBox AutomationProperties.AccessibilityView="Content"
                       ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                       ItemsSource="{x:Bind ViewModel.TextMeasurementList}"
@@ -42,13 +44,15 @@
 
         <!--  Debug Features  -->
         <local:SettingContainer x:Uid="Globals_DebugFeaturesEnabled"
+                                x:Name="DebugFeaturesEnabled"
                                 Visibility="{x:Bind ViewModel.DebugFeaturesAvailable}">
             <ToggleSwitch IsOn="{x:Bind ViewModel.DebugFeaturesEnabled, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Reset Application State  -->
-        <local:SettingContainer x:Uid="Settings_ResetApplicationState">
+        <local:SettingContainer x:Uid="Settings_ResetApplicationState"
+                                x:Name="ResetApplicationState">
             <Button x:Uid="Settings_ResetApplicationStateButton"
                     Style="{StaticResource DeleteButtonStyle}">
                 <Button.Flyout>
@@ -69,7 +73,8 @@
         </local:SettingContainer>
 
         <!--  Reset to Default Settings  -->
-        <local:SettingContainer x:Uid="Settings_ResetToDefaultSettings">
+        <local:SettingContainer x:Uid="Settings_ResetToDefaultSettings"
+                                x:Name="ResetToDefaultSettings">
             <Button x:Uid="Settings_ResetToDefaultSettingsButton"
                     Style="{StaticResource DeleteButtonStyle}">
                 <Button.Flyout>
diff --git a/src/cascadia/TerminalSettingsEditor/EditColorScheme.xaml b/src/cascadia/TerminalSettingsEditor/EditColorScheme.xaml
index c30287ebafd..54d93bad772 100644
--- a/src/cascadia/TerminalSettingsEditor/EditColorScheme.xaml
+++ b/src/cascadia/TerminalSettingsEditor/EditColorScheme.xaml
@@ -201,6 +201,7 @@
         </Border>
 
         <local:SettingContainer x:Uid="ColorScheme_InboxSchemeDuplicate"
+                                x:Name="InboxSchemeDuplicate"
                                 Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(ViewModel.IsEditable), Mode=OneWay}">
             <Button x:Name="DuplicateSchemeButton"
                     x:Uid="ColorScheme_DuplicateButton"
@@ -209,6 +210,7 @@
         </local:SettingContainer>
 
         <local:SettingContainer x:Uid="ColorScheme_ColorsHeader"
+                                x:Name="ColorsHeader"
                                 StartExpanded="True"
                                 Style="{StaticResource ExpanderSettingContainerStyle}"
                                 Visibility="{x:Bind ViewModel.IsEditable, Mode=OneWay}">
diff --git a/src/cascadia/TerminalSettingsEditor/Extensions.cpp b/src/cascadia/TerminalSettingsEditor/Extensions.cpp
index ecf2cc26ad9..3d731561e72 100644
--- a/src/cascadia/TerminalSettingsEditor/Extensions.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Extensions.cpp
@@ -34,12 +34,16 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void Extensions::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        _ViewModel = e.Parameter().as<Editor::ExtensionsViewModel>();
+        const auto args = e.Parameter().as<Editor::NavigateToExtensionsArgs>();
+        _ViewModel = args.ViewModel();
         auto vmImpl = get_self<ExtensionsViewModel>(_ViewModel);
         vmImpl->ExtensionPackageIdentifierTemplateSelector(_extensionPackageIdentifierTemplateSelector);
         vmImpl->LazyLoadExtensions();
         vmImpl->MarkAsVisited();
 
+        // TODO CARLOS: runtime indexing and retrieval support
+        BringIntoViewWhenLoaded(args.ElementToFocus());
+
         if (vmImpl->IsExtensionView())
         {
             const auto currentPkgVM = vmImpl->CurrentExtensionPackage();
diff --git a/src/cascadia/TerminalSettingsEditor/Extensions.h b/src/cascadia/TerminalSettingsEditor/Extensions.h
index a9379829d26..04d44ffaca6 100644
--- a/src/cascadia/TerminalSettingsEditor/Extensions.h
+++ b/src/cascadia/TerminalSettingsEditor/Extensions.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include "Extensions.g.h"
+#include "NavigateToExtensionsArgs.g.h"
 #include "ExtensionsViewModel.g.h"
 #include "ExtensionPackageViewModel.g.h"
 #include "FragmentExtensionViewModel.g.h"
@@ -15,6 +16,20 @@
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
+    struct NavigateToExtensionsArgs : NavigateToExtensionsArgsT<NavigateToExtensionsArgs>
+    {
+        NavigateToExtensionsArgs(const Editor::ExtensionsViewModel& vm, const hstring& elementToFocus = {}) :
+            _ViewModel(vm),
+            _ElementToFocus(elementToFocus) {}
+
+        Editor::ExtensionsViewModel ViewModel() const noexcept { return _ViewModel; }
+        hstring ElementToFocus() const noexcept { return _ElementToFocus; }
+
+    private:
+        Editor::ExtensionsViewModel _ViewModel{ nullptr };
+        hstring _ElementToFocus{};
+    };
+
     struct Extensions : public HasScrollViewer<Extensions>, ExtensionsT<Extensions>
     {
     public:
diff --git a/src/cascadia/TerminalSettingsEditor/Extensions.idl b/src/cascadia/TerminalSettingsEditor/Extensions.idl
index 6093471014d..b11bcdc2645 100644
--- a/src/cascadia/TerminalSettingsEditor/Extensions.idl
+++ b/src/cascadia/TerminalSettingsEditor/Extensions.idl
@@ -5,6 +5,12 @@ import "ColorSchemesPageViewModel.idl";
 
 namespace Microsoft.Terminal.Settings.Editor
 {
+    runtimeclass NavigateToExtensionsArgs
+    {
+        ExtensionsViewModel ViewModel { get; };
+        String ElementToFocus { get; };
+    }
+
     [default_interface] runtimeclass Extensions : Windows.UI.Xaml.Controls.Page
     {
         Extensions();
diff --git a/src/cascadia/TerminalSettingsEditor/Extensions.xaml b/src/cascadia/TerminalSettingsEditor/Extensions.xaml
index 4ebb03889e9..be026be4b90 100644
--- a/src/cascadia/TerminalSettingsEditor/Extensions.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Extensions.xaml
@@ -501,6 +501,7 @@
                     <StackPanel>
                         <!--  Scope  -->
                         <local:SettingContainer x:Uid="Extensions_Scope"
+                                                x:Name="Scope"
                                                 Content="{x:Bind ViewModel.CurrentExtensionPackage.Scope, Mode=OneWay}"
                                                 IsTabStop="False"
                                                 Style="{StaticResource SettingContainerWithTextContent}" />
diff --git a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.cpp b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.cpp
index 2b220b2ddd3..0074af33f67 100644
--- a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.cpp
+++ b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.cpp
@@ -24,7 +24,9 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void GlobalAppearance::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        _ViewModel = e.Parameter().as<Editor::GlobalAppearanceViewModel>();
+        const auto& args = e.Parameter().as<Editor::NavigateToGlobalAppearanceArgs>();
+        _ViewModel = args.ViewModel();
+        BringIntoViewWhenLoaded(args.ElementToFocus());
 
         TraceLoggingWrite(
             g_hTerminalSettingsEditorProvider,
diff --git a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.h b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.h
index 61a330b70e9..03759e1b130 100644
--- a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.h
+++ b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.h
@@ -4,10 +4,25 @@
 #pragma once
 
 #include "GlobalAppearance.g.h"
+#include "NavigateToGlobalAppearanceArgs.g.h"
 #include "Utils.h"
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
+    struct NavigateToGlobalAppearanceArgs : NavigateToGlobalAppearanceArgsT<NavigateToGlobalAppearanceArgs>
+    {
+        NavigateToGlobalAppearanceArgs(const Editor::GlobalAppearanceViewModel& vm, const hstring& elementToFocus = {}) :
+            _ViewModel(vm),
+            _ElementToFocus(elementToFocus) {}
+
+        Editor::GlobalAppearanceViewModel ViewModel() const noexcept { return _ViewModel; }
+        hstring ElementToFocus() const noexcept { return _ElementToFocus; }
+
+    private:
+        Editor::GlobalAppearanceViewModel _ViewModel{ nullptr };
+        hstring _ElementToFocus{};
+    };
+
     struct GlobalAppearance : public HasScrollViewer<GlobalAppearance>, GlobalAppearanceT<GlobalAppearance>
     {
     public:
diff --git a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.idl b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.idl
index 08c0aa49a5b..bdf5f01e067 100644
--- a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.idl
+++ b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.idl
@@ -5,6 +5,12 @@ import "GlobalAppearanceViewModel.idl";
 
 namespace Microsoft.Terminal.Settings.Editor
 {
+    runtimeclass NavigateToGlobalAppearanceArgs
+    {
+        GlobalAppearanceViewModel ViewModel { get; };
+        String ElementToFocus { get; };
+    }
+
     [default_interface] runtimeclass GlobalAppearance : Windows.UI.Xaml.Controls.Page
     {
         GlobalAppearance();
diff --git a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml
index 854fd733766..ad8b3078c37 100644
--- a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml
+++ b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml
@@ -28,7 +28,8 @@
 
     <StackPanel Style="{StaticResource SettingsStackStyle}">
         <!--  Theme  -->
-        <local:SettingContainer x:Uid="Globals_Theme">
+        <local:SettingContainer x:Uid="Globals_Theme"
+                                x:Name="Theme">
             <ComboBox AutomationProperties.AccessibilityView="Content"
                       ItemsSource="{x:Bind ViewModel.ThemeList, Mode=OneWay}"
                       SelectedItem="{x:Bind ViewModel.CurrentTheme, Mode=TwoWay}"
@@ -42,7 +43,8 @@
         </local:SettingContainer>
 
         <!--  Position of new tab  -->
-        <local:SettingContainer x:Uid="Globals_NewTabPosition">
+        <local:SettingContainer x:Uid="Globals_NewTabPosition"
+                                x:Name="NewTabPosition">
             <ComboBox AutomationProperties.AccessibilityView="Content"
                       ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                       ItemsSource="{x:Bind ViewModel.NewTabPositionList, Mode=OneWay}"
@@ -51,45 +53,52 @@
         </local:SettingContainer>
 
         <!--  Show Titlebar  -->
-        <local:SettingContainer x:Uid="Globals_ShowTitlebar">
+        <local:SettingContainer x:Uid="Globals_ShowTitlebar"
+                                x:Name="ShowTitlebar">
             <ToggleSwitch IsOn="{x:Bind ViewModel.ShowTabsInTitlebar, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}"
                           Toggled="{x:Bind ViewModel.ShowTitlebarToggled}" />
         </local:SettingContainer>
 
         <!--  Always show tabs  -->
-        <local:SettingContainer x:Uid="Globals_AlwaysShowTabs">
+        <local:SettingContainer x:Uid="Globals_AlwaysShowTabs"
+                                x:Name="AlwaysShowTabs">
             <ToggleSwitch IsEnabled="{x:Bind mtu:Converters.InvertBoolean(ViewModel.ShowTabsInTitlebar), Mode=OneWay}"
                           IsOn="{x:Bind ViewModel.AlwaysShowTabs, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Show tabs in full screen  -->
-        <local:SettingContainer x:Uid="Globals_ShowTabsFullscreen">
+        <local:SettingContainer x:Uid="Globals_ShowTabsFullscreen"
+                                x:Name="ShowTabsFullscreen">
             <ToggleSwitch IsOn="{x:Bind ViewModel.ShowTabsFullscreen, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Show Acrylic in Tab Row  -->
-        <local:SettingContainer x:Uid="Globals_AcrylicTabRow">
+        <local:SettingContainer x:Uid="Globals_AcrylicTabRow"
+                                x:Name="AcrylicTabRow">
             <ToggleSwitch IsOn="{x:Bind ViewModel.UseAcrylicInTabRow, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Show Title in Titlebar  -->
-        <local:SettingContainer x:Uid="Globals_ShowTitleInTitlebar">
+        <local:SettingContainer x:Uid="Globals_ShowTitleInTitlebar"
+                                x:Name="ShowTitleInTitlebar">
             <ToggleSwitch IsOn="{x:Bind ViewModel.ShowTitleInTitlebar, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Always on Top  -->
-        <local:SettingContainer x:Uid="Globals_AlwaysOnTop">
+        <local:SettingContainer x:Uid="Globals_AlwaysOnTop"
+                                x:Name="AlwaysOnTop">
             <ToggleSwitch IsOn="{x:Bind ViewModel.AlwaysOnTop, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Tab Width Mode  -->
-        <local:SettingContainer x:Uid="Globals_TabWidthMode">
+        <local:SettingContainer x:Uid="Globals_TabWidthMode"
+                                x:Name="TabWidthMode">
             <ComboBox AutomationProperties.AccessibilityView="Content"
                       ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                       ItemsSource="{x:Bind ViewModel.TabWidthModeList, Mode=OneWay}"
@@ -99,37 +108,43 @@
 
         <!--  Disable Animations  -->
         <!--  NOTE: the UID is "DisablePaneAnimationsReversed" not "DisablePaneAnimations". See GH#9124 for more details.  -->
-        <local:SettingContainer x:Uid="Globals_DisableAnimationsReversed">
+        <local:SettingContainer x:Uid="Globals_DisableAnimationsReversed"
+                                x:Name="DisableAnimations">
             <ToggleSwitch IsOn="{x:Bind ViewModel.InvertedDisableAnimations, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Always Show Notification Icon  -->
-        <local:SettingContainer x:Uid="Globals_AlwaysShowNotificationIcon">
+        <local:SettingContainer x:Uid="Globals_AlwaysShowNotificationIcon"
+                                x:Name="AlwaysShowNotificationIcon">
             <ToggleSwitch IsOn="{x:Bind ViewModel.AlwaysShowNotificationIcon, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Minimize To Notification Area  -->
-        <local:SettingContainer x:Uid="Globals_MinimizeToNotificationArea">
+        <local:SettingContainer x:Uid="Globals_MinimizeToNotificationArea"
+                                x:Name="MinimizeToNotificationArea">
             <ToggleSwitch IsOn="{x:Bind ViewModel.MinimizeToNotificationArea, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Automatically hide window  -->
-        <local:SettingContainer x:Uid="Globals_AutoHideWindow">
+        <local:SettingContainer x:Uid="Globals_AutoHideWindow"
+                                x:Name="AutoHideWindow">
             <ToggleSwitch IsOn="{x:Bind ViewModel.AutoHideWindow, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Show Admin Shield  -->
-        <local:SettingContainer x:Uid="Globals_ShowAdminShield">
+        <local:SettingContainer x:Uid="Globals_ShowAdminShield"
+                                x:Name="ShowAdminShield">
             <ToggleSwitch IsOn="{x:Bind ViewModel.ShowAdminShield, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Enable Unfocused Acrylic  -->
-        <local:SettingContainer x:Uid="Globals_EnableUnfocusedAcrylic">
+        <local:SettingContainer x:Uid="Globals_EnableUnfocusedAcrylic"
+                                x:Name="EnableUnfocusedAcrylic">
             <ToggleSwitch IsOn="{x:Bind ViewModel.EnableUnfocusedAcrylic, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
diff --git a/src/cascadia/TerminalSettingsEditor/Interaction.cpp b/src/cascadia/TerminalSettingsEditor/Interaction.cpp
index 6015cbcea14..f729e13c15c 100644
--- a/src/cascadia/TerminalSettingsEditor/Interaction.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Interaction.cpp
@@ -21,7 +21,9 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void Interaction::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        _ViewModel = e.Parameter().as<Editor::InteractionViewModel>();
+        const auto args = e.Parameter().as<Editor::NavigateToInteractionArgs>();
+        _ViewModel = args.ViewModel();
+        BringIntoViewWhenLoaded(args.ElementToFocus());
 
         TraceLoggingWrite(
             g_hTerminalSettingsEditorProvider,
diff --git a/src/cascadia/TerminalSettingsEditor/Interaction.h b/src/cascadia/TerminalSettingsEditor/Interaction.h
index 568139fdeed..d914ba5e84c 100644
--- a/src/cascadia/TerminalSettingsEditor/Interaction.h
+++ b/src/cascadia/TerminalSettingsEditor/Interaction.h
@@ -4,10 +4,25 @@
 #pragma once
 
 #include "Interaction.g.h"
+#include "NavigateToInteractionArgs.g.h"
 #include "Utils.h"
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
+    struct NavigateToInteractionArgs : NavigateToInteractionArgsT<NavigateToInteractionArgs>
+    {
+        NavigateToInteractionArgs(const Editor::InteractionViewModel& vm, const hstring& elementToFocus = {}) :
+            _ViewModel(vm),
+            _ElementToFocus(elementToFocus) {}
+
+        Editor::InteractionViewModel ViewModel() const noexcept { return _ViewModel; }
+        hstring ElementToFocus() const noexcept { return _ElementToFocus; }
+
+    private:
+        Editor::InteractionViewModel _ViewModel{ nullptr };
+        hstring _ElementToFocus{};
+    };
+
     struct Interaction : public HasScrollViewer<Interaction>, InteractionT<Interaction>
     {
         Interaction();
diff --git a/src/cascadia/TerminalSettingsEditor/Interaction.idl b/src/cascadia/TerminalSettingsEditor/Interaction.idl
index 3a41823b87f..4e58f5b8e41 100644
--- a/src/cascadia/TerminalSettingsEditor/Interaction.idl
+++ b/src/cascadia/TerminalSettingsEditor/Interaction.idl
@@ -5,6 +5,12 @@ import "InteractionViewModel.idl";
 
 namespace Microsoft.Terminal.Settings.Editor
 {
+    runtimeclass NavigateToInteractionArgs
+    {
+        InteractionViewModel ViewModel { get; };
+        String ElementToFocus { get; };
+    }
+
     [default_interface] runtimeclass Interaction : Windows.UI.Xaml.Controls.Page
     {
         Interaction();
diff --git a/src/cascadia/TerminalSettingsEditor/Interaction.xaml b/src/cascadia/TerminalSettingsEditor/Interaction.xaml
index fe3f67c6eb3..bccf1edfcc9 100644
--- a/src/cascadia/TerminalSettingsEditor/Interaction.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Interaction.xaml
@@ -27,13 +27,15 @@
     <StackPanel>
         <StackPanel Style="{StaticResource SettingsStackStyle}">
             <!--  Copy On Select  -->
-            <local:SettingContainer x:Uid="Globals_CopyOnSelect">
+            <local:SettingContainer x:Uid="Globals_CopyOnSelect"
+                                    x:Name="CopyOnSelect">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.CopyOnSelect, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
             </local:SettingContainer>
 
             <!--  Copy Format  -->
-            <local:SettingContainer x:Uid="Globals_CopyFormat">
+            <local:SettingContainer x:Uid="Globals_CopyFormat"
+                                    x:Name="CopyFormat">
                 <ComboBox AutomationProperties.AccessibilityView="Content"
                           ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                           ItemsSource="{x:Bind ViewModel.CopyFormatList, Mode=OneWay}"
@@ -42,19 +44,22 @@
             </local:SettingContainer>
 
             <!--  Trim Block Selection  -->
-            <local:SettingContainer x:Uid="Globals_TrimBlockSelection">
+            <local:SettingContainer x:Uid="Globals_TrimBlockSelection"
+                                    x:Name="TrimBlockSelection">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.TrimBlockSelection, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
             </local:SettingContainer>
 
             <!--  Trim Paste  -->
-            <local:SettingContainer x:Uid="Globals_TrimPaste">
+            <local:SettingContainer x:Uid="Globals_TrimPaste"
+                                    x:Name="TrimPaste">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.TrimPaste, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
             </local:SettingContainer>
 
             <!--  Word Delimiters  -->
             <local:SettingContainer x:Uid="Globals_WordDelimiters"
+                                    x:Name="WordDelimiters"
                                     CurrentValue="{x:Bind ViewModel.WordDelimiters, Mode=OneWay}"
                                     Style="{StaticResource ExpanderSettingContainerStyle}">
                 <TextBox IsSpellCheckEnabled="False"
@@ -63,13 +68,15 @@
             </local:SettingContainer>
 
             <!--  Snap On Resize  -->
-            <local:SettingContainer x:Uid="Globals_SnapToGridOnResize">
+            <local:SettingContainer x:Uid="Globals_SnapToGridOnResize"
+                                    x:Name="SnapToGridOnResize">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.SnapToGridOnResize, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
             </local:SettingContainer>
 
             <!--  Tab Switcher Mode  -->
-            <local:SettingContainer x:Uid="Globals_TabSwitcherMode">
+            <local:SettingContainer x:Uid="Globals_TabSwitcherMode"
+                                    x:Name="TabSwitcherMode">
                 <ComboBox AutomationProperties.AccessibilityView="Content"
                           ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                           ItemsSource="{x:Bind ViewModel.TabSwitcherModeList}"
@@ -78,31 +85,36 @@
             </local:SettingContainer>
 
             <!--  Focus Follow Mouse Mode  -->
-            <local:SettingContainer x:Uid="Globals_FocusFollowMouse">
+            <local:SettingContainer x:Uid="Globals_FocusFollowMouse"
+                                    x:Name="FocusFollowMouse">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.FocusFollowMouse, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
             </local:SettingContainer>
 
             <!--  Enable Font Size Changes with Scrolling  -->
-            <local:SettingContainer x:Uid="Globals_ScrollToZoom">
+            <local:SettingContainer x:Uid="Globals_ScrollToZoom"
+                                    x:Name="ScrollToZoom">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.ScrollToZoom, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
             </local:SettingContainer>
 
             <!--  Enable Window Opacity Changes with Scrolling  -->
-            <local:SettingContainer x:Uid="Globals_ScrollToChangeOpacity">
+            <local:SettingContainer x:Uid="Globals_ScrollToChangeOpacity"
+                                    x:Name="ScrollToChangeOpacity">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.ScrollToChangeOpacity, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
             </local:SettingContainer>
 
             <!--  Detect URLs  -->
-            <local:SettingContainer x:Uid="Globals_DetectURLs">
+            <local:SettingContainer x:Uid="Globals_DetectURLs"
+                                    x:Name="DetectURLs">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.DetectURLs, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
             </local:SettingContainer>
 
             <!--  Search Web Default Query URL  -->
             <local:SettingContainer x:Uid="Globals_SearchWebDefaultQueryUrl"
+                                    x:Name="SearchWebDefaultQueryUrl"
                                     CurrentValue="{x:Bind ViewModel.SearchWebDefaultQueryUrl, Mode=OneWay}"
                                     Style="{StaticResource ExpanderSettingContainerStyle}">
                 <TextBox IsSpellCheckEnabled="False"
@@ -111,7 +123,8 @@
             </local:SettingContainer>
 
             <!--  Enable Color Selection  -->
-            <local:SettingContainer x:Uid="Globals_EnableColorSelection">
+            <local:SettingContainer x:Uid="Globals_EnableColorSelection"
+                                    x:Name="EnableColorSelection">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.EnableColorSelection, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
             </local:SettingContainer>
@@ -123,25 +136,29 @@
                        Style="{StaticResource TextBlockSubHeaderStyle}" />
 
             <!--  Close All Tabs Warning  -->
-            <local:SettingContainer x:Uid="Globals_ConfirmCloseAllTabs">
+            <local:SettingContainer x:Uid="Globals_ConfirmCloseAllTabs"
+                                    x:Name="ConfirmCloseAllTabs">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.ConfirmCloseAllTabs, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
             </local:SettingContainer>
 
             <!--  Input Service Warning  -->
-            <local:SettingContainer x:Uid="Globals_InputServiceWarning">
+            <local:SettingContainer x:Uid="Globals_InputServiceWarning"
+                                    x:Name="InputServiceWarning">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.InputServiceWarning, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
             </local:SettingContainer>
 
             <!--  Large Paste Warning  -->
-            <local:SettingContainer x:Uid="Globals_WarnAboutLargePaste">
+            <local:SettingContainer x:Uid="Globals_WarnAboutLargePaste"
+                                    x:Name="WarnAboutLargePaste">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.WarnAboutLargePaste, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
             </local:SettingContainer>
 
             <!--  Multi Line Paste Warning  -->
-            <local:SettingContainer x:Uid="Globals_WarnAboutMultiLinePaste">
+            <local:SettingContainer x:Uid="Globals_WarnAboutMultiLinePaste"
+                                    x:Name="WarnAboutMultiLinePaste">
                 <ComboBox AutomationProperties.AccessibilityView="Content"
                           ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                           ItemsSource="{x:Bind WarnAboutMultiLinePasteList}"
diff --git a/src/cascadia/TerminalSettingsEditor/Launch.cpp b/src/cascadia/TerminalSettingsEditor/Launch.cpp
index 9c0a933961c..e83a098aa1c 100644
--- a/src/cascadia/TerminalSettingsEditor/Launch.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Launch.cpp
@@ -40,10 +40,13 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void Launch::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        _ViewModel = e.Parameter().as<Editor::LaunchViewModel>();
+        const auto args = e.Parameter().as<Editor::NavigateToLaunchArgs>();
+        _ViewModel = args.ViewModel();
+        BringIntoViewWhenLoaded(args.ElementToFocus());
         auto innerViewModel{ winrt::get_self<Editor::implementation::LaunchViewModel>(_ViewModel) };
         /* coroutine dispatch */ innerViewModel->PrepareStartOnUserLoginSettings();
 
+
         TraceLoggingWrite(
             g_hTerminalSettingsEditorProvider,
             "NavigatedToPage",
diff --git a/src/cascadia/TerminalSettingsEditor/Launch.h b/src/cascadia/TerminalSettingsEditor/Launch.h
index 985be422af3..ef37dab9cab 100644
--- a/src/cascadia/TerminalSettingsEditor/Launch.h
+++ b/src/cascadia/TerminalSettingsEditor/Launch.h
@@ -4,10 +4,25 @@
 #pragma once
 
 #include "Launch.g.h"
+#include "NavigateToLaunchArgs.g.h"
 #include "Utils.h"
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
+    struct NavigateToLaunchArgs : NavigateToLaunchArgsT<NavigateToLaunchArgs>
+    {
+        NavigateToLaunchArgs(const Editor::LaunchViewModel& vm, const hstring& elementToFocus = {}) :
+            _ViewModel(vm),
+            _ElementToFocus(elementToFocus) {}
+
+        Editor::LaunchViewModel ViewModel() const noexcept { return _ViewModel; }
+        hstring ElementToFocus() const noexcept { return _ElementToFocus; }
+
+    private:
+        Editor::LaunchViewModel _ViewModel{ nullptr };
+        hstring _ElementToFocus{};
+    };
+
     struct Launch : public HasScrollViewer<Launch>, LaunchT<Launch>
     {
     public:
diff --git a/src/cascadia/TerminalSettingsEditor/Launch.idl b/src/cascadia/TerminalSettingsEditor/Launch.idl
index 537650cb780..7d42f379340 100644
--- a/src/cascadia/TerminalSettingsEditor/Launch.idl
+++ b/src/cascadia/TerminalSettingsEditor/Launch.idl
@@ -6,6 +6,12 @@ import "LaunchViewModel.idl";
 
 namespace Microsoft.Terminal.Settings.Editor
 {
+    runtimeclass NavigateToLaunchArgs
+    {
+        LaunchViewModel ViewModel { get; };
+        String ElementToFocus { get; };
+    }
+
     [default_interface] runtimeclass Launch : Windows.UI.Xaml.Controls.Page
     {
         Launch();
diff --git a/src/cascadia/TerminalSettingsEditor/Launch.xaml b/src/cascadia/TerminalSettingsEditor/Launch.xaml
index 22125d2ac6a..72669b9b22f 100644
--- a/src/cascadia/TerminalSettingsEditor/Launch.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Launch.xaml
@@ -44,9 +44,9 @@
     <StackPanel>
         <StackPanel Style="{StaticResource SettingsStackStyle}">
             <!--  Default Profile  -->
-            <local:SettingContainer x:Uid="Globals_DefaultProfile">
-                <ComboBox x:Name="DefaultProfile"
-                          ItemsSource="{x:Bind ViewModel.DefaultProfiles}"
+            <local:SettingContainer x:Uid="Globals_DefaultProfile"
+                                    x:Name="DefaultProfile">
+                <ComboBox ItemsSource="{x:Bind ViewModel.DefaultProfiles}"
                           SelectedItem="{x:Bind ViewModel.CurrentDefaultProfile, Mode=TwoWay}"
                           Style="{StaticResource ComboBoxSettingStyle}">
                     <ComboBox.ItemTemplate>
@@ -141,7 +141,8 @@
             </local:SettingContainer>
 
             <!--  Language  -->
-            <local:SettingContainer x:Uid="Globals_Language">
+            <local:SettingContainer x:Uid="Globals_Language"
+                                    x:Name="Language">
                 <ComboBox ItemsSource="{x:Bind ViewModel.LanguageList}"
                           SelectedItem="{x:Bind ViewModel.CurrentLanguage, Mode=TwoWay}"
                           Style="{StaticResource ComboBoxSettingStyle}">
@@ -154,7 +155,8 @@
             </local:SettingContainer>
 
             <!--  Language  -->
-            <local:SettingContainer x:Uid="Globals_DefaultInputScope">
+            <local:SettingContainer x:Uid="Globals_DefaultInputScope"
+                                    x:Name="DefaultInputScope">
                 <ComboBox AutomationProperties.AccessibilityView="Content"
                           ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                           ItemsSource="{x:Bind ViewModel.DefaultInputScopeList}"
@@ -164,6 +166,7 @@
 
             <!--  Start on User Login  -->
             <local:SettingContainer x:Uid="Globals_StartOnUserLogin"
+                                    x:Name="StartOnUserLogin"
                                     HelpText="{x:Bind ViewModel.StartOnUserLoginStatefulHelpText, Mode=OneWay}"
                                     Visibility="{x:Bind ViewModel.StartOnUserLoginAvailable, Mode=OneTime}">
                 <ToggleSwitch IsEnabled="{x:Bind ViewModel.StartOnUserLoginConfigurable, Mode=OneWay}"
@@ -172,7 +175,8 @@
             </local:SettingContainer>
 
             <!--  First Window Behavior  -->
-            <local:SettingContainer x:Uid="Globals_FirstWindowPreference">
+            <local:SettingContainer x:Uid="Globals_FirstWindowPreference"
+                                    x:Name="FirstWindowPreference">
                 <ComboBox AutomationProperties.AccessibilityView="Content"
                           ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                           ItemsSource="{x:Bind ViewModel.FirstWindowPreferenceList}"
@@ -181,7 +185,8 @@
             </local:SettingContainer>
 
             <!--  Windowing Behavior  -->
-            <local:SettingContainer x:Uid="Globals_WindowingBehavior">
+            <local:SettingContainer x:Uid="Globals_WindowingBehavior"
+                                    x:Name="WindowingBehavior">
                 <ComboBox AutomationProperties.AccessibilityView="Content"
                           ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                           ItemsSource="{x:Bind ViewModel.WindowingBehaviorList}"
@@ -191,6 +196,7 @@
 
             <!--  Launch Size  -->
             <local:SettingContainer x:Uid="Globals_LaunchSize"
+                                    x:Name="LaunchSize"
                                     CurrentValue="{x:Bind ViewModel.LaunchSizeCurrentValue, Mode=OneWay}"
                                     Style="{StaticResource ExpanderSettingContainerStyle}">
                 <Grid ColumnSpacing="12"
@@ -234,6 +240,7 @@
 
             <!--  Launch Parameters  -->
             <local:SettingContainer x:Uid="Globals_LaunchParameters"
+                                    x:Name="LaunchParameters"
                                     CurrentValue="{x:Bind ViewModel.LaunchParametersCurrentValue, Mode=OneWay}"
                                     Style="{StaticResource ExpanderSettingContainerStyle}">
                 <Grid RowSpacing="8">
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
index 19345746aa3..f1abb77e6e3 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
@@ -19,6 +19,7 @@
 #include "InteractionViewModel.h"
 #include "LaunchViewModel.h"
 #include "NewTabMenuViewModel.h"
+#include "NewTabMenu.h"
 #include "..\types\inc\utils.hpp"
 #include <..\WinRTUtils\inc\Utils.h>
 
@@ -84,7 +85,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                     const auto crumb = winrt::make<Breadcrumb>(box_value(newTabMenuTag), RS_(L"Nav_NewTabMenu/Content"), BreadcrumbSubPage::None);
                     _breadcrumbs.Append(crumb);
                 }
-                contentFrame().Navigate(xaml_typename<Editor::NewTabMenu>(), _newTabMenuPageVM);
+                contentFrame().Navigate(xaml_typename<Editor::NewTabMenu>(), winrt::make<NavigateToNewTabMenuArgs>(_newTabMenuPageVM));
             }
         });
 
@@ -137,7 +138,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                     const auto crumb = winrt::make<Breadcrumb>(box_value(extensionsTag), RS_(L"Nav_Extensions/Content"), BreadcrumbSubPage::None);
                     _breadcrumbs.Append(crumb);
                 }
-                contentFrame().Navigate(xaml_typename<Editor::Extensions>(), _extensionsVM);
+                contentFrame().Navigate(xaml_typename<Editor::Extensions>(), winrt::make<NavigateToExtensionsArgs>(_extensionsVM));
             }
         });
 
@@ -441,7 +442,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 }
                 else if (currentPage == ProfileSubPage::Terminal)
                 {
-                    contentFrame().Navigate(xaml_typename<Editor::Profiles_Terminal>(), profile);
+                    contentFrame().Navigate(xaml_typename<Editor::Profiles_Terminal>(), winrt::make<implementation::NavigateToProfileArgs>(profile, *this));
                     const auto crumb = winrt::make<Breadcrumb>(breadcrumbTag, RS_(L"Profile_Terminal/Header"), BreadcrumbSubPage::Profile_Terminal);
                     _breadcrumbs.Append(crumb);
                     SettingsMainPage_ScrollViewer().ScrollToVerticalOffset(0);
@@ -463,31 +464,32 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
         if (clickedItemTag == launchTag)
         {
-            contentFrame().Navigate(xaml_typename<Editor::Launch>(), winrt::make<LaunchViewModel>(_settingsClone));
+            _newTabMenuPageVM.CurrentFolder(nullptr);
+            contentFrame().Navigate(xaml_typename<Editor::Launch>(), winrt::make<NavigateToLaunchArgs>(winrt::make<LaunchViewModel>(_settingsClone)));
             const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_Launch/Content"), BreadcrumbSubPage::None);
             _breadcrumbs.Append(crumb);
         }
         else if (clickedItemTag == interactionTag)
         {
-            contentFrame().Navigate(xaml_typename<Editor::Interaction>(), winrt::make<InteractionViewModel>(_settingsClone.GlobalSettings()));
+            contentFrame().Navigate(xaml_typename<Editor::Interaction>(), winrt::make<NavigateToInteractionArgs>(winrt::make<InteractionViewModel>(_settingsClone.GlobalSettings())));
             const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_Interaction/Content"), BreadcrumbSubPage::None);
             _breadcrumbs.Append(crumb);
         }
         else if (clickedItemTag == renderingTag)
         {
-            contentFrame().Navigate(xaml_typename<Editor::Rendering>(), winrt::make<RenderingViewModel>(_settingsClone));
+            contentFrame().Navigate(xaml_typename<Editor::Rendering>(), winrt::make<NavigateToRenderingArgs>(winrt::make<RenderingViewModel>(_settingsClone)));
             const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_Rendering/Content"), BreadcrumbSubPage::None);
             _breadcrumbs.Append(crumb);
         }
         else if (clickedItemTag == compatibilityTag)
         {
-            contentFrame().Navigate(xaml_typename<Editor::Compatibility>(), winrt::make<CompatibilityViewModel>(_settingsClone));
+            contentFrame().Navigate(xaml_typename<Editor::Compatibility>(), winrt::make<NavigateToCompatibilityArgs>(winrt::make<CompatibilityViewModel>(_settingsClone)));
             const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_Compatibility/Content"), BreadcrumbSubPage::None);
             _breadcrumbs.Append(crumb);
         }
         else if (clickedItemTag == actionsTag)
         {
-            contentFrame().Navigate(xaml_typename<Editor::Actions>(), winrt::make<ActionsViewModel>(_settingsClone));
+            contentFrame().Navigate(xaml_typename<Editor::Actions>(), winrt::make<NavigateToActionsArgs>(winrt::make<ActionsViewModel>(_settingsClone)));
             const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_Actions/Content"), BreadcrumbSubPage::None);
             _breadcrumbs.Append(crumb);
         }
@@ -502,7 +504,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             else
             {
                 // Navigate to the NewTabMenu page
-                contentFrame().Navigate(xaml_typename<Editor::NewTabMenu>(), _newTabMenuPageVM);
+                contentFrame().Navigate(xaml_typename<Editor::NewTabMenu>(), winrt::make<NavigateToNewTabMenuArgs>(_newTabMenuPageVM));
                 const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_NewTabMenu/Content"), BreadcrumbSubPage::None);
                 _breadcrumbs.Append(crumb);
             }
@@ -517,7 +519,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             }
             else
             {
-                contentFrame().Navigate(xaml_typename<Editor::Extensions>(), _extensionsVM);
+                contentFrame().Navigate(xaml_typename<Editor::Extensions>(), winrt::make<NavigateToExtensionsArgs>(_extensionsVM));
                 const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_Extensions/Content"), BreadcrumbSubPage::None);
                 _breadcrumbs.Append(crumb);
             }
@@ -552,7 +554,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         {
             const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_ColorSchemes/Content"), BreadcrumbSubPage::None);
             _breadcrumbs.Append(crumb);
-            contentFrame().Navigate(xaml_typename<Editor::ColorSchemes>(), _colorSchemesPageVM);
+            contentFrame().Navigate(xaml_typename<Editor::ColorSchemes>(), winrt::make<NavigateToColorSchemesArgs>(_colorSchemesPageVM));
 
             if (subPage == BreadcrumbSubPage::ColorSchemes_Edit)
             {
@@ -561,7 +563,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         }
         else if (clickedItemTag == globalAppearanceTag)
         {
-            contentFrame().Navigate(xaml_typename<Editor::GlobalAppearance>(), winrt::make<GlobalAppearanceViewModel>(_settingsClone.GlobalSettings()));
+            contentFrame().Navigate(xaml_typename<Editor::GlobalAppearance>(), winrt::make<NavigateToGlobalAppearanceArgs>(winrt::make<GlobalAppearanceViewModel>(_settingsClone.GlobalSettings())));
             const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_Appearance/Content"), BreadcrumbSubPage::None);
             _breadcrumbs.Append(crumb);
         }
@@ -623,7 +625,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     {
         _PreNavigateHelper();
 
-        contentFrame().Navigate(xaml_typename<Editor::NewTabMenu>(), _newTabMenuPageVM);
+        contentFrame().Navigate(xaml_typename<Editor::NewTabMenu>(), winrt::make<NavigateToNewTabMenuArgs>(_newTabMenuPageVM));
         const auto crumb = winrt::make<Breadcrumb>(box_value(newTabMenuTag), RS_(L"Nav_NewTabMenu/Content"), BreadcrumbSubPage::None);
         _breadcrumbs.Append(crumb);
 
@@ -656,7 +658,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     {
         _PreNavigateHelper();
 
-        contentFrame().Navigate(xaml_typename<Editor::Extensions>(), _extensionsVM);
+        contentFrame().Navigate(xaml_typename<Editor::Extensions>(), winrt::make<NavigateToExtensionsArgs>(_extensionsVM));
         const auto crumb = winrt::make<Breadcrumb>(box_value(extensionsTag), RS_(L"Nav_Extensions/Content"), BreadcrumbSubPage::None);
         _breadcrumbs.Append(crumb);
 
diff --git a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj
index 49778fd31a9..17ee5591bb3 100644
--- a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj
+++ b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj
@@ -157,6 +157,9 @@
     <ClInclude Include="Rendering.h">
       <DependentUpon>Rendering.xaml</DependentUpon>
     </ClInclude>
+    <ClInclude Include="SearchMetadata.h">
+      <DependentUpon>SearchMetadata.idl</DependentUpon>
+    </ClInclude>
     <ClInclude Include="SettingContainer.h">
       <DependentUpon>SettingContainer.idl</DependentUpon>
     </ClInclude>
@@ -349,6 +352,10 @@
     <ClCompile Include="Rendering.cpp">
       <DependentUpon>Rendering.xaml</DependentUpon>
     </ClCompile>
+    <ClCompile Include="SearchMetadata.cpp">
+      <DependentUpon>SearchMetadata.idl</DependentUpon>
+      <SubType>Code</SubType>
+    </ClCompile>
     <ClCompile Include="SettingContainer.cpp">
       <DependentUpon>SettingContainer.idl</DependentUpon>
     </ClCompile>
@@ -449,6 +456,9 @@
       <DependentUpon>Appearances.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Midl>
+    <Midl Include="SearchMetadata.idl">
+      <SubType>Code</SubType>
+    </Midl>
     <Midl Include="SettingContainer.idl">
       <SubType>Code</SubType>
     </Midl>
diff --git a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters
index f49f4c9bc74..59731bc68ff 100644
--- a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters
+++ b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters
@@ -29,6 +29,7 @@
     <Midl Include="GlobalAppearanceViewModel.idl" />
     <Midl Include="LaunchViewModel.idl" />
     <Midl Include="EnumEntry.idl" />
+    <Midl Include="SearchMetadata.idl" />
     <Midl Include="SettingContainer.idl" />
     <Midl Include="TerminalColorConverters.idl" />
     <Midl Include="NewTabMenuViewModel.idl" />
diff --git a/src/cascadia/TerminalSettingsEditor/NewTabMenu.cpp b/src/cascadia/TerminalSettingsEditor/NewTabMenu.cpp
index 1587740b68e..16e891162f8 100644
--- a/src/cascadia/TerminalSettingsEditor/NewTabMenu.cpp
+++ b/src/cascadia/TerminalSettingsEditor/NewTabMenu.cpp
@@ -43,7 +43,11 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void NewTabMenu::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        _ViewModel = e.Parameter().as<Editor::NewTabMenuViewModel>();
+        const auto args = e.Parameter().as<Editor::NavigateToNewTabMenuArgs>();
+        _ViewModel = args.ViewModel();
+
+        // TODO CARLOS: runtime indexing and retrieval support
+        BringIntoViewWhenLoaded(args.ElementToFocus());
 
         TraceLoggingWrite(
             g_hTerminalSettingsEditorProvider,
diff --git a/src/cascadia/TerminalSettingsEditor/NewTabMenu.h b/src/cascadia/TerminalSettingsEditor/NewTabMenu.h
index f305c44c885..84f424abb3c 100644
--- a/src/cascadia/TerminalSettingsEditor/NewTabMenu.h
+++ b/src/cascadia/TerminalSettingsEditor/NewTabMenu.h
@@ -4,11 +4,26 @@
 #pragma once
 
 #include "NewTabMenu.g.h"
+#include "NavigateToNewTabMenuArgs.g.h"
 #include "NewTabMenuEntryTemplateSelector.g.h"
 #include "Utils.h"
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
+    struct NavigateToNewTabMenuArgs : NavigateToNewTabMenuArgsT<NavigateToNewTabMenuArgs>
+    {
+        NavigateToNewTabMenuArgs(const Editor::NewTabMenuViewModel& vm, const hstring& elementToFocus = {}) :
+            _ViewModel(vm),
+            _ElementToFocus(elementToFocus) {}
+
+        Editor::NewTabMenuViewModel ViewModel() const noexcept { return _ViewModel; }
+        hstring ElementToFocus() const noexcept { return _ElementToFocus; }
+
+    private:
+        Editor::NewTabMenuViewModel _ViewModel{ nullptr };
+        hstring _ElementToFocus{};
+    };
+
     struct NewTabMenu : public HasScrollViewer<NewTabMenu>, NewTabMenuT<NewTabMenu>
     {
     public:
diff --git a/src/cascadia/TerminalSettingsEditor/NewTabMenu.idl b/src/cascadia/TerminalSettingsEditor/NewTabMenu.idl
index 11de472596c..ced50368625 100644
--- a/src/cascadia/TerminalSettingsEditor/NewTabMenu.idl
+++ b/src/cascadia/TerminalSettingsEditor/NewTabMenu.idl
@@ -5,6 +5,12 @@ import "NewTabMenuViewModel.idl";
 
 namespace Microsoft.Terminal.Settings.Editor
 {
+    runtimeclass NavigateToNewTabMenuArgs
+    {
+        NewTabMenuViewModel ViewModel { get; };
+        String ElementToFocus { get; };
+    }
+
     [default_interface] runtimeclass NewTabMenu : Windows.UI.Xaml.Controls.Page
     {
         NewTabMenu();
diff --git a/src/cascadia/TerminalSettingsEditor/ProfileViewModel.h b/src/cascadia/TerminalSettingsEditor/ProfileViewModel.h
index efafedf5cf4..c4e70ec8a1f 100644
--- a/src/cascadia/TerminalSettingsEditor/ProfileViewModel.h
+++ b/src/cascadia/TerminalSettingsEditor/ProfileViewModel.h
@@ -15,16 +15,19 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     struct NavigateToProfileArgs : NavigateToProfileArgsT<NavigateToProfileArgs>
     {
     public:
-        NavigateToProfileArgs(ProfileViewModel profile, Editor::IHostedInWindow windowRoot) :
+        NavigateToProfileArgs(ProfileViewModel profile, Editor::IHostedInWindow windowRoot, const hstring& elementToFocus = {}) :
             _Profile(profile),
-            _WindowRoot(windowRoot) {}
+            _WindowRoot(windowRoot),
+            _ElementToFocus(elementToFocus) {}
 
         Editor::IHostedInWindow WindowRoot() const noexcept { return _WindowRoot; }
         Editor::ProfileViewModel Profile() const noexcept { return _Profile; }
+        hstring ElementToFocus() const noexcept { return _ElementToFocus; }
 
     private:
         Editor::IHostedInWindow _WindowRoot;
         Editor::ProfileViewModel _Profile{ nullptr };
+        hstring _ElementToFocus{};
     };
 
     struct BellSoundViewModel : BellSoundViewModelT<BellSoundViewModel>, ViewModelHelper<BellSoundViewModel>
diff --git a/src/cascadia/TerminalSettingsEditor/ProfileViewModel.idl b/src/cascadia/TerminalSettingsEditor/ProfileViewModel.idl
index d43b75aecc6..c3610771642 100644
--- a/src/cascadia/TerminalSettingsEditor/ProfileViewModel.idl
+++ b/src/cascadia/TerminalSettingsEditor/ProfileViewModel.idl
@@ -18,6 +18,7 @@ namespace Microsoft.Terminal.Settings.Editor
     {
         ProfileViewModel Profile { get; };
         IHostedInWindow WindowRoot { get; };
+        String ElementToFocus { get; };
     }
 
     runtimeclass DeleteProfileEventArgs
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.cpp b/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.cpp
index 64bdecd1d48..41302472522 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.cpp
@@ -29,6 +29,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         const auto args = e.Parameter().as<Editor::NavigateToProfileArgs>();
         _Profile = args.Profile();
         _windowRoot = args.WindowRoot();
+        BringIntoViewWhenLoaded(args.ElementToFocus());
 
         TraceLoggingWrite(
             g_hTerminalSettingsEditorProvider,
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.cpp b/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.cpp
index c338925ee3a..7fb4eee5d4b 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.cpp
@@ -26,6 +26,9 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         _Profile = args.Profile();
         _windowRoot = args.WindowRoot();
 
+        // TODO CARLOS: how to handle Appearances object
+        BringIntoViewWhenLoaded(args.ElementToFocus());
+
         if (!_previewControl)
         {
             const auto settings = winrt::get_self<implementation::ProfileViewModel>(_Profile)->TermSettings();
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.h b/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.h
index 4e52248f437..5da6d192f97 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.h
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.h
@@ -5,11 +5,10 @@
 
 #include <ThrottledFunc.h>
 
+#include "Profiles_Appearance.g.h"
 #include "PreviewConnection.h"
 #include "Utils.h"
 
-#include "Profiles_Appearance.g.h"
-
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
     struct Profiles_Appearance : public HasScrollViewer<Profiles_Appearance>, Profiles_AppearanceT<Profiles_Appearance>
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.xaml b/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.xaml
index ea991e3b23d..8520611dbfe 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.xaml
@@ -85,12 +85,12 @@
                            Style="{StaticResource TextBlockSubHeaderStyle}" />
 
                 <!--  Opacity  -->
-                <local:SettingContainer x:Name="OpacityContainer"
+                <local:SettingContainer x:Name="Opacity"
                                         x:Uid="Profile_Opacity"
                                         ClearSettingValue="{x:Bind Profile.ClearOpacity}"
                                         HasSettingValue="{x:Bind Profile.HasOpacity, Mode=OneWay}"
                                         SettingOverrideSource="{x:Bind Profile.OpacityOverrideSource, Mode=OneWay}">
-                    <StackPanel x:Name="OpacityControl">
+                    <StackPanel>
                         <Grid Style="{StaticResource CustomSliderControlGridStyle}">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="*" />
@@ -108,11 +108,11 @@
 
                 <!--  Use Acrylic  -->
                 <local:SettingContainer x:Uid="Profile_UseAcrylic"
+                                        x:Name="UseAcrylic"
                                         ClearSettingValue="{x:Bind Profile.ClearUseAcrylic}"
                                         HasSettingValue="{x:Bind Profile.HasUseAcrylic, Mode=OneWay}"
                                         SettingOverrideSource="{x:Bind Profile.UseAcrylicOverrideSource, Mode=OneWay}">
-                    <ToggleSwitch x:Name="UseAcrylicToggleSwitch"
-                                  IsOn="{x:Bind Profile.UseAcrylic, Mode=TwoWay}"
+                    <ToggleSwitch IsOn="{x:Bind Profile.UseAcrylic, Mode=TwoWay}"
                                   Style="{StaticResource ToggleSwitchInExpanderStyle}" />
                 </local:SettingContainer>
 
@@ -125,6 +125,7 @@
 
                 <!--  Padding  -->
                 <local:SettingContainer x:Uid="Profile_Padding"
+                                        x:Name="Padding"
                                         ClearSettingValue="{x:Bind Profile.ClearPadding}"
                                         CurrentValue="{x:Bind Profile.Padding, Mode=OneWay}"
                                         HasSettingValue="{x:Bind Profile.HasPadding, Mode=OneWay}"
@@ -192,6 +193,7 @@
 
                 <!--  Scrollbar Visibility  -->
                 <local:SettingContainer x:Uid="Profile_ScrollbarVisibility"
+                                        x:Name="ScrollbarVisibility"
                                         ClearSettingValue="{x:Bind Profile.ClearScrollState}"
                                         HasSettingValue="{x:Bind Profile.HasScrollState, Mode=OneWay}"
                                         SettingOverrideSource="{x:Bind Profile.ScrollStateOverrideSource, Mode=OneWay}">
@@ -207,7 +209,10 @@
                             Visibility="{x:Bind Profile.EditableUnfocusedAppearance, Mode=OneWay}">
                     <TextBlock x:Uid="Profile_UnfocusedAppearanceTextBlock"
                                Style="{StaticResource TextBlockSubtitleStyle}" />
+
+                    <!--Create Unfocused Appearance-->
                     <Button x:Uid="Profile_CreateUnfocusedAppearanceButton"
+                            x:Name="CreateUnfocusedAppearance"
                             Margin="8,0,0,0"
                             VerticalAlignment="Bottom"
                             Click="CreateUnfocusedAppearance_Click"
@@ -224,7 +229,10 @@
                             </StackPanel>
                         </Button.Content>
                     </Button>
+
+                    <!--Delete Unfocused Appearance-->
                     <Button x:Uid="Profile_DeleteUnfocusedAppearanceButton"
+                            x:Name="DeleteUnfocusedAppearance"
                             Margin="8,0,0,0"
                             VerticalAlignment="Bottom"
                             Click="DeleteUnfocusedAppearance_Click"
@@ -241,6 +249,8 @@
                         </Button.Content>
                     </Button>
                 </StackPanel>
+
+                <!--Unfocused Appearance-->
                 <local:Appearances Appearance="{x:Bind Profile.UnfocusedAppearance, Mode=OneWay}"
                                    SourceProfile="{x:Bind Profile, Mode=OneWay}"
                                    Visibility="{x:Bind Profile.ShowUnfocusedAppearance, Mode=OneWay}"
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Base.cpp b/src/cascadia/TerminalSettingsEditor/Profiles_Base.cpp
index 774ecbb34de..5a4fdc65400 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Base.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Base.cpp
@@ -33,6 +33,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         const auto args = e.Parameter().as<Editor::NavigateToProfileArgs>();
         _Profile = args.Profile();
         _windowRoot = args.WindowRoot();
+        BringIntoViewWhenLoaded(args.ElementToFocus());
 
         // Check the use parent directory box if the starting directory is empty
         if (_Profile.StartingDirectory().empty())
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml b/src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml
index 813cada4c54..4737c045e42 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml
@@ -41,6 +41,7 @@
                 so the name will always be overridden.
             -->
             <local:SettingContainer x:Uid="Profile_Name"
+                                    x:Name="Name"
                                     CurrentValue="{x:Bind Profile.Name, Mode=OneWay}"
                                     Style="{StaticResource ExpanderSettingContainerStyle}"
                                     Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(Profile.IsBaseLayer), Mode=OneWay}">
@@ -49,7 +50,7 @@
             </local:SettingContainer>
 
             <!--  Commandline  -->
-            <local:SettingContainer x:Name="CommandlineContainer"
+            <local:SettingContainer x:Name="Commandline"
                                     x:Uid="Profile_Commandline"
                                     ClearSettingValue="{x:Bind Profile.ClearCommandline}"
                                     CurrentValue="{x:Bind Profile.Commandline, Mode=OneWay}"
@@ -70,7 +71,7 @@
             </local:SettingContainer>
 
             <!--  Starting Directory  -->
-            <local:SettingContainer x:Name="StartingDirectoryContainer"
+            <local:SettingContainer x:Name="StartingDirectory"
                                     x:Uid="Profile_StartingDirectory"
                                     ClearSettingValue="{x:Bind Profile.ClearStartingDirectory}"
                                     CurrentValue="{x:Bind Profile.CurrentStartingDirectoryPreview, Mode=OneWay}"
@@ -100,6 +101,7 @@
 
             <!--  Icon  -->
             <local:SettingContainer x:Uid="Profile_Icon"
+                                    x:Name="Icon"
                                     ClearSettingValue="{x:Bind Profile.ClearIcon}"
                                     CurrentValueAccessibleName="{x:Bind Profile.LocalizedIcon, Mode=OneWay}"
                                     HasSettingValue="{x:Bind Profile.HasIcon, Mode=OneWay}"
@@ -199,6 +201,7 @@
 
             <!--  Tab Title  -->
             <local:SettingContainer x:Uid="Profile_TabTitle"
+                                    x:Name="TabTitle"
                                     ClearSettingValue="{x:Bind Profile.ClearTabTitle}"
                                     CurrentValue="{x:Bind Profile.TabTitlePreview, Mode=OneWay}"
                                     HasSettingValue="{x:Bind Profile.HasTabTitle, Mode=OneWay}"
@@ -226,6 +229,7 @@
 
             <!--  Elevate  -->
             <local:SettingContainer x:Uid="Profile_Elevate"
+                                    x:Name="Elevate"
                                     ClearSettingValue="{x:Bind Profile.ClearElevate}"
                                     HasSettingValue="{x:Bind Profile.HasElevate, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Profile.ElevateOverrideSource, Mode=OneWay}">
@@ -235,6 +239,7 @@
 
             <!--  Hidden  -->
             <local:SettingContainer x:Uid="Profile_Hidden"
+                                    x:Name="Hidden"
                                     Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(Profile.IsBaseLayer), Mode=OneWay}">
                 <ToggleSwitch IsOn="{x:Bind Profile.Hidden, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Terminal.cpp b/src/cascadia/TerminalSettingsEditor/Profiles_Terminal.cpp
index fd8899dff1b..467945b65a8 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Terminal.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Terminal.cpp
@@ -21,7 +21,9 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void Profiles_Terminal::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        _Profile = e.Parameter().as<Editor::ProfileViewModel>();
+        const auto args = e.Parameter().as<Editor::NavigateToProfileArgs>();
+        _Profile = args.Profile();
+        BringIntoViewWhenLoaded(args.ElementToFocus());
 
         TraceLoggingWrite(
             g_hTerminalSettingsEditorProvider,
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Terminal.xaml b/src/cascadia/TerminalSettingsEditor/Profiles_Terminal.xaml
index dfe5954d4fe..c70519de6e3 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Terminal.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Terminal.xaml
@@ -33,6 +33,7 @@
 
             <!--  Suppress Application Title  -->
             <local:SettingContainer x:Uid="Profile_SuppressApplicationTitle"
+                                    x:Name="SuppressApplicationTitle"
                                     ClearSettingValue="{x:Bind Profile.ClearSuppressApplicationTitle}"
                                     HasSettingValue="{x:Bind Profile.HasSuppressApplicationTitle, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Profile.SuppressApplicationTitleOverrideSource, Mode=OneWay}">
@@ -42,6 +43,7 @@
 
             <!--  Force VT Input  -->
             <local:SettingContainer x:Uid="Profile_ForceVTInput"
+                                    x:Name="ForceVTInput"
                                     ClearSettingValue="{x:Bind Profile.ClearForceVTInput}"
                                     HasSettingValue="{x:Bind Profile.HasForceVTInput, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Profile.ForceVTInputOverrideSource, Mode=OneWay}">
@@ -51,6 +53,7 @@
 
             <!--  Allow VT Checksum Report  -->
             <local:SettingContainer x:Uid="Profile_AllowVtChecksumReport"
+                                    x:Name="AllowVtChecksumReport"
                                     ClearSettingValue="{x:Bind Profile.ClearAllowVtChecksumReport}"
                                     HasSettingValue="{x:Bind Profile.HasAllowVtChecksumReport, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Profile.AllowVtChecksumReportOverrideSource, Mode=OneWay}">
@@ -60,6 +63,7 @@
 
             <!--  Allow VT Clipboard Writing  -->
             <local:SettingContainer x:Uid="Profile_AllowVtClipboardWrite"
+                                    x:Name="AllowVtClipboardWrite"
                                     ClearSettingValue="{x:Bind Profile.ClearAllowVtClipboardWrite}"
                                     HasSettingValue="{x:Bind Profile.HasAllowVtClipboardWrite, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Profile.AllowVtClipboardWriteOverrideSource, Mode=OneWay}">
@@ -69,6 +73,7 @@
 
             <!--  Answerback Message  -->
             <local:SettingContainer x:Uid="Profile_AnswerbackMessage"
+                                    x:Name="AnswerbackMessage"
                                     ClearSettingValue="{x:Bind Profile.ClearAnswerbackMessage}"
                                     CurrentValue="{x:Bind Profile.AnswerbackMessagePreview, Mode=OneWay}"
                                     HasSettingValue="{x:Bind Profile.HasAnswerbackMessage, Mode=OneWay}"
diff --git a/src/cascadia/TerminalSettingsEditor/Rendering.cpp b/src/cascadia/TerminalSettingsEditor/Rendering.cpp
index 836d63ca203..f7271534e79 100644
--- a/src/cascadia/TerminalSettingsEditor/Rendering.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Rendering.cpp
@@ -16,7 +16,9 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void Rendering::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        _ViewModel = e.Parameter().as<Editor::RenderingViewModel>();
+        const auto args = e.Parameter().as<Editor::NavigateToRenderingArgs>();
+        _ViewModel = args.ViewModel();
+        BringIntoViewWhenLoaded(args.ElementToFocus());
 
         TraceLoggingWrite(
             g_hTerminalSettingsEditorProvider,
diff --git a/src/cascadia/TerminalSettingsEditor/Rendering.h b/src/cascadia/TerminalSettingsEditor/Rendering.h
index dd202b1c7e8..bda0034c6bb 100644
--- a/src/cascadia/TerminalSettingsEditor/Rendering.h
+++ b/src/cascadia/TerminalSettingsEditor/Rendering.h
@@ -4,10 +4,25 @@
 #pragma once
 
 #include "Rendering.g.h"
+#include "NavigateToRenderingArgs.g.h"
 #include "Utils.h"
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
+    struct NavigateToRenderingArgs : NavigateToRenderingArgsT<NavigateToRenderingArgs>
+    {
+        NavigateToRenderingArgs(const Editor::RenderingViewModel& vm, const hstring& elementToFocus = {}) :
+            _ViewModel(vm),
+            _ElementToFocus(elementToFocus) {}
+
+        Editor::RenderingViewModel ViewModel() const noexcept { return _ViewModel; }
+        hstring ElementToFocus() const noexcept { return _ElementToFocus; }
+
+    private:
+        Editor::RenderingViewModel _ViewModel{ nullptr };
+        hstring _ElementToFocus{};
+    };
+
     struct Rendering : public HasScrollViewer<Rendering>, RenderingT<Rendering>
     {
         Rendering();
diff --git a/src/cascadia/TerminalSettingsEditor/Rendering.idl b/src/cascadia/TerminalSettingsEditor/Rendering.idl
index 21dc7d8023f..3b59b6de6f5 100644
--- a/src/cascadia/TerminalSettingsEditor/Rendering.idl
+++ b/src/cascadia/TerminalSettingsEditor/Rendering.idl
@@ -5,6 +5,12 @@ import "RenderingViewModel.idl";
 
 namespace Microsoft.Terminal.Settings.Editor
 {
+    runtimeclass NavigateToRenderingArgs
+    {
+        RenderingViewModel ViewModel { get; };
+        String ElementToFocus { get; };
+    }
+
     [default_interface] runtimeclass Rendering : Windows.UI.Xaml.Controls.Page
     {
         Rendering();
diff --git a/src/cascadia/TerminalSettingsEditor/Rendering.xaml b/src/cascadia/TerminalSettingsEditor/Rendering.xaml
index 4b9534167d0..7df8c136d0c 100644
--- a/src/cascadia/TerminalSettingsEditor/Rendering.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Rendering.xaml
@@ -24,7 +24,8 @@
     </Page.Resources>
 
     <StackPanel Style="{StaticResource SettingsStackStyle}">
-        <local:SettingContainer x:Uid="Globals_GraphicsAPI">
+        <local:SettingContainer x:Uid="Globals_GraphicsAPI"
+                                x:Name="GraphicsAPI">
             <ComboBox AutomationProperties.AccessibilityView="Content"
                       ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                       ItemsSource="{x:Bind ViewModel.GraphicsAPIList}"
@@ -32,12 +33,14 @@
                       Style="{StaticResource ComboBoxSettingStyle}" />
         </local:SettingContainer>
 
-        <local:SettingContainer x:Uid="Globals_DisablePartialInvalidation">
+        <local:SettingContainer x:Uid="Globals_DisablePartialInvalidation"
+                                x:Name="DisablePartialInvalidation">
             <ToggleSwitch IsOn="{x:Bind ViewModel.DisablePartialInvalidation, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
-        <local:SettingContainer x:Uid="Globals_SoftwareRendering">
+        <local:SettingContainer x:Uid="Globals_SoftwareRendering"
+                                x:Name="SoftwareRendering">
             <ToggleSwitch IsOn="{x:Bind ViewModel.SoftwareRendering, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
diff --git a/src/cascadia/TerminalSettingsEditor/SearchMetadata.cpp b/src/cascadia/TerminalSettingsEditor/SearchMetadata.cpp
new file mode 100644
index 00000000000..6bbad407163
--- /dev/null
+++ b/src/cascadia/TerminalSettingsEditor/SearchMetadata.cpp
@@ -0,0 +1,45 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "pch.h"
+#include "SearchMetadata.h"
+#include "SearchMetadata.g.cpp"
+#include "LibraryResources.h"
+
+using namespace winrt::Windows::UI::Xaml;
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
+{
+    DependencyProperty SearchMetadata::_ParentPageProperty{ nullptr };
+    DependencyProperty SearchMetadata::_SettingNameProperty{ nullptr };
+
+    SearchMetadata::SearchMetadata()
+    {
+        _InitializeProperties();
+    }
+
+    void SearchMetadata::_InitializeProperties()
+    {
+        // Initialize any dependency properties here.
+        // This performs a lazy load on these properties, instead of
+        // initializing them when the DLL loads.
+        if (!_ParentPageProperty)
+        {
+            _ParentPageProperty =
+                DependencyProperty::RegisterAttached(
+                    L"ParentPage",
+                    xaml_typename<winrt::Windows::UI::Xaml::Interop::TypeName>(),
+                    xaml_typename<Editor::SearchMetadata>(),
+                    PropertyMetadata{ nullptr });
+        }
+        if (!_SettingNameProperty)
+        {
+            _SettingNameProperty =
+                DependencyProperty::RegisterAttached(
+                    L"SettingName",
+                    xaml_typename<hstring>(),
+                    xaml_typename<Editor::SearchMetadata>(),
+                    PropertyMetadata{ box_value(L"") });
+        }
+    }
+}
diff --git a/src/cascadia/TerminalSettingsEditor/SearchMetadata.h b/src/cascadia/TerminalSettingsEditor/SearchMetadata.h
new file mode 100644
index 00000000000..aa03f7cb77a
--- /dev/null
+++ b/src/cascadia/TerminalSettingsEditor/SearchMetadata.h
@@ -0,0 +1,40 @@
+/*++
+Copyright (c) Microsoft Corporation
+Licensed under the MIT license.
+
+Module Name:
+- SearchMetadata
+
+Abstract:
+- A custom XAML attached property (like AutomationProperties)
+  to hold metadata for search in the settings editor.
+
+Author(s):
+- Carlos Zamora - October 2025
+
+--*/
+
+#pragma once
+
+#include "SearchMetadata.g.h"
+#include "Utils.h"
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
+{
+    struct SearchMetadata : SearchMetadataT<SearchMetadata>
+    {
+    public:
+        SearchMetadata();
+
+        ATTACHED_DEPENDENCY_PROPERTY(winrt::Windows::UI::Xaml::Interop::TypeName, ParentPage);
+        ATTACHED_DEPENDENCY_PROPERTY(winrt::hstring, SettingName);
+
+    private:
+        static void _InitializeProperties();
+    };
+}
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::factory_implementation
+{
+    BASIC_FACTORY(SearchMetadata);
+}
diff --git a/src/cascadia/TerminalSettingsEditor/SearchMetadata.idl b/src/cascadia/TerminalSettingsEditor/SearchMetadata.idl
new file mode 100644
index 00000000000..b5e66a8046f
--- /dev/null
+++ b/src/cascadia/TerminalSettingsEditor/SearchMetadata.idl
@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+namespace Microsoft.Terminal.Settings.Editor
+{
+    [default_interface]
+    runtimeclass SearchMetadata : Windows.UI.Xaml.DependencyObject
+    {
+        SearchMetadata();
+
+        static Windows.UI.Xaml.DependencyProperty ParentPageProperty { get; };
+        static Windows.UI.Xaml.Interop.TypeName GetParentPage(Windows.UI.Xaml.DependencyObject target);
+        static void SetParentPage(Windows.UI.Xaml.DependencyObject target, Windows.UI.Xaml.Interop.TypeName val);
+
+        static Windows.UI.Xaml.DependencyProperty SettingNameProperty { get; };
+        static String GetSettingName(Windows.UI.Xaml.DependencyObject target);
+        static void SetSettingName(Windows.UI.Xaml.DependencyObject target, String val);
+    }
+}
diff --git a/src/cascadia/TerminalSettingsEditor/Utils.h b/src/cascadia/TerminalSettingsEditor/Utils.h
index 37fe4a81ec8..6ac8a6b9bdf 100644
--- a/src/cascadia/TerminalSettingsEditor/Utils.h
+++ b/src/cascadia/TerminalSettingsEditor/Utils.h
@@ -116,4 +116,34 @@ struct HasScrollViewer
             DismissAllPopups(uielem.XamlRoot());
         }
     }
+
+    // Finds the element with the given name and brings it into view
+    void BringIntoViewWhenLoaded(const winrt::hstring elementName)
+    {
+        if (elementName.empty())
+        {
+            return;
+        }
+
+        auto* pThis = static_cast<T*>(this);
+        _loadedRevoker = pThis->Loaded(winrt::auto_revoke, [weakThis{ pThis->get_weak() }, elementName](auto&&, auto&&) {
+            if (auto page{ weakThis.get() })
+            {
+                if (const auto& elementToFocus{ page->FindName(elementName).try_as<winrt::Microsoft::Terminal::Settings::Editor::SettingContainer>() })
+                {
+                    // We need to wait for the page to be loaded
+                    // or else the call to StartBringIntoView()
+                    // will end up doing nothing
+                    elementToFocus.StartBringIntoView();
+
+                    // TODO CARLOS: ensure this works in all scenarios (easiest to test when navigating to page by keyboard)
+                    elementToFocus.Focus(winrt::Windows::UI::Xaml::FocusState::Programmatic);
+                }
+                page->_loadedRevoker.revoke();
+            }
+        });
+    }
+
+protected:
+    winrt::Windows::UI::Xaml::FrameworkElement::Loaded_revoker _loadedRevoker;
 };
diff --git a/src/cascadia/inc/cppwinrt_utils.h b/src/cascadia/inc/cppwinrt_utils.h
index e7a85278185..985d4995979 100644
--- a/src/cascadia/inc/cppwinrt_utils.h
+++ b/src/cascadia/inc/cppwinrt_utils.h
@@ -253,6 +253,39 @@ private:
     static winrt::Windows::UI::Xaml::DependencyProperty _##name##Property;
 #endif
 
+#ifndef ATTACHED_DEPENDENCY_PROPERTY
+#define ATTACHED_DEPENDENCY_PROPERTY(type, name)                                                       \
+public:                                                                                                \
+    static winrt::Windows::UI::Xaml::DependencyProperty name##Property()                               \
+    {                                                                                                  \
+        return _##name##Property;                                                                      \
+    }                                                                                                  \
+    static type Get##name(winrt::Windows::UI::Xaml::DependencyObject const& target)                    \
+    {                                                                                                  \
+        auto&& temp{ target.GetValue(_##name##Property) };                                             \
+        if (temp)                                                                                      \
+        {                                                                                              \
+            return winrt::unbox_value<type>(temp);                                                     \
+        }                                                                                              \
+                                                                                                       \
+        if constexpr (std::is_base_of_v<winrt::Windows::Foundation::IInspectable, type>)               \
+        {                                                                                              \
+            return { nullptr };                                                                        \
+        }                                                                                              \
+        else                                                                                           \
+        {                                                                                              \
+            return {};                                                                                 \
+        }                                                                                              \
+    }                                                                                                  \
+    static void Set##name(winrt::Windows::UI::Xaml::DependencyObject const& target, const type& value) \
+    {                                                                                                  \
+        target.SetValue(_##name##Property, winrt::box_value(value));                                   \
+    }                                                                                                  \
+                                                                                                       \
+private:                                                                                               \
+    static winrt::Windows::UI::Xaml::DependencyProperty _##name##Property;
+#endif
+
 // Use this macro for quickly defining the factory_implementation part of a
 // class. CppWinrt requires these for the compiler, but more often than not,
 // they require no customization. See

From 1b8c99dff87c21c2c4d86991d4de41c68aeae310 Mon Sep 17 00:00:00 2001
From: Carlos Zamora <cazamor@microsoft.com>
Date: Wed, 15 Oct 2025 15:42:43 -0700
Subject: [PATCH 02/25] Load build time index for search

- Adds referential XAML names to components of interest.
- Adds a script that generates the build time entries to be loaded
- Invokes the script in Editor.vcxproj
---
 .../TerminalSettingsEditor/AddProfile.xaml    |   3 +-
 .../TerminalSettingsEditor/MainPage.cpp       |   1 +
 ...Microsoft.Terminal.Settings.Editor.vcxproj |   8 +
 .../TerminalSettingsEditor/NewTabMenu.xaml    |   7 +
 .../Profiles_Advanced.xaml                    |  14 ++
 .../Profiles_Base_Orphaned.xaml               |   9 +-
 tools/GenerateSettingsIndex.ps1               | 159 ++++++++++++++++++
 7 files changed, 197 insertions(+), 4 deletions(-)
 create mode 100644 tools/GenerateSettingsIndex.ps1

diff --git a/src/cascadia/TerminalSettingsEditor/AddProfile.xaml b/src/cascadia/TerminalSettingsEditor/AddProfile.xaml
index 1db1bbd4d3b..323b7f959d3 100644
--- a/src/cascadia/TerminalSettingsEditor/AddProfile.xaml
+++ b/src/cascadia/TerminalSettingsEditor/AddProfile.xaml
@@ -37,7 +37,8 @@
             </Button>
         </Border>
         <StackPanel Margin="{StaticResource StandardControlMargin}">
-            <local:SettingContainer x:Uid="AddProfile_Duplicate">
+            <local:SettingContainer x:Uid="AddProfile_Duplicate"
+                                    x:Name="DuplicateProfile">
                 <ComboBox x:Name="Profiles"
                           AutomationProperties.AccessibilityView="Content"
                           ItemsSource="{x:Bind State.Settings.AllProfiles, Mode=OneWay}"
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
index f1abb77e6e3..3846661a265 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
@@ -22,6 +22,7 @@
 #include "NewTabMenu.h"
 #include "..\types\inc\utils.hpp"
 #include <..\WinRTUtils\inc\Utils.h>
+#include "GeneratedSettingsIndex.g.h"
 
 #include <LibraryResources.h>
 #include <dwmapi.h>
diff --git a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj
index 17ee5591bb3..b91a24b7519 100644
--- a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj
+++ b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj
@@ -165,6 +165,7 @@
     </ClInclude>
     <ClInclude Include="Utils.h" />
     <ClInclude Include="PreviewConnection.h" />
+    <ClInclude Include="$(GeneratedFilesDir)GeneratedSettingsIndex.g.h" />
   </ItemGroup>
   <!-- ========================= XAML files ======================== -->
   <ItemGroup>
@@ -363,6 +364,7 @@
     <ClCompile Include="PreviewConnection.cpp">
       <DependentUpon>PreviewConnection.h</DependentUpon>
     </ClCompile>
+    <ClCompile Include="$(GeneratedFilesDir)GeneratedSettingsIndex.g.cpp" />
   </ItemGroup>
   <!-- ========================= idl Files ======================== -->
   <ItemGroup>
@@ -534,4 +536,10 @@
   <!-- This -must- go after cppwinrt.build.post.props because that includes many VS-provided props including appcontainer.common.props, which stomps on what cppwinrt.targets did. -->
   <Import Project="$(OpenConsoleDir)src\common.nugetversions.targets" />
   <Import Project="$(SolutionDir)build\rules\CollectWildcardResources.targets" />
+  <Target Name="GenerateSettingsIndex"
+          Inputs="@(Page);$(OpenConsoleDir)tools\GenerateSettingsIndex.ps1"
+          Outputs="$(GeneratedFilesDir)GeneratedSettingsIndex.g.h;$(GeneratedFilesDir)GeneratedSettingsIndex.g.cpp"
+          BeforeTargets="ClCompile">
+    <Exec Command="pwsh.exe -NoProfile -ExecutionPolicy Unrestricted &quot;$(OpenConsoleDir)tools\GenerateSettingsIndex.ps1&quot; -SourceDir &quot;$(MSBuildThisFileDirectory).&quot; -OutputDir &quot;$(MSBuildThisFileDirectory)$(GeneratedFilesDir).&quot;" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/cascadia/TerminalSettingsEditor/NewTabMenu.xaml b/src/cascadia/TerminalSettingsEditor/NewTabMenu.xaml
index 70285aaccca..7066e42a542 100644
--- a/src/cascadia/TerminalSettingsEditor/NewTabMenu.xaml
+++ b/src/cascadia/TerminalSettingsEditor/NewTabMenu.xaml
@@ -325,6 +325,7 @@
 
             <!--  Name  -->
             <local:SettingContainer x:Uid="NewTabMenu_CurrentFolderName"
+                                    x:Name="CurrentFolderName"
                                     Grid.Row="0"
                                     CurrentValue="{x:Bind ViewModel.CurrentFolderName, Mode=OneWay}"
                                     Style="{StaticResource ExpanderSettingContainerStyle}">
@@ -334,6 +335,7 @@
 
             <!--  Inlining  -->
             <local:SettingContainer x:Uid="NewTabMenu_CurrentFolderInlining"
+                                    x:Name="CurrentFolderInlining"
                                     Grid.Row="1">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.CurrentFolderInlining, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
@@ -341,6 +343,7 @@
 
             <!--  Allow Empty  -->
             <local:SettingContainer x:Uid="NewTabMenu_CurrentFolderAllowEmpty"
+                                    x:Name="CurrentFolderAllowEmpty"
                                     Grid.Row="2">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.CurrentFolderAllowEmpty, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
@@ -354,6 +357,7 @@
 
             <!--  Add Profile  -->
             <local:SettingContainer x:Uid="NewTabMenu_AddProfile"
+                                    x:Name="AddProfile"
                                     FontIconGlyph="&#xE756;"
                                     Style="{StaticResource SettingContainerWithIcon}">
 
@@ -403,6 +407,7 @@
 
             <!--  Add Separator  -->
             <local:SettingContainer x:Uid="NewTabMenu_AddSeparator"
+                                    x:Name="AddSeparator"
                                     FontIconGlyph="&#xE76f;"
                                     Style="{StaticResource SettingContainerWithIcon}">
                 <Button x:Name="AddSeparatorButton"
@@ -419,6 +424,7 @@
 
             <!--  Add Folder  -->
             <local:SettingContainer x:Uid="NewTabMenu_AddFolder"
+                                    x:Name="AddFolder"
                                     FontIconGlyph="&#xF12B;"
                                     Style="{StaticResource SettingContainerWithIcon}">
                 <StackPanel Orientation="Horizontal"
@@ -445,6 +451,7 @@
 
             <!--  Add Match Profiles  -->
             <local:SettingContainer x:Uid="NewTabMenu_AddMatchProfiles"
+                                    x:Name="AddMatchProfiles"
                                     FontIconGlyph="&#xE748;"
                                     Style="{StaticResource ExpanderSettingContainerStyleWithIcon}">
                 <StackPanel Spacing="8">
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.xaml b/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.xaml
index 8f4d3ae7c06..7eac588f055 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.xaml
@@ -38,6 +38,7 @@
                     Style="{StaticResource SettingsStackStyle}">
             <!--  Antialiasing Mode  -->
             <local:SettingContainer x:Uid="Profile_AntialiasingMode"
+                                    x:Name="AntialiasingMode"
                                     ClearSettingValue="{x:Bind Profile.ClearAntialiasingMode}"
                                     HasSettingValue="{x:Bind Profile.HasAntialiasingMode, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Profile.AntialiasingModeOverrideSource, Mode=OneWay}">
@@ -50,6 +51,7 @@
 
             <!--  AltGr Aliasing  -->
             <local:SettingContainer x:Uid="Profile_AltGrAliasing"
+                                    x:Name="AltGrAliasing"
                                     ClearSettingValue="{x:Bind Profile.ClearAltGrAliasing}"
                                     HasSettingValue="{x:Bind Profile.HasAltGrAliasing, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Profile.AltGrAliasingOverrideSource, Mode=OneWay}">
@@ -59,6 +61,7 @@
 
             <!--  Snap On Input  -->
             <local:SettingContainer x:Uid="Profile_SnapOnInput"
+                                    x:Name="SnapOnInput"
                                     ClearSettingValue="{x:Bind Profile.ClearSnapOnInput}"
                                     HasSettingValue="{x:Bind Profile.HasSnapOnInput, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Profile.SnapOnInputOverrideSource, Mode=OneWay}">
@@ -68,6 +71,7 @@
 
             <!--  History Size  -->
             <local:SettingContainer x:Uid="Profile_HistorySize"
+                                    x:Name="HistorySize"
                                     ClearSettingValue="{x:Bind Profile.ClearHistorySize}"
                                     HasSettingValue="{x:Bind Profile.HasHistorySize, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Profile.HistorySizeOverrideSource, Mode=OneWay}">
@@ -81,6 +85,7 @@
 
             <!--  Close On Exit  -->
             <local:SettingContainer x:Uid="Profile_CloseOnExit"
+                                    x:Name="CloseOnExit"
                                     ClearSettingValue="{x:Bind Profile.ClearCloseOnExit}"
                                     HasSettingValue="{x:Bind Profile.HasCloseOnExit, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Profile.CloseOnExitOverrideSource, Mode=OneWay}">
@@ -93,6 +98,7 @@
 
             <!--  Bell Style  -->
             <local:SettingContainer x:Uid="Profile_BellStyle"
+                                    x:Name="BellStyle"
                                     ClearSettingValue="{x:Bind Profile.ClearBellStyle}"
                                     CurrentValue="{x:Bind Profile.BellStylePreview, Mode=OneWay}"
                                     HasSettingValue="{x:Bind Profile.HasBellStyle, Mode=OneWay}"
@@ -110,6 +116,7 @@
 
             <!--  Bell Sound  -->
             <local:SettingContainer x:Uid="Profile_BellSound"
+                                    x:Name="BellSound"
                                     ClearSettingValue="{x:Bind Profile.ClearBellSound}"
                                     CurrentValue="{x:Bind Profile.BellSoundPreview, Mode=OneWay}"
                                     HasSettingValue="{x:Bind Profile.HasBellSound, Mode=OneWay}"
@@ -191,6 +198,7 @@
 
             <!--  RightClickContextMenu  -->
             <local:SettingContainer x:Uid="Profile_RightClickContextMenu"
+                                    x:Name="RightClickContextMenu"
                                     ClearSettingValue="{x:Bind Profile.ClearRightClickContextMenu}"
                                     HasSettingValue="{x:Bind Profile.HasRightClickContextMenu, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Profile.RightClickContextMenuOverrideSource, Mode=OneWay}">
@@ -200,6 +208,7 @@
 
             <!--  ShowMarks  -->
             <local:SettingContainer x:Uid="Profile_ShowMarks"
+                                    x:Name="ShowMarks"
                                     ClearSettingValue="{x:Bind Profile.ClearShowMarks}"
                                     HasSettingValue="{x:Bind Profile.HasShowMarks, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Profile.ShowMarksOverrideSource, Mode=OneWay}"
@@ -210,6 +219,7 @@
 
             <!--  AutoMarkPrompts  -->
             <local:SettingContainer x:Uid="Profile_AutoMarkPrompts"
+                                    x:Name="AutoMarkPrompts"
                                     ClearSettingValue="{x:Bind Profile.ClearAutoMarkPrompts}"
                                     HasSettingValue="{x:Bind Profile.HasAutoMarkPrompts, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Profile.AutoMarkPromptsOverrideSource, Mode=OneWay}"
@@ -220,6 +230,7 @@
 
             <!--  ReloadEnvVars  -->
             <local:SettingContainer x:Uid="Profile_ReloadEnvVars"
+                                    x:Name="ReloadEnvVars"
                                     ClearSettingValue="{x:Bind Profile.ClearReloadEnvironmentVariables}"
                                     HasSettingValue="{x:Bind Profile.HasReloadEnvironmentVariables, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Profile.ReloadEnvironmentVariablesOverrideSource, Mode=OneWay}">
@@ -229,6 +240,7 @@
 
             <!--  RepositionCursorWithMouse  -->
             <local:SettingContainer x:Uid="Profile_RepositionCursorWithMouse"
+                                    x:Name="RepositionCursorWithMouse"
                                     ClearSettingValue="{x:Bind Profile.ClearRepositionCursorWithMouse}"
                                     HasSettingValue="{x:Bind Profile.HasRepositionCursorWithMouse, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Profile.RepositionCursorWithMouseOverrideSource, Mode=OneWay}"
@@ -239,6 +251,7 @@
 
             <!--  RainbowSuggestions  -->
             <local:SettingContainer x:Uid="Profile_RainbowSuggestions"
+                                    x:Name="RainbowSuggestions"
                                     ClearSettingValue="{x:Bind Profile.ClearRainbowSuggestions}"
                                     HasSettingValue="{x:Bind Profile.HasRainbowSuggestions, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Profile.RainbowSuggestionsOverrideSource, Mode=OneWay}">
@@ -248,6 +261,7 @@
 
             <!--  Path Translation  -->
             <local:SettingContainer x:Uid="Profile_PathTranslationStyle"
+                                    x:Name="PathTranslationStyle"
                                     ClearSettingValue="{x:Bind Profile.ClearPathTranslationStyle}"
                                     HasSettingValue="{x:Bind Profile.HasPathTranslationStyle, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Profile.PathTranslationStyleOverrideSource, Mode=OneWay}">
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Base_Orphaned.xaml b/src/cascadia/TerminalSettingsEditor/Profiles_Base_Orphaned.xaml
index 4259435f03c..44a1c7e1980 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Base_Orphaned.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Base_Orphaned.xaml
@@ -23,7 +23,8 @@
 
     <StackPanel Style="{StaticResource SettingsStackStyle}">
         <!--  Delete Button  -->
-        <local:SettingContainer x:Uid="Profile_Delete_Orphaned">
+        <local:SettingContainer x:Uid="Profile_Delete_Orphaned"
+                                x:Name="DeleteOrphaned">
             <local:SettingContainer.Content>
                 <Button x:Name="DeleteButton"
                         Click="DeleteConfirmation_Click"
@@ -40,7 +41,8 @@
             </local:SettingContainer.Content>
         </local:SettingContainer>
 
-        <local:SettingContainer x:Uid="Profile_Name">
+        <local:SettingContainer x:Uid="Profile_Name"
+                                x:Name="Name">
             <local:SettingContainer.Content>
                 <TextBlock FontFamily="Segoe UI, Segoe Fluent Icons, Segoe MDL2 Assets"
                            Style="{StaticResource SettingsPageItemDescriptionStyle}"
@@ -48,7 +50,8 @@
             </local:SettingContainer.Content>
         </local:SettingContainer>
 
-        <local:SettingContainer x:Uid="Profile_Source_Orphaned">
+        <local:SettingContainer x:Uid="Profile_Source_Orphaned"
+                                x:Name="Source">
             <local:SettingContainer.Content>
                 <TextBlock FontFamily="Segoe UI, Segoe Fluent Icons, Segoe MDL2 Assets"
                            Style="{StaticResource SettingsPageItemDescriptionStyle}"
diff --git a/tools/GenerateSettingsIndex.ps1 b/tools/GenerateSettingsIndex.ps1
new file mode 100644
index 00000000000..2fb21e27814
--- /dev/null
+++ b/tools/GenerateSettingsIndex.ps1
@@ -0,0 +1,159 @@
+<#
+Copyright (c) Microsoft Corporation.
+Licensed under the MIT license.
+.SYNOPSIS
+Scans XAML files for local:SettingContainer entries and generates GeneratedSettingsIndex.g.h / .g.cpp.
+
+.PARAMETER SourceDir
+Directory to scan recursively for .xaml files.
+
+.PARAMETER OutputDir
+Directory to place generated C++ files.
+#>
+[CmdletBinding()]
+param(
+    [Parameter(Mandatory=$true)][string]$SourceDir,
+    [Parameter(Mandatory=$true)][string]$OutputDir
+)
+
+# Prohibited UIDs (exact match, case-insensitive by default)
+$ProhibitedUids = @(
+    'NewTabMenu_AddRemainingProfiles'
+)
+
+# Prohibited XAML files (full paths preferred)
+$ProhibitedXamlFiles = @(
+    # 'd:\projects\terminal\src\cascadia\TerminalSettingsEditor\SomePage.xaml'
+)
+
+if (-not (Test-Path $SourceDir)) { throw "SourceDir not found: $SourceDir" }
+if (-not (Test-Path $OutputDir)) { New-Item -ItemType Directory -Path $OutputDir | Out-Null }
+
+$entries = @()
+
+Get-ChildItem -Path $SourceDir -Recurse -Filter *.xaml | ForEach-Object {
+    $file = $_.FullName
+
+    # Skip whole file if prohibited
+    if ($ProhibitedXamlFiles -contains $file) { return }
+
+    $text = Get-Content -Raw -LiteralPath $file
+
+    # Extract Page x:Class
+    $pageClass = $null
+    if ($text -match '<Page\b[^>]*\bx:Class="([^"]+)"') {
+        $pageClass = $matches[1]
+    } elseif ($text -match '<UserControl\b[^>]*\bx:Class="([^"]+)"') {
+        # Needed for Appearances.xaml
+        $pageClass = $matches[1]
+    } else {
+        return
+    }
+
+    # Convert XAML namespace dots to C++ scope operators
+    $cppPageType = ($pageClass -replace '\.', '::')
+
+    # Find all local:SettingContainer start tags
+    $pattern = '<local:SettingContainer\b([^>/]*)(/?>)'
+    $matchesAll = [System.Text.RegularExpressions.Regex]::Matches($text, $pattern, 'IgnoreCase')
+
+    foreach ($m in $matchesAll) {
+        $attrBlock = $m.Groups[1].Value
+
+        if ($attrBlock -match '\bx:Uid="([^"]+)"') {
+            $uid = $matches[1]
+        }
+        else {
+            continue
+        }
+
+        if ($attrBlock -match '\bx:Name="([^"]+)"') {
+            $name = $matches[1]
+        }
+        elseif ($attrBlock -match '\bName="([^"]+)"') {
+            $name = $matches[1]
+        }
+        else {
+            $name = ""
+        }
+
+        # Skip entry if UID prohibited
+        if ($ProhibitedUids -contains $uid) { continue }
+
+        $entries += [pscustomobject]@{
+            PageClass   = $pageClass
+            CppPageType = $cppPageType
+            Uid         = $uid
+            Name        = $name
+            File        = $file
+        }
+    }
+}
+
+# Ensure there aren't any duplicate entries (PageClass, Uid, Name)
+$entries = $entries | Sort-Object PageClass, Uid, Name -Unique
+
+$headerPath = Join-Path $OutputDir 'GeneratedSettingsIndex.g.h'
+$cppPath    = Join-Path $OutputDir 'GeneratedSettingsIndex.g.cpp'
+
+$header = @"
+/*++
+Copyright (c) Microsoft Corporation
+Licensed under the MIT license.
+--*/
+#pragma once
+#include <winrt/Windows.UI.Xaml.Interop.h>
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
+{
+    struct IndexEntry
+    {
+        std::wstring_view ElementName;
+        std::wstring_view ElementUID;
+        winrt::Windows::UI::Xaml::Interop::TypeName ParentPage;
+    };
+
+    std::span<const IndexEntry> LoadBuildTimeIndex();
+}
+"@
+
+$entryLines = foreach ($e in $entries) {
+    # Ensure we emit valid wide string literals (escape backslashes and quotes)
+    $uidEsc = ($e.Uid   -replace '\\','\\\\') -replace '"','\"'
+    $nameEsc = ($e.Name -replace '\\','\\\\') -replace '"','\"'
+    "            { L`"$nameEsc`", L`"$uidEsc`", winrt::xaml_typename<$($e.CppPageType)>() }"
+}
+
+$cpp = @"
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "pch.h"
+#include <winrt/Microsoft.Terminal.Settings.Editor.h>
+#include "GeneratedSettingsIndex.g.h"
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
+{
+    namespace
+    {
+        static const IndexEntry s_entries[] =
+        {
+$( ($entryLines -join ",`r`n") )
+        };
+    }
+
+    std::span<const IndexEntry> LoadBuildTimeIndex()
+    {
+        static auto entries = std::span<const IndexEntry>(s_entries, std::size(s_entries));
+        return entries;
+    }
+}
+"@
+
+Set-Content -LiteralPath $headerPath -Value $header -NoNewline
+Set-Content -LiteralPath $cppPath -Value $cpp -NoNewline
+
+Write-Host "Generated:"
+Write-Host "  $headerPath"
+Write-Host "  $cppPath"
+Write-Host "Entries: $($entries.Count)"
\ No newline at end of file

From 915f085b607a52a302fcf8c0c1c2d42982c5c4c3 Mon Sep 17 00:00:00 2001
From: Carlos Zamora <cazamor@microsoft.com>
Date: Thu, 23 Oct 2025 11:47:20 -0700
Subject: [PATCH 03/25] load runtime index for search

---
 .../TerminalSettingsEditor/MainPage.cpp       |  63 +++-
 .../TerminalSettingsEditor/MainPage.h         |   5 +
 .../NewTabMenuViewModel.cpp                   |  18 +
 .../NewTabMenuViewModel.h                     |   1 +
 tools/GenerateSettingsIndex.ps1               | 355 +++++++++++++++---
 5 files changed, 394 insertions(+), 48 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
index 3846661a265..edb39ad582d 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
@@ -63,7 +63,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     MainPage::MainPage(const CascadiaSettings& settings) :
         _settingsSource{ settings },
-        _settingsClone{ settings.Copy() }
+        _settingsClone{ settings.Copy() },
+        _profileVMs{ single_threaded_observable_vector<Editor::ProfileViewModel>() }
     {
         InitializeComponent();
         _UpdateBackgroundForMica();
@@ -152,6 +153,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         Automation::AutomationProperties::SetHelpText(OpenJsonNavItem(), RS_(L"Nav_OpenJSON/[using:Windows.UI.Xaml.Controls]ToolTipService/ToolTip"));
 
         _breadcrumbs = single_threaded_observable_vector<IInspectable>();
+        _UpdateSearchIndex();
     }
 
     // Method Description:
@@ -266,6 +268,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         const auto& firstItem{ _menuItemSource.GetAt(0).as<MUX::Controls::NavigationViewItem>() };
         SettingsNav().SelectedItem(firstItem);
         _Navigate(unbox_value<hstring>(firstItem.Tag()), BreadcrumbSubPage::None);
+
+        _UpdateSearchIndex();
     }
 
     void MainPage::SetHostingWindow(uint64_t hostingWindow) noexcept
@@ -465,7 +469,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
         if (clickedItemTag == launchTag)
         {
-            _newTabMenuPageVM.CurrentFolder(nullptr);
             contentFrame().Navigate(xaml_typename<Editor::Launch>(), winrt::make<NavigateToLaunchArgs>(winrt::make<LaunchViewModel>(_settingsClone)));
             const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_Launch/Content"), BreadcrumbSubPage::None);
             _breadcrumbs.Append(crumb);
@@ -870,6 +873,9 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         // Add an event handler for when the user wants to delete a profile.
         profile.DeleteProfileRequested({ this, &MainPage::_DeleteProfile });
 
+        // Register the VM so that it appears in the search index
+        _profileVMs.Append(profile);
+
         return profileNavItem;
     }
 
@@ -895,6 +901,14 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             _menuItemSource.IndexOf(selectedItem, index);
             _menuItemSource.RemoveAt(index);
 
+            // Remove it from the list of VMs
+            auto profileVM = selectedItem.as<MUX::Controls::NavigationViewItem>().Tag().as<Editor::ProfileViewModel>();
+            uint32_t vmIndex;
+            if (_menuItemSource.IndexOf(profileVM, vmIndex))
+            {
+                _profileVMs.RemoveAt(vmIndex); 
+            }
+
             // navigate to the profile next to this one
             const auto newSelectedItem{ _menuItemSource.GetAt(index < _menuItemSource.Size() - 1 ? index : index - 1) };
             SettingsNav().SelectedItem(newSelectedItem);
@@ -1008,4 +1022,49 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         }
     }
 
+    void MainPage::_UpdateSearchIndex()
+    {
+        _searchIndex = {};
+
+        const auto buildIndex = LoadBuildTimeIndex();
+        _searchIndex.reserve(buildIndex.size());
+        _searchIndex.assign(buildIndex.begin(), buildIndex.end());
+
+        // Load profiles
+        for (const auto& profile : _profileVMs)
+        {
+            const auto& profileIndex = LoadProfileIndex(profile);
+            _searchIndex.reserve(_searchIndex.size() + profileIndex.size());
+            _searchIndex.insert(_searchIndex.end(), profileIndex.begin(), profileIndex.end());
+        }
+
+        // Load new tab menu
+        for (const auto& folderVM : get_self<implementation::NewTabMenuViewModel>(_newTabMenuPageVM)->FolderTreeFlatList())
+        {
+            const auto& folderIndex = LoadNTMFolderIndex(folderVM);
+            _searchIndex.reserve(_searchIndex.size() + folderIndex.size());
+            _searchIndex.insert(_searchIndex.end(), folderIndex.begin(), folderIndex.end());
+        }
+
+        // Load extensions
+        // TODO CARLOS: annoying that we have to load the extensions to build the index. Can we defer this until the user searches?
+        get_self<ExtensionsViewModel>(_extensionsVM)->LazyLoadExtensions();
+        for (const auto& extPkg : _extensionsVM.ExtensionPackages())
+        {
+            const auto& extPkgIndex = LoadExtensionIndex(extPkg);
+            _searchIndex.reserve(_searchIndex.size() + extPkgIndex.size());
+            _searchIndex.insert(_searchIndex.end(), extPkgIndex.begin(), extPkgIndex.end());
+        }
+
+        // Load color schemes
+        for (const auto& schemeVM : _colorSchemesPageVM.AllColorSchemes())
+        {
+            const auto& schemeIndex = LoadColorSchemeIndex(schemeVM.Name());
+            _searchIndex.reserve(_searchIndex.size() + schemeIndex.size());
+            _searchIndex.insert(_searchIndex.end(), schemeIndex.begin(), schemeIndex.end());
+        }
+
+        // Load actions
+        // TODO CARLOS: postpone until actions page is updated
+    }
 }
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.h b/src/cascadia/TerminalSettingsEditor/MainPage.h
index ff87f4910b6..0386361bcbb 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.h
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.h
@@ -6,6 +6,7 @@
 #include "MainPage.g.h"
 #include "Breadcrumb.g.h"
 #include "Utils.h"
+#include "GeneratedSettingsIndex.g.h"
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
@@ -76,11 +77,15 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
         void _UpdateBackgroundForMica();
         void _MoveXamlParsedNavItemsIntoItemSource();
+        void _UpdateSearchIndex();
 
+        Windows::Foundation::Collections::IVector<winrt::Microsoft::Terminal::Settings::Editor::ProfileViewModel> _profileVMs{ nullptr };
         winrt::Microsoft::Terminal::Settings::Editor::ColorSchemesPageViewModel _colorSchemesPageVM{ nullptr };
         winrt::Microsoft::Terminal::Settings::Editor::NewTabMenuViewModel _newTabMenuPageVM{ nullptr };
         winrt::Microsoft::Terminal::Settings::Editor::ExtensionsViewModel _extensionsVM{ nullptr };
 
+        std::vector<IndexEntry> _searchIndex;
+
         Windows::UI::Xaml::Data::INotifyPropertyChanged::PropertyChanged_revoker _profileViewModelChangedRevoker;
         Windows::UI::Xaml::Data::INotifyPropertyChanged::PropertyChanged_revoker _colorSchemesPageViewModelChangedRevoker;
         Windows::UI::Xaml::Data::INotifyPropertyChanged::PropertyChanged_revoker _ntmViewModelChangedRevoker;
diff --git a/src/cascadia/TerminalSettingsEditor/NewTabMenuViewModel.cpp b/src/cascadia/TerminalSettingsEditor/NewTabMenuViewModel.cpp
index f9c57cd3718..9b4ca291015 100644
--- a/src/cascadia/TerminalSettingsEditor/NewTabMenuViewModel.cpp
+++ b/src/cascadia/TerminalSettingsEditor/NewTabMenuViewModel.cpp
@@ -452,6 +452,24 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         return _folderTreeCache;
     }
 
+    Collections::IObservableVector<Editor::FolderEntryViewModel> NewTabMenuViewModel::FolderTreeFlatList() const
+    {
+        std::vector<Editor::FolderEntryViewModel> flatList;
+        std::function<void(const IVector<Editor::NewTabMenuEntryViewModel>&)> addFoldersRecursively;
+        addFoldersRecursively = [&flatList, &addFoldersRecursively](const IVector<Editor::NewTabMenuEntryViewModel>& entries) {
+            for (const auto& entry : entries)
+            {
+                if (const auto& folderVM = entry.try_as<Editor::FolderEntryViewModel>())
+                {
+                    flatList.push_back(folderVM);
+                    addFoldersRecursively(folderVM.Entries());
+                }
+            }
+        };
+        addFoldersRecursively(_rootEntries);
+        return single_threaded_observable_vector<Editor::FolderEntryViewModel>(std::move(flatList));
+    }
+
     // This recursively constructs the FolderTree
     FolderTreeViewEntry::FolderTreeViewEntry(Editor::FolderEntryViewModel folderEntry) :
         _folderEntry{ folderEntry },
diff --git a/src/cascadia/TerminalSettingsEditor/NewTabMenuViewModel.h b/src/cascadia/TerminalSettingsEditor/NewTabMenuViewModel.h
index b58767707f2..365682533b5 100644
--- a/src/cascadia/TerminalSettingsEditor/NewTabMenuViewModel.h
+++ b/src/cascadia/TerminalSettingsEditor/NewTabMenuViewModel.h
@@ -49,6 +49,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
         Windows::Foundation::Collections::IObservableVector<Model::Profile> AvailableProfiles() const { return _Settings.AllProfiles(); }
         Windows::Foundation::Collections::IObservableVector<Editor::FolderTreeViewEntry> FolderTree() const;
+        Windows::Foundation::Collections::IObservableVector<Editor::FolderEntryViewModel> FolderTreeFlatList() const;
         Windows::Foundation::Collections::IObservableVector<Editor::NewTabMenuEntryViewModel> CurrentView() const;
         VIEW_MODEL_OBSERVABLE_PROPERTY(Editor::FolderEntryViewModel, CurrentFolder, nullptr);
         VIEW_MODEL_OBSERVABLE_PROPERTY(Editor::FolderTreeViewEntry, CurrentFolderTreeViewSelectedItem, nullptr);
diff --git a/tools/GenerateSettingsIndex.ps1 b/tools/GenerateSettingsIndex.ps1
index 2fb21e27814..e193dcf939d 100644
--- a/tools/GenerateSettingsIndex.ps1
+++ b/tools/GenerateSettingsIndex.ps1
@@ -12,18 +12,24 @@ Directory to place generated C++ files.
 #>
 [CmdletBinding()]
 param(
-    [Parameter(Mandatory=$true)][string]$SourceDir,
-    [Parameter(Mandatory=$true)][string]$OutputDir
+    # TODO CARLOS: set mandatory to true and remove default params
+    [Parameter(Mandatory=$false)][string]$SourceDir='D:\projects\terminal\src\cascadia\TerminalSettingsEditor\',
+    [Parameter(Mandatory=$false)][string]$OutputDir='D:\projects\terminal\src\cascadia\TerminalSettingsEditor\Generated Files\'
 )
 
 # Prohibited UIDs (exact match, case-insensitive by default)
 $ProhibitedUids = @(
-    'NewTabMenu_AddRemainingProfiles'
+    # TODO CARLOS: AddRemainingProfiles should probably be allowed
+    'NewTabMenu_AddRemainingProfiles',
+    'Extensions_Scope'
 )
 
-# Prohibited XAML files (full paths preferred)
+# Prohibited XAML files
 $ProhibitedXamlFiles = @(
-    # 'd:\projects\terminal\src\cascadia\TerminalSettingsEditor\SomePage.xaml'
+    'CommonResources.xaml',
+    'KeyChordListener.xaml',
+    'NullableColorPicker.xaml',
+    'SettingContainerStyle.xaml'
 )
 
 if (-not (Test-Path $SourceDir)) { throw "SourceDir not found: $SourceDir" }
@@ -32,66 +38,247 @@ if (-not (Test-Path $OutputDir)) { New-Item -ItemType Directory -Path $OutputDir
 $entries = @()
 
 Get-ChildItem -Path $SourceDir -Recurse -Filter *.xaml | ForEach-Object {
-    $file = $_.FullName
-
     # Skip whole file if prohibited
-    if ($ProhibitedXamlFiles -contains $file) { return }
+    $filename = $_.Name
+    if ($ProhibitedXamlFiles -contains $filename)
+    {
+        return
+    }
 
-    $text = Get-Content -Raw -LiteralPath $file
+    $text = Get-Content -Raw -LiteralPath $_.FullName
 
     # Extract Page x:Class
     $pageClass = $null
-    if ($text -match '<Page\b[^>]*\bx:Class="([^"]+)"') {
-        $pageClass = $matches[1]
-    } elseif ($text -match '<UserControl\b[^>]*\bx:Class="([^"]+)"') {
-        # Needed for Appearances.xaml
+    if ($text -match '<Page\b[^>]*\bx:Class="([^"]+)"')
+    {
         $pageClass = $matches[1]
-    } else {
+    }
+    elseif ($filename -eq 'Appearances.xaml')
+    {
+        # Apperances.xaml is a UserControl that is hosted in Profiles_Appearance.xaml
+        $pageClass = 'Microsoft::Terminal::Settings::Editor::Profiles_Appearance'
+    }
+    else
+    {
         return
     }
 
     # Convert XAML namespace dots to C++ scope operators
-    $cppPageType = ($pageClass -replace '\.', '::')
+    $pageClass = ($pageClass -replace '\.', '::')
+
+    # Deduce BreadcrumbSubPage
+    # Special cases:
+    #  - NewTabMenu: defer to UID, see NavigationParam section below
+    #  - Extensions: defer to UID, see NavigationParam section below
+    $subPage = 'BreadcrumbSubPage::'
+    if ($pageClass -match 'Editor::Profiles_Appearance')
+    {
+        $subPage += 'Profile_Appearance'
+    }
+    elseif ($pageClass -match 'Editor::Profiles_Terminal')
+    {
+        $subPage += 'Profile_Terminal'
+    }
+    elseif ($pageClass -match 'Editor::Profiles_Advanced')
+    {
+        $subPage += 'Profile_Advanced'
+    }
+    elseif ($pageClass -match 'Editor::EditColorScheme')
+    {
+        $subPage += 'ColorSchemes_Edit'
+    }
+    else
+    {
+        $subPage += 'None'
+    }
+
+    if ($filename -eq 'ColorSchemes.xaml')
+    {
+        # ColorSchemes.xaml doesn't have any SettingContainers!
+        
+        # Register the page itself
+        $entries += [pscustomobject]@{
+            DisplayText     = 'vm'
+            ParentPage      = "winrt::xaml_typename<Microsoft::Terminal::Settings::Editor::ColorSchemes>()"
+            NavigationParam = "winrt::box_value(hstring{L`"ColorSchemes_Nav`"})"
+            SubPage         = 'BreadcrumbSubPage::ColorSchemes_Edit'
+            ElementName    = 'L""'
+            File            = $filename
+        }
+
+        # Manually register the "add new" button
+        $entries += [pscustomobject]@{
+            DisplayText     = 'RS_(L"ColorScheme_AddNewButton/Text")'
+            ParentPage      = "winrt::xaml_typename<Microsoft::Terminal::Settings::Editor::ColorSchemes>()"
+            NavigationParam = "winrt::box_value(hstring{L`"ColorSchemes_Nav`"})"
+            SubPage         = 'BreadcrumbSubPage::None'
+            ElementName    = 'L"AddNewButton"'
+            File            = $filename
+        }
+        return
+    }
+    elseif ($filename -eq 'Extensions.xaml')
+    {
+        # Register the main extension page
+        $entries += [pscustomobject]@{
+            DisplayText     = 'RS_(L"Nav_Extensions/Content")'
+            ParentPage      = "winrt::xaml_typename<Microsoft::Terminal::Settings::Editor::Extensions>()"
+            NavigationParam = "nullptr"
+            SubPage         = 'BreadcrumbSubPage::None'
+            ElementName    = 'L""'
+            File            = $filename
+        }
+
+        # Register the extension view
+        $entries += [pscustomobject]@{
+            DisplayText     = 'vm.Package().DisplayName()'
+            ParentPage      = "winrt::xaml_typename<Microsoft::Terminal::Settings::Editor::Extensions>()"
+            NavigationParam = "vm"
+            SubPage         = 'BreadcrumbSubPage::Extensions_Extension'
+            ElementName    = 'L""'
+            File            = $filename
+        }
+        return
+    }
 
     # Find all local:SettingContainer start tags
     $pattern = '<local:SettingContainer\b([^>/]*)(/?>)'
     $matchesAll = [System.Text.RegularExpressions.Regex]::Matches($text, $pattern, 'IgnoreCase')
 
-    foreach ($m in $matchesAll) {
+    foreach ($m in $matchesAll)
+    {
         $attrBlock = $m.Groups[1].Value
 
-        if ($attrBlock -match '\bx:Uid="([^"]+)"') {
+        # Extract Uid
+        if ($attrBlock -match '\bx:Uid="([^"]+)"')
+        {
             $uid = $matches[1]
+            
+            # Skip entry if UID prohibited
+            if ($ProhibitedUids -contains $uid)
+            {
+                continue
+            }
         }
-        else {
+        else
+        {
             continue
         }
 
-        if ($attrBlock -match '\bx:Name="([^"]+)"') {
+        # Extract Name
+        if ($attrBlock -match '\bx:Name="([^"]+)"')
+        {
             $name = $matches[1]
         }
-        elseif ($attrBlock -match '\bName="([^"]+)"') {
+        elseif ($attrBlock -match '\bName="([^"]+)"')
+        {
             $name = $matches[1]
         }
-        else {
+        else
+        {
             $name = ""
         }
 
-        # Skip entry if UID prohibited
-        if ($ProhibitedUids -contains $uid) { continue }
+        # Deduce NavigationParam
+        # duplicateForVM is used to duplicate the entry if we need a VM param at runtime (i.e. profile vs global profile)
+        $duplicateForVM = $false
+        $navigationParam = 'nullptr'
+        if ($pageClass -match 'Editor::Launch')
+        {
+            $navigationParam = 'Launch_Nav'
+        }
+        elseif ($pageClass -match 'Editor::Interaction')
+        {
+            $navigationParam = 'Interaction_Nav'
+        }
+        elseif ($pageClass -match 'Editor::Rendering')
+        {
+            $navigationParam = 'Rendering_Nav'
+        }
+        elseif ($pageClass -match 'Editor::Compatibility')
+        {
+            $navigationParam = 'Compatibility_Nav'
+        }
+        elseif ($pageClass -match 'Editor::Actions')
+        {
+            $navigationParam = 'Actions_Nav'
+        }
+        elseif ($pageClass -match 'Editor::NewTabMenu')
+        {
+            if ($uid -match 'NewTabMenu_CurrentFolder')
+            {
+                $navigationParam = 'vm'
+                $subPage = 'BreadcrumbSubPage::NewTabMenu_Folder'
+            }
+            else
+            {
+                $navigationParam = 'NewTabMenu_Nav'
+                $subPage = 'BreadcrumbSubPage::None'
+                $duplicateForVM = $true
+            }
+        }
+        elseif ($pageClass -match 'Editor::Extensions')
+        {
+            # TODO CARLOS: There's actually no UIDs for extension view! But I want the page to still exist in the index at runtime for each extension.
+            #if ($uid -match 'NewTabMenu_CurrentFolder')
+            #{
+            #    $navigationParam = 'vm'
+            #    $subPage = 'BreadcrumbSubPage::Extensions_Extension'
+            #}
+            #else
+            #{
+            $navigationParam = 'Extensions_Nav'
+            $subPage = 'BreadcrumbSubPage::None'
+            #}
+        }
+        elseif ($pageClass -match 'Editor::Profiles_Base' -or
+                $pageClass -match 'Editor::Profiles_Appearance' -or
+                $pageClass -match 'Editor::Profiles_Terminal' -or
+                $pageClass -match 'Editor::Profiles_Advanced')
+        {
+            $navigationParam = 'GlobalProfile_Nav'
+            $duplicateForVM = $true
+        }
+        elseif ($pageClass -match 'Editor::EditColorScheme')
+        {
+            # EditColorScheme.xaml always uses a boxed vm param
+            $navigationParam = 'winrt::box_value(vm)'
+        }
+        elseif ($pageClass -match 'Editor::GlobalAppearance')
+        {
+            $navigationParam = 'GlobalAppearance_Nav'
+        }
+        elseif ($pageClass -match 'Editor::AddProfile')
+        {
+            $navigationParam = 'AddProfile_Nav'
+        }
 
         $entries += [pscustomobject]@{
-            PageClass   = $pageClass
-            CppPageType = $cppPageType
-            Uid         = $uid
-            Name        = $name
-            File        = $file
+            DisplayText     = "RS_(L`"$($uid)/Header`")"
+            ParentPage      = "winrt::xaml_typename<$($pageClass)>()"
+            NavigationParam = $navigationParam -eq "vm" -or $navigationParam -eq "winrt::box_value(vm)" -or $navigationParam -eq "nullptr" ? $navigationParam : "winrt::box_value(hstring{L`"$($navigationParam)`"})"
+            SubPage         = $subPage
+            ElementName    = "L`"$($name)`""
+            File            = $filename
+        }
+
+        # Duplicate entry for VM param if needed
+        if ($duplicateForVM)
+        {
+            $entries += [pscustomobject]@{
+                DisplayText     = "RS_(L`"$($uid)/Header`")"
+                ParentPage      = "winrt::xaml_typename<$($pageClass)>()"
+                NavigationParam = 'vm'
+                SubPage         = $navigationParam -eq 'NewTabMenu_Nav' ? 'BreadcrumbSubPage::NewTabMenu_Folder' : $subPage
+                ElementName    = "L`"$($name)`""
+                File            = $filename
+            }
         }
     }
 }
 
-# Ensure there aren't any duplicate entries (PageClass, Uid, Name)
-$entries = $entries | Sort-Object PageClass, Uid, Name -Unique
+# Ensure there aren't any duplicate entries
+$entries = $entries | Sort-Object DisplayText, ParentPage, NavigationParam, SubPage, ElementName, File -Unique
 
 $headerPath = Join-Path $OutputDir 'GeneratedSettingsIndex.g.h'
 $cppPath    = Join-Path $OutputDir 'GeneratedSettingsIndex.g.cpp'
@@ -108,20 +295,55 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
     struct IndexEntry
     {
-        std::wstring_view ElementName;
-        std::wstring_view ElementUID;
+        hstring DisplayText; // RS_(L"<x:uid>/Header")
         winrt::Windows::UI::Xaml::Interop::TypeName ParentPage;
+        winrt::Windows::Foundation::IInspectable NavigationParam; // VM or hstring tag
+        BreadcrumbSubPage SubPage;
+        hstring ElementName;
     };
 
-    std::span<const IndexEntry> LoadBuildTimeIndex();
+    std::vector<IndexEntry> LoadBuildTimeIndex();
+    std::vector<IndexEntry> LoadProfileIndex(const Editor::ProfileViewModel& vm);
+    std::vector<IndexEntry> LoadNTMFolderIndex(const Editor::FolderEntryViewModel& vm);
+    std::vector<IndexEntry> LoadExtensionIndex(const Editor::ExtensionPackageViewModel& vm);
+    std::vector<IndexEntry> LoadColorSchemeIndex(const hstring colorSchemeName);
 }
 "@
 
-$entryLines = foreach ($e in $entries) {
-    # Ensure we emit valid wide string literals (escape backslashes and quotes)
-    $uidEsc = ($e.Uid   -replace '\\','\\\\') -replace '"','\"'
-    $nameEsc = ($e.Name -replace '\\','\\\\') -replace '"','\"'
-    "            { L`"$nameEsc`", L`"$uidEsc`", winrt::xaml_typename<$($e.CppPageType)>() }"
+
+$buildTimeEntries = @()
+$profileEntries = @()
+$schemeEntries = @()
+$ntmEntries = @()
+$extensionEntries = @()
+foreach ($e in $entries)
+{
+    $formattedEntry = "            { $($e.DisplayText), $($e.ParentPage), $($e.NavigationParam), $($e.SubPage), $($e.ElementName) }, // $($e.File)"
+    
+    if ($e.NavigationParam -eq 'vm' -and
+        ($e.ParentPage -match 'Profiles_Base' -or
+         $e.ParentPage -match 'Profiles_Appearance' -or
+         $e.ParentPage -match 'Profiles_Terminal' -or
+         $e.ParentPage -match 'Profiles_Advanced'))
+    {
+        $profileEntries += $formattedEntry
+    }
+    elseif ($e.SubPage -eq 'BreadcrumbSubPage::ColorSchemes_Edit')
+    {
+        $schemeEntries += $formattedEntry
+    }
+    elseif ($e.SubPage -eq 'BreadcrumbSubPage::NewTabMenu_Folder')
+    {
+        $ntmEntries += $formattedEntry
+    }
+    elseif ($e.SubPage -eq 'BreadcrumbSubPage::Extensions_Extension')
+    {
+        $extensionEntries += $formattedEntry
+    }
+    else
+    {
+        $buildTimeEntries += $formattedEntry
+    }
 }
 
 $cpp = @"
@@ -131,21 +353,63 @@ $cpp = @"
 #include "pch.h"
 #include <winrt/Microsoft.Terminal.Settings.Editor.h>
 #include "GeneratedSettingsIndex.g.h"
+#include <LibraryResources.h>
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
-    namespace
+    std::vector<IndexEntry> LoadBuildTimeIndex()
+    {
+        static const IndexEntry entries[] =
+        {
+$( ($buildTimeEntries -join "`r`n") )
+        };
+        std::vector<IndexEntry> index;
+        index.assign(std::begin(entries), std::end(entries));
+        return index;
+    }
+
+    std::vector<IndexEntry> LoadProfileIndex(const Editor::ProfileViewModel& vm)
+    {
+        const IndexEntry entries[] =
+        {
+$( ($profileEntries -join "`r`n") )
+        };
+        std::vector<IndexEntry> index;
+        index.assign(std::begin(entries), std::end(entries));
+        return index;
+    }
+
+    std::vector<IndexEntry> LoadNTMFolderIndex(const Editor::FolderEntryViewModel& vm)
     {
-        static const IndexEntry s_entries[] =
+        const IndexEntry entries[] =
         {
-$( ($entryLines -join ",`r`n") )
+$( ($ntmEntries -join "`r`n") )
         };
+        std::vector<IndexEntry> index;
+        index.assign(std::begin(entries), std::end(entries));
+        return index;
     }
 
-    std::span<const IndexEntry> LoadBuildTimeIndex()
+    std::vector<IndexEntry> LoadExtensionIndex(const Editor::ExtensionPackageViewModel& vm)
     {
-        static auto entries = std::span<const IndexEntry>(s_entries, std::size(s_entries));
-        return entries;
+        const IndexEntry entries[] =
+        {
+$( ($extensionEntries -join "`r`n") )
+        };
+        std::vector<IndexEntry> index;
+        index.assign(std::begin(entries), std::end(entries));
+        return index;
+    }
+    
+    std::vector<IndexEntry> LoadColorSchemeIndex(const hstring vm)
+    {
+        const IndexEntry entries[] =
+        {
+$( ($schemeEntries -join "`r`n") )
+        };
+        std::vector<IndexEntry> index;
+        index.assign(std::begin(entries), std::end(entries));
+        return index;
     }
 }
 "@
@@ -155,5 +419,4 @@ Set-Content -LiteralPath $cppPath -Value $cpp -NoNewline
 
 Write-Host "Generated:"
 Write-Host "  $headerPath"
-Write-Host "  $cppPath"
-Write-Host "Entries: $($entries.Count)"
\ No newline at end of file
+Write-Host "  $cppPath"
\ No newline at end of file

From cac844b1e9660324c60636a81b037efd7beeefaf Mon Sep 17 00:00:00 2001
From: Carlos Zamora <cazamor@microsoft.com>
Date: Tue, 28 Oct 2025 12:59:31 -0700
Subject: [PATCH 04/25] minimum viable product

---
 .../TerminalSettingsEditor/MainPage.cpp       | 173 ++++++++++++++++--
 .../TerminalSettingsEditor/MainPage.h         |  55 +++++-
 .../TerminalSettingsEditor/MainPage.idl       |   5 +
 .../TerminalSettingsEditor/MainPage.xaml      |  15 ++
 .../Resources/en-US/Resources.resw            |  10 +-
 5 files changed, 233 insertions(+), 25 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
index edb39ad582d..ddd30ade1e1 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
@@ -26,6 +26,7 @@
 
 #include <LibraryResources.h>
 #include <dwmapi.h>
+#include <fmt/compile.h>
 
 namespace winrt
 {
@@ -463,31 +464,31 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         });
     }
 
-    void MainPage::_Navigate(hstring clickedItemTag, BreadcrumbSubPage subPage)
+    void MainPage::_Navigate(hstring clickedItemTag, BreadcrumbSubPage subPage, hstring elementToFocus)
     {
         _PreNavigateHelper();
 
         if (clickedItemTag == launchTag)
         {
-            contentFrame().Navigate(xaml_typename<Editor::Launch>(), winrt::make<NavigateToLaunchArgs>(winrt::make<LaunchViewModel>(_settingsClone)));
+            contentFrame().Navigate(xaml_typename<Editor::Launch>(), winrt::make<NavigateToLaunchArgs>(winrt::make<LaunchViewModel>(_settingsClone), elementToFocus));
             const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_Launch/Content"), BreadcrumbSubPage::None);
             _breadcrumbs.Append(crumb);
         }
         else if (clickedItemTag == interactionTag)
         {
-            contentFrame().Navigate(xaml_typename<Editor::Interaction>(), winrt::make<NavigateToInteractionArgs>(winrt::make<InteractionViewModel>(_settingsClone.GlobalSettings())));
+            contentFrame().Navigate(xaml_typename<Editor::Interaction>(), winrt::make<NavigateToInteractionArgs>(winrt::make<InteractionViewModel>(_settingsClone.GlobalSettings()), elementToFocus));
             const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_Interaction/Content"), BreadcrumbSubPage::None);
             _breadcrumbs.Append(crumb);
         }
         else if (clickedItemTag == renderingTag)
         {
-            contentFrame().Navigate(xaml_typename<Editor::Rendering>(), winrt::make<NavigateToRenderingArgs>(winrt::make<RenderingViewModel>(_settingsClone)));
+            contentFrame().Navigate(xaml_typename<Editor::Rendering>(), winrt::make<NavigateToRenderingArgs>(winrt::make<RenderingViewModel>(_settingsClone), elementToFocus));
             const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_Rendering/Content"), BreadcrumbSubPage::None);
             _breadcrumbs.Append(crumb);
         }
         else if (clickedItemTag == compatibilityTag)
         {
-            contentFrame().Navigate(xaml_typename<Editor::Compatibility>(), winrt::make<NavigateToCompatibilityArgs>(winrt::make<CompatibilityViewModel>(_settingsClone)));
+            contentFrame().Navigate(xaml_typename<Editor::Compatibility>(), winrt::make<NavigateToCompatibilityArgs>(winrt::make<CompatibilityViewModel>(_settingsClone), elementToFocus));
             const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_Compatibility/Content"), BreadcrumbSubPage::None);
             _breadcrumbs.Append(crumb);
         }
@@ -508,7 +509,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             else
             {
                 // Navigate to the NewTabMenu page
-                contentFrame().Navigate(xaml_typename<Editor::NewTabMenu>(), winrt::make<NavigateToNewTabMenuArgs>(_newTabMenuPageVM));
+                contentFrame().Navigate(xaml_typename<Editor::NewTabMenu>(), winrt::make<NavigateToNewTabMenuArgs>(_newTabMenuPageVM, elementToFocus));
                 const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_NewTabMenu/Content"), BreadcrumbSubPage::None);
                 _breadcrumbs.Append(crumb);
             }
@@ -523,7 +524,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             }
             else
             {
-                contentFrame().Navigate(xaml_typename<Editor::Extensions>(), winrt::make<NavigateToExtensionsArgs>(_extensionsVM));
+                contentFrame().Navigate(xaml_typename<Editor::Extensions>(), winrt::make<NavigateToExtensionsArgs>(_extensionsVM, elementToFocus));
                 const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_Extensions/Content"), BreadcrumbSubPage::None);
                 _breadcrumbs.Append(crumb);
             }
@@ -536,7 +537,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
             _SetupProfileEventHandling(profileVM);
 
-            contentFrame().Navigate(xaml_typename<Editor::Profiles_Base>(), winrt::make<implementation::NavigateToProfileArgs>(profileVM, *this));
+            contentFrame().Navigate(xaml_typename<Editor::Profiles_Base>(), winrt::make<implementation::NavigateToProfileArgs>(profileVM, *this, elementToFocus));
             const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_ProfileDefaults/Content"), BreadcrumbSubPage::None);
             _breadcrumbs.Append(crumb);
 
@@ -558,7 +559,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         {
             const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_ColorSchemes/Content"), BreadcrumbSubPage::None);
             _breadcrumbs.Append(crumb);
-            contentFrame().Navigate(xaml_typename<Editor::ColorSchemes>(), winrt::make<NavigateToColorSchemesArgs>(_colorSchemesPageVM));
+            contentFrame().Navigate(xaml_typename<Editor::ColorSchemes>(), winrt::make<NavigateToColorSchemesArgs>(_colorSchemesPageVM, elementToFocus));
 
             if (subPage == BreadcrumbSubPage::ColorSchemes_Edit)
             {
@@ -567,13 +568,13 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         }
         else if (clickedItemTag == globalAppearanceTag)
         {
-            contentFrame().Navigate(xaml_typename<Editor::GlobalAppearance>(), winrt::make<NavigateToGlobalAppearanceArgs>(winrt::make<GlobalAppearanceViewModel>(_settingsClone.GlobalSettings())));
+            contentFrame().Navigate(xaml_typename<Editor::GlobalAppearance>(), winrt::make<NavigateToGlobalAppearanceArgs>(winrt::make<GlobalAppearanceViewModel>(_settingsClone.GlobalSettings()), elementToFocus));
             const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_Appearance/Content"), BreadcrumbSubPage::None);
             _breadcrumbs.Append(crumb);
         }
         else if (clickedItemTag == addProfileTag)
         {
-            auto addProfileState{ winrt::make<AddProfilePageNavigationState>(_settingsClone) };
+            auto addProfileState{ winrt::make<AddProfilePageNavigationState>(_settingsClone, elementToFocus) };
             addProfileState.AddNew({ get_weak(), &MainPage::_AddProfileHandler });
             contentFrame().Navigate(xaml_typename<Editor::AddProfile>(), addProfileState);
             const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_AddNewProfile/Content"), BreadcrumbSubPage::None);
@@ -586,7 +587,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     // - NOTE: this does not update the selected item.
     // Arguments:
     // - profile - the profile object we are getting a view of
-    void MainPage::_Navigate(const Editor::ProfileViewModel& profile, BreadcrumbSubPage subPage)
+    void MainPage::_Navigate(const Editor::ProfileViewModel& profile, BreadcrumbSubPage subPage, hstring elementToFocus)
     {
         _PreNavigateHelper();
 
@@ -594,14 +595,14 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
         if (profile.Orphaned())
         {
-            contentFrame().Navigate(xaml_typename<Editor::Profiles_Base_Orphaned>(), winrt::make<implementation::NavigateToProfileArgs>(profile, *this));
+            contentFrame().Navigate(xaml_typename<Editor::Profiles_Base_Orphaned>(), winrt::make<implementation::NavigateToProfileArgs>(profile, *this, elementToFocus));
             const auto crumb = winrt::make<Breadcrumb>(box_value(profile), profile.Name(), BreadcrumbSubPage::None);
             _breadcrumbs.Append(crumb);
             profile.CurrentPage(ProfileSubPage::Base);
             return;
         }
 
-        contentFrame().Navigate(xaml_typename<Editor::Profiles_Base>(), winrt::make<implementation::NavigateToProfileArgs>(profile, *this));
+        contentFrame().Navigate(xaml_typename<Editor::Profiles_Base>(), winrt::make<implementation::NavigateToProfileArgs>(profile, *this, elementToFocus));
         const auto crumb = winrt::make<Breadcrumb>(box_value(profile), profile.Name(), BreadcrumbSubPage::None);
         _breadcrumbs.Append(crumb);
 
@@ -625,11 +626,11 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         }
     }
 
-    void MainPage::_Navigate(const Editor::NewTabMenuEntryViewModel& ntmEntryVM, BreadcrumbSubPage subPage)
+    void MainPage::_Navigate(const Editor::NewTabMenuEntryViewModel& ntmEntryVM, BreadcrumbSubPage subPage, hstring elementToFocus)
     {
         _PreNavigateHelper();
 
-        contentFrame().Navigate(xaml_typename<Editor::NewTabMenu>(), winrt::make<NavigateToNewTabMenuArgs>(_newTabMenuPageVM));
+        contentFrame().Navigate(xaml_typename<Editor::NewTabMenu>(), winrt::make<NavigateToNewTabMenuArgs>(_newTabMenuPageVM, elementToFocus));
         const auto crumb = winrt::make<Breadcrumb>(box_value(newTabMenuTag), RS_(L"Nav_NewTabMenu/Content"), BreadcrumbSubPage::None);
         _breadcrumbs.Append(crumb);
 
@@ -658,11 +659,11 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         }
     }
 
-    void MainPage::_Navigate(const Editor::ExtensionPackageViewModel& extPkgVM, BreadcrumbSubPage subPage)
+    void MainPage::_Navigate(const Editor::ExtensionPackageViewModel& extPkgVM, BreadcrumbSubPage subPage, hstring elementToFocus)
     {
         _PreNavigateHelper();
 
-        contentFrame().Navigate(xaml_typename<Editor::Extensions>(), winrt::make<NavigateToExtensionsArgs>(_extensionsVM));
+        contentFrame().Navigate(xaml_typename<Editor::Extensions>(), winrt::make<NavigateToExtensionsArgs>(_extensionsVM, elementToFocus));
         const auto crumb = winrt::make<Breadcrumb>(box_value(extensionsTag), RS_(L"Nav_Extensions/Content"), BreadcrumbSubPage::None);
         _breadcrumbs.Append(crumb);
 
@@ -906,7 +907,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             uint32_t vmIndex;
             if (_menuItemSource.IndexOf(profileVM, vmIndex))
             {
-                _profileVMs.RemoveAt(vmIndex); 
+                _profileVMs.RemoveAt(vmIndex);
             }
 
             // navigate to the profile next to this one
@@ -1022,13 +1023,145 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         }
     }
 
+    safe_void_coroutine MainPage::SettingsSearchBox_TextChanged(const AutoSuggestBox& sender, const AutoSuggestBoxTextChangedEventArgs& args)
+    {
+        // TODO CARLOS: debug this function. May still need debounce?
+        if (args.Reason() != AutoSuggestionBoxTextChangeReason::UserInput)
+        {
+            // Only respond to user input, not programmatic text changes
+            co_return;
+        }
+
+        // remove leading spaces
+        std::wstring queryW{ sender.Text() };
+        const auto firstNonSpace{ queryW.find_first_not_of(L' ') };
+        if (firstNonSpace == std::wstring::npos)
+        {
+            // only spaces
+            const auto& searchBox = SettingsSearchBox();
+            searchBox.ItemsSource(nullptr);
+            searchBox.IsSuggestionListOpen(false);
+            co_return;
+        }
+
+        const hstring sanitizedQuery{ queryW.substr(firstNonSpace) };
+        if (sanitizedQuery.empty())
+        {
+            // empty query
+            const auto& searchBox = SettingsSearchBox();
+            searchBox.ItemsSource(nullptr);
+            searchBox.IsSuggestionListOpen(false);
+            co_return;
+        }
+
+        // search the index on the background thread
+        co_await winrt::resume_background();
+        const auto searchGeneration = _QuerySearchIndex(sanitizedQuery);
+
+        // convert and display results on the foreground thread
+        co_await winrt::resume_foreground(Dispatcher());
+        if (searchGeneration != _filteredSearchIndex.generation())
+        {
+            // search index was updated while we were searching, discard results
+            co_return;
+        }
+
+        // must be IInspectable to be used as ItemsSource
+        std::vector<IInspectable> results;
+        if (_filteredSearchIndex->empty())
+        {
+            // Explicitly show "no results"
+
+            // TODO CARLOS: use RS_switchable_fmt from ActionArgs.cpp
+            const hstring noResultsText{ fmt::format(fmt::runtime(std::wstring{ RS_(L"Search_NoResults") }), sanitizedQuery) };
+
+            results.reserve(1);
+            results.push_back(winrt::make<FilteredSearchResult>(noResultsText));
+        }
+        else
+        {
+            for (const auto* indexEntry : *_filteredSearchIndex)
+            {
+                results.push_back(winrt::make<FilteredSearchResult>(*indexEntry));
+            }
+        }
+
+        // Update the UI with the results
+        const auto& searchBox = SettingsSearchBox();
+        searchBox.ItemsSource(winrt::single_threaded_observable_vector<IInspectable>(std::move(results)));
+        searchBox.IsSuggestionListOpen(true);
+    }
+
+    // Update _filteredSearchIndex with results matching queryText
+    til::generation_t MainPage::_QuerySearchIndex(const hstring& queryText)
+    {
+        auto filteredResults{ _filteredSearchIndex.write() };
+
+        filteredResults->clear();
+        for (const auto& entry : _searchIndex)
+        {
+            // TODO CARLOS: replace with fuzzy search
+            const auto& displayText = entry.DisplayText;
+            if (til::contains_linguistic_insensitive(displayText, queryText))
+            {
+                filteredResults->push_back(&entry);
+            }
+        }
+        return _filteredSearchIndex.generation();
+    }
+
+    void MainPage::SettingsSearchBox_QuerySubmitted(const AutoSuggestBox& /*sender*/, const AutoSuggestBoxQuerySubmittedEventArgs& args)
+    {
+        if (args.ChosenSuggestion())
+        {
+            const auto& chosenResult{ args.ChosenSuggestion().as<FilteredSearchResult>() };
+            if (chosenResult->IsNoResultsPlaceholder())
+            {
+                // don't navigate anywhere
+                return;
+            }
+
+            // Navigate to the target page
+            const auto& indexEntry{ chosenResult->SearchIndexEntry() };
+            const auto& navigationParam{ indexEntry.NavigationParam };
+            if (navigationParam.try_as<hstring>())
+            {
+                _Navigate(navigationParam.as<hstring>(), indexEntry.SubPage, indexEntry.ElementName);
+            }
+            else if (const auto profileVM = navigationParam.try_as<ProfileViewModel>())
+            {
+                _Navigate(*profileVM, indexEntry.SubPage, indexEntry.ElementName);
+            }
+            else if (const auto ntmEntryVM = navigationParam.try_as<NewTabMenuEntryViewModel>())
+            {
+                _Navigate(*ntmEntryVM, indexEntry.SubPage, indexEntry.ElementName);
+            }
+            else if (const auto extPkgVM = navigationParam.try_as<ExtensionPackageViewModel>())
+            {
+                _Navigate(*extPkgVM, indexEntry.SubPage, indexEntry.ElementName);
+            }
+        }
+    }
+
+    void MainPage::SettingsSearchBox_SuggestionChosen(const AutoSuggestBox&, const AutoSuggestBoxSuggestionChosenEventArgs&)
+    {
+        // Don't navigate on arrow keys
+        // Handle Enter/Click with QuerySubmitted() to instead
+        // AutoSuggestBox will pass the chosen item to QuerySubmitted() via args.ChosenSuggestion()
+    }
+
     void MainPage::_UpdateSearchIndex()
     {
         _searchIndex = {};
 
+        // TODO CARLOS: delay evaluating resources to here.
+        //   - we also want to allow searching in English regardless or the selected language
+        //   - we still want to only show the native language though
+        //   - we should update the index to use USES_RESOURCE instead of RS_, then evaluate resources here
+
         const auto buildIndex = LoadBuildTimeIndex();
         _searchIndex.reserve(buildIndex.size());
-        _searchIndex.assign(buildIndex.begin(), buildIndex.end());
+        _searchIndex.insert(_searchIndex.end(), buildIndex.begin(), buildIndex.end());
 
         // Load profiles
         for (const auto& profile : _profileVMs)
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.h b/src/cascadia/TerminalSettingsEditor/MainPage.h
index 0386361bcbb..1da7215c589 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.h
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.h
@@ -5,8 +5,10 @@
 
 #include "MainPage.g.h"
 #include "Breadcrumb.g.h"
+#include "FilteredSearchResult.g.h"
 #include "Utils.h"
 #include "GeneratedSettingsIndex.g.h"
+#include <til/generational.h>
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
@@ -24,6 +26,44 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         WINRT_PROPERTY(BreadcrumbSubPage, SubPage);
     };
 
+    struct FilteredSearchResult : FilteredSearchResultT<FilteredSearchResult>
+    {
+        FilteredSearchResult(const winrt::hstring& label) :
+            _overrideLabel{ label } {}
+
+        FilteredSearchResult(const IndexEntry& entry) :
+            _SearchIndexEntry{ &entry } {}
+
+        hstring ToString() { return Label(); }
+
+        winrt::hstring Label() const
+        {
+            if (_overrideLabel)
+            {
+                return _overrideLabel.value();
+            }
+            else if (_SearchIndexEntry)
+            {
+                return _SearchIndexEntry->DisplayText;
+            }
+            return {};
+        }
+
+        bool IsNoResultsPlaceholder() const
+        {
+            return _overrideLabel.has_value();
+        }
+
+        const IndexEntry& SearchIndexEntry() const noexcept
+        {
+            return *_SearchIndexEntry;
+        }
+
+    private:
+        std::optional<winrt::hstring> _overrideLabel{ std::nullopt };
+        const IndexEntry* _SearchIndexEntry{ nullptr };
+    };
+
     struct MainPage : MainPageT<MainPage>
     {
         MainPage() = delete;
@@ -31,6 +71,10 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
         void UpdateSettings(const Model::CascadiaSettings& settings);
 
+        safe_void_coroutine SettingsSearchBox_TextChanged(const Windows::UI::Xaml::Controls::AutoSuggestBox& sender, const Windows::UI::Xaml::Controls::AutoSuggestBoxTextChangedEventArgs& args);
+        void SettingsSearchBox_QuerySubmitted(const Windows::UI::Xaml::Controls::AutoSuggestBox& sender, const Windows::UI::Xaml::Controls::AutoSuggestBoxQuerySubmittedEventArgs& args);
+        void SettingsSearchBox_SuggestionChosen(const Windows::UI::Xaml::Controls::AutoSuggestBox& sender, const Windows::UI::Xaml::Controls::AutoSuggestBoxSuggestionChosenEventArgs& args);
+
         void SettingsNav_Loaded(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& args);
         void SettingsNav_ItemInvoked(const Microsoft::UI::Xaml::Controls::NavigationView& sender, const Microsoft::UI::Xaml::Controls::NavigationViewItemInvokedEventArgs& args);
         void SaveButton_Click(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& args);
@@ -68,15 +112,17 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         void _SetupProfileEventHandling(const winrt::Microsoft::Terminal::Settings::Editor::ProfileViewModel profile);
 
         void _PreNavigateHelper();
-        void _Navigate(hstring clickedItemTag, BreadcrumbSubPage subPage);
-        void _Navigate(const Editor::ProfileViewModel& profile, BreadcrumbSubPage subPage);
-        void _Navigate(const Editor::NewTabMenuEntryViewModel& ntmEntryVM, BreadcrumbSubPage subPage);
-        void _Navigate(const Editor::ExtensionPackageViewModel& extPkgVM, BreadcrumbSubPage subPage);
+        void _Navigate(hstring clickedItemTag, BreadcrumbSubPage subPage, hstring elementToFocus = {});
+        void _Navigate(const Editor::ProfileViewModel& profile, BreadcrumbSubPage subPage, hstring elementToFocus = {});
+        void _Navigate(const Editor::NewTabMenuEntryViewModel& ntmEntryVM, BreadcrumbSubPage subPage, hstring elementToFocus = {});
+        void _Navigate(const Editor::ExtensionPackageViewModel& extPkgVM, BreadcrumbSubPage subPage, hstring elementToFocus = {});
         void _NavigateToProfileHandler(const IInspectable& sender, winrt::guid profileGuid);
         void _NavigateToColorSchemeHandler(const IInspectable& sender, const IInspectable& args);
 
         void _UpdateBackgroundForMica();
         void _MoveXamlParsedNavItemsIntoItemSource();
+
+        til::generation_t _QuerySearchIndex(const hstring& queryText);
         void _UpdateSearchIndex();
 
         Windows::Foundation::Collections::IVector<winrt::Microsoft::Terminal::Settings::Editor::ProfileViewModel> _profileVMs{ nullptr };
@@ -85,6 +131,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         winrt::Microsoft::Terminal::Settings::Editor::ExtensionsViewModel _extensionsVM{ nullptr };
 
         std::vector<IndexEntry> _searchIndex;
+        til::generational<std::vector<const IndexEntry*>> _filteredSearchIndex;
 
         Windows::UI::Xaml::Data::INotifyPropertyChanged::PropertyChanged_revoker _profileViewModelChangedRevoker;
         Windows::UI::Xaml::Data::INotifyPropertyChanged::PropertyChanged_revoker _colorSchemesPageViewModelChangedRevoker;
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.idl b/src/cascadia/TerminalSettingsEditor/MainPage.idl
index 20f3bab869d..9ea551bdfd8 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.idl
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.idl
@@ -26,6 +26,11 @@ namespace Microsoft.Terminal.Settings.Editor
         Extensions_Extension
     };
 
+    runtimeclass FilteredSearchResult : Windows.Foundation.IStringable
+    {
+        String Label { get; };
+    }
+
     runtimeclass Breadcrumb : Windows.Foundation.IStringable
     {
         IInspectable Tag;
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.xaml b/src/cascadia/TerminalSettingsEditor/MainPage.xaml
index 77c1bd8488f..d6847dc5c42 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.xaml
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.xaml
@@ -99,6 +99,21 @@
             </Grid>
         </muxc:NavigationView.Header>
 
+        <muxc:NavigationView.AutoSuggestBox>
+            <AutoSuggestBox x:Uid="Nav_SearchBox"
+                            x:Name="SettingsSearchBox"
+                            QueryIcon="Find"
+                            TextChanged="SettingsSearchBox_TextChanged"
+                            QuerySubmitted="SettingsSearchBox_QuerySubmitted"
+                            SuggestionChosen="SettingsSearchBox_SuggestionChosen">
+                <AutoSuggestBox.ItemTemplate>
+                    <DataTemplate x:DataType="local:FilteredSearchResult">
+                        <TextBlock Text="{x:Bind Label}" />
+                    </DataTemplate>
+                </AutoSuggestBox.ItemTemplate>
+            </AutoSuggestBox>
+        </muxc:NavigationView.AutoSuggestBox>
+
         <muxc:NavigationView.MenuItems>
 
             <muxc:NavigationViewItem x:Uid="Nav_Launch"
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
index cbde5854346..dcff9e6d067 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
@@ -2467,4 +2467,12 @@
   <data name="Settings_ResetApplicationStateConfirmationButton.Content" xml:space="preserve">
     <value>Yes, clear the cache</value>
   </data>
-</root>
+  <data name="Nav_SearchBox.PlaceholderText" xml:space="preserve">
+    <value>Search for settings</value>
+    <comment>Placeholder text for the main search box in the settings editor.</comment>
+  </data>
+  <data name="Search_NoResults" xml:space="preserve">
+    <value>No results for {}</value>
+    <comment>{Locked="{}"} Displayed when no results were found for a given query. "{}" will be replaced with the query.</comment>
+  </data>
+</root>
\ No newline at end of file

From e56eb7478823aee24613f5f4e2fd0ada50a2181a Mon Sep 17 00:00:00 2001
From: Carlos Zamora <cazamor@microsoft.com>
Date: Wed, 29 Oct 2025 15:01:31 -0700
Subject: [PATCH 05/25] improve indexing perf and include help text

---
 .../TerminalSettingsEditor/MainPage.cpp       | 250 ++++++++++++++----
 .../TerminalSettingsEditor/MainPage.h         |  57 +++-
 .../TerminalSettingsModel/ActionArgs.cpp      |   5 +-
 tools/GenerateSettingsIndex.ps1               | 233 ++++++++--------
 4 files changed, 366 insertions(+), 179 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
index ddd30ade1e1..a06e56b7e85 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
@@ -24,7 +24,9 @@
 #include <..\WinRTUtils\inc\Utils.h>
 #include "GeneratedSettingsIndex.g.h"
 
+#include <winrt/Windows.ApplicationModel.Resources.Core.h>
 #include <LibraryResources.h>
+#include <ScopedResourceLoader.h>
 #include <dwmapi.h>
 #include <fmt/compile.h>
 
@@ -55,6 +57,15 @@ static const std::wstring_view addProfileTag{ L"AddProfile" };
 static const std::wstring_view colorSchemesTag{ L"ColorSchemes_Nav" };
 static const std::wstring_view globalAppearanceTag{ L"GlobalAppearance_Nav" };
 
+// Like RS_, but uses an ambient context to determine whether
+// to load the English verion of a resource or the localized one.
+#define RS_switchable_(x) RS_switchable_impl(context, USES_RESOURCE(x))
+
+static winrt::hstring RS_switchable_impl(const winrt::Windows::ApplicationModel::Resources::Core::ResourceContext& context, std::wstring_view key)
+{
+    return GetLibraryResourceLoader().ResourceMap().GetValue(key, context).ValueAsString();
+}
+
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
     static Editor::ProfileViewModel _viewModelForProfile(const Model::Profile& profile, const Model::CascadiaSettings& appSettings, const Windows::UI::Core::CoreDispatcher& dispatcher)
@@ -155,6 +166,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
         _breadcrumbs = single_threaded_observable_vector<IInspectable>();
         _UpdateSearchIndex();
+        extensionsVMImpl->LazyLoadExtensions();
     }
 
     // Method Description:
@@ -1080,11 +1092,92 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         }
         else
         {
+            // Package filtered search index objects into WinRT FilteredSearchResults for UI
             for (const auto* indexEntry : *_filteredSearchIndex)
             {
-                results.push_back(winrt::make<FilteredSearchResult>(*indexEntry));
+                results.push_back(winrt::make<FilteredSearchResult>(indexEntry));
+            }
+
+            // TODO CARLOS: use the macro below for runtime objects once everything is verified to be working right
+#define APPEND_RUNTIME_OBJECT_RESULTS(runtimeObjectList, runtimeObjectIdentifier, filteredSearchIndex, navigationArgOverride) \
+    for (const auto& runtimeObj : runtimeObjectList)                                                                          \
+    {                                                                                                                         \
+        if (til::contains_linguistic_insensitive(runtimeObjectIdentifier, sanitizedQuery))                                    \
+        {                                                                                                                     \
+            /*results.push_back(winrt::make<FilteredSearchResult>(, profile));*/                                              \
+        }                                                                                                                     \
+                                                                                                                              \
+        for (const auto* indexEntry : filteredSearchIndex)                                                                    \
+        {                                                                                                                     \
+            results.push_back(winrt::make<FilteredSearchResult>(indexEntry, navigationArgOverride));                          \
+        }                                                                                                                     \
+    }
+
+            // Profiles
+            //APPEND_RUNTIME_OBJECT_RESULTS(_profileVMs, runtimeObj.Name(), _filteredSearchProfileIndex, runtimeObj)
+            for (const auto& profile : _profileVMs)
+            {
+                // TODO CARLOS: replace with fuzzy search
+                if (til::contains_linguistic_insensitive(profile.Name(), sanitizedQuery))
+                {
+                    // TODO CARLOS: if name matches, link the top-level page
+                    //   can't do that rn because I need a LocalizedIndexEntry stored somewhere for that
+                    //results.push_back(winrt::make<FilteredSearchResult>(, profile));
+                }
+
+                for (const auto* indexEntry : _filteredSearchProfileIndex)
+                {
+                    results.push_back(winrt::make<FilteredSearchResult>(indexEntry, profile));
+                }
+            }
+
+            // New Tab Menu (Folder View)
+            //APPEND_RUNTIME_OBJECT_RESULTS(get_self<implementation::NewTabMenuViewModel>(_newTabMenuPageVM)->FolderTreeFlatList(), runtimeObj.Name(), _filteredSearchNTMFolderIndex, runtimeObj)
+            for (const auto& ntmFolder : get_self<implementation::NewTabMenuViewModel>(_newTabMenuPageVM)->FolderTreeFlatList())
+            {
+                if (til::contains_linguistic_insensitive(ntmFolder.Name(), sanitizedQuery))
+                {
+                    // TODO CARLOS: if name matches, link the top-level page
+                    //   can't do that rn because I need a LocalizedIndexEntry stored somewhere for that
+                    //results.push_back(winrt::make<FilteredSearchResult>(, ntmFolder));
+                }
+
+                for (const auto* indexEntry : _filteredSearchNTMFolderIndex)
+                {
+                    results.push_back(winrt::make<FilteredSearchResult>(indexEntry, ntmFolder));
+                }
+            }
+
+            // Color schemes
+            //APPEND_RUNTIME_OBJECT_RESULTS(_colorSchemesPageVM.AllColorSchemes(), runtimeObj.Name(), _filteredSearchColorSchemeIndex, winrt::box_value(runtimeObj.Name()))
+            for (const auto& scheme : _colorSchemesPageVM.AllColorSchemes())
+            {
+                if (til::contains_linguistic_insensitive(scheme.Name(), sanitizedQuery))
+                {
+                    // TODO CARLOS: if name matches, link the top-level page
+                    //   can't do that rn because I need a LocalizedIndexEntry stored somewhere for that
+                    //results.push_back(winrt::make<FilteredSearchResult>(, scheme));
+                }
+
+                for (const auto* indexEntry : _filteredSearchColorSchemeIndex)
+                {
+                    results.push_back(winrt::make<FilteredSearchResult>(indexEntry, winrt::box_value(scheme.Name())));
+                }
+            }
+
+            // TODO CARLOS:
+            // - if match with extension name, go to extension page
+            for (const auto& extension : _extensionsVM.ExtensionPackages())
+            {
+                if (til::contains_linguistic_insensitive(extension.Package().DisplayName(), sanitizedQuery))
+                {
+                    // TODO CARLOS: if name matches, link the top-level page
+                    //   can't do that rn because I need a LocalizedIndexEntry stored somewhere for that
+                    //results.push_back(winrt::make<FilteredSearchResult>(, ntmFolder));
+                }
             }
         }
+#undef APPEND_RUNTIME_OBJECT_RESULTS
 
         // Update the UI with the results
         const auto& searchBox = SettingsSearchBox();
@@ -1097,16 +1190,35 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     {
         auto filteredResults{ _filteredSearchIndex.write() };
 
-        filteredResults->clear();
-        for (const auto& entry : _searchIndex)
-        {
-            // TODO CARLOS: replace with fuzzy search
-            const auto& displayText = entry.DisplayText;
-            if (til::contains_linguistic_insensitive(displayText, queryText))
+        auto findMatchingResults = [&queryText](const std::vector<LocalizedIndexEntry>& searchIndex, std::vector<const LocalizedIndexEntry*>& filteredIndex) {
+            filteredIndex.clear();
+            for (const auto& entry : searchIndex)
             {
-                filteredResults->push_back(&entry);
+                // TODO CARLOS: replace with fuzzy search
+                // Check for a match with DisplayText (i.e. "Globals_DefaultProfile/Header") and HelpText (i.e. "Globals_DefaultProfile/HelpText")
+                // in language neutral and current language
+                if (til::contains_linguistic_insensitive(entry.Entry->DisplayTextLocalized, queryText) ||
+                    (entry.Entry->HelpTextLocalized.has_value() && til::contains_linguistic_insensitive(entry.Entry->HelpTextLocalized.value(), queryText)) ||
+                    (entry.DisplayTextNeutral.has_value() && til::contains_linguistic_insensitive(entry.DisplayTextNeutral.value(), queryText)) ||
+                    (entry.HelpTextNeutral.has_value() && til::contains_linguistic_insensitive(entry.HelpTextNeutral.value(), queryText)))
+                {
+                    filteredIndex.push_back(&entry);
+                }
             }
-        }
+        };
+
+        // build-time search index can be filtered and returned pretty much as-is
+        findMatchingResults(_searchIndex, *filteredResults);
+
+        // Profiles
+        findMatchingResults(_searchProfileIndex, _filteredSearchProfileIndex);
+
+        // New Tab Menu (Folder View)
+        findMatchingResults(_searchNTMFolderIndex, _filteredSearchNTMFolderIndex);
+
+        // Color schemes
+        findMatchingResults(_searchColorSchemeIndex, _filteredSearchColorSchemeIndex);
+
         return _filteredSearchIndex.generation();
     }
 
@@ -1123,22 +1235,24 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
             // Navigate to the target page
             const auto& indexEntry{ chosenResult->SearchIndexEntry() };
-            const auto& navigationParam{ indexEntry.NavigationParam };
-            if (navigationParam.try_as<hstring>())
+            const auto& navigationArg{ chosenResult->NavigationArg() };
+            const auto& subpage{ indexEntry.Entry->SubPage };
+            const auto& elementToFocus{ indexEntry.Entry->ElementName };
+            if (navigationArg.try_as<hstring>())
             {
-                _Navigate(navigationParam.as<hstring>(), indexEntry.SubPage, indexEntry.ElementName);
+                _Navigate(navigationArg.as<hstring>(), subpage, elementToFocus);
             }
-            else if (const auto profileVM = navigationParam.try_as<ProfileViewModel>())
+            else if (const auto profileVM = navigationArg.try_as<ProfileViewModel>())
             {
-                _Navigate(*profileVM, indexEntry.SubPage, indexEntry.ElementName);
+                _Navigate(*profileVM, subpage, elementToFocus);
             }
-            else if (const auto ntmEntryVM = navigationParam.try_as<NewTabMenuEntryViewModel>())
+            else if (const auto ntmEntryVM = navigationArg.try_as<NewTabMenuEntryViewModel>())
             {
-                _Navigate(*ntmEntryVM, indexEntry.SubPage, indexEntry.ElementName);
+                _Navigate(*ntmEntryVM, subpage, elementToFocus);
             }
-            else if (const auto extPkgVM = navigationParam.try_as<ExtensionPackageViewModel>())
+            else if (const auto extPkgVM = navigationArg.try_as<ExtensionPackageViewModel>())
             {
-                _Navigate(*extPkgVM, indexEntry.SubPage, indexEntry.ElementName);
+                _Navigate(*extPkgVM, subpage, elementToFocus);
             }
         }
     }
@@ -1150,54 +1264,94 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         // AutoSuggestBox will pass the chosen item to QuerySubmitted() via args.ChosenSuggestion()
     }
 
-    void MainPage::_UpdateSearchIndex()
+    safe_void_coroutine MainPage::_UpdateSearchIndex()
     {
-        _searchIndex = {};
+        co_await winrt::resume_background();
 
-        // TODO CARLOS: delay evaluating resources to here.
-        //   - we also want to allow searching in English regardless or the selected language
-        //   - we still want to only show the native language though
-        //   - we should update the index to use USES_RESOURCE instead of RS_, then evaluate resources here
+        // These are the new index entries we are building.
+        // Don't actually modify the members until we're completely done here.
+        std::vector<LocalizedIndexEntry> localizedIndex;
+        std::vector<LocalizedIndexEntry> localizedProfileIndex;
+        std::vector<LocalizedIndexEntry> localizedNTMFolderIndex;
+        std::vector<LocalizedIndexEntry> localizedColorSchemeIndex;
+
+        // TODO CARLOS: actually use this
+        // copied from CommandPaletteItems.h
+        static bool shouldIncludeLanguageNeutralResources = [] {
+            try
+            {
+                const auto context{ winrt::Windows::ApplicationModel::Resources::Core::ResourceContext::GetForViewIndependentUse() };
+                const auto qualifiers{ context.QualifierValues() };
+                if (const auto language{ qualifiers.TryLookup(L"language") })
+                {
+                    return !til::starts_with_insensitive_ascii(*language, L"en-");
+                }
+            }
+            catch (...)
+            {
+                LOG_CAUGHT_EXCEPTION();
+            }
+            return false;
+        }();
 
-        const auto buildIndex = LoadBuildTimeIndex();
-        _searchIndex.reserve(buildIndex.size());
-        _searchIndex.insert(_searchIndex.end(), buildIndex.begin(), buildIndex.end());
+        const auto& buildIndex = LoadBuildTimeIndex();
+        localizedIndex.reserve(buildIndex.size());
+        for (const auto& entry : buildIndex)
+        {
+            // TODO CARLOS: properly populate LocalizedIndexEntry
+            LocalizedIndexEntry localizedEntry;
+            localizedEntry.Entry = &entry;
+            localizedIndex.push_back(localizedEntry);
+        }
 
         // Load profiles
-        for (const auto& profile : _profileVMs)
+        const auto& profileIndex = LoadProfileIndex();
+        localizedProfileIndex.reserve(profileIndex.size());
+        for (const auto& entry : profileIndex)
         {
-            const auto& profileIndex = LoadProfileIndex(profile);
-            _searchIndex.reserve(_searchIndex.size() + profileIndex.size());
-            _searchIndex.insert(_searchIndex.end(), profileIndex.begin(), profileIndex.end());
+            // TODO CARLOS: properly populate LocalizedIndexEntry
+            LocalizedIndexEntry localizedEntry;
+            localizedEntry.Entry = &entry;
+            localizedProfileIndex.push_back(localizedEntry);
         }
 
         // Load new tab menu
-        for (const auto& folderVM : get_self<implementation::NewTabMenuViewModel>(_newTabMenuPageVM)->FolderTreeFlatList())
+        const auto& ntmFolderIndex = LoadNTMFolderIndex();
+        localizedNTMFolderIndex.reserve(ntmFolderIndex.size());
+        for (const auto& entry : ntmFolderIndex)
         {
-            const auto& folderIndex = LoadNTMFolderIndex(folderVM);
-            _searchIndex.reserve(_searchIndex.size() + folderIndex.size());
-            _searchIndex.insert(_searchIndex.end(), folderIndex.begin(), folderIndex.end());
+            // TODO CARLOS: properly populate LocalizedIndexEntry
+            LocalizedIndexEntry localizedEntry;
+            localizedEntry.Entry = &entry;
+            localizedNTMFolderIndex.push_back(localizedEntry);
         }
 
-        // Load extensions
-        // TODO CARLOS: annoying that we have to load the extensions to build the index. Can we defer this until the user searches?
-        get_self<ExtensionsViewModel>(_extensionsVM)->LazyLoadExtensions();
-        for (const auto& extPkg : _extensionsVM.ExtensionPackages())
-        {
-            const auto& extPkgIndex = LoadExtensionIndex(extPkg);
-            _searchIndex.reserve(_searchIndex.size() + extPkgIndex.size());
-            _searchIndex.insert(_searchIndex.end(), extPkgIndex.begin(), extPkgIndex.end());
-        }
+        // Nothing to load for extensions.
+        // At query time, we'll search for matching extension names.
 
         // Load color schemes
-        for (const auto& schemeVM : _colorSchemesPageVM.AllColorSchemes())
+        const auto& colorSchemesIndex = LoadColorSchemeIndex();
+        localizedColorSchemeIndex.reserve(colorSchemesIndex.size());
+        for (const auto& entry : colorSchemesIndex)
         {
-            const auto& schemeIndex = LoadColorSchemeIndex(schemeVM.Name());
-            _searchIndex.reserve(_searchIndex.size() + schemeIndex.size());
-            _searchIndex.insert(_searchIndex.end(), schemeIndex.begin(), schemeIndex.end());
+            // TODO CARLOS: properly populate LocalizedIndexEntry
+            LocalizedIndexEntry localizedEntry;
+            localizedEntry.Entry = &entry;
+            localizedColorSchemeIndex.push_back(localizedEntry);
         }
 
         // Load actions
         // TODO CARLOS: postpone until actions page is updated
+
+        _searchIndex = std::move(localizedIndex);
+        _searchProfileIndex = std::move(localizedProfileIndex);
+        _searchNTMFolderIndex = std::move(localizedNTMFolderIndex);
+        _searchColorSchemeIndex = std::move(localizedColorSchemeIndex);
+    }
+
+    const ScopedResourceLoader& EnglishOnlyResourceLoader() noexcept
+    {
+        static ScopedResourceLoader loader{ GetLibraryResourceLoader().WithQualifier(L"language", L"en-US") };
+        return loader;
     }
 }
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.h b/src/cascadia/TerminalSettingsEditor/MainPage.h
index 1da7215c589..06994d581e9 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.h
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.h
@@ -10,8 +10,12 @@
 #include "GeneratedSettingsIndex.g.h"
 #include <til/generational.h>
 
+class ScopedResourceLoader;
+
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
+    const ScopedResourceLoader& EnglishOnlyResourceLoader() noexcept;
+
     struct Breadcrumb : BreadcrumbT<Breadcrumb>
     {
         Breadcrumb(IInspectable tag, winrt::hstring label, BreadcrumbSubPage subPage) :
@@ -26,13 +30,21 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         WINRT_PROPERTY(BreadcrumbSubPage, SubPage);
     };
 
+    struct LocalizedIndexEntry
+    {
+        std::optional<winrt::hstring> DisplayTextNeutral = std::nullopt;
+        std::optional<winrt::hstring> HelpTextNeutral = std::nullopt;
+        const IndexEntry* Entry = nullptr;
+    };
+
     struct FilteredSearchResult : FilteredSearchResultT<FilteredSearchResult>
     {
         FilteredSearchResult(const winrt::hstring& label) :
             _overrideLabel{ label } {}
 
-        FilteredSearchResult(const IndexEntry& entry) :
-            _SearchIndexEntry{ &entry } {}
+        FilteredSearchResult(const LocalizedIndexEntry* entry, const Windows::Foundation::IInspectable& navigationArgOverride = nullptr) :
+            _SearchIndexEntry{ entry },
+            _NavigationArgOverride{ navigationArgOverride } {}
 
         hstring ToString() { return Label(); }
 
@@ -44,7 +56,14 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             }
             else if (_SearchIndexEntry)
             {
-                return _SearchIndexEntry->DisplayText;
+                if (_SearchIndexEntry->Entry)
+                {
+                    return _SearchIndexEntry->Entry->DisplayTextLocalized;
+                }
+                else if (_SearchIndexEntry->DisplayTextNeutral.has_value())
+                {
+                    return _SearchIndexEntry->DisplayTextNeutral.value();
+                }
             }
             return {};
         }
@@ -54,14 +73,28 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             return _overrideLabel.has_value();
         }
 
-        const IndexEntry& SearchIndexEntry() const noexcept
+        const LocalizedIndexEntry& SearchIndexEntry() const noexcept
         {
             return *_SearchIndexEntry;
         }
 
+        Windows::Foundation::IInspectable NavigationArg() const
+        {
+            if (_NavigationArgOverride)
+            {
+                return _NavigationArgOverride;
+            }
+            else if (_SearchIndexEntry)
+            {
+                return _SearchIndexEntry->Entry->NavigationArg;
+            }
+            return nullptr;
+        }
+
     private:
-        std::optional<winrt::hstring> _overrideLabel{ std::nullopt };
-        const IndexEntry* _SearchIndexEntry{ nullptr };
+        const std::optional<winrt::hstring> _overrideLabel{ std::nullopt };
+        const Windows::Foundation::IInspectable& _NavigationArgOverride{ nullptr };
+        const LocalizedIndexEntry* _SearchIndexEntry{ nullptr };
     };
 
     struct MainPage : MainPageT<MainPage>
@@ -123,15 +156,21 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         void _MoveXamlParsedNavItemsIntoItemSource();
 
         til::generation_t _QuerySearchIndex(const hstring& queryText);
-        void _UpdateSearchIndex();
+        safe_void_coroutine _UpdateSearchIndex();
 
         Windows::Foundation::Collections::IVector<winrt::Microsoft::Terminal::Settings::Editor::ProfileViewModel> _profileVMs{ nullptr };
         winrt::Microsoft::Terminal::Settings::Editor::ColorSchemesPageViewModel _colorSchemesPageVM{ nullptr };
         winrt::Microsoft::Terminal::Settings::Editor::NewTabMenuViewModel _newTabMenuPageVM{ nullptr };
         winrt::Microsoft::Terminal::Settings::Editor::ExtensionsViewModel _extensionsVM{ nullptr };
 
-        std::vector<IndexEntry> _searchIndex;
-        til::generational<std::vector<const IndexEntry*>> _filteredSearchIndex;
+        std::vector<LocalizedIndexEntry> _searchIndex;
+        std::vector<LocalizedIndexEntry> _searchProfileIndex;
+        std::vector<LocalizedIndexEntry> _searchNTMFolderIndex;
+        std::vector<LocalizedIndexEntry> _searchColorSchemeIndex;
+        til::generational<std::vector<const LocalizedIndexEntry*>> _filteredSearchIndex;
+        std::vector<const LocalizedIndexEntry*> _filteredSearchProfileIndex;
+        std::vector<const LocalizedIndexEntry*> _filteredSearchNTMFolderIndex;
+        std::vector<const LocalizedIndexEntry*> _filteredSearchColorSchemeIndex;
 
         Windows::UI::Xaml::Data::INotifyPropertyChanged::PropertyChanged_revoker _profileViewModelChangedRevoker;
         Windows::UI::Xaml::Data::INotifyPropertyChanged::PropertyChanged_revoker _colorSchemesPageViewModelChangedRevoker;
diff --git a/src/cascadia/TerminalSettingsModel/ActionArgs.cpp b/src/cascadia/TerminalSettingsModel/ActionArgs.cpp
index ee014118602..3518d21c305 100644
--- a/src/cascadia/TerminalSettingsModel/ActionArgs.cpp
+++ b/src/cascadia/TerminalSettingsModel/ActionArgs.cpp
@@ -60,9 +60,8 @@ namespace winrt
     namespace WARC = ::winrt::Windows::ApplicationModel::Resources::Core;
 }
 
-// Like RS_ and RS_fmt, but they use an ambient boolean named "localized" to
-// determine whether to load the English version of a resource or the localized
-// one.
+// Like RS_ and RS_fmt, but they use an ambient context to determine 
+// whether to load the English version of a resource or the localized one.
 #define RS_switchable_(x) RS_switchable_impl(context, USES_RESOURCE(x))
 #define RS_switchable_fmt(x, ...) RS_switchable_fmt_impl(context, USES_RESOURCE(x), __VA_ARGS__)
 
diff --git a/tools/GenerateSettingsIndex.ps1 b/tools/GenerateSettingsIndex.ps1
index e193dcf939d..6519206e0c4 100644
--- a/tools/GenerateSettingsIndex.ps1
+++ b/tools/GenerateSettingsIndex.ps1
@@ -35,6 +35,7 @@ $ProhibitedXamlFiles = @(
 if (-not (Test-Path $SourceDir)) { throw "SourceDir not found: $SourceDir" }
 if (-not (Test-Path $OutputDir)) { New-Item -ItemType Directory -Path $OutputDir | Out-Null }
 
+$resourceKeys = ([xml](Get-Content "$($SourceDir)\Resources\en-US\Resources.resw")).root.data.name
 $entries = @()
 
 Get-ChildItem -Path $SourceDir -Recurse -Filter *.xaml | ForEach-Object {
@@ -96,48 +97,53 @@ Get-ChildItem -Path $SourceDir -Recurse -Filter *.xaml | ForEach-Object {
     {
         # ColorSchemes.xaml doesn't have any SettingContainers!
         
+        # TODO CARLOS: remove from script; hard code in MainPage instead
         # Register the page itself
-        $entries += [pscustomobject]@{
-            DisplayText     = 'vm'
-            ParentPage      = "winrt::xaml_typename<Microsoft::Terminal::Settings::Editor::ColorSchemes>()"
-            NavigationParam = "winrt::box_value(hstring{L`"ColorSchemes_Nav`"})"
-            SubPage         = 'BreadcrumbSubPage::ColorSchemes_Edit'
-            ElementName    = 'L""'
-            File            = $filename
-        }
-
+        # $entries += [pscustomobject]@{
+        #     DisplayText     = 'vm'
+        #     ParentPage      = "winrt::xaml_typename<Microsoft::Terminal::Settings::Editor::ColorSchemes>()"
+        #     NavigationParam = "winrt::box_value(hstring{L`"ColorSchemes_Nav`"})"
+        #     SubPage         = 'BreadcrumbSubPage::ColorSchemes_Edit'
+        #     ElementName    = 'L""'
+        #     File            = $filename
+        # }
+
+        # TODO CARLOS: remove from script; hard code in MainPage instead
         # Manually register the "add new" button
-        $entries += [pscustomobject]@{
-            DisplayText     = 'RS_(L"ColorScheme_AddNewButton/Text")'
-            ParentPage      = "winrt::xaml_typename<Microsoft::Terminal::Settings::Editor::ColorSchemes>()"
-            NavigationParam = "winrt::box_value(hstring{L`"ColorSchemes_Nav`"})"
-            SubPage         = 'BreadcrumbSubPage::None'
-            ElementName    = 'L"AddNewButton"'
-            File            = $filename
-        }
+        # $entries += [pscustomobject]@{
+        #     DisplayText     = 'RS_(L"ColorScheme_AddNewButton/Text")'
+        #     ParentPage      = "winrt::xaml_typename<Microsoft::Terminal::Settings::Editor::ColorSchemes>()"
+        #     NavigationParam = "winrt::box_value(hstring{L`"ColorSchemes_Nav`"})"
+        #     SubPage         = 'BreadcrumbSubPage::None'
+        #     ElementName    = 'L"AddNewButton"'
+        #     File            = $filename
+        # }
         return
     }
     elseif ($filename -eq 'Extensions.xaml')
     {
-        # Register the main extension page
-        $entries += [pscustomobject]@{
-            DisplayText     = 'RS_(L"Nav_Extensions/Content")'
-            ParentPage      = "winrt::xaml_typename<Microsoft::Terminal::Settings::Editor::Extensions>()"
-            NavigationParam = "nullptr"
-            SubPage         = 'BreadcrumbSubPage::None'
-            ElementName    = 'L""'
-            File            = $filename
-        }
 
+        # TODO CARLOS: remove from script; hard code in MainPage instead
+        # Register the main extension page
+        # $entries += [pscustomobject]@{
+        #     DisplayText     = 'RS_(L"Nav_Extensions/Content")'
+        #     ParentPage      = "winrt::xaml_typename<Microsoft::Terminal::Settings::Editor::Extensions>()"
+        #     NavigationParam = "nullptr"
+        #     SubPage         = 'BreadcrumbSubPage::None'
+        #     ElementName    = 'L""'
+        #     File            = $filename
+        # }
+
+        # TODO CARLOS: remove from script; hard code in MainPage instead
         # Register the extension view
-        $entries += [pscustomobject]@{
-            DisplayText     = 'vm.Package().DisplayName()'
-            ParentPage      = "winrt::xaml_typename<Microsoft::Terminal::Settings::Editor::Extensions>()"
-            NavigationParam = "vm"
-            SubPage         = 'BreadcrumbSubPage::Extensions_Extension'
-            ElementName    = 'L""'
-            File            = $filename
-        }
+        # $entries += [pscustomobject]@{
+        #     DisplayText     = 'vm.Package().DisplayName()'
+        #     ParentPage      = "winrt::xaml_typename<Microsoft::Terminal::Settings::Editor::Extensions>()"
+        #     NavigationParam = "vm"
+        #     SubPage         = 'BreadcrumbSubPage::Extensions_Extension'
+        #     ElementName    = 'L""'
+        #     File            = $filename
+        # }
         return
     }
 
@@ -207,7 +213,7 @@ Get-ChildItem -Path $SourceDir -Recurse -Filter *.xaml | ForEach-Object {
         {
             if ($uid -match 'NewTabMenu_CurrentFolder')
             {
-                $navigationParam = 'vm'
+                $navigationParam = 'nullptr'
                 $subPage = 'BreadcrumbSubPage::NewTabMenu_Folder'
             }
             else
@@ -241,8 +247,8 @@ Get-ChildItem -Path $SourceDir -Recurse -Filter *.xaml | ForEach-Object {
         }
         elseif ($pageClass -match 'Editor::EditColorScheme')
         {
-            # EditColorScheme.xaml always uses a boxed vm param
-            $navigationParam = 'winrt::box_value(vm)'
+            # populate with color scheme name at runtime
+            $navigationParam = 'nullptr'
         }
         elseif ($pageClass -match 'Editor::GlobalAppearance')
         {
@@ -254,73 +260,43 @@ Get-ChildItem -Path $SourceDir -Recurse -Filter *.xaml | ForEach-Object {
         }
 
         $entries += [pscustomobject]@{
-            DisplayText     = "RS_(L`"$($uid)/Header`")"
-            ParentPage      = "winrt::xaml_typename<$($pageClass)>()"
-            NavigationParam = $navigationParam -eq "vm" -or $navigationParam -eq "winrt::box_value(vm)" -or $navigationParam -eq "nullptr" ? $navigationParam : "winrt::box_value(hstring{L`"$($navigationParam)`"})"
-            SubPage         = $subPage
-            ElementName    = "L`"$($name)`""
-            File            = $filename
+            DisplayTextLocalized = "RS_(L`"$($uid)/Header`")"
+            HelpTextLocalized    = $resourceKeys -contains "$($uid)/HelpText" ? "std::optional<hstring>{ RS_(L`"$($uid)/HelpText`") }" : "std::nullopt"
+            ParentPage           = "winrt::xaml_typename<$($pageClass)>()"
+            NavigationParam      = $navigationParam -eq "nullptr" ? $navigationParam : "winrt::box_value(hstring{L`"$($navigationParam)`"})"
+            SubPage              = $subPage
+            ElementName          = "L`"$($name)`""
+            File                 = $filename
         }
 
         # Duplicate entry for VM param if needed
         if ($duplicateForVM)
         {
             $entries += [pscustomobject]@{
-                DisplayText     = "RS_(L`"$($uid)/Header`")"
-                ParentPage      = "winrt::xaml_typename<$($pageClass)>()"
-                NavigationParam = 'vm'
-                SubPage         = $navigationParam -eq 'NewTabMenu_Nav' ? 'BreadcrumbSubPage::NewTabMenu_Folder' : $subPage
-                ElementName    = "L`"$($name)`""
-                File            = $filename
+                DisplayTextLocalized = "RS_(L`"$($uid)/Header`")"
+                HelpTextLocalized    = $resourceKeys -contains "$($uid)/HelpText" ? "std::optional<hstring>{ RS_(L`"$($uid)/HelpText`") }" : "std::nullopt"
+                ParentPage           = "winrt::xaml_typename<$($pageClass)>()"
+                NavigationParam      = 'nullptr'  # VM param at runtime
+                SubPage              = $navigationParam -eq 'NewTabMenu_Nav' ? 'BreadcrumbSubPage::NewTabMenu_Folder' : $subPage
+                ElementName          = "L`"$($name)`""
+                File                 = $filename
             }
         }
     }
 }
 
 # Ensure there aren't any duplicate entries
-$entries = $entries | Sort-Object DisplayText, ParentPage, NavigationParam, SubPage, ElementName, File -Unique
-
-$headerPath = Join-Path $OutputDir 'GeneratedSettingsIndex.g.h'
-$cppPath    = Join-Path $OutputDir 'GeneratedSettingsIndex.g.cpp'
-
-$header = @"
-/*++
-Copyright (c) Microsoft Corporation
-Licensed under the MIT license.
---*/
-#pragma once
-#include <winrt/Windows.UI.Xaml.Interop.h>
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
-{
-    struct IndexEntry
-    {
-        hstring DisplayText; // RS_(L"<x:uid>/Header")
-        winrt::Windows::UI::Xaml::Interop::TypeName ParentPage;
-        winrt::Windows::Foundation::IInspectable NavigationParam; // VM or hstring tag
-        BreadcrumbSubPage SubPage;
-        hstring ElementName;
-    };
-
-    std::vector<IndexEntry> LoadBuildTimeIndex();
-    std::vector<IndexEntry> LoadProfileIndex(const Editor::ProfileViewModel& vm);
-    std::vector<IndexEntry> LoadNTMFolderIndex(const Editor::FolderEntryViewModel& vm);
-    std::vector<IndexEntry> LoadExtensionIndex(const Editor::ExtensionPackageViewModel& vm);
-    std::vector<IndexEntry> LoadColorSchemeIndex(const hstring colorSchemeName);
-}
-"@
-
+$entries = $entries | Sort-Object RootUid, ParentPage, NavigationParam, SubPage, ElementName, File -Unique
 
 $buildTimeEntries = @()
 $profileEntries = @()
 $schemeEntries = @()
 $ntmEntries = @()
-$extensionEntries = @()
 foreach ($e in $entries)
 {
-    $formattedEntry = "            { $($e.DisplayText), $($e.ParentPage), $($e.NavigationParam), $($e.SubPage), $($e.ElementName) }, // $($e.File)"
+    $formattedEntry = "            IndexEntry{ $($e.DisplayTextLocalized), $($e.HelpTextLocalized), $($e.ParentPage), $($e.NavigationParam), $($e.SubPage), $($e.ElementName) }, // $($e.File)"
     
-    if ($e.NavigationParam -eq 'vm' -and
+    if ($e.NavigationParam -eq 'nullptr' -and
         ($e.ParentPage -match 'Profiles_Base' -or
          $e.ParentPage -match 'Profiles_Appearance' -or
          $e.ParentPage -match 'Profiles_Terminal' -or
@@ -336,16 +312,54 @@ foreach ($e in $entries)
     {
         $ntmEntries += $formattedEntry
     }
-    elseif ($e.SubPage -eq 'BreadcrumbSubPage::Extensions_Extension')
-    {
-        $extensionEntries += $formattedEntry
-    }
     else
     {
         $buildTimeEntries += $formattedEntry
     }
 }
 
+$headerPath = Join-Path $OutputDir 'GeneratedSettingsIndex.g.h'
+$cppPath    = Join-Path $OutputDir 'GeneratedSettingsIndex.g.cpp'
+
+$header = @"
+/*++
+Copyright (c) Microsoft Corporation
+Licensed under the MIT license.
+--*/
+#pragma once
+#include <winrt/Windows.UI.Xaml.Interop.h>
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
+{
+    struct IndexEntry
+    {
+        // Localized display text shown in the SettingContainer (i.e. RS_(L"Globals_DefaultProfile/Header"))
+        hstring DisplayTextLocalized;
+
+        // Localized help text shown in the SettingContainer (i.e. RS_(L"Globals_DefaultProfile/HelpText"))
+        // May not exist for all entries
+        std::optional<hstring> HelpTextLocalized;
+
+        // x:Class of the parent Page (i.e. winrt::xaml_typename<Microsoft::Terminal::Settings::Editor::Launch>())
+        winrt::Windows::UI::Xaml::Interop::TypeName ParentPage;
+
+        // Navigation argument (i.e. winrt::box_value(hstring) or nullptr)
+        // Use nullptr as placeholder for runtime navigation with a view model object
+        winrt::Windows::Foundation::IInspectable NavigationArg;
+
+        BreadcrumbSubPage SubPage;
+        
+        // x:Name of the SettingContainer to navigate to on the page (i.e. "DefaultProfile")
+        hstring ElementName;
+    };
+
+    const std::array<IndexEntry, $($buildTimeEntries.Count)>& LoadBuildTimeIndex();
+    const std::array<IndexEntry, $($profileEntries.Count)>& LoadProfileIndex();
+    const std::array<IndexEntry, $($ntmEntries.Count)>& LoadNTMFolderIndex();
+    const std::array<IndexEntry, $($schemeEntries.Count)>& LoadColorSchemeIndex();
+}
+"@
+
 $cpp = @"
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
@@ -357,59 +371,40 @@ $cpp = @"
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
-    std::vector<IndexEntry> LoadBuildTimeIndex()
+    const std::array<IndexEntry, $($buildTimeEntries.Count)>& LoadBuildTimeIndex()
     {
-        static const IndexEntry entries[] =
+        static std::array<IndexEntry, $($buildTimeEntries.Count)> entries =
         {
 $( ($buildTimeEntries -join "`r`n") )
         };
-        std::vector<IndexEntry> index;
-        index.assign(std::begin(entries), std::end(entries));
-        return index;
+        return entries;
     }
 
-    std::vector<IndexEntry> LoadProfileIndex(const Editor::ProfileViewModel& vm)
+    const std::array<IndexEntry, $($profileEntries.Count)>& LoadProfileIndex()
     {
-        const IndexEntry entries[] =
+        static std::array<IndexEntry, $($profileEntries.Count)> entries =
         {
 $( ($profileEntries -join "`r`n") )
         };
-        std::vector<IndexEntry> index;
-        index.assign(std::begin(entries), std::end(entries));
-        return index;
+        return entries;
     }
 
-    std::vector<IndexEntry> LoadNTMFolderIndex(const Editor::FolderEntryViewModel& vm)
+    const std::array<IndexEntry, $($ntmEntries.Count)>& LoadNTMFolderIndex()
     {
-        const IndexEntry entries[] =
+        static std::array<IndexEntry, $($ntmEntries.Count)> entries =
         {
 $( ($ntmEntries -join "`r`n") )
         };
-        std::vector<IndexEntry> index;
-        index.assign(std::begin(entries), std::end(entries));
-        return index;
+        return entries;
     }
 
-    std::vector<IndexEntry> LoadExtensionIndex(const Editor::ExtensionPackageViewModel& vm)
-    {
-        const IndexEntry entries[] =
-        {
-$( ($extensionEntries -join "`r`n") )
-        };
-        std::vector<IndexEntry> index;
-        index.assign(std::begin(entries), std::end(entries));
-        return index;
-    }
-    
-    std::vector<IndexEntry> LoadColorSchemeIndex(const hstring vm)
+    const std::array<IndexEntry, $($schemeEntries.Count)>& LoadColorSchemeIndex()
     {
-        const IndexEntry entries[] =
+        static std::array<IndexEntry, $($schemeEntries.Count)> entries =
         {
 $( ($schemeEntries -join "`r`n") )
         };
-        std::vector<IndexEntry> index;
-        index.assign(std::begin(entries), std::end(entries));
-        return index;
+        return entries;
     }
 }
 "@

From 2a41f8a57c9a9b28a1e35487a1a294b954b4d0ee Mon Sep 17 00:00:00 2001
From: Carlos Zamora <cazamor@microsoft.com>
Date: Mon, 3 Nov 2025 11:48:36 -0800
Subject: [PATCH 06/25] improve index

---
 .../TerminalSettingsEditor/MainPage.cpp       |  28 +--
 .../TerminalSettingsEditor/MainPage.h         |   5 +-
 tools/GenerateSettingsIndex.ps1               | 173 +++++++++++++-----
 3 files changed, 143 insertions(+), 63 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
index a06e56b7e85..59e4999ba48 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
@@ -1074,6 +1074,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         co_await winrt::resume_foreground(Dispatcher());
         if (searchGeneration != _filteredSearchIndex.generation())
         {
+            // TODO CARLOS: look into til::throttled_func (winrt version and non-winrt version) for debounce (used in BellSound and TaskbarProgressUpdates)
             // search index was updated while we were searching, discard results
             co_return;
         }
@@ -1099,18 +1100,18 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             }
 
             // TODO CARLOS: use the macro below for runtime objects once everything is verified to be working right
-#define APPEND_RUNTIME_OBJECT_RESULTS(runtimeObjectList, runtimeObjectIdentifier, filteredSearchIndex, navigationArgOverride) \
-    for (const auto& runtimeObj : runtimeObjectList)                                                                          \
-    {                                                                                                                         \
-        if (til::contains_linguistic_insensitive(runtimeObjectIdentifier, sanitizedQuery))                                    \
-        {                                                                                                                     \
-            /*results.push_back(winrt::make<FilteredSearchResult>(, profile));*/                                              \
-        }                                                                                                                     \
-                                                                                                                              \
-        for (const auto* indexEntry : filteredSearchIndex)                                                                    \
-        {                                                                                                                     \
-            results.push_back(winrt::make<FilteredSearchResult>(indexEntry, navigationArgOverride));                          \
-        }                                                                                                                     \
+#define APPEND_RUNTIME_OBJECT_RESULTS(runtimeObjectList, runtimeObjectIdentifier, filteredSearchIndex, navigationArgOverride)    \
+    for (const auto& runtimeObj : runtimeObjectList)                                                                             \
+    {                                                                                                                            \
+        if (til::contains_linguistic_insensitive(runtimeObjectIdentifier, sanitizedQuery))                                       \
+        {                                                                                                                        \
+            /*results.push_back(winrt::make<FilteredSearchResult>(<NEED ANOTHER PARAM>, runtimeObj, runtimeObjectIdentifier));*/ \
+        }                                                                                                                        \
+                                                                                                                                 \
+        for (const auto* indexEntry : filteredSearchIndex)                                                                       \
+        {                                                                                                                        \
+            results.push_back(winrt::make<FilteredSearchResult>(indexEntry, navigationArgOverride));                             \
+        }                                                                                                                        \
     }
 
             // Profiles
@@ -1122,7 +1123,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 {
                     // TODO CARLOS: if name matches, link the top-level page
                     //   can't do that rn because I need a LocalizedIndexEntry stored somewhere for that
-                    //results.push_back(winrt::make<FilteredSearchResult>(, profile));
+                    // SPECIFICALLY, I NEED TO CONVERT PartialProfileIndexEntry into a LocalizedIndexEntry (which is dumb, because there's nothing to localize)
+                    //results.push_back(winrt::make<FilteredSearchResult>(&PartialProfileIndexEntry(), profile));//, std::optional<hstring>{ profile.Name() }));
                 }
 
                 for (const auto* indexEntry : _filteredSearchProfileIndex)
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.h b/src/cascadia/TerminalSettingsEditor/MainPage.h
index 06994d581e9..7b23bab9b7b 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.h
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.h
@@ -42,9 +42,10 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         FilteredSearchResult(const winrt::hstring& label) :
             _overrideLabel{ label } {}
 
-        FilteredSearchResult(const LocalizedIndexEntry* entry, const Windows::Foundation::IInspectable& navigationArgOverride = nullptr) :
+        FilteredSearchResult(const LocalizedIndexEntry* entry, const Windows::Foundation::IInspectable& navigationArgOverride = nullptr, const std::optional<hstring>& label = std::nullopt) :
             _SearchIndexEntry{ entry },
-            _NavigationArgOverride{ navigationArgOverride } {}
+            _NavigationArgOverride{ navigationArgOverride },
+            _overrideLabel{ label } {}
 
         hstring ToString() { return Label(); }
 
diff --git a/tools/GenerateSettingsIndex.ps1 b/tools/GenerateSettingsIndex.ps1
index 6519206e0c4..fa3b431e2e9 100644
--- a/tools/GenerateSettingsIndex.ps1
+++ b/tools/GenerateSettingsIndex.ps1
@@ -93,58 +93,126 @@ Get-ChildItem -Path $SourceDir -Recurse -Filter *.xaml | ForEach-Object {
         $subPage += 'None'
     }
 
-    if ($filename -eq 'ColorSchemes.xaml')
+    # Register top-level pages
+    if ($filename -eq 'Launch.xaml')
     {
-        # ColorSchemes.xaml doesn't have any SettingContainers!
-        
-        # TODO CARLOS: remove from script; hard code in MainPage instead
-        # Register the page itself
-        # $entries += [pscustomobject]@{
-        #     DisplayText     = 'vm'
-        #     ParentPage      = "winrt::xaml_typename<Microsoft::Terminal::Settings::Editor::ColorSchemes>()"
-        #     NavigationParam = "winrt::box_value(hstring{L`"ColorSchemes_Nav`"})"
-        #     SubPage         = 'BreadcrumbSubPage::ColorSchemes_Edit'
-        #     ElementName    = 'L""'
-        #     File            = $filename
-        # }
-
-        # TODO CARLOS: remove from script; hard code in MainPage instead
+        $entries += [pscustomobject]@{
+            DisplayTextLocalized = "RS_(L`"Nav_Launch/Content`")"
+            HelpTextLocalized    = "std::nullopt"
+            ParentPage           = "winrt::xaml_typename<$($pageClass)>()"
+            NavigationParam      = "winrt::box_value(hstring{L`"Launch_Nav`"})"
+            SubPage              = "BreadcrumbSubPage::None"
+            ElementName          = 'L""'
+            File                 = $filename
+        }
+    }
+    elseif ($filename -eq 'Interaction.xaml')
+    {
+        $entries += [pscustomobject]@{
+            DisplayTextLocalized = "RS_(L`"Nav_Interaction/Content`")"
+            HelpTextLocalized    = "std::nullopt"
+            ParentPage           = "winrt::xaml_typename<$($pageClass)>()"
+            NavigationParam      = "winrt::box_value(hstring{L`"Interaction_Nav`"})"
+            SubPage              = "BreadcrumbSubPage::None"
+            ElementName          = 'L""'
+            File                 = $filename
+        }
+    }
+    elseif ($filename -eq 'GlobalAppearance.xaml')
+    {
+        $entries += [pscustomobject]@{
+            DisplayTextLocalized = "RS_(L`"Nav_Appearance/Content`")"
+            HelpTextLocalized    = "std::nullopt"
+            ParentPage           = "winrt::xaml_typename<$($pageClass)>()"
+            NavigationParam      = "winrt::box_value(hstring{L`"Appearance_Nav`"})"
+            SubPage              = "BreadcrumbSubPage::None"
+            ElementName          = 'L""'
+            File                 = $filename
+        }
+    }
+    elseif ($filename -eq 'ColorSchemes.xaml')
+    {
+        $entries += [pscustomobject]@{
+            DisplayTextLocalized = "RS_(L`"Nav_ColorSchemes/Content`")"
+            HelpTextLocalized    = "std::nullopt"
+            ParentPage           = "winrt::xaml_typename<$($pageClass)>()"
+            NavigationParam      = "winrt::box_value(hstring{L`"ColorSchemes_Nav`"})"
+            SubPage              = "BreadcrumbSubPage::None"
+            ElementName          = 'L""'
+            File                 = $filename
+        }
+
         # Manually register the "add new" button
-        # $entries += [pscustomobject]@{
-        #     DisplayText     = 'RS_(L"ColorScheme_AddNewButton/Text")'
-        #     ParentPage      = "winrt::xaml_typename<Microsoft::Terminal::Settings::Editor::ColorSchemes>()"
-        #     NavigationParam = "winrt::box_value(hstring{L`"ColorSchemes_Nav`"})"
-        #     SubPage         = 'BreadcrumbSubPage::None'
-        #     ElementName    = 'L"AddNewButton"'
-        #     File            = $filename
-        # }
-        return
+        $entries += [pscustomobject]@{
+            DisplayTextLocalized = 'RS_(L"ColorScheme_AddNewButton/Text")'
+            HelpTextLocalized    = 'std::nullopt'
+            ParentPage           = "winrt::xaml_typename<$($pageClass)>()"
+            NavigationParam      = "winrt::box_value(hstring{L`"ColorSchemes_Nav`"})"
+            SubPage              = 'BreadcrumbSubPage::None'
+            ElementName          = 'L"AddNewButton"'
+            File                 = $filename
+        }
+
+    }
+    elseif ($filename -eq 'Rendering.xaml')
+    {
+        $entries += [pscustomobject]@{
+            DisplayTextLocalized = "RS_(L`"Nav_Rendering/Content`")"
+            HelpTextLocalized    = "std::nullopt"
+            ParentPage           = "winrt::xaml_typename<$($pageClass)>()"
+            NavigationParam      = "winrt::box_value(hstring{L`"Rendering_Nav`"})"
+            SubPage              = "BreadcrumbSubPage::None"
+            ElementName          = 'L""'
+            File                 = $filename
+        }
+    }
+    elseif ($filename -eq 'Compatibility.xaml')
+    {
+        $entries += [pscustomobject]@{
+            DisplayTextLocalized = "RS_(L`"Nav_Compatibility/Content`")"
+            HelpTextLocalized    = "std::nullopt"
+            ParentPage           = "winrt::xaml_typename<$($pageClass)>()"
+            NavigationParam      = "winrt::box_value(hstring{L`"Compatibility_Nav`"})"
+            SubPage              = "BreadcrumbSubPage::None"
+            ElementName          = 'L""'
+            File                 = $filename
+        }
+    }
+    elseif ($filename -eq 'Actions.xaml')
+    {
+        $entries += [pscustomobject]@{
+            DisplayTextLocalized = "RS_(L`"Nav_Actions/Content`")"
+            HelpTextLocalized    = "std::nullopt"
+            ParentPage           = "winrt::xaml_typename<$($pageClass)>()"
+            NavigationParam      = "winrt::box_value(hstring{L`"Actions_Nav`"})"
+            SubPage              = "BreadcrumbSubPage::None"
+            ElementName          = 'L""'
+            File                 = $filename
+        }
+    }
+    elseif ($filename -eq 'NewTabMenu.xaml')
+    {
+        $entries += [pscustomobject]@{
+            DisplayTextLocalized = "RS_(L`"Nav_NewTabMenu/Content`")"
+            HelpTextLocalized    = "std::nullopt"
+            ParentPage           = "winrt::xaml_typename<$($pageClass)>()"
+            NavigationParam      = "winrt::box_value(hstring{L`"NewTabMenu_Nav`"})"
+            SubPage              = "BreadcrumbSubPage::None"
+            ElementName          = 'L""'
+            File                 = $filename
+        }
     }
     elseif ($filename -eq 'Extensions.xaml')
     {
-
-        # TODO CARLOS: remove from script; hard code in MainPage instead
-        # Register the main extension page
-        # $entries += [pscustomobject]@{
-        #     DisplayText     = 'RS_(L"Nav_Extensions/Content")'
-        #     ParentPage      = "winrt::xaml_typename<Microsoft::Terminal::Settings::Editor::Extensions>()"
-        #     NavigationParam = "nullptr"
-        #     SubPage         = 'BreadcrumbSubPage::None'
-        #     ElementName    = 'L""'
-        #     File            = $filename
-        # }
-
-        # TODO CARLOS: remove from script; hard code in MainPage instead
-        # Register the extension view
-        # $entries += [pscustomobject]@{
-        #     DisplayText     = 'vm.Package().DisplayName()'
-        #     ParentPage      = "winrt::xaml_typename<Microsoft::Terminal::Settings::Editor::Extensions>()"
-        #     NavigationParam = "vm"
-        #     SubPage         = 'BreadcrumbSubPage::Extensions_Extension'
-        #     ElementName    = 'L""'
-        #     File            = $filename
-        # }
-        return
+        $entries += [pscustomobject]@{
+            DisplayTextLocalized = "RS_(L`"Nav_Extensions/Content`")"
+            HelpTextLocalized    = "std::nullopt"
+            ParentPage           = "winrt::xaml_typename<$($pageClass)>()"
+            NavigationParam      = "winrt::box_value(hstring{L`"Extensions_Nav`"})"
+            SubPage              = "BreadcrumbSubPage::None"
+            ElementName          = 'L""'
+            File                 = $filename
+        }
     }
 
     # Find all local:SettingContainer start tags
@@ -286,7 +354,7 @@ Get-ChildItem -Path $SourceDir -Recurse -Filter *.xaml | ForEach-Object {
 }
 
 # Ensure there aren't any duplicate entries
-$entries = $entries | Sort-Object RootUid, ParentPage, NavigationParam, SubPage, ElementName, File -Unique
+$entries = $entries | Sort-Object DisplayTextLocalized, HelpTextLocalized, ParentPage, NavigationParam, SubPage, ElementName, File -Unique
 
 $buildTimeEntries = @()
 $profileEntries = @()
@@ -340,6 +408,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         // May not exist for all entries
         std::optional<hstring> HelpTextLocalized;
 
+        // TODO CARLOS: this might not be necessary; remove
         // x:Class of the parent Page (i.e. winrt::xaml_typename<Microsoft::Terminal::Settings::Editor::Launch>())
         winrt::Windows::UI::Xaml::Interop::TypeName ParentPage;
 
@@ -357,6 +426,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     const std::array<IndexEntry, $($profileEntries.Count)>& LoadProfileIndex();
     const std::array<IndexEntry, $($ntmEntries.Count)>& LoadNTMFolderIndex();
     const std::array<IndexEntry, $($schemeEntries.Count)>& LoadColorSchemeIndex();
+
+    const IndexEntry& PartialProfileIndexEntry();
 }
 "@
 
@@ -406,6 +477,12 @@ $( ($schemeEntries -join "`r`n") )
         };
         return entries;
     }
+
+    const IndexEntry& PartialProfileIndexEntry()
+    {
+        static IndexEntry entry{ L"", std::nullopt, winrt::xaml_typename<Microsoft::Terminal::Settings::Editor::Profiles_Base>(), nullptr, BreadcrumbSubPage::None, L"" };
+        return entry;
+    }
 }
 "@
 

From 532343f1cec0a9a25b6773da065f3e72d823a676 Mon Sep 17 00:00:00 2001
From: Carlos Zamora <cazamor@microsoft.com>
Date: Mon, 3 Nov 2025 16:27:12 -0800
Subject: [PATCH 07/25] runtime object indexing

---
 .../TerminalSettingsEditor/Actions.cpp        |   1 -
 .../TerminalSettingsEditor/ColorSchemes.cpp   |   1 -
 .../TerminalSettingsEditor/Extensions.cpp     |   1 -
 .../TerminalSettingsEditor/MainPage.cpp       | 171 +++++++-----------
 .../TerminalSettingsEditor/MainPage.h         |  37 +++-
 .../TerminalSettingsEditor/NewTabMenu.cpp     |   1 -
 .../Resources/en-US/Resources.resw            |   4 +-
 src/cascadia/TerminalSettingsEditor/Utils.h   |   2 +
 tools/GenerateSettingsIndex.ps1               |  21 +++
 9 files changed, 114 insertions(+), 125 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/Actions.cpp b/src/cascadia/TerminalSettingsEditor/Actions.cpp
index cf2d4a50248..619595a9ad3 100644
--- a/src/cascadia/TerminalSettingsEditor/Actions.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Actions.cpp
@@ -30,7 +30,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         const auto args = e.Parameter().as<Editor::NavigateToActionsArgs>();
         _ViewModel = args.ViewModel();
 
-        // TODO CARLOS: runtime indexing and retrieval support
         BringIntoViewWhenLoaded(args.ElementToFocus());
 
         // Subscribe to the view model's FocusContainer event.
diff --git a/src/cascadia/TerminalSettingsEditor/ColorSchemes.cpp b/src/cascadia/TerminalSettingsEditor/ColorSchemes.cpp
index b0daa6817ee..d5aa3d290ab 100644
--- a/src/cascadia/TerminalSettingsEditor/ColorSchemes.cpp
+++ b/src/cascadia/TerminalSettingsEditor/ColorSchemes.cpp
@@ -39,7 +39,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         _ViewModel = args.ViewModel();
         _ViewModel.CurrentPage(ColorSchemesSubPage::Base);
 
-        // TODO CARLOS: runtime indexing and retrieval support
         BringIntoViewWhenLoaded(args.ElementToFocus());
 
         _layoutUpdatedRevoker = LayoutUpdated(winrt::auto_revoke, [this](auto /*s*/, auto /*e*/) {
diff --git a/src/cascadia/TerminalSettingsEditor/Extensions.cpp b/src/cascadia/TerminalSettingsEditor/Extensions.cpp
index 3d731561e72..f5be54dfd8a 100644
--- a/src/cascadia/TerminalSettingsEditor/Extensions.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Extensions.cpp
@@ -41,7 +41,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         vmImpl->LazyLoadExtensions();
         vmImpl->MarkAsVisited();
 
-        // TODO CARLOS: runtime indexing and retrieval support
         BringIntoViewWhenLoaded(args.ElementToFocus());
 
         if (vmImpl->IsExtensionView())
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
index 59e4999ba48..e1155e87ce2 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
@@ -1081,103 +1081,55 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
         // must be IInspectable to be used as ItemsSource
         std::vector<IInspectable> results;
-        if (_filteredSearchIndex->empty())
+        // Package filtered search index objects into WinRT FilteredSearchResults for UI
+        for (const auto* indexEntry : _filteredSearchIndex->mainIndex)
         {
-            // Explicitly show "no results"
-
-            // TODO CARLOS: use RS_switchable_fmt from ActionArgs.cpp
-            const hstring noResultsText{ fmt::format(fmt::runtime(std::wstring{ RS_(L"Search_NoResults") }), sanitizedQuery) };
-
-            results.reserve(1);
-            results.push_back(winrt::make<FilteredSearchResult>(noResultsText));
+            results.push_back(winrt::make<FilteredSearchResult>(indexEntry));
         }
-        else
-        {
-            // Package filtered search index objects into WinRT FilteredSearchResults for UI
-            for (const auto* indexEntry : *_filteredSearchIndex)
-            {
-                results.push_back(winrt::make<FilteredSearchResult>(indexEntry));
-            }
 
-            // TODO CARLOS: use the macro below for runtime objects once everything is verified to be working right
-#define APPEND_RUNTIME_OBJECT_RESULTS(runtimeObjectList, runtimeObjectIdentifier, filteredSearchIndex, navigationArgOverride)    \
-    for (const auto& runtimeObj : runtimeObjectList)                                                                             \
-    {                                                                                                                            \
-        if (til::contains_linguistic_insensitive(runtimeObjectIdentifier, sanitizedQuery))                                       \
-        {                                                                                                                        \
-            /*results.push_back(winrt::make<FilteredSearchResult>(<NEED ANOTHER PARAM>, runtimeObj, runtimeObjectIdentifier));*/ \
-        }                                                                                                                        \
-                                                                                                                                 \
-        for (const auto* indexEntry : filteredSearchIndex)                                                                       \
-        {                                                                                                                        \
-            results.push_back(winrt::make<FilteredSearchResult>(indexEntry, navigationArgOverride));                             \
-        }                                                                                                                        \
+#define APPEND_RUNTIME_OBJECT_RESULTS(runtimeObjectList, nameAccessor, filteredSearchIndex, partialSearchIndexEntry, navigationArgTransform) \
+    for (const auto& runtimeObj : runtimeObjectList)                                                                                         \
+    {                                                                                                                                        \
+        const auto& objName = nameAccessor;                                                                                                  \
+        const bool nameMatches = til::contains_linguistic_insensitive(objName, sanitizedQuery);                                              \
+                                                                                                                                             \
+        if (nameMatches)                                                                                                                     \
+        {                                                                                                                                    \
+            results.push_back(winrt::make<FilteredSearchResult>(&partialSearchIndexEntry, runtimeObj, std::optional<hstring>{ objName }));   \
+        }                                                                                                                                    \
+                                                                                                                                             \
+        for (const auto* indexEntry : filteredSearchIndex)                                                                                   \
+        {                                                                                                                                    \
+            results.push_back(winrt::make<FilteredSearchResult>(indexEntry, navigationArgTransform));                                        \
+        }                                                                                                                                    \
     }
 
-            // Profiles
-            //APPEND_RUNTIME_OBJECT_RESULTS(_profileVMs, runtimeObj.Name(), _filteredSearchProfileIndex, runtimeObj)
-            for (const auto& profile : _profileVMs)
-            {
-                // TODO CARLOS: replace with fuzzy search
-                if (til::contains_linguistic_insensitive(profile.Name(), sanitizedQuery))
-                {
-                    // TODO CARLOS: if name matches, link the top-level page
-                    //   can't do that rn because I need a LocalizedIndexEntry stored somewhere for that
-                    // SPECIFICALLY, I NEED TO CONVERT PartialProfileIndexEntry into a LocalizedIndexEntry (which is dumb, because there's nothing to localize)
-                    //results.push_back(winrt::make<FilteredSearchResult>(&PartialProfileIndexEntry(), profile));//, std::optional<hstring>{ profile.Name() }));
-                }
+        // Profiles
+        APPEND_RUNTIME_OBJECT_RESULTS(_profileVMs, runtimeObj.Name(), _filteredSearchIndex->profileIndex, _searchIndex->profileIndexEntry, runtimeObj)
 
-                for (const auto* indexEntry : _filteredSearchProfileIndex)
-                {
-                    results.push_back(winrt::make<FilteredSearchResult>(indexEntry, profile));
-                }
-            }
+        // New Tab Menu (Folder View)
+        APPEND_RUNTIME_OBJECT_RESULTS(get_self<implementation::NewTabMenuViewModel>(_newTabMenuPageVM)->FolderTreeFlatList(), runtimeObj.Name(), _filteredSearchIndex->ntmFolderIndex, _searchIndex->ntmFolderIndexEntry, runtimeObj)
 
-            // New Tab Menu (Folder View)
-            //APPEND_RUNTIME_OBJECT_RESULTS(get_self<implementation::NewTabMenuViewModel>(_newTabMenuPageVM)->FolderTreeFlatList(), runtimeObj.Name(), _filteredSearchNTMFolderIndex, runtimeObj)
-            for (const auto& ntmFolder : get_self<implementation::NewTabMenuViewModel>(_newTabMenuPageVM)->FolderTreeFlatList())
-            {
-                if (til::contains_linguistic_insensitive(ntmFolder.Name(), sanitizedQuery))
-                {
-                    // TODO CARLOS: if name matches, link the top-level page
-                    //   can't do that rn because I need a LocalizedIndexEntry stored somewhere for that
-                    //results.push_back(winrt::make<FilteredSearchResult>(, ntmFolder));
-                }
+        // Color schemes
+        APPEND_RUNTIME_OBJECT_RESULTS(_colorSchemesPageVM.AllColorSchemes(), runtimeObj.Name(), _filteredSearchIndex->colorSchemeIndex, _searchIndex->colorSchemeIndexEntry, winrt::box_value(runtimeObj.Name()))
 
-                for (const auto* indexEntry : _filteredSearchNTMFolderIndex)
-                {
-                    results.push_back(winrt::make<FilteredSearchResult>(indexEntry, ntmFolder));
-                }
+        for (const auto& extension : _extensionsVM.ExtensionPackages())
+        {
+            if (til::contains_linguistic_insensitive(extension.Package().DisplayName(), sanitizedQuery))
+            {
+                results.push_back(winrt::make<FilteredSearchResult>(&_searchIndex->extensionIndexEntry, extension, std::optional<hstring>{ extension.Package().DisplayName() }));
             }
+        }
 
-            // Color schemes
-            //APPEND_RUNTIME_OBJECT_RESULTS(_colorSchemesPageVM.AllColorSchemes(), runtimeObj.Name(), _filteredSearchColorSchemeIndex, winrt::box_value(runtimeObj.Name()))
-            for (const auto& scheme : _colorSchemesPageVM.AllColorSchemes())
-            {
-                if (til::contains_linguistic_insensitive(scheme.Name(), sanitizedQuery))
-                {
-                    // TODO CARLOS: if name matches, link the top-level page
-                    //   can't do that rn because I need a LocalizedIndexEntry stored somewhere for that
-                    //results.push_back(winrt::make<FilteredSearchResult>(, scheme));
-                }
+        if (results.empty())
+        {
+            // Explicitly show "no results"
 
-                for (const auto* indexEntry : _filteredSearchColorSchemeIndex)
-                {
-                    results.push_back(winrt::make<FilteredSearchResult>(indexEntry, winrt::box_value(scheme.Name())));
-                }
-            }
+            // TODO CARLOS: use RS_switchable_fmt from ActionArgs.cpp
+            const hstring noResultsText{ fmt::format(fmt::runtime(std::wstring{ RS_(L"Search_NoResults") }), sanitizedQuery) };
 
-            // TODO CARLOS:
-            // - if match with extension name, go to extension page
-            for (const auto& extension : _extensionsVM.ExtensionPackages())
-            {
-                if (til::contains_linguistic_insensitive(extension.Package().DisplayName(), sanitizedQuery))
-                {
-                    // TODO CARLOS: if name matches, link the top-level page
-                    //   can't do that rn because I need a LocalizedIndexEntry stored somewhere for that
-                    //results.push_back(winrt::make<FilteredSearchResult>(, ntmFolder));
-                }
-            }
+            results.reserve(1);
+            results.push_back(winrt::make<FilteredSearchResult>(noResultsText));
         }
 #undef APPEND_RUNTIME_OBJECT_RESULTS
 
@@ -1190,7 +1142,9 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     // Update _filteredSearchIndex with results matching queryText
     til::generation_t MainPage::_QuerySearchIndex(const hstring& queryText)
     {
-        auto filteredResults{ _filteredSearchIndex.write() };
+        auto filteredSearchIndex{ _filteredSearchIndex.write() };
+        const auto generation = _filteredSearchIndex.generation();
+        wil::hide_name _filteredSearchIndex;
 
         auto findMatchingResults = [&queryText](const std::vector<LocalizedIndexEntry>& searchIndex, std::vector<const LocalizedIndexEntry*>& filteredIndex) {
             filteredIndex.clear();
@@ -1210,18 +1164,18 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         };
 
         // build-time search index can be filtered and returned pretty much as-is
-        findMatchingResults(_searchIndex, *filteredResults);
+        findMatchingResults(_searchIndex->mainIndex, filteredSearchIndex->mainIndex);
 
         // Profiles
-        findMatchingResults(_searchProfileIndex, _filteredSearchProfileIndex);
+        findMatchingResults(_searchIndex->profileIndex, filteredSearchIndex->profileIndex);
 
         // New Tab Menu (Folder View)
-        findMatchingResults(_searchNTMFolderIndex, _filteredSearchNTMFolderIndex);
+        findMatchingResults(_searchIndex->ntmFolderIndex, filteredSearchIndex->ntmFolderIndex);
 
         // Color schemes
-        findMatchingResults(_searchColorSchemeIndex, _filteredSearchColorSchemeIndex);
+        findMatchingResults(_searchIndex->colorSchemeIndex, filteredSearchIndex->colorSchemeIndex);
 
-        return _filteredSearchIndex.generation();
+        return generation;
     }
 
     void MainPage::SettingsSearchBox_QuerySubmitted(const AutoSuggestBox& /*sender*/, const AutoSuggestBoxQuerySubmittedEventArgs& args)
@@ -1272,10 +1226,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
         // These are the new index entries we are building.
         // Don't actually modify the members until we're completely done here.
-        std::vector<LocalizedIndexEntry> localizedIndex;
-        std::vector<LocalizedIndexEntry> localizedProfileIndex;
-        std::vector<LocalizedIndexEntry> localizedNTMFolderIndex;
-        std::vector<LocalizedIndexEntry> localizedColorSchemeIndex;
+        SearchIndex searchIndex;
 
         // TODO CARLOS: actually use this
         // copied from CommandPaletteItems.h
@@ -1297,58 +1248,60 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         }();
 
         const auto& buildIndex = LoadBuildTimeIndex();
-        localizedIndex.reserve(buildIndex.size());
+        searchIndex.mainIndex.reserve(buildIndex.size());
         for (const auto& entry : buildIndex)
         {
             // TODO CARLOS: properly populate LocalizedIndexEntry
             LocalizedIndexEntry localizedEntry;
             localizedEntry.Entry = &entry;
-            localizedIndex.push_back(localizedEntry);
+            searchIndex.mainIndex.push_back(localizedEntry);
         }
 
         // Load profiles
         const auto& profileIndex = LoadProfileIndex();
-        localizedProfileIndex.reserve(profileIndex.size());
+        searchIndex.profileIndex.reserve(profileIndex.size());
         for (const auto& entry : profileIndex)
         {
             // TODO CARLOS: properly populate LocalizedIndexEntry
             LocalizedIndexEntry localizedEntry;
             localizedEntry.Entry = &entry;
-            localizedProfileIndex.push_back(localizedEntry);
+            searchIndex.profileIndex.push_back(localizedEntry);
         }
+        searchIndex.profileIndexEntry.Entry = &PartialProfileIndexEntry();
 
         // Load new tab menu
         const auto& ntmFolderIndex = LoadNTMFolderIndex();
-        localizedNTMFolderIndex.reserve(ntmFolderIndex.size());
+        searchIndex.ntmFolderIndex.reserve(ntmFolderIndex.size());
         for (const auto& entry : ntmFolderIndex)
         {
             // TODO CARLOS: properly populate LocalizedIndexEntry
             LocalizedIndexEntry localizedEntry;
             localizedEntry.Entry = &entry;
-            localizedNTMFolderIndex.push_back(localizedEntry);
+            searchIndex.ntmFolderIndex.push_back(localizedEntry);
         }
+        searchIndex.ntmFolderIndexEntry.Entry = &PartialNTMFolderIndexEntry();
 
-        // Nothing to load for extensions.
-        // At query time, we'll search for matching extension names.
+        // Load extensions
+        // Nothing to load at build time.
+        // At query time, we'll search for matching extension names and use this entry below
+        searchIndex.extensionIndexEntry.Entry = &PartialExtensionIndexEntry();
 
         // Load color schemes
         const auto& colorSchemesIndex = LoadColorSchemeIndex();
-        localizedColorSchemeIndex.reserve(colorSchemesIndex.size());
+        searchIndex.colorSchemeIndex.reserve(colorSchemesIndex.size());
         for (const auto& entry : colorSchemesIndex)
         {
             // TODO CARLOS: properly populate LocalizedIndexEntry
             LocalizedIndexEntry localizedEntry;
             localizedEntry.Entry = &entry;
-            localizedColorSchemeIndex.push_back(localizedEntry);
+            searchIndex.colorSchemeIndex.push_back(localizedEntry);
         }
+        searchIndex.colorSchemeIndexEntry.Entry = &PartialColorSchemeIndexEntry();
 
         // Load actions
         // TODO CARLOS: postpone until actions page is updated
 
-        _searchIndex = std::move(localizedIndex);
-        _searchProfileIndex = std::move(localizedProfileIndex);
-        _searchNTMFolderIndex = std::move(localizedNTMFolderIndex);
-        _searchColorSchemeIndex = std::move(localizedColorSchemeIndex);
+        *_searchIndex.write() = std::move(searchIndex);
     }
 
     const ScopedResourceLoader& EnglishOnlyResourceLoader() noexcept
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.h b/src/cascadia/TerminalSettingsEditor/MainPage.h
index 7b23bab9b7b..9376e5a7e43 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.h
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.h
@@ -71,7 +71,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
         bool IsNoResultsPlaceholder() const
         {
-            return _overrideLabel.has_value();
+            return _overrideLabel.has_value() && !_NavigationArgOverride;
         }
 
         const LocalizedIndexEntry& SearchIndexEntry() const noexcept
@@ -94,7 +94,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     private:
         const std::optional<winrt::hstring> _overrideLabel{ std::nullopt };
-        const Windows::Foundation::IInspectable& _NavigationArgOverride{ nullptr };
+        const Windows::Foundation::IInspectable _NavigationArgOverride{ nullptr };
         const LocalizedIndexEntry* _SearchIndexEntry{ nullptr };
     };
 
@@ -164,14 +164,31 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         winrt::Microsoft::Terminal::Settings::Editor::NewTabMenuViewModel _newTabMenuPageVM{ nullptr };
         winrt::Microsoft::Terminal::Settings::Editor::ExtensionsViewModel _extensionsVM{ nullptr };
 
-        std::vector<LocalizedIndexEntry> _searchIndex;
-        std::vector<LocalizedIndexEntry> _searchProfileIndex;
-        std::vector<LocalizedIndexEntry> _searchNTMFolderIndex;
-        std::vector<LocalizedIndexEntry> _searchColorSchemeIndex;
-        til::generational<std::vector<const LocalizedIndexEntry*>> _filteredSearchIndex;
-        std::vector<const LocalizedIndexEntry*> _filteredSearchProfileIndex;
-        std::vector<const LocalizedIndexEntry*> _filteredSearchNTMFolderIndex;
-        std::vector<const LocalizedIndexEntry*> _filteredSearchColorSchemeIndex;
+        struct SearchIndex
+        {
+            SearchIndex& operator=(const SearchIndex& other) = default;
+
+            std::vector<LocalizedIndexEntry> mainIndex;
+            std::vector<LocalizedIndexEntry> profileIndex;
+            std::vector<LocalizedIndexEntry> ntmFolderIndex;
+            std::vector<LocalizedIndexEntry> colorSchemeIndex;
+
+            // Links to main page; used when searching runtime objects (i.e. profile/extension name --> Profile_Base/Extension View)
+            LocalizedIndexEntry profileIndexEntry;
+            LocalizedIndexEntry ntmFolderIndexEntry;
+            LocalizedIndexEntry colorSchemeIndexEntry;
+            LocalizedIndexEntry extensionIndexEntry;
+        };
+        til::generational<SearchIndex> _searchIndex;
+
+        struct FilteredSearchIndex
+        {
+            std::vector<const LocalizedIndexEntry*> mainIndex;
+            std::vector<const LocalizedIndexEntry*> profileIndex;
+            std::vector<const LocalizedIndexEntry*> ntmFolderIndex;
+            std::vector<const LocalizedIndexEntry*> colorSchemeIndex;
+        };
+        til::generational<FilteredSearchIndex> _filteredSearchIndex;
 
         Windows::UI::Xaml::Data::INotifyPropertyChanged::PropertyChanged_revoker _profileViewModelChangedRevoker;
         Windows::UI::Xaml::Data::INotifyPropertyChanged::PropertyChanged_revoker _colorSchemesPageViewModelChangedRevoker;
diff --git a/src/cascadia/TerminalSettingsEditor/NewTabMenu.cpp b/src/cascadia/TerminalSettingsEditor/NewTabMenu.cpp
index 16e891162f8..c62a8ca1422 100644
--- a/src/cascadia/TerminalSettingsEditor/NewTabMenu.cpp
+++ b/src/cascadia/TerminalSettingsEditor/NewTabMenu.cpp
@@ -46,7 +46,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         const auto args = e.Parameter().as<Editor::NavigateToNewTabMenuArgs>();
         _ViewModel = args.ViewModel();
 
-        // TODO CARLOS: runtime indexing and retrieval support
         BringIntoViewWhenLoaded(args.ElementToFocus());
 
         TraceLoggingWrite(
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
index dcff9e6d067..fd135b60db8 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
@@ -2472,7 +2472,7 @@
     <comment>Placeholder text for the main search box in the settings editor.</comment>
   </data>
   <data name="Search_NoResults" xml:space="preserve">
-    <value>No results for {}</value>
-    <comment>{Locked="{}"} Displayed when no results were found for a given query. "{}" will be replaced with the query.</comment>
+    <value>No results for "{}"</value>
+    <comment>{Locked=""{}""} Displayed when no results were found for a given query. "{}" will be replaced with the query.</comment>
   </data>
 </root>
\ No newline at end of file
diff --git a/src/cascadia/TerminalSettingsEditor/Utils.h b/src/cascadia/TerminalSettingsEditor/Utils.h
index 6ac8a6b9bdf..745e908beaf 100644
--- a/src/cascadia/TerminalSettingsEditor/Utils.h
+++ b/src/cascadia/TerminalSettingsEditor/Utils.h
@@ -3,6 +3,8 @@
 
 #pragma once
 
+#include "SettingContainer.h"
+
 // This macro must be used alongside GETSET_BINDABLE_ENUM_SETTING.
 // Use this in your class's constructor after Initialize_Component().
 // It sorts and initializes the observable list of enum entries with the enum name
diff --git a/tools/GenerateSettingsIndex.ps1 b/tools/GenerateSettingsIndex.ps1
index fa3b431e2e9..9922f5b7edf 100644
--- a/tools/GenerateSettingsIndex.ps1
+++ b/tools/GenerateSettingsIndex.ps1
@@ -428,6 +428,9 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     const std::array<IndexEntry, $($schemeEntries.Count)>& LoadColorSchemeIndex();
 
     const IndexEntry& PartialProfileIndexEntry();
+    const IndexEntry& PartialNTMFolderIndexEntry();
+    const IndexEntry& PartialColorSchemeIndexEntry();
+    const IndexEntry& PartialExtensionIndexEntry();
 }
 "@
 
@@ -483,6 +486,24 @@ $( ($schemeEntries -join "`r`n") )
         static IndexEntry entry{ L"", std::nullopt, winrt::xaml_typename<Microsoft::Terminal::Settings::Editor::Profiles_Base>(), nullptr, BreadcrumbSubPage::None, L"" };
         return entry;
     }
+
+    const IndexEntry& PartialNTMFolderIndexEntry()
+    {
+        static IndexEntry entry{ L"", std::nullopt, winrt::xaml_typename<Microsoft::Terminal::Settings::Editor::NewTabMenu>(), nullptr, BreadcrumbSubPage::NewTabMenu_Folder, L"" };
+        return entry;
+    }
+
+    const IndexEntry& PartialColorSchemeIndexEntry()
+    {
+        static IndexEntry entry{ L"", std::nullopt, winrt::xaml_typename<Microsoft::Terminal::Settings::Editor::EditColorScheme>(), nullptr, BreadcrumbSubPage::ColorSchemes_Edit, L"" };
+        return entry;
+    }
+
+    const IndexEntry& PartialExtensionIndexEntry()
+    {
+        static IndexEntry entry{ L"", std::nullopt, winrt::xaml_typename<Microsoft::Terminal::Settings::Editor::Extensions>(), nullptr, BreadcrumbSubPage::Extensions_Extension, L"" };
+        return entry;
+    }
 }
 "@
 

From e84e8d408fb17c824b5fa3c9849102d2d29c5017 Mon Sep 17 00:00:00 2001
From: Carlos Zamora <cazamor@microsoft.com>
Date: Mon, 3 Nov 2025 17:02:03 -0800
Subject: [PATCH 08/25] add language neutral search

---
 .../TerminalSettingsEditor/MainPage.cpp       | 67 +++++++----------
 tools/GenerateSettingsIndex.ps1               | 73 +++++++++++++------
 2 files changed, 75 insertions(+), 65 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
index e1155e87ce2..dede4b93edb 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
@@ -1124,12 +1124,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         if (results.empty())
         {
             // Explicitly show "no results"
-
-            // TODO CARLOS: use RS_switchable_fmt from ActionArgs.cpp
-            const hstring noResultsText{ fmt::format(fmt::runtime(std::wstring{ RS_(L"Search_NoResults") }), sanitizedQuery) };
-
             results.reserve(1);
-            results.push_back(winrt::make<FilteredSearchResult>(noResultsText));
+            results.push_back(winrt::make<FilteredSearchResult>(fmt::format(fmt::runtime(std::wstring{ RS_(L"Search_NoResults") }), sanitizedQuery)));
         }
 #undef APPEND_RUNTIME_OBJECT_RESULTS
 
@@ -1228,7 +1224,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         // Don't actually modify the members until we're completely done here.
         SearchIndex searchIndex;
 
-        // TODO CARLOS: actually use this
         // copied from CommandPaletteItems.h
         static bool shouldIncludeLanguageNeutralResources = [] {
             try
@@ -1247,38 +1242,34 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             return false;
         }();
 
-        const auto& buildIndex = LoadBuildTimeIndex();
-        searchIndex.mainIndex.reserve(buildIndex.size());
-        for (const auto& entry : buildIndex)
-        {
-            // TODO CARLOS: properly populate LocalizedIndexEntry
-            LocalizedIndexEntry localizedEntry;
-            localizedEntry.Entry = &entry;
-            searchIndex.mainIndex.push_back(localizedEntry);
-        }
+#define REGISTER_INDEX(index, storage)                                                                                          \
+    {                                                                                                                           \
+        const auto& indexRef = index;                                                                                           \
+        storage.reserve(indexRef.size());                                                                                       \
+        for (const auto& entry : indexRef)                                                                                      \
+        {                                                                                                                       \
+            LocalizedIndexEntry localizedEntry;                                                                                 \
+            localizedEntry.Entry = &entry;                                                                                      \
+            if (shouldIncludeLanguageNeutralResources)                                                                          \
+            {                                                                                                                   \
+                localizedEntry.DisplayTextNeutral = EnglishOnlyResourceLoader().GetLocalizedString(entry.DisplayTextUid);       \
+                if (entry.HelpTextUid)                                                                                          \
+                {                                                                                                               \
+                    localizedEntry.HelpTextNeutral = EnglishOnlyResourceLoader().GetLocalizedString(entry.HelpTextUid.value()); \
+                }                                                                                                               \
+            }                                                                                                                   \
+            storage.push_back(localizedEntry);                                                                                  \
+        }                                                                                                                       \
+    }
+
+        REGISTER_INDEX(LoadBuildTimeIndex(), searchIndex.mainIndex);
 
         // Load profiles
-        const auto& profileIndex = LoadProfileIndex();
-        searchIndex.profileIndex.reserve(profileIndex.size());
-        for (const auto& entry : profileIndex)
-        {
-            // TODO CARLOS: properly populate LocalizedIndexEntry
-            LocalizedIndexEntry localizedEntry;
-            localizedEntry.Entry = &entry;
-            searchIndex.profileIndex.push_back(localizedEntry);
-        }
+        REGISTER_INDEX(LoadProfileIndex(), searchIndex.profileIndex);
         searchIndex.profileIndexEntry.Entry = &PartialProfileIndexEntry();
 
         // Load new tab menu
-        const auto& ntmFolderIndex = LoadNTMFolderIndex();
-        searchIndex.ntmFolderIndex.reserve(ntmFolderIndex.size());
-        for (const auto& entry : ntmFolderIndex)
-        {
-            // TODO CARLOS: properly populate LocalizedIndexEntry
-            LocalizedIndexEntry localizedEntry;
-            localizedEntry.Entry = &entry;
-            searchIndex.ntmFolderIndex.push_back(localizedEntry);
-        }
+        REGISTER_INDEX(LoadNTMFolderIndex(), searchIndex.ntmFolderIndex);
         searchIndex.ntmFolderIndexEntry.Entry = &PartialNTMFolderIndexEntry();
 
         // Load extensions
@@ -1287,15 +1278,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         searchIndex.extensionIndexEntry.Entry = &PartialExtensionIndexEntry();
 
         // Load color schemes
-        const auto& colorSchemesIndex = LoadColorSchemeIndex();
-        searchIndex.colorSchemeIndex.reserve(colorSchemesIndex.size());
-        for (const auto& entry : colorSchemesIndex)
-        {
-            // TODO CARLOS: properly populate LocalizedIndexEntry
-            LocalizedIndexEntry localizedEntry;
-            localizedEntry.Entry = &entry;
-            searchIndex.colorSchemeIndex.push_back(localizedEntry);
-        }
+        REGISTER_INDEX(LoadColorSchemeIndex(), searchIndex.colorSchemeIndex)
         searchIndex.colorSchemeIndexEntry.Entry = &PartialColorSchemeIndexEntry();
 
         // Load actions
diff --git a/tools/GenerateSettingsIndex.ps1 b/tools/GenerateSettingsIndex.ps1
index 9922f5b7edf..bc3ff10fb76 100644
--- a/tools/GenerateSettingsIndex.ps1
+++ b/tools/GenerateSettingsIndex.ps1
@@ -97,9 +97,11 @@ Get-ChildItem -Path $SourceDir -Recurse -Filter *.xaml | ForEach-Object {
     if ($filename -eq 'Launch.xaml')
     {
         $entries += [pscustomobject]@{
+            DisplayTextUid       = "L`"Nav_Launch/Content`""
             DisplayTextLocalized = "RS_(L`"Nav_Launch/Content`")"
+            HelpTextUid          = "std::nullopt"
             HelpTextLocalized    = "std::nullopt"
-            ParentPage           = "winrt::xaml_typename<$($pageClass)>()"
+            ParentPage           = $pageClass
             NavigationParam      = "winrt::box_value(hstring{L`"Launch_Nav`"})"
             SubPage              = "BreadcrumbSubPage::None"
             ElementName          = 'L""'
@@ -109,9 +111,11 @@ Get-ChildItem -Path $SourceDir -Recurse -Filter *.xaml | ForEach-Object {
     elseif ($filename -eq 'Interaction.xaml')
     {
         $entries += [pscustomobject]@{
+            DisplayTextUid       = "L`"Nav_Interaction/Content`""
             DisplayTextLocalized = "RS_(L`"Nav_Interaction/Content`")"
+            HelpTextUid          = "std::nullopt"
             HelpTextLocalized    = "std::nullopt"
-            ParentPage           = "winrt::xaml_typename<$($pageClass)>()"
+            ParentPage           = $pageClass
             NavigationParam      = "winrt::box_value(hstring{L`"Interaction_Nav`"})"
             SubPage              = "BreadcrumbSubPage::None"
             ElementName          = 'L""'
@@ -121,9 +125,11 @@ Get-ChildItem -Path $SourceDir -Recurse -Filter *.xaml | ForEach-Object {
     elseif ($filename -eq 'GlobalAppearance.xaml')
     {
         $entries += [pscustomobject]@{
+            DisplayTextUid       = "L`"Nav_Appearance/Content`""
             DisplayTextLocalized = "RS_(L`"Nav_Appearance/Content`")"
+            HelpTextUid          = "std::nullopt"
             HelpTextLocalized    = "std::nullopt"
-            ParentPage           = "winrt::xaml_typename<$($pageClass)>()"
+            ParentPage           = $pageClass
             NavigationParam      = "winrt::box_value(hstring{L`"Appearance_Nav`"})"
             SubPage              = "BreadcrumbSubPage::None"
             ElementName          = 'L""'
@@ -133,9 +139,11 @@ Get-ChildItem -Path $SourceDir -Recurse -Filter *.xaml | ForEach-Object {
     elseif ($filename -eq 'ColorSchemes.xaml')
     {
         $entries += [pscustomobject]@{
+            DisplayTextUid       = "L`"Nav_ColorSchemes/Content`""
             DisplayTextLocalized = "RS_(L`"Nav_ColorSchemes/Content`")"
+            HelpTextUid          = "std::nullopt"
             HelpTextLocalized    = "std::nullopt"
-            ParentPage           = "winrt::xaml_typename<$($pageClass)>()"
+            ParentPage           = $pageClass
             NavigationParam      = "winrt::box_value(hstring{L`"ColorSchemes_Nav`"})"
             SubPage              = "BreadcrumbSubPage::None"
             ElementName          = 'L""'
@@ -144,9 +152,11 @@ Get-ChildItem -Path $SourceDir -Recurse -Filter *.xaml | ForEach-Object {
 
         # Manually register the "add new" button
         $entries += [pscustomobject]@{
+            DisplayTextUid       = "L`"ColorScheme_AddNewButton/Text`""
             DisplayTextLocalized = 'RS_(L"ColorScheme_AddNewButton/Text")'
+            HelpTextUid          = 'std::nullopt'
             HelpTextLocalized    = 'std::nullopt'
-            ParentPage           = "winrt::xaml_typename<$($pageClass)>()"
+            ParentPage           = $pageClass
             NavigationParam      = "winrt::box_value(hstring{L`"ColorSchemes_Nav`"})"
             SubPage              = 'BreadcrumbSubPage::None'
             ElementName          = 'L"AddNewButton"'
@@ -157,9 +167,11 @@ Get-ChildItem -Path $SourceDir -Recurse -Filter *.xaml | ForEach-Object {
     elseif ($filename -eq 'Rendering.xaml')
     {
         $entries += [pscustomobject]@{
+            DisplayTextUid       = "L`"Nav_Rendering/Content`""
             DisplayTextLocalized = "RS_(L`"Nav_Rendering/Content`")"
+            HelpTextUid          = "std::nullopt"
             HelpTextLocalized    = "std::nullopt"
-            ParentPage           = "winrt::xaml_typename<$($pageClass)>()"
+            ParentPage           = $pageClass
             NavigationParam      = "winrt::box_value(hstring{L`"Rendering_Nav`"})"
             SubPage              = "BreadcrumbSubPage::None"
             ElementName          = 'L""'
@@ -169,9 +181,11 @@ Get-ChildItem -Path $SourceDir -Recurse -Filter *.xaml | ForEach-Object {
     elseif ($filename -eq 'Compatibility.xaml')
     {
         $entries += [pscustomobject]@{
+            DisplayTextUid       = "L`"Nav_Compatibility/Content`""
             DisplayTextLocalized = "RS_(L`"Nav_Compatibility/Content`")"
+            HelpTextUid          = "std::nullopt"
             HelpTextLocalized    = "std::nullopt"
-            ParentPage           = "winrt::xaml_typename<$($pageClass)>()"
+            ParentPage           = $pageClass
             NavigationParam      = "winrt::box_value(hstring{L`"Compatibility_Nav`"})"
             SubPage              = "BreadcrumbSubPage::None"
             ElementName          = 'L""'
@@ -181,9 +195,11 @@ Get-ChildItem -Path $SourceDir -Recurse -Filter *.xaml | ForEach-Object {
     elseif ($filename -eq 'Actions.xaml')
     {
         $entries += [pscustomobject]@{
+            DisplayTextUid       = "L`"Nav_Actions/Content`""
             DisplayTextLocalized = "RS_(L`"Nav_Actions/Content`")"
+            HelpTextUid          = "std::nullopt"
             HelpTextLocalized    = "std::nullopt"
-            ParentPage           = "winrt::xaml_typename<$($pageClass)>()"
+            ParentPage           = $pageClass
             NavigationParam      = "winrt::box_value(hstring{L`"Actions_Nav`"})"
             SubPage              = "BreadcrumbSubPage::None"
             ElementName          = 'L""'
@@ -193,9 +209,11 @@ Get-ChildItem -Path $SourceDir -Recurse -Filter *.xaml | ForEach-Object {
     elseif ($filename -eq 'NewTabMenu.xaml')
     {
         $entries += [pscustomobject]@{
+            DisplayTextUid       = "L`"Nav_NewTabMenu/Content`""
             DisplayTextLocalized = "RS_(L`"Nav_NewTabMenu/Content`")"
+            HelpTextUid          = "std::nullopt"
             HelpTextLocalized    = "std::nullopt"
-            ParentPage           = "winrt::xaml_typename<$($pageClass)>()"
+            ParentPage           = $pageClass
             NavigationParam      = "winrt::box_value(hstring{L`"NewTabMenu_Nav`"})"
             SubPage              = "BreadcrumbSubPage::None"
             ElementName          = 'L""'
@@ -205,9 +223,11 @@ Get-ChildItem -Path $SourceDir -Recurse -Filter *.xaml | ForEach-Object {
     elseif ($filename -eq 'Extensions.xaml')
     {
         $entries += [pscustomobject]@{
+            DisplayTextUid       = "L`"Nav_Extensions/Content`""
             DisplayTextLocalized = "RS_(L`"Nav_Extensions/Content`")"
+            HelpTextUid          = "std::nullopt"
             HelpTextLocalized    = "std::nullopt"
-            ParentPage           = "winrt::xaml_typename<$($pageClass)>()"
+            ParentPage           = $pageClass
             NavigationParam      = "winrt::box_value(hstring{L`"Extensions_Nav`"})"
             SubPage              = "BreadcrumbSubPage::None"
             ElementName          = 'L""'
@@ -328,9 +348,11 @@ Get-ChildItem -Path $SourceDir -Recurse -Filter *.xaml | ForEach-Object {
         }
 
         $entries += [pscustomobject]@{
+            DisplayTextUid       = "L`"$($uid)/Header`""
             DisplayTextLocalized = "RS_(L`"$($uid)/Header`")"
-            HelpTextLocalized    = $resourceKeys -contains "$($uid)/HelpText" ? "std::optional<hstring>{ RS_(L`"$($uid)/HelpText`") }" : "std::nullopt"
-            ParentPage           = "winrt::xaml_typename<$($pageClass)>()"
+            HelpTextUid          = $resourceKeys -contains "$($uid).HelpText" ? "std::optional<hstring>{ L`"$($uid)/HelpText`" }" : "std::nullopt"
+            HelpTextLocalized    = $resourceKeys -contains "$($uid).HelpText" ? "std::optional<hstring>{ RS_(L`"$($uid)/HelpText`") }" : "std::nullopt"
+            ParentPage           = $pageClass
             NavigationParam      = $navigationParam -eq "nullptr" ? $navigationParam : "winrt::box_value(hstring{L`"$($navigationParam)`"})"
             SubPage              = $subPage
             ElementName          = "L`"$($name)`""
@@ -341,9 +363,11 @@ Get-ChildItem -Path $SourceDir -Recurse -Filter *.xaml | ForEach-Object {
         if ($duplicateForVM)
         {
             $entries += [pscustomobject]@{
+                DisplayTextUid       = "L`"$($uid)/Header`""
                 DisplayTextLocalized = "RS_(L`"$($uid)/Header`")"
-                HelpTextLocalized    = $resourceKeys -contains "$($uid)/HelpText" ? "std::optional<hstring>{ RS_(L`"$($uid)/HelpText`") }" : "std::nullopt"
-                ParentPage           = "winrt::xaml_typename<$($pageClass)>()"
+                HelpTextUid          = $resourceKeys -contains "$($uid).HelpText" ? "std::optional<hstring>{ L`"$($uid)/HelpText`" }" : "std::nullopt"
+                HelpTextLocalized    = $resourceKeys -contains "$($uid).HelpText" ? "std::optional<hstring>{ RS_(L`"$($uid)/HelpText`") }" : "std::nullopt"
+                ParentPage           = $pageClass
                 NavigationParam      = 'nullptr'  # VM param at runtime
                 SubPage              = $navigationParam -eq 'NewTabMenu_Nav' ? 'BreadcrumbSubPage::NewTabMenu_Folder' : $subPage
                 ElementName          = "L`"$($name)`""
@@ -362,7 +386,7 @@ $schemeEntries = @()
 $ntmEntries = @()
 foreach ($e in $entries)
 {
-    $formattedEntry = "            IndexEntry{ $($e.DisplayTextLocalized), $($e.HelpTextLocalized), $($e.ParentPage), $($e.NavigationParam), $($e.SubPage), $($e.ElementName) }, // $($e.File)"
+    $formattedEntry = "            IndexEntry{ $($e.DisplayTextUid), $($e.DisplayTextLocalized), $($e.HelpTextUid), $($e.HelpTextLocalized), $($e.NavigationParam), $($e.SubPage), $($e.ElementName) }, // $($e.File)"
     
     if ($e.NavigationParam -eq 'nullptr' -and
         ($e.ParentPage -match 'Profiles_Base' -or
@@ -401,17 +425,20 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
     struct IndexEntry
     {
+        // x:Uid of the SettingContainer's Header (i.e. "Globals_DefaultProfile/Header")
+        hstring DisplayTextUid;
+
         // Localized display text shown in the SettingContainer (i.e. RS_(L"Globals_DefaultProfile/Header"))
         hstring DisplayTextLocalized;
 
+        // x:Uid of the SettingContainer's HelpText (i.e. "Globals_DefaultProfile/HelpText")
+        // May not exist for all entries
+        std::optional<hstring> HelpTextUid;
+
         // Localized help text shown in the SettingContainer (i.e. RS_(L"Globals_DefaultProfile/HelpText"))
         // May not exist for all entries
         std::optional<hstring> HelpTextLocalized;
 
-        // TODO CARLOS: this might not be necessary; remove
-        // x:Class of the parent Page (i.e. winrt::xaml_typename<Microsoft::Terminal::Settings::Editor::Launch>())
-        winrt::Windows::UI::Xaml::Interop::TypeName ParentPage;
-
         // Navigation argument (i.e. winrt::box_value(hstring) or nullptr)
         // Use nullptr as placeholder for runtime navigation with a view model object
         winrt::Windows::Foundation::IInspectable NavigationArg;
@@ -483,25 +510,25 @@ $( ($schemeEntries -join "`r`n") )
 
     const IndexEntry& PartialProfileIndexEntry()
     {
-        static IndexEntry entry{ L"", std::nullopt, winrt::xaml_typename<Microsoft::Terminal::Settings::Editor::Profiles_Base>(), nullptr, BreadcrumbSubPage::None, L"" };
+        static IndexEntry entry{ L"", L"", std::nullopt, std::nullopt, nullptr, BreadcrumbSubPage::None, L"" };
         return entry;
     }
 
     const IndexEntry& PartialNTMFolderIndexEntry()
     {
-        static IndexEntry entry{ L"", std::nullopt, winrt::xaml_typename<Microsoft::Terminal::Settings::Editor::NewTabMenu>(), nullptr, BreadcrumbSubPage::NewTabMenu_Folder, L"" };
+        static IndexEntry entry{ L"", L"", std::nullopt, std::nullopt, nullptr, BreadcrumbSubPage::NewTabMenu_Folder, L"" };
         return entry;
     }
 
     const IndexEntry& PartialColorSchemeIndexEntry()
     {
-        static IndexEntry entry{ L"", std::nullopt, winrt::xaml_typename<Microsoft::Terminal::Settings::Editor::EditColorScheme>(), nullptr, BreadcrumbSubPage::ColorSchemes_Edit, L"" };
+        static IndexEntry entry{ L"", L"", std::nullopt, std::nullopt, nullptr, BreadcrumbSubPage::ColorSchemes_Edit, L"" };
         return entry;
     }
 
     const IndexEntry& PartialExtensionIndexEntry()
     {
-        static IndexEntry entry{ L"", std::nullopt, winrt::xaml_typename<Microsoft::Terminal::Settings::Editor::Extensions>(), nullptr, BreadcrumbSubPage::Extensions_Extension, L"" };
+        static IndexEntry entry{ L"", L"", std::nullopt, std::nullopt, nullptr, BreadcrumbSubPage::Extensions_Extension, L"" };
         return entry;
     }
 }

From 53ddd92e7fe2e214435b3e1cb350482fad2faa16 Mon Sep 17 00:00:00 2001
From: Carlos Zamora <cazamor@microsoft.com>
Date: Mon, 3 Nov 2025 17:26:08 -0800
Subject: [PATCH 09/25] remove SearchMetadata (old attempt)

---
 ...Microsoft.Terminal.Settings.Editor.vcxproj | 10 -----
 ...t.Terminal.Settings.Editor.vcxproj.filters |  1 -
 .../TerminalSettingsEditor/SearchMetadata.cpp | 45 -------------------
 .../TerminalSettingsEditor/SearchMetadata.h   | 40 -----------------
 .../TerminalSettingsEditor/SearchMetadata.idl | 19 --------
 5 files changed, 115 deletions(-)
 delete mode 100644 src/cascadia/TerminalSettingsEditor/SearchMetadata.cpp
 delete mode 100644 src/cascadia/TerminalSettingsEditor/SearchMetadata.h
 delete mode 100644 src/cascadia/TerminalSettingsEditor/SearchMetadata.idl

diff --git a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj
index b91a24b7519..eb5a1faf986 100644
--- a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj
+++ b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj
@@ -157,9 +157,6 @@
     <ClInclude Include="Rendering.h">
       <DependentUpon>Rendering.xaml</DependentUpon>
     </ClInclude>
-    <ClInclude Include="SearchMetadata.h">
-      <DependentUpon>SearchMetadata.idl</DependentUpon>
-    </ClInclude>
     <ClInclude Include="SettingContainer.h">
       <DependentUpon>SettingContainer.idl</DependentUpon>
     </ClInclude>
@@ -353,10 +350,6 @@
     <ClCompile Include="Rendering.cpp">
       <DependentUpon>Rendering.xaml</DependentUpon>
     </ClCompile>
-    <ClCompile Include="SearchMetadata.cpp">
-      <DependentUpon>SearchMetadata.idl</DependentUpon>
-      <SubType>Code</SubType>
-    </ClCompile>
     <ClCompile Include="SettingContainer.cpp">
       <DependentUpon>SettingContainer.idl</DependentUpon>
     </ClCompile>
@@ -458,9 +451,6 @@
       <DependentUpon>Appearances.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Midl>
-    <Midl Include="SearchMetadata.idl">
-      <SubType>Code</SubType>
-    </Midl>
     <Midl Include="SettingContainer.idl">
       <SubType>Code</SubType>
     </Midl>
diff --git a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters
index 59731bc68ff..f49f4c9bc74 100644
--- a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters
+++ b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters
@@ -29,7 +29,6 @@
     <Midl Include="GlobalAppearanceViewModel.idl" />
     <Midl Include="LaunchViewModel.idl" />
     <Midl Include="EnumEntry.idl" />
-    <Midl Include="SearchMetadata.idl" />
     <Midl Include="SettingContainer.idl" />
     <Midl Include="TerminalColorConverters.idl" />
     <Midl Include="NewTabMenuViewModel.idl" />
diff --git a/src/cascadia/TerminalSettingsEditor/SearchMetadata.cpp b/src/cascadia/TerminalSettingsEditor/SearchMetadata.cpp
deleted file mode 100644
index 6bbad407163..00000000000
--- a/src/cascadia/TerminalSettingsEditor/SearchMetadata.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
-#include "SearchMetadata.h"
-#include "SearchMetadata.g.cpp"
-#include "LibraryResources.h"
-
-using namespace winrt::Windows::UI::Xaml;
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
-{
-    DependencyProperty SearchMetadata::_ParentPageProperty{ nullptr };
-    DependencyProperty SearchMetadata::_SettingNameProperty{ nullptr };
-
-    SearchMetadata::SearchMetadata()
-    {
-        _InitializeProperties();
-    }
-
-    void SearchMetadata::_InitializeProperties()
-    {
-        // Initialize any dependency properties here.
-        // This performs a lazy load on these properties, instead of
-        // initializing them when the DLL loads.
-        if (!_ParentPageProperty)
-        {
-            _ParentPageProperty =
-                DependencyProperty::RegisterAttached(
-                    L"ParentPage",
-                    xaml_typename<winrt::Windows::UI::Xaml::Interop::TypeName>(),
-                    xaml_typename<Editor::SearchMetadata>(),
-                    PropertyMetadata{ nullptr });
-        }
-        if (!_SettingNameProperty)
-        {
-            _SettingNameProperty =
-                DependencyProperty::RegisterAttached(
-                    L"SettingName",
-                    xaml_typename<hstring>(),
-                    xaml_typename<Editor::SearchMetadata>(),
-                    PropertyMetadata{ box_value(L"") });
-        }
-    }
-}
diff --git a/src/cascadia/TerminalSettingsEditor/SearchMetadata.h b/src/cascadia/TerminalSettingsEditor/SearchMetadata.h
deleted file mode 100644
index aa03f7cb77a..00000000000
--- a/src/cascadia/TerminalSettingsEditor/SearchMetadata.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*++
-Copyright (c) Microsoft Corporation
-Licensed under the MIT license.
-
-Module Name:
-- SearchMetadata
-
-Abstract:
-- A custom XAML attached property (like AutomationProperties)
-  to hold metadata for search in the settings editor.
-
-Author(s):
-- Carlos Zamora - October 2025
-
---*/
-
-#pragma once
-
-#include "SearchMetadata.g.h"
-#include "Utils.h"
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
-{
-    struct SearchMetadata : SearchMetadataT<SearchMetadata>
-    {
-    public:
-        SearchMetadata();
-
-        ATTACHED_DEPENDENCY_PROPERTY(winrt::Windows::UI::Xaml::Interop::TypeName, ParentPage);
-        ATTACHED_DEPENDENCY_PROPERTY(winrt::hstring, SettingName);
-
-    private:
-        static void _InitializeProperties();
-    };
-}
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::factory_implementation
-{
-    BASIC_FACTORY(SearchMetadata);
-}
diff --git a/src/cascadia/TerminalSettingsEditor/SearchMetadata.idl b/src/cascadia/TerminalSettingsEditor/SearchMetadata.idl
deleted file mode 100644
index b5e66a8046f..00000000000
--- a/src/cascadia/TerminalSettingsEditor/SearchMetadata.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-namespace Microsoft.Terminal.Settings.Editor
-{
-    [default_interface]
-    runtimeclass SearchMetadata : Windows.UI.Xaml.DependencyObject
-    {
-        SearchMetadata();
-
-        static Windows.UI.Xaml.DependencyProperty ParentPageProperty { get; };
-        static Windows.UI.Xaml.Interop.TypeName GetParentPage(Windows.UI.Xaml.DependencyObject target);
-        static void SetParentPage(Windows.UI.Xaml.DependencyObject target, Windows.UI.Xaml.Interop.TypeName val);
-
-        static Windows.UI.Xaml.DependencyProperty SettingNameProperty { get; };
-        static String GetSettingName(Windows.UI.Xaml.DependencyObject target);
-        static void SetSettingName(Windows.UI.Xaml.DependencyObject target, String val);
-    }
-}

From 1dafcef36f23792183e3538d3a67bdadddaa8bad Mon Sep 17 00:00:00 2001
From: Carlos Zamora <cazamor@microsoft.com>
Date: Wed, 5 Nov 2025 11:11:31 -0800
Subject: [PATCH 10/25] FilteredSearchResult::CreateNoResultsItem and
 CreateRuntimeObjectItem

---
 .../TerminalSettingsEditor/MainPage.cpp       | 73 +++++++++++++++----
 .../TerminalSettingsEditor/MainPage.h         |  6 +-
 2 files changed, 60 insertions(+), 19 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
index dede4b93edb..ca7c4bd4eea 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
@@ -57,15 +57,6 @@ static const std::wstring_view addProfileTag{ L"AddProfile" };
 static const std::wstring_view colorSchemesTag{ L"ColorSchemes_Nav" };
 static const std::wstring_view globalAppearanceTag{ L"GlobalAppearance_Nav" };
 
-// Like RS_, but uses an ambient context to determine whether
-// to load the English verion of a resource or the localized one.
-#define RS_switchable_(x) RS_switchable_impl(context, USES_RESOURCE(x))
-
-static winrt::hstring RS_switchable_impl(const winrt::Windows::ApplicationModel::Resources::Core::ResourceContext& context, std::wstring_view key)
-{
-    return GetLibraryResourceLoader().ResourceMap().GetValue(key, context).ValueAsString();
-}
-
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
     static Editor::ProfileViewModel _viewModelForProfile(const Model::Profile& profile, const Model::CascadiaSettings& appSettings, const Windows::UI::Core::CoreDispatcher& dispatcher)
@@ -73,6 +64,53 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         return winrt::make<implementation::ProfileViewModel>(profile, appSettings, dispatcher);
     }
 
+    Editor::FilteredSearchResult FilteredSearchResult::CreateNoResultsItem(const winrt::hstring& query)
+    {
+        return winrt::make<FilteredSearchResult>(nullptr, nullptr, hstring{ fmt::format(fmt::runtime(std::wstring{ RS_(L"Search_NoResults") }), query) });
+    }
+
+    // Creates a FilteredSearchResult with the given search index entry and runtime object.
+    // The resulting search result will have a label like "<ProfileName>: <display text>" or "<ProfileName>".
+    // This is so that we can reuse the display text from the search index, but also add additional context to which runtime object this search result maps to.
+    Editor::FilteredSearchResult FilteredSearchResult::CreateRuntimeObjectItem(const LocalizedIndexEntry* searchIndexEntry, const Windows::Foundation::IInspectable& runtimeObj)
+    {
+        hstring runtimeObjLabel{};
+        if (const auto profileVM = runtimeObj.try_as<Editor::ProfileViewModel>())
+        {
+            runtimeObjLabel = profileVM.Name();
+        }
+        else if (const auto ntmFolderEntryVM = runtimeObj.try_as<Editor::FolderEntryViewModel>())
+        {
+            runtimeObjLabel = ntmFolderEntryVM.Name();
+        }
+        else if (const auto extensionPackageVM = runtimeObj.try_as<Editor::ExtensionPackageViewModel>())
+        {
+            runtimeObjLabel = extensionPackageVM.Package().DisplayName();
+        }
+        else if (const auto colorSchemeName = runtimeObj.try_as<hstring>())
+        {
+            runtimeObjLabel = *colorSchemeName;
+        }
+
+        hstring displayText{};
+        if (searchIndexEntry)
+        {
+            if (searchIndexEntry->Entry)
+            {
+                displayText = searchIndexEntry->Entry->DisplayTextLocalized;
+            }
+            else if (searchIndexEntry->DisplayTextNeutral)
+            {
+                displayText = searchIndexEntry->DisplayTextNeutral.value();
+            }
+        }
+
+        // empty display text --> just show runtime object label (i.e. "PowerShell") --> navigates to main runtime object page (i.e. Profiles_Base)
+        // otherwise --> "<ProfileName>: <display text>" (i.e. "PowerShell: Command line") --> navigates to setting container
+        const hstring label = displayText.empty() ? runtimeObjLabel : hstring{ fmt::format(FMT_COMPILE(L"{}: {}"), runtimeObjLabel, displayText) };
+        return winrt::make<FilteredSearchResult>(searchIndexEntry, runtimeObj, label);
+    }
+
     MainPage::MainPage(const CascadiaSettings& settings) :
         _settingsSource{ settings },
         _settingsClone{ settings.Copy() },
@@ -1095,29 +1133,32 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                                                                                                                                              \
         if (nameMatches)                                                                                                                     \
         {                                                                                                                                    \
-            results.push_back(winrt::make<FilteredSearchResult>(&partialSearchIndexEntry, runtimeObj, std::optional<hstring>{ objName }));   \
+            /* navigates to runtime object main page (i.e. "PowerShell" Profiles_Base page) */                                               \
+            results.push_back(FilteredSearchResult::CreateRuntimeObjectItem(&partialSearchIndexEntry, runtimeObj));                          \
         }                                                                                                                                    \
                                                                                                                                              \
         for (const auto* indexEntry : filteredSearchIndex)                                                                                   \
         {                                                                                                                                    \
-            results.push_back(winrt::make<FilteredSearchResult>(indexEntry, navigationArgTransform));                                        \
+            /* navigates to runtime object's setting (i.e. "PowerShell: Command line" ) */                                                   \
+            results.push_back(FilteredSearchResult::CreateRuntimeObjectItem(indexEntry, navigationArgTransform));                            \
         }                                                                                                                                    \
     }
 
         // Profiles
-        APPEND_RUNTIME_OBJECT_RESULTS(_profileVMs, runtimeObj.Name(), _filteredSearchIndex->profileIndex, _searchIndex->profileIndexEntry, runtimeObj)
+        APPEND_RUNTIME_OBJECT_RESULTS(_profileVMs, runtimeObj.Name(), _filteredSearchIndex->profileIndex, _searchIndex->profileIndexEntry, runtimeObj);
 
         // New Tab Menu (Folder View)
-        APPEND_RUNTIME_OBJECT_RESULTS(get_self<implementation::NewTabMenuViewModel>(_newTabMenuPageVM)->FolderTreeFlatList(), runtimeObj.Name(), _filteredSearchIndex->ntmFolderIndex, _searchIndex->ntmFolderIndexEntry, runtimeObj)
+        APPEND_RUNTIME_OBJECT_RESULTS(get_self<implementation::NewTabMenuViewModel>(_newTabMenuPageVM)->FolderTreeFlatList(), runtimeObj.Name(), _filteredSearchIndex->ntmFolderIndex, _searchIndex->ntmFolderIndexEntry, runtimeObj);
 
         // Color schemes
-        APPEND_RUNTIME_OBJECT_RESULTS(_colorSchemesPageVM.AllColorSchemes(), runtimeObj.Name(), _filteredSearchIndex->colorSchemeIndex, _searchIndex->colorSchemeIndexEntry, winrt::box_value(runtimeObj.Name()))
+        APPEND_RUNTIME_OBJECT_RESULTS(_colorSchemesPageVM.AllColorSchemes(), runtimeObj.Name(), _filteredSearchIndex->colorSchemeIndex, _searchIndex->colorSchemeIndexEntry, winrt::box_value(runtimeObj.Name()));
 
+        // Extensions
         for (const auto& extension : _extensionsVM.ExtensionPackages())
         {
             if (til::contains_linguistic_insensitive(extension.Package().DisplayName(), sanitizedQuery))
             {
-                results.push_back(winrt::make<FilteredSearchResult>(&_searchIndex->extensionIndexEntry, extension, std::optional<hstring>{ extension.Package().DisplayName() }));
+                results.push_back(FilteredSearchResult::CreateRuntimeObjectItem(&_searchIndex->extensionIndexEntry, extension));
             }
         }
 
@@ -1125,7 +1166,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         {
             // Explicitly show "no results"
             results.reserve(1);
-            results.push_back(winrt::make<FilteredSearchResult>(fmt::format(fmt::runtime(std::wstring{ RS_(L"Search_NoResults") }), sanitizedQuery)));
+            results.push_back(FilteredSearchResult::CreateNoResultsItem(sanitizedQuery));
         }
 #undef APPEND_RUNTIME_OBJECT_RESULTS
 
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.h b/src/cascadia/TerminalSettingsEditor/MainPage.h
index 9376e5a7e43..23f94f3fffa 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.h
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.h
@@ -39,14 +39,14 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     struct FilteredSearchResult : FilteredSearchResultT<FilteredSearchResult>
     {
-        FilteredSearchResult(const winrt::hstring& label) :
-            _overrideLabel{ label } {}
-
         FilteredSearchResult(const LocalizedIndexEntry* entry, const Windows::Foundation::IInspectable& navigationArgOverride = nullptr, const std::optional<hstring>& label = std::nullopt) :
             _SearchIndexEntry{ entry },
             _NavigationArgOverride{ navigationArgOverride },
             _overrideLabel{ label } {}
 
+        static Editor::FilteredSearchResult CreateNoResultsItem(const winrt::hstring& query);
+        static Editor::FilteredSearchResult CreateRuntimeObjectItem(const LocalizedIndexEntry* searchIndexEntry, const Windows::Foundation::IInspectable& runtimeObj);
+
         hstring ToString() { return Label(); }
 
         winrt::hstring Label() const

From 2706d05491f070369901e59816479f7bec9f831a Mon Sep 17 00:00:00 2001
From: Carlos Zamora <cazamor@microsoft.com>
Date: Wed, 5 Nov 2025 14:54:07 -0800
Subject: [PATCH 11/25] icons

---
 .../TerminalSettingsEditor/MainPage.cpp       | 135 ++++++++++++++++++
 .../TerminalSettingsEditor/MainPage.h         |  48 +------
 .../TerminalSettingsEditor/MainPage.idl       |   1 +
 .../TerminalSettingsEditor/MainPage.xaml      |  15 +-
 4 files changed, 155 insertions(+), 44 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
index ca7c4bd4eea..0e602509821 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
@@ -111,6 +111,141 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         return winrt::make<FilteredSearchResult>(searchIndexEntry, runtimeObj, label);
     }
 
+    winrt::hstring FilteredSearchResult::Label() const
+    {
+        if (_overrideLabel)
+        {
+            return _overrideLabel.value();
+        }
+        else if (_SearchIndexEntry)
+        {
+            if (_SearchIndexEntry->Entry)
+            {
+                return _SearchIndexEntry->Entry->DisplayTextLocalized;
+            }
+            else if (_SearchIndexEntry->DisplayTextNeutral.has_value())
+            {
+                return _SearchIndexEntry->DisplayTextNeutral.value();
+            }
+        }
+        return {};
+    }
+
+    bool FilteredSearchResult::IsNoResultsPlaceholder() const
+    {
+        return _overrideLabel.has_value() && !_NavigationArgOverride;
+    }
+
+    Windows::Foundation::IInspectable FilteredSearchResult::NavigationArg() const
+    {
+        if (_NavigationArgOverride)
+        {
+            return _NavigationArgOverride;
+        }
+        else if (_SearchIndexEntry)
+        {
+            return _SearchIndexEntry->Entry->NavigationArg;
+        }
+        return nullptr;
+    }
+
+    Windows::UI::Xaml::Controls::IconElement FilteredSearchResult::Icon() const
+    {
+        // We need to set the icon size here as opposed to in the XAML.
+        // Setting it in the XAML just crops the icon.
+        static constexpr double iconSize = 16;
+        if (auto navigationArg = NavigationArg())
+        {
+            if (const auto profileVM = navigationArg.try_as<Editor::ProfileViewModel>())
+            {
+                auto icon = UI::IconPathConverter::IconWUX(profileVM.EvaluatedIcon());
+                icon.Width(iconSize);
+                icon.Height(iconSize);
+                return icon;
+            }
+            else if (const auto ntmFolderEntryVM = navigationArg.try_as<Editor::FolderEntryViewModel>())
+            {
+                auto icon = UI::IconPathConverter::IconWUX(ntmFolderEntryVM.Icon());
+                icon.Width(iconSize);
+                icon.Height(iconSize);
+                return icon;
+            }
+            else if (const auto extensionPackageVM = navigationArg.try_as<Editor::ExtensionPackageViewModel>())
+            {
+                auto icon = UI::IconPathConverter::IconWUX(extensionPackageVM.Package().Icon());
+                icon.Width(iconSize);
+                icon.Height(iconSize);
+                return icon;
+            }
+            else if (const auto stringNavArg = navigationArg.try_as<hstring>())
+            {
+                // The hstring navArg can be...
+                // - a color scheme name
+                // - an hstring tag (all defined at the top of the file)
+                // Regardless, we'll use the font icon used by the navigation view item
+                WUX::Controls::FontIcon icon{};
+                icon.FontFamily(Media::FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" });
+                icon.FontSize(iconSize);
+                if (stringNavArg == colorSchemesTag || _SearchIndexEntry->Entry->SubPage == BreadcrumbSubPage::ColorSchemes_Edit)
+                {
+                    icon.Glyph(L"\xE790");
+                    return icon;
+                }
+                else if (stringNavArg == launchTag)
+                {
+                    icon.Glyph(L"\xE7B5");
+                    return icon;
+                }
+                else if (stringNavArg == interactionTag)
+                {
+                    icon.Glyph(L"\xE7C9");
+                    return icon;
+                }
+                else if (stringNavArg == renderingTag)
+                {
+                    icon.Glyph(L"\xE7F8");
+                    return icon;
+                }
+                else if (stringNavArg == compatibilityTag)
+                {
+                    icon.Glyph(L"\xEC7A");
+                    return icon;
+                }
+                else if (stringNavArg == actionsTag)
+                {
+                    icon.Glyph(L"\xE765");
+                    return icon;
+                }
+                else if (stringNavArg == newTabMenuTag)
+                {
+                    icon.Glyph(L"\xE71d");
+                    return icon;
+                }
+                else if (stringNavArg == extensionsTag)
+                {
+                    icon.Glyph(L"\xEA86");
+                    return icon;
+                }
+                else if (stringNavArg == globalProfileTag)
+                {
+                    icon.Glyph(L"\xE81E");
+                    return icon;
+                }
+                else if (stringNavArg == addProfileTag)
+                {
+                    icon.Glyph(L"\xE710");
+                    return icon;
+                }
+                else if (stringNavArg == globalAppearanceTag)
+                {
+                    icon.Glyph(L"\xE771");
+                    return icon;
+                }
+            }
+        }
+        return nullptr;
+    }
+
     MainPage::MainPage(const CascadiaSettings& settings) :
         _settingsSource{ settings },
         _settingsClone{ settings.Copy() },
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.h b/src/cascadia/TerminalSettingsEditor/MainPage.h
index 23f94f3fffa..76e1dc77520 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.h
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.h
@@ -48,49 +48,11 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         static Editor::FilteredSearchResult CreateRuntimeObjectItem(const LocalizedIndexEntry* searchIndexEntry, const Windows::Foundation::IInspectable& runtimeObj);
 
         hstring ToString() { return Label(); }
-
-        winrt::hstring Label() const
-        {
-            if (_overrideLabel)
-            {
-                return _overrideLabel.value();
-            }
-            else if (_SearchIndexEntry)
-            {
-                if (_SearchIndexEntry->Entry)
-                {
-                    return _SearchIndexEntry->Entry->DisplayTextLocalized;
-                }
-                else if (_SearchIndexEntry->DisplayTextNeutral.has_value())
-                {
-                    return _SearchIndexEntry->DisplayTextNeutral.value();
-                }
-            }
-            return {};
-        }
-
-        bool IsNoResultsPlaceholder() const
-        {
-            return _overrideLabel.has_value() && !_NavigationArgOverride;
-        }
-
-        const LocalizedIndexEntry& SearchIndexEntry() const noexcept
-        {
-            return *_SearchIndexEntry;
-        }
-
-        Windows::Foundation::IInspectable NavigationArg() const
-        {
-            if (_NavigationArgOverride)
-            {
-                return _NavigationArgOverride;
-            }
-            else if (_SearchIndexEntry)
-            {
-                return _SearchIndexEntry->Entry->NavigationArg;
-            }
-            return nullptr;
-        }
+        winrt::hstring Label() const;
+        bool IsNoResultsPlaceholder() const;
+        const LocalizedIndexEntry& SearchIndexEntry() const noexcept { return *_SearchIndexEntry; }
+        Windows::Foundation::IInspectable NavigationArg() const;
+        Windows::UI::Xaml::Controls::IconElement Icon() const;
 
     private:
         const std::optional<winrt::hstring> _overrideLabel{ std::nullopt };
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.idl b/src/cascadia/TerminalSettingsEditor/MainPage.idl
index 9ea551bdfd8..9154f195ea8 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.idl
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.idl
@@ -29,6 +29,7 @@ namespace Microsoft.Terminal.Settings.Editor
     runtimeclass FilteredSearchResult : Windows.Foundation.IStringable
     {
         String Label { get; };
+        Windows.UI.Xaml.Controls.IconElement Icon { get; };
     }
 
     runtimeclass Breadcrumb : Windows.Foundation.IStringable
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.xaml b/src/cascadia/TerminalSettingsEditor/MainPage.xaml
index d6847dc5c42..b655c1cd628 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.xaml
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.xaml
@@ -108,7 +108,20 @@
                             SuggestionChosen="SettingsSearchBox_SuggestionChosen">
                 <AutoSuggestBox.ItemTemplate>
                     <DataTemplate x:DataType="local:FilteredSearchResult">
-                        <TextBlock Text="{x:Bind Label}" />
+                        <Grid HorizontalAlignment="Stretch"
+                              ColumnSpacing="8">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+
+                            <ContentPresenter Grid.Column="0"
+                                              HorizontalAlignment="Center"
+                                              VerticalAlignment="Center"
+                                              Content="{x:Bind Icon}"/>
+                            <TextBlock Grid.Column="1"
+                                       Text="{x:Bind Label}" />
+                        </Grid>
                     </DataTemplate>
                 </AutoSuggestBox.ItemTemplate>
             </AutoSuggestBox>

From bf2e4e19d74f633a2043f57905b8be3a3eb80c41 Mon Sep 17 00:00:00 2001
From: Carlos Zamora <cazamor@microsoft.com>
Date: Wed, 5 Nov 2025 15:26:34 -0800
Subject: [PATCH 12/25] code format and spell check

---
 .github/actions/spelling/allow/allow.txt      |  2 +
 .../TerminalSettingsEditor/AddProfile.xaml    |  4 +-
 .../TerminalSettingsEditor/Appearances.xaml   | 76 +++++++++----------
 .../TerminalSettingsEditor/Compatibility.xaml | 20 ++---
 .../EditColorScheme.xaml                      |  8 +-
 .../TerminalSettingsEditor/Extensions.xaml    |  4 +-
 .../GlobalAppearance.xaml                     | 60 +++++++--------
 .../TerminalSettingsEditor/Interaction.xaml   | 68 ++++++++---------
 .../TerminalSettingsEditor/Launch.cpp         |  1 -
 .../TerminalSettingsEditor/Launch.xaml        | 32 ++++----
 .../TerminalSettingsEditor/MainPage.xaml      | 14 ++--
 .../TerminalSettingsEditor/NewTabMenu.xaml    | 28 +++----
 .../Profiles_Advanced.xaml                    | 56 +++++++-------
 .../Profiles_Appearance.xaml                  | 26 +++----
 .../TerminalSettingsEditor/Profiles_Base.xaml | 20 ++---
 .../Profiles_Base_Orphaned.xaml               | 12 +--
 .../Profiles_Terminal.xaml                    | 20 ++---
 .../TerminalSettingsEditor/Rendering.xaml     | 12 +--
 .../TerminalSettingsModel/ActionArgs.cpp      |  2 +-
 tools/GenerateSettingsIndex.ps1               |  2 +-
 20 files changed, 234 insertions(+), 233 deletions(-)

diff --git a/.github/actions/spelling/allow/allow.txt b/.github/actions/spelling/allow/allow.txt
index a99422e8b0b..117e643159b 100644
--- a/.github/actions/spelling/allow/allow.txt
+++ b/.github/actions/spelling/allow/allow.txt
@@ -71,7 +71,9 @@ sustainability
 sxn
 Tencent
 toolset
+Uids
 UEFI
+UIDs
 uiatextrange
 und
 vsdevcmd
diff --git a/src/cascadia/TerminalSettingsEditor/AddProfile.xaml b/src/cascadia/TerminalSettingsEditor/AddProfile.xaml
index 323b7f959d3..633dd20875f 100644
--- a/src/cascadia/TerminalSettingsEditor/AddProfile.xaml
+++ b/src/cascadia/TerminalSettingsEditor/AddProfile.xaml
@@ -37,8 +37,8 @@
             </Button>
         </Border>
         <StackPanel Margin="{StaticResource StandardControlMargin}">
-            <local:SettingContainer x:Uid="AddProfile_Duplicate"
-                                    x:Name="DuplicateProfile">
+            <local:SettingContainer x:Name="DuplicateProfile"
+                                    x:Uid="AddProfile_Duplicate">
                 <ComboBox x:Name="Profiles"
                           AutomationProperties.AccessibilityView="Content"
                           ItemsSource="{x:Bind State.Settings.AllProfiles, Mode=OneWay}"
diff --git a/src/cascadia/TerminalSettingsEditor/Appearances.xaml b/src/cascadia/TerminalSettingsEditor/Appearances.xaml
index a1a7617d42f..435139ff67f 100644
--- a/src/cascadia/TerminalSettingsEditor/Appearances.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Appearances.xaml
@@ -72,8 +72,8 @@
                        Style="{StaticResource TextBlockSubHeaderStyle}" />
             <!--  Color Scheme  -->
             <!--  This currently only display the Dark color scheme, even if the user has a pair of schemes set.  -->
-            <local:SettingContainer x:Uid="Profile_ColorScheme"
-                                    x:Name="ColorScheme"
+            <local:SettingContainer x:Name="ColorScheme"
+                                    x:Uid="Profile_ColorScheme"
                                     ClearSettingValue="{x:Bind Appearance.ClearColorScheme}"
                                     CurrentValueAccessibleName="{x:Bind Appearance.CurrentColorScheme.Name, Mode=OneWay}"
                                     HasSettingValue="{x:Bind Appearance.HasDarkColorSchemeName, Mode=OneWay}"
@@ -281,20 +281,20 @@
                               IsChecked="{x:Bind ShowAllFonts, Mode=TwoWay}" />
                 </StackPanel>
             </local:SettingContainer>
-            <local:SettingContainer x:Uid="Profile_MissingFontFaces"
-                                    x:Name="MissingFontFaces"
+            <local:SettingContainer x:Name="MissingFontFaces"
+                                    x:Uid="Profile_MissingFontFaces"
                                     HelpText="{x:Bind Appearance.MissingFontFaces, Mode=OneWay}"
                                     Style="{StaticResource SettingContainerErrorStyle}"
                                     Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(Appearance.MissingFontFaces), Mode=OneWay}" />
-            <local:SettingContainer x:Uid="Profile_ProportionalFontFaces"
-                                    x:Name="ProportionalFontFaces"
+            <local:SettingContainer x:Name="ProportionalFontFaces"
+                                    x:Uid="Profile_ProportionalFontFaces"
                                     HelpText="{x:Bind Appearance.ProportionalFontFaces, Mode=OneWay}"
                                     Style="{StaticResource SettingContainerWarningStyle}"
                                     Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(Appearance.ProportionalFontFaces), Mode=OneWay}" />
 
             <!--  Font Size  -->
-            <local:SettingContainer x:Uid="Profile_FontSize"
-                                    x:Name="FontSize"
+            <local:SettingContainer x:Name="FontSize"
+                                    x:Uid="Profile_FontSize"
                                     ClearSettingValue="{x:Bind Appearance.ClearFontSize}"
                                     HasSettingValue="{x:Bind Appearance.HasFontSize, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.FontSizeOverrideSource, Mode=OneWay}"
@@ -310,8 +310,8 @@
             </local:SettingContainer>
 
             <!--  Line Height  -->
-            <local:SettingContainer x:Uid="Profile_LineHeight"
-                                    x:Name="LineHeight"
+            <local:SettingContainer x:Name="LineHeight"
+                                    x:Uid="Profile_LineHeight"
                                     ClearSettingValue="{x:Bind Appearance.ClearLineHeight}"
                                     HasSettingValue="{x:Bind Appearance.HasLineHeight, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.LineHeightOverrideSource, Mode=OneWay}"
@@ -327,8 +327,8 @@
             </local:SettingContainer>
 
             <!--  Cell Width  -->
-            <local:SettingContainer x:Uid="Profile_CellWidth"
-                                    x:Name="CellWidth"
+            <local:SettingContainer x:Name="CellWidth"
+                                    x:Uid="Profile_CellWidth"
                                     ClearSettingValue="{x:Bind Appearance.ClearCellWidth}"
                                     HasSettingValue="{x:Bind Appearance.HasCellWidth, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.CellWidthOverrideSource, Mode=OneWay}"
@@ -344,8 +344,8 @@
             </local:SettingContainer>
 
             <!--  Font Weight  -->
-            <local:SettingContainer x:Uid="Profile_FontWeight"
-                                    x:Name="FontWeight"
+            <local:SettingContainer x:Name="FontWeight"
+                                    x:Uid="Profile_FontWeight"
                                     ClearSettingValue="{x:Bind Appearance.ClearFontWeight}"
                                     HasSettingValue="{x:Bind Appearance.HasFontWeight, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.FontWeightOverrideSource, Mode=OneWay}"
@@ -381,8 +381,8 @@
                     </Grid>
                 </StackPanel>
             </local:SettingContainer>
-            <local:SettingContainer x:Uid="Profile_FontAxes"
-                                    x:Name="FontAxes"
+            <local:SettingContainer x:Name="FontAxes"
+                                    x:Uid="Profile_FontAxes"
                                     ClearSettingValue="{x:Bind Appearance.ClearFontAxes}"
                                     HasSettingValue="{x:Bind Appearance.HasFontAxes, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.FontAxesOverrideSource, Mode=OneWay}"
@@ -409,8 +409,8 @@
                     </muxc:DropDownButton>
                 </StackPanel>
             </local:SettingContainer>
-            <local:SettingContainer x:Uid="Profile_FontFeatures"
-                                    x:Name="FontFeatures"
+            <local:SettingContainer x:Name="FontFeatures"
+                                    x:Uid="Profile_FontFeatures"
                                     ClearSettingValue="{x:Bind Appearance.ClearFontFeatures}"
                                     HasSettingValue="{x:Bind Appearance.HasFontFeatures, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.FontFeaturesOverrideSource, Mode=OneWay}"
@@ -439,8 +439,8 @@
             </local:SettingContainer>
 
             <!--  Builtin Glyphs  -->
-            <local:SettingContainer x:Uid="Profile_EnableBuiltinGlyphs"
-                                    x:Name="EnableBuiltinGlyphs"
+            <local:SettingContainer x:Name="EnableBuiltinGlyphs"
+                                    x:Uid="Profile_EnableBuiltinGlyphs"
                                     ClearSettingValue="{x:Bind Appearance.ClearEnableBuiltinGlyphs}"
                                     HasSettingValue="{x:Bind Appearance.HasEnableBuiltinGlyphs, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.EnableBuiltinGlyphsOverrideSource, Mode=OneWay}">
@@ -449,8 +449,8 @@
             </local:SettingContainer>
 
             <!--  Color Glyphs  -->
-            <local:SettingContainer x:Uid="Profile_EnableColorGlyphs"
-                                    x:Name="EnableColorGlyphs"
+            <local:SettingContainer x:Name="EnableColorGlyphs"
+                                    x:Uid="Profile_EnableColorGlyphs"
                                     ClearSettingValue="{x:Bind Appearance.ClearEnableColorGlyphs}"
                                     HasSettingValue="{x:Bind Appearance.HasEnableColorGlyphs, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.EnableColorGlyphsOverrideSource, Mode=OneWay}">
@@ -459,8 +459,8 @@
             </local:SettingContainer>
 
             <!--  Retro Terminal Effect  -->
-            <local:SettingContainer x:Uid="Profile_RetroTerminalEffect"
-                                    x:Name="RetroTerminalEffect"
+            <local:SettingContainer x:Name="RetroTerminalEffect"
+                                    x:Uid="Profile_RetroTerminalEffect"
                                     ClearSettingValue="{x:Bind Appearance.ClearRetroTerminalEffect}"
                                     HasSettingValue="{x:Bind Appearance.HasRetroTerminalEffect, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.RetroTerminalEffectOverrideSource, Mode=OneWay}">
@@ -469,8 +469,8 @@
             </local:SettingContainer>
 
             <!--  Adjust Indistinguishable Colors  -->
-            <local:SettingContainer x:Uid="Profile_AdjustIndistinguishableColors"
-                                    x:Name="AdjustIndistinguishableColors"
+            <local:SettingContainer x:Name="AdjustIndistinguishableColors"
+                                    x:Uid="Profile_AdjustIndistinguishableColors"
                                     ClearSettingValue="{x:Bind Appearance.ClearAdjustIndistinguishableColors}"
                                     HasSettingValue="{x:Bind Appearance.HasAdjustIndistinguishableColors, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.AdjustIndistinguishableColorsOverrideSource, Mode=OneWay}">
@@ -488,8 +488,8 @@
                        Style="{StaticResource TextBlockSubHeaderStyle}" />
 
             <!--  Cursor Shape  -->
-            <local:SettingContainer x:Uid="Profile_CursorShape"
-                                    x:Name="CursorShape"
+            <local:SettingContainer x:Name="CursorShape"
+                                    x:Uid="Profile_CursorShape"
                                     ClearSettingValue="{x:Bind Appearance.ClearCursorShape}"
                                     HasSettingValue="{x:Bind Appearance.HasCursorShape, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.CursorShapeOverrideSource, Mode=OneWay}">
@@ -501,8 +501,8 @@
             </local:SettingContainer>
 
             <!--  Cursor Height  -->
-            <local:SettingContainer x:Uid="Profile_CursorHeight"
-                                    x:Name="CursorHeight"
+            <local:SettingContainer x:Name="CursorHeight"
+                                    x:Uid="Profile_CursorHeight"
                                     ClearSettingValue="{x:Bind Appearance.ClearCursorHeight}"
                                     HasSettingValue="{x:Bind Appearance.HasCursorHeight, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.CursorHeightOverrideSource, Mode=OneWay}"
@@ -574,8 +574,8 @@
             </local:SettingContainer>
 
             <!--  Background Image Stretch Mode  -->
-            <local:SettingContainer x:Uid="Profile_BackgroundImageStretchMode"
-                                    x:Name="BackgroundImageStretchMode"
+            <local:SettingContainer x:Name="BackgroundImageStretchMode"
+                                    x:Uid="Profile_BackgroundImageStretchMode"
                                     ClearSettingValue="{x:Bind Appearance.ClearBackgroundImageStretchMode}"
                                     HasSettingValue="{x:Bind Appearance.HasBackgroundImageStretchMode, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.BackgroundImageStretchModeOverrideSource, Mode=OneWay}"
@@ -588,8 +588,8 @@
             </local:SettingContainer>
 
             <!--  Background Image Alignment  -->
-            <local:SettingContainer x:Uid="Profile_BackgroundImageAlignment"
-                                    x:Name="BackgroundImageAlignment"
+            <local:SettingContainer x:Name="BackgroundImageAlignment"
+                                    x:Uid="Profile_BackgroundImageAlignment"
                                     ClearSettingValue="{x:Bind Appearance.ClearBackgroundImageAlignment}"
                                     CurrentValue="{x:Bind Appearance.BackgroundImageAlignmentCurrentValue, Mode=OneWay}"
                                     HasSettingValue="{x:Bind Appearance.HasBackgroundImageAlignment, Mode=OneWay}"
@@ -777,8 +777,8 @@
             </local:SettingContainer>
 
             <!--  Background Image Opacity  -->
-            <local:SettingContainer x:Uid="Profile_BackgroundImageOpacity"
-                                    x:Name="BackgroundImageOpacity"
+            <local:SettingContainer x:Name="BackgroundImageOpacity"
+                                    x:Uid="Profile_BackgroundImageOpacity"
                                     ClearSettingValue="{x:Bind Appearance.ClearBackgroundImageOpacity}"
                                     HasSettingValue="{x:Bind Appearance.HasBackgroundImageOpacity, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.BackgroundImageOpacityOverrideSource, Mode=OneWay}"
@@ -804,8 +804,8 @@
                        Style="{StaticResource TextBlockSubHeaderStyle}" />
 
             <!--  Intense is bold, bright  -->
-            <local:SettingContainer x:Uid="Appearance_IntenseTextStyle"
-                                    x:Name="IntenseTextStyle"
+            <local:SettingContainer x:Name="IntenseTextStyle"
+                                    x:Uid="Appearance_IntenseTextStyle"
                                     ClearSettingValue="{x:Bind Appearance.ClearIntenseTextStyle}"
                                     HasSettingValue="{x:Bind Appearance.HasIntenseTextStyle, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.IntenseTextStyleOverrideSource, Mode=OneWay}">
diff --git a/src/cascadia/TerminalSettingsEditor/Compatibility.xaml b/src/cascadia/TerminalSettingsEditor/Compatibility.xaml
index 39810efd003..54354f3ed40 100644
--- a/src/cascadia/TerminalSettingsEditor/Compatibility.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Compatibility.xaml
@@ -26,15 +26,15 @@
 
     <StackPanel Style="{StaticResource SettingsStackStyle}">
         <!--  Allow Headless  -->
-        <local:SettingContainer x:Uid="Globals_AllowHeadless"
-                                x:Name="AllowHeadless">
+        <local:SettingContainer x:Name="AllowHeadless"
+                                x:Uid="Globals_AllowHeadless">
             <ToggleSwitch IsOn="{x:Bind ViewModel.AllowHeadless, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Text Measurement  -->
-        <local:SettingContainer x:Uid="Globals_TextMeasurement"
-                                x:Name="TextMeasurement">
+        <local:SettingContainer x:Name="TextMeasurement"
+                                x:Uid="Globals_TextMeasurement">
             <ComboBox AutomationProperties.AccessibilityView="Content"
                       ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                       ItemsSource="{x:Bind ViewModel.TextMeasurementList}"
@@ -43,16 +43,16 @@
         </local:SettingContainer>
 
         <!--  Debug Features  -->
-        <local:SettingContainer x:Uid="Globals_DebugFeaturesEnabled"
-                                x:Name="DebugFeaturesEnabled"
+        <local:SettingContainer x:Name="DebugFeaturesEnabled"
+                                x:Uid="Globals_DebugFeaturesEnabled"
                                 Visibility="{x:Bind ViewModel.DebugFeaturesAvailable}">
             <ToggleSwitch IsOn="{x:Bind ViewModel.DebugFeaturesEnabled, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Reset Application State  -->
-        <local:SettingContainer x:Uid="Settings_ResetApplicationState"
-                                x:Name="ResetApplicationState">
+        <local:SettingContainer x:Name="ResetApplicationState"
+                                x:Uid="Settings_ResetApplicationState">
             <Button x:Uid="Settings_ResetApplicationStateButton"
                     Style="{StaticResource DeleteButtonStyle}">
                 <Button.Flyout>
@@ -73,8 +73,8 @@
         </local:SettingContainer>
 
         <!--  Reset to Default Settings  -->
-        <local:SettingContainer x:Uid="Settings_ResetToDefaultSettings"
-                                x:Name="ResetToDefaultSettings">
+        <local:SettingContainer x:Name="ResetToDefaultSettings"
+                                x:Uid="Settings_ResetToDefaultSettings">
             <Button x:Uid="Settings_ResetToDefaultSettingsButton"
                     Style="{StaticResource DeleteButtonStyle}">
                 <Button.Flyout>
diff --git a/src/cascadia/TerminalSettingsEditor/EditColorScheme.xaml b/src/cascadia/TerminalSettingsEditor/EditColorScheme.xaml
index 54d93bad772..ab3798b8578 100644
--- a/src/cascadia/TerminalSettingsEditor/EditColorScheme.xaml
+++ b/src/cascadia/TerminalSettingsEditor/EditColorScheme.xaml
@@ -200,8 +200,8 @@
             </Grid>
         </Border>
 
-        <local:SettingContainer x:Uid="ColorScheme_InboxSchemeDuplicate"
-                                x:Name="InboxSchemeDuplicate"
+        <local:SettingContainer x:Name="InboxSchemeDuplicate"
+                                x:Uid="ColorScheme_InboxSchemeDuplicate"
                                 Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(ViewModel.IsEditable), Mode=OneWay}">
             <Button x:Name="DuplicateSchemeButton"
                     x:Uid="ColorScheme_DuplicateButton"
@@ -209,8 +209,8 @@
                     Style="{StaticResource BrowseButtonStyle}" />
         </local:SettingContainer>
 
-        <local:SettingContainer x:Uid="ColorScheme_ColorsHeader"
-                                x:Name="ColorsHeader"
+        <local:SettingContainer x:Name="ColorsHeader"
+                                x:Uid="ColorScheme_ColorsHeader"
                                 StartExpanded="True"
                                 Style="{StaticResource ExpanderSettingContainerStyle}"
                                 Visibility="{x:Bind ViewModel.IsEditable, Mode=OneWay}">
diff --git a/src/cascadia/TerminalSettingsEditor/Extensions.xaml b/src/cascadia/TerminalSettingsEditor/Extensions.xaml
index be026be4b90..9659f8f467a 100644
--- a/src/cascadia/TerminalSettingsEditor/Extensions.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Extensions.xaml
@@ -500,8 +500,8 @@
                 <muxc:Expander.Content>
                     <StackPanel>
                         <!--  Scope  -->
-                        <local:SettingContainer x:Uid="Extensions_Scope"
-                                                x:Name="Scope"
+                        <local:SettingContainer x:Name="Scope"
+                                                x:Uid="Extensions_Scope"
                                                 Content="{x:Bind ViewModel.CurrentExtensionPackage.Scope, Mode=OneWay}"
                                                 IsTabStop="False"
                                                 Style="{StaticResource SettingContainerWithTextContent}" />
diff --git a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml
index ad8b3078c37..70fc972a534 100644
--- a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml
+++ b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml
@@ -28,8 +28,8 @@
 
     <StackPanel Style="{StaticResource SettingsStackStyle}">
         <!--  Theme  -->
-        <local:SettingContainer x:Uid="Globals_Theme"
-                                x:Name="Theme">
+        <local:SettingContainer x:Name="Theme"
+                                x:Uid="Globals_Theme">
             <ComboBox AutomationProperties.AccessibilityView="Content"
                       ItemsSource="{x:Bind ViewModel.ThemeList, Mode=OneWay}"
                       SelectedItem="{x:Bind ViewModel.CurrentTheme, Mode=TwoWay}"
@@ -43,8 +43,8 @@
         </local:SettingContainer>
 
         <!--  Position of new tab  -->
-        <local:SettingContainer x:Uid="Globals_NewTabPosition"
-                                x:Name="NewTabPosition">
+        <local:SettingContainer x:Name="NewTabPosition"
+                                x:Uid="Globals_NewTabPosition">
             <ComboBox AutomationProperties.AccessibilityView="Content"
                       ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                       ItemsSource="{x:Bind ViewModel.NewTabPositionList, Mode=OneWay}"
@@ -53,52 +53,52 @@
         </local:SettingContainer>
 
         <!--  Show Titlebar  -->
-        <local:SettingContainer x:Uid="Globals_ShowTitlebar"
-                                x:Name="ShowTitlebar">
+        <local:SettingContainer x:Name="ShowTitlebar"
+                                x:Uid="Globals_ShowTitlebar">
             <ToggleSwitch IsOn="{x:Bind ViewModel.ShowTabsInTitlebar, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}"
                           Toggled="{x:Bind ViewModel.ShowTitlebarToggled}" />
         </local:SettingContainer>
 
         <!--  Always show tabs  -->
-        <local:SettingContainer x:Uid="Globals_AlwaysShowTabs"
-                                x:Name="AlwaysShowTabs">
+        <local:SettingContainer x:Name="AlwaysShowTabs"
+                                x:Uid="Globals_AlwaysShowTabs">
             <ToggleSwitch IsEnabled="{x:Bind mtu:Converters.InvertBoolean(ViewModel.ShowTabsInTitlebar), Mode=OneWay}"
                           IsOn="{x:Bind ViewModel.AlwaysShowTabs, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Show tabs in full screen  -->
-        <local:SettingContainer x:Uid="Globals_ShowTabsFullscreen"
-                                x:Name="ShowTabsFullscreen">
+        <local:SettingContainer x:Name="ShowTabsFullscreen"
+                                x:Uid="Globals_ShowTabsFullscreen">
             <ToggleSwitch IsOn="{x:Bind ViewModel.ShowTabsFullscreen, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Show Acrylic in Tab Row  -->
-        <local:SettingContainer x:Uid="Globals_AcrylicTabRow"
-                                x:Name="AcrylicTabRow">
+        <local:SettingContainer x:Name="AcrylicTabRow"
+                                x:Uid="Globals_AcrylicTabRow">
             <ToggleSwitch IsOn="{x:Bind ViewModel.UseAcrylicInTabRow, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Show Title in Titlebar  -->
-        <local:SettingContainer x:Uid="Globals_ShowTitleInTitlebar"
-                                x:Name="ShowTitleInTitlebar">
+        <local:SettingContainer x:Name="ShowTitleInTitlebar"
+                                x:Uid="Globals_ShowTitleInTitlebar">
             <ToggleSwitch IsOn="{x:Bind ViewModel.ShowTitleInTitlebar, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Always on Top  -->
-        <local:SettingContainer x:Uid="Globals_AlwaysOnTop"
-                                x:Name="AlwaysOnTop">
+        <local:SettingContainer x:Name="AlwaysOnTop"
+                                x:Uid="Globals_AlwaysOnTop">
             <ToggleSwitch IsOn="{x:Bind ViewModel.AlwaysOnTop, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Tab Width Mode  -->
-        <local:SettingContainer x:Uid="Globals_TabWidthMode"
-                                x:Name="TabWidthMode">
+        <local:SettingContainer x:Name="TabWidthMode"
+                                x:Uid="Globals_TabWidthMode">
             <ComboBox AutomationProperties.AccessibilityView="Content"
                       ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                       ItemsSource="{x:Bind ViewModel.TabWidthModeList, Mode=OneWay}"
@@ -108,43 +108,43 @@
 
         <!--  Disable Animations  -->
         <!--  NOTE: the UID is "DisablePaneAnimationsReversed" not "DisablePaneAnimations". See GH#9124 for more details.  -->
-        <local:SettingContainer x:Uid="Globals_DisableAnimationsReversed"
-                                x:Name="DisableAnimations">
+        <local:SettingContainer x:Name="DisableAnimations"
+                                x:Uid="Globals_DisableAnimationsReversed">
             <ToggleSwitch IsOn="{x:Bind ViewModel.InvertedDisableAnimations, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Always Show Notification Icon  -->
-        <local:SettingContainer x:Uid="Globals_AlwaysShowNotificationIcon"
-                                x:Name="AlwaysShowNotificationIcon">
+        <local:SettingContainer x:Name="AlwaysShowNotificationIcon"
+                                x:Uid="Globals_AlwaysShowNotificationIcon">
             <ToggleSwitch IsOn="{x:Bind ViewModel.AlwaysShowNotificationIcon, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Minimize To Notification Area  -->
-        <local:SettingContainer x:Uid="Globals_MinimizeToNotificationArea"
-                                x:Name="MinimizeToNotificationArea">
+        <local:SettingContainer x:Name="MinimizeToNotificationArea"
+                                x:Uid="Globals_MinimizeToNotificationArea">
             <ToggleSwitch IsOn="{x:Bind ViewModel.MinimizeToNotificationArea, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Automatically hide window  -->
-        <local:SettingContainer x:Uid="Globals_AutoHideWindow"
-                                x:Name="AutoHideWindow">
+        <local:SettingContainer x:Name="AutoHideWindow"
+                                x:Uid="Globals_AutoHideWindow">
             <ToggleSwitch IsOn="{x:Bind ViewModel.AutoHideWindow, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Show Admin Shield  -->
-        <local:SettingContainer x:Uid="Globals_ShowAdminShield"
-                                x:Name="ShowAdminShield">
+        <local:SettingContainer x:Name="ShowAdminShield"
+                                x:Uid="Globals_ShowAdminShield">
             <ToggleSwitch IsOn="{x:Bind ViewModel.ShowAdminShield, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Enable Unfocused Acrylic  -->
-        <local:SettingContainer x:Uid="Globals_EnableUnfocusedAcrylic"
-                                x:Name="EnableUnfocusedAcrylic">
+        <local:SettingContainer x:Name="EnableUnfocusedAcrylic"
+                                x:Uid="Globals_EnableUnfocusedAcrylic">
             <ToggleSwitch IsOn="{x:Bind ViewModel.EnableUnfocusedAcrylic, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
diff --git a/src/cascadia/TerminalSettingsEditor/Interaction.xaml b/src/cascadia/TerminalSettingsEditor/Interaction.xaml
index bccf1edfcc9..3c49ee3a25a 100644
--- a/src/cascadia/TerminalSettingsEditor/Interaction.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Interaction.xaml
@@ -27,15 +27,15 @@
     <StackPanel>
         <StackPanel Style="{StaticResource SettingsStackStyle}">
             <!--  Copy On Select  -->
-            <local:SettingContainer x:Uid="Globals_CopyOnSelect"
-                                    x:Name="CopyOnSelect">
+            <local:SettingContainer x:Name="CopyOnSelect"
+                                    x:Uid="Globals_CopyOnSelect">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.CopyOnSelect, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
             </local:SettingContainer>
 
             <!--  Copy Format  -->
-            <local:SettingContainer x:Uid="Globals_CopyFormat"
-                                    x:Name="CopyFormat">
+            <local:SettingContainer x:Name="CopyFormat"
+                                    x:Uid="Globals_CopyFormat">
                 <ComboBox AutomationProperties.AccessibilityView="Content"
                           ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                           ItemsSource="{x:Bind ViewModel.CopyFormatList, Mode=OneWay}"
@@ -44,22 +44,22 @@
             </local:SettingContainer>
 
             <!--  Trim Block Selection  -->
-            <local:SettingContainer x:Uid="Globals_TrimBlockSelection"
-                                    x:Name="TrimBlockSelection">
+            <local:SettingContainer x:Name="TrimBlockSelection"
+                                    x:Uid="Globals_TrimBlockSelection">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.TrimBlockSelection, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
             </local:SettingContainer>
 
             <!--  Trim Paste  -->
-            <local:SettingContainer x:Uid="Globals_TrimPaste"
-                                    x:Name="TrimPaste">
+            <local:SettingContainer x:Name="TrimPaste"
+                                    x:Uid="Globals_TrimPaste">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.TrimPaste, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
             </local:SettingContainer>
 
             <!--  Word Delimiters  -->
-            <local:SettingContainer x:Uid="Globals_WordDelimiters"
-                                    x:Name="WordDelimiters"
+            <local:SettingContainer x:Name="WordDelimiters"
+                                    x:Uid="Globals_WordDelimiters"
                                     CurrentValue="{x:Bind ViewModel.WordDelimiters, Mode=OneWay}"
                                     Style="{StaticResource ExpanderSettingContainerStyle}">
                 <TextBox IsSpellCheckEnabled="False"
@@ -68,15 +68,15 @@
             </local:SettingContainer>
 
             <!--  Snap On Resize  -->
-            <local:SettingContainer x:Uid="Globals_SnapToGridOnResize"
-                                    x:Name="SnapToGridOnResize">
+            <local:SettingContainer x:Name="SnapToGridOnResize"
+                                    x:Uid="Globals_SnapToGridOnResize">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.SnapToGridOnResize, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
             </local:SettingContainer>
 
             <!--  Tab Switcher Mode  -->
-            <local:SettingContainer x:Uid="Globals_TabSwitcherMode"
-                                    x:Name="TabSwitcherMode">
+            <local:SettingContainer x:Name="TabSwitcherMode"
+                                    x:Uid="Globals_TabSwitcherMode">
                 <ComboBox AutomationProperties.AccessibilityView="Content"
                           ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                           ItemsSource="{x:Bind ViewModel.TabSwitcherModeList}"
@@ -85,36 +85,36 @@
             </local:SettingContainer>
 
             <!--  Focus Follow Mouse Mode  -->
-            <local:SettingContainer x:Uid="Globals_FocusFollowMouse"
-                                    x:Name="FocusFollowMouse">
+            <local:SettingContainer x:Name="FocusFollowMouse"
+                                    x:Uid="Globals_FocusFollowMouse">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.FocusFollowMouse, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
             </local:SettingContainer>
 
             <!--  Enable Font Size Changes with Scrolling  -->
-            <local:SettingContainer x:Uid="Globals_ScrollToZoom"
-                                    x:Name="ScrollToZoom">
+            <local:SettingContainer x:Name="ScrollToZoom"
+                                    x:Uid="Globals_ScrollToZoom">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.ScrollToZoom, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
             </local:SettingContainer>
 
             <!--  Enable Window Opacity Changes with Scrolling  -->
-            <local:SettingContainer x:Uid="Globals_ScrollToChangeOpacity"
-                                    x:Name="ScrollToChangeOpacity">
+            <local:SettingContainer x:Name="ScrollToChangeOpacity"
+                                    x:Uid="Globals_ScrollToChangeOpacity">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.ScrollToChangeOpacity, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
             </local:SettingContainer>
 
             <!--  Detect URLs  -->
-            <local:SettingContainer x:Uid="Globals_DetectURLs"
-                                    x:Name="DetectURLs">
+            <local:SettingContainer x:Name="DetectURLs"
+                                    x:Uid="Globals_DetectURLs">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.DetectURLs, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
             </local:SettingContainer>
 
             <!--  Search Web Default Query URL  -->
-            <local:SettingContainer x:Uid="Globals_SearchWebDefaultQueryUrl"
-                                    x:Name="SearchWebDefaultQueryUrl"
+            <local:SettingContainer x:Name="SearchWebDefaultQueryUrl"
+                                    x:Uid="Globals_SearchWebDefaultQueryUrl"
                                     CurrentValue="{x:Bind ViewModel.SearchWebDefaultQueryUrl, Mode=OneWay}"
                                     Style="{StaticResource ExpanderSettingContainerStyle}">
                 <TextBox IsSpellCheckEnabled="False"
@@ -123,8 +123,8 @@
             </local:SettingContainer>
 
             <!--  Enable Color Selection  -->
-            <local:SettingContainer x:Uid="Globals_EnableColorSelection"
-                                    x:Name="EnableColorSelection">
+            <local:SettingContainer x:Name="EnableColorSelection"
+                                    x:Uid="Globals_EnableColorSelection">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.EnableColorSelection, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
             </local:SettingContainer>
@@ -136,29 +136,29 @@
                        Style="{StaticResource TextBlockSubHeaderStyle}" />
 
             <!--  Close All Tabs Warning  -->
-            <local:SettingContainer x:Uid="Globals_ConfirmCloseAllTabs"
-                                    x:Name="ConfirmCloseAllTabs">
+            <local:SettingContainer x:Name="ConfirmCloseAllTabs"
+                                    x:Uid="Globals_ConfirmCloseAllTabs">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.ConfirmCloseAllTabs, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
             </local:SettingContainer>
 
             <!--  Input Service Warning  -->
-            <local:SettingContainer x:Uid="Globals_InputServiceWarning"
-                                    x:Name="InputServiceWarning">
+            <local:SettingContainer x:Name="InputServiceWarning"
+                                    x:Uid="Globals_InputServiceWarning">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.InputServiceWarning, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
             </local:SettingContainer>
 
             <!--  Large Paste Warning  -->
-            <local:SettingContainer x:Uid="Globals_WarnAboutLargePaste"
-                                    x:Name="WarnAboutLargePaste">
+            <local:SettingContainer x:Name="WarnAboutLargePaste"
+                                    x:Uid="Globals_WarnAboutLargePaste">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.WarnAboutLargePaste, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
             </local:SettingContainer>
 
             <!--  Multi Line Paste Warning  -->
-            <local:SettingContainer x:Uid="Globals_WarnAboutMultiLinePaste"
-                                    x:Name="WarnAboutMultiLinePaste">
+            <local:SettingContainer x:Name="WarnAboutMultiLinePaste"
+                                    x:Uid="Globals_WarnAboutMultiLinePaste">
                 <ComboBox AutomationProperties.AccessibilityView="Content"
                           ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                           ItemsSource="{x:Bind WarnAboutMultiLinePasteList}"
diff --git a/src/cascadia/TerminalSettingsEditor/Launch.cpp b/src/cascadia/TerminalSettingsEditor/Launch.cpp
index e83a098aa1c..268d4d43b42 100644
--- a/src/cascadia/TerminalSettingsEditor/Launch.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Launch.cpp
@@ -46,7 +46,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         auto innerViewModel{ winrt::get_self<Editor::implementation::LaunchViewModel>(_ViewModel) };
         /* coroutine dispatch */ innerViewModel->PrepareStartOnUserLoginSettings();
 
-
         TraceLoggingWrite(
             g_hTerminalSettingsEditorProvider,
             "NavigatedToPage",
diff --git a/src/cascadia/TerminalSettingsEditor/Launch.xaml b/src/cascadia/TerminalSettingsEditor/Launch.xaml
index 72669b9b22f..e202feef33f 100644
--- a/src/cascadia/TerminalSettingsEditor/Launch.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Launch.xaml
@@ -44,8 +44,8 @@
     <StackPanel>
         <StackPanel Style="{StaticResource SettingsStackStyle}">
             <!--  Default Profile  -->
-            <local:SettingContainer x:Uid="Globals_DefaultProfile"
-                                    x:Name="DefaultProfile">
+            <local:SettingContainer x:Name="DefaultProfile"
+                                    x:Uid="Globals_DefaultProfile">
                 <ComboBox ItemsSource="{x:Bind ViewModel.DefaultProfiles}"
                           SelectedItem="{x:Bind ViewModel.CurrentDefaultProfile, Mode=TwoWay}"
                           Style="{StaticResource ComboBoxSettingStyle}">
@@ -141,8 +141,8 @@
             </local:SettingContainer>
 
             <!--  Language  -->
-            <local:SettingContainer x:Uid="Globals_Language"
-                                    x:Name="Language">
+            <local:SettingContainer x:Name="Language"
+                                    x:Uid="Globals_Language">
                 <ComboBox ItemsSource="{x:Bind ViewModel.LanguageList}"
                           SelectedItem="{x:Bind ViewModel.CurrentLanguage, Mode=TwoWay}"
                           Style="{StaticResource ComboBoxSettingStyle}">
@@ -155,8 +155,8 @@
             </local:SettingContainer>
 
             <!--  Language  -->
-            <local:SettingContainer x:Uid="Globals_DefaultInputScope"
-                                    x:Name="DefaultInputScope">
+            <local:SettingContainer x:Name="DefaultInputScope"
+                                    x:Uid="Globals_DefaultInputScope">
                 <ComboBox AutomationProperties.AccessibilityView="Content"
                           ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                           ItemsSource="{x:Bind ViewModel.DefaultInputScopeList}"
@@ -165,8 +165,8 @@
             </local:SettingContainer>
 
             <!--  Start on User Login  -->
-            <local:SettingContainer x:Uid="Globals_StartOnUserLogin"
-                                    x:Name="StartOnUserLogin"
+            <local:SettingContainer x:Name="StartOnUserLogin"
+                                    x:Uid="Globals_StartOnUserLogin"
                                     HelpText="{x:Bind ViewModel.StartOnUserLoginStatefulHelpText, Mode=OneWay}"
                                     Visibility="{x:Bind ViewModel.StartOnUserLoginAvailable, Mode=OneTime}">
                 <ToggleSwitch IsEnabled="{x:Bind ViewModel.StartOnUserLoginConfigurable, Mode=OneWay}"
@@ -175,8 +175,8 @@
             </local:SettingContainer>
 
             <!--  First Window Behavior  -->
-            <local:SettingContainer x:Uid="Globals_FirstWindowPreference"
-                                    x:Name="FirstWindowPreference">
+            <local:SettingContainer x:Name="FirstWindowPreference"
+                                    x:Uid="Globals_FirstWindowPreference">
                 <ComboBox AutomationProperties.AccessibilityView="Content"
                           ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                           ItemsSource="{x:Bind ViewModel.FirstWindowPreferenceList}"
@@ -185,8 +185,8 @@
             </local:SettingContainer>
 
             <!--  Windowing Behavior  -->
-            <local:SettingContainer x:Uid="Globals_WindowingBehavior"
-                                    x:Name="WindowingBehavior">
+            <local:SettingContainer x:Name="WindowingBehavior"
+                                    x:Uid="Globals_WindowingBehavior">
                 <ComboBox AutomationProperties.AccessibilityView="Content"
                           ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                           ItemsSource="{x:Bind ViewModel.WindowingBehaviorList}"
@@ -195,8 +195,8 @@
             </local:SettingContainer>
 
             <!--  Launch Size  -->
-            <local:SettingContainer x:Uid="Globals_LaunchSize"
-                                    x:Name="LaunchSize"
+            <local:SettingContainer x:Name="LaunchSize"
+                                    x:Uid="Globals_LaunchSize"
                                     CurrentValue="{x:Bind ViewModel.LaunchSizeCurrentValue, Mode=OneWay}"
                                     Style="{StaticResource ExpanderSettingContainerStyle}">
                 <Grid ColumnSpacing="12"
@@ -239,8 +239,8 @@
             </local:SettingContainer>
 
             <!--  Launch Parameters  -->
-            <local:SettingContainer x:Uid="Globals_LaunchParameters"
-                                    x:Name="LaunchParameters"
+            <local:SettingContainer x:Name="LaunchParameters"
+                                    x:Uid="Globals_LaunchParameters"
                                     CurrentValue="{x:Bind ViewModel.LaunchParametersCurrentValue, Mode=OneWay}"
                                     Style="{StaticResource ExpanderSettingContainerStyle}">
                 <Grid RowSpacing="8">
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.xaml b/src/cascadia/TerminalSettingsEditor/MainPage.xaml
index b655c1cd628..0090f5853a9 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.xaml
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.xaml
@@ -100,25 +100,25 @@
         </muxc:NavigationView.Header>
 
         <muxc:NavigationView.AutoSuggestBox>
-            <AutoSuggestBox x:Uid="Nav_SearchBox"
-                            x:Name="SettingsSearchBox"
+            <AutoSuggestBox x:Name="SettingsSearchBox"
+                            x:Uid="Nav_SearchBox"
                             QueryIcon="Find"
-                            TextChanged="SettingsSearchBox_TextChanged"
                             QuerySubmitted="SettingsSearchBox_QuerySubmitted"
-                            SuggestionChosen="SettingsSearchBox_SuggestionChosen">
+                            SuggestionChosen="SettingsSearchBox_SuggestionChosen"
+                            TextChanged="SettingsSearchBox_TextChanged">
                 <AutoSuggestBox.ItemTemplate>
                     <DataTemplate x:DataType="local:FilteredSearchResult">
                         <Grid HorizontalAlignment="Stretch"
                               ColumnSpacing="8">
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" />
                             </Grid.ColumnDefinitions>
 
                             <ContentPresenter Grid.Column="0"
                                               HorizontalAlignment="Center"
                                               VerticalAlignment="Center"
-                                              Content="{x:Bind Icon}"/>
+                                              Content="{x:Bind Icon}" />
                             <TextBlock Grid.Column="1"
                                        Text="{x:Bind Label}" />
                         </Grid>
diff --git a/src/cascadia/TerminalSettingsEditor/NewTabMenu.xaml b/src/cascadia/TerminalSettingsEditor/NewTabMenu.xaml
index 7066e42a542..5d409d941ad 100644
--- a/src/cascadia/TerminalSettingsEditor/NewTabMenu.xaml
+++ b/src/cascadia/TerminalSettingsEditor/NewTabMenu.xaml
@@ -324,8 +324,8 @@
             <!--  Once PR #17965 merges, we can add that kind of control to set an icon  -->
 
             <!--  Name  -->
-            <local:SettingContainer x:Uid="NewTabMenu_CurrentFolderName"
-                                    x:Name="CurrentFolderName"
+            <local:SettingContainer x:Name="CurrentFolderName"
+                                    x:Uid="NewTabMenu_CurrentFolderName"
                                     Grid.Row="0"
                                     CurrentValue="{x:Bind ViewModel.CurrentFolderName, Mode=OneWay}"
                                     Style="{StaticResource ExpanderSettingContainerStyle}">
@@ -334,16 +334,16 @@
             </local:SettingContainer>
 
             <!--  Inlining  -->
-            <local:SettingContainer x:Uid="NewTabMenu_CurrentFolderInlining"
-                                    x:Name="CurrentFolderInlining"
+            <local:SettingContainer x:Name="CurrentFolderInlining"
+                                    x:Uid="NewTabMenu_CurrentFolderInlining"
                                     Grid.Row="1">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.CurrentFolderInlining, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
             </local:SettingContainer>
 
             <!--  Allow Empty  -->
-            <local:SettingContainer x:Uid="NewTabMenu_CurrentFolderAllowEmpty"
-                                    x:Name="CurrentFolderAllowEmpty"
+            <local:SettingContainer x:Name="CurrentFolderAllowEmpty"
+                                    x:Uid="NewTabMenu_CurrentFolderAllowEmpty"
                                     Grid.Row="2">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.CurrentFolderAllowEmpty, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
@@ -356,8 +356,8 @@
                        Style="{StaticResource TextBlockSubHeaderStyle}" />
 
             <!--  Add Profile  -->
-            <local:SettingContainer x:Uid="NewTabMenu_AddProfile"
-                                    x:Name="AddProfile"
+            <local:SettingContainer x:Name="AddProfile"
+                                    x:Uid="NewTabMenu_AddProfile"
                                     FontIconGlyph="&#xE756;"
                                     Style="{StaticResource SettingContainerWithIcon}">
 
@@ -406,8 +406,8 @@
             </local:SettingContainer>
 
             <!--  Add Separator  -->
-            <local:SettingContainer x:Uid="NewTabMenu_AddSeparator"
-                                    x:Name="AddSeparator"
+            <local:SettingContainer x:Name="AddSeparator"
+                                    x:Uid="NewTabMenu_AddSeparator"
                                     FontIconGlyph="&#xE76f;"
                                     Style="{StaticResource SettingContainerWithIcon}">
                 <Button x:Name="AddSeparatorButton"
@@ -423,8 +423,8 @@
             </local:SettingContainer>
 
             <!--  Add Folder  -->
-            <local:SettingContainer x:Uid="NewTabMenu_AddFolder"
-                                    x:Name="AddFolder"
+            <local:SettingContainer x:Name="AddFolder"
+                                    x:Uid="NewTabMenu_AddFolder"
                                     FontIconGlyph="&#xF12B;"
                                     Style="{StaticResource SettingContainerWithIcon}">
                 <StackPanel Orientation="Horizontal"
@@ -450,8 +450,8 @@
             </local:SettingContainer>
 
             <!--  Add Match Profiles  -->
-            <local:SettingContainer x:Uid="NewTabMenu_AddMatchProfiles"
-                                    x:Name="AddMatchProfiles"
+            <local:SettingContainer x:Name="AddMatchProfiles"
+                                    x:Uid="NewTabMenu_AddMatchProfiles"
                                     FontIconGlyph="&#xE748;"
                                     Style="{StaticResource ExpanderSettingContainerStyleWithIcon}">
                 <StackPanel Spacing="8">
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.xaml b/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.xaml
index 7eac588f055..3f243c22bca 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.xaml
@@ -37,8 +37,8 @@
         <StackPanel Grid.Row="1"
                     Style="{StaticResource SettingsStackStyle}">
             <!--  Antialiasing Mode  -->
-            <local:SettingContainer x:Uid="Profile_AntialiasingMode"
-                                    x:Name="AntialiasingMode"
+            <local:SettingContainer x:Name="AntialiasingMode"
+                                    x:Uid="Profile_AntialiasingMode"
                                     ClearSettingValue="{x:Bind Profile.ClearAntialiasingMode}"
                                     HasSettingValue="{x:Bind Profile.HasAntialiasingMode, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Profile.AntialiasingModeOverrideSource, Mode=OneWay}">
@@ -50,8 +50,8 @@
             </local:SettingContainer>
 
             <!--  AltGr Aliasing  -->
-            <local:SettingContainer x:Uid="Profile_AltGrAliasing"
-                                    x:Name="AltGrAliasing"
+            <local:SettingContainer x:Name="AltGrAliasing"
+                                    x:Uid="Profile_AltGrAliasing"
                                     ClearSettingValue="{x:Bind Profile.ClearAltGrAliasing}"
                                     HasSettingValue="{x:Bind Profile.HasAltGrAliasing, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Profile.AltGrAliasingOverrideSource, Mode=OneWay}">
@@ -60,8 +60,8 @@
             </local:SettingContainer>
 
             <!--  Snap On Input  -->
-            <local:SettingContainer x:Uid="Profile_SnapOnInput"
-                                    x:Name="SnapOnInput"
+            <local:SettingContainer x:Name="SnapOnInput"
+                                    x:Uid="Profile_SnapOnInput"
                                     ClearSettingValue="{x:Bind Profile.ClearSnapOnInput}"
                                     HasSettingValue="{x:Bind Profile.HasSnapOnInput, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Profile.SnapOnInputOverrideSource, Mode=OneWay}">
@@ -70,8 +70,8 @@
             </local:SettingContainer>
 
             <!--  History Size  -->
-            <local:SettingContainer x:Uid="Profile_HistorySize"
-                                    x:Name="HistorySize"
+            <local:SettingContainer x:Name="HistorySize"
+                                    x:Uid="Profile_HistorySize"
                                     ClearSettingValue="{x:Bind Profile.ClearHistorySize}"
                                     HasSettingValue="{x:Bind Profile.HasHistorySize, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Profile.HistorySizeOverrideSource, Mode=OneWay}">
@@ -84,8 +84,8 @@
             </local:SettingContainer>
 
             <!--  Close On Exit  -->
-            <local:SettingContainer x:Uid="Profile_CloseOnExit"
-                                    x:Name="CloseOnExit"
+            <local:SettingContainer x:Name="CloseOnExit"
+                                    x:Uid="Profile_CloseOnExit"
                                     ClearSettingValue="{x:Bind Profile.ClearCloseOnExit}"
                                     HasSettingValue="{x:Bind Profile.HasCloseOnExit, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Profile.CloseOnExitOverrideSource, Mode=OneWay}">
@@ -97,8 +97,8 @@
             </local:SettingContainer>
 
             <!--  Bell Style  -->
-            <local:SettingContainer x:Uid="Profile_BellStyle"
-                                    x:Name="BellStyle"
+            <local:SettingContainer x:Name="BellStyle"
+                                    x:Uid="Profile_BellStyle"
                                     ClearSettingValue="{x:Bind Profile.ClearBellStyle}"
                                     CurrentValue="{x:Bind Profile.BellStylePreview, Mode=OneWay}"
                                     HasSettingValue="{x:Bind Profile.HasBellStyle, Mode=OneWay}"
@@ -115,8 +115,8 @@
             </local:SettingContainer>
 
             <!--  Bell Sound  -->
-            <local:SettingContainer x:Uid="Profile_BellSound"
-                                    x:Name="BellSound"
+            <local:SettingContainer x:Name="BellSound"
+                                    x:Uid="Profile_BellSound"
                                     ClearSettingValue="{x:Bind Profile.ClearBellSound}"
                                     CurrentValue="{x:Bind Profile.BellSoundPreview, Mode=OneWay}"
                                     HasSettingValue="{x:Bind Profile.HasBellSound, Mode=OneWay}"
@@ -197,8 +197,8 @@
             </local:SettingContainer>
 
             <!--  RightClickContextMenu  -->
-            <local:SettingContainer x:Uid="Profile_RightClickContextMenu"
-                                    x:Name="RightClickContextMenu"
+            <local:SettingContainer x:Name="RightClickContextMenu"
+                                    x:Uid="Profile_RightClickContextMenu"
                                     ClearSettingValue="{x:Bind Profile.ClearRightClickContextMenu}"
                                     HasSettingValue="{x:Bind Profile.HasRightClickContextMenu, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Profile.RightClickContextMenuOverrideSource, Mode=OneWay}">
@@ -207,8 +207,8 @@
             </local:SettingContainer>
 
             <!--  ShowMarks  -->
-            <local:SettingContainer x:Uid="Profile_ShowMarks"
-                                    x:Name="ShowMarks"
+            <local:SettingContainer x:Name="ShowMarks"
+                                    x:Uid="Profile_ShowMarks"
                                     ClearSettingValue="{x:Bind Profile.ClearShowMarks}"
                                     HasSettingValue="{x:Bind Profile.HasShowMarks, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Profile.ShowMarksOverrideSource, Mode=OneWay}"
@@ -218,8 +218,8 @@
             </local:SettingContainer>
 
             <!--  AutoMarkPrompts  -->
-            <local:SettingContainer x:Uid="Profile_AutoMarkPrompts"
-                                    x:Name="AutoMarkPrompts"
+            <local:SettingContainer x:Name="AutoMarkPrompts"
+                                    x:Uid="Profile_AutoMarkPrompts"
                                     ClearSettingValue="{x:Bind Profile.ClearAutoMarkPrompts}"
                                     HasSettingValue="{x:Bind Profile.HasAutoMarkPrompts, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Profile.AutoMarkPromptsOverrideSource, Mode=OneWay}"
@@ -229,8 +229,8 @@
             </local:SettingContainer>
 
             <!--  ReloadEnvVars  -->
-            <local:SettingContainer x:Uid="Profile_ReloadEnvVars"
-                                    x:Name="ReloadEnvVars"
+            <local:SettingContainer x:Name="ReloadEnvVars"
+                                    x:Uid="Profile_ReloadEnvVars"
                                     ClearSettingValue="{x:Bind Profile.ClearReloadEnvironmentVariables}"
                                     HasSettingValue="{x:Bind Profile.HasReloadEnvironmentVariables, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Profile.ReloadEnvironmentVariablesOverrideSource, Mode=OneWay}">
@@ -239,8 +239,8 @@
             </local:SettingContainer>
 
             <!--  RepositionCursorWithMouse  -->
-            <local:SettingContainer x:Uid="Profile_RepositionCursorWithMouse"
-                                    x:Name="RepositionCursorWithMouse"
+            <local:SettingContainer x:Name="RepositionCursorWithMouse"
+                                    x:Uid="Profile_RepositionCursorWithMouse"
                                     ClearSettingValue="{x:Bind Profile.ClearRepositionCursorWithMouse}"
                                     HasSettingValue="{x:Bind Profile.HasRepositionCursorWithMouse, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Profile.RepositionCursorWithMouseOverrideSource, Mode=OneWay}"
@@ -250,8 +250,8 @@
             </local:SettingContainer>
 
             <!--  RainbowSuggestions  -->
-            <local:SettingContainer x:Uid="Profile_RainbowSuggestions"
-                                    x:Name="RainbowSuggestions"
+            <local:SettingContainer x:Name="RainbowSuggestions"
+                                    x:Uid="Profile_RainbowSuggestions"
                                     ClearSettingValue="{x:Bind Profile.ClearRainbowSuggestions}"
                                     HasSettingValue="{x:Bind Profile.HasRainbowSuggestions, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Profile.RainbowSuggestionsOverrideSource, Mode=OneWay}">
@@ -260,8 +260,8 @@
             </local:SettingContainer>
 
             <!--  Path Translation  -->
-            <local:SettingContainer x:Uid="Profile_PathTranslationStyle"
-                                    x:Name="PathTranslationStyle"
+            <local:SettingContainer x:Name="PathTranslationStyle"
+                                    x:Uid="Profile_PathTranslationStyle"
                                     ClearSettingValue="{x:Bind Profile.ClearPathTranslationStyle}"
                                     HasSettingValue="{x:Bind Profile.HasPathTranslationStyle, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Profile.PathTranslationStyleOverrideSource, Mode=OneWay}">
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.xaml b/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.xaml
index 8520611dbfe..44f7cca4d11 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.xaml
@@ -107,8 +107,8 @@
                 </local:SettingContainer>
 
                 <!--  Use Acrylic  -->
-                <local:SettingContainer x:Uid="Profile_UseAcrylic"
-                                        x:Name="UseAcrylic"
+                <local:SettingContainer x:Name="UseAcrylic"
+                                        x:Uid="Profile_UseAcrylic"
                                         ClearSettingValue="{x:Bind Profile.ClearUseAcrylic}"
                                         HasSettingValue="{x:Bind Profile.HasUseAcrylic, Mode=OneWay}"
                                         SettingOverrideSource="{x:Bind Profile.UseAcrylicOverrideSource, Mode=OneWay}">
@@ -124,8 +124,8 @@
                            Style="{StaticResource TextBlockSubHeaderStyle}" />
 
                 <!--  Padding  -->
-                <local:SettingContainer x:Uid="Profile_Padding"
-                                        x:Name="Padding"
+                <local:SettingContainer x:Name="Padding"
+                                        x:Uid="Profile_Padding"
                                         ClearSettingValue="{x:Bind Profile.ClearPadding}"
                                         CurrentValue="{x:Bind Profile.Padding, Mode=OneWay}"
                                         HasSettingValue="{x:Bind Profile.HasPadding, Mode=OneWay}"
@@ -192,8 +192,8 @@
                 </local:SettingContainer>
 
                 <!--  Scrollbar Visibility  -->
-                <local:SettingContainer x:Uid="Profile_ScrollbarVisibility"
-                                        x:Name="ScrollbarVisibility"
+                <local:SettingContainer x:Name="ScrollbarVisibility"
+                                        x:Uid="Profile_ScrollbarVisibility"
                                         ClearSettingValue="{x:Bind Profile.ClearScrollState}"
                                         HasSettingValue="{x:Bind Profile.HasScrollState, Mode=OneWay}"
                                         SettingOverrideSource="{x:Bind Profile.ScrollStateOverrideSource, Mode=OneWay}">
@@ -210,9 +210,9 @@
                     <TextBlock x:Uid="Profile_UnfocusedAppearanceTextBlock"
                                Style="{StaticResource TextBlockSubtitleStyle}" />
 
-                    <!--Create Unfocused Appearance-->
-                    <Button x:Uid="Profile_CreateUnfocusedAppearanceButton"
-                            x:Name="CreateUnfocusedAppearance"
+                    <!--  Create Unfocused Appearance  -->
+                    <Button x:Name="CreateUnfocusedAppearance"
+                            x:Uid="Profile_CreateUnfocusedAppearanceButton"
                             Margin="8,0,0,0"
                             VerticalAlignment="Bottom"
                             Click="CreateUnfocusedAppearance_Click"
@@ -230,9 +230,9 @@
                         </Button.Content>
                     </Button>
 
-                    <!--Delete Unfocused Appearance-->
-                    <Button x:Uid="Profile_DeleteUnfocusedAppearanceButton"
-                            x:Name="DeleteUnfocusedAppearance"
+                    <!--  Delete Unfocused Appearance  -->
+                    <Button x:Name="DeleteUnfocusedAppearance"
+                            x:Uid="Profile_DeleteUnfocusedAppearanceButton"
                             Margin="8,0,0,0"
                             VerticalAlignment="Bottom"
                             Click="DeleteUnfocusedAppearance_Click"
@@ -250,7 +250,7 @@
                     </Button>
                 </StackPanel>
 
-                <!--Unfocused Appearance-->
+                <!--  Unfocused Appearance  -->
                 <local:Appearances Appearance="{x:Bind Profile.UnfocusedAppearance, Mode=OneWay}"
                                    SourceProfile="{x:Bind Profile, Mode=OneWay}"
                                    Visibility="{x:Bind Profile.ShowUnfocusedAppearance, Mode=OneWay}"
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml b/src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml
index 4737c045e42..0c10bf11b86 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml
@@ -40,8 +40,8 @@
                 Additionally, the JSON stubs generated by auto-generated profiles come with a name,
                 so the name will always be overridden.
             -->
-            <local:SettingContainer x:Uid="Profile_Name"
-                                    x:Name="Name"
+            <local:SettingContainer x:Name="Name"
+                                    x:Uid="Profile_Name"
                                     CurrentValue="{x:Bind Profile.Name, Mode=OneWay}"
                                     Style="{StaticResource ExpanderSettingContainerStyle}"
                                     Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(Profile.IsBaseLayer), Mode=OneWay}">
@@ -100,8 +100,8 @@
             </local:SettingContainer>
 
             <!--  Icon  -->
-            <local:SettingContainer x:Uid="Profile_Icon"
-                                    x:Name="Icon"
+            <local:SettingContainer x:Name="Icon"
+                                    x:Uid="Profile_Icon"
                                     ClearSettingValue="{x:Bind Profile.ClearIcon}"
                                     CurrentValueAccessibleName="{x:Bind Profile.LocalizedIcon, Mode=OneWay}"
                                     HasSettingValue="{x:Bind Profile.HasIcon, Mode=OneWay}"
@@ -200,8 +200,8 @@
             </local:SettingContainer>
 
             <!--  Tab Title  -->
-            <local:SettingContainer x:Uid="Profile_TabTitle"
-                                    x:Name="TabTitle"
+            <local:SettingContainer x:Name="TabTitle"
+                                    x:Uid="Profile_TabTitle"
                                     ClearSettingValue="{x:Bind Profile.ClearTabTitle}"
                                     CurrentValue="{x:Bind Profile.TabTitlePreview, Mode=OneWay}"
                                     HasSettingValue="{x:Bind Profile.HasTabTitle, Mode=OneWay}"
@@ -228,8 +228,8 @@
             </local:SettingContainer>
 
             <!--  Elevate  -->
-            <local:SettingContainer x:Uid="Profile_Elevate"
-                                    x:Name="Elevate"
+            <local:SettingContainer x:Name="Elevate"
+                                    x:Uid="Profile_Elevate"
                                     ClearSettingValue="{x:Bind Profile.ClearElevate}"
                                     HasSettingValue="{x:Bind Profile.HasElevate, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Profile.ElevateOverrideSource, Mode=OneWay}">
@@ -238,8 +238,8 @@
             </local:SettingContainer>
 
             <!--  Hidden  -->
-            <local:SettingContainer x:Uid="Profile_Hidden"
-                                    x:Name="Hidden"
+            <local:SettingContainer x:Name="Hidden"
+                                    x:Uid="Profile_Hidden"
                                     Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(Profile.IsBaseLayer), Mode=OneWay}">
                 <ToggleSwitch IsOn="{x:Bind Profile.Hidden, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Base_Orphaned.xaml b/src/cascadia/TerminalSettingsEditor/Profiles_Base_Orphaned.xaml
index 44a1c7e1980..6f928b0cb73 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Base_Orphaned.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Base_Orphaned.xaml
@@ -23,8 +23,8 @@
 
     <StackPanel Style="{StaticResource SettingsStackStyle}">
         <!--  Delete Button  -->
-        <local:SettingContainer x:Uid="Profile_Delete_Orphaned"
-                                x:Name="DeleteOrphaned">
+        <local:SettingContainer x:Name="DeleteOrphaned"
+                                x:Uid="Profile_Delete_Orphaned">
             <local:SettingContainer.Content>
                 <Button x:Name="DeleteButton"
                         Click="DeleteConfirmation_Click"
@@ -41,8 +41,8 @@
             </local:SettingContainer.Content>
         </local:SettingContainer>
 
-        <local:SettingContainer x:Uid="Profile_Name"
-                                x:Name="Name">
+        <local:SettingContainer x:Name="Name"
+                                x:Uid="Profile_Name">
             <local:SettingContainer.Content>
                 <TextBlock FontFamily="Segoe UI, Segoe Fluent Icons, Segoe MDL2 Assets"
                            Style="{StaticResource SettingsPageItemDescriptionStyle}"
@@ -50,8 +50,8 @@
             </local:SettingContainer.Content>
         </local:SettingContainer>
 
-        <local:SettingContainer x:Uid="Profile_Source_Orphaned"
-                                x:Name="Source">
+        <local:SettingContainer x:Name="Source"
+                                x:Uid="Profile_Source_Orphaned">
             <local:SettingContainer.Content>
                 <TextBlock FontFamily="Segoe UI, Segoe Fluent Icons, Segoe MDL2 Assets"
                            Style="{StaticResource SettingsPageItemDescriptionStyle}"
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Terminal.xaml b/src/cascadia/TerminalSettingsEditor/Profiles_Terminal.xaml
index c70519de6e3..b5b10c2af85 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Terminal.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Terminal.xaml
@@ -32,8 +32,8 @@
                     Style="{StaticResource SettingsStackStyle}">
 
             <!--  Suppress Application Title  -->
-            <local:SettingContainer x:Uid="Profile_SuppressApplicationTitle"
-                                    x:Name="SuppressApplicationTitle"
+            <local:SettingContainer x:Name="SuppressApplicationTitle"
+                                    x:Uid="Profile_SuppressApplicationTitle"
                                     ClearSettingValue="{x:Bind Profile.ClearSuppressApplicationTitle}"
                                     HasSettingValue="{x:Bind Profile.HasSuppressApplicationTitle, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Profile.SuppressApplicationTitleOverrideSource, Mode=OneWay}">
@@ -42,8 +42,8 @@
             </local:SettingContainer>
 
             <!--  Force VT Input  -->
-            <local:SettingContainer x:Uid="Profile_ForceVTInput"
-                                    x:Name="ForceVTInput"
+            <local:SettingContainer x:Name="ForceVTInput"
+                                    x:Uid="Profile_ForceVTInput"
                                     ClearSettingValue="{x:Bind Profile.ClearForceVTInput}"
                                     HasSettingValue="{x:Bind Profile.HasForceVTInput, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Profile.ForceVTInputOverrideSource, Mode=OneWay}">
@@ -52,8 +52,8 @@
             </local:SettingContainer>
 
             <!--  Allow VT Checksum Report  -->
-            <local:SettingContainer x:Uid="Profile_AllowVtChecksumReport"
-                                    x:Name="AllowVtChecksumReport"
+            <local:SettingContainer x:Name="AllowVtChecksumReport"
+                                    x:Uid="Profile_AllowVtChecksumReport"
                                     ClearSettingValue="{x:Bind Profile.ClearAllowVtChecksumReport}"
                                     HasSettingValue="{x:Bind Profile.HasAllowVtChecksumReport, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Profile.AllowVtChecksumReportOverrideSource, Mode=OneWay}">
@@ -62,8 +62,8 @@
             </local:SettingContainer>
 
             <!--  Allow VT Clipboard Writing  -->
-            <local:SettingContainer x:Uid="Profile_AllowVtClipboardWrite"
-                                    x:Name="AllowVtClipboardWrite"
+            <local:SettingContainer x:Name="AllowVtClipboardWrite"
+                                    x:Uid="Profile_AllowVtClipboardWrite"
                                     ClearSettingValue="{x:Bind Profile.ClearAllowVtClipboardWrite}"
                                     HasSettingValue="{x:Bind Profile.HasAllowVtClipboardWrite, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Profile.AllowVtClipboardWriteOverrideSource, Mode=OneWay}">
@@ -72,8 +72,8 @@
             </local:SettingContainer>
 
             <!--  Answerback Message  -->
-            <local:SettingContainer x:Uid="Profile_AnswerbackMessage"
-                                    x:Name="AnswerbackMessage"
+            <local:SettingContainer x:Name="AnswerbackMessage"
+                                    x:Uid="Profile_AnswerbackMessage"
                                     ClearSettingValue="{x:Bind Profile.ClearAnswerbackMessage}"
                                     CurrentValue="{x:Bind Profile.AnswerbackMessagePreview, Mode=OneWay}"
                                     HasSettingValue="{x:Bind Profile.HasAnswerbackMessage, Mode=OneWay}"
diff --git a/src/cascadia/TerminalSettingsEditor/Rendering.xaml b/src/cascadia/TerminalSettingsEditor/Rendering.xaml
index 7df8c136d0c..9a966d0f913 100644
--- a/src/cascadia/TerminalSettingsEditor/Rendering.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Rendering.xaml
@@ -24,8 +24,8 @@
     </Page.Resources>
 
     <StackPanel Style="{StaticResource SettingsStackStyle}">
-        <local:SettingContainer x:Uid="Globals_GraphicsAPI"
-                                x:Name="GraphicsAPI">
+        <local:SettingContainer x:Name="GraphicsAPI"
+                                x:Uid="Globals_GraphicsAPI">
             <ComboBox AutomationProperties.AccessibilityView="Content"
                       ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                       ItemsSource="{x:Bind ViewModel.GraphicsAPIList}"
@@ -33,14 +33,14 @@
                       Style="{StaticResource ComboBoxSettingStyle}" />
         </local:SettingContainer>
 
-        <local:SettingContainer x:Uid="Globals_DisablePartialInvalidation"
-                                x:Name="DisablePartialInvalidation">
+        <local:SettingContainer x:Name="DisablePartialInvalidation"
+                                x:Uid="Globals_DisablePartialInvalidation">
             <ToggleSwitch IsOn="{x:Bind ViewModel.DisablePartialInvalidation, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
-        <local:SettingContainer x:Uid="Globals_SoftwareRendering"
-                                x:Name="SoftwareRendering">
+        <local:SettingContainer x:Name="SoftwareRendering"
+                                x:Uid="Globals_SoftwareRendering">
             <ToggleSwitch IsOn="{x:Bind ViewModel.SoftwareRendering, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
diff --git a/src/cascadia/TerminalSettingsModel/ActionArgs.cpp b/src/cascadia/TerminalSettingsModel/ActionArgs.cpp
index 3518d21c305..2a0af3ecbf1 100644
--- a/src/cascadia/TerminalSettingsModel/ActionArgs.cpp
+++ b/src/cascadia/TerminalSettingsModel/ActionArgs.cpp
@@ -60,7 +60,7 @@ namespace winrt
     namespace WARC = ::winrt::Windows::ApplicationModel::Resources::Core;
 }
 
-// Like RS_ and RS_fmt, but they use an ambient context to determine 
+// Like RS_ and RS_fmt, but they use an ambient context to determine
 // whether to load the English version of a resource or the localized one.
 #define RS_switchable_(x) RS_switchable_impl(context, USES_RESOURCE(x))
 #define RS_switchable_fmt(x, ...) RS_switchable_fmt_impl(context, USES_RESOURCE(x), __VA_ARGS__)
diff --git a/tools/GenerateSettingsIndex.ps1 b/tools/GenerateSettingsIndex.ps1
index bc3ff10fb76..66e4b713d15 100644
--- a/tools/GenerateSettingsIndex.ps1
+++ b/tools/GenerateSettingsIndex.ps1
@@ -56,7 +56,7 @@ Get-ChildItem -Path $SourceDir -Recurse -Filter *.xaml | ForEach-Object {
     }
     elseif ($filename -eq 'Appearances.xaml')
     {
-        # Apperances.xaml is a UserControl that is hosted in Profiles_Appearance.xaml
+        # Appearances.xaml is a UserControl that is hosted in Profiles_Appearance.xaml
         $pageClass = 'Microsoft::Terminal::Settings::Editor::Profiles_Appearance'
     }
     else

From 82536fd756af1b536bc15ba52b725c81aec4e63d Mon Sep 17 00:00:00 2001
From: Carlos Zamora <cazamor@microsoft.com>
Date: Wed, 5 Nov 2025 15:26:54 -0800
Subject: [PATCH 13/25] bugfix: duplicate profile

---
 tools/GenerateSettingsIndex.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/GenerateSettingsIndex.ps1 b/tools/GenerateSettingsIndex.ps1
index 66e4b713d15..6a9f38863ef 100644
--- a/tools/GenerateSettingsIndex.ps1
+++ b/tools/GenerateSettingsIndex.ps1
@@ -344,7 +344,7 @@ Get-ChildItem -Path $SourceDir -Recurse -Filter *.xaml | ForEach-Object {
         }
         elseif ($pageClass -match 'Editor::AddProfile')
         {
-            $navigationParam = 'AddProfile_Nav'
+            $navigationParam = 'AddProfile'
         }
 
         $entries += [pscustomobject]@{

From cff62cc60e6bd6917a922a7639bd28c52e47aace Mon Sep 17 00:00:00 2001
From: Carlos Zamora <cazamor@microsoft.com>
Date: Thu, 6 Nov 2025 13:57:13 -0800
Subject: [PATCH 14/25] update selected item

---
 .../TerminalSettingsEditor/MainPage.cpp       | 75 +++++++++++++++----
 .../TerminalSettingsEditor/MainPage.h         |  1 +
 .../TerminalSettingsEditor/MainPage.xaml      | 24 ++++--
 3 files changed, 78 insertions(+), 22 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
index 0e602509821..f52235b1c92 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
@@ -402,8 +402,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                                 if (stringTag == breadcrumbStringTag)
                                 {
                                     // found the one that was selected before the refresh
-                                    SettingsNav().SelectedItem(item);
                                     _Navigate(*breadcrumbStringTag, crumb->SubPage());
+                                    SettingsNav().SelectedItem(item);
                                     return;
                                 }
                             }
@@ -413,8 +413,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                                 {
                                     // navigate to the NewTabMenu page,
                                     // _Navigate() will handle trying to find the right subpage
-                                    SettingsNav().SelectedItem(item);
                                     _Navigate(breadcrumbFolderEntry, BreadcrumbSubPage::NewTabMenu_Folder);
+                                    SettingsNav().SelectedItem(item);
                                     return;
                                 }
                             }
@@ -424,8 +424,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                                 {
                                     // navigate to the Extensions page,
                                     // _Navigate() will handle trying to find the right subpage
-                                    SettingsNav().SelectedItem(item);
                                     _Navigate(breadcrumbExtensionPackage, BreadcrumbSubPage::Extensions_Extension);
+                                    SettingsNav().SelectedItem(item);
                                     return;
                                 }
                             }
@@ -437,8 +437,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                                 if (profileTag->OriginalProfileGuid() == breadcrumbProfileTag->OriginalProfileGuid())
                                 {
                                     // found the one that was selected before the refresh
-                                    SettingsNav().SelectedItem(item);
                                     _Navigate(*profileTag, crumb->SubPage());
+                                    SettingsNav().SelectedItem(item);
                                     return;
                                 }
                             }
@@ -452,8 +452,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         // This happens when the selected item was a profile which doesn't exist in the new configuration
         // We can use menuItemsSTL here because the only things they miss are profile entries.
         const auto& firstItem{ _menuItemSource.GetAt(0).as<MUX::Controls::NavigationViewItem>() };
-        SettingsNav().SelectedItem(firstItem);
         _Navigate(unbox_value<hstring>(firstItem.Tag()), BreadcrumbSubPage::None);
+        SettingsNav().SelectedItem(firstItem);
 
         _UpdateSearchIndex();
     }
@@ -658,30 +658,35 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             contentFrame().Navigate(xaml_typename<Editor::Launch>(), winrt::make<NavigateToLaunchArgs>(winrt::make<LaunchViewModel>(_settingsClone), elementToFocus));
             const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_Launch/Content"), BreadcrumbSubPage::None);
             _breadcrumbs.Append(crumb);
+            SettingsNav().SelectedItem(LaunchNavItem());
         }
         else if (clickedItemTag == interactionTag)
         {
             contentFrame().Navigate(xaml_typename<Editor::Interaction>(), winrt::make<NavigateToInteractionArgs>(winrt::make<InteractionViewModel>(_settingsClone.GlobalSettings()), elementToFocus));
             const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_Interaction/Content"), BreadcrumbSubPage::None);
             _breadcrumbs.Append(crumb);
+            SettingsNav().SelectedItem(InteractionNavItem());
         }
         else if (clickedItemTag == renderingTag)
         {
             contentFrame().Navigate(xaml_typename<Editor::Rendering>(), winrt::make<NavigateToRenderingArgs>(winrt::make<RenderingViewModel>(_settingsClone), elementToFocus));
             const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_Rendering/Content"), BreadcrumbSubPage::None);
             _breadcrumbs.Append(crumb);
+            SettingsNav().SelectedItem(RenderingNavItem());
         }
         else if (clickedItemTag == compatibilityTag)
         {
             contentFrame().Navigate(xaml_typename<Editor::Compatibility>(), winrt::make<NavigateToCompatibilityArgs>(winrt::make<CompatibilityViewModel>(_settingsClone), elementToFocus));
             const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_Compatibility/Content"), BreadcrumbSubPage::None);
             _breadcrumbs.Append(crumb);
+            SettingsNav().SelectedItem(CompatibilityNavItem());
         }
         else if (clickedItemTag == actionsTag)
         {
             contentFrame().Navigate(xaml_typename<Editor::Actions>(), winrt::make<NavigateToActionsArgs>(winrt::make<ActionsViewModel>(_settingsClone)));
             const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_Actions/Content"), BreadcrumbSubPage::None);
             _breadcrumbs.Append(crumb);
+            SettingsNav().SelectedItem(ActionsNavItem());
         }
         else if (clickedItemTag == newTabMenuTag)
         {
@@ -698,6 +703,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_NewTabMenu/Content"), BreadcrumbSubPage::None);
                 _breadcrumbs.Append(crumb);
             }
+            SettingsNav().SelectedItem(NewTabMenuNavItem());
         }
         else if (clickedItemTag == extensionsTag)
         {
@@ -713,6 +719,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_Extensions/Content"), BreadcrumbSubPage::None);
                 _breadcrumbs.Append(crumb);
             }
+            SettingsNav().SelectedItem(ExtensionsNavItem());
         }
         else if (clickedItemTag == globalProfileTag)
         {
@@ -725,6 +732,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             contentFrame().Navigate(xaml_typename<Editor::Profiles_Base>(), winrt::make<implementation::NavigateToProfileArgs>(profileVM, *this, elementToFocus));
             const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_ProfileDefaults/Content"), BreadcrumbSubPage::None);
             _breadcrumbs.Append(crumb);
+            SettingsNav().SelectedItem(BaseLayerMenuItem());
 
             // If we were given a label, make sure we are on the correct sub-page
             if (subPage == BreadcrumbSubPage::Profile_Appearance)
@@ -745,6 +753,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_ColorSchemes/Content"), BreadcrumbSubPage::None);
             _breadcrumbs.Append(crumb);
             contentFrame().Navigate(xaml_typename<Editor::ColorSchemes>(), winrt::make<NavigateToColorSchemesArgs>(_colorSchemesPageVM, elementToFocus));
+            SettingsNav().SelectedItem(ColorSchemesNavItem());
 
             if (subPage == BreadcrumbSubPage::ColorSchemes_Edit)
             {
@@ -756,6 +765,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             contentFrame().Navigate(xaml_typename<Editor::GlobalAppearance>(), winrt::make<NavigateToGlobalAppearanceArgs>(winrt::make<GlobalAppearanceViewModel>(_settingsClone.GlobalSettings()), elementToFocus));
             const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_Appearance/Content"), BreadcrumbSubPage::None);
             _breadcrumbs.Append(crumb);
+            SettingsNav().SelectedItem(GlobalAppearanceNavItem());
         }
         else if (clickedItemTag == addProfileTag)
         {
@@ -764,6 +774,27 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             contentFrame().Navigate(xaml_typename<Editor::AddProfile>(), addProfileState);
             const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_AddNewProfile/Content"), BreadcrumbSubPage::None);
             _breadcrumbs.Append(crumb);
+
+            // Find the "Add new profile" menu item and select it
+            // It's likely at the very end of the list, so we'll search backwards
+            for (auto i = _menuItemSource.Size() - 1; i > 0; --i)
+            {
+                const auto& item = _menuItemSource.GetAt(i);
+                if (const auto& menuItem{ item.try_as<MUX::Controls::NavigationViewItem>() })
+                {
+                    if (const auto& tag{ menuItem.Tag() })
+                    {
+                        if (const auto& stringTag{ tag.try_as<hstring>() })
+                        {
+                            if (*stringTag == addProfileTag)
+                            {
+                                SettingsNav().SelectedItem(item);
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
         }
     }
 
@@ -790,6 +821,10 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         contentFrame().Navigate(xaml_typename<Editor::Profiles_Base>(), winrt::make<implementation::NavigateToProfileArgs>(profile, *this, elementToFocus));
         const auto crumb = winrt::make<Breadcrumb>(box_value(profile), profile.Name(), BreadcrumbSubPage::None);
         _breadcrumbs.Append(crumb);
+        if (const auto profileNavItem = _FindProfileNavItem(profile.OriginalProfileGuid()))
+        {
+            SettingsNav().SelectedItem(profileNavItem);
+        }
 
         // Set the profile's 'CurrentPage' to the correct one, if this requires further navigation, the
         // event handler will do it
@@ -818,6 +853,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         contentFrame().Navigate(xaml_typename<Editor::NewTabMenu>(), winrt::make<NavigateToNewTabMenuArgs>(_newTabMenuPageVM, elementToFocus));
         const auto crumb = winrt::make<Breadcrumb>(box_value(newTabMenuTag), RS_(L"Nav_NewTabMenu/Content"), BreadcrumbSubPage::None);
         _breadcrumbs.Append(crumb);
+        SettingsNav().SelectedItem(NewTabMenuNavItem());
 
         if (subPage == BreadcrumbSubPage::None)
         {
@@ -851,6 +887,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         contentFrame().Navigate(xaml_typename<Editor::Extensions>(), winrt::make<NavigateToExtensionsArgs>(_extensionsVM, elementToFocus));
         const auto crumb = winrt::make<Breadcrumb>(box_value(extensionsTag), RS_(L"Nav_Extensions/Content"), BreadcrumbSubPage::None);
         _breadcrumbs.Append(crumb);
+        SettingsNav().SelectedItem(ExtensionsNavItem());
 
         if (subPage == BreadcrumbSubPage::None)
         {
@@ -1004,8 +1041,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         }
 
         // Select and navigate to the new profile
-        SettingsNav().SelectedItem(navItem);
         _Navigate(profileViewModel, BreadcrumbSubPage::None);
+        SettingsNav().SelectedItem(navItem);
     }
 
     static MUX::Controls::InfoBadge _createGlyphIconBadge(wil::zwstring_view glyph)
@@ -1097,7 +1134,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
             // navigate to the profile next to this one
             const auto newSelectedItem{ _menuItemSource.GetAt(index < _menuItemSource.Size() - 1 ? index : index - 1) };
-            SettingsNav().SelectedItem(newSelectedItem);
             const auto newTag = newSelectedItem.as<MUX::Controls::NavigationViewItem>().Tag();
             if (const auto profileViewModel = newTag.try_as<ProfileViewModel>())
             {
@@ -1110,6 +1146,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             }
             // Since we are navigating to a new profile after deletion, scroll up to the top
             SettingsMainPage_ScrollViewer().ChangeView(nullptr, 0.0, nullptr);
+            SettingsNav().SelectedItem(newSelectedItem);
         }
     }
 
@@ -1119,6 +1156,15 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     }
 
     void MainPage::_NavigateToProfileHandler(const IInspectable& /*sender*/, winrt::guid profileGuid)
+    {
+        if (const auto profileNavItem = _FindProfileNavItem(profileGuid))
+        {
+            _Navigate(profileNavItem.Tag().as<Editor::ProfileViewModel>(), BreadcrumbSubPage::None);
+        }
+        // Silently fail if the profile wasn't found
+    }
+
+    MUX::Controls::NavigationViewItem MainPage::_FindProfileNavItem(winrt::guid profileGuid) const
     {
         for (auto&& menuItem : _menuItemSource)
         {
@@ -1130,21 +1176,19 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                     {
                         if (profileTag->OriginalProfileGuid() == profileGuid)
                         {
-                            SettingsNav().SelectedItem(menuItem);
-                            _Navigate(*profileTag, BreadcrumbSubPage::None);
-                            return;
+                            return navViewItem;
                         }
                     }
                 }
             }
         }
-        // Silently fail if the profile wasn't found
+        return nullptr;
     }
 
     void MainPage::_NavigateToColorSchemeHandler(const IInspectable& /*sender*/, const IInspectable& /*args*/)
     {
-        SettingsNav().SelectedItem(ColorSchemesNavItem());
         _Navigate(hstring{ colorSchemesTag }, BreadcrumbSubPage::ColorSchemes_Edit);
+        SettingsNav().SelectedItem(ColorSchemesNavItem());
     }
 
     winrt::Windows::UI::Xaml::Media::Brush MainPage::BackgroundBrush()
@@ -1366,9 +1410,9 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             const auto& navigationArg{ chosenResult->NavigationArg() };
             const auto& subpage{ indexEntry.Entry->SubPage };
             const auto& elementToFocus{ indexEntry.Entry->ElementName };
-            if (navigationArg.try_as<hstring>())
+            if (const auto navArgString = navigationArg.try_as<hstring>())
             {
-                _Navigate(navigationArg.as<hstring>(), subpage, elementToFocus);
+                _Navigate(*navArgString, subpage, elementToFocus);
             }
             else if (const auto profileVM = navigationArg.try_as<ProfileViewModel>())
             {
@@ -1382,6 +1426,9 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             {
                 _Navigate(*extPkgVM, subpage, elementToFocus);
             }
+            // TODO CARLOS:
+            // - update selected item
+            // - clear text box
         }
     }
 
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.h b/src/cascadia/TerminalSettingsEditor/MainPage.h
index 76e1dc77520..de013f85b9d 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.h
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.h
@@ -114,6 +114,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         void _Navigate(const Editor::ExtensionPackageViewModel& extPkgVM, BreadcrumbSubPage subPage, hstring elementToFocus = {});
         void _NavigateToProfileHandler(const IInspectable& sender, winrt::guid profileGuid);
         void _NavigateToColorSchemeHandler(const IInspectable& sender, const IInspectable& args);
+        Microsoft::UI::Xaml::Controls::NavigationViewItem _FindProfileNavItem(winrt::guid profileGuid) const;
 
         void _UpdateBackgroundForMica();
         void _MoveXamlParsedNavItemsIntoItemSource();
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.xaml b/src/cascadia/TerminalSettingsEditor/MainPage.xaml
index 0090f5853a9..0501a5a09c3 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.xaml
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.xaml
@@ -129,21 +129,24 @@
 
         <muxc:NavigationView.MenuItems>
 
-            <muxc:NavigationViewItem x:Uid="Nav_Launch"
+            <muxc:NavigationViewItem x:Name="LaunchNavItem"
+                                     x:Uid="Nav_Launch"
                                      Tag="Launch_Nav">
                 <muxc:NavigationViewItem.Icon>
                     <FontIcon Glyph="&#xE7B5;" />
                 </muxc:NavigationViewItem.Icon>
             </muxc:NavigationViewItem>
 
-            <muxc:NavigationViewItem x:Uid="Nav_Interaction"
+            <muxc:NavigationViewItem x:Name="InteractionNavItem"
+                                     x:Uid="Nav_Interaction"
                                      Tag="Interaction_Nav">
                 <muxc:NavigationViewItem.Icon>
                     <FontIcon Glyph="&#xE7C9;" />
                 </muxc:NavigationViewItem.Icon>
             </muxc:NavigationViewItem>
 
-            <muxc:NavigationViewItem x:Uid="Nav_Appearance"
+            <muxc:NavigationViewItem x:Name="GlobalAppearanceNavItem"
+                                     x:Uid="Nav_Appearance"
                                      Tag="GlobalAppearance_Nav">
                 <muxc:NavigationViewItem.Icon>
                     <FontIcon Glyph="&#xE771;" />
@@ -158,35 +161,40 @@
                 </muxc:NavigationViewItem.Icon>
             </muxc:NavigationViewItem>
 
-            <muxc:NavigationViewItem x:Uid="Nav_Rendering"
+            <muxc:NavigationViewItem x:Name="RenderingNavItem"
+                                     x:Uid="Nav_Rendering"
                                      Tag="Rendering_Nav">
                 <muxc:NavigationViewItem.Icon>
                     <FontIcon Glyph="&#xE7F8;" />
                 </muxc:NavigationViewItem.Icon>
             </muxc:NavigationViewItem>
 
-            <muxc:NavigationViewItem x:Uid="Nav_Compatibility"
+            <muxc:NavigationViewItem x:Name="CompatibilityNavItem"
+                                     x:Uid="Nav_Compatibility"
                                      Tag="Compatibility_Nav">
                 <muxc:NavigationViewItem.Icon>
                     <FontIcon Glyph="&#xEC7A;" />
                 </muxc:NavigationViewItem.Icon>
             </muxc:NavigationViewItem>
 
-            <muxc:NavigationViewItem x:Uid="Nav_Actions"
+            <muxc:NavigationViewItem x:Name="ActionsNavItem"
+                                     x:Uid="Nav_Actions"
                                      Tag="Actions_Nav">
                 <muxc:NavigationViewItem.Icon>
                     <FontIcon Glyph="&#xE765;" />
                 </muxc:NavigationViewItem.Icon>
             </muxc:NavigationViewItem>
 
-            <muxc:NavigationViewItem x:Uid="Nav_NewTabMenu"
+            <muxc:NavigationViewItem x:Name="NewTabMenuNavItem"
+                                     x:Uid="Nav_NewTabMenu"
                                      Tag="NewTabMenu_Nav">
                 <muxc:NavigationViewItem.Icon>
                     <FontIcon Glyph="&#xE71d;" />
                 </muxc:NavigationViewItem.Icon>
             </muxc:NavigationViewItem>
 
-            <muxc:NavigationViewItem x:Uid="Nav_Extensions"
+            <muxc:NavigationViewItem x:Name="ExtensionsNavItem"
+                                     x:Uid="Nav_Extensions"
                                      Tag="Extensions_Nav">
                 <muxc:NavigationViewItem.Icon>
                     <FontIcon Glyph="&#xEA86;" />

From 6fbf953fb23c2be4f6de4fc0827ef0115d2d3df5 Mon Sep 17 00:00:00 2001
From: Carlos Zamora <cazamor@microsoft.com>
Date: Thu, 6 Nov 2025 15:32:35 -0800
Subject: [PATCH 15/25] clear search box

---
 src/cascadia/TerminalSettingsEditor/MainPage.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
index f52235b1c92..c177494ce53 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
@@ -1426,9 +1426,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             {
                 _Navigate(*extPkgVM, subpage, elementToFocus);
             }
-            // TODO CARLOS:
-            // - update selected item
-            // - clear text box
+            SettingsSearchBox().Text(L"");
         }
     }
 

From be2b1d30cb880d3ea7d92318ba2cfa4322908bbe Mon Sep 17 00:00:00 2001
From: Carlos Zamora <cazamor@microsoft.com>
Date: Thu, 6 Nov 2025 16:17:32 -0800
Subject: [PATCH 16/25] fix color schemes; convert
 APPEND_RUNTIME_OBJECT_RESULTS to lambda

---
 .../TerminalSettingsEditor/MainPage.cpp       | 91 +++++++++++++------
 .../TerminalSettingsEditor/MainPage.h         |  1 +
 2 files changed, 65 insertions(+), 27 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
index c177494ce53..4a0f0db46e7 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
@@ -79,6 +79,10 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         {
             runtimeObjLabel = profileVM.Name();
         }
+        else if (const auto colorSchemeVM = runtimeObj.try_as<Editor::ColorSchemeViewModel>())
+        {
+            runtimeObjLabel = colorSchemeVM.Name();
+        }
         else if (const auto ntmFolderEntryVM = runtimeObj.try_as<Editor::FolderEntryViewModel>())
         {
             runtimeObjLabel = ntmFolderEntryVM.Name();
@@ -163,6 +167,14 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 icon.Height(iconSize);
                 return icon;
             }
+            else if (const auto colorSchemeVM = navigationArg.try_as<Editor::ColorSchemeViewModel>())
+            {
+                WUX::Controls::FontIcon icon{};
+                icon.FontFamily(Media::FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" });
+                icon.FontSize(iconSize);
+                icon.Glyph(L"\xE790");
+                return icon;
+            }
             else if (const auto ntmFolderEntryVM = navigationArg.try_as<Editor::FolderEntryViewModel>())
             {
                 auto icon = UI::IconPathConverter::IconWUX(ntmFolderEntryVM.Icon());
@@ -846,6 +858,28 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         }
     }
 
+    void MainPage::_Navigate(const Editor::ColorSchemeViewModel& colorSchemeVM, BreadcrumbSubPage subPage, hstring elementToFocus)
+    {
+        _PreNavigateHelper();
+
+        const auto crumb = winrt::make<Breadcrumb>(box_value(colorSchemesTag), RS_(L"Nav_ColorSchemes/Content"), BreadcrumbSubPage::None);
+        _breadcrumbs.Append(crumb);
+        contentFrame().Navigate(xaml_typename<Editor::ColorSchemes>(), winrt::make<NavigateToColorSchemesArgs>(_colorSchemesPageVM, elementToFocus));
+        SettingsNav().SelectedItem(ColorSchemesNavItem());
+
+        // Set CurrentScheme BEFORE the CurrentPage!
+        if (subPage == BreadcrumbSubPage::None)
+        {
+            _colorSchemesPageVM.CurrentScheme(nullptr);
+            _colorSchemesPageVM.CurrentPage(ColorSchemesSubPage::Base);
+        }
+        else
+        {
+            _colorSchemesPageVM.CurrentScheme(colorSchemeVM);
+            _colorSchemesPageVM.CurrentPage(ColorSchemesSubPage::EditColorScheme);
+        }
+    }
+
     void MainPage::_Navigate(const Editor::NewTabMenuEntryViewModel& ntmEntryVM, BreadcrumbSubPage subPage, hstring elementToFocus)
     {
         _PreNavigateHelper();
@@ -1304,33 +1338,32 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             results.push_back(winrt::make<FilteredSearchResult>(indexEntry));
         }
 
-#define APPEND_RUNTIME_OBJECT_RESULTS(runtimeObjectList, nameAccessor, filteredSearchIndex, partialSearchIndexEntry, navigationArgTransform) \
-    for (const auto& runtimeObj : runtimeObjectList)                                                                                         \
-    {                                                                                                                                        \
-        const auto& objName = nameAccessor;                                                                                                  \
-        const bool nameMatches = til::contains_linguistic_insensitive(objName, sanitizedQuery);                                              \
-                                                                                                                                             \
-        if (nameMatches)                                                                                                                     \
-        {                                                                                                                                    \
-            /* navigates to runtime object main page (i.e. "PowerShell" Profiles_Base page) */                                               \
-            results.push_back(FilteredSearchResult::CreateRuntimeObjectItem(&partialSearchIndexEntry, runtimeObj));                          \
-        }                                                                                                                                    \
-                                                                                                                                             \
-        for (const auto* indexEntry : filteredSearchIndex)                                                                                   \
-        {                                                                                                                                    \
-            /* navigates to runtime object's setting (i.e. "PowerShell: Command line" ) */                                                   \
-            results.push_back(FilteredSearchResult::CreateRuntimeObjectItem(indexEntry, navigationArgTransform));                            \
-        }                                                                                                                                    \
-    }
+        auto appendRuntimeObjectResults = [&](const auto& runtimeObjectList, const auto& filteredSearchIndex, const auto& partialSearchIndexEntry) {
+            for (const auto& runtimeObj : runtimeObjectList)
+            {
+                const auto& objName = runtimeObj.Name();
+                const bool nameMatches = til::contains_linguistic_insensitive(objName, sanitizedQuery);
+                if (nameMatches)
+                {
+                    // navigates to runtime object main page (i.e. "PowerShell" Profiles_Base page)
+                    results.push_back(FilteredSearchResult::CreateRuntimeObjectItem(&partialSearchIndexEntry, runtimeObj));
+                }
+                for (const auto* indexEntry : filteredSearchIndex)
+                {
+                    // navigates to runtime object's setting (i.e. "PowerShell: Command line" )
+                    results.push_back(FilteredSearchResult::CreateRuntimeObjectItem(indexEntry, runtimeObj));
+                }
+            }
+        };
 
         // Profiles
-        APPEND_RUNTIME_OBJECT_RESULTS(_profileVMs, runtimeObj.Name(), _filteredSearchIndex->profileIndex, _searchIndex->profileIndexEntry, runtimeObj);
+        appendRuntimeObjectResults(_profileVMs, _filteredSearchIndex->profileIndex, _searchIndex->profileIndexEntry);
 
         // New Tab Menu (Folder View)
-        APPEND_RUNTIME_OBJECT_RESULTS(get_self<implementation::NewTabMenuViewModel>(_newTabMenuPageVM)->FolderTreeFlatList(), runtimeObj.Name(), _filteredSearchIndex->ntmFolderIndex, _searchIndex->ntmFolderIndexEntry, runtimeObj);
+        appendRuntimeObjectResults(get_self<implementation::NewTabMenuViewModel>(_newTabMenuPageVM)->FolderTreeFlatList(), _filteredSearchIndex->ntmFolderIndex, _searchIndex->ntmFolderIndexEntry);
 
         // Color schemes
-        APPEND_RUNTIME_OBJECT_RESULTS(_colorSchemesPageVM.AllColorSchemes(), runtimeObj.Name(), _filteredSearchIndex->colorSchemeIndex, _searchIndex->colorSchemeIndexEntry, winrt::box_value(runtimeObj.Name()));
+        appendRuntimeObjectResults(_colorSchemesPageVM.AllColorSchemes(), _filteredSearchIndex->colorSchemeIndex, _searchIndex->colorSchemeIndexEntry);
 
         // Extensions
         for (const auto& extension : _extensionsVM.ExtensionPackages())
@@ -1414,17 +1447,21 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             {
                 _Navigate(*navArgString, subpage, elementToFocus);
             }
-            else if (const auto profileVM = navigationArg.try_as<ProfileViewModel>())
+            else if (const auto& profileVM = navigationArg.try_as<Editor::ProfileViewModel>())
+            {
+                _Navigate(profileVM, subpage, elementToFocus);
+            }
+            else if (const auto& colorSchemeVM = navigationArg.try_as<Editor::ColorSchemeViewModel>())
             {
-                _Navigate(*profileVM, subpage, elementToFocus);
+                _Navigate(colorSchemeVM, subpage, elementToFocus);
             }
-            else if (const auto ntmEntryVM = navigationArg.try_as<NewTabMenuEntryViewModel>())
+            else if (const auto& ntmEntryVM = navigationArg.try_as<Editor::NewTabMenuEntryViewModel>())
             {
-                _Navigate(*ntmEntryVM, subpage, elementToFocus);
+                _Navigate(ntmEntryVM, subpage, elementToFocus);
             }
-            else if (const auto extPkgVM = navigationArg.try_as<ExtensionPackageViewModel>())
+            else if (const auto& extPkgVM = navigationArg.try_as<Editor::ExtensionPackageViewModel>())
             {
-                _Navigate(*extPkgVM, subpage, elementToFocus);
+                _Navigate(extPkgVM, subpage, elementToFocus);
             }
             SettingsSearchBox().Text(L"");
         }
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.h b/src/cascadia/TerminalSettingsEditor/MainPage.h
index de013f85b9d..7860b21d3f5 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.h
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.h
@@ -110,6 +110,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         void _PreNavigateHelper();
         void _Navigate(hstring clickedItemTag, BreadcrumbSubPage subPage, hstring elementToFocus = {});
         void _Navigate(const Editor::ProfileViewModel& profile, BreadcrumbSubPage subPage, hstring elementToFocus = {});
+        void _Navigate(const Editor::ColorSchemeViewModel& colorSchemeVM, BreadcrumbSubPage subPage, hstring elementToFocus = {});
         void _Navigate(const Editor::NewTabMenuEntryViewModel& ntmEntryVM, BreadcrumbSubPage subPage, hstring elementToFocus = {});
         void _Navigate(const Editor::ExtensionPackageViewModel& extPkgVM, BreadcrumbSubPage subPage, hstring elementToFocus = {});
         void _NavigateToProfileHandler(const IInspectable& sender, winrt::guid profileGuid);

From 14bab6cc1a687ccdc6620df4d8e8e601f657475b Mon Sep 17 00:00:00 2001
From: Carlos Zamora <cazamor@microsoft.com>
Date: Fri, 7 Nov 2025 12:24:33 -0800
Subject: [PATCH 17/25] more polish; more bugs found; I guess it's a stalemate

---
 .../TerminalSettingsEditor/MainPage.cpp       |  5 +-
 .../NewTabMenuViewModel.cpp                   | 23 ++++---
 .../NewTabMenuViewModel.h                     |  1 +
 .../Resources/en-US/Resources.resw            |  2 +-
 tools/GenerateSettingsIndex.ps1               | 67 +++++++++++++++----
 5 files changed, 72 insertions(+), 26 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
index 4a0f0db46e7..2c35320591c 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
@@ -862,6 +862,10 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     {
         _PreNavigateHelper();
 
+        // TODO CARLOS:
+        // - should navigate to EditColorScheme, not ColorSchemes
+        // - EditColorScheme::OnNavigatedTo needs to accept NavigateToColorSchemesArgs (or similar)
+        // - EditColorScheme::OnNavigatedTo needs BringIntoViewWhenLoaded(args.ElementToFocus())
         const auto crumb = winrt::make<Breadcrumb>(box_value(colorSchemesTag), RS_(L"Nav_ColorSchemes/Content"), BreadcrumbSubPage::None);
         _breadcrumbs.Append(crumb);
         contentFrame().Navigate(xaml_typename<Editor::ColorSchemes>(), winrt::make<NavigateToColorSchemesArgs>(_colorSchemesPageVM, elementToFocus));
@@ -1380,7 +1384,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             results.reserve(1);
             results.push_back(FilteredSearchResult::CreateNoResultsItem(sanitizedQuery));
         }
-#undef APPEND_RUNTIME_OBJECT_RESULTS
 
         // Update the UI with the results
         const auto& searchBox = SettingsSearchBox();
diff --git a/src/cascadia/TerminalSettingsEditor/NewTabMenuViewModel.cpp b/src/cascadia/TerminalSettingsEditor/NewTabMenuViewModel.cpp
index 9b4ca291015..7032119c639 100644
--- a/src/cascadia/TerminalSettingsEditor/NewTabMenuViewModel.cpp
+++ b/src/cascadia/TerminalSettingsEditor/NewTabMenuViewModel.cpp
@@ -455,19 +455,20 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     Collections::IObservableVector<Editor::FolderEntryViewModel> NewTabMenuViewModel::FolderTreeFlatList() const
     {
         std::vector<Editor::FolderEntryViewModel> flatList;
-        std::function<void(const IVector<Editor::NewTabMenuEntryViewModel>&)> addFoldersRecursively;
-        addFoldersRecursively = [&flatList, &addFoldersRecursively](const IVector<Editor::NewTabMenuEntryViewModel>& entries) {
-            for (const auto& entry : entries)
+        _FolderTreeFlatListImpl(_rootEntries, flatList);
+        return single_threaded_observable_vector<Editor::FolderEntryViewModel>(std::move(flatList));
+    }
+
+    void NewTabMenuViewModel::_FolderTreeFlatListImpl(const Windows::Foundation::Collections::IVector<Editor::NewTabMenuEntryViewModel>& entriesToAdd, std::vector<Editor::FolderEntryViewModel>& flatList)
+    {
+        for (const auto& entry : entriesToAdd)
+        {
+            if (const auto& folderVM = entry.try_as<Editor::FolderEntryViewModel>())
             {
-                if (const auto& folderVM = entry.try_as<Editor::FolderEntryViewModel>())
-                {
-                    flatList.push_back(folderVM);
-                    addFoldersRecursively(folderVM.Entries());
-                }
+                flatList.push_back(folderVM);
+                _FolderTreeFlatListImpl(folderVM.Entries(), flatList);
             }
-        };
-        addFoldersRecursively(_rootEntries);
-        return single_threaded_observable_vector<Editor::FolderEntryViewModel>(std::move(flatList));
+        }
     }
 
     // This recursively constructs the FolderTree
diff --git a/src/cascadia/TerminalSettingsEditor/NewTabMenuViewModel.h b/src/cascadia/TerminalSettingsEditor/NewTabMenuViewModel.h
index 365682533b5..62eb6c45f05 100644
--- a/src/cascadia/TerminalSettingsEditor/NewTabMenuViewModel.h
+++ b/src/cascadia/TerminalSettingsEditor/NewTabMenuViewModel.h
@@ -68,6 +68,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         Windows::Foundation::Collections::IObservableVector<Editor::NewTabMenuEntryViewModel>::VectorChanged_revoker _rootEntriesChangedRevoker;
 
         static bool _IsRemainingProfilesEntryMissing(const Windows::Foundation::Collections::IVector<Editor::NewTabMenuEntryViewModel>& entries);
+        static void _FolderTreeFlatListImpl(const Windows::Foundation::Collections::IVector<Editor::NewTabMenuEntryViewModel>& entriesToAdd, std::vector<Editor::FolderEntryViewModel>& flatList);
         void _FolderPropertyChanged(const IInspectable& sender, const Windows::UI::Xaml::Data::PropertyChangedEventArgs& args);
     };
 
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
index fd135b60db8..80befad62bf 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
@@ -2473,6 +2473,6 @@
   </data>
   <data name="Search_NoResults" xml:space="preserve">
     <value>No results for "{}"</value>
-    <comment>{Locked=""{}""} Displayed when no results were found for a given query. "{}" will be replaced with the query.</comment>
+    <comment>{Locked="{}"} Displayed when no results were found for a given query. "{}" will be replaced with the query.</comment>
   </data>
 </root>
\ No newline at end of file
diff --git a/tools/GenerateSettingsIndex.ps1 b/tools/GenerateSettingsIndex.ps1
index 6a9f38863ef..a2f6145f2da 100644
--- a/tools/GenerateSettingsIndex.ps1
+++ b/tools/GenerateSettingsIndex.ps1
@@ -19,9 +19,12 @@ param(
 
 # Prohibited UIDs (exact match, case-insensitive by default)
 $ProhibitedUids = @(
-    # TODO CARLOS: AddRemainingProfiles should probably be allowed
-    'NewTabMenu_AddRemainingProfiles',
-    'Extensions_Scope'
+    'Extensions_Scope',
+    'Profile_MissingFontFaces',
+    'Profile_ProportionalFontFaces',
+    'ColorScheme_InboxSchemeDuplicate',
+    'ColorScheme_ColorsHeader',
+    'ColorScheme_Rename'
 )
 
 # Prohibited XAML files
@@ -130,7 +133,7 @@ Get-ChildItem -Path $SourceDir -Recurse -Filter *.xaml | ForEach-Object {
             HelpTextUid          = "std::nullopt"
             HelpTextLocalized    = "std::nullopt"
             ParentPage           = $pageClass
-            NavigationParam      = "winrt::box_value(hstring{L`"Appearance_Nav`"})"
+            NavigationParam      = "winrt::box_value(hstring{L`"GlobalAppearance_Nav`"})"
             SubPage              = "BreadcrumbSubPage::None"
             ElementName          = 'L""'
             File                 = $filename
@@ -234,6 +237,46 @@ Get-ChildItem -Path $SourceDir -Recurse -Filter *.xaml | ForEach-Object {
             File                 = $filename
         }
     }
+    elseif ($filename -eq 'Profiles_Base.xaml')
+    {
+        $entries += [pscustomobject]@{
+            DisplayTextUid       = "L`"Nav_ProfileDefaults/Content`""
+            DisplayTextLocalized = "RS_(L`"Nav_ProfileDefaults/Content`")"
+            HelpTextUid          = "std::nullopt"
+            HelpTextLocalized    = "std::nullopt"
+            ParentPage           = $pageClass
+            NavigationParam      = "winrt::box_value(hstring{L`"GlobalProfile_Nav`"})"
+            SubPage              = "BreadcrumbSubPage::None"
+            ElementName          = 'L""'
+            File                 = $filename
+        }
+    }
+    elseif ($filename -eq 'AddProfile.xaml')
+    {
+        $entries += [pscustomobject]@{
+            DisplayTextUid       = "L`"Nav_AddNewProfile/Content`""
+            DisplayTextLocalized = "RS_(L`"Nav_AddNewProfile/Content`")"
+            HelpTextUid          = "std::nullopt"
+            HelpTextLocalized    = "std::nullopt"
+            ParentPage           = $pageClass
+            NavigationParam      = "winrt::box_value(hstring{L`"AddProfile`"})"
+            SubPage              = "BreadcrumbSubPage::None"
+            ElementName          = 'L""'
+            File                 = $filename
+        }
+
+        $entries += [pscustomobject]@{
+            DisplayTextUid       = "L`"AddProfile_AddNewTextBlock/Text`""
+            DisplayTextLocalized = "RS_(L`"AddProfile_AddNewTextBlock/Text`")"
+            HelpTextUid          = "std::nullopt"
+            HelpTextLocalized    = "std::nullopt"
+            ParentPage           = $pageClass
+            NavigationParam      = "winrt::box_value(hstring{L`"AddProfile`"})"
+            SubPage              = "BreadcrumbSubPage::None"
+            ElementName          = 'L"AddNewButton"'
+            File                 = $filename
+        }
+    }
 
     # Find all local:SettingContainer start tags
     $pattern = '<local:SettingContainer\b([^>/]*)(/?>)'
@@ -313,17 +356,8 @@ Get-ChildItem -Path $SourceDir -Recurse -Filter *.xaml | ForEach-Object {
         }
         elseif ($pageClass -match 'Editor::Extensions')
         {
-            # TODO CARLOS: There's actually no UIDs for extension view! But I want the page to still exist in the index at runtime for each extension.
-            #if ($uid -match 'NewTabMenu_CurrentFolder')
-            #{
-            #    $navigationParam = 'vm'
-            #    $subPage = 'BreadcrumbSubPage::Extensions_Extension'
-            #}
-            #else
-            #{
             $navigationParam = 'Extensions_Nav'
             $subPage = 'BreadcrumbSubPage::None'
-            #}
         }
         elseif ($pageClass -match 'Editor::Profiles_Base' -or
                 $pageClass -match 'Editor::Profiles_Appearance' -or
@@ -337,6 +371,13 @@ Get-ChildItem -Path $SourceDir -Recurse -Filter *.xaml | ForEach-Object {
         {
             # populate with color scheme name at runtime
             $navigationParam = 'nullptr'
+
+            # TODO CARLOS: Not sure if I need this. Turns out the issue is that EditColorScheme doesn't have a BringIntoViewWhenLoaded()!
+            if ($uid -match 'ColorScheme_SetAsDefault')
+            {
+                # SetAsDefault should focus SetAsDefaultButton, not wrapping SetAsDefaultContainer
+                $name = 'SetAsDefaultButton'
+            }
         }
         elseif ($pageClass -match 'Editor::GlobalAppearance')
         {

From 8c99200e96fa8c635203b6fcb15773ef4b9dbd37 Mon Sep 17 00:00:00 2001
From: Carlos Zamora <cazamor@microsoft.com>
Date: Wed, 12 Nov 2025 15:47:52 -0800
Subject: [PATCH 18/25] color schemes: fix BringIntoView

---
 .../ColorSchemesPageViewModel.h               |  1 +
 .../EditColorScheme.cpp                       |  5 ++++-
 .../TerminalSettingsEditor/EditColorScheme.h  | 15 +++++++++++++++
 .../EditColorScheme.idl                       |  6 ++++++
 .../TerminalSettingsEditor/MainPage.cpp       | 19 +++++++++++++------
 src/cascadia/TerminalSettingsEditor/Utils.h   |  6 +++---
 6 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/ColorSchemesPageViewModel.h b/src/cascadia/TerminalSettingsEditor/ColorSchemesPageViewModel.h
index e559432b78d..dd60f8de20e 100644
--- a/src/cascadia/TerminalSettingsEditor/ColorSchemesPageViewModel.h
+++ b/src/cascadia/TerminalSettingsEditor/ColorSchemesPageViewModel.h
@@ -37,6 +37,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
         WINRT_OBSERVABLE_PROPERTY(ColorSchemesSubPage, CurrentPage, _propertyChangedHandlers, ColorSchemesSubPage::Base);
         WINRT_OBSERVABLE_PROPERTY(Windows::Foundation::Collections::IObservableVector<Editor::ColorSchemeViewModel>, AllColorSchemes, _propertyChangedHandlers, nullptr);
+        WINRT_PROPERTY(hstring, ElementToFocus);
 
     private:
         Editor::ColorSchemeViewModel _CurrentScheme{ nullptr };
diff --git a/src/cascadia/TerminalSettingsEditor/EditColorScheme.cpp b/src/cascadia/TerminalSettingsEditor/EditColorScheme.cpp
index 1c1d5f0c84c..f664470e7eb 100644
--- a/src/cascadia/TerminalSettingsEditor/EditColorScheme.cpp
+++ b/src/cascadia/TerminalSettingsEditor/EditColorScheme.cpp
@@ -40,7 +40,10 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void EditColorScheme::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        _ViewModel = e.Parameter().as<Editor::ColorSchemeViewModel>();
+        const auto args = e.Parameter().as<Editor::NavigateToEditColorSchemeArgs>();
+        _ViewModel = args.ViewModel();
+
+        BringIntoViewWhenLoaded(args.ElementToFocus());
 
         const auto schemeName = _ViewModel.Name();
         NameBox().Text(schemeName);
diff --git a/src/cascadia/TerminalSettingsEditor/EditColorScheme.h b/src/cascadia/TerminalSettingsEditor/EditColorScheme.h
index 798c1c96ce5..c32168a7d26 100644
--- a/src/cascadia/TerminalSettingsEditor/EditColorScheme.h
+++ b/src/cascadia/TerminalSettingsEditor/EditColorScheme.h
@@ -3,12 +3,27 @@
 
 #pragma once
 
+#include "NavigateToEditColorSchemeArgs.g.h"
 #include "EditColorScheme.g.h"
 #include "ColorSchemeViewModel.h"
 #include "Utils.h"
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
+    struct NavigateToEditColorSchemeArgs : NavigateToEditColorSchemeArgsT<NavigateToEditColorSchemeArgs>
+    {
+        NavigateToEditColorSchemeArgs(const Editor::ColorSchemeViewModel& vm, const hstring& elementToFocus = {}) :
+            _ViewModel(vm),
+            _ElementToFocus(elementToFocus) {}
+
+        Editor::ColorSchemeViewModel ViewModel() const noexcept { return _ViewModel; }
+        hstring ElementToFocus() const noexcept { return _ElementToFocus; }
+
+    private:
+        Editor::ColorSchemeViewModel _ViewModel{ nullptr };
+        hstring _ElementToFocus{};
+    };
+
     struct EditColorScheme : public HasScrollViewer<EditColorScheme>, EditColorSchemeT<EditColorScheme>
     {
         EditColorScheme();
diff --git a/src/cascadia/TerminalSettingsEditor/EditColorScheme.idl b/src/cascadia/TerminalSettingsEditor/EditColorScheme.idl
index 33c8ee46589..706ad882ffa 100644
--- a/src/cascadia/TerminalSettingsEditor/EditColorScheme.idl
+++ b/src/cascadia/TerminalSettingsEditor/EditColorScheme.idl
@@ -5,6 +5,12 @@ import "ColorSchemeViewModel.idl";
 
 namespace Microsoft.Terminal.Settings.Editor
 {
+    runtimeclass NavigateToEditColorSchemeArgs
+    {
+        ColorSchemeViewModel ViewModel { get; };
+        String ElementToFocus { get; };
+    }
+
     [default_interface] runtimeclass EditColorScheme : Windows.UI.Xaml.Controls.Page, Windows.UI.Xaml.Data.INotifyPropertyChanged
     {
         EditColorScheme();
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
index 2c35320591c..9bd1a2cc145 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
@@ -15,6 +15,7 @@
 #include "GlobalAppearance.h"
 #include "GlobalAppearanceViewModel.h"
 #include "ColorSchemes.h"
+#include "EditColorScheme.h"
 #include "AddProfile.h"
 #include "InteractionViewModel.h"
 #include "LaunchViewModel.h"
@@ -293,16 +294,21 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             const auto settingName{ args.PropertyName() };
             if (settingName == L"CurrentPage")
             {
+                // extract ElementToFocus and clear it; we only want to use it once
+                auto vmImpl = get_self<ColorSchemesPageViewModel>(_colorSchemesPageVM);
+                const auto elementToFocus = vmImpl->ElementToFocus();
+                vmImpl->ElementToFocus(L"");
+
                 const auto currentScheme = _colorSchemesPageVM.CurrentScheme();
                 if (_colorSchemesPageVM.CurrentPage() == ColorSchemesSubPage::EditColorScheme && currentScheme)
                 {
-                    contentFrame().Navigate(xaml_typename<Editor::EditColorScheme>(), currentScheme);
+                    contentFrame().Navigate(xaml_typename<Editor::EditColorScheme>(), winrt::make<NavigateToEditColorSchemeArgs>(currentScheme, elementToFocus));
                     const auto crumb = winrt::make<Breadcrumb>(box_value(colorSchemesTag), currentScheme.Name(), BreadcrumbSubPage::ColorSchemes_Edit);
                     _breadcrumbs.Append(crumb);
                 }
                 else if (_colorSchemesPageVM.CurrentPage() == ColorSchemesSubPage::Base)
                 {
-                    _Navigate(winrt::hstring{ colorSchemesTag }, BreadcrumbSubPage::None);
+                    _Navigate(winrt::hstring{ colorSchemesTag }, BreadcrumbSubPage::None, elementToFocus);
                 }
             }
             else if (settingName == L"CurrentSchemeName")
@@ -862,16 +868,17 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     {
         _PreNavigateHelper();
 
-        // TODO CARLOS:
-        // - should navigate to EditColorScheme, not ColorSchemes
-        // - EditColorScheme::OnNavigatedTo needs to accept NavigateToColorSchemesArgs (or similar)
-        // - EditColorScheme::OnNavigatedTo needs BringIntoViewWhenLoaded(args.ElementToFocus())
         const auto crumb = winrt::make<Breadcrumb>(box_value(colorSchemesTag), RS_(L"Nav_ColorSchemes/Content"), BreadcrumbSubPage::None);
         _breadcrumbs.Append(crumb);
         contentFrame().Navigate(xaml_typename<Editor::ColorSchemes>(), winrt::make<NavigateToColorSchemesArgs>(_colorSchemesPageVM, elementToFocus));
         SettingsNav().SelectedItem(ColorSchemesNavItem());
 
+        // Pass along the element to focus to the ColorSchemesPageViewModel.
+        // This will work as a staging area before we navigate to EditColorScheme
+        get_self<ColorSchemesPageViewModel>(_colorSchemesPageVM)->ElementToFocus(elementToFocus);
+
         // Set CurrentScheme BEFORE the CurrentPage!
+        // Doing so triggers the PropertyChanged event which performs the navigation to EditColorScheme
         if (subPage == BreadcrumbSubPage::None)
         {
             _colorSchemesPageVM.CurrentScheme(nullptr);
diff --git a/src/cascadia/TerminalSettingsEditor/Utils.h b/src/cascadia/TerminalSettingsEditor/Utils.h
index 745e908beaf..64fdb343565 100644
--- a/src/cascadia/TerminalSettingsEditor/Utils.h
+++ b/src/cascadia/TerminalSettingsEditor/Utils.h
@@ -131,15 +131,15 @@ struct HasScrollViewer
         _loadedRevoker = pThis->Loaded(winrt::auto_revoke, [weakThis{ pThis->get_weak() }, elementName](auto&&, auto&&) {
             if (auto page{ weakThis.get() })
             {
-                if (const auto& elementToFocus{ page->FindName(elementName).try_as<winrt::Microsoft::Terminal::Settings::Editor::SettingContainer>() })
+                if (const auto& controlToFocus{ page->FindName(elementName).try_as<winrt::Windows::UI::Xaml::Controls::Control>() })
                 {
                     // We need to wait for the page to be loaded
                     // or else the call to StartBringIntoView()
                     // will end up doing nothing
-                    elementToFocus.StartBringIntoView();
+                    controlToFocus.StartBringIntoView();
 
                     // TODO CARLOS: ensure this works in all scenarios (easiest to test when navigating to page by keyboard)
-                    elementToFocus.Focus(winrt::Windows::UI::Xaml::FocusState::Programmatic);
+                    controlToFocus.Focus(winrt::Windows::UI::Xaml::FocusState::Programmatic);
                 }
                 page->_loadedRevoker.revoke();
             }

From 83aa9fd88903131e0bf83197ece1c0b8b5aa224d Mon Sep 17 00:00:00 2001
From: Carlos Zamora <cazamor@microsoft.com>
Date: Thu, 13 Nov 2025 10:34:20 -0800
Subject: [PATCH 19/25] profiles: fix BringIntoView (partially)

---
 .../TerminalSettingsEditor/MainPage.cpp       | 59 +++++++++++++------
 .../TerminalSettingsEditor/ProfileViewModel.h |  7 +++
 .../Profiles_Appearance.xaml                  |  6 +-
 3 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
index 9bd1a2cc145..9bd9cb7bee2 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
@@ -297,7 +297,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 // extract ElementToFocus and clear it; we only want to use it once
                 auto vmImpl = get_self<ColorSchemesPageViewModel>(_colorSchemesPageVM);
                 const auto elementToFocus = vmImpl->ElementToFocus();
-                vmImpl->ElementToFocus(L"");
+                vmImpl->ElementToFocus({});
 
                 const auto currentScheme = _colorSchemesPageVM.CurrentScheme();
                 if (_colorSchemesPageVM.CurrentPage() == ColorSchemesSubPage::EditColorScheme && currentScheme)
@@ -634,31 +634,37 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             const auto settingName{ args.PropertyName() };
             if (settingName == L"CurrentPage")
             {
+                // extract ElementToFocus and clear it; we only want to use it once
+                auto vmImpl = get_self<ProfileViewModel>(profile);
+                const auto elementToFocus = vmImpl->ElementToFocus();
+                vmImpl->ElementToFocus({});
+
                 const auto currentPage = profile.CurrentPage();
                 if (currentPage == ProfileSubPage::Base)
                 {
-                    contentFrame().Navigate(xaml_typename<Editor::Profiles_Base>(), winrt::make<implementation::NavigateToProfileArgs>(profile, *this));
+                    contentFrame().Navigate(xaml_typename<Editor::Profiles_Base>(), winrt::make<implementation::NavigateToProfileArgs>(profile, *this, elementToFocus));
                     _breadcrumbs.Clear();
                     const auto crumb = winrt::make<Breadcrumb>(breadcrumbTag, breadcrumbText, BreadcrumbSubPage::None);
                     _breadcrumbs.Append(crumb);
+                    SettingsMainPage_ScrollViewer().ScrollToVerticalOffset(0);
                 }
                 else if (currentPage == ProfileSubPage::Appearance)
                 {
-                    contentFrame().Navigate(xaml_typename<Editor::Profiles_Appearance>(), winrt::make<implementation::NavigateToProfileArgs>(profile, *this));
+                    contentFrame().Navigate(xaml_typename<Editor::Profiles_Appearance>(), winrt::make<implementation::NavigateToProfileArgs>(profile, *this, elementToFocus));
                     const auto crumb = winrt::make<Breadcrumb>(breadcrumbTag, RS_(L"Profile_Appearance/Header"), BreadcrumbSubPage::Profile_Appearance);
                     _breadcrumbs.Append(crumb);
                     SettingsMainPage_ScrollViewer().ScrollToVerticalOffset(0);
                 }
                 else if (currentPage == ProfileSubPage::Terminal)
                 {
-                    contentFrame().Navigate(xaml_typename<Editor::Profiles_Terminal>(), winrt::make<implementation::NavigateToProfileArgs>(profile, *this));
+                    contentFrame().Navigate(xaml_typename<Editor::Profiles_Terminal>(), winrt::make<implementation::NavigateToProfileArgs>(profile, *this, elementToFocus));
                     const auto crumb = winrt::make<Breadcrumb>(breadcrumbTag, RS_(L"Profile_Terminal/Header"), BreadcrumbSubPage::Profile_Terminal);
                     _breadcrumbs.Append(crumb);
                     SettingsMainPage_ScrollViewer().ScrollToVerticalOffset(0);
                 }
                 else if (currentPage == ProfileSubPage::Advanced)
                 {
-                    contentFrame().Navigate(xaml_typename<Editor::Profiles_Advanced>(), winrt::make<implementation::NavigateToProfileArgs>(profile, *this));
+                    contentFrame().Navigate(xaml_typename<Editor::Profiles_Advanced>(), winrt::make<implementation::NavigateToProfileArgs>(profile, *this, elementToFocus));
                     const auto crumb = winrt::make<Breadcrumb>(breadcrumbTag, RS_(L"Profile_Advanced/Header"), BreadcrumbSubPage::Profile_Advanced);
                     _breadcrumbs.Append(crumb);
                     SettingsMainPage_ScrollViewer().ScrollToVerticalOffset(0);
@@ -844,23 +850,38 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             SettingsNav().SelectedItem(profileNavItem);
         }
 
+        // Pass along the element to focus to the ProfileViewModel.
+        // This will work as a staging area before we navigate to the correct sub-page
+        auto profileVMImpl = get_self<ProfileViewModel>(profile);
+        profileVMImpl->ElementToFocus(elementToFocus);
+
+        // convert the BreadcrumbSubPage to ProfileSubPage
+        const ProfileSubPage profileSubPage = [&](BreadcrumbSubPage subPage) {
+            switch (subPage)
+            {
+            case BreadcrumbSubPage::None:
+                return ProfileSubPage::Base;
+            case BreadcrumbSubPage::Profile_Appearance:
+                return ProfileSubPage::Appearance;
+            case BreadcrumbSubPage::Profile_Terminal:
+                return ProfileSubPage::Terminal;
+            case BreadcrumbSubPage::Profile_Advanced:
+                return ProfileSubPage::Advanced;
+            default:
+                // This should never happen
+                assert(false);
+            }
+        }(subPage);
+        const bool needsForcedRefresh = profile.CurrentPage() == profileSubPage;
+
         // Set the profile's 'CurrentPage' to the correct one, if this requires further navigation, the
         // event handler will do it
-        if (subPage == BreadcrumbSubPage::None)
-        {
-            profile.CurrentPage(ProfileSubPage::Base);
-        }
-        else if (subPage == BreadcrumbSubPage::Profile_Appearance)
-        {
-            profile.CurrentPage(ProfileSubPage::Appearance);
-        }
-        else if (subPage == BreadcrumbSubPage::Profile_Terminal)
-        {
-            profile.CurrentPage(ProfileSubPage::Terminal);
-        }
-        else if (subPage == BreadcrumbSubPage::Profile_Advanced)
+        profile.CurrentPage(profileSubPage);
+        if (needsForcedRefresh)
         {
-            profile.CurrentPage(ProfileSubPage::Advanced);
+            // If we're already on the correct sub-page, the PropertyChanged event won't fire.
+            // However, we still need to pass along the ElementToFocus, so we need to force a refresh.
+            profileVMImpl->ForceRefreshCurrentPage();   
         }
     }
 
diff --git a/src/cascadia/TerminalSettingsEditor/ProfileViewModel.h b/src/cascadia/TerminalSettingsEditor/ProfileViewModel.h
index c4e70ec8a1f..5d045f20534 100644
--- a/src/cascadia/TerminalSettingsEditor/ProfileViewModel.h
+++ b/src/cascadia/TerminalSettingsEditor/ProfileViewModel.h
@@ -59,6 +59,12 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         void DeleteProfile();
 
         void SetupAppearances(Windows::Foundation::Collections::IObservableVector<Editor::ColorSchemeViewModel> schemesList);
+        void ForceRefreshCurrentPage()
+        {
+            // Used to trigger the PropertyChanged handler in MainPage.cpp
+            // This forces the page to refresh
+            _NotifyChanges(L"CurrentPage");
+        }
 
         // bell style bits
         hstring BellStylePreview() const;
@@ -177,6 +183,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
         WINRT_PROPERTY(bool, IsBaseLayer, false);
         WINRT_PROPERTY(bool, FocusDeleteButton, false);
+        WINRT_PROPERTY(hstring, ElementToFocus);
         WINRT_PROPERTY(Windows::Foundation::Collections::IVector<Windows::Foundation::IInspectable>, IconTypes);
         GETSET_BINDABLE_ENUM_SETTING(AntiAliasingMode, Microsoft::Terminal::Control::TextAntialiasingMode, AntialiasingMode);
         GETSET_BINDABLE_ENUM_SETTING(CloseOnExitMode, Microsoft::Terminal::Settings::Model::CloseOnExitMode, CloseOnExit);
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.xaml b/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.xaml
index 44f7cca4d11..280bca2940a 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.xaml
@@ -75,7 +75,8 @@
                         CornerRadius="{StaticResource ControlCornerRadius}" />
             </Border>
 
-            <local:Appearances Appearance="{x:Bind Profile.DefaultAppearance, Mode=OneWay}"
+            <local:Appearances x:Name="DefaultAppearanceView"
+                               Appearance="{x:Bind Profile.DefaultAppearance, Mode=OneWay}"
                                SourceProfile="{x:Bind Profile, Mode=OneWay}"
                                WindowRoot="{x:Bind WindowRoot, Mode=OneTime}" />
 
@@ -251,7 +252,8 @@
                 </StackPanel>
 
                 <!--  Unfocused Appearance  -->
-                <local:Appearances Appearance="{x:Bind Profile.UnfocusedAppearance, Mode=OneWay}"
+                <local:Appearances x:Name="UnfocusedAppearanceView"
+                                   Appearance="{x:Bind Profile.UnfocusedAppearance, Mode=OneWay}"
                                    SourceProfile="{x:Bind Profile, Mode=OneWay}"
                                    Visibility="{x:Bind Profile.ShowUnfocusedAppearance, Mode=OneWay}"
                                    WindowRoot="{x:Bind WindowRoot, Mode=OneTime}" />

From 45d75e701fae9b7ab1a4c95b03b345a1c00d65b9 Mon Sep 17 00:00:00 2001
From: Carlos Zamora <cazamor@microsoft.com>
Date: Mon, 17 Nov 2025 14:11:56 -0800
Subject: [PATCH 20/25] registerIndex macro -> lambda

---
 .../TerminalSettingsEditor/EditColorScheme.h  |  2 +
 .../TerminalSettingsEditor/MainPage.cpp       | 45 +++++++++----------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/EditColorScheme.h b/src/cascadia/TerminalSettingsEditor/EditColorScheme.h
index c32168a7d26..ce59789a856 100644
--- a/src/cascadia/TerminalSettingsEditor/EditColorScheme.h
+++ b/src/cascadia/TerminalSettingsEditor/EditColorScheme.h
@@ -10,6 +10,8 @@
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
+    // TODO CARLOS: We have a bunch of NavigateToXArgs that have the same pattern.
+    // Leonard suggested replacing ViewModel with IInspectable so that we can just reuse this for everything.
     struct NavigateToEditColorSchemeArgs : NavigateToEditColorSchemeArgsT<NavigateToEditColorSchemeArgs>
     {
         NavigateToEditColorSchemeArgs(const Editor::ColorSchemeViewModel& vm, const hstring& elementToFocus = {}) :
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
index 9bd9cb7bee2..a8c02f2f78e 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
@@ -1531,34 +1531,33 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             return false;
         }();
 
-#define REGISTER_INDEX(index, storage)                                                                                          \
-    {                                                                                                                           \
-        const auto& indexRef = index;                                                                                           \
-        storage.reserve(indexRef.size());                                                                                       \
-        for (const auto& entry : indexRef)                                                                                      \
-        {                                                                                                                       \
-            LocalizedIndexEntry localizedEntry;                                                                                 \
-            localizedEntry.Entry = &entry;                                                                                      \
-            if (shouldIncludeLanguageNeutralResources)                                                                          \
-            {                                                                                                                   \
-                localizedEntry.DisplayTextNeutral = EnglishOnlyResourceLoader().GetLocalizedString(entry.DisplayTextUid);       \
-                if (entry.HelpTextUid)                                                                                          \
-                {                                                                                                               \
-                    localizedEntry.HelpTextNeutral = EnglishOnlyResourceLoader().GetLocalizedString(entry.HelpTextUid.value()); \
-                }                                                                                                               \
-            }                                                                                                                   \
-            storage.push_back(localizedEntry);                                                                                  \
-        }                                                                                                                       \
-    }
+        auto registerIndex = [&](const auto& index, auto& storage) {
+            const auto& indexRef = index;
+            storage.reserve(indexRef.size());
+            for (const auto& entry : indexRef)
+            {
+                LocalizedIndexEntry localizedEntry;
+                localizedEntry.Entry = &entry;
+                if (shouldIncludeLanguageNeutralResources)
+                {
+                    localizedEntry.DisplayTextNeutral = EnglishOnlyResourceLoader().GetLocalizedString(entry.DisplayTextUid);
+                    if (entry.HelpTextUid)
+                    {
+                        localizedEntry.HelpTextNeutral = EnglishOnlyResourceLoader().GetLocalizedString(entry.HelpTextUid.value());
+                    }
+                }
+                storage.push_back(localizedEntry);
+            }
+        };
 
-        REGISTER_INDEX(LoadBuildTimeIndex(), searchIndex.mainIndex);
+        registerIndex(LoadBuildTimeIndex(), searchIndex.mainIndex);
 
         // Load profiles
-        REGISTER_INDEX(LoadProfileIndex(), searchIndex.profileIndex);
+        registerIndex(LoadProfileIndex(), searchIndex.profileIndex);
         searchIndex.profileIndexEntry.Entry = &PartialProfileIndexEntry();
 
         // Load new tab menu
-        REGISTER_INDEX(LoadNTMFolderIndex(), searchIndex.ntmFolderIndex);
+        registerIndex(LoadNTMFolderIndex(), searchIndex.ntmFolderIndex);
         searchIndex.ntmFolderIndexEntry.Entry = &PartialNTMFolderIndexEntry();
 
         // Load extensions
@@ -1567,7 +1566,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         searchIndex.extensionIndexEntry.Entry = &PartialExtensionIndexEntry();
 
         // Load color schemes
-        REGISTER_INDEX(LoadColorSchemeIndex(), searchIndex.colorSchemeIndex)
+        registerIndex(LoadColorSchemeIndex(), searchIndex.colorSchemeIndex);
         searchIndex.colorSchemeIndexEntry.Entry = &PartialColorSchemeIndexEntry();
 
         // Load actions

From 81f881a579447d4fe9d31772bd1f164f7828125d Mon Sep 17 00:00:00 2001
From: Carlos Zamora <cazamor@microsoft.com>
Date: Mon, 17 Nov 2025 15:41:19 -0800
Subject: [PATCH 21/25] Fix navigation for profile.appearance settings (global
 profile too)

---
 .../TerminalSettingsEditor/Appearances.cpp    | 18 +++++
 .../TerminalSettingsEditor/Appearances.h      |  2 +
 .../TerminalSettingsEditor/MainPage.cpp       | 81 ++++++++++---------
 .../TerminalSettingsEditor/MainPage.h         |  1 +
 .../Profiles_Appearance.cpp                   | 14 +++-
 tools/GenerateSettingsIndex.ps1               | 12 +++
 6 files changed, 90 insertions(+), 38 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/Appearances.cpp b/src/cascadia/TerminalSettingsEditor/Appearances.cpp
index 236485128ec..10536c1a2df 100644
--- a/src/cascadia/TerminalSettingsEditor/Appearances.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Appearances.cpp
@@ -1134,6 +1134,24 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         INITIALIZE_BINDABLE_ENUM_SETTING(IntenseTextStyle, IntenseTextStyle, winrt::Microsoft::Terminal::Settings::Model::IntenseStyle, L"Appearance_IntenseTextStyle", L"Content");
     }
 
+    void Appearances::BringIntoViewWhenLoaded(hstring elementToFocus)
+    {
+        if (elementToFocus.empty())
+        {
+            return;
+        }
+
+        _loadedRevoker = this->Loaded(winrt::auto_revoke, [weakThis{ get_weak() }, elementToFocus](auto&&, auto&&) {
+            if (const auto strongThis = weakThis.get())
+            {
+                if (const auto element = strongThis->FindName(elementToFocus))
+                {
+                    element.as<FrameworkElement>().StartBringIntoView();
+                }
+            }
+        });
+    }
+
     IObservableVector<Editor::Font> Appearances::FilteredFontList()
     {
         if (!_filteredFonts)
diff --git a/src/cascadia/TerminalSettingsEditor/Appearances.h b/src/cascadia/TerminalSettingsEditor/Appearances.h
index e8b1cac6c3c..6c5647cd445 100644
--- a/src/cascadia/TerminalSettingsEditor/Appearances.h
+++ b/src/cascadia/TerminalSettingsEditor/Appearances.h
@@ -188,6 +188,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     struct Appearances : AppearancesT<Appearances>
     {
         Appearances();
+        void BringIntoViewWhenLoaded(hstring elementToFocus);
 
         // CursorShape visibility logic
         bool IsVintageCursor() const;
@@ -210,6 +211,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         bool IsCustomFontWeight();
 
         til::property_changed_event PropertyChanged;
+        winrt::Windows::UI::Xaml::FrameworkElement::Loaded_revoker _loadedRevoker;
 
         WINRT_PROPERTY(Windows::Foundation::Collections::IObservableVector<Microsoft::Terminal::Settings::Editor::EnumEntry>, FontWeightList);
 
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
index a8c02f2f78e..74d4e91f5ce 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
@@ -65,6 +65,25 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         return winrt::make<implementation::ProfileViewModel>(profile, appSettings, dispatcher);
     }
 
+    static ProfileSubPage ProfileSubPageFromBreadcrumb(BreadcrumbSubPage subPage)
+    {
+        switch (subPage)
+        {
+        case BreadcrumbSubPage::None:
+            return ProfileSubPage::Base;
+        case BreadcrumbSubPage::Profile_Appearance:
+            return ProfileSubPage::Appearance;
+        case BreadcrumbSubPage::Profile_Terminal:
+            return ProfileSubPage::Terminal;
+        case BreadcrumbSubPage::Profile_Advanced:
+            return ProfileSubPage::Advanced;
+        default:
+            // This should never happen
+            assert(false);
+            return ProfileSubPage::Base;
+        }
+    }
+
     Editor::FilteredSearchResult FilteredSearchResult::CreateNoResultsItem(const winrt::hstring& query)
     {
         return winrt::make<FilteredSearchResult>(nullptr, nullptr, hstring{ fmt::format(fmt::runtime(std::wstring{ RS_(L"Search_NoResults") }), query) });
@@ -747,29 +766,36 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         }
         else if (clickedItemTag == globalProfileTag)
         {
-            auto profileVM{ _viewModelForProfile(_settingsClone.ProfileDefaults(), _settingsClone, Dispatcher()) };
-            profileVM.SetupAppearances(_colorSchemesPageVM.AllColorSchemes());
-            profileVM.IsBaseLayer(true);
+            // lazy load profile defaults VM
+            if (!_profileDefaultsVM)
+            {
+                _profileDefaultsVM = _viewModelForProfile(_settingsClone.ProfileDefaults(), _settingsClone, Dispatcher());
+                _profileDefaultsVM.SetupAppearances(_colorSchemesPageVM.AllColorSchemes());
+                _profileDefaultsVM.IsBaseLayer(true);
+            }
 
-            _SetupProfileEventHandling(profileVM);
+            _SetupProfileEventHandling(_profileDefaultsVM);
 
-            contentFrame().Navigate(xaml_typename<Editor::Profiles_Base>(), winrt::make<implementation::NavigateToProfileArgs>(profileVM, *this, elementToFocus));
+            contentFrame().Navigate(xaml_typename<Editor::Profiles_Base>(), winrt::make<implementation::NavigateToProfileArgs>(_profileDefaultsVM, *this, elementToFocus));
             const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_ProfileDefaults/Content"), BreadcrumbSubPage::None);
             _breadcrumbs.Append(crumb);
             SettingsNav().SelectedItem(BaseLayerMenuItem());
 
-            // If we were given a label, make sure we are on the correct sub-page
-            if (subPage == BreadcrumbSubPage::Profile_Appearance)
-            {
-                profileVM.CurrentPage(ProfileSubPage::Appearance);
-            }
-            else if (subPage == BreadcrumbSubPage::Profile_Terminal)
-            {
-                profileVM.CurrentPage(ProfileSubPage::Terminal);
-            }
-            else if (subPage == BreadcrumbSubPage::Profile_Advanced)
+            // Pass along the element to focus to the ProfileViewModel.
+            // This will work as a staging area before we navigate to the correct sub-page
+            auto profileVMImpl = get_self<ProfileViewModel>(_profileDefaultsVM);
+            profileVMImpl->ElementToFocus(elementToFocus);
+
+            // Set the profile's 'CurrentPage' to the correct one, if this requires further navigation, the
+            // event handler will do it
+            const ProfileSubPage profileSubPage = ProfileSubPageFromBreadcrumb(subPage);
+            const bool needsForcedRefresh = _profileDefaultsVM.CurrentPage() == profileSubPage;
+            _profileDefaultsVM.CurrentPage(profileSubPage);
+            if (needsForcedRefresh)
             {
-                profileVM.CurrentPage(ProfileSubPage::Advanced);
+                // If we're already on the correct sub-page, the PropertyChanged event won't fire.
+                // However, we still need to pass along the ElementToFocus, so we need to force a refresh.
+                profileVMImpl->ForceRefreshCurrentPage();
             }
         }
         else if (clickedItemTag == colorSchemesTag)
@@ -855,33 +881,16 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         auto profileVMImpl = get_self<ProfileViewModel>(profile);
         profileVMImpl->ElementToFocus(elementToFocus);
 
-        // convert the BreadcrumbSubPage to ProfileSubPage
-        const ProfileSubPage profileSubPage = [&](BreadcrumbSubPage subPage) {
-            switch (subPage)
-            {
-            case BreadcrumbSubPage::None:
-                return ProfileSubPage::Base;
-            case BreadcrumbSubPage::Profile_Appearance:
-                return ProfileSubPage::Appearance;
-            case BreadcrumbSubPage::Profile_Terminal:
-                return ProfileSubPage::Terminal;
-            case BreadcrumbSubPage::Profile_Advanced:
-                return ProfileSubPage::Advanced;
-            default:
-                // This should never happen
-                assert(false);
-            }
-        }(subPage);
-        const bool needsForcedRefresh = profile.CurrentPage() == profileSubPage;
-
         // Set the profile's 'CurrentPage' to the correct one, if this requires further navigation, the
         // event handler will do it
+        const ProfileSubPage profileSubPage = ProfileSubPageFromBreadcrumb(subPage);
+        const bool needsForcedRefresh = profile.CurrentPage() == profileSubPage;
         profile.CurrentPage(profileSubPage);
         if (needsForcedRefresh)
         {
             // If we're already on the correct sub-page, the PropertyChanged event won't fire.
             // However, we still need to pass along the ElementToFocus, so we need to force a refresh.
-            profileVMImpl->ForceRefreshCurrentPage();   
+            profileVMImpl->ForceRefreshCurrentPage();
         }
     }
 
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.h b/src/cascadia/TerminalSettingsEditor/MainPage.h
index 7860b21d3f5..d68867ea60a 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.h
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.h
@@ -123,6 +123,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         til::generation_t _QuerySearchIndex(const hstring& queryText);
         safe_void_coroutine _UpdateSearchIndex();
 
+        winrt::Microsoft::Terminal::Settings::Editor::ProfileViewModel _profileDefaultsVM{ nullptr };
         Windows::Foundation::Collections::IVector<winrt::Microsoft::Terminal::Settings::Editor::ProfileViewModel> _profileVMs{ nullptr };
         winrt::Microsoft::Terminal::Settings::Editor::ColorSchemesPageViewModel _colorSchemesPageVM{ nullptr };
         winrt::Microsoft::Terminal::Settings::Editor::NewTabMenuViewModel _newTabMenuPageVM{ nullptr };
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.cpp b/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.cpp
index 7fb4eee5d4b..9cf3ee9d144 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.cpp
@@ -3,6 +3,7 @@
 
 #include "pch.h"
 #include "Profiles_Appearance.h"
+#include "Appearances.h"
 
 #include "ProfileViewModel.h"
 #include "PreviewConnection.h"
@@ -26,8 +27,17 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         _Profile = args.Profile();
         _windowRoot = args.WindowRoot();
 
-        // TODO CARLOS: how to handle Appearances object
-        BringIntoViewWhenLoaded(args.ElementToFocus());
+        const auto elementToFocus = args.ElementToFocus();
+        if (elementToFocus.starts_with(L"App."))
+        {
+            // remove "App." prefix
+            std::wstring correctedName{ elementToFocus.c_str() };
+            get_self<implementation::Appearances>(DefaultAppearanceView())->BringIntoViewWhenLoaded(hstring{ correctedName.substr(4) });
+        }
+        else
+        {
+            BringIntoViewWhenLoaded(elementToFocus);
+        }
 
         if (!_previewControl)
         {
diff --git a/tools/GenerateSettingsIndex.ps1 b/tools/GenerateSettingsIndex.ps1
index a2f6145f2da..676af87e415 100644
--- a/tools/GenerateSettingsIndex.ps1
+++ b/tools/GenerateSettingsIndex.ps1
@@ -316,6 +316,13 @@ Get-ChildItem -Path $SourceDir -Recurse -Filter *.xaml | ForEach-Object {
             $name = ""
         }
 
+        # Profile.Appearance settings need a special prefix for the ElementName.
+        # This allows us to bring the element into view at runtime.
+        if ($filename -eq 'Appearances.xaml')
+        {
+            $name = 'App.' + $name
+        }
+
         # Deduce NavigationParam
         # duplicateForVM is used to duplicate the entry if we need a VM param at runtime (i.e. profile vs global profile)
         $duplicateForVM = $false
@@ -435,6 +442,11 @@ foreach ($e in $entries)
          $e.ParentPage -match 'Profiles_Terminal' -or
          $e.ParentPage -match 'Profiles_Advanced'))
     {
+        # TODO CARLOS: needs special ElementToFocus (maybe I should be adding it earlier so that this works on Profiles.Defaults too)
+        # if ($e.File -eq 'Appearances.xaml')
+        # {
+        #     
+        # }
         $profileEntries += $formattedEntry
     }
     elseif ($e.SubPage -eq 'BreadcrumbSubPage::ColorSchemes_Edit')

From e5ea64586d09a850a61c870e39021f615f32d53d Mon Sep 17 00:00:00 2001
From: Carlos Zamora <cazamor@microsoft.com>
Date: Mon, 17 Nov 2025 16:49:57 -0800
Subject: [PATCH 22/25] NavigateToXArgs --> NavigateToPageArgs

---
 .../TerminalSettingsEditor/Actions.cpp        |  6 +--
 src/cascadia/TerminalSettingsEditor/Actions.h | 15 ------
 .../TerminalSettingsEditor/Actions.idl        |  6 ---
 .../TerminalSettingsEditor/ColorSchemes.cpp   |  5 +-
 .../TerminalSettingsEditor/ColorSchemes.h     | 15 ------
 .../TerminalSettingsEditor/ColorSchemes.idl   |  6 ---
 .../TerminalSettingsEditor/Compatibility.cpp  |  5 +-
 .../TerminalSettingsEditor/Compatibility.h    | 15 ------
 .../TerminalSettingsEditor/Compatibility.idl  |  6 ---
 .../EditColorScheme.cpp                       |  5 +-
 .../TerminalSettingsEditor/EditColorScheme.h  | 17 -------
 .../TerminalSettingsEditor/Extensions.cpp     |  6 ++-
 .../TerminalSettingsEditor/Extensions.h       | 15 ------
 .../TerminalSettingsEditor/Extensions.idl     |  6 ---
 .../GlobalAppearance.cpp                      |  5 +-
 .../TerminalSettingsEditor/GlobalAppearance.h | 15 ------
 .../GlobalAppearance.idl                      |  8 +---
 .../TerminalSettingsEditor/Interaction.cpp    |  6 ++-
 .../TerminalSettingsEditor/Interaction.h      | 15 ------
 .../TerminalSettingsEditor/Interaction.idl    |  6 ---
 .../TerminalSettingsEditor/Launch.cpp         |  4 +-
 src/cascadia/TerminalSettingsEditor/Launch.h  | 15 ------
 .../TerminalSettingsEditor/Launch.idl         |  6 ---
 .../TerminalSettingsEditor/MainPage.cpp       | 47 +++++++++----------
 .../TerminalSettingsEditor/MainPage.h         | 19 ++++++++
 .../TerminalSettingsEditor/MainPage.idl       |  7 +++
 .../TerminalSettingsEditor/NewTabMenu.cpp     |  5 +-
 .../TerminalSettingsEditor/NewTabMenu.h       | 15 ------
 .../TerminalSettingsEditor/NewTabMenu.idl     |  6 ---
 .../TerminalSettingsEditor/ProfileViewModel.h | 19 --------
 .../ProfileViewModel.idl                      |  7 ---
 .../Profiles_Advanced.cpp                     |  4 +-
 .../Profiles_Appearance.cpp                   |  4 +-
 .../TerminalSettingsEditor/Profiles_Base.cpp  |  4 +-
 .../Profiles_Base_Orphaned.cpp                |  4 +-
 .../Profiles_Terminal.cpp                     |  4 +-
 .../TerminalSettingsEditor/Rendering.cpp      |  5 +-
 .../TerminalSettingsEditor/Rendering.h        | 15 ------
 .../TerminalSettingsEditor/Rendering.idl      |  6 ---
 39 files changed, 90 insertions(+), 289 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/Actions.cpp b/src/cascadia/TerminalSettingsEditor/Actions.cpp
index 619595a9ad3..0685b57e18d 100644
--- a/src/cascadia/TerminalSettingsEditor/Actions.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Actions.cpp
@@ -4,6 +4,7 @@
 #include "pch.h"
 #include "Actions.h"
 #include "Actions.g.cpp"
+#include "NavigateToPageArgs.g.h"
 #include "LibraryResources.h"
 #include "../TerminalSettingsModel/AllShortcutActions.h"
 
@@ -27,9 +28,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void Actions::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        const auto args = e.Parameter().as<Editor::NavigateToActionsArgs>();
-        _ViewModel = args.ViewModel();
-
+        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
+        _ViewModel = args.ViewModel().as<Editor::ActionsViewModel>();
         BringIntoViewWhenLoaded(args.ElementToFocus());
 
         // Subscribe to the view model's FocusContainer event.
diff --git a/src/cascadia/TerminalSettingsEditor/Actions.h b/src/cascadia/TerminalSettingsEditor/Actions.h
index e4468924190..a79003afbfb 100644
--- a/src/cascadia/TerminalSettingsEditor/Actions.h
+++ b/src/cascadia/TerminalSettingsEditor/Actions.h
@@ -4,27 +4,12 @@
 #pragma once
 
 #include "Actions.g.h"
-#include "NavigateToActionsArgs.g.h"
 #include "ActionsViewModel.h"
 #include "Utils.h"
 #include "ViewModelHelpers.h"
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
-    struct NavigateToActionsArgs : NavigateToActionsArgsT<NavigateToActionsArgs>
-    {
-        NavigateToActionsArgs(Editor::ActionsViewModel vm, hstring elementToFocus = {}) :
-            _ViewModel(vm),
-            _ElementToFocus(elementToFocus) {}
-
-        Editor::ActionsViewModel ViewModel() const noexcept { return _ViewModel; }
-        hstring ElementToFocus() const noexcept { return _ElementToFocus; }
-
-    private:
-        Editor::ActionsViewModel _ViewModel{ nullptr };
-        hstring _ElementToFocus{};
-    };
-
     struct Actions : public HasScrollViewer<Actions>, ActionsT<Actions>
     {
     public:
diff --git a/src/cascadia/TerminalSettingsEditor/Actions.idl b/src/cascadia/TerminalSettingsEditor/Actions.idl
index 1da06382b1f..ec7444d2410 100644
--- a/src/cascadia/TerminalSettingsEditor/Actions.idl
+++ b/src/cascadia/TerminalSettingsEditor/Actions.idl
@@ -5,12 +5,6 @@ import "ActionsViewModel.idl";
 
 namespace Microsoft.Terminal.Settings.Editor
 {
-    runtimeclass NavigateToActionsArgs
-    {
-        ActionsViewModel ViewModel { get; };
-        String ElementToFocus { get; };
-    }
-
     [default_interface] runtimeclass Actions : Windows.UI.Xaml.Controls.Page
     {
         Actions();
diff --git a/src/cascadia/TerminalSettingsEditor/ColorSchemes.cpp b/src/cascadia/TerminalSettingsEditor/ColorSchemes.cpp
index d5aa3d290ab..0a046f6939b 100644
--- a/src/cascadia/TerminalSettingsEditor/ColorSchemes.cpp
+++ b/src/cascadia/TerminalSettingsEditor/ColorSchemes.cpp
@@ -4,6 +4,7 @@
 #include "pch.h"
 #include "ColorSchemes.h"
 #include "ColorTableEntry.g.cpp"
+#include "NavigateToPageArgs.g.h"
 #include "ColorSchemes.g.cpp"
 
 #include <LibraryResources.h>
@@ -35,8 +36,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void ColorSchemes::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        const auto args = e.Parameter().as<Editor::NavigateToColorSchemesArgs>();
-        _ViewModel = args.ViewModel();
+        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
+        _ViewModel = args.ViewModel().as<Editor::ColorSchemesPageViewModel>();
         _ViewModel.CurrentPage(ColorSchemesSubPage::Base);
 
         BringIntoViewWhenLoaded(args.ElementToFocus());
diff --git a/src/cascadia/TerminalSettingsEditor/ColorSchemes.h b/src/cascadia/TerminalSettingsEditor/ColorSchemes.h
index 37376c83477..c8e7786e8ec 100644
--- a/src/cascadia/TerminalSettingsEditor/ColorSchemes.h
+++ b/src/cascadia/TerminalSettingsEditor/ColorSchemes.h
@@ -5,27 +5,12 @@
 
 #include "ColorTableEntry.g.h"
 #include "ColorSchemes.g.h"
-#include "NavigateToColorSchemesArgs.g.h"
 #include "ColorSchemeViewModel.h"
 #include "ColorSchemesPageViewModel.h"
 #include "Utils.h"
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
-    struct NavigateToColorSchemesArgs : NavigateToColorSchemesArgsT<NavigateToColorSchemesArgs>
-    {
-        NavigateToColorSchemesArgs(const Editor::ColorSchemesPageViewModel& vm, const hstring& elementToFocus = {}) :
-            _ViewModel(vm),
-            _ElementToFocus(elementToFocus) {}
-
-        Editor::ColorSchemesPageViewModel ViewModel() const noexcept { return _ViewModel; }
-        hstring ElementToFocus() const noexcept { return _ElementToFocus; }
-
-    private:
-        Editor::ColorSchemesPageViewModel _ViewModel{ nullptr };
-        hstring _ElementToFocus{};
-    };
-
     struct ColorSchemes : public HasScrollViewer<ColorSchemes>, ColorSchemesT<ColorSchemes>
     {
     public:
diff --git a/src/cascadia/TerminalSettingsEditor/ColorSchemes.idl b/src/cascadia/TerminalSettingsEditor/ColorSchemes.idl
index 772627f3469..e92408dd56e 100644
--- a/src/cascadia/TerminalSettingsEditor/ColorSchemes.idl
+++ b/src/cascadia/TerminalSettingsEditor/ColorSchemes.idl
@@ -6,12 +6,6 @@ import "ColorSchemesPageViewModel.idl";
 
 namespace Microsoft.Terminal.Settings.Editor
 {
-    runtimeclass NavigateToColorSchemesArgs
-    {
-        ColorSchemesPageViewModel ViewModel { get; };
-        String ElementToFocus { get; };
-    }
-
     [default_interface] runtimeclass ColorSchemes : Windows.UI.Xaml.Controls.Page, Windows.UI.Xaml.Data.INotifyPropertyChanged
     {
         ColorSchemes();
diff --git a/src/cascadia/TerminalSettingsEditor/Compatibility.cpp b/src/cascadia/TerminalSettingsEditor/Compatibility.cpp
index 4e28b8802c1..81e5bc66e6e 100644
--- a/src/cascadia/TerminalSettingsEditor/Compatibility.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Compatibility.cpp
@@ -6,6 +6,7 @@
 #include "EnumEntry.h"
 #include "Compatibility.g.cpp"
 #include "CompatibilityViewModel.g.cpp"
+#include "NavigateToPageArgs.g.h"
 
 using namespace winrt::Windows::UI::Xaml::Navigation;
 using namespace winrt::Microsoft::Terminal::Settings::Model;
@@ -54,8 +55,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void Compatibility::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        const auto args = e.Parameter().as<Editor::NavigateToCompatibilityArgs>();
-        _ViewModel = args.ViewModel();
+        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
+        _ViewModel = args.ViewModel().as<Editor::CompatibilityViewModel>();
         BringIntoViewWhenLoaded(args.ElementToFocus());
 
         TraceLoggingWrite(
diff --git a/src/cascadia/TerminalSettingsEditor/Compatibility.h b/src/cascadia/TerminalSettingsEditor/Compatibility.h
index 37a9811552b..54e81f52522 100644
--- a/src/cascadia/TerminalSettingsEditor/Compatibility.h
+++ b/src/cascadia/TerminalSettingsEditor/Compatibility.h
@@ -4,27 +4,12 @@
 #pragma once
 
 #include "Compatibility.g.h"
-#include "NavigateToCompatibilityArgs.g.h"
 #include "CompatibilityViewModel.g.h"
 #include "ViewModelHelpers.h"
 #include "Utils.h"
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
-    struct NavigateToCompatibilityArgs : NavigateToCompatibilityArgsT<NavigateToCompatibilityArgs>
-    {
-        NavigateToCompatibilityArgs(const Editor::CompatibilityViewModel& vm, const hstring& elementToFocus = {}) :
-            _ViewModel(vm),
-            _ElementToFocus(elementToFocus) {}
-
-        Editor::CompatibilityViewModel ViewModel() const noexcept { return _ViewModel; }
-        hstring ElementToFocus() const noexcept { return _ElementToFocus; }
-
-    private:
-        Editor::CompatibilityViewModel _ViewModel{ nullptr };
-        hstring _ElementToFocus{};
-    };
-
     struct CompatibilityViewModel : CompatibilityViewModelT<CompatibilityViewModel>, ViewModelHelper<CompatibilityViewModel>
     {
     public:
diff --git a/src/cascadia/TerminalSettingsEditor/Compatibility.idl b/src/cascadia/TerminalSettingsEditor/Compatibility.idl
index f107200e2e7..b9f13ffe6e6 100644
--- a/src/cascadia/TerminalSettingsEditor/Compatibility.idl
+++ b/src/cascadia/TerminalSettingsEditor/Compatibility.idl
@@ -7,12 +7,6 @@ import "EnumEntry.idl";
 
 namespace Microsoft.Terminal.Settings.Editor
 {
-    runtimeclass NavigateToCompatibilityArgs
-    {
-        CompatibilityViewModel ViewModel { get; };
-        String ElementToFocus { get; };
-    }
-
     runtimeclass CompatibilityViewModel : Windows.UI.Xaml.Data.INotifyPropertyChanged
     {
         CompatibilityViewModel(Microsoft.Terminal.Settings.Model.CascadiaSettings settings);
diff --git a/src/cascadia/TerminalSettingsEditor/EditColorScheme.cpp b/src/cascadia/TerminalSettingsEditor/EditColorScheme.cpp
index f664470e7eb..d33c3cc92ee 100644
--- a/src/cascadia/TerminalSettingsEditor/EditColorScheme.cpp
+++ b/src/cascadia/TerminalSettingsEditor/EditColorScheme.cpp
@@ -4,6 +4,7 @@
 #include "pch.h"
 #include "EditColorScheme.h"
 #include "EditColorScheme.g.cpp"
+#include "NavigateToPageArgs.g.h"
 
 #include <LibraryResources.h>
 
@@ -40,8 +41,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void EditColorScheme::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        const auto args = e.Parameter().as<Editor::NavigateToEditColorSchemeArgs>();
-        _ViewModel = args.ViewModel();
+        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
+        _ViewModel = args.ViewModel().as<Editor::ColorSchemeViewModel>();
 
         BringIntoViewWhenLoaded(args.ElementToFocus());
 
diff --git a/src/cascadia/TerminalSettingsEditor/EditColorScheme.h b/src/cascadia/TerminalSettingsEditor/EditColorScheme.h
index ce59789a856..798c1c96ce5 100644
--- a/src/cascadia/TerminalSettingsEditor/EditColorScheme.h
+++ b/src/cascadia/TerminalSettingsEditor/EditColorScheme.h
@@ -3,29 +3,12 @@
 
 #pragma once
 
-#include "NavigateToEditColorSchemeArgs.g.h"
 #include "EditColorScheme.g.h"
 #include "ColorSchemeViewModel.h"
 #include "Utils.h"
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
-    // TODO CARLOS: We have a bunch of NavigateToXArgs that have the same pattern.
-    // Leonard suggested replacing ViewModel with IInspectable so that we can just reuse this for everything.
-    struct NavigateToEditColorSchemeArgs : NavigateToEditColorSchemeArgsT<NavigateToEditColorSchemeArgs>
-    {
-        NavigateToEditColorSchemeArgs(const Editor::ColorSchemeViewModel& vm, const hstring& elementToFocus = {}) :
-            _ViewModel(vm),
-            _ElementToFocus(elementToFocus) {}
-
-        Editor::ColorSchemeViewModel ViewModel() const noexcept { return _ViewModel; }
-        hstring ElementToFocus() const noexcept { return _ElementToFocus; }
-
-    private:
-        Editor::ColorSchemeViewModel _ViewModel{ nullptr };
-        hstring _ElementToFocus{};
-    };
-
     struct EditColorScheme : public HasScrollViewer<EditColorScheme>, EditColorSchemeT<EditColorScheme>
     {
         EditColorScheme();
diff --git a/src/cascadia/TerminalSettingsEditor/Extensions.cpp b/src/cascadia/TerminalSettingsEditor/Extensions.cpp
index f5be54dfd8a..875ef3489d5 100644
--- a/src/cascadia/TerminalSettingsEditor/Extensions.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Extensions.cpp
@@ -3,6 +3,7 @@
 
 #include "pch.h"
 #include "Extensions.h"
+#include "NavigateToPageArgs.g.h"
 #include "Extensions.g.cpp"
 #include "ExtensionPackageViewModel.g.cpp"
 #include "ExtensionsViewModel.g.cpp"
@@ -34,8 +35,9 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void Extensions::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        const auto args = e.Parameter().as<Editor::NavigateToExtensionsArgs>();
-        _ViewModel = args.ViewModel();
+        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
+        _ViewModel = args.ViewModel().as<Editor::ExtensionsViewModel>();
+
         auto vmImpl = get_self<ExtensionsViewModel>(_ViewModel);
         vmImpl->ExtensionPackageIdentifierTemplateSelector(_extensionPackageIdentifierTemplateSelector);
         vmImpl->LazyLoadExtensions();
diff --git a/src/cascadia/TerminalSettingsEditor/Extensions.h b/src/cascadia/TerminalSettingsEditor/Extensions.h
index 04d44ffaca6..a9379829d26 100644
--- a/src/cascadia/TerminalSettingsEditor/Extensions.h
+++ b/src/cascadia/TerminalSettingsEditor/Extensions.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include "Extensions.g.h"
-#include "NavigateToExtensionsArgs.g.h"
 #include "ExtensionsViewModel.g.h"
 #include "ExtensionPackageViewModel.g.h"
 #include "FragmentExtensionViewModel.g.h"
@@ -16,20 +15,6 @@
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
-    struct NavigateToExtensionsArgs : NavigateToExtensionsArgsT<NavigateToExtensionsArgs>
-    {
-        NavigateToExtensionsArgs(const Editor::ExtensionsViewModel& vm, const hstring& elementToFocus = {}) :
-            _ViewModel(vm),
-            _ElementToFocus(elementToFocus) {}
-
-        Editor::ExtensionsViewModel ViewModel() const noexcept { return _ViewModel; }
-        hstring ElementToFocus() const noexcept { return _ElementToFocus; }
-
-    private:
-        Editor::ExtensionsViewModel _ViewModel{ nullptr };
-        hstring _ElementToFocus{};
-    };
-
     struct Extensions : public HasScrollViewer<Extensions>, ExtensionsT<Extensions>
     {
     public:
diff --git a/src/cascadia/TerminalSettingsEditor/Extensions.idl b/src/cascadia/TerminalSettingsEditor/Extensions.idl
index b11bcdc2645..6093471014d 100644
--- a/src/cascadia/TerminalSettingsEditor/Extensions.idl
+++ b/src/cascadia/TerminalSettingsEditor/Extensions.idl
@@ -5,12 +5,6 @@ import "ColorSchemesPageViewModel.idl";
 
 namespace Microsoft.Terminal.Settings.Editor
 {
-    runtimeclass NavigateToExtensionsArgs
-    {
-        ExtensionsViewModel ViewModel { get; };
-        String ElementToFocus { get; };
-    }
-
     [default_interface] runtimeclass Extensions : Windows.UI.Xaml.Controls.Page
     {
         Extensions();
diff --git a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.cpp b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.cpp
index 0074af33f67..4a9f4c43e92 100644
--- a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.cpp
+++ b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.cpp
@@ -3,6 +3,7 @@
 
 #include "pch.h"
 #include "GlobalAppearance.h"
+#include "NavigateToPageArgs.g.h"
 #include "GlobalAppearance.g.cpp"
 
 #include <LibraryResources.h>
@@ -24,8 +25,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void GlobalAppearance::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        const auto& args = e.Parameter().as<Editor::NavigateToGlobalAppearanceArgs>();
-        _ViewModel = args.ViewModel();
+        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
+        _ViewModel = args.ViewModel().as<Editor::GlobalAppearanceViewModel>();
         BringIntoViewWhenLoaded(args.ElementToFocus());
 
         TraceLoggingWrite(
diff --git a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.h b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.h
index 03759e1b130..61a330b70e9 100644
--- a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.h
+++ b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.h
@@ -4,25 +4,10 @@
 #pragma once
 
 #include "GlobalAppearance.g.h"
-#include "NavigateToGlobalAppearanceArgs.g.h"
 #include "Utils.h"
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
-    struct NavigateToGlobalAppearanceArgs : NavigateToGlobalAppearanceArgsT<NavigateToGlobalAppearanceArgs>
-    {
-        NavigateToGlobalAppearanceArgs(const Editor::GlobalAppearanceViewModel& vm, const hstring& elementToFocus = {}) :
-            _ViewModel(vm),
-            _ElementToFocus(elementToFocus) {}
-
-        Editor::GlobalAppearanceViewModel ViewModel() const noexcept { return _ViewModel; }
-        hstring ElementToFocus() const noexcept { return _ElementToFocus; }
-
-    private:
-        Editor::GlobalAppearanceViewModel _ViewModel{ nullptr };
-        hstring _ElementToFocus{};
-    };
-
     struct GlobalAppearance : public HasScrollViewer<GlobalAppearance>, GlobalAppearanceT<GlobalAppearance>
     {
     public:
diff --git a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.idl b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.idl
index bdf5f01e067..008226a4bee 100644
--- a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.idl
+++ b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.idl
@@ -5,13 +5,7 @@ import "GlobalAppearanceViewModel.idl";
 
 namespace Microsoft.Terminal.Settings.Editor
 {
-    runtimeclass NavigateToGlobalAppearanceArgs
-    {
-        GlobalAppearanceViewModel ViewModel { get; };
-        String ElementToFocus { get; };
-    }
-
-    [default_interface] runtimeclass GlobalAppearance : Windows.UI.Xaml.Controls.Page
+    runtimeclass GlobalAppearance : Windows.UI.Xaml.Controls.Page
     {
         GlobalAppearance();
         GlobalAppearanceViewModel ViewModel { get; };
diff --git a/src/cascadia/TerminalSettingsEditor/Interaction.cpp b/src/cascadia/TerminalSettingsEditor/Interaction.cpp
index f729e13c15c..dbc6708ffeb 100644
--- a/src/cascadia/TerminalSettingsEditor/Interaction.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Interaction.cpp
@@ -4,6 +4,7 @@
 #include "pch.h"
 #include "Interaction.h"
 #include "Interaction.g.cpp"
+#include "NavigateToPageArgs.g.h"
 
 #include "EnumEntry.h"
 
@@ -21,8 +22,9 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void Interaction::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        const auto args = e.Parameter().as<Editor::NavigateToInteractionArgs>();
-        _ViewModel = args.ViewModel();
+        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
+        _ViewModel = args.ViewModel().as<Editor::InteractionViewModel>();
+
         BringIntoViewWhenLoaded(args.ElementToFocus());
 
         TraceLoggingWrite(
diff --git a/src/cascadia/TerminalSettingsEditor/Interaction.h b/src/cascadia/TerminalSettingsEditor/Interaction.h
index d914ba5e84c..568139fdeed 100644
--- a/src/cascadia/TerminalSettingsEditor/Interaction.h
+++ b/src/cascadia/TerminalSettingsEditor/Interaction.h
@@ -4,25 +4,10 @@
 #pragma once
 
 #include "Interaction.g.h"
-#include "NavigateToInteractionArgs.g.h"
 #include "Utils.h"
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
-    struct NavigateToInteractionArgs : NavigateToInteractionArgsT<NavigateToInteractionArgs>
-    {
-        NavigateToInteractionArgs(const Editor::InteractionViewModel& vm, const hstring& elementToFocus = {}) :
-            _ViewModel(vm),
-            _ElementToFocus(elementToFocus) {}
-
-        Editor::InteractionViewModel ViewModel() const noexcept { return _ViewModel; }
-        hstring ElementToFocus() const noexcept { return _ElementToFocus; }
-
-    private:
-        Editor::InteractionViewModel _ViewModel{ nullptr };
-        hstring _ElementToFocus{};
-    };
-
     struct Interaction : public HasScrollViewer<Interaction>, InteractionT<Interaction>
     {
         Interaction();
diff --git a/src/cascadia/TerminalSettingsEditor/Interaction.idl b/src/cascadia/TerminalSettingsEditor/Interaction.idl
index 4e58f5b8e41..3a41823b87f 100644
--- a/src/cascadia/TerminalSettingsEditor/Interaction.idl
+++ b/src/cascadia/TerminalSettingsEditor/Interaction.idl
@@ -5,12 +5,6 @@ import "InteractionViewModel.idl";
 
 namespace Microsoft.Terminal.Settings.Editor
 {
-    runtimeclass NavigateToInteractionArgs
-    {
-        InteractionViewModel ViewModel { get; };
-        String ElementToFocus { get; };
-    }
-
     [default_interface] runtimeclass Interaction : Windows.UI.Xaml.Controls.Page
     {
         Interaction();
diff --git a/src/cascadia/TerminalSettingsEditor/Launch.cpp b/src/cascadia/TerminalSettingsEditor/Launch.cpp
index 268d4d43b42..eddba538943 100644
--- a/src/cascadia/TerminalSettingsEditor/Launch.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Launch.cpp
@@ -40,8 +40,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void Launch::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        const auto args = e.Parameter().as<Editor::NavigateToLaunchArgs>();
-        _ViewModel = args.ViewModel();
+        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
+        _ViewModel = args.ViewModel().as<Editor::LaunchViewModel>();
         BringIntoViewWhenLoaded(args.ElementToFocus());
         auto innerViewModel{ winrt::get_self<Editor::implementation::LaunchViewModel>(_ViewModel) };
         /* coroutine dispatch */ innerViewModel->PrepareStartOnUserLoginSettings();
diff --git a/src/cascadia/TerminalSettingsEditor/Launch.h b/src/cascadia/TerminalSettingsEditor/Launch.h
index ef37dab9cab..985be422af3 100644
--- a/src/cascadia/TerminalSettingsEditor/Launch.h
+++ b/src/cascadia/TerminalSettingsEditor/Launch.h
@@ -4,25 +4,10 @@
 #pragma once
 
 #include "Launch.g.h"
-#include "NavigateToLaunchArgs.g.h"
 #include "Utils.h"
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
-    struct NavigateToLaunchArgs : NavigateToLaunchArgsT<NavigateToLaunchArgs>
-    {
-        NavigateToLaunchArgs(const Editor::LaunchViewModel& vm, const hstring& elementToFocus = {}) :
-            _ViewModel(vm),
-            _ElementToFocus(elementToFocus) {}
-
-        Editor::LaunchViewModel ViewModel() const noexcept { return _ViewModel; }
-        hstring ElementToFocus() const noexcept { return _ElementToFocus; }
-
-    private:
-        Editor::LaunchViewModel _ViewModel{ nullptr };
-        hstring _ElementToFocus{};
-    };
-
     struct Launch : public HasScrollViewer<Launch>, LaunchT<Launch>
     {
     public:
diff --git a/src/cascadia/TerminalSettingsEditor/Launch.idl b/src/cascadia/TerminalSettingsEditor/Launch.idl
index 7d42f379340..537650cb780 100644
--- a/src/cascadia/TerminalSettingsEditor/Launch.idl
+++ b/src/cascadia/TerminalSettingsEditor/Launch.idl
@@ -6,12 +6,6 @@ import "LaunchViewModel.idl";
 
 namespace Microsoft.Terminal.Settings.Editor
 {
-    runtimeclass NavigateToLaunchArgs
-    {
-        LaunchViewModel ViewModel { get; };
-        String ElementToFocus { get; };
-    }
-
     [default_interface] runtimeclass Launch : Windows.UI.Xaml.Controls.Page
     {
         Launch();
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
index 74d4e91f5ce..efcf1f6fb9e 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
@@ -304,7 +304,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                     const auto crumb = winrt::make<Breadcrumb>(box_value(newTabMenuTag), RS_(L"Nav_NewTabMenu/Content"), BreadcrumbSubPage::None);
                     _breadcrumbs.Append(crumb);
                 }
-                contentFrame().Navigate(xaml_typename<Editor::NewTabMenu>(), winrt::make<NavigateToNewTabMenuArgs>(_newTabMenuPageVM));
+                contentFrame().Navigate(xaml_typename<Editor::NewTabMenu>(), winrt::make<NavigateToPageArgs>(_newTabMenuPageVM, *this));
             }
         });
 
@@ -321,7 +321,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 const auto currentScheme = _colorSchemesPageVM.CurrentScheme();
                 if (_colorSchemesPageVM.CurrentPage() == ColorSchemesSubPage::EditColorScheme && currentScheme)
                 {
-                    contentFrame().Navigate(xaml_typename<Editor::EditColorScheme>(), winrt::make<NavigateToEditColorSchemeArgs>(currentScheme, elementToFocus));
+                    contentFrame().Navigate(xaml_typename<Editor::EditColorScheme>(), winrt::make<NavigateToPageArgs>(currentScheme, *this, elementToFocus));
                     const auto crumb = winrt::make<Breadcrumb>(box_value(colorSchemesTag), currentScheme.Name(), BreadcrumbSubPage::ColorSchemes_Edit);
                     _breadcrumbs.Append(crumb);
                 }
@@ -362,7 +362,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                     const auto crumb = winrt::make<Breadcrumb>(box_value(extensionsTag), RS_(L"Nav_Extensions/Content"), BreadcrumbSubPage::None);
                     _breadcrumbs.Append(crumb);
                 }
-                contentFrame().Navigate(xaml_typename<Editor::Extensions>(), winrt::make<NavigateToExtensionsArgs>(_extensionsVM));
+                contentFrame().Navigate(xaml_typename<Editor::Extensions>(), winrt::make<NavigateToPageArgs>(_extensionsVM, *this));
             }
         });
 
@@ -661,7 +661,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 const auto currentPage = profile.CurrentPage();
                 if (currentPage == ProfileSubPage::Base)
                 {
-                    contentFrame().Navigate(xaml_typename<Editor::Profiles_Base>(), winrt::make<implementation::NavigateToProfileArgs>(profile, *this, elementToFocus));
+                    contentFrame().Navigate(xaml_typename<Editor::Profiles_Base>(), winrt::make<NavigateToPageArgs>(profile, *this, elementToFocus));
                     _breadcrumbs.Clear();
                     const auto crumb = winrt::make<Breadcrumb>(breadcrumbTag, breadcrumbText, BreadcrumbSubPage::None);
                     _breadcrumbs.Append(crumb);
@@ -669,21 +669,21 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 }
                 else if (currentPage == ProfileSubPage::Appearance)
                 {
-                    contentFrame().Navigate(xaml_typename<Editor::Profiles_Appearance>(), winrt::make<implementation::NavigateToProfileArgs>(profile, *this, elementToFocus));
+                    contentFrame().Navigate(xaml_typename<Editor::Profiles_Appearance>(), winrt::make<NavigateToPageArgs>(profile, *this, elementToFocus));
                     const auto crumb = winrt::make<Breadcrumb>(breadcrumbTag, RS_(L"Profile_Appearance/Header"), BreadcrumbSubPage::Profile_Appearance);
                     _breadcrumbs.Append(crumb);
                     SettingsMainPage_ScrollViewer().ScrollToVerticalOffset(0);
                 }
                 else if (currentPage == ProfileSubPage::Terminal)
                 {
-                    contentFrame().Navigate(xaml_typename<Editor::Profiles_Terminal>(), winrt::make<implementation::NavigateToProfileArgs>(profile, *this, elementToFocus));
+                    contentFrame().Navigate(xaml_typename<Editor::Profiles_Terminal>(), winrt::make<NavigateToPageArgs>(profile, *this, elementToFocus));
                     const auto crumb = winrt::make<Breadcrumb>(breadcrumbTag, RS_(L"Profile_Terminal/Header"), BreadcrumbSubPage::Profile_Terminal);
                     _breadcrumbs.Append(crumb);
                     SettingsMainPage_ScrollViewer().ScrollToVerticalOffset(0);
                 }
                 else if (currentPage == ProfileSubPage::Advanced)
                 {
-                    contentFrame().Navigate(xaml_typename<Editor::Profiles_Advanced>(), winrt::make<implementation::NavigateToProfileArgs>(profile, *this, elementToFocus));
+                    contentFrame().Navigate(xaml_typename<Editor::Profiles_Advanced>(), winrt::make<NavigateToPageArgs>(profile, *this, elementToFocus));
                     const auto crumb = winrt::make<Breadcrumb>(breadcrumbTag, RS_(L"Profile_Advanced/Header"), BreadcrumbSubPage::Profile_Advanced);
                     _breadcrumbs.Append(crumb);
                     SettingsMainPage_ScrollViewer().ScrollToVerticalOffset(0);
@@ -698,35 +698,35 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
         if (clickedItemTag == launchTag)
         {
-            contentFrame().Navigate(xaml_typename<Editor::Launch>(), winrt::make<NavigateToLaunchArgs>(winrt::make<LaunchViewModel>(_settingsClone), elementToFocus));
+            contentFrame().Navigate(xaml_typename<Editor::Launch>(), winrt::make<NavigateToPageArgs>(winrt::make<LaunchViewModel>(_settingsClone), *this, elementToFocus));
             const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_Launch/Content"), BreadcrumbSubPage::None);
             _breadcrumbs.Append(crumb);
             SettingsNav().SelectedItem(LaunchNavItem());
         }
         else if (clickedItemTag == interactionTag)
         {
-            contentFrame().Navigate(xaml_typename<Editor::Interaction>(), winrt::make<NavigateToInteractionArgs>(winrt::make<InteractionViewModel>(_settingsClone.GlobalSettings()), elementToFocus));
+            contentFrame().Navigate(xaml_typename<Editor::Interaction>(), winrt::make<NavigateToPageArgs>(winrt::make<InteractionViewModel>(_settingsClone.GlobalSettings()), *this, elementToFocus));
             const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_Interaction/Content"), BreadcrumbSubPage::None);
             _breadcrumbs.Append(crumb);
             SettingsNav().SelectedItem(InteractionNavItem());
         }
         else if (clickedItemTag == renderingTag)
         {
-            contentFrame().Navigate(xaml_typename<Editor::Rendering>(), winrt::make<NavigateToRenderingArgs>(winrt::make<RenderingViewModel>(_settingsClone), elementToFocus));
+            contentFrame().Navigate(xaml_typename<Editor::Rendering>(), winrt::make<NavigateToPageArgs>(winrt::make<RenderingViewModel>(_settingsClone), *this, elementToFocus));
             const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_Rendering/Content"), BreadcrumbSubPage::None);
             _breadcrumbs.Append(crumb);
             SettingsNav().SelectedItem(RenderingNavItem());
         }
         else if (clickedItemTag == compatibilityTag)
         {
-            contentFrame().Navigate(xaml_typename<Editor::Compatibility>(), winrt::make<NavigateToCompatibilityArgs>(winrt::make<CompatibilityViewModel>(_settingsClone), elementToFocus));
+            contentFrame().Navigate(xaml_typename<Editor::Compatibility>(), winrt::make<NavigateToPageArgs>(winrt::make<CompatibilityViewModel>(_settingsClone), *this, elementToFocus));
             const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_Compatibility/Content"), BreadcrumbSubPage::None);
             _breadcrumbs.Append(crumb);
             SettingsNav().SelectedItem(CompatibilityNavItem());
         }
         else if (clickedItemTag == actionsTag)
         {
-            contentFrame().Navigate(xaml_typename<Editor::Actions>(), winrt::make<NavigateToActionsArgs>(winrt::make<ActionsViewModel>(_settingsClone)));
+            contentFrame().Navigate(xaml_typename<Editor::Actions>(), winrt::make<NavigateToPageArgs>(winrt::make<ActionsViewModel>(_settingsClone), *this, elementToFocus));
             const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_Actions/Content"), BreadcrumbSubPage::None);
             _breadcrumbs.Append(crumb);
             SettingsNav().SelectedItem(ActionsNavItem());
@@ -742,7 +742,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             else
             {
                 // Navigate to the NewTabMenu page
-                contentFrame().Navigate(xaml_typename<Editor::NewTabMenu>(), winrt::make<NavigateToNewTabMenuArgs>(_newTabMenuPageVM, elementToFocus));
+                contentFrame().Navigate(xaml_typename<Editor::NewTabMenu>(), winrt::make<NavigateToPageArgs>(_newTabMenuPageVM, *this, elementToFocus));
                 const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_NewTabMenu/Content"), BreadcrumbSubPage::None);
                 _breadcrumbs.Append(crumb);
             }
@@ -758,7 +758,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             }
             else
             {
-                contentFrame().Navigate(xaml_typename<Editor::Extensions>(), winrt::make<NavigateToExtensionsArgs>(_extensionsVM, elementToFocus));
+                contentFrame().Navigate(xaml_typename<Editor::Extensions>(), winrt::make<NavigateToPageArgs>(_extensionsVM, *this, elementToFocus));
                 const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_Extensions/Content"), BreadcrumbSubPage::None);
                 _breadcrumbs.Append(crumb);
             }
@@ -776,7 +776,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
             _SetupProfileEventHandling(_profileDefaultsVM);
 
-            contentFrame().Navigate(xaml_typename<Editor::Profiles_Base>(), winrt::make<implementation::NavigateToProfileArgs>(_profileDefaultsVM, *this, elementToFocus));
+            contentFrame().Navigate(xaml_typename<Editor::Profiles_Base>(), winrt::make<NavigateToPageArgs>(_profileDefaultsVM, *this, elementToFocus));
             const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_ProfileDefaults/Content"), BreadcrumbSubPage::None);
             _breadcrumbs.Append(crumb);
             SettingsNav().SelectedItem(BaseLayerMenuItem());
@@ -802,7 +802,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         {
             const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_ColorSchemes/Content"), BreadcrumbSubPage::None);
             _breadcrumbs.Append(crumb);
-            contentFrame().Navigate(xaml_typename<Editor::ColorSchemes>(), winrt::make<NavigateToColorSchemesArgs>(_colorSchemesPageVM, elementToFocus));
+            contentFrame().Navigate(xaml_typename<Editor::ColorSchemes>(), winrt::make<NavigateToPageArgs>(_colorSchemesPageVM, *this, elementToFocus));
             SettingsNav().SelectedItem(ColorSchemesNavItem());
 
             if (subPage == BreadcrumbSubPage::ColorSchemes_Edit)
@@ -812,7 +812,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         }
         else if (clickedItemTag == globalAppearanceTag)
         {
-            contentFrame().Navigate(xaml_typename<Editor::GlobalAppearance>(), winrt::make<NavigateToGlobalAppearanceArgs>(winrt::make<GlobalAppearanceViewModel>(_settingsClone.GlobalSettings()), elementToFocus));
+            contentFrame().Navigate(xaml_typename<Editor::GlobalAppearance>(), winrt::make<NavigateToPageArgs>(winrt::make<GlobalAppearanceViewModel>(_settingsClone.GlobalSettings()), *this, elementToFocus));
             const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_Appearance/Content"), BreadcrumbSubPage::None);
             _breadcrumbs.Append(crumb);
             SettingsNav().SelectedItem(GlobalAppearanceNavItem());
@@ -861,14 +861,14 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
         if (profile.Orphaned())
         {
-            contentFrame().Navigate(xaml_typename<Editor::Profiles_Base_Orphaned>(), winrt::make<implementation::NavigateToProfileArgs>(profile, *this, elementToFocus));
+            contentFrame().Navigate(xaml_typename<Editor::Profiles_Base_Orphaned>(), winrt::make<NavigateToPageArgs>(profile, *this, elementToFocus));
             const auto crumb = winrt::make<Breadcrumb>(box_value(profile), profile.Name(), BreadcrumbSubPage::None);
             _breadcrumbs.Append(crumb);
             profile.CurrentPage(ProfileSubPage::Base);
             return;
         }
 
-        contentFrame().Navigate(xaml_typename<Editor::Profiles_Base>(), winrt::make<implementation::NavigateToProfileArgs>(profile, *this, elementToFocus));
+        contentFrame().Navigate(xaml_typename<Editor::Profiles_Base>(), winrt::make<NavigateToPageArgs>(profile, *this, elementToFocus));
         const auto crumb = winrt::make<Breadcrumb>(box_value(profile), profile.Name(), BreadcrumbSubPage::None);
         _breadcrumbs.Append(crumb);
         if (const auto profileNavItem = _FindProfileNavItem(profile.OriginalProfileGuid()))
@@ -900,7 +900,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
         const auto crumb = winrt::make<Breadcrumb>(box_value(colorSchemesTag), RS_(L"Nav_ColorSchemes/Content"), BreadcrumbSubPage::None);
         _breadcrumbs.Append(crumb);
-        contentFrame().Navigate(xaml_typename<Editor::ColorSchemes>(), winrt::make<NavigateToColorSchemesArgs>(_colorSchemesPageVM, elementToFocus));
+        contentFrame().Navigate(xaml_typename<Editor::ColorSchemes>(), winrt::make<NavigateToPageArgs>(_colorSchemesPageVM, *this, elementToFocus));
         SettingsNav().SelectedItem(ColorSchemesNavItem());
 
         // Pass along the element to focus to the ColorSchemesPageViewModel.
@@ -925,7 +925,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     {
         _PreNavigateHelper();
 
-        contentFrame().Navigate(xaml_typename<Editor::NewTabMenu>(), winrt::make<NavigateToNewTabMenuArgs>(_newTabMenuPageVM, elementToFocus));
+        contentFrame().Navigate(xaml_typename<Editor::NewTabMenu>(), winrt::make<NavigateToPageArgs>(_newTabMenuPageVM, *this, elementToFocus));
         const auto crumb = winrt::make<Breadcrumb>(box_value(newTabMenuTag), RS_(L"Nav_NewTabMenu/Content"), BreadcrumbSubPage::None);
         _breadcrumbs.Append(crumb);
         SettingsNav().SelectedItem(NewTabMenuNavItem());
@@ -959,7 +959,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     {
         _PreNavigateHelper();
 
-        contentFrame().Navigate(xaml_typename<Editor::Extensions>(), winrt::make<NavigateToExtensionsArgs>(_extensionsVM, elementToFocus));
+        contentFrame().Navigate(xaml_typename<Editor::Extensions>(), winrt::make<NavigateToPageArgs>(_extensionsVM, *this, elementToFocus));
         const auto crumb = winrt::make<Breadcrumb>(box_value(extensionsTag), RS_(L"Nav_Extensions/Content"), BreadcrumbSubPage::None);
         _breadcrumbs.Append(crumb);
         SettingsNav().SelectedItem(ExtensionsNavItem());
@@ -1578,9 +1578,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         registerIndex(LoadColorSchemeIndex(), searchIndex.colorSchemeIndex);
         searchIndex.colorSchemeIndexEntry.Entry = &PartialColorSchemeIndexEntry();
 
-        // Load actions
-        // TODO CARLOS: postpone until actions page is updated
-
         *_searchIndex.write() = std::move(searchIndex);
     }
 
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.h b/src/cascadia/TerminalSettingsEditor/MainPage.h
index d68867ea60a..3ff692712e7 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.h
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.h
@@ -5,6 +5,7 @@
 
 #include "MainPage.g.h"
 #include "Breadcrumb.g.h"
+#include "NavigateToPageArgs.g.h"
 #include "FilteredSearchResult.g.h"
 #include "Utils.h"
 #include "GeneratedSettingsIndex.g.h"
@@ -30,6 +31,24 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         WINRT_PROPERTY(BreadcrumbSubPage, SubPage);
     };
 
+    struct NavigateToPageArgs : NavigateToPageArgsT<NavigateToPageArgs>
+    {
+    public:
+        NavigateToPageArgs(Windows::Foundation::IInspectable viewModel, Editor::IHostedInWindow windowRoot, const hstring& elementToFocus = {}) :
+            _ViewModel(viewModel),
+            _WindowRoot(windowRoot),
+            _ElementToFocus(elementToFocus) {}
+
+        Editor::IHostedInWindow WindowRoot() const noexcept { return _WindowRoot; }
+        Windows::Foundation::IInspectable ViewModel() const noexcept { return _ViewModel; }
+        hstring ElementToFocus() const noexcept { return _ElementToFocus; }
+
+    private:
+        Editor::IHostedInWindow _WindowRoot;
+        Windows::Foundation::IInspectable _ViewModel{ nullptr };
+        hstring _ElementToFocus{};
+    };
+
     struct LocalizedIndexEntry
     {
         std::optional<winrt::hstring> DisplayTextNeutral = std::nullopt;
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.idl b/src/cascadia/TerminalSettingsEditor/MainPage.idl
index 9154f195ea8..4c7f684b4bf 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.idl
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.idl
@@ -15,6 +15,13 @@ namespace Microsoft.Terminal.Settings.Editor
         UInt64 GetHostingWindow();
     }
 
+    runtimeclass NavigateToPageArgs
+    {        
+        IHostedInWindow WindowRoot { get; };
+        IInspectable ViewModel { get; };
+        String ElementToFocus { get; };
+    }
+
     enum BreadcrumbSubPage
     {
         None = 0,
diff --git a/src/cascadia/TerminalSettingsEditor/NewTabMenu.cpp b/src/cascadia/TerminalSettingsEditor/NewTabMenu.cpp
index c62a8ca1422..dd4226a5d6e 100644
--- a/src/cascadia/TerminalSettingsEditor/NewTabMenu.cpp
+++ b/src/cascadia/TerminalSettingsEditor/NewTabMenu.cpp
@@ -3,6 +3,7 @@
 
 #include "pch.h"
 #include "NewTabMenu.h"
+#include "NavigateToPageArgs.g.h"
 #include "NewTabMenu.g.cpp"
 #include "NewTabMenuEntryTemplateSelector.g.cpp"
 #include "EnumEntry.h"
@@ -43,8 +44,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void NewTabMenu::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        const auto args = e.Parameter().as<Editor::NavigateToNewTabMenuArgs>();
-        _ViewModel = args.ViewModel();
+        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
+        _ViewModel = args.ViewModel().as<Editor::NewTabMenuViewModel>();
 
         BringIntoViewWhenLoaded(args.ElementToFocus());
 
diff --git a/src/cascadia/TerminalSettingsEditor/NewTabMenu.h b/src/cascadia/TerminalSettingsEditor/NewTabMenu.h
index 84f424abb3c..f305c44c885 100644
--- a/src/cascadia/TerminalSettingsEditor/NewTabMenu.h
+++ b/src/cascadia/TerminalSettingsEditor/NewTabMenu.h
@@ -4,26 +4,11 @@
 #pragma once
 
 #include "NewTabMenu.g.h"
-#include "NavigateToNewTabMenuArgs.g.h"
 #include "NewTabMenuEntryTemplateSelector.g.h"
 #include "Utils.h"
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
-    struct NavigateToNewTabMenuArgs : NavigateToNewTabMenuArgsT<NavigateToNewTabMenuArgs>
-    {
-        NavigateToNewTabMenuArgs(const Editor::NewTabMenuViewModel& vm, const hstring& elementToFocus = {}) :
-            _ViewModel(vm),
-            _ElementToFocus(elementToFocus) {}
-
-        Editor::NewTabMenuViewModel ViewModel() const noexcept { return _ViewModel; }
-        hstring ElementToFocus() const noexcept { return _ElementToFocus; }
-
-    private:
-        Editor::NewTabMenuViewModel _ViewModel{ nullptr };
-        hstring _ElementToFocus{};
-    };
-
     struct NewTabMenu : public HasScrollViewer<NewTabMenu>, NewTabMenuT<NewTabMenu>
     {
     public:
diff --git a/src/cascadia/TerminalSettingsEditor/NewTabMenu.idl b/src/cascadia/TerminalSettingsEditor/NewTabMenu.idl
index ced50368625..11de472596c 100644
--- a/src/cascadia/TerminalSettingsEditor/NewTabMenu.idl
+++ b/src/cascadia/TerminalSettingsEditor/NewTabMenu.idl
@@ -5,12 +5,6 @@ import "NewTabMenuViewModel.idl";
 
 namespace Microsoft.Terminal.Settings.Editor
 {
-    runtimeclass NavigateToNewTabMenuArgs
-    {
-        NewTabMenuViewModel ViewModel { get; };
-        String ElementToFocus { get; };
-    }
-
     [default_interface] runtimeclass NewTabMenu : Windows.UI.Xaml.Controls.Page
     {
         NewTabMenu();
diff --git a/src/cascadia/TerminalSettingsEditor/ProfileViewModel.h b/src/cascadia/TerminalSettingsEditor/ProfileViewModel.h
index 5d045f20534..d420479ad21 100644
--- a/src/cascadia/TerminalSettingsEditor/ProfileViewModel.h
+++ b/src/cascadia/TerminalSettingsEditor/ProfileViewModel.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include "DeleteProfileEventArgs.g.h"
-#include "NavigateToProfileArgs.g.h"
 #include "BellSoundViewModel.g.h"
 #include "ProfileViewModel.g.h"
 #include "Utils.h"
@@ -12,24 +11,6 @@
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
-    struct NavigateToProfileArgs : NavigateToProfileArgsT<NavigateToProfileArgs>
-    {
-    public:
-        NavigateToProfileArgs(ProfileViewModel profile, Editor::IHostedInWindow windowRoot, const hstring& elementToFocus = {}) :
-            _Profile(profile),
-            _WindowRoot(windowRoot),
-            _ElementToFocus(elementToFocus) {}
-
-        Editor::IHostedInWindow WindowRoot() const noexcept { return _WindowRoot; }
-        Editor::ProfileViewModel Profile() const noexcept { return _Profile; }
-        hstring ElementToFocus() const noexcept { return _ElementToFocus; }
-
-    private:
-        Editor::IHostedInWindow _WindowRoot;
-        Editor::ProfileViewModel _Profile{ nullptr };
-        hstring _ElementToFocus{};
-    };
-
     struct BellSoundViewModel : BellSoundViewModelT<BellSoundViewModel>, ViewModelHelper<BellSoundViewModel>
     {
     public:
diff --git a/src/cascadia/TerminalSettingsEditor/ProfileViewModel.idl b/src/cascadia/TerminalSettingsEditor/ProfileViewModel.idl
index c3610771642..ece0dff3fa7 100644
--- a/src/cascadia/TerminalSettingsEditor/ProfileViewModel.idl
+++ b/src/cascadia/TerminalSettingsEditor/ProfileViewModel.idl
@@ -14,13 +14,6 @@ import "ColorSchemesPageViewModel.idl";
 
 namespace Microsoft.Terminal.Settings.Editor
 {
-    runtimeclass NavigateToProfileArgs
-    {
-        ProfileViewModel Profile { get; };
-        IHostedInWindow WindowRoot { get; };
-        String ElementToFocus { get; };
-    }
-
     runtimeclass DeleteProfileEventArgs
     {
         Guid ProfileGuid { get; };
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.cpp b/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.cpp
index 41302472522..81fd4862b44 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.cpp
@@ -26,8 +26,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void Profiles_Advanced::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        const auto args = e.Parameter().as<Editor::NavigateToProfileArgs>();
-        _Profile = args.Profile();
+        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
+        _Profile = args.ViewModel().as<Editor::ProfileViewModel>();
         _windowRoot = args.WindowRoot();
         BringIntoViewWhenLoaded(args.ElementToFocus());
 
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.cpp b/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.cpp
index 9cf3ee9d144..ee91d597030 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.cpp
@@ -23,8 +23,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void Profiles_Appearance::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        const auto args = e.Parameter().as<Editor::NavigateToProfileArgs>();
-        _Profile = args.Profile();
+        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
+        _Profile = args.ViewModel().as<Editor::ProfileViewModel>();
         _windowRoot = args.WindowRoot();
 
         const auto elementToFocus = args.ElementToFocus();
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Base.cpp b/src/cascadia/TerminalSettingsEditor/Profiles_Base.cpp
index 5a4fdc65400..cce287ebe55 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Base.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Base.cpp
@@ -30,8 +30,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void Profiles_Base::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        const auto args = e.Parameter().as<Editor::NavigateToProfileArgs>();
-        _Profile = args.Profile();
+        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
+        _Profile = args.ViewModel().as<Editor::ProfileViewModel>();
         _windowRoot = args.WindowRoot();
         BringIntoViewWhenLoaded(args.ElementToFocus());
 
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Base_Orphaned.cpp b/src/cascadia/TerminalSettingsEditor/Profiles_Base_Orphaned.cpp
index dc1de90cb03..560c87655ce 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Base_Orphaned.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Base_Orphaned.cpp
@@ -23,8 +23,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void Profiles_Base_Orphaned::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        const auto args = e.Parameter().as<Editor::NavigateToProfileArgs>();
-        _Profile = args.Profile();
+        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
+        _Profile = args.ViewModel().as<Editor::ProfileViewModel>();
 
         _layoutUpdatedRevoker = LayoutUpdated(winrt::auto_revoke, [this](auto /*s*/, auto /*e*/) {
             // This event fires every time the layout changes, but it is always the last one to fire
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Terminal.cpp b/src/cascadia/TerminalSettingsEditor/Profiles_Terminal.cpp
index 467945b65a8..24415f2eba5 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Terminal.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Terminal.cpp
@@ -21,8 +21,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void Profiles_Terminal::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        const auto args = e.Parameter().as<Editor::NavigateToProfileArgs>();
-        _Profile = args.Profile();
+        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
+        _Profile = args.ViewModel().as<Editor::ProfileViewModel>();
         BringIntoViewWhenLoaded(args.ElementToFocus());
 
         TraceLoggingWrite(
diff --git a/src/cascadia/TerminalSettingsEditor/Rendering.cpp b/src/cascadia/TerminalSettingsEditor/Rendering.cpp
index f7271534e79..86b56f10597 100644
--- a/src/cascadia/TerminalSettingsEditor/Rendering.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Rendering.cpp
@@ -3,6 +3,7 @@
 
 #include "pch.h"
 #include "Rendering.h"
+#include "NavigateToPageArgs.g.h"
 #include "Rendering.g.cpp"
 
 using namespace winrt::Windows::UI::Xaml::Navigation;
@@ -16,8 +17,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void Rendering::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        const auto args = e.Parameter().as<Editor::NavigateToRenderingArgs>();
-        _ViewModel = args.ViewModel();
+        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
+        _ViewModel = args.ViewModel().as<Editor::RenderingViewModel>();
         BringIntoViewWhenLoaded(args.ElementToFocus());
 
         TraceLoggingWrite(
diff --git a/src/cascadia/TerminalSettingsEditor/Rendering.h b/src/cascadia/TerminalSettingsEditor/Rendering.h
index bda0034c6bb..dd202b1c7e8 100644
--- a/src/cascadia/TerminalSettingsEditor/Rendering.h
+++ b/src/cascadia/TerminalSettingsEditor/Rendering.h
@@ -4,25 +4,10 @@
 #pragma once
 
 #include "Rendering.g.h"
-#include "NavigateToRenderingArgs.g.h"
 #include "Utils.h"
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
-    struct NavigateToRenderingArgs : NavigateToRenderingArgsT<NavigateToRenderingArgs>
-    {
-        NavigateToRenderingArgs(const Editor::RenderingViewModel& vm, const hstring& elementToFocus = {}) :
-            _ViewModel(vm),
-            _ElementToFocus(elementToFocus) {}
-
-        Editor::RenderingViewModel ViewModel() const noexcept { return _ViewModel; }
-        hstring ElementToFocus() const noexcept { return _ElementToFocus; }
-
-    private:
-        Editor::RenderingViewModel _ViewModel{ nullptr };
-        hstring _ElementToFocus{};
-    };
-
     struct Rendering : public HasScrollViewer<Rendering>, RenderingT<Rendering>
     {
         Rendering();
diff --git a/src/cascadia/TerminalSettingsEditor/Rendering.idl b/src/cascadia/TerminalSettingsEditor/Rendering.idl
index 3b59b6de6f5..21dc7d8023f 100644
--- a/src/cascadia/TerminalSettingsEditor/Rendering.idl
+++ b/src/cascadia/TerminalSettingsEditor/Rendering.idl
@@ -5,12 +5,6 @@ import "RenderingViewModel.idl";
 
 namespace Microsoft.Terminal.Settings.Editor
 {
-    runtimeclass NavigateToRenderingArgs
-    {
-        RenderingViewModel ViewModel { get; };
-        String ElementToFocus { get; };
-    }
-
     [default_interface] runtimeclass Rendering : Windows.UI.Xaml.Controls.Page
     {
         Rendering();

From a4c69cfc6a03c2e73f150e3568bafc024f9880b0 Mon Sep 17 00:00:00 2001
From: Carlos Zamora <cazamor@microsoft.com>
Date: Mon, 17 Nov 2025 17:35:45 -0800
Subject: [PATCH 23/25] clean up some TODOs

---
 tools/GenerateSettingsIndex.ps1 | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/tools/GenerateSettingsIndex.ps1 b/tools/GenerateSettingsIndex.ps1
index 676af87e415..8a83f4b5c00 100644
--- a/tools/GenerateSettingsIndex.ps1
+++ b/tools/GenerateSettingsIndex.ps1
@@ -12,9 +12,8 @@ Directory to place generated C++ files.
 #>
 [CmdletBinding()]
 param(
-    # TODO CARLOS: set mandatory to true and remove default params
-    [Parameter(Mandatory=$false)][string]$SourceDir='D:\projects\terminal\src\cascadia\TerminalSettingsEditor\',
-    [Parameter(Mandatory=$false)][string]$OutputDir='D:\projects\terminal\src\cascadia\TerminalSettingsEditor\Generated Files\'
+    [Parameter(Mandatory=$false)][string]$SourceDir,
+    [Parameter(Mandatory=$false)][string]$OutputDir
 )
 
 # Prohibited UIDs (exact match, case-insensitive by default)
@@ -32,7 +31,8 @@ $ProhibitedXamlFiles = @(
     'CommonResources.xaml',
     'KeyChordListener.xaml',
     'NullableColorPicker.xaml',
-    'SettingContainerStyle.xaml'
+    'SettingContainerStyle.xaml',
+    'AISettings.xaml'
 )
 
 if (-not (Test-Path $SourceDir)) { throw "SourceDir not found: $SourceDir" }
@@ -378,13 +378,6 @@ Get-ChildItem -Path $SourceDir -Recurse -Filter *.xaml | ForEach-Object {
         {
             # populate with color scheme name at runtime
             $navigationParam = 'nullptr'
-
-            # TODO CARLOS: Not sure if I need this. Turns out the issue is that EditColorScheme doesn't have a BringIntoViewWhenLoaded()!
-            if ($uid -match 'ColorScheme_SetAsDefault')
-            {
-                # SetAsDefault should focus SetAsDefaultButton, not wrapping SetAsDefaultContainer
-                $name = 'SetAsDefaultButton'
-            }
         }
         elseif ($pageClass -match 'Editor::GlobalAppearance')
         {
@@ -442,11 +435,6 @@ foreach ($e in $entries)
          $e.ParentPage -match 'Profiles_Terminal' -or
          $e.ParentPage -match 'Profiles_Advanced'))
     {
-        # TODO CARLOS: needs special ElementToFocus (maybe I should be adding it earlier so that this works on Profiles.Defaults too)
-        # if ($e.File -eq 'Appearances.xaml')
-        # {
-        #     
-        # }
         $profileEntries += $formattedEntry
     }
     elseif ($e.SubPage -eq 'BreadcrumbSubPage::ColorSchemes_Edit')

From 20bdc21c79a298c1f3aa61a58496cc4ad6be4932 Mon Sep 17 00:00:00 2001
From: Carlos Zamora <cazamor@microsoft.com>
Date: Mon, 17 Nov 2025 17:42:43 -0800
Subject: [PATCH 24/25] clean up more TODOs

---
 src/cascadia/TerminalSettingsEditor/MainPage.cpp | 5 ++---
 src/cascadia/TerminalSettingsEditor/Utils.h      | 2 --
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
index efcf1f6fb9e..8b67cd63885 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
@@ -212,8 +212,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             else if (const auto stringNavArg = navigationArg.try_as<hstring>())
             {
                 // The hstring navArg can be...
-                // - a color scheme name
-                // - an hstring tag (all defined at the top of the file)
+                // - color scheme name
+                // - hstring tag (all defined at the top of the file)
                 // Regardless, we'll use the font icon used by the navigation view item
                 WUX::Controls::FontIcon icon{};
                 icon.FontFamily(Media::FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" });
@@ -1439,7 +1439,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             filteredIndex.clear();
             for (const auto& entry : searchIndex)
             {
-                // TODO CARLOS: replace with fuzzy search
                 // Check for a match with DisplayText (i.e. "Globals_DefaultProfile/Header") and HelpText (i.e. "Globals_DefaultProfile/HelpText")
                 // in language neutral and current language
                 if (til::contains_linguistic_insensitive(entry.Entry->DisplayTextLocalized, queryText) ||
diff --git a/src/cascadia/TerminalSettingsEditor/Utils.h b/src/cascadia/TerminalSettingsEditor/Utils.h
index 64fdb343565..d4d8ac2914e 100644
--- a/src/cascadia/TerminalSettingsEditor/Utils.h
+++ b/src/cascadia/TerminalSettingsEditor/Utils.h
@@ -137,8 +137,6 @@ struct HasScrollViewer
                     // or else the call to StartBringIntoView()
                     // will end up doing nothing
                     controlToFocus.StartBringIntoView();
-
-                    // TODO CARLOS: ensure this works in all scenarios (easiest to test when navigating to page by keyboard)
                     controlToFocus.Focus(winrt::Windows::UI::Xaml::FocusState::Programmatic);
                 }
                 page->_loadedRevoker.revoke();

From 6d968b54f3ee49948535f2740a3acb5cc2b94ee8 Mon Sep 17 00:00:00 2001
From: Carlos Zamora <cazamor@microsoft.com>
Date: Mon, 24 Nov 2025 16:19:22 -0800
Subject: [PATCH 25/25] remove TODO CARLOS

---
 src/cascadia/TerminalSettingsEditor/MainPage.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
index 8b67cd63885..35b21eaa923 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
@@ -1329,7 +1329,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     safe_void_coroutine MainPage::SettingsSearchBox_TextChanged(const AutoSuggestBox& sender, const AutoSuggestBoxTextChangedEventArgs& args)
     {
-        // TODO CARLOS: debug this function. May still need debounce?
         if (args.Reason() != AutoSuggestionBoxTextChangeReason::UserInput)
         {
             // Only respond to user input, not programmatic text changes
@@ -1366,8 +1365,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         co_await winrt::resume_foreground(Dispatcher());
         if (searchGeneration != _filteredSearchIndex.generation())
         {
-            // TODO CARLOS: look into til::throttled_func (winrt version and non-winrt version) for debounce (used in BellSound and TaskbarProgressUpdates)
-            // search index was updated while we were searching, discard results
             co_return;
         }