From 21d68c7998c834951223997f9ec458b292d09dc6 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Mon, 19 Apr 2021 12:42:36 +0200
Subject: [PATCH] [OOBE] Accessibility fixes (#10799)

* Narrator support for all Settings buttons

* Shortened welcome title

* Fixes

* Removed unused string

* Update src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw

Co-authored-by: Niels Laute <niels9001@hotmail.com>
Co-authored-by: Enrico Giordani <enricogior@users.noreply.github.com>
---
 .../OOBE/Views/OobeColorPicker.xaml              | 10 +++++++---
 .../OOBE/Views/OobeFancyZones.xaml               | 10 +++++++---
 .../OOBE/Views/OobeFileExplorer.xaml             |  7 +++++--
 .../OOBE/Views/OobeImageResizer.xaml             |  8 ++++++--
 .../OOBE/Views/OobeKBM.xaml                      |  8 ++++++--
 .../OOBE/Views/OobeOverview.xaml                 | 16 +++++++++-------
 .../OOBE/Views/OobePowerRename.xaml              |  8 ++++++--
 .../OOBE/Views/OobeRun.xaml                      | 10 +++++++---
 .../OOBE/Views/OobeShellPage.xaml                |  1 +
 .../OOBE/Views/OobeShortcutGuide.xaml            |  7 +++++--
 .../OOBE/Views/OobeVideoConference.xaml          |  7 +++++--
 .../Strings/en-us/Resources.resw                 |  5 ++---
 12 files changed, 66 insertions(+), 31 deletions(-)

diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeColorPicker.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeColorPicker.xaml
index 597e67482a..8bc40337a1 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeColorPicker.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeColorPicker.xaml
@@ -25,6 +25,7 @@
                         VerticalAlignment="Top">
                 
                 <TextBlock Text="{x:Bind ViewModel.ModuleName}"
+                           AutomationProperties.HeadingLevel="Level2"
                            Style="{StaticResource PageTitleStyle}" />
                 
                 <TextBlock TextWrapping="Wrap"
@@ -39,12 +40,14 @@
                 </HyperlinkButton>
 
                 <TextBlock x:Uid="Oobe_HowToUse"
+                           AutomationProperties.HeadingLevel="Level3"
                            Style="{StaticResource OobeSubtitleStyle}" />
 
                 <controls:ShortcutTextControl x:Uid="Oobe_ColorPicker_HowToUse" />
               
                 <TextBlock x:Uid="Oobe_TipsAndTricks"
-                       Style="{StaticResource OobeSubtitleStyle}"/>
+                           AutomationProperties.HeadingLevel="Level3"
+                           Style="{StaticResource OobeSubtitleStyle}"/>
 
                 <controls:ShortcutTextControl x:Uid="Oobe_ColorPicker_TipsAndTricks" />
             
@@ -57,13 +60,14 @@
                         <Run Text="{x:Bind ViewModel.ModuleName}"/>
                     </TextBlock>
                 </Button>
-                    <Button Click="SettingsLaunchButton_Click">
+                    <Button Click="SettingsLaunchButton_Click"
+                            AutomationProperties.LabeledBy="{Binding ElementName=SettingsLabel}">
                         <StackPanel Orientation="Horizontal"
                                     Spacing="8">
                             <TextBlock Text="&#xE115;"
                                        Margin="0,3,0,0"
                                        FontFamily="Segoe MDL2 Assets" />
-                            <TextBlock x:Uid="OOBE_Settings" />
+                            <TextBlock x:Uid="OOBE_Settings" Name="SettingsLabel" />
                         </StackPanel>
                     </Button>
                 </StackPanel>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeFancyZones.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeFancyZones.xaml
index a00e44ca12..d509e58f35 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeFancyZones.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeFancyZones.xaml
@@ -24,6 +24,7 @@
                         Margin="{StaticResource OobePageContentMargin}"
                         VerticalAlignment="Top">
                 <TextBlock Text="{x:Bind ViewModel.ModuleName}"
+                           AutomationProperties.HeadingLevel="Level2"
                            Style="{StaticResource PageTitleStyle}" />
                 <TextBlock TextWrapping="Wrap"
                            Margin="0,4,0,0"
@@ -36,14 +37,16 @@
                                 <Run Text="{x:Bind ViewModel.ModuleName}" />
                     </TextBlock>
                 </HyperlinkButton>
-                
+
                 <TextBlock x:Uid="Oobe_HowToUse"
+                           AutomationProperties.HeadingLevel="Level3"
                            Style="{StaticResource OobeSubtitleStyle}" />
 
 
                 <controls:ShortcutTextControl x:Uid="Oobe_FancyZones_HowToUse" />
 
                 <TextBlock x:Uid="Oobe_TipsAndTricks"
+                           AutomationProperties.HeadingLevel="Level3"
                            Style="{StaticResource OobeSubtitleStyle}" />
 
                 <controls:ShortcutTextControl x:Uid="Oobe_FancyZones_TipsAndTricks" />
@@ -51,13 +54,14 @@
                 <StackPanel Orientation="Horizontal"
                             Spacing="4"
                             Margin="0,32,0,0">
-                    <Button Click="SettingsLaunchButton_Click">
+                    <Button Click="SettingsLaunchButton_Click"
+                            AutomationProperties.LabeledBy="{Binding ElementName=SettingsLabel}">
                         <StackPanel Orientation="Horizontal"
                                     Spacing="8">
                             <TextBlock Text="&#xE115;"
                                        Margin="0,3,0,0"
                                        FontFamily="Segoe MDL2 Assets" />
-                            <TextBlock x:Uid="OOBE_Settings" />
+                            <TextBlock x:Uid="OOBE_Settings" Name="SettingsLabel" />
                         </StackPanel>
                     </Button>
                 </StackPanel>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeFileExplorer.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeFileExplorer.xaml
index 91ad457373..9d9c77ce57 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeFileExplorer.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeFileExplorer.xaml
@@ -24,6 +24,7 @@
                         VerticalAlignment="Top">
 
                 <TextBlock Text="{x:Bind ViewModel.ModuleName}"
+                           AutomationProperties.HeadingLevel="Level2"
                            Style="{StaticResource PageTitleStyle}" />
 
                 <TextBlock Margin="0,4,0,0"
@@ -39,6 +40,7 @@
                 </HyperlinkButton>
 
                 <TextBlock x:Uid="Oobe_HowToEnable"
+                           AutomationProperties.HeadingLevel="Level3"
                            Style="{StaticResource OobeSubtitleStyle}" />
 
                 <controls:ShortcutTextControl x:Uid="Oobe_FileExplorer_HowToEnable" />
@@ -47,13 +49,14 @@
                             Spacing="4"
                             Margin="0,32,0,0">
 
-                    <Button Click="SettingsLaunchButton_Click">
+                    <Button Click="SettingsLaunchButton_Click"
+                            AutomationProperties.LabeledBy="{Binding ElementName=SettingsLabel}">
                         <StackPanel Orientation="Horizontal"
                                     Spacing="8">
                             <TextBlock Text="&#xE115;"
                                        Margin="0,3,0,0"
                                        FontFamily="Segoe MDL2 Assets" />
-                            <TextBlock x:Uid="OOBE_Settings" />
+                            <TextBlock x:Uid="OOBE_Settings" Name="SettingsLabel" />
                         </StackPanel>
                     </Button>
                 </StackPanel>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeImageResizer.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeImageResizer.xaml
index 25f6c14d6c..1a497a9474 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeImageResizer.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeImageResizer.xaml
@@ -25,6 +25,7 @@
                         VerticalAlignment="Top">
 
                 <TextBlock Text="{x:Bind ViewModel.ModuleName}"
+                           AutomationProperties.HeadingLevel="Level2"
                            Style="{StaticResource PageTitleStyle}" />
 
                 <TextBlock Margin="0,4,0,0"
@@ -40,11 +41,13 @@
                 </HyperlinkButton>
 
                 <TextBlock x:Uid="Oobe_HowToLaunch"
+                           AutomationProperties.HeadingLevel="Level3"
                            Style="{StaticResource OobeSubtitleStyle}" />
 
                 <controls:ShortcutTextControl x:Uid="Oobe_ImageResizer_HowToLaunch" />
 
                 <TextBlock x:Uid="Oobe_TipsAndTricks"
+                           AutomationProperties.HeadingLevel="Level3"
                            Style="{StaticResource OobeSubtitleStyle}" />
 
                 <controls:ShortcutTextControl x:Uid="Oobe_ImageResizer_TipsAndTricks" />
@@ -52,13 +55,14 @@
                 <StackPanel Orientation="Horizontal"
                             Spacing="4"
                             Margin="0,32,0,0">
-                    <Button Click="SettingsLaunchButton_Click">
+                    <Button Click="SettingsLaunchButton_Click"
+                            AutomationProperties.LabeledBy="{Binding ElementName=SettingsLabel}">
                         <StackPanel Orientation="Horizontal"
                                     Spacing="8">
                             <TextBlock Text="&#xE115;"
                                        Margin="0,3,0,0"
                                        FontFamily="Segoe MDL2 Assets" />
-                            <TextBlock Text="Settings" />
+                            <TextBlock x:Uid="OOBE_Settings" Name="SettingsLabel"/>
                         </StackPanel>
                     </Button>
                 </StackPanel>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeKBM.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeKBM.xaml
index d1e5353911..37c2c7a2f2 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeKBM.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeKBM.xaml
@@ -24,6 +24,7 @@
                         VerticalAlignment="Top">
 
                 <TextBlock Text="{x:Bind ViewModel.ModuleName}"
+                           AutomationProperties.HeadingLevel="Level2"
                            Style="{StaticResource PageTitleStyle}" />
 
                 <TextBlock Margin="0,4,0,0"
@@ -39,11 +40,13 @@
                 </HyperlinkButton>
 
                 <TextBlock x:Uid="Oobe_HowToCreateMappings"
+                           AutomationProperties.HeadingLevel="Level3"
                            Style="{StaticResource OobeSubtitleStyle}" />
 
                 <controls:ShortcutTextControl x:Uid="Oobe_KBM_HowToCreateMappings" />
 
                 <TextBlock x:Uid="Oobe_TipsAndTricks"
+                           AutomationProperties.HeadingLevel="Level3"
                            Style="{StaticResource OobeSubtitleStyle}" />
 
                 <controls:ShortcutTextControl x:Uid="Oobe_KBM_TipsAndTricks" />
@@ -51,13 +54,14 @@
                 <StackPanel Orientation="Horizontal"
                             Spacing="4"
                             Margin="0,32,0,0">
-                    <Button Click="SettingsLaunchButton_Click">
+                    <Button Click="SettingsLaunchButton_Click"
+                            AutomationProperties.LabeledBy="{Binding ElementName=SettingsLabel}">
                         <StackPanel Orientation="Horizontal"
                                     Spacing="8">
                             <TextBlock Text="&#xE115;"
                                        Margin="0,3,0,0"
                                        FontFamily="Segoe MDL2 Assets" />
-                            <TextBlock Text="Settings" />
+                            <TextBlock x:Uid="OOBE_Settings" Name="SettingsLabel" />
                         </StackPanel>
                     </Button>
                 </StackPanel>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeOverview.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeOverview.xaml
index 61d9aa2c9a..e70ca06054 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeOverview.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeOverview.xaml
@@ -23,13 +23,13 @@
                         VerticalAlignment="Top">
 
                 <TextBlock Text="{x:Bind ViewModel.ModuleName}"
+                           AutomationProperties.HeadingLevel="Level2"
                            Style="{StaticResource PageTitleStyle}" />
 
                 <TextBlock Margin="0,4,0,0"
                            TextWrapping="Wrap">
                     <Run x:Uid="Oobe_Overview_Description" />
-                    <Hyperlink NavigateUri="{x:Bind ViewModel.DescriptionLink}"
-                               Foreground="{ThemeResource SystemControlBackgroundAccentBrush}">
+                    <Hyperlink NavigateUri="{x:Bind ViewModel.DescriptionLink}">
                         <Run x:Uid="Oobe_Overview_DescriptionLinkText" />
                     </Hyperlink><Run Text="." />
                 </TextBlock>
@@ -43,13 +43,15 @@
                 </TextBlock>
 
                 <Button Click="SettingsLaunchButton_Click"
-                            Margin="0,32,0,0">
+                        AutomationProperties.LabeledBy="{Binding ElementName=SettingsLabel}"
+                        Margin="0,32,0,0">
                     <StackPanel Orientation="Horizontal"
-                                    Spacing="8">
+                                Spacing="8">
                         <TextBlock Text="&#xE115;"
-                                       Margin="0,3,0,0"
-                                       FontFamily="Segoe MDL2 Assets" />
-                        <TextBlock x:Uid="OOBE_Settings" />
+                                   Margin="0,3,0,0"
+                                   FontFamily="Segoe MDL2 Assets" />
+                        <TextBlock x:Uid="OOBE_Settings"
+                                   Name="SettingsLabel" />
                     </StackPanel>
                 </Button>
             </StackPanel>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobePowerRename.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobePowerRename.xaml
index 17f4d5ecb9..7009860602 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobePowerRename.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobePowerRename.xaml
@@ -24,6 +24,7 @@
                         VerticalAlignment="Top">
 
                 <TextBlock Text="{x:Bind ViewModel.ModuleName}"
+                           AutomationProperties.HeadingLevel="Level2"
                            Style="{StaticResource PageTitleStyle}" />
 
                 <TextBlock Margin="0,4,0,0"
@@ -40,11 +41,13 @@
 
 
                 <TextBlock x:Uid="Oobe_HowToUse"
+                           AutomationProperties.HeadingLevel="Level3"
                            Style="{StaticResource OobeSubtitleStyle}" />
 
                 <controls:ShortcutTextControl x:Uid="Oobe_PowerRename_HowToUse" />
 
                 <TextBlock x:Uid="Oobe_TipsAndTricks"
+                           AutomationProperties.HeadingLevel="Level3"
                            Style="{StaticResource OobeSubtitleStyle}" />
 
                 <TextBlock x:Uid="Oobe_PowerRename_TipsAndTricks"
@@ -54,13 +57,14 @@
                             Spacing="4"
                             Margin="0,32,0,0">
 
-                    <Button Click="SettingsLaunchButton_Click">
+                    <Button Click="SettingsLaunchButton_Click"
+                            AutomationProperties.LabeledBy="{Binding ElementName=SettingsLabel}">
                         <StackPanel Orientation="Horizontal"
                                     Spacing="8">
                             <TextBlock Text="&#xE115;"
                                        Margin="0,3,0,0"
                                        FontFamily="Segoe MDL2 Assets" />
-                            <TextBlock x:Uid="OOBE_Settings" />
+                            <TextBlock x:Uid="OOBE_Settings" Name="SettingsLabel" />
                         </StackPanel>
                     </Button>
                 </StackPanel>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeRun.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeRun.xaml
index 53736a5456..85861c8bda 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeRun.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeRun.xaml
@@ -25,6 +25,7 @@
                         VerticalAlignment="Top">
 
                 <TextBlock Text="{x:Bind ViewModel.ModuleName}"
+                           AutomationProperties.HeadingLevel="Level2"
                            Style="{StaticResource PageTitleStyle}" />
 
                 <TextBlock Margin="0,4,0,0"
@@ -41,11 +42,13 @@
                 </HyperlinkButton>
 
                 <TextBlock x:Uid="Oobe_HowToLaunch"
+                           AutomationProperties.HeadingLevel="Level3"
                            Style="{StaticResource OobeSubtitleStyle}" />
 
                 <controls:ShortcutTextControl x:Uid="Oobe_Run_HowToLaunch" />
-                
+
                 <TextBlock x:Uid="Oobe_TipsAndTricks"
+                           AutomationProperties.HeadingLevel="Level3"
                            Style="{StaticResource OobeSubtitleStyle}" />
 
                 <controls:ShortcutTextControl x:Uid="Oobe_Run_TipsAndTricks" />
@@ -61,13 +64,14 @@
                         </TextBlock>
                     </Button>
 
-                    <Button Click="SettingsLaunchButton_Click">
+                    <Button Click="SettingsLaunchButton_Click"
+                            AutomationProperties.LabeledBy="{Binding ElementName=SettingsLabel}">
                         <StackPanel Orientation="Horizontal"
                                     Spacing="8">
                             <TextBlock Text="&#xE115;"
                                        Margin="0,3,0,0"
                                        FontFamily="Segoe MDL2 Assets" />
-                            <TextBlock  x:Uid="OOBE_Settings" />
+                            <TextBlock  x:Uid="OOBE_Settings" Name="SettingsLabel" />
                         </StackPanel>
                     </Button>
                 </StackPanel>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml
index 9f0ee9296a..eb7c1bb039 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml
@@ -58,6 +58,7 @@
                     <TextBlock x:Uid="Oobe_GettingStarted"
                                TextWrapping="Wrap"
                                FontWeight="SemiBold"
+                               AutomationProperties.HeadingLevel="Level1"
                                Style="{StaticResource PageTitleStyle}"
                                Margin="0,0,0,16" />
                 </StackPanel>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShortcutGuide.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShortcutGuide.xaml
index e0d2210ec6..1189789327 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShortcutGuide.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShortcutGuide.xaml
@@ -25,6 +25,7 @@
                         VerticalAlignment="Top">
 
                 <TextBlock Text="{x:Bind ViewModel.ModuleName}"
+                           AutomationProperties.HeadingLevel="Level2"
                            Style="{StaticResource PageTitleStyle}" />
 
                 <TextBlock Margin="0,4,0,0"
@@ -41,6 +42,7 @@
                 </HyperlinkButton>
 
                 <TextBlock x:Uid="Oobe_HowToLaunch"
+                           AutomationProperties.HeadingLevel="Level3"
                            Style="{StaticResource OobeSubtitleStyle}" />
 
                 <controls:ShortcutTextControl x:Uid="Oobe_ShortcutGuide_HowToLaunch" />
@@ -54,13 +56,14 @@
                         <Run Text="{x:Bind ViewModel.ModuleName}" />
                         </TextBlock>
                     </Button>
-                    <Button Click="SettingsLaunchButton_Click">
+                    <Button Click="SettingsLaunchButton_Click"
+                            AutomationProperties.LabeledBy="{Binding ElementName=SettingsLabel}">
                         <StackPanel Orientation="Horizontal"
                                     Spacing="8">
                             <TextBlock Text="&#xE115;"
                                        Margin="0,3,0,0"
                                        FontFamily="Segoe MDL2 Assets" />
-                            <TextBlock x:Uid="OOBE_Settings" />
+                            <TextBlock x:Uid="OOBE_Settings" Name="SettingsLabel" />
                         </StackPanel>
                     </Button>
                 </StackPanel>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeVideoConference.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeVideoConference.xaml
index 4e309a3fe2..9291f8aeec 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeVideoConference.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeVideoConference.xaml
@@ -25,6 +25,7 @@
                         VerticalAlignment="Top">
 
                 <TextBlock Text="{x:Bind ViewModel.ModuleName}"
+                           AutomationProperties.HeadingLevel="Level2"
                            Style="{StaticResource PageTitleStyle}" />
 
                 <TextBlock TextWrapping="Wrap"
@@ -40,6 +41,7 @@
                 </HyperlinkButton>
 
                 <TextBlock x:Uid="Oobe_HowToLaunch"
+                           AutomationProperties.HeadingLevel="Level3"
                            Style="{StaticResource OobeSubtitleStyle}" />
 
                 <controls:ShortcutTextControl x:Uid="Oobe_VideoConference_HowToLaunch" />
@@ -47,13 +49,14 @@
                 <StackPanel Orientation="Horizontal"
                             Margin="0,32,0,0"
                             Spacing="8">
-                    <Button Click="SettingsLaunchButton_Click"> 
+                    <Button Click="SettingsLaunchButton_Click"
+                            AutomationProperties.LabeledBy="{Binding ElementName=SettingsLabel}"> 
                         <StackPanel Orientation="Horizontal"
                                     Spacing="8">
                             <TextBlock Text="&#xE115;"
                                        Margin="0,3,0,0"
                                        FontFamily="Segoe MDL2 Assets" />
-                            <TextBlock x:Uid="OOBE_Settings" />
+                            <TextBlock x:Uid="OOBE_Settings" Name="SettingsLabel"/>
                         </StackPanel>
                     </Button>
                 </StackPanel>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
index 90b78b431a..79f8919cf3 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
@@ -1147,8 +1147,7 @@ From there, simply click on a Markdown file or SVG icon in the File Explorer and
     <comment>Do not localize this string</comment>
   </data>
   <data name="Oobe_Welcome" xml:space="preserve">
-    <value>Welcome to PowerToys</value>
-    <comment>Do not localize 'PowerToys'</comment>
+    <value>Welcome</value>
   </data>
   <data name="OOBE_Settings.Text" xml:space="preserve">
     <value>Settings</value>
@@ -1196,4 +1195,4 @@ From there, simply click on a Markdown file or SVG icon in the File Explorer and
   <data name="FancyZones_QuickLayoutSwitch_GroupSettings.Text" xml:space="preserve">
     <value>Quick layout switch</value>
   </data>
-</root>
\ No newline at end of file
+</root>