From e748699fdb6e099e5fee824da96e58b28e861d2f Mon Sep 17 00:00:00 2001
From: htcfreek <61519853+htcfreek@users.noreply.github.com>
Date: Sun, 7 Jul 2024 12:00:28 +0200
Subject: [PATCH 01/24] changes part 1

---
 .../SettingsXAML/Views/AdvancedPaste.xaml            | 12 +++++++++---
 .../SettingsXAML/Views/AlwaysOnTopPage.xaml          |  4 +++-
 .../Settings.UI/SettingsXAML/Views/AwakePage.xaml    |  4 +++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPaste.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPaste.xaml
index 638bd8588ee2..31ef70276b2f 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPaste.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPaste.xaml
@@ -42,7 +42,9 @@
                         IsClosable="False"
                         IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
                         IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                        Severity="Informational" />
+                        Severity="Informational">
+                        <InfoBar IconSource="{ui:FontIconSource Glyph=&#xE72E;}" />
+                    </InfoBar>
 
                     <controls:SettingsGroup x:Uid="AdvancedPaste_EnableAISettingsGroup" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
                         <tkcontrols:SettingsCard x:Uid="AdvancedPaste_EnableAISettingsCard" IsEnabled="{x:Bind ViewModel.IsOnlineAIModelsDisallowedByGPO, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
@@ -78,7 +80,9 @@
                             IsClosable="False"
                             IsOpen="{x:Bind ViewModel.ShowOnlineAIModelsGpoConfiguredInfoBar, Mode=OneWay}"
                             IsTabStop="{x:Bind ViewModel.ShowOnlineAIModelsGpoConfiguredInfoBar, Mode=OneWay}"
-                            Severity="Informational" />
+                            Severity="Informational">
+                            <InfoBar IconSource="{ui:FontIconSource Glyph=&#xE72E;}" />
+                        </InfoBar>
                     </controls:SettingsGroup>
 
                     <controls:SettingsGroup x:Uid="AdvancedPaste_BehaviorSettingsGroup" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
@@ -93,7 +97,9 @@
                             IsClosable="False"
                             IsOpen="{x:Bind ViewModel.ShowClipboardHistoryIsGpoConfiguredInfoBar, Mode=OneWay}"
                             IsTabStop="{x:Bind ViewModel.ShowClipboardHistoryIsGpoConfiguredInfoBar, Mode=OneWay}"
-                            Severity="Informational" />
+                            Severity="Informational">
+                            <InfoBar IconSource="{ui:FontIconSource Glyph=&#xE72E;}" />
+                        </InfoBar>
                         <tkcontrols:SettingsCard x:Uid="AdvancedPaste_CloseAfterLosingFocus" HeaderIcon="{ui:FontIcon Glyph=&#xED1A;}">
                             <ToggleSwitch IsOn="{x:Bind ViewModel.CloseAfterLosingFocus, Mode=TwoWay}" />
                         </tkcontrols:SettingsCard>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/AlwaysOnTopPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/AlwaysOnTopPage.xaml
index aead2cb5ebfb..265b033e3c6a 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/AlwaysOnTopPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/AlwaysOnTopPage.xaml
@@ -27,7 +27,9 @@
                     IsClosable="False"
                     IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
                     IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational" />
+                    Severity="Informational">
+                    <InfoBar IconSource="{ui:FontIconSource Glyph=&#xE72E;}" />
+                </InfoBar>
                 <controls:SettingsGroup x:Uid="AlwaysOnTop_Activation_GroupSettings" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
 
                     <tkcontrols:SettingsExpander
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml
index e855cc6c9663..d239f6750bf9 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml
@@ -34,7 +34,9 @@
                     IsClosable="False"
                     IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
                     IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational" />
+                    Severity="Informational">
+                    <InfoBar IconSource="{ui:FontIconSource Glyph=&#xE72E;}" />
+                </InfoBar>
 
                 <controls:SettingsGroup x:Uid="Awake_BehaviorSettingsGroup" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
 

From bfa54091666a3fa65bac4ba703b73372aa5f67c5 Mon Sep 17 00:00:00 2001
From: htcfreek <61519853+htcfreek@users.noreply.github.com>
Date: Sun, 7 Jul 2024 12:30:53 +0200
Subject: [PATCH 02/24] fix xaml code

---
 .../SettingsXAML/Views/AdvancedPaste.xaml            | 12 +++++++++---
 .../SettingsXAML/Views/AlwaysOnTopPage.xaml          |  4 +++-
 .../Settings.UI/SettingsXAML/Views/AwakePage.xaml    |  4 +++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPaste.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPaste.xaml
index 31ef70276b2f..b0a7727aa300 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPaste.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPaste.xaml
@@ -43,7 +43,9 @@
                         IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
                         IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
                         Severity="Informational">
-                        <InfoBar IconSource="{ui:FontIconSource Glyph=&#xE72E;}" />
+                        <InfoBar.IconSource>
+                            <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                        </InfoBar.IconSource>
                     </InfoBar>
 
                     <controls:SettingsGroup x:Uid="AdvancedPaste_EnableAISettingsGroup" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
@@ -81,7 +83,9 @@
                             IsOpen="{x:Bind ViewModel.ShowOnlineAIModelsGpoConfiguredInfoBar, Mode=OneWay}"
                             IsTabStop="{x:Bind ViewModel.ShowOnlineAIModelsGpoConfiguredInfoBar, Mode=OneWay}"
                             Severity="Informational">
-                            <InfoBar IconSource="{ui:FontIconSource Glyph=&#xE72E;}" />
+                            <InfoBar.IconSource>
+                                <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                            </InfoBar.IconSource>
                         </InfoBar>
                     </controls:SettingsGroup>
 
@@ -98,7 +102,9 @@
                             IsOpen="{x:Bind ViewModel.ShowClipboardHistoryIsGpoConfiguredInfoBar, Mode=OneWay}"
                             IsTabStop="{x:Bind ViewModel.ShowClipboardHistoryIsGpoConfiguredInfoBar, Mode=OneWay}"
                             Severity="Informational">
-                            <InfoBar IconSource="{ui:FontIconSource Glyph=&#xE72E;}" />
+                            <InfoBar.IconSource>
+                                <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                            </InfoBar.IconSource>
                         </InfoBar>
                         <tkcontrols:SettingsCard x:Uid="AdvancedPaste_CloseAfterLosingFocus" HeaderIcon="{ui:FontIcon Glyph=&#xED1A;}">
                             <ToggleSwitch IsOn="{x:Bind ViewModel.CloseAfterLosingFocus, Mode=TwoWay}" />
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/AlwaysOnTopPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/AlwaysOnTopPage.xaml
index 265b033e3c6a..66cf570af055 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/AlwaysOnTopPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/AlwaysOnTopPage.xaml
@@ -28,7 +28,9 @@
                     IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
                     IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
                     Severity="Informational">
-                    <InfoBar IconSource="{ui:FontIconSource Glyph=&#xE72E;}" />
+                    <InfoBar.IconSource>
+                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                    </InfoBar.IconSource>
                 </InfoBar>
                 <controls:SettingsGroup x:Uid="AlwaysOnTop_Activation_GroupSettings" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml
index d239f6750bf9..c16b52606703 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml
@@ -35,7 +35,9 @@
                     IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
                     IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
                     Severity="Informational">
-                    <InfoBar IconSource="{ui:FontIconSource Glyph=&#xE72E;}" />
+                    <InfoBar.IconSource>
+                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                    </InfoBar.IconSource>
                 </InfoBar>
 
                 <controls:SettingsGroup x:Uid="Awake_BehaviorSettingsGroup" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">

From 1565cdcde4f54f65d4c39a15ae153b91b06a7478 Mon Sep 17 00:00:00 2001
From: htcfreek <61519853+htcfreek@users.noreply.github.com>
Date: Sun, 7 Jul 2024 12:40:35 +0200
Subject: [PATCH 03/24] changes part 2

---
 .../SettingsXAML/Views/CmdNotFoundPage.xaml          |  6 +++++-
 .../SettingsXAML/Views/ColorPickerPage.xaml          |  6 +++++-
 .../SettingsXAML/Views/CropAndLockPage.xaml          |  6 +++++-
 .../SettingsXAML/Views/EnvironmentVariablesPage.xaml |  6 +++++-
 .../SettingsXAML/Views/FancyZonesPage.xaml           |  6 +++++-
 .../SettingsXAML/Views/FileLocksmithPage.xaml        |  6 +++++-
 .../Settings.UI/SettingsXAML/Views/GeneralPage.xaml  | 12 ++++++++++--
 7 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdNotFoundPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdNotFoundPage.xaml
index 649d30622617..c73f4b60ca3f 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdNotFoundPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdNotFoundPage.xaml
@@ -25,7 +25,11 @@
                     IsClosable="False"
                     IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
                     IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational" />
+                    Severity="Informational">
+                    <InfoBar.IconSource>
+                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                    </InfoBar.IconSource>
+                </InfoBar>
 
                 <tkcontrols:SettingsExpander
                     x:Uid="CmdNotFound_Enable"
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml
index 5762d03064ef..4d036a517a90 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml
@@ -37,7 +37,11 @@
                     IsClosable="False"
                     IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
                     IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational" />
+                    Severity="Informational">
+                    <InfoBar.IconSource>
+                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                    </InfoBar.IconSource>
+                </InfoBar>
 
                 <controls:SettingsGroup x:Uid="Shortcut" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
                     <tkcontrols:SettingsCard x:Uid="Activation_Shortcut" HeaderIcon="{ui:FontIcon Glyph=&#xEDA7;}">
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/CropAndLockPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/CropAndLockPage.xaml
index 1a3ceab5338f..ae1464948041 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/CropAndLockPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/CropAndLockPage.xaml
@@ -27,7 +27,11 @@
                     IsClosable="False"
                     IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
                     IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational" />
+                    Severity="Informational">
+                    <InfoBar.IconSource>
+                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                    </InfoBar.IconSource>
+                </InfoBar>
                 <controls:SettingsGroup x:Uid="CropAndLock_Activation_GroupSettings" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
 
                     <tkcontrols:SettingsCard x:Uid="CropAndLock_ThumbnailActivation_Shortcut" HeaderIcon="{ui:FontIcon Glyph=&#xEDA7;}">
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/EnvironmentVariablesPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/EnvironmentVariablesPage.xaml
index 3dc0b6bfcbce..595710c0c4a1 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/EnvironmentVariablesPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/EnvironmentVariablesPage.xaml
@@ -23,7 +23,11 @@
                     IsClosable="False"
                     IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
                     IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational" />
+                    Severity="Informational">
+                    <InfoBar.IconSource>
+                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                    </InfoBar.IconSource>
+                </InfoBar>
                 <controls:SettingsGroup x:Uid="EnvironmentVariables_Activation_GroupSettings" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
                     <tkcontrols:SettingsCard
                         x:Uid="EnvironmentVariables_LaunchButtonControl"
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml
index 8ae51a321bc9..0e178a93d006 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml
@@ -24,7 +24,11 @@
                     IsClosable="False"
                     IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
                     IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational" />
+                    Severity="Informational">
+                    <InfoBar.IconSource>
+                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                    </InfoBar.IconSource>
+                </InfoBar>
 
                 <controls:SettingsGroup x:Uid="FancyZones_Editor_GroupSettings" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
                     <tkcontrols:SettingsCard
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/FileLocksmithPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/FileLocksmithPage.xaml
index 04bdd7976a76..033337dc01cf 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/FileLocksmithPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/FileLocksmithPage.xaml
@@ -25,7 +25,11 @@
                     IsClosable="False"
                     IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
                     IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational" />
+                    Severity="Informational">
+                    <InfoBar.IconSource>
+                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                    </InfoBar.IconSource>
+                </InfoBar>
 
                 <controls:SettingsGroup x:Uid="FileLocksmith_ShellIntegration" IsEnabled="{x:Bind ViewModel.IsFileLocksmithEnabled, Mode=OneWay}">
                     <tkcontrols:SettingsCard x:Uid="FileLocksmith_Toggle_ContextMenu">
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
index 4ffa0bf4a999..84be74105b85 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
@@ -63,7 +63,11 @@
                                 IsClosable="False"
                                 IsOpen="{x:Bind ViewModel.SomeUpdateSettingsAreGpoManaged, Mode=OneWay}"
                                 IsTabStop="{x:Bind ViewModel.SomeUpdateSettingsAreGpoManaged, Mode=OneWay}"
-                                Severity="Informational" />
+                                Severity="Informational">
+                                <InfoBar.IconSource>
+                                    <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                                </InfoBar.IconSource>
+                            </InfoBar>
                         </tkcontrols:SettingsExpander.ItemsHeader>
                         <tkcontrols:SettingsExpander.Items>
                             <tkcontrols:SettingsCard
@@ -359,7 +363,11 @@
                         IsClosable="False"
                         IsOpen="{x:Bind ViewModel.IsExperimentationGpoDisallowed, Mode=OneWay}"
                         IsTabStop="{x:Bind ViewModel.IsExperimentationGpoDisallowed, Mode=OneWay}"
-                        Severity="Informational" />
+                        Severity="Informational">
+                        <InfoBar.IconSource>
+                            <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                        </InfoBar.IconSource>
+                    </InfoBar>
                 </controls:SettingsGroup>
             </StackPanel>
 

From 00b56fcc47426450b1d0d6e173702a1fe220ad32 Mon Sep 17 00:00:00 2001
From: htcfreek <61519853+htcfreek@users.noreply.github.com>
Date: Sun, 7 Jul 2024 13:18:10 +0200
Subject: [PATCH 04/24] fix cmdNotFound page

---
 .../SettingsXAML/Views/CmdNotFoundPage.xaml   | 34 ++++++++++++++-----
 .../Settings.UI/Strings/en-us/Resources.resw  |  6 ++++
 .../ViewModels/CmdNotFoundViewModel.cs        | 19 ++++++-----
 3 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdNotFoundPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdNotFoundPage.xaml
index c73f4b60ca3f..5c4a09a9c47f 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdNotFoundPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdNotFoundPage.xaml
@@ -21,10 +21,20 @@
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
                 <InfoBar
-                    x:Uid="GPO_SettingIsManaged"
+                    x:Uid="GPO_CommandNotFound_ForceEnabled"
                     IsClosable="False"
-                    IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
+                    IsOpen="{x:Bind ViewModel.IsModuleGpoEnabled, Mode=OneWay}"
+                    IsTabStop="{x:Bind ViewModel.IsModuleGpoEnabled, Mode=OneWay}"
+                    Severity="Informational">
+                    <InfoBar.IconSource>
+                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                    </InfoBar.IconSource>
+                </InfoBar>
+                <InfoBar
+                    x:Uid="GPO_CommandNotFound_ForceDisabled"
+                    IsClosable="False"
+                    IsOpen="{x:Bind ViewModel.IsModuleGpoDisabled, Mode=OneWay}"
+                    IsTabStop="{x:Bind ViewModel.IsModuleGpoDisabled, Mode=OneWay}"
                     Severity="Informational">
                     <InfoBar.IconSource>
                         <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
@@ -34,7 +44,6 @@
                 <tkcontrols:SettingsExpander
                     x:Uid="CmdNotFound_Enable"
                     HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/CommandNotFound.png}"
-                    IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}"
                     IsExpanded="True">
                     <tkcontrols:SwitchPresenter TargetType="x:Boolean" Value="{x:Bind ViewModel.IsCommandNotFoundModuleInstalled, Mode=OneWay}">
                         <tkcontrols:Case Value="True">
@@ -49,13 +58,17 @@
                                     AutomationProperties.AccessibilityView="Raw"
                                     Foreground="{ThemeResource SystemFillColorSuccessBrush}"
                                     Glyph="&#xEC61;" />
-                                <HyperlinkButton x:Uid="CmdNotFound_UninstallButton" Command="{x:Bind ViewModel.UninstallModuleEventHandler}" />
+                                <HyperlinkButton
+                                    x:Uid="CmdNotFound_UninstallButton"
+                                    Command="{x:Bind ViewModel.UninstallModuleEventHandler}"
+                                    IsEnabled="{x:Bind ViewModel.IsModuleGpoEnabled, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}" />
                             </StackPanel>
                         </tkcontrols:Case>
                         <tkcontrols:Case Value="False">
                             <Button
                                 x:Uid="CmdNotFound_InstallButton"
                                 Command="{x:Bind ViewModel.InstallModuleEventHandler}"
+                                IsEnabled="{x:Bind ViewModel.IsModuleGpoDisabled, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}"
                                 Style="{StaticResource AccentButtonStyle}" />
                         </tkcontrols:Case>
                     </tkcontrols:SwitchPresenter>
@@ -102,7 +115,10 @@
                                             AutomationProperties.AccessibilityView="Raw"
                                             Foreground="{ThemeResource SystemFillColorCriticalBrush}"
                                             Glyph="&#xEB90;" />
-                                        <Button x:Uid="CmdNotFound_InstallButton" Command="{x:Bind ViewModel.InstallPowerShell7EventHandler}" />
+                                        <Button
+                                            x:Uid="CmdNotFound_InstallButton"
+                                            Command="{x:Bind ViewModel.InstallPowerShell7EventHandler}"
+                                            IsEnabled="{x:Bind ViewModel.IsModuleGpoDisabled, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}" />
                                     </StackPanel>
                                 </tkcontrols:Case>
                             </tkcontrols:SwitchPresenter>
@@ -132,7 +148,10 @@
                                             AutomationProperties.AccessibilityView="Raw"
                                             Foreground="{ThemeResource SystemFillColorCriticalBrush}"
                                             Glyph="&#xEB90;" />
-                                        <Button x:Uid="CmdNotFound_InstallButton" Command="{x:Bind ViewModel.InstallWinGetClientModuleEventHandler}" />
+                                        <Button
+                                            x:Uid="CmdNotFound_InstallButton"
+                                            Command="{x:Bind ViewModel.InstallWinGetClientModuleEventHandler}"
+                                            IsEnabled="{x:Bind ViewModel.IsModuleGpoDisabled, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}" />
                                     </StackPanel>
                                 </tkcontrols:Case>
                             </tkcontrols:SwitchPresenter>
@@ -146,7 +165,6 @@
                 <TextBox
                     Height="300"
                     FontFamily="Consolas"
-                    IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}"
                     IsReadOnly="True"
                     Text="{x:Bind ViewModel.CommandOutputLog, Mode=OneWay}"
                     TextWrapping="Wrap" />
diff --git a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
index 7dc0ae28adb0..4454303274c4 100644
--- a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
+++ b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
@@ -4196,4 +4196,10 @@ Activate by holding the key for the character you want to add an accent to, then
     <value>Automatically close the AdvancedPaste window after it loses focus</value>
     <comment>AdvancedPaste is a product name, do not loc</comment>
   </data>
+  <data name="GPO_CommandNotFound_ForceDisabled.Title" xml:space="preserve">
+    <value>The Command Not Found module is force disabled by your organization.</value>
+  </data>
+  <data name="GPO_CommandNotFound_ForceEnabled.Title" xml:space="preserve">
+    <value>The Command Not Found module is force enabled by your organization.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/settings-ui/Settings.UI/ViewModels/CmdNotFoundViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/CmdNotFoundViewModel.cs
index 458ed443d636..10ed6f89b206 100644
--- a/src/settings-ui/Settings.UI/ViewModels/CmdNotFoundViewModel.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/CmdNotFoundViewModel.cs
@@ -31,7 +31,8 @@ public class CmdNotFoundViewModel : Observable
         public ButtonClickCommand UninstallModuleEventHandler => new ButtonClickCommand(UninstallModule);
 
         private GpoRuleConfigured _enabledGpoRuleConfiguration;
-        private bool _enabledStateIsGPOConfigured;
+        private bool _moduleIsGpoEnabled;
+        private bool _moduleIsGpoDisabled;
 
         public static string AssemblyDirectory
         {
@@ -52,11 +53,8 @@ public CmdNotFoundViewModel()
         private void InitializeEnabledValue()
         {
             _enabledGpoRuleConfiguration = GPOWrapper.GetConfiguredCmdNotFoundEnabledValue();
-            if (_enabledGpoRuleConfiguration == GpoRuleConfigured.Disabled || _enabledGpoRuleConfiguration == GpoRuleConfigured.Enabled)
-            {
-                // Get the enabled state from GPO.
-                _enabledStateIsGPOConfigured = true;
-            }
+            _moduleIsGpoEnabled = _enabledGpoRuleConfiguration == GpoRuleConfigured.Enabled;
+            _moduleIsGpoDisabled = _enabledGpoRuleConfiguration == GpoRuleConfigured.Disabled;
 
             // Update PATH environment variable to get pwsh.exe on further calls.
             Environment.SetEnvironmentVariable("PATH", (Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.Machine) ?? string.Empty) + ";" + (Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.User) ?? string.Empty), EnvironmentVariableTarget.Process);
@@ -127,9 +125,14 @@ public bool IsCommandNotFoundModuleInstalled
             }
         }
 
-        public bool IsEnabledGpoConfigured
+        public bool IsModuleGpoEnabled
+        {
+            get => _moduleIsGpoEnabled;
+        }
+
+        public bool IsModuleGpoDisabled
         {
-            get => _enabledStateIsGPOConfigured;
+            get => _moduleIsGpoDisabled;
         }
 
         public string RunPowerShellOrPreviewScript(string powershellExecutable, string powershellArguments, bool hidePowerShellWindow = false)

From 01ce77ac77d801e76a6ee8689865c9ace446bdf1 Mon Sep 17 00:00:00 2001
From: htcfreek <61519853+htcfreek@users.noreply.github.com>
Date: Sun, 7 Jul 2024 13:55:21 +0200
Subject: [PATCH 05/24] Update PowerOcrPage

---
 .../SettingsXAML/Views/PowerOcrPage.xaml      | 19 ++++++++++++-------
 .../ViewModels/PowerOcrViewModel.cs           |  6 ++++++
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml
index 5d170cdb91e5..3068fc74c8ef 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml
@@ -16,24 +16,29 @@
                 ChildrenTransitions="{StaticResource SettingsCardsAnimations}"
                 Orientation="Vertical"
                 Spacing="2">
-                <tkcontrols:SettingsCard
-                    x:Uid="TextExtractor_EnableToggleControl_HeaderText"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/TextExtractor.png}"
-                    IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                    <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
-                </tkcontrols:SettingsCard>
                 <InfoBar
                     x:Uid="TextExtractor_UseSnippingToolWarning"
+                    Margin="{x:Bind ViewModel.SnippingToolInfoBarMargin, Mode=OneWay}"
                     IsClosable="False"
                     IsOpen="{x:Bind ViewModel.IsWin11OrGreater, Mode=OneWay}"
                     IsTabStop="{x:Bind ViewModel.IsWin11OrGreater, Mode=OneWay}"
                     Severity="Informational" />
+                <tkcontrols:SettingsCard
+                    x:Uid="TextExtractor_EnableToggleControl_HeaderText"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/TextExtractor.png}"
+                    IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
+                    <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
+                </tkcontrols:SettingsCard>
                 <InfoBar
                     x:Uid="GPO_SettingIsManaged"
                     IsClosable="False"
                     IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
                     IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational" />
+                    Severity="Informational">
+                    <InfoBar.IconSource>
+                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                    </InfoBar.IconSource>
+                </InfoBar>
                 <InfoBar
                     x:Uid="TextExtractor_SupportedLanguages"
                     IsClosable="False"
diff --git a/src/settings-ui/Settings.UI/ViewModels/PowerOcrViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/PowerOcrViewModel.cs
index a52924860bb5..a125144baea4 100644
--- a/src/settings-ui/Settings.UI/ViewModels/PowerOcrViewModel.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/PowerOcrViewModel.cs
@@ -263,5 +263,11 @@ public void Dispose()
             Dispose(disposing: true);
             GC.SuppressFinalize(this);
         }
+
+        public string SnippingToolInfoBarMargin
+        {
+            // Workaround for wrong StackPanel behavior: On hidden controls the margin is still reserverd.
+            get => IsWin11OrGreater ? "0,0,0,25" : "0,0,0,0";
+        }
     }
 }

From 4822042707441965f14c160fe82a661d7350f185 Mon Sep 17 00:00:00 2001
From: htcfreek <61519853+htcfreek@users.noreply.github.com>
Date: Sun, 7 Jul 2024 13:55:34 +0200
Subject: [PATCH 06/24] More Pages changed

---
 .../SettingsXAML/Views/HostsPage.xaml         |  6 ++++-
 .../SettingsXAML/Views/ImageResizerPage.xaml  |  6 ++++-
 .../Views/KeyboardManagerPage.xaml            |  6 ++++-
 .../SettingsXAML/Views/MeasureToolPage.xaml   |  6 ++++-
 .../SettingsXAML/Views/MouseUtilsPage.xaml    | 24 +++++++++++++++----
 .../SettingsXAML/Views/PeekPage.xaml          |  6 ++++-
 .../SettingsXAML/Views/PowerAccentPage.xaml   |  6 ++++-
 .../SettingsXAML/Views/PowerLauncherPage.xaml | 12 ++++++++--
 8 files changed, 60 insertions(+), 12 deletions(-)

diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml
index 2dcc2cbca443..2d0a6d0c2d0c 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml
@@ -23,7 +23,11 @@
                     IsClosable="False"
                     IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
                     IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational" />
+                    Severity="Informational">
+                    <InfoBar.IconSource>
+                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                    </InfoBar.IconSource>
+                </InfoBar>
                 <controls:SettingsGroup x:Uid="Hosts_Activation_GroupSettings" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
                     <tkcontrols:SettingsCard
                         x:Uid="Hosts_LaunchButtonControl"
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml
index e7d4b55f6fa5..4aa4a024ffbc 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml
@@ -36,7 +36,11 @@
                     IsClosable="False"
                     IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
                     IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational" />
+                    Severity="Informational">
+                    <InfoBar.IconSource>
+                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                    </InfoBar.IconSource>
+                </InfoBar>
 
                 <controls:SettingsGroup x:Uid="ImageResizer_CustomSizes" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
                     <tkcontrols:SettingsCard x:Uid="ImageResizer_Presets" HeaderIcon="{ui:FontIcon Glyph=&#xE792;}">
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml
index 02624ca9f067..f6e7a3fddb2c 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml
@@ -70,7 +70,11 @@
                     IsClosable="False"
                     IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
                     IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational" />
+                    Severity="Informational">
+                    <InfoBar.IconSource>
+                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                    </InfoBar.IconSource>
+                </InfoBar>
 
                 <controls:SettingsGroup x:Uid="KeyboardManager_Keys" IsEnabled="{x:Bind ViewModel.Enabled, Mode=OneWay}">
                     <tkcontrols:SettingsCard
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/MeasureToolPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/MeasureToolPage.xaml
index cc67246a2d5b..881e6ea32671 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MeasureToolPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/MeasureToolPage.xaml
@@ -24,7 +24,11 @@
                     IsClosable="False"
                     IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
                     IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational" />
+                    Severity="Informational">
+                    <InfoBar.IconSource>
+                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                    </InfoBar.IconSource>
+                </InfoBar>
                 <controls:SettingsGroup x:Uid="MeasureTool_ActivationSettings" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
                     <tkcontrols:SettingsCard x:Uid="MeasureTool_ActivationShortcut" HeaderIcon="{ui:FontIcon Glyph=&#xEDA7;}">
                         <controls:ShortcutControl MinWidth="{StaticResource SettingActionControlMinWidth}" HotkeySettings="{x:Bind Path=ViewModel.ActivationShortcut, Mode=TwoWay}" />
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml
index 5dcec727c749..7421a083d820 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml
@@ -33,7 +33,11 @@
                         IsClosable="False"
                         IsOpen="{x:Bind ViewModel.IsFindMyMouseEnabledGpoConfigured, Mode=OneWay}"
                         IsTabStop="{x:Bind ViewModel.IsFindMyMouseEnabledGpoConfigured, Mode=OneWay}"
-                        Severity="Informational" />
+                        Severity="Informational">
+                        <InfoBar.IconSource>
+                            <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                        </InfoBar.IconSource>
+                    </InfoBar>
                     <tkcontrols:SettingsExpander
                         x:Uid="MouseUtils_FindMyMouse_ActivationMethod"
                         HeaderIcon="{ui:FontIcon Glyph=&#xE961;}"
@@ -183,7 +187,11 @@
                         IsClosable="False"
                         IsOpen="{x:Bind ViewModel.IsHighlighterEnabledGpoConfigured, Mode=OneWay}"
                         IsTabStop="{x:Bind ViewModel.IsHighlighterEnabledGpoConfigured, Mode=OneWay}"
-                        Severity="Informational" />
+                        Severity="Informational">
+                        <InfoBar.IconSource>
+                            <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                        </InfoBar.IconSource>
+                    </InfoBar>
                     <tkcontrols:SettingsExpander
                         x:Uid="MouseUtils_MouseHighlighter_ActivationShortcut"
                         HeaderIcon="{ui:FontIcon Glyph=&#xEDA7;}"
@@ -253,7 +261,11 @@
                         IsClosable="False"
                         IsOpen="{x:Bind ViewModel.IsJumpEnabledGpoConfigured, Mode=OneWay}"
                         IsTabStop="{x:Bind ViewModel.IsJumpEnabledGpoConfigured, Mode=OneWay}"
-                        Severity="Informational" />
+                        Severity="Informational">
+                        <InfoBar.IconSource>
+                            <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                        </InfoBar.IconSource>
+                    </InfoBar>
                     <tkcontrols:SettingsCard
                         x:Uid="MouseUtils_MouseJump_ActivationShortcut"
                         HeaderIcon="{ui:FontIcon Glyph=&#xEDA7;}"
@@ -349,7 +361,11 @@
                         IsClosable="False"
                         IsOpen="{x:Bind ViewModel.IsMousePointerCrosshairsEnabledGpoConfigured, Mode=OneWay}"
                         IsTabStop="{x:Bind ViewModel.IsMousePointerCrosshairsEnabledGpoConfigured, Mode=OneWay}"
-                        Severity="Informational" />
+                        Severity="Informational">
+                        <InfoBar.IconSource>
+                            <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                        </InfoBar.IconSource>
+                    </InfoBar>
                     <tkcontrols:SettingsExpander
                         x:Uid="MouseUtils_MousePointerCrosshairs_ActivationShortcut"
                         HeaderIcon="{ui:FontIcon Glyph=&#xEDA7;}"
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PeekPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PeekPage.xaml
index 4e6913f0fb86..a652b1848e8a 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PeekPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PeekPage.xaml
@@ -24,7 +24,11 @@
                     IsClosable="False"
                     IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
                     IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational" />
+                    Severity="Informational">
+                    <InfoBar.IconSource>
+                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                    </InfoBar.IconSource>
+                </InfoBar>
 
                 <controls:SettingsGroup x:Uid="Peek_Activation_GroupSettings" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
                     <tkcontrols:SettingsCard x:Uid="Activation_Shortcut" HeaderIcon="{ui:FontIcon Glyph=&#xEDA7;}">
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml
index b57ffc87927f..80557a1b42a9 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml
@@ -28,7 +28,11 @@
                     IsClosable="False"
                     IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
                     IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational" />
+                    Severity="Informational">
+                    <InfoBar.IconSource>
+                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                    </InfoBar.IconSource>
+                </InfoBar>
 
                 <controls:SettingsGroup x:Uid="QuickAccent_Activation_GroupSettings" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
                     <tkcontrols:SettingsExpander
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml
index 1a2c01f6b338..b9181fe9e730 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml
@@ -316,7 +316,11 @@
                     IsClosable="False"
                     IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
                     IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational" />
+                    Severity="Informational">
+                    <InfoBar.IconSource>
+                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                    </InfoBar.IconSource>
+                </InfoBar>
 
                 <controls:SettingsGroup x:Uid="Shortcut" IsEnabled="{x:Bind ViewModel.EnablePowerLauncher, Mode=OneWay}">
                     <tkcontrols:SettingsExpander
@@ -565,7 +569,11 @@
                         IsClosable="False"
                         IsOpen="{x:Bind ViewModel.ShowPluginsAreGpoManagedInfo, Mode=OneWay}"
                         IsTabStop="{x:Bind ViewModel.ShowPluginsAreGpoManagedInfo, Mode=OneWay}"
-                        Severity="Informational" />
+                        Severity="Informational">
+                        <InfoBar.IconSource>
+                            <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                        </InfoBar.IconSource>
+                    </InfoBar>
                     <InfoBar
                         x:Uid="Run_AllPluginsDisabled"
                         IsClosable="False"

From 012820b8cfb9cd7c849455f1d464551a3149200a Mon Sep 17 00:00:00 2001
From: htcfreek <61519853+htcfreek@users.noreply.github.com>
Date: Sun, 7 Jul 2024 14:16:40 +0200
Subject: [PATCH 07/24] More Pages changed

---
 .../SettingsXAML/Views/PowerRenamePage.xaml     |  6 +++++-
 .../SettingsXAML/Views/RegistryPreviewPage.xaml |  6 +++++-
 .../SettingsXAML/Views/ShortcutGuidePage.xaml   |  6 +++++-
 .../SettingsXAML/Views/VideoConference.xaml     | 17 +++++++++++------
 .../Settings.UI/ViewModels/ShellViewModel.cs    |  6 ++++--
 5 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml
index 2cd21b6bed87..7bc51d7a4d28 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml
@@ -27,7 +27,11 @@
                     IsClosable="False"
                     IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
                     IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational" />
+                    Severity="Informational">
+                    <InfoBar.IconSource>
+                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                    </InfoBar.IconSource>
+                </InfoBar>
                 <controls:SettingsGroup x:Uid="PowerRename_ShellIntegration" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
                     <tkcontrols:SettingsExpander x:Uid="PowerRename_Toggle_ContextMenu" IsExpanded="False">
                         <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}" SelectedIndex="{x:Bind ViewModel.EnabledOnContextExtendedMenu, Mode=TwoWay, Converter={StaticResource BoolToComboBoxIndexConverter}}">
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/RegistryPreviewPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/RegistryPreviewPage.xaml
index 3e3dc209f4b1..fb56c8220829 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/RegistryPreviewPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/RegistryPreviewPage.xaml
@@ -25,7 +25,11 @@
                     IsClosable="False"
                     IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
                     IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational" />
+                    Severity="Informational">
+                    <InfoBar.IconSource>
+                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                    </InfoBar.IconSource>
+                </InfoBar>
 
                 <controls:SettingsGroup x:Uid="RegistryPreview_Launch_GroupSettings" IsEnabled="{x:Bind ViewModel.IsRegistryPreviewEnabled, Mode=OneWay}">
                     <tkcontrols:SettingsCard
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml
index 979c9c7bacaa..1189e4870040 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml
@@ -24,7 +24,11 @@
                     IsClosable="False"
                     IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
                     IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational" />
+                    Severity="Informational">
+                    <InfoBar.IconSource>
+                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                    </InfoBar.IconSource>
+                </InfoBar>
                 <controls:SettingsGroup x:Uid="Shortcut" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
                     <tkcontrols:SettingsCard x:Uid="ShortcutGuide_ActivationMethod">
                         <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}" SelectedIndex="{x:Bind ViewModel.UseLegacyPressWinKeyBehavior, Mode=TwoWay, Converter={StaticResource BoolToComboBoxIndexConverter}}">
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/VideoConference.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/VideoConference.xaml
index ad8accb87422..494bbac76439 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/VideoConference.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/VideoConference.xaml
@@ -26,6 +26,7 @@
             <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
                 <InfoBar
                     x:Uid="VideoConference_DeprecationWarning"
+                    Margin="0,0,0,25"
                     IsClosable="False"
                     IsOpen="True"
                     IsTabStop="True"
@@ -45,17 +46,21 @@
                     IsEnabled="{x:Bind ViewModel.IsElevated, Mode=OneWay}">
                     <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
                 </tkcontrols:SettingsCard>
-                <InfoBar
-                    x:Uid="VideoConference_RunAsAdminRequired"
-                    IsClosable="False"
-                    IsOpen="{x:Bind ViewModel.IsElevated, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
-                    IsTabStop="True"
-                    Severity="Informational" />
                 <InfoBar
                     x:Uid="GPO_SettingIsManaged"
                     IsClosable="False"
                     IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
                     IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
+                    Severity="Informational">
+                    <InfoBar.IconSource>
+                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                    </InfoBar.IconSource>
+                </InfoBar>
+                <InfoBar
+                    x:Uid="VideoConference_RunAsAdminRequired"
+                    IsClosable="False"
+                    IsOpen="{x:Bind ViewModel.IsElevated, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
+                    IsTabStop="True"
                     Severity="Informational" />
                 <controls:SettingsGroup x:Uid="VideoConference_Shortcuts" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
                     <tkcontrols:SettingsCard x:Uid="VideoConference_CameraAndMicrophoneMuteHotkeyControl_Header">
diff --git a/src/settings-ui/Settings.UI/ViewModels/ShellViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/ShellViewModel.cs
index b222c4ddf9be..72ef44f36e1c 100644
--- a/src/settings-ui/Settings.UI/ViewModels/ShellViewModel.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/ShellViewModel.cs
@@ -42,14 +42,16 @@ public bool IsVideoConferenceBuild
         {
             get
             {
-                var mfHandle = NativeMethods.LoadLibrary("mf.dll");
+                return true;
+
+                /* var mfHandle = NativeMethods.LoadLibrary("mf.dll");
                 bool mfAvailable = mfHandle != IntPtr.Zero;
                 if (mfAvailable)
                 {
                     NativeMethods.FreeLibrary(mfHandle);
                 }
 
-                return this != null && File.Exists("PowerToys.VideoConferenceModule.dll") && mfAvailable;
+                return this != null && File.Exists("PowerToys.VideoConferenceModule.dll") && mfAvailable; */
             }
         }
 

From 4310cc8dc3c162ef0a8e6b6261ddc490c9899c26 Mon Sep 17 00:00:00 2001
From: htcfreek <61519853+htcfreek@users.noreply.github.com>
Date: Sun, 7 Jul 2024 14:18:27 +0200
Subject: [PATCH 08/24] revert temporary change

---
 src/settings-ui/Settings.UI/ViewModels/ShellViewModel.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/settings-ui/Settings.UI/ViewModels/ShellViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/ShellViewModel.cs
index 72ef44f36e1c..b222c4ddf9be 100644
--- a/src/settings-ui/Settings.UI/ViewModels/ShellViewModel.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/ShellViewModel.cs
@@ -42,16 +42,14 @@ public bool IsVideoConferenceBuild
         {
             get
             {
-                return true;
-
-                /* var mfHandle = NativeMethods.LoadLibrary("mf.dll");
+                var mfHandle = NativeMethods.LoadLibrary("mf.dll");
                 bool mfAvailable = mfHandle != IntPtr.Zero;
                 if (mfAvailable)
                 {
                     NativeMethods.FreeLibrary(mfHandle);
                 }
 
-                return this != null && File.Exists("PowerToys.VideoConferenceModule.dll") && mfAvailable; */
+                return this != null && File.Exists("PowerToys.VideoConferenceModule.dll") && mfAvailable;
             }
         }
 

From feb637b188b19129cd55007541aa84a9e05c0adc Mon Sep 17 00:00:00 2001
From: htcfreek <61519853+htcfreek@users.noreply.github.com>
Date: Sun, 7 Jul 2024 14:33:19 +0200
Subject: [PATCH 09/24] fix spelling

---
 src/settings-ui/Settings.UI/ViewModels/PowerOcrViewModel.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/settings-ui/Settings.UI/ViewModels/PowerOcrViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/PowerOcrViewModel.cs
index a125144baea4..036ec74895ea 100644
--- a/src/settings-ui/Settings.UI/ViewModels/PowerOcrViewModel.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/PowerOcrViewModel.cs
@@ -266,7 +266,7 @@ public void Dispose()
 
         public string SnippingToolInfoBarMargin
         {
-            // Workaround for wrong StackPanel behavior: On hidden controls the margin is still reserverd.
+            // Workaround for wrong StackPanel behavior: On hidden controls the margin is still reserved.
             get => IsWin11OrGreater ? "0,0,0,25" : "0,0,0,0";
         }
     }

From 335c60def8a6f90a2d3b1dde68982feb46b1637a Mon Sep 17 00:00:00 2001
From: Heiko <61519853+htcfreek@users.noreply.github.com>
Date: Sun, 7 Jul 2024 14:36:44 +0200
Subject: [PATCH 10/24] add resw comment

---
 src/settings-ui/Settings.UI/Strings/en-us/Resources.resw | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
index 4454303274c4..a67cc77ee907 100644
--- a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
+++ b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
@@ -4200,6 +4200,7 @@ Activate by holding the key for the character you want to add an accent to, then
     <value>The Command Not Found module is force disabled by your organization.</value>
   </data>
   <data name="GPO_CommandNotFound_ForceEnabled.Title" xml:space="preserve">
-    <value>The Command Not Found module is force enabled by your organization.</value>
+    <value>The Command Not Found module is force enabled by your organization.</value>>
+    <comment>"Command Not Found" is a product name</comment>
   </data>
 </root>
\ No newline at end of file

From cf25a07019bfaa32ab34165a27109b127234e9c5 Mon Sep 17 00:00:00 2001
From: Heiko <61519853+htcfreek@users.noreply.github.com>
Date: Sun, 7 Jul 2024 14:37:01 +0200
Subject: [PATCH 11/24] add resw comment

---
 src/settings-ui/Settings.UI/Strings/en-us/Resources.resw | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
index a67cc77ee907..eca65cfd3068 100644
--- a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
+++ b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
@@ -4197,7 +4197,8 @@ Activate by holding the key for the character you want to add an accent to, then
     <comment>AdvancedPaste is a product name, do not loc</comment>
   </data>
   <data name="GPO_CommandNotFound_ForceDisabled.Title" xml:space="preserve">
-    <value>The Command Not Found module is force disabled by your organization.</value>
+    <value>The Command Not Found module is force disabled by your organization.</value>>
+    <comment>"Command Not Found" is a product name</comment>
   </data>
   <data name="GPO_CommandNotFound_ForceEnabled.Title" xml:space="preserve">
     <value>The Command Not Found module is force enabled by your organization.</value>>

From 47a06662756ccc97022fc86c34873646fe7e8fa2 Mon Sep 17 00:00:00 2001
From: htcfreek <61519853+htcfreek@users.noreply.github.com>
Date: Mon, 22 Jul 2024 20:46:03 +0200
Subject: [PATCH 12/24] Update MouseWihtoutBorderPage.xaml

---
 .../Views/MouseWithoutBordersPage.xaml        | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml
index 46141e91a484..0046bca9902e 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml
@@ -35,7 +35,11 @@
                         IsClosable="False"
                         IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
                         IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                        Severity="Informational" />
+                        Severity="Informational">
+                        <InfoBar.IconSource>
+                            <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                        </InfoBar.IconSource>
+                    </InfoBar>
                 </controls:SettingsGroup>
                 <controls:SettingsGroup x:Uid="MouseWithoutBorders_KeySettings" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
                     <tkcontrols:SettingsExpander
@@ -214,9 +218,9 @@
                         IsOpen="{x:Bind ViewModel.ShowPolicyConfiguredInfoForBehaviorSettings, Mode=OneWay}"
                         IsTabStop="{x:Bind ViewModel.ShowPolicyConfiguredInfoForBehaviorSettings, Mode=OneWay}"
                         Severity="Informational">
-                        <!--InfoBar.IconSource>
-                                    <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                                </InfoBar.IconSource-->
+                        <InfoBar.IconSource>
+                            <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                        </InfoBar.IconSource>
                     </InfoBar>
                     <tkcontrols:SettingsCard x:Uid="MouseWithoutBorders_WrapMouse">
                         <ToggleSwitch x:Uid="MouseWithoutBorders_WrapMouse_ToggleSwitch" IsOn="{x:Bind ViewModel.WrapMouse, Mode=TwoWay}" />
@@ -337,9 +341,9 @@
                                     IsOpen="True"
                                     IsTabStop="{x:Bind ViewModel.ShowPolicyConfiguredInfoForName2IPSetting, Mode=OneWay}"
                                     Severity="Informational">
-                                    <!--InfoBar.IconSource>
-                                    <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                                </InfoBar.IconSource-->
+                                    <InfoBar.IconSource>
+                                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                                    </InfoBar.IconSource>
                                 </InfoBar>
                             </tkcontrols:SettingsCard>
                             <tkcontrols:SettingsCard
@@ -395,9 +399,9 @@
                         IsOpen="{x:Bind ViewModel.ShowPolicyConfiguredInfoForOriginalUiSetting, Mode=OneWay}"
                         IsTabStop="{x:Bind ViewModel.ShowPolicyConfiguredInfoForOriginalUiSetting, Mode=OneWay}"
                         Severity="Informational">
-                        <!--InfoBar.IconSource>
+                        <InfoBar.IconSource>
                             <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                        </InfoBar.IconSource-->
+                        </InfoBar.IconSource>
                     </InfoBar>
                 </controls:SettingsGroup>
             </StackPanel>

From 7f9540232301f1637b91813f3632b97b34dc1717 Mon Sep 17 00:00:00 2001
From: htcfreek <61519853+htcfreek@users.noreply.github.com>
Date: Sat, 24 Aug 2024 19:01:06 +0200
Subject: [PATCH 13/24] PowerPreview page

---
 .../SettingsXAML/Views/PowerPreviewPage.xaml         | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerPreviewPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerPreviewPage.xaml
index f4836958201f..78226849768b 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerPreviewPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerPreviewPage.xaml
@@ -26,7 +26,11 @@
                         IsClosable="False"
                         IsOpen="{x:Bind ViewModel.SomePreviewPaneEnabledGposConfigured, Mode=OneWay}"
                         IsTabStop="{x:Bind ViewModel.SomePreviewPaneEnabledGposConfigured, Mode=OneWay}"
-                        Severity="Informational" />
+                        Severity="Informational">
+                        <InfoBar.IconSource>
+                            <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                        </InfoBar.IconSource>
+                    </InfoBar>
 
                     <tkcontrols:SettingsExpander
                         x:Uid="FileExplorerPreview_ToggleSwitch_Preview_SVG"
@@ -165,7 +169,11 @@
                         IsClosable="False"
                         IsOpen="{x:Bind ViewModel.SomeThumbnailEnabledGposConfigured, Mode=OneWay}"
                         IsTabStop="{x:Bind ViewModel.SomeThumbnailEnabledGposConfigured, Mode=OneWay}"
-                        Severity="Informational" />
+                        Severity="Informational">
+                        <InfoBar.IconSource>
+                            <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                        </InfoBar.IconSource>
+                    </InfoBar>
 
                     <tkcontrols:SettingsCard
                         x:Uid="FileExplorerPreview_ToggleSwitch_Thumbnail_SVG"

From 10f1465fba58500e3aa5034bc8f420766af4874a Mon Sep 17 00:00:00 2001
From: htcfreek <61519853+htcfreek@users.noreply.github.com>
Date: Sat, 24 Aug 2024 19:01:20 +0200
Subject: [PATCH 14/24] workspaces page

---
 .../Settings.UI/SettingsXAML/Views/WorkspacesPage.xaml      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/WorkspacesPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/WorkspacesPage.xaml
index c8280b33bc91..cb13ecc8cee6 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/WorkspacesPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/WorkspacesPage.xaml
@@ -26,7 +26,11 @@
                     IsClosable="False"
                     IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
                     IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational" />
+                    Severity="Informational">
+                    <InfoBar.IconSource>
+                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                    </InfoBar.IconSource>
+                </InfoBar>
                 <controls:SettingsGroup x:Uid="Workspaces_Activation_GroupSettings" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
 
                     <tkcontrols:SettingsCard x:Uid="Workspaces_ActivationShortcut" HeaderIcon="{ui:FontIcon Glyph=&#xEDA7;}">

From 6b8d654bfb39d2f019089026a31e12eb287c9e12 Mon Sep 17 00:00:00 2001
From: htcfreek <61519853+htcfreek@users.noreply.github.com>
Date: Sat, 24 Aug 2024 19:27:40 +0200
Subject: [PATCH 15/24] fix awake page gpo handling

---
 .../SettingsXAML/Views/AwakePage.xaml.cs      |  2 +-
 .../Settings.UI/ViewModels/AwakeViewModel.cs  | 27 ++++++++++++++++++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml.cs
index 25822b303ea7..e410dff742e4 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml.cs
@@ -163,7 +163,7 @@ private void UpdateEnabledState(bool recommendedState)
             {
                 // Get the enabled state from GPO.
                 ViewModel.IsEnabledGpoConfigured = true;
-                ViewModel.IsEnabled = enabledGpoRuleConfiguration == GpoRuleConfigured.Enabled;
+                ViewModel.EnabledGPOConfiguration = enabledGpoRuleConfiguration == GpoRuleConfigured.Enabled;
             }
             else
             {
diff --git a/src/settings-ui/Settings.UI/ViewModels/AwakeViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/AwakeViewModel.cs
index 7d9a48c62890..2036a2884eb7 100644
--- a/src/settings-ui/Settings.UI/ViewModels/AwakeViewModel.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/AwakeViewModel.cs
@@ -32,7 +32,18 @@ public AwakeSettings ModuleSettings
 
         public bool IsEnabled
         {
-            get => _isEnabled;
+            get
+            {
+                if (_enabledStateIsGPOConfigured)
+                {
+                    return _enabledGPOConfiguration;
+                }
+                else
+                {
+                    return _isEnabled;
+                }
+            }
+
             set
             {
                 if (_isEnabled != value)
@@ -65,6 +76,19 @@ public bool IsEnabledGpoConfigured
             }
         }
 
+        public bool EnabledGPOConfiguration
+        {
+            get => _enabledGPOConfiguration;
+            set
+            {
+                if (_enabledGPOConfiguration != value)
+                {
+                    _enabledGPOConfiguration = value;
+                    NotifyPropertyChanged();
+                }
+            }
+        }
+
         public bool IsExpirationConfigurationEnabled => ModuleSettings.Properties.Mode == AwakeMode.EXPIRABLE && IsEnabled;
 
         public bool IsTimeConfigurationEnabled => ModuleSettings.Properties.Mode == AwakeMode.TIMED && IsEnabled;
@@ -197,6 +221,7 @@ public void RefreshModuleSettings()
         }
 
         private bool _enabledStateIsGPOConfigured;
+        private bool _enabledGPOConfiguration;
         private AwakeSettings _moduleSettings;
         private bool _isEnabled;
     }

From b898ea4a10ba8ce95de0dd39307de3d6a43ed6cf Mon Sep 17 00:00:00 2001
From: htcfreek <61519853+htcfreek@users.noreply.github.com>
Date: Sun, 22 Sep 2024 11:54:09 +0200
Subject: [PATCH 16/24] NewPlus page

---
 .../SettingsXAML/Views/NewPlusPage.xaml       | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/NewPlusPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/NewPlusPage.xaml
index 2a3f5b9d8eb8..8f90664df272 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/NewPlusPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/NewPlusPage.xaml
@@ -16,26 +16,30 @@
                 ChildrenTransitions="{StaticResource SettingsCardsAnimations}"
                 Orientation="Vertical"
                 Spacing="2">
-                <tkcontrols:SettingsCard
-                    x:Uid="NewPlus_Enable_Toggle"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/NewPlus.png}"
-                    IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                    <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
-                </tkcontrols:SettingsCard>
-
                 <InfoBar
                     x:Uid="NewPlus_NoWindows10SupportWarning"
+                    Margin="0,0,0,25"
                     IsClosable="False"
                     IsOpen="{x:Bind ViewModel.IsWin10OrLower, Mode=OneWay}"
                     IsTabStop="{x:Bind ViewModel.IsWin10OrLower, Mode=OneWay}"
                     Severity="Warning" />
 
+                <tkcontrols:SettingsCard
+                    x:Uid="NewPlus_Enable_Toggle"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/NewPlus.png}"
+                    IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
+                    <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
+                </tkcontrols:SettingsCard>
                 <InfoBar
                     x:Uid="GPO_SettingIsManaged"
                     IsClosable="False"
                     IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
                     IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational" />
+                    Severity="Informational">
+                    <InfoBar.IconSource>
+                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                    </InfoBar.IconSource>
+                </InfoBar>
 
                 <controls:SettingsGroup x:Uid="NewPlus_Templates" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
                     <tkcontrols:SettingsCard

From 05f0c87f856a2800f3ba281f237c70717fdde335 Mon Sep 17 00:00:00 2001
From: htcfreek <61519853+htcfreek@users.noreply.github.com>
Date: Tue, 24 Sep 2024 19:05:24 +0200
Subject: [PATCH 17/24] update new+ page!

---
 .../Settings.UI/SettingsXAML/Views/NewPlusPage.xaml           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/NewPlusPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/NewPlusPage.xaml
index 427c872ca9ea..106a017dd2eb 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/NewPlusPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/NewPlusPage.xaml
@@ -81,9 +81,9 @@
                         IsOpen="{x:Bind ViewModel.IsHideFileExtSettingGPOConfigured, Mode=OneWay}"
                         IsTabStop="{x:Bind ViewModel.IsHideFileExtSettingGPOConfigured, Mode=OneWay}"
                         Severity="Informational">
-                        <!-- InfoBar.IconSource>
+                        <InfoBar.IconSource>
                             <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                        </InfoBar.IconSource-->
+                        </InfoBar.IconSource>
                     </InfoBar>
                     <tkcontrols:SettingsCard x:Uid="NewPlus_Hide_Starting_Digits_Toggle">
                         <ToggleSwitch x:Uid="HideStartingDigitsToggle" IsOn="{x:Bind ViewModel.HideStartingDigits, Mode=TwoWay}" />

From fb9885eb6bfa5e085c5b7ebcb9182fb19ec1dd37 Mon Sep 17 00:00:00 2001
From: Heiko <61519853+htcfreek@users.noreply.github.com>
Date: Tue, 12 Nov 2024 23:18:39 +0100
Subject: [PATCH 18/24] AdvancedPaste.xaml: Move Info bar.

---
 .../SettingsXAML/Views/AdvancedPaste.xaml            | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPaste.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPaste.xaml
index ad19c7a5ca80..52a244407089 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPaste.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPaste.xaml
@@ -73,12 +73,6 @@
                                 </StackPanel>
                             </tkcontrols:SettingsCard.Description>
                         </tkcontrols:SettingsCard>
-                        <tkcontrols:SettingsCard
-                            x:Uid="AdvancedPaste_ShowCustomPreviewSettingsCard"
-                            HeaderIcon="{ui:FontIcon Glyph=&#xE71E;}"
-                            IsEnabled="{x:Bind ViewModel.IsOpenAIEnabled, Mode=OneWay}">
-                            <ToggleSwitch IsOn="{x:Bind ViewModel.ShowCustomPreview, Mode=TwoWay}" />
-                        </tkcontrols:SettingsCard>
                         <InfoBar
                             x:Uid="GPO_SettingIsManaged"
                             IsClosable="False"
@@ -89,6 +83,12 @@
                                 <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
                             </InfoBar.IconSource>
                         </InfoBar>
+                        <tkcontrols:SettingsCard
+                            x:Uid="AdvancedPaste_ShowCustomPreviewSettingsCard"
+                            HeaderIcon="{ui:FontIcon Glyph=&#xE71E;}"
+                            IsEnabled="{x:Bind ViewModel.IsOpenAIEnabled, Mode=OneWay}">
+                            <ToggleSwitch IsOn="{x:Bind ViewModel.ShowCustomPreview, Mode=TwoWay}" />
+                        </tkcontrols:SettingsCard>
                     </controls:SettingsGroup>
 
                     <controls:SettingsGroup x:Uid="AdvancedPaste_BehaviorSettingsGroup" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">

From db0299ade68ac5cbd817597059d426e21535c464 Mon Sep 17 00:00:00 2001
From: Heiko <61519853+htcfreek@users.noreply.github.com>
Date: Sat, 7 Dec 2024 18:39:41 +0100
Subject: [PATCH 19/24] Update MouseJumpPanel.xaml

---
 .../Settings.UI/SettingsXAML/Panels/MouseJumpPanel.xaml   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Panels/MouseJumpPanel.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Panels/MouseJumpPanel.xaml
index b92cf4d4584b..22d996efb288 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Panels/MouseJumpPanel.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Panels/MouseJumpPanel.xaml
@@ -35,7 +35,11 @@
             IsClosable="False"
             IsOpen="{x:Bind ViewModel.IsJumpEnabledGpoConfigured, Mode=OneWay}"
             IsTabStop="{x:Bind ViewModel.IsJumpEnabledGpoConfigured, Mode=OneWay}"
-            Severity="Informational" />
+            Severity="Informational">
+            <InfoBar.IconSource>
+                <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+            </InfoBar.IconSource>
+        </InfoBar>
 
         <tkcontrols:SettingsCard
             x:Uid="MouseUtils_MouseJump_ActivationShortcut"
@@ -249,4 +253,4 @@
             </tkcontrols:SettingsExpander.Items>
         </tkcontrols:SettingsExpander>
     </controls:SettingsGroup>
-</UserControl>
\ No newline at end of file
+</UserControl>

From 01c5a0ee4145eaef86b8183507333c4fa0b7186b Mon Sep 17 00:00:00 2001
From: Heiko <61519853+htcfreek@users.noreply.github.com>
Date: Sat, 7 Dec 2024 18:44:45 +0100
Subject: [PATCH 20/24] Update GeneralPage.xaml

---
 .../Settings.UI/SettingsXAML/Views/GeneralPage.xaml       | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
index f4f4af4ed427..8aedc9255473 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
@@ -435,7 +435,11 @@
                             IsClosable="False"
                             IsOpen="{x:Bind ViewModel.IsDataDiagnosticsGPOManaged, Mode=OneWay}"
                             IsTabStop="{x:Bind ViewModel.IsDataDiagnosticsGPOManaged, Mode=OneWay}"
-                            Severity="Informational" />
+                            Severity="Informational">
+                            <InfoBar.IconSource>
+                                <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                            </InfoBar.IconSource>
+                        </InfoBar>
 
                     </StackPanel>
                 </controls:SettingsGroup>
@@ -453,4 +457,4 @@
             <controls:PageLink x:Uid="OpenSource_Notice" Link="https://github.com/microsoft/PowerToys/blob/main/NOTICE.md" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
-</Page>
\ No newline at end of file
+</Page>

From 13c711efe3831d03181082c7e800a435963bbaec Mon Sep 17 00:00:00 2001
From: htcfreek <61519853+htcfreek@users.noreply.github.com>
Date: Sat, 7 Dec 2024 19:53:58 +0100
Subject: [PATCH 21/24] fix position of info bar and some ui quirks

---
 .../SettingsXAML/Views/GeneralPage.xaml       | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
index 8aedc9255473..c06ecf7b2d71 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
@@ -401,16 +401,25 @@
                             IsEnabled="{x:Bind ViewModel.IsDataDiagnosticsGPOManaged, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
                             <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.EnableDataDiagnostics, Mode=TwoWay}" />
                         </tkcontrols:SettingsCard>
+                        <InfoBar
+                            x:Uid="GPO_SettingIsManaged"
+                            IsClosable="False"
+                            IsOpen="{x:Bind ViewModel.IsDataDiagnosticsGPOManaged, Mode=OneWay}"
+                            IsTabStop="{x:Bind ViewModel.IsDataDiagnosticsGPOManaged, Mode=OneWay}"
+                            Severity="Informational">
+                            <InfoBar.IconSource>
+                                <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                            </InfoBar.IconSource>
+                        </InfoBar>
                         <tkcontrols:SettingsExpander
                             x:Uid="GeneralPage_ViewDiagnosticData"
                             HeaderIcon="{ui:FontIcon Glyph=&#xE7EF;}"
                             IsEnabled="{x:Bind ViewModel.IsDataDiagnosticsGPOManaged, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}"
                             IsExpanded="True">
                             <tkcontrols:SettingsExpander.Items>
-                                <tkcontrols:SettingsCard x:Uid="GeneralPage_EnableViewDiagnosticData">
+                                <tkcontrols:SettingsCard x:Uid="GeneralPage_EnableViewDiagnosticData" IsEnabled="{x:Bind ViewModel.EnableDataDiagnostics, Mode=TwoWay}">
                                     <ToggleSwitch
                                         x:Uid="ToggleSwitch"
-                                        IsEnabled="{x:Bind ViewModel.EnableDataDiagnostics, Mode=TwoWay}"
                                         IsOn="{x:Bind ViewModel.EnableViewDataDiagnostics, Mode=TwoWay}" />
                                 </tkcontrols:SettingsCard>
                                 <tkcontrols:SettingsCard
@@ -430,16 +439,6 @@
                                 <Button x:Uid="GeneralPage_ViewDiagnosticDataViewerInfoButton" Click="Click_ViewDiagnosticDataViewerRestart" />
                             </InfoBar.ActionButton>
                         </InfoBar>
-                        <InfoBar
-                            x:Uid="GPO_SettingIsManaged"
-                            IsClosable="False"
-                            IsOpen="{x:Bind ViewModel.IsDataDiagnosticsGPOManaged, Mode=OneWay}"
-                            IsTabStop="{x:Bind ViewModel.IsDataDiagnosticsGPOManaged, Mode=OneWay}"
-                            Severity="Informational">
-                            <InfoBar.IconSource>
-                                <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                            </InfoBar.IconSource>
-                        </InfoBar>
 
                     </StackPanel>
                 </controls:SettingsGroup>

From 4c8e4b47d5dc8280bceac07b3f96b9eb3aa65098 Mon Sep 17 00:00:00 2001
From: htcfreek <61519853+htcfreek@users.noreply.github.com>
Date: Sat, 7 Dec 2024 21:00:35 +0100
Subject: [PATCH 22/24] fix xaml style

---
 .../Settings.UI/SettingsXAML/Views/GeneralPage.xaml           | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
index c06ecf7b2d71..6eee331171c7 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
@@ -418,9 +418,7 @@
                             IsExpanded="True">
                             <tkcontrols:SettingsExpander.Items>
                                 <tkcontrols:SettingsCard x:Uid="GeneralPage_EnableViewDiagnosticData" IsEnabled="{x:Bind ViewModel.EnableDataDiagnostics, Mode=TwoWay}">
-                                    <ToggleSwitch
-                                        x:Uid="ToggleSwitch"
-                                        IsOn="{x:Bind ViewModel.EnableViewDataDiagnostics, Mode=TwoWay}" />
+                                    <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.EnableViewDataDiagnostics, Mode=TwoWay}" />
                                 </tkcontrols:SettingsCard>
                                 <tkcontrols:SettingsCard
                                     x:Uid="GeneralPage_ViewDiagnosticDataViewer"

From dbe2f8c035d59aa071f9274e25ee3bfced85d99a Mon Sep 17 00:00:00 2001
From: htcfreek <61519853+htcfreek@users.noreply.github.com>
Date: Wed, 25 Dec 2024 11:39:23 +0100
Subject: [PATCH 23/24] fix string resources

---
 src/settings-ui/Settings.UI/Strings/en-us/Resources.resw | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
index 29395d237ebf..9a2fac75b2e8 100644
--- a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
+++ b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
@@ -3966,7 +3966,7 @@ Activate by holding the key for the character you want to add an accent to, then
   </data>
   <data name="AdvancedPaste_EnableAdvancedAI.Description" xml:space="preserve">
     <value>Add advanced capabilities when using 'Paste with AI' including the power to 'chain' multiple transformations together and work with images and files. This feature may consume more API credits when used.</value>
-  </data>  
+  </data>
   <data name="Oobe_AdvancedPaste.Description" xml:space="preserve">
     <value>Advanced Paste is a tool to put your clipboard content into any format you need, focused towards developer workflows. It can paste as plain text, markdown, or json directly with the UX or with a direct keystroke invoke. These are fully locally executed. In addition, it has an AI powered option that is 100% opt-in and requires an Open AI key. Note: this will replace the formatted text in your clipboard with the selected format.</value>
   </data>
@@ -4494,11 +4494,11 @@ Activate by holding the key for the character you want to add an accent to, then
     <comment>AdvancedPaste is a product name, do not loc</comment>
   </data>
   <data name="GPO_CommandNotFound_ForceDisabled.Title" xml:space="preserve">
-    <value>The Command Not Found module is force disabled by your organization.</value>>
+    <value>The Command Not Found module is force disabled by your organization.</value>
     <comment>"Command Not Found" is a product name</comment>
   </data>
   <data name="GPO_CommandNotFound_ForceEnabled.Title" xml:space="preserve">
-    <value>The Command Not Found module is force enabled by your organization.</value>>
+    <value>The Command Not Found module is force enabled by your organization.</value>
     <comment>"Command Not Found" is a product name</comment>
   </data>
   <data name="NewPlus.ModuleTitle" xml:space="preserve">

From e9cfbcd2e843bf8f5e39299aa112b3e240a7b1fe Mon Sep 17 00:00:00 2001
From: htcfreek <61519853+htcfreek@users.noreply.github.com>
Date: Wed, 25 Dec 2024 11:56:33 +0100
Subject: [PATCH 24/24] string changes

---
 src/settings-ui/Settings.UI/Strings/en-us/Resources.resw | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
index 9a2fac75b2e8..62ce08f837d0 100644
--- a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
+++ b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
@@ -4494,11 +4494,11 @@ Activate by holding the key for the character you want to add an accent to, then
     <comment>AdvancedPaste is a product name, do not loc</comment>
   </data>
   <data name="GPO_CommandNotFound_ForceDisabled.Title" xml:space="preserve">
-    <value>The Command Not Found module is force disabled by your organization.</value>
+    <value>The Command Not Found module is disabled by your organization.</value>
     <comment>"Command Not Found" is a product name</comment>
   </data>
   <data name="GPO_CommandNotFound_ForceEnabled.Title" xml:space="preserve">
-    <value>The Command Not Found module is force enabled by your organization.</value>
+    <value>The Command Not Found module is enabled by your organization.</value>
     <comment>"Command Not Found" is a product name</comment>
   </data>
   <data name="NewPlus.ModuleTitle" xml:space="preserve">