From 2903b7dbad8e1fd2ea5b49b1d3adf73a47ea0516 Mon Sep 17 00:00:00 2001
From: Violet Hansen <spynetgirl@outlook.com>
Date: Fri, 14 Feb 2025 20:15:26 +0200
Subject: [PATCH 1/2] Improving multilingual feature of AppControl Manager

Made lots of changes to the XAML to separate the strings from the code to make it easier to translate the AppControl Manager into other languages.
---
 .../SigningDetailsDialog.xaml                 |   4 +-
 .../SigningDetailsDialogForRemoval.xaml       |   6 +-
 AppControl Manager/MainWindow.xaml            |  20 +-
 .../Pages/AllowNewApps/AllowNewApps.xaml      |  10 +-
 .../AllowNewAppsEventLogsDataGrid.xaml        |  14 +-
 .../AllowNewAppsLocalFilesDataGrid.xaml       |  10 +-
 .../Pages/AllowNewApps/AllowNewAppsStart.xaml |  11 +-
 .../Pages/BuildNewCertificate.xaml            |   3 +-
 .../Pages/ConfigurePolicyRuleOptions.xaml     |   9 +-
 .../Pages/CreateDenyPolicy.xaml               |  77 ++---
 ...eDenyPolicyFilesAndFoldersScanResults.xaml |  15 +-
 AppControl Manager/Pages/CreatePolicy.xaml    |  60 +---
 .../Pages/CreateSupplementalPolicy.xaml       | 119 +++----
 ...entalPolicyFilesAndFoldersScanResults.xaml |  15 +-
 AppControl Manager/Pages/Deployment.xaml      |  10 +-
 .../Pages/EventLogsPolicyCreation.xaml        |  26 +-
 AppControl Manager/Pages/GetCIHashes.xaml     |   3 +-
 .../Pages/GetSecurePolicySettings.xaml        |   3 +-
 AppControl Manager/Pages/Logs.xaml            |  13 +-
 .../Pages/MDEAHPolicyCreation.xaml            |  35 +-
 AppControl Manager/Pages/MergePolicies.xaml   |   6 +-
 AppControl Manager/Pages/Simulation.xaml      |  29 +-
 .../Pages/StrictKernelPolicyScanResults.xaml  |  21 +-
 .../SystemInformation/SystemInformation.xaml  |  15 +-
 AppControl Manager/Pages/Update.xaml          |   9 +-
 AppControl Manager/Pages/ValidatePolicy.xaml  |   3 +-
 .../Pages/ViewFileCertificates.xaml           |  10 +-
 .../StrictKernelMode_NoFlightRoots.xml        |   2 +-
 .../Strings/en-US/Resources.resw              | 324 ++++++++++++++++--
 29 files changed, 527 insertions(+), 355 deletions(-)

diff --git a/AppControl Manager/CustomUIElements/SigningDetailsDialog.xaml b/AppControl Manager/CustomUIElements/SigningDetailsDialog.xaml
index a2c3ba8af..436a536e4 100644
--- a/AppControl Manager/CustomUIElements/SigningDetailsDialog.xaml	
+++ b/AppControl Manager/CustomUIElements/SigningDetailsDialog.xaml	
@@ -68,7 +68,7 @@
 
                     <controls:WrapPanel Orientation="Vertical" VerticalSpacing="10" HorizontalSpacing="10">
 
-                        <Button x:Name="CertFileBrowseButton" HorizontalAlignment="Center" Click="CertFileBrowseButton_Click" Content="Browse"/>
+                        <Button x:Name="CertFileBrowseButton" HorizontalAlignment="Center" Click="CertFileBrowseButton_Click" x:Uid="FileBrowseButton"/>
                         <TextBox MaxWidth="700" x:Name="CertFilePathTextBox" TextWrapping="Wrap" PlaceholderText=".cer file path" />
 
                     </controls:WrapPanel>
@@ -105,7 +105,7 @@
                             <TextBlock Text="Auto Acquire" Margin="0,8.7,0,0" />
                         </StackPanel>
 
-                        <Button x:Name="SignToolBrowseButton" Click="SignToolBrowseButton_Click" HorizontalAlignment="Center" Content="Browse"/>
+                        <Button x:Name="SignToolBrowseButton" Click="SignToolBrowseButton_Click" HorizontalAlignment="Center" x:Uid="FileBrowseButton"/>
                         <TextBox MaxWidth="700" x:Name="SignToolPathTextBox" PlaceholderText="SignTool.exe Path" TextWrapping="Wrap"/>
 
                     </controls:WrapPanel>
diff --git a/AppControl Manager/CustomUIElements/SigningDetailsDialogForRemoval.xaml b/AppControl Manager/CustomUIElements/SigningDetailsDialogForRemoval.xaml
index e6abacaf0..c29288d61 100644
--- a/AppControl Manager/CustomUIElements/SigningDetailsDialogForRemoval.xaml	
+++ b/AppControl Manager/CustomUIElements/SigningDetailsDialogForRemoval.xaml	
@@ -68,7 +68,7 @@
 
                     <controls:WrapPanel Orientation="Vertical" VerticalSpacing="10" HorizontalSpacing="10">
 
-                        <Button x:Name="CertFileBrowseButton" HorizontalAlignment="Center" Click="CertFileBrowseButton_Click" Content="Browse"/>
+                        <Button x:Name="CertFileBrowseButton" HorizontalAlignment="Center" Click="CertFileBrowseButton_Click" x:Uid="FileBrowseButton"/>
                         <TextBox MaxWidth="700" x:Name="CertFilePathTextBox" TextWrapping="Wrap" PlaceholderText=".cer file path" />
 
                     </controls:WrapPanel>
@@ -105,7 +105,7 @@
                             <TextBlock Text="Auto Acquire" Margin="0,8.7,0,0" />
                         </StackPanel>
 
-                        <Button x:Name="SignToolBrowseButton" Click="SignToolBrowseButton_Click" HorizontalAlignment="Center" Content="Browse"/>
+                        <Button x:Name="SignToolBrowseButton" Click="SignToolBrowseButton_Click" HorizontalAlignment="Center" x:Uid="FileBrowseButton"/>
                         <TextBox MaxWidth="700" x:Name="SignToolPathTextBox" PlaceholderText="SignTool.exe Path" TextWrapping="Wrap"/>
 
                     </controls:WrapPanel>
@@ -121,7 +121,7 @@
 
                     <controls:WrapPanel VerticalSpacing="10" HorizontalSpacing="10" Orientation="Vertical">
 
-                        <Button x:Name="XMLPolicyFileBrowseButton" Click="XMLPolicyFileBrowseButton_Click" HorizontalAlignment="Center" Content="Browse"/>
+                        <Button x:Name="XMLPolicyFileBrowseButton" Click="XMLPolicyFileBrowseButton_Click" HorizontalAlignment="Center" x:Uid="FileBrowseButton"/>
 
                         <TextBox MaxWidth="700" x:Name="XMLPolicyFileTextBox" PlaceholderText="XML file path" TextWrapping="Wrap"/>
 
diff --git a/AppControl Manager/MainWindow.xaml b/AppControl Manager/MainWindow.xaml
index bc975a693..94b63132e 100644
--- a/AppControl Manager/MainWindow.xaml	
+++ b/AppControl Manager/MainWindow.xaml	
@@ -102,8 +102,8 @@
 
             <!-- App icon -->
             <Image x:Name="TitleBarIcon" Source="ms-appx:///Assets/StoreLogo.png" Grid.Column="3"
-           Width="16" Height="16"
-           Margin="8,0,4,0"/>
+                Width="16" Height="16"
+                Margin="8,0,4,0"/>
 
             <!-- App title bar -->
             <TextBlock x:Name="TitleBarTextBlock"
@@ -118,7 +118,7 @@
                             VerticalAlignment="Center"
                             MaxWidth="600" TextChanged="SearchBox_TextChanged"
                             SuggestionChosen="SearchBox_SuggestionChosen"
-                            PlaceholderText="Search menu items..." Margin="0"/>
+                            x:Uid="MainSearchAutoSuggestBox" Margin="0"/>
 
             <!-- Sidebar access point -->
             <Button x:Name="SidebarButton" Click="SidebarButton_Click" Grid.Column="8"
@@ -228,7 +228,7 @@
 
             <NavigationView.FooterMenuItems>
 
-                <NavigationViewItem x:Name="UpdateNavItem" Content="Update" ToolTipService.ToolTip="Check for updates">
+                <NavigationViewItem x:Name="UpdateNavItem" x:Uid="UpdateNavItem">
                     <NavigationViewItem.InfoBadge>
                         <InfoBadge x:Name="AvailableUpdateInfoBadge"
                                    Opacity="{x:Bind ViewModel.InfoBadgeOpacity, Mode=OneWay}"
@@ -349,12 +349,12 @@
 
                                 <HyperlinkButton HorizontalAlignment="Center" ToolTipService.ToolTip="Sidebar usage guide on GitHub wiki" Content="Sidebar Guide" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Sidebar" />
 
-                                <Button HorizontalAlignment="Center" x:Name="OpenConfigDirectoryButton" ToolTipService.ToolTip="Open the directory where user configurations and user generated files are stored" Click="OpenConfigDirectoryButton_Click">
+                                <Button HorizontalAlignment="Center" x:Name="OpenConfigDirectoryButton" x:Uid="OpenConfigDirectoryButton" Click="OpenConfigDirectoryButton_Click">
                                     <Button.Content>
                                         <StackPanel Orientation="Horizontal">
                                             <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center">
                                                 <FontIcon Glyph="&#xE8A7;" Margin="0,0,8,0" />
-                                                <TextBlock Text="Open User Config Directory"/>
+                                                <TextBlock x:Uid="OpenConfigDirectoryButtonText"/>
                                             </StackPanel>
                                         </StackPanel>
                                     </Button.Content>
@@ -392,10 +392,10 @@
 
                     <!--  Note the use of a TwoWay binding here, this is required for this control to work.  -->
                     <controls:PropertySizer HorizontalAlignment="Left" Grid.Row="1"
-                 Binding="{x:Bind MainNavigation.OpenPaneLength, Mode=TwoWay}"
-                 Maximum="640"
-                 Minimum="60"
-                 Visibility="{x:Bind MainNavigation.IsPaneOpen, Mode=OneWay}" />
+                        Binding="{x:Bind MainNavigation.OpenPaneLength, Mode=TwoWay}"
+                        Maximum="640"
+                        Minimum="60"
+                        Visibility="{x:Bind MainNavigation.IsPaneOpen, Mode=OneWay}" />
 
                     <!-- Global margin settings for every page's content -->
                     <Frame x:Name="ContentFrame" Margin="15,15,15,10" Grid.Row="1" />
diff --git a/AppControl Manager/Pages/AllowNewApps/AllowNewApps.xaml b/AppControl Manager/Pages/AllowNewApps/AllowNewApps.xaml
index 3f142c0df..6b634a5a3 100644
--- a/AppControl Manager/Pages/AllowNewApps/AllowNewApps.xaml	
+++ b/AppControl Manager/Pages/AllowNewApps/AllowNewApps.xaml	
@@ -26,13 +26,13 @@
 
             <NavigationView.MenuItems>
 
-                <NavigationViewItem Content="Start allowing apps or files" ToolTipService.ToolTip="Start" Tag="Start" >
+                <NavigationViewItem x:Uid="AllowNewAppsInternalMainNavItem" Tag="Start" >
                     <NavigationViewItem.Icon>
                         <FontIcon Glyph="&#xE83D;" />
                     </NavigationViewItem.Icon>
                 </NavigationViewItem>
 
-                <NavigationViewItem Content="Review the Local Files" ToolTipService.ToolTip="Local Files" Tag="LocalFiles" >
+                <NavigationViewItem x:Uid="ReviewLocalFilesNavItem" Tag="LocalFiles" >
                     <NavigationViewItem.Icon>
                         <FontIcon Glyph="&#xE83D;" />
                     </NavigationViewItem.Icon>
@@ -49,15 +49,15 @@
 
                 </NavigationViewItem>
 
-                <NavigationViewItem Content="Review the Event Logs" ToolTipService.ToolTip="Event Logs" Tag="EventLogs" >
+                <NavigationViewItem x:Uid="ReviewEventLogsNavItem" Tag="EventLogs" >
                     <NavigationViewItem.Icon>
                         <FontIcon Glyph="&#xE964;" />
                     </NavigationViewItem.Icon>
 
                     <NavigationViewItem.InfoBadge>
                         <InfoBadge x:Name="EventLogsCountInfoBadge"
-                Value="0" Opacity="0"
-                Style="{ThemeResource AttentionIconInfoBadgeStyle}">
+                            Value="0" Opacity="0"
+                            Style="{ThemeResource AttentionIconInfoBadgeStyle}">
                             <InfoBadge.IconSource>
                                 <FontIconSource Glyph="&#xEA6A;"/>
                             </InfoBadge.IconSource>
diff --git a/AppControl Manager/Pages/AllowNewApps/AllowNewAppsEventLogsDataGrid.xaml b/AppControl Manager/Pages/AllowNewApps/AllowNewAppsEventLogsDataGrid.xaml
index 2beb0ed69..fe1ea567b 100644
--- a/AppControl Manager/Pages/AllowNewApps/AllowNewAppsEventLogsDataGrid.xaml	
+++ b/AppControl Manager/Pages/AllowNewApps/AllowNewAppsEventLogsDataGrid.xaml	
@@ -24,24 +24,24 @@
 
                 <ProgressRing x:Name="SelectLogsProgressRing" Visibility="Collapsed" IsActive="False" />
 
-                <DropDownButton Content="Actions" ToolTipService.ToolTip="Multiple actions to take on the logs">
+                <DropDownButton x:Uid="ExtraActionsDropDownButton">
                     <DropDownButton.Flyout>
 
                         <MenuFlyout Placement="Bottom">
 
-                            <MenuFlyoutItem Text="Select All" Click="SelectAll_Click">
+                            <MenuFlyoutItem x:Uid="SelectAllMenuFlyoutItem" Click="SelectAll_Click">
                                 <MenuFlyoutItem.Icon>
                                     <FontIcon Glyph="&#xE762;"/>
                                 </MenuFlyoutItem.Icon>
                             </MenuFlyoutItem>
 
-                            <MenuFlyoutItem Text="De-Select All" Click="DeSelectAll_Click">
+                            <MenuFlyoutItem x:Uid="DeSelectAllMenuFlyoutItem" Click="DeSelectAll_Click">
                                 <MenuFlyoutItem.Icon>
                                     <FontIcon Glyph="&#xE8E6;"/>
                                 </MenuFlyoutItem.Icon>
                             </MenuFlyoutItem>
 
-                            <MenuFlyoutItem Text="Clear Data" Click="ClearDataButton_Click" ToolTipService.ToolTip="Clears all of the displayed data">
+                            <MenuFlyoutItem Click="ClearDataButton_Click" x:Uid="ClearDataMenuFlyoutItem">
                                 <MenuFlyoutItem.Icon>
                                     <SymbolIcon Symbol="Delete" />
                                 </MenuFlyoutItem.Icon>
@@ -52,13 +52,13 @@
                     </DropDownButton.Flyout>
                 </DropDownButton>
 
-                <TextBox PlaceholderText="Total logs: 0"
+                <TextBox x:Uid="TotalLogsTextBlock"
                x:Name="TotalCountOfTheFilesTextBox"
                IsReadOnly="True"
                VerticalAlignment="Center"
-               VerticalContentAlignment="Center" ToolTipService.ToolTip="The total number of the logs"/>
+               VerticalContentAlignment="Center"/>
 
-                <TextBox x:Name="SearchBox" Width="300" PlaceholderText="Search data..." TextChanged="SearchBox_TextChanged" VerticalAlignment="Center" VerticalContentAlignment="Center" ToolTipService.ToolTip="Search the data" />
+                <TextBox x:Name="SearchBox" Width="300" x:Uid="SearchBoxTextBox" TextChanged="SearchBox_TextChanged" VerticalAlignment="Center" VerticalContentAlignment="Center" />
 
             </controls:WrapPanel>
         </Border>
diff --git a/AppControl Manager/Pages/AllowNewApps/AllowNewAppsLocalFilesDataGrid.xaml b/AppControl Manager/Pages/AllowNewApps/AllowNewAppsLocalFilesDataGrid.xaml
index 8eea4d90c..e266b0810 100644
--- a/AppControl Manager/Pages/AllowNewApps/AllowNewAppsLocalFilesDataGrid.xaml	
+++ b/AppControl Manager/Pages/AllowNewApps/AllowNewAppsLocalFilesDataGrid.xaml	
@@ -24,24 +24,24 @@
 
                 <ProgressRing x:Name="SelectLogsProgressRing" Visibility="Collapsed" IsActive="False" />
 
-                <DropDownButton Content="Actions" ToolTipService.ToolTip="Multiple actions to take on the logs">
+                <DropDownButton x:Uid="ExtraActionsDropDownButton">
                     <DropDownButton.Flyout>
 
                         <MenuFlyout Placement="Bottom">
 
-                            <MenuFlyoutItem Text="Select All" Click="SelectAll_Click">
+                            <MenuFlyoutItem x:Uid="SelectAllMenuFlyoutItem" Click="SelectAll_Click">
                                 <MenuFlyoutItem.Icon>
                                     <FontIcon Glyph="&#xE762;"/>
                                 </MenuFlyoutItem.Icon>
                             </MenuFlyoutItem>
 
-                            <MenuFlyoutItem Text="De-Select All" Click="DeSelectAll_Click">
+                            <MenuFlyoutItem x:Uid="DeSelectAllMenuFlyoutItem" Click="DeSelectAll_Click">
                                 <MenuFlyoutItem.Icon>
                                     <FontIcon Glyph="&#xE8E6;"/>
                                 </MenuFlyoutItem.Icon>
                             </MenuFlyoutItem>
 
-                            <MenuFlyoutItem Text="Clear Data" Click="ClearDataButton_Click" ToolTipService.ToolTip="Clears all of the displayed data">
+                            <MenuFlyoutItem Click="ClearDataButton_Click" x:Uid="ClearDataMenuFlyoutItem">
                                 <MenuFlyoutItem.Icon>
                                     <SymbolIcon Symbol="Delete" />
                                 </MenuFlyoutItem.Icon>
@@ -58,7 +58,7 @@
                VerticalAlignment="Center"
                VerticalContentAlignment="Center" ToolTipService.ToolTip="The total number of the files"/>
 
-                <TextBox x:Name="SearchBox" Width="300" PlaceholderText="Search data..." TextChanged="SearchBox_TextChanged" VerticalAlignment="Center" VerticalContentAlignment="Center" ToolTipService.ToolTip="Search the data" />
+                <TextBox x:Name="SearchBox" Width="300" x:Uid="SearchBoxTextBox" TextChanged="SearchBox_TextChanged" VerticalAlignment="Center" VerticalContentAlignment="Center" />
 
             </controls:WrapPanel>
         </Border>
diff --git a/AppControl Manager/Pages/AllowNewApps/AllowNewAppsStart.xaml b/AppControl Manager/Pages/AllowNewApps/AllowNewAppsStart.xaml
index 299352155..e7ac915da 100644
--- a/AppControl Manager/Pages/AllowNewApps/AllowNewAppsStart.xaml	
+++ b/AppControl Manager/Pages/AllowNewApps/AllowNewAppsStart.xaml	
@@ -30,14 +30,13 @@
             <controls:WrapPanel Grid.Row="0" VerticalSpacing="15" HorizontalSpacing="15" Orientation="Horizontal" Margin="6,10,6,5">
 
                 <TextBlock TextWrapping="WrapWholeWords" Style="{StaticResource BodyTextBlockStyle}">
-
                     <Span>
                         Use this page to <Run Foreground="{ThemeResource SystemAccentColor}">Allow</Run>
                         new or already installed apps or files to run on the system.
                     </Span>
                 </TextBlock>
 
-                <HyperlinkButton Margin="0,-8,0,8" Content="Guide" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Allow-New-Apps" />
+                <HyperlinkButton Margin="0,-8,0,8" x:Uid="GuideButtonAtTop" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Allow-New-Apps" />
 
                 <StackPanel Orientation="Horizontal" Spacing="15" Margin="0,-6,0,10">
 
@@ -79,9 +78,9 @@
 
                                     <controls:WrapPanel Orientation="Vertical" HorizontalSpacing="15" VerticalSpacing="15">
 
-                                        <Button Content="Clear" Click="BrowseForXMLPolicyButton_Flyout_Clear_Click" />
+                                        <Button x:Uid="ClearButton" Click="BrowseForXMLPolicyButton_Flyout_Clear_Click" />
 
-                                        <TextBlock Text="View the Base policy path you selected." TextWrapping="WrapWholeWords" />
+                                        <TextBlock x:Uid="ViewSelectedBasePolicyTextBlock" TextWrapping="WrapWholeWords" />
 
                                         <TextBox x:Name="BrowseForXMLPolicyButton_SelectedBasePolicyTextBox"
                                             TextWrapping="Wrap" AcceptsReturn="True" IsSpellCheckEnabled="False"
@@ -154,9 +153,9 @@ LargeChange="10" Minimum="2" Maximum="1000000" ValueChanged="LogSizeNumberBox_Va
 
                                     <controls:WrapPanel Orientation="Vertical" HorizontalSpacing="15" VerticalSpacing="15">
 
-                                        <Button Content="Clear" Click="ClearSelectedDirectoriesButton_Click" />
+                                        <Button x:Uid="ClearButton" Click="ClearSelectedDirectoriesButton_Click" />
 
-                                        <TextBlock Text="View the directories you selected."  TextWrapping="WrapWholeWords" Width="400" />
+                                        <TextBlock x:Uid="ViewSelectedFoldersTextBlock" TextWrapping="WrapWholeWords" Width="400" />
 
                                         <TextBox x:Name="SelectedDirectoriesTextBox"
                                             TextWrapping="Wrap" AcceptsReturn="True" IsSpellCheckEnabled="True"
diff --git a/AppControl Manager/Pages/BuildNewCertificate.xaml b/AppControl Manager/Pages/BuildNewCertificate.xaml
index a23a55566..e91dd8f78 100644
--- a/AppControl Manager/Pages/BuildNewCertificate.xaml	
+++ b/AppControl Manager/Pages/BuildNewCertificate.xaml	
@@ -24,13 +24,12 @@
             <controls:WrapPanel Grid.Row="0" VerticalSpacing="4" HorizontalSpacing="4" Orientation="Horizontal" Margin="6,5,6,5">
 
                 <TextBlock TextWrapping="WrapWholeWords" Style="{StaticResource BodyTextBlockStyle}">
-
                     <Span>
                         Build <Bold>Code Signing</Bold> Certificates that are suitable for signing <Run Foreground="{ThemeResource SystemAccentColor}">App Control</Run> Policies.
                     </Span>
                 </TextBlock>
 
-                <HyperlinkButton Margin="0,-6,0,0" Content="Guide" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Build-New-Certificate" />
+                <HyperlinkButton Margin="0,-6,0,0" x:Uid="GuideButtonAtTop" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Build-New-Certificate" />
 
             </controls:WrapPanel>
 
diff --git a/AppControl Manager/Pages/ConfigurePolicyRuleOptions.xaml b/AppControl Manager/Pages/ConfigurePolicyRuleOptions.xaml
index edd2d2c84..3e1dd6a61 100644
--- a/AppControl Manager/Pages/ConfigurePolicyRuleOptions.xaml	
+++ b/AppControl Manager/Pages/ConfigurePolicyRuleOptions.xaml	
@@ -22,15 +22,14 @@
             <controls:WrapPanel Grid.Row="0" VerticalSpacing="4" HorizontalSpacing="4" Orientation="Horizontal" Margin="6,5,6,5">
 
                 <TextBlock TextWrapping="WrapWholeWords" Style="{StaticResource BodyTextBlockStyle}">
-
-                <Span>
-                    Configure <Italic>App Control for Business</Italic>
+                    <Span>
+                        Configure <Italic>App Control for Business</Italic>
                         <Run Foreground="{ThemeResource SystemAccentColor}">policies'</Run>
                     <Bold>rule options</Bold>.
                   </Span>
                 </TextBlock>
 
-                <HyperlinkButton Margin="0,-6,0,0" Content="Guide" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Configure-Policy-Rule-Options" />
+                <HyperlinkButton Margin="0,-6,0,0" x:Uid="GuideButtonAtTop" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Configure-Policy-Rule-Options" />
 
             </controls:WrapPanel>
 
@@ -44,7 +43,7 @@
 
                         <controls:WrapPanel Orientation="Vertical" HorizontalSpacing="15" VerticalSpacing="15">
 
-                            <Button Content="Clear" Click="PickPolicyFileButton_FlyOut_Clear_Click" />
+                            <Button x:Uid="ClearButton" Click="PickPolicyFileButton_FlyOut_Clear_Click" />
 
                             <TextBlock Text="View the policy path you selected." TextWrapping="WrapWholeWords" />
 
diff --git a/AppControl Manager/Pages/CreateDenyPolicy.xaml b/AppControl Manager/Pages/CreateDenyPolicy.xaml
index 057906f82..e1ea536a6 100644
--- a/AppControl Manager/Pages/CreateDenyPolicy.xaml	
+++ b/AppControl Manager/Pages/CreateDenyPolicy.xaml	
@@ -26,9 +26,7 @@
                 <!-- For the Packaged Apps ListView Grouping -->
                 <CollectionViewSource x:Name="PackagedAppsCollectionViewSource" IsSourceGrouped="True"/>
 
-
                 <!-- Defines a single App that is displayed in the ListView -->
-
                 <DataTemplate x:Key="PackagedAppsListViewTemplate" x:DataType="others:PackagedAppView">
                     <Grid>
                         <Grid.RowDefinitions>
@@ -69,20 +67,17 @@
                     </Grid>
                 </DataTemplate>
 
-
             </Grid.Resources>
 
-
             <controls:WrapPanel Grid.Row="0" VerticalSpacing="4" HorizontalSpacing="4" Orientation="Vertical" Margin="6,0,6,10">
 
                 <TextBlock TextWrapping="WrapWholeWords" Style="{StaticResource BodyTextBlockStyle}">
-
                     <Span>
                         Create a <Bold>Deny</Bold> <Underline>base</Underline> policy that will <Run Foreground="{ThemeResource SystemAccentColor}">explicitly deny</Run> files or applications. Keep in mind that Application Control is fundamentally based on allow-listing, which means anything that is not allowed by a policy is <Bold>already automatically denied.</Bold>
                     </Span>
                 </TextBlock>
 
-                <HyperlinkButton Content="Guide" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Create-Deny-App-Control-Policy" />
+                <HyperlinkButton x:Uid="GuideButtonAtTop" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Create-Deny-App-Control-Policy" />
 
             </controls:WrapPanel>
 
@@ -96,10 +91,8 @@
                 </win:StackPanel.ChildrenTransitions>
 
                 <!-- Files and Folders Scan -->
-
                 <controls:SettingsExpander x:Name="FilesAndFoldersSettingsCard"
-                           Description="Create Deny policy by scanning files and folders"
-                           Header="Files and Folders"
+                           x:Uid="CreateDenyPolicyFilesAndFoldersSettingsExpander"
                            HeaderIcon="{ui:FontIcon Glyph=&#xE71D;}">
 
                     <controls:SettingsExpander.ItemsHeader>
@@ -117,33 +110,33 @@
 
                     <controls:WrapPanel Orientation="Horizontal" HorizontalSpacing="6" VerticalSpacing="10">
 
-                        <Button x:Name="CreateFilesAndFoldersDenyPolicyButton" Content="Create Deny Policy" ToolTipService.ToolTip="Create the deny policy based on the configurations you selected"
-            Style="{StaticResource AccentButtonStyle}" Margin="0,0,15,0" Click="CreateFilesAndFoldersDenyPolicyButton_Click" />
+                        <Button x:Name="CreateFilesAndFoldersDenyPolicyButton" x:Uid="CreateDenyPolicyButton"
+                            Style="{StaticResource AccentButtonStyle}" Margin="0,0,15,0" Click="CreateFilesAndFoldersDenyPolicyButton_Click" />
 
-                        <ToggleButton x:Name="FilesAndFoldersPolicyDeployToggleButton" Click="FilesAndFoldersPolicyDeployToggleButton_Click" Content="Deploy after Creation" Margin="0,0,15,0"
-                                      ToolTipService.ToolTip="Toggling this button means the deny policy will be deployed on the system after it's created"/>
+                        <ToggleButton x:Name="FilesAndFoldersPolicyDeployToggleButton" Click="FilesAndFoldersPolicyDeployToggleButton_Click" x:Uid="DeployAfterCreationButton" Margin="0,0,15,0" />
 
                         <TeachingTip x:Name="CreateDenyPolicyTeachingTip"
- Target="{x:Bind CreateFilesAndFoldersDenyPolicyButton}" />
+                            Target="{x:Bind CreateFilesAndFoldersDenyPolicyButton}" />
 
                     </controls:WrapPanel>
 
                     <controls:SettingsExpander.Items>
 
-                        <controls:SettingsCard x:Name="FilesAndFoldersBrowseForFilesSettingsCard" Description="Browse for file paths to scan and include in the Deny policy."
-                               Header="Browse For Files" Holding="FilesAndFoldersBrowseForFilesSettingsCard_Holding" RightTapped="FilesAndFoldersBrowseForFilesSettingsCard_RightTapped"
+                        <controls:SettingsCard x:Name="FilesAndFoldersBrowseForFilesSettingsCard" x:Uid="BrowseForFilesDenyPolicySettingsCard"
+                               Holding="FilesAndFoldersBrowseForFilesSettingsCard_Holding" RightTapped="FilesAndFoldersBrowseForFilesSettingsCard_RightTapped"
                                IsClickEnabled="True" IsActionIconVisible="False" Click="FilesAndFoldersBrowseForFilesSettingsCard_Click">
 
-                            <Button x:Name="FilesAndFoldersBrowseForFilesButton" RightTapped="FilesAndFoldersBrowseForFilesButton_RightTapped" Content="Browse" Click="FilesAndFoldersBrowseForFilesButton_Click">
+                            <Button x:Name="FilesAndFoldersBrowseForFilesButton" RightTapped="FilesAndFoldersBrowseForFilesButton_RightTapped"
+                                    x:Uid="FileBrowseButton" Click="FilesAndFoldersBrowseForFilesButton_Click">
 
                                 <Button.Flyout>
                                     <Flyout x:Name="FilesAndFoldersBrowseForFilesButton_Flyout">
 
                                         <controls:WrapPanel Orientation="Vertical" HorizontalSpacing="15" VerticalSpacing="15">
 
-                                            <Button Content="Clear" Click="FilesAndFoldersBrowseForFilesButton_Flyout_Clear_Click" />
+                                            <Button x:Uid="ClearButton" Click="FilesAndFoldersBrowseForFilesButton_Flyout_Clear_Click" />
 
-                                            <TextBlock Text="View the files you selected." TextWrapping="WrapWholeWords" />
+                                            <TextBlock x:Uid="ViewSelectedFilesTextBlock" TextWrapping="WrapWholeWords" />
 
                                             <TextBox x:Name="FilesAndFoldersBrowseForFilesButton_SelectedFilesTextBox"
                                                 TextWrapping="Wrap" AcceptsReturn="True" IsSpellCheckEnabled="False"
@@ -158,20 +151,19 @@
 
                         </controls:SettingsCard>
 
-                        <controls:SettingsCard Description="Browse for Folder paths to scan and include in the Deny policy. The folders will be scanned recursively."
-            Header="Browse For Folders" x:Name="FilesAndFoldersBrowseForFoldersSettingsCard" Click="FilesAndFoldersBrowseForFoldersSettingsCard_Click"
-             Holding="FilesAndFoldersBrowseForFoldersSettingsCard_Holding" RightTapped="FilesAndFoldersBrowseForFoldersSettingsCard_RightTapped" IsClickEnabled="True" IsActionIconVisible="False">
+                        <controls:SettingsCard x:Uid="BrowseForFoldersDenyPolicySettingsCard" x:Name="FilesAndFoldersBrowseForFoldersSettingsCard" Click="FilesAndFoldersBrowseForFoldersSettingsCard_Click"
+                                Holding="FilesAndFoldersBrowseForFoldersSettingsCard_Holding" RightTapped="FilesAndFoldersBrowseForFoldersSettingsCard_RightTapped" IsClickEnabled="True" IsActionIconVisible="False">
 
-                            <Button x:Name="FilesAndFoldersBrowseForFoldersButton" RightTapped="FilesAndFoldersBrowseForFoldersButton_RightTapped" Content="Browse" Click="FilesAndFoldersBrowseForFoldersButton_Click">
+                            <Button x:Name="FilesAndFoldersBrowseForFoldersButton" RightTapped="FilesAndFoldersBrowseForFoldersButton_RightTapped" x:Uid="FolderBrowseButton" Click="FilesAndFoldersBrowseForFoldersButton_Click">
 
                                 <Button.Flyout>
                                     <Flyout x:Name="FilesAndFoldersBrowseForFoldersButton_FlyOut">
 
                                         <controls:WrapPanel Orientation="Vertical" HorizontalSpacing="15" VerticalSpacing="15">
 
-                                            <Button Content="Clear" Click="FilesAndFoldersBrowseForFoldersButton_Flyout_Clear_Click" />
+                                            <Button x:Uid="ClearButton" Click="FilesAndFoldersBrowseForFoldersButton_Flyout_Clear_Click" />
 
-                                            <TextBlock Text="View the folders you selected." TextWrapping="WrapWholeWords" />
+                                            <TextBlock x:Uid="ViewSelectedFoldersTextBlock" TextWrapping="WrapWholeWords" />
 
                                             <TextBox x:Name="FilesAndFoldersBrowseForFoldersButton_SelectedFoldersTextBox"
                                                 TextWrapping="Wrap" AcceptsReturn="True" IsSpellCheckEnabled="False"
@@ -186,11 +178,8 @@
 
                         </controls:SettingsCard>
 
-                        <controls:SettingsCard Description="The name of the Deny policy that is going to be created."
-Header="Policy Name" IsClickEnabled="False" IsActionIconVisible="False">
-
+                        <controls:SettingsCard x:Uid="DenyPolicyNameSettingsCard" IsClickEnabled="False" IsActionIconVisible="False">
                             <TextBox x:Name="FilesAndFoldersPolicyNameTextBox" TextChanged="FilesAndFoldersPolicyNameTextBox_TextChanged" PlaceholderText="Deny Policy Name"/>
-
                         </controls:SettingsCard>
 
                         <controls:SettingsCard Description="Select the level based on which the detected files will be scanned."
@@ -258,12 +247,9 @@ Header="Policy Name" IsClickEnabled="False" IsActionIconVisible="False">
                 </controls:SettingsExpander>
 
 
-
-                <!-- Package Family Name (PFN -->
-
+                <!-- Package Family Name (PFN) -->
                 <controls:SettingsExpander x:Name="PFNSettingsCard"
-                    Description="Create a Deny policy based on an app's Package Family Name (PFN)"
-                    Header="Package Family Name"
+                    x:Uid="CreateDenyPolicyPFNSettingsExpander"
                     HeaderIcon="{ui:FontIcon Glyph=&#xE8F1;}" Expanded="PFNSettingsCard_Expanded">
 
                     <controls:SettingsExpander.ItemsHeader>
@@ -280,26 +266,21 @@ Header="Policy Name" IsClickEnabled="False" IsActionIconVisible="False">
 
                     <controls:WrapPanel Orientation="Horizontal" HorizontalSpacing="6" VerticalSpacing="10">
 
-                        <Button x:Name="CreatePFNDenyPolicyButton" Click="CreatePFNDenyPolicyButton_Click" Content="Create Deny Policy"
-Style="{StaticResource AccentButtonStyle}" Margin="0,0,15,0" ToolTipService.ToolTip="Create the deny policy based on the configurations you selected"/>
+                        <Button x:Name="CreatePFNDenyPolicyButton" Click="CreatePFNDenyPolicyButton_Click" x:Uid="CreateDenyPolicyButton"
+Style="{StaticResource AccentButtonStyle}" Margin="0,0,15,0"/>
 
-                        <ToggleButton x:Name="PFNPolicyDeployToggleButton" Content="Deploy after Creation" Margin="0,0,15,0" ToolTipService.ToolTip="Toggling this button means the deny policy will be deployed on the system after it's created" />
+                        <ToggleButton x:Name="PFNPolicyDeployToggleButton" x:Uid="DeployAfterCreationButton" Margin="0,0,15,0" />
 
-                        <TeachingTip x:Name="CreatePFNDenyPolicyTeachingTip"
-    Target="{x:Bind CreatePFNDenyPolicyButton}" />
+                        <TeachingTip x:Name="CreatePFNDenyPolicyTeachingTip" Target="{x:Bind CreatePFNDenyPolicyButton}" />
 
                     </controls:WrapPanel>
 
                     <controls:SettingsExpander.Items>
 
-                        <controls:SettingsCard Description="The name of the Deny policy that is going to be created."
-                            Header="Policy Name" IsClickEnabled="False" IsActionIconVisible="False">
-
+                        <controls:SettingsCard x:Uid="DenyPolicyNameSettingsCard" IsClickEnabled="False" IsActionIconVisible="False">
                             <TextBox x:Name="PFNPolicyNameTextBox" PlaceholderText="Deny Policy Name"/>
-
                         </controls:SettingsCard>
 
-
                         <controls:SettingsCard Description="Select one or more installed packages to create a Deny policy for"
                             Header="Package Family Names" x:Name="PFNSelectPackagedAppsSettingsCard" IsClickEnabled="False" IsActionIconVisible="False">
 
@@ -310,10 +291,10 @@ Style="{StaticResource AccentButtonStyle}" Margin="0,0,15,0" ToolTipService.Tool
 
                                     <TextBox x:Name="PFNAppFilteringTextBox" TextChanged="PFNAppFilteringTextBox_TextChanged" PlaceholderText="Search among the apps"/>
 
-                                    <TextBlock x:Name="PFNSelectedItemsCount" HorizontalAlignment="Center" Text="Selected Apps: 0"/>
-                                    <Button Content="Refresh" HorizontalAlignment="Center" x:Name="PFNRefreshAppsListButton" Click="PFNRefreshAppsListButton_Click" />
-                                    <Button Content="Select All" HorizontalAlignment="Center" x:Name="PFNSelectAllAppsListButton" Click="PFNSelectAllAppsListButton_Click" />
-                                    <Button Content="Remove Selections" HorizontalAlignment="Center" x:Name="PFNRemoveSelectionAppsListButton" Click="PFNRemoveSelectionAppsListButton_Click" />
+                                    <TextBlock x:Uid="SelectedAppsTextBlock" x:Name="PFNSelectedItemsCount" HorizontalAlignment="Center"/>
+                                    <Button x:Uid="RefreshButton" HorizontalAlignment="Center" x:Name="PFNRefreshAppsListButton" Click="PFNRefreshAppsListButton_Click" />
+                                    <Button x:Uid="SelectAllButton" HorizontalAlignment="Center" x:Name="PFNSelectAllAppsListButton" Click="PFNSelectAllAppsListButton_Click" />
+                                    <Button x:Uid="RemoveSelectionsButton" HorizontalAlignment="Center" x:Name="PFNRemoveSelectionAppsListButton" Click="PFNRemoveSelectionAppsListButton_Click" />
 
                                 </controls:WrapPanel>
 
diff --git a/AppControl Manager/Pages/CreateDenyPolicyFilesAndFoldersScanResults.xaml b/AppControl Manager/Pages/CreateDenyPolicyFilesAndFoldersScanResults.xaml
index b3e91d112..b2600aeb7 100644
--- a/AppControl Manager/Pages/CreateDenyPolicyFilesAndFoldersScanResults.xaml	
+++ b/AppControl Manager/Pages/CreateDenyPolicyFilesAndFoldersScanResults.xaml	
@@ -22,7 +22,6 @@
         <controls:WrapPanel Grid.Row="0" VerticalSpacing="4" HorizontalSpacing="4" Orientation="Horizontal" Margin="6,0,6,10">
 
             <TextBlock TextWrapping="WrapWholeWords" Style="{StaticResource BodyTextBlockStyle}">
-
                 <Span>
                     View the detected files that were used to create the <Run Foreground="{ThemeResource SystemAccentColor}">Deny</Run> policy.
                 </Span>
@@ -36,24 +35,24 @@
 
                 <ProgressRing x:Name="SelectLogsProgressRing" Visibility="Collapsed" IsActive="False" />
 
-                <DropDownButton Content="Actions" ToolTipService.ToolTip="Multiple actions to take on the logs">
+                <DropDownButton x:Uid="ExtraActionsDropDownButton">
                     <DropDownButton.Flyout>
 
                         <MenuFlyout Placement="Bottom">
 
-                            <MenuFlyoutItem Text="Select All" Click="SelectAll_Click">
+                            <MenuFlyoutItem x:Uid="SelectAllMenuFlyoutItem" Click="SelectAll_Click">
                                 <MenuFlyoutItem.Icon>
                                     <FontIcon Glyph="&#xE762;"/>
                                 </MenuFlyoutItem.Icon>
                             </MenuFlyoutItem>
 
-                            <MenuFlyoutItem Text="De-Select All" Click="DeSelectAll_Click">
+                            <MenuFlyoutItem x:Uid="DeSelectAllMenuFlyoutItem" Click="DeSelectAll_Click">
                                 <MenuFlyoutItem.Icon>
                                     <FontIcon Glyph="&#xE8E6;"/>
                                 </MenuFlyoutItem.Icon>
                             </MenuFlyoutItem>
 
-                            <MenuFlyoutItem Text="Clear Data" Click="ClearDataButton_Click" ToolTipService.ToolTip="Clears all of the displayed data">
+                            <MenuFlyoutItem Click="ClearDataButton_Click" x:Uid="ClearDataMenuFlyoutItem">
                                 <MenuFlyoutItem.Icon>
                                     <SymbolIcon Symbol="Delete" />
                                 </MenuFlyoutItem.Icon>
@@ -64,13 +63,13 @@
                     </DropDownButton.Flyout>
                 </DropDownButton>
 
-                <TextBox PlaceholderText="Total logs: 0"
+                <TextBox x:Uid="TotalLogsTextBlock"
             x:Name="TotalCountOfTheFilesTextBox"
             IsReadOnly="True"
             VerticalAlignment="Center"
-            VerticalContentAlignment="Center" ToolTipService.ToolTip="The total number of the logs"/>
+            VerticalContentAlignment="Center"/>
 
-                <TextBox x:Name="SearchBox" Width="300" PlaceholderText="Search data..." TextChanged="SearchBox_TextChanged" VerticalAlignment="Center" VerticalContentAlignment="Center" ToolTipService.ToolTip="Search the data" />
+                <TextBox x:Name="SearchBox" Width="300" x:Uid="SearchBoxTextBox" TextChanged="SearchBox_TextChanged" VerticalAlignment="Center" VerticalContentAlignment="Center" />
 
             </controls:WrapPanel>
         </Border>
diff --git a/AppControl Manager/Pages/CreatePolicy.xaml b/AppControl Manager/Pages/CreatePolicy.xaml
index 73f39824b..bc577082f 100644
--- a/AppControl Manager/Pages/CreatePolicy.xaml	
+++ b/AppControl Manager/Pages/CreatePolicy.xaml	
@@ -21,7 +21,6 @@
             <controls:WrapPanel Grid.Row="0" VerticalSpacing="4" HorizontalSpacing="4" Orientation="Vertical" Margin="6,0,6,10">
 
                 <TextBlock TextWrapping="WrapWholeWords" Style="{StaticResource BodyTextBlockStyle}">
-
                 <Span>
                     Create <Italic>App Control for Business</Italic>
                         <Run Foreground="{ThemeResource SystemAccentColor}">policies</Run>
@@ -31,7 +30,7 @@
                 </Span>
                 </TextBlock>
 
-                <HyperlinkButton Content="Guide" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Create-App-Control-Policy" />
+                <HyperlinkButton x:Uid="GuideButtonAtTop" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Create-App-Control-Policy" />
 
             </controls:WrapPanel>
 
@@ -55,16 +54,14 @@
                         <Button x:Name="AllowMicrosoftCreate" Content="Create" ToolTipService.ToolTip="Create the Allow Microsoft base policy"
                             Style="{StaticResource AccentButtonStyle}" Margin="0,0,15,0" Click="AllowMicrosoftCreate_Click" />
 
-                        <ToggleButton x:Name="AllowMicrosoftCreateAndDeploy" Content="Deploy after Creation" ToolTipService.ToolTip="Deploy the Allow Microsoft policy after creating it" Margin="0,0,15,0" />
+                        <ToggleButton x:Name="AllowMicrosoftCreateAndDeploy" x:Uid="DeployAfterCreationButton" Margin="0,0,15,0" />
 
                     </controls:WrapPanel>
 
                     <controls:SettingsExpander.Items>
 
-                        <controls:SettingsCard Description="Indicates that the created/deployed policy will have (Enabled:Audit Mode) policy rule option and will generate audit logs instead of blocking files."
-                               Header="Audit">
+                        <controls:SettingsCard x:Uid="AuditRuleOptionSettingsCard">
                             <ToggleSwitch x:Name="AllowMicrosoftAudit" Toggled="AllowMicrosoftAudit_Toggled" />
-
                         </controls:SettingsCard>
 
                         <controls:SettingsCard Description="Specifies the log size for Microsoft-Windows-CodeIntegrity/Operational events." Header="Log Size">
@@ -86,22 +83,18 @@
                         </controls:SettingsCard>
 
 
-                        <controls:SettingsCard Description="Indicates that the created/deployed policy will have (Require EV Signers) policy rule option which will only allow kernel-mode drivers signed with an EV certificate to run."
-                            Header="Require EVSigners">
+                        <controls:SettingsCard x:Uid="RequireEVSignersRuleOption">
                             <ToggleSwitch x:Name="AllowMicrosoftRequireEVSigners" />
                         </controls:SettingsCard>
 
-                        <controls:SettingsCard Description="Enables script enforcement for the policy which will severely limit the attack surface of PowerShell by requiring only scripts/modules signed and allowed in the Code Integrity policy to run."
-                            Header="Enable Script Enforcement">
+                        <controls:SettingsCard x:Uid="EnableScriptEnforcementRuleOption">
                             <ToggleSwitch x:Name="AllowMicrosoftEnableScriptEnforcement" />
                         </controls:SettingsCard>
 
-                        <controls:SettingsCard Description="Indicates that the created/deployed policy will have (Enabled:Boot Audit on Failure) and (Enabled:Advanced Boot Options Menu) policy rule options. Useful for testing the policy and having recovery options available when something goes wrong. Not recommended to be used in the final production-ready policy due to security reasons."
-                            Header="Test Mode">
+                        <controls:SettingsCard x:Uid="TestModeRuleOption">
                             <ToggleSwitch x:Name="AllowMicrosoftTestMode" />
                         </controls:SettingsCard>
 
-
                     </controls:SettingsExpander.Items>
 
                 </controls:SettingsExpander>
@@ -120,17 +113,14 @@
                         <Button x:Name="DefaultWindowsCreate" Content="Create" ToolTipService.ToolTip="Create the Default Windows base policy"
                                 Style="{StaticResource AccentButtonStyle}" Margin="0,0,15,0" Click="DefaultWindowsCreate_Click" />
 
-                        <ToggleButton x:Name="DefaultWindowsCreateAndDeploy" Content="Deploy after Creation" ToolTipService.ToolTip="Deploy the Default Windows policy after creating it" Margin="0,0,15,0" />
+                        <ToggleButton x:Name="DefaultWindowsCreateAndDeploy" x:Uid="DeployAfterCreationButton" Margin="0,0,15,0" />
 
                     </controls:WrapPanel>
 
                     <controls:SettingsExpander.Items>
 
-                        <controls:SettingsCard Description="Indicates that the created/deployed policy will have (Enabled:Audit Mode) policy rule option and will generate audit logs instead of blocking files."
-                               Header="Audit">
-
+                        <controls:SettingsCard x:Uid="AuditRuleOptionSettingsCard">
                             <ToggleSwitch x:Name="DefaultWindowsAudit" Toggled="DefaultWindowsAudit_Toggled" />
-
                         </controls:SettingsCard>
 
                         <controls:SettingsCard Description="Specifies the log size for Microsoft-Windows-CodeIntegrity/Operational events." Header="Log Size">
@@ -152,18 +142,15 @@
                         </controls:SettingsCard>
 
 
-                        <controls:SettingsCard Description="Indicates that the created/deployed policy will have (Require EV Signers) policy rule option which will only allow kernel-mode drivers signed with an EV certificate to run."
-                            Header="Require EVSigners">
+                        <controls:SettingsCard x:Uid="RequireEVSignersRuleOption">
                             <ToggleSwitch x:Name="DefaultWindowsRequireEVSigners" />
                         </controls:SettingsCard>
 
-                        <controls:SettingsCard Description="Enables script enforcement for the policy which will severely limit the attack surface of PowerShell by requiring only scripts/modules signed and allowed in the Code Integrity policy to run."
-                            Header="Enable Script Enforcement">
+                        <controls:SettingsCard x:Uid="EnableScriptEnforcementRuleOption">
                             <ToggleSwitch x:Name="DefaultWindowsEnableScriptEnforcement" />
                         </controls:SettingsCard>
 
-                        <controls:SettingsCard Description="Indicates that the created/deployed policy will have (Enabled:Boot Audit on Failure) and (Enabled:Advanced Boot Options Menu) policy rule options. Useful for testing the policy and having recovery options available when something goes wrong. Not recommended to be used in the final production-ready policy due to security reasons."
-                                 Header="Test Mode">
+                        <controls:SettingsCard x:Uid="TestModeRuleOption">
                             <ToggleSwitch x:Name="DefaultWindowsTestMode" />
                         </controls:SettingsCard>
 
@@ -185,20 +172,17 @@
                         <Button x:Name="SignedAndReputableCreate" Content="Create" ToolTipService.ToolTip="Create the Signed and Reputable base policy"
                                 Style="{StaticResource AccentButtonStyle}" Margin="0,0,15,0" Click="SignedAndReputableCreate_Click" />
 
-                        <ToggleButton x:Name="SignedAndReputableCreateAndDeploy" Content="Deploy after Creation" ToolTipService.ToolTip="Deploy the Signed and Reputable policy after creating it" Margin="0,0,15,0" />
+                        <ToggleButton x:Name="SignedAndReputableCreateAndDeploy" x:Uid="DeployAfterCreationButton" Margin="0,0,15,0" />
 
                     </controls:WrapPanel>
 
 
                     <controls:SettingsExpander.Items>
 
-                        <controls:SettingsCard Description="Indicates that the created/deployed policy will have (Enabled:Audit Mode) policy rule option and will generate audit logs instead of blocking files." Header="Audit">
-
+                        <controls:SettingsCard x:Uid="AuditRuleOptionSettingsCard">
                             <ToggleSwitch x:Name="SignedAndReputableAudit" Toggled="SignedAndReputableAudit_Toggled" />
-
                         </controls:SettingsCard>
 
-
                         <controls:SettingsCard Description="Specifies the log size for Microsoft-Windows-CodeIntegrity/Operational events." Header="Log Size">
 
                             <controls:WrapPanel Orientation="Horizontal">
@@ -217,24 +201,18 @@
 
                         </controls:SettingsCard>
 
-
-
-                        <controls:SettingsCard Description="Indicates that the created/deployed policy will have (Require EV Signers) policy rule option which will only allow kernel-mode drivers signed with an EV certificate to run."
-                            Header="Require EVSigners">
+                        <controls:SettingsCard x:Uid="RequireEVSignersRuleOption">
                             <ToggleSwitch x:Name="SignedAndReputableRequireEVSigners" />
                         </controls:SettingsCard>
 
-                        <controls:SettingsCard Description="Enables script enforcement for the policy which will severely limit the attack surface of PowerShell by requiring only scripts/modules signed and allowed in the Code Integrity policy to run."
-                            Header="Enable Script Enforcement">
+                        <controls:SettingsCard x:Uid="EnableScriptEnforcementRuleOption">
                             <ToggleSwitch x:Name="SignedAndReputableEnableScriptEnforcement" />
                         </controls:SettingsCard>
 
-                        <controls:SettingsCard Description="Indicates that the created/deployed policy will have (Enabled:Boot Audit on Failure) and (Enabled:Advanced Boot Options Menu) policy rule options. Useful for testing the policy and having recovery options available when something goes wrong. Not recommended to be used in the final production-ready policy due to security reasons."
-                            Header="Test Mode">
+                        <controls:SettingsCard x:Uid="TestModeRuleOption">
                             <ToggleSwitch x:Name="SignedAndReputableTestMode" />
                         </controls:SettingsCard>
 
-
                     </controls:SettingsExpander.Items>
 
                 </controls:SettingsExpander>
@@ -263,7 +241,7 @@
                         <Button x:Name="RecommendedDriverBlockRulesCreate" Content="Create" ToolTipService.ToolTip="Create the Microsoft Recommended Drivers Block List policy"
                             Style="{StaticResource AccentButtonStyle}" Margin="0,0,15,0" Click="RecommendedDriverBlockRulesCreate_Click" />
 
-                        <ToggleButton x:Name="RecommendedDriverBlockRulesCreateAndDeploy" Content="Deploy after Creation" ToolTipService.ToolTip="Deploy the Microsoft Recommended Drivers Block List policy after creating it" Margin="0,0,15,0" />
+                        <ToggleButton x:Name="RecommendedDriverBlockRulesCreateAndDeploy" x:Uid="DeployAfterCreationButton" Margin="0,0,15,0" />
 
                         <Button x:Name="RecommendedDriverBlockRulesScheduledAutoUpdate" Content="Auto Update" ToolTipService.ToolTip="Configures the Microsoft Recommended Drivers Block List to be automatically updated using a scheduled task"
                             Style="{StaticResource AccentButtonStyle}" Click="RecommendedDriverBlockRulesScheduledAutoUpdate_Click" Margin="0,0,15,0" />
@@ -294,7 +272,7 @@
                         <Button x:Name="RecommendedUserModeBlockRulesCreate" Content="Create" ToolTipService.ToolTip="Create the Microsoft recommended user-mode block rules policy"
                               Style="{StaticResource AccentButtonStyle}" Margin="0,0,15,0" Click="RecommendedUserModeBlockRulesCreate_Click" />
 
-                        <ToggleButton x:Name="RecommendedUserModeBlockRulesCreateAndDeploy" Content="Deploy after Creation" ToolTipService.ToolTip="Deploy the Microsoft recommended user-mode block rules policy after creating it" Margin="0,0,15,0" />
+                        <ToggleButton x:Name="RecommendedUserModeBlockRulesCreateAndDeploy" x:Uid="DeployAfterCreationButton" Margin="0,0,15,0" />
 
                     </controls:WrapPanel>
 
@@ -325,7 +303,7 @@
                         <Button x:Name="StrictKernelModePolicyCreateButton" Content="Create" Click="StrictKernelModePolicyCreateButton_Click"
                              Style="{StaticResource AccentButtonStyle}" Margin="0,0,15,0" ToolTipService.ToolTip="Create the Strict Kernel-mode base policy"  />
 
-                        <ToggleButton x:Name="StrictKernelModePolicyToggleButtonForDeploy" Content="Deploy after Creation" ToolTipService.ToolTip="Deploy the Strict Kernel-mode base policy after creating it" Margin="0,0,15,0" />
+                        <ToggleButton x:Name="StrictKernelModePolicyToggleButtonForDeploy" x:Uid="DeployAfterCreationButton" Margin="0,0,15,0" />
 
                     </controls:WrapPanel>
 
diff --git a/AppControl Manager/Pages/CreateSupplementalPolicy.xaml b/AppControl Manager/Pages/CreateSupplementalPolicy.xaml
index fdc0d0dfb..5b6b60efa 100644
--- a/AppControl Manager/Pages/CreateSupplementalPolicy.xaml	
+++ b/AppControl Manager/Pages/CreateSupplementalPolicy.xaml	
@@ -27,7 +27,6 @@
                 <!-- For the Packaged Apps ListView Grouping -->
                 <CollectionViewSource x:Name="PackagedAppsCollectionViewSource" IsSourceGrouped="True"/>
 
-
                 <!-- Defines a single App that is displayed in the ListView -->
 
                 <DataTemplate x:Key="PackagedAppsListViewTemplate" x:DataType="others:PackagedAppView">
@@ -42,13 +41,11 @@
                             <ColumnDefinition Width="*"/>
                         </Grid.ColumnDefinitions>
 
-
                         <Border CornerRadius="15" VerticalAlignment="Center"
                             HorizontalAlignment="Center" BorderThickness="0" Grid.RowSpan="3" Grid.Column="0">
                             <Image Width ="32" Height="32" Margin="6" Source="{x:Bind Logo}" />
                         </Border>
 
-
                         <TextBlock Grid.Column="1"
                             Grid.Row="0"
                             Text="{x:Bind DisplayName}"
@@ -62,7 +59,6 @@
                             Style="{ThemeResource BodyTextBlockStyle}"
                             Margin="12,6,0,0"/>
 
-
                         <TextBlock  Grid.Column="1"
                             Grid.Row="2"
                             Text="{x:Bind PackageFamilyName}"
@@ -78,13 +74,12 @@
             <controls:WrapPanel Grid.Row="0" VerticalSpacing="4" HorizontalSpacing="4" Orientation="Vertical" Margin="6,0,6,10">
 
                 <TextBlock TextWrapping="WrapWholeWords" Style="{StaticResource BodyTextBlockStyle}">
-
                      <Span>
                        Create a <Bold>Supplemental</Bold> policy that will <Run Foreground="{ThemeResource SystemAccentColor}">expand</Run> the scope of a base policy. Supplemental policies can only allow files, they cannot have deny rules in them.
                      </Span>
                 </TextBlock>
 
-                <HyperlinkButton Content="Guide" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Create-Supplemental-App-Control-Policy" />
+                <HyperlinkButton x:Uid="GuideButtonAtTop" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Create-Supplemental-App-Control-Policy" />
 
             </controls:WrapPanel>
 
@@ -95,11 +90,10 @@
                     <win:RepositionThemeTransition IsStaggeringEnabled="False" />
                 </win:StackPanel.ChildrenTransitions>
 
-                <!-- Files and Folders Scan -->
 
+                <!-- Files and Folders Scan -->
                 <controls:SettingsExpander x:Name="FilesAndFoldersSettingsCard"
-                    Description="Create Supplemental policy by scanning files and folders"
-                    Header="Files and Folders"
+                    x:Uid="SupplementalFilesAndFoldersSettingsCard"
                     HeaderIcon="{ui:FontIcon Glyph=&#xE71D;}" IsExpanded="False">
 
                     <controls:SettingsExpander.ItemsHeader>
@@ -117,10 +111,10 @@
 
                     <controls:WrapPanel Orientation="Horizontal" HorizontalSpacing="6" VerticalSpacing="10">
 
-                        <Button x:Name="CreateFilesAndFoldersSupplementalPolicyButton" Content="Create Supplemental Policy"
+                        <Button x:Name="CreateFilesAndFoldersSupplementalPolicyButton" x:Uid="CreateSupplementalPolicyButton"
                             Style="{StaticResource AccentButtonStyle}" Margin="0,0,15,0" Click="CreateFilesAndFoldersSupplementalPolicyButton_Click" />
 
-                        <ToggleButton x:Name="FilesAndFoldersPolicyDeployToggleButton" Click="FilesAndFoldersPolicyDeployToggleButton_Click" Content="Deploy after Creation" Margin="0,0,15,0" />
+                        <ToggleButton x:Name="FilesAndFoldersPolicyDeployToggleButton" Click="FilesAndFoldersPolicyDeployToggleButton_Click" x:Uid="DeployAfterCreationButton" Margin="0,0,15,0" />
 
                         <TeachingTip x:Name="CreateSupplementalPolicyTeachingTip" Target="{x:Bind CreateFilesAndFoldersSupplementalPolicyButton}" />
 
@@ -132,16 +126,16 @@
                             Header="Browse For Files"
                             IsClickEnabled="True" IsActionIconVisible="False" Click="FilesAndFoldersBrowseForFilesSettingsCard_Click" Holding="FilesAndFoldersBrowseForFilesSettingsCard_Holding" RightTapped="FilesAndFoldersBrowseForFilesSettingsCard_RightTapped">
 
-                            <Button x:Name="FilesAndFoldersBrowseForFilesButton" Content="Browse" Click="FilesAndFoldersBrowseForFilesButton_Click" RightTapped="FilesAndFoldersBrowseForFilesButton_RightTapped">
+                            <Button x:Name="FilesAndFoldersBrowseForFilesButton" x:Uid="FileBrowseButton" Click="FilesAndFoldersBrowseForFilesButton_Click" RightTapped="FilesAndFoldersBrowseForFilesButton_RightTapped">
 
                                 <Button.Flyout>
                                     <Flyout x:Name="FilesAndFoldersBrowseForFilesButton_Flyout">
 
                                         <controls:WrapPanel Orientation="Vertical" HorizontalSpacing="15" VerticalSpacing="15">
 
-                                            <Button Content="Clear" Click="FilesAndFoldersBrowseForFilesButton_Flyout_Clear_Click" />
+                                            <Button x:Uid="ClearButton" Click="FilesAndFoldersBrowseForFilesButton_Flyout_Clear_Click" />
 
-                                            <TextBlock Text="View the files you selected." TextWrapping="WrapWholeWords" />
+                                            <TextBlock x:Uid="ViewSelectedFilesTextBlock" TextWrapping="WrapWholeWords" />
 
                                             <TextBox x:Name="FilesAndFoldersBrowseForFilesButton_SelectedFilesTextBox"
                                                 TextWrapping="Wrap" AcceptsReturn="True" IsSpellCheckEnabled="False"
@@ -159,16 +153,16 @@
                         <controls:SettingsCard Description="Browse for Folder paths to scan and include in the Supplemental policy. The folders will be scanned recursively."
                             Header="Browse For Folders" Holding="FilesAndFoldersBrowseForFoldersSettingsCard_Holding" RightTapped="FilesAndFoldersBrowseForFoldersSettingsCard_RightTapped" x:Name="FilesAndFoldersBrowseForFoldersSettingsCard" Click="FilesAndFoldersBrowseForFoldersSettingsCard_Click" IsClickEnabled="True" IsActionIconVisible="False">
 
-                            <Button RightTapped="FilesAndFoldersBrowseForFoldersButton_RightTapped" x:Name="FilesAndFoldersBrowseForFoldersButton" Content="Browse" Click="FilesAndFoldersBrowseForFoldersButton_Click">
+                            <Button RightTapped="FilesAndFoldersBrowseForFoldersButton_RightTapped" x:Name="FilesAndFoldersBrowseForFoldersButton" x:Uid="FolderBrowseButton" Click="FilesAndFoldersBrowseForFoldersButton_Click">
 
                                 <Button.Flyout>
                                     <Flyout x:Name="FilesAndFoldersBrowseForFoldersButton_FlyOut">
 
                                         <controls:WrapPanel Orientation="Vertical" HorizontalSpacing="15" VerticalSpacing="15">
 
-                                            <Button Content="Clear" Click="FilesAndFoldersBrowseForFoldersButton_Flyout_Clear_Click" />
+                                            <Button x:Uid="ClearButton" Click="FilesAndFoldersBrowseForFoldersButton_Flyout_Clear_Click" />
 
-                                            <TextBlock Text="View the folders you selected." TextWrapping="WrapWholeWords" />
+                                            <TextBlock x:Uid="ViewSelectedFoldersTextBlock" TextWrapping="WrapWholeWords" />
 
                                             <TextBox x:Name="FilesAndFoldersBrowseForFoldersButton_SelectedFoldersTextBox"
                                                  TextWrapping="Wrap" AcceptsReturn="True" IsSpellCheckEnabled="False"
@@ -183,11 +177,8 @@
 
                         </controls:SettingsCard>
 
-                        <controls:SettingsCard Description="The name of the Supplemental policy that is going to be created."
-                            Header="Policy Name" IsClickEnabled="False" IsActionIconVisible="False">
-
-                            <TextBox x:Name="FilesAndFoldersPolicyNameTextBox" TextChanged="FilesAndFoldersPolicyNameTextBox_TextChanged" PlaceholderText="Supplemental Policy Name"/>
-
+                        <controls:SettingsCard x:Uid="SupplementalPolicyNameSettingsCard" IsClickEnabled="False" IsActionIconVisible="False">
+                            <TextBox x:Name="FilesAndFoldersPolicyNameTextBox" TextChanged="FilesAndFoldersPolicyNameTextBox_TextChanged" x:Uid="SupplementalPolicyNameTextBox"/>
                         </controls:SettingsCard>
 
                         <controls:SettingsCard Description="Browse for the Base policy XML file that this Supplemental policy will be associated to."
@@ -201,9 +192,9 @@
 
                                         <controls:WrapPanel Orientation="Vertical" HorizontalSpacing="15" VerticalSpacing="15">
 
-                                            <Button Content="Clear" Click="FilesAndFoldersBrowseForBasePolicyButton_Flyout_Clear_Click" />
+                                            <Button x:Uid="ClearButton" Click="FilesAndFoldersBrowseForBasePolicyButton_Flyout_Clear_Click" />
 
-                                            <TextBlock Text="View the Base policy path you selected." TextWrapping="WrapWholeWords" />
+                                            <TextBlock x:Uid="ViewSelectedBasePolicyTextBlock" TextWrapping="WrapWholeWords" />
 
                                             <TextBox x:Name="FilesAndFoldersBrowseForBasePolicyButton_SelectedBasePolicyTextBox"
                                                 TextWrapping="Wrap" AcceptsReturn="True" IsSpellCheckEnabled="False"
@@ -296,9 +287,7 @@
 
                 </controls:SettingsExpander>
 
-
                 <!-- Certificate -->
-
                 <controls:SettingsExpander x:Name="CertificatesSettingsCard"
                     Description="Create Supplemental policy based on certificates"
                     Header="Certificates"
@@ -319,10 +308,10 @@
 
                     <controls:WrapPanel Orientation="Horizontal" HorizontalSpacing="6" VerticalSpacing="10">
 
-                        <Button x:Name="CreateCertificatesSupplementalPolicyButton" Click="CreateCertificatesSupplementalPolicyButton_Click" Content="Create Supplemental Policy"
+                        <Button x:Name="CreateCertificatesSupplementalPolicyButton" Click="CreateCertificatesSupplementalPolicyButton_Click" x:Uid="CreateSupplementalPolicyButton"
                             Style="{StaticResource AccentButtonStyle}" Margin="0,0,15,0" />
 
-                        <ToggleButton x:Name="CertificatesPolicyDeployToggleButton" Click="CertificatesPolicyDeployToggleButton_Click" Content="Deploy after Creation" Margin="0,0,15,0" />
+                        <ToggleButton x:Name="CertificatesPolicyDeployToggleButton" Click="CertificatesPolicyDeployToggleButton_Click" x:Uid="DeployAfterCreationButton" Margin="0,0,15,0" />
 
                         <TeachingTip x:Name="CreateCertificateBasedSupplementalPolicyTeachingTip" Target="{x:Bind CreateCertificatesSupplementalPolicyButton}" />
 
@@ -335,16 +324,13 @@
                             Header="Browse For Certificates" Click="CertificatesBrowseForCertsSettingsCard_Click"
                             IsClickEnabled="True" IsActionIconVisible="False">
 
-                            <Button x:Name="CertificatesBrowseForCertsButton" Content="Browse" Click="CertificatesBrowseForCertsButton_Click" />
+                            <Button x:Name="CertificatesBrowseForCertsButton" x:Uid="FileBrowseButton" Click="CertificatesBrowseForCertsButton_Click" />
 
                         </controls:SettingsCard>
 
 
-                        <controls:SettingsCard Description="The name of the Supplemental policy that is going to be created."
-                            Header="Policy Name" IsClickEnabled="False" IsActionIconVisible="False">
-
-                            <TextBox x:Name="CertificatesPolicyNameTextBox" TextChanged="CertificatesPolicyNameTextBox_TextChanged" PlaceholderText="Supplemental Policy Name"/>
-
+                        <controls:SettingsCard x:Uid="SupplementalPolicyNameSettingsCard" IsClickEnabled="False" IsActionIconVisible="False">
+                            <TextBox x:Name="CertificatesPolicyNameTextBox" TextChanged="CertificatesPolicyNameTextBox_TextChanged" x:Uid="SupplementalPolicyNameTextBox"/>
                         </controls:SettingsCard>
 
                         <controls:SettingsCard x:Name="CertificatesBrowseForBasePolicySettingsCard" Description="Browse for the Base policy XML file that this Supplemental policy will be associated to."
@@ -358,9 +344,9 @@
 
                                         <controls:WrapPanel Orientation="Vertical" HorizontalSpacing="15" VerticalSpacing="15">
 
-                                            <Button Content="Clear" Click="CertificatesBrowseForBasePolicyButton_Flyout_Clear_Click" />
+                                            <Button x:Uid="ClearButton" Click="CertificatesBrowseForBasePolicyButton_Flyout_Clear_Click" />
 
-                                            <TextBlock Text="View the Base policy path you selected." TextWrapping="WrapWholeWords" />
+                                            <TextBlock x:Uid="ViewSelectedBasePolicyTextBlock" TextWrapping="WrapWholeWords" />
 
                                             <TextBox x:Name="CertificatesBrowseForBasePolicyButton_SelectedBasePolicyTextBox"
                                                 TextWrapping="Wrap" AcceptsReturn="True" IsSpellCheckEnabled="False"
@@ -404,9 +390,7 @@
                 </controls:SettingsExpander>
 
 
-
                 <!-- ISG -->
-
                 <controls:SettingsExpander x:Name="ISGSettingsCard"
                     Description="Create a Supplemental policy that only enables the usage of the Intelligent Security Graph to automatically authorize reputable apps and files"
                     Header="ISG"
@@ -426,10 +410,10 @@
 
                     <controls:WrapPanel Orientation="Horizontal" HorizontalSpacing="6" VerticalSpacing="10">
 
-                        <Button x:Name="CreateISGSupplementalPolicyButton" Click="CreateISGSupplementalPolicyButton_Click" Content="Create Supplemental Policy"
+                        <Button x:Name="CreateISGSupplementalPolicyButton" Click="CreateISGSupplementalPolicyButton_Click" x:Uid="CreateSupplementalPolicyButton"
                             Style="{StaticResource AccentButtonStyle}" Margin="0,0,15,0" />
 
-                        <ToggleButton x:Name="ISGPolicyDeployToggleButton" Click="ISGPolicyDeployToggleButton_Click" Content="Deploy after Creation" Margin="0,0,15,0" />
+                        <ToggleButton x:Name="ISGPolicyDeployToggleButton" Click="ISGPolicyDeployToggleButton_Click" x:Uid="DeployAfterCreationButton" Margin="0,0,15,0" />
 
                         <TeachingTip x:Name="CreateISGSupplementalPolicyTeachingTip" Target="{x:Bind CreateISGSupplementalPolicyButton}" />
 
@@ -437,11 +421,8 @@
 
                     <controls:SettingsExpander.Items>
 
-                        <controls:SettingsCard Description="The name of the Supplemental policy that is going to be created."
-                            Header="Policy Name" IsClickEnabled="False" IsActionIconVisible="False">
-
-                            <TextBox x:Name="ISGPolicyNameTextBox" TextChanged="ISGPolicyNameTextBox_TextChanged" PlaceholderText="Supplemental Policy Name"/>
-
+                        <controls:SettingsCard x:Uid="SupplementalPolicyNameSettingsCard" IsClickEnabled="False" IsActionIconVisible="False">
+                            <TextBox x:Name="ISGPolicyNameTextBox" TextChanged="ISGPolicyNameTextBox_TextChanged" x:Uid="SupplementalPolicyNameTextBox"/>
                         </controls:SettingsCard>
 
                         <controls:SettingsCard x:Name="ISGBrowseForBasePolicySettingsCard" Description="Browse for the Base policy XML file that this Supplemental policy will be associated to."
@@ -455,9 +436,9 @@
 
                                         <controls:WrapPanel Orientation="Vertical" HorizontalSpacing="15" VerticalSpacing="15">
 
-                                            <Button Content="Clear" Click="ISGBrowseForBasePolicyButton_Flyout_Clear_Click" />
+                                            <Button x:Uid="ClearButton" Click="ISGBrowseForBasePolicyButton_Flyout_Clear_Click" />
 
-                                            <TextBlock Text="View the Base policy path you selected." TextWrapping="WrapWholeWords" />
+                                            <TextBlock x:Uid="ViewSelectedBasePolicyTextBlock" TextWrapping="WrapWholeWords" />
 
                                             <TextBox x:Name="ISGBrowseForBasePolicyButton_SelectedBasePolicyTextBox"
                                                 TextWrapping="Wrap" AcceptsReturn="True" IsSpellCheckEnabled="False"
@@ -491,9 +472,7 @@
                 </controls:SettingsExpander>
 
 
-
                 <!-- Strict Kernel-Mode -->
-
                 <controls:SettingsExpander x:Name="StrictKernelModeSection"
                     Description="Create a Kernel-mode policy by scanning the event logs or scanning all local drivers"
                     Header="Kernel-mode policy"
@@ -514,10 +493,10 @@
 
                     <controls:WrapPanel Orientation="Horizontal" HorizontalSpacing="6" VerticalSpacing="10">
 
-                        <Button x:Name="StrictKernelModeCreateButton" Content="Create Supplemental Policy"
+                        <Button x:Name="StrictKernelModeCreateButton" x:Uid="CreateSupplementalPolicyButton"
                               Style="{StaticResource AccentButtonStyle}" Margin="0,0,15,0" Click="StrictKernelModeCreateButton_Click" />
 
-                        <ToggleButton x:Name="StrictKernelModeDeployToggleButton" Content="Deploy After Creation" Margin="0,0,15,0" />
+                        <ToggleButton x:Name="StrictKernelModeDeployToggleButton" x:Uid="DeployAfterCreationButton" Margin="0,0,15,0" />
 
                         <TeachingTip x:Name="StrictKernelModeCreateButtonTeachingTip" Target="{x:Bind StrictKernelModeCreateButton}" />
 
@@ -560,9 +539,9 @@
 
                                         <controls:WrapPanel Orientation="Vertical" HorizontalSpacing="15" VerticalSpacing="15">
 
-                                            <Button Content="Clear" Click="StrictKernelModeBrowseForBasePolicyButton_Flyout_Clear_Click" />
+                                            <Button x:Uid="ClearButton" Click="StrictKernelModeBrowseForBasePolicyButton_Flyout_Clear_Click" />
 
-                                            <TextBlock Text="View the Base policy path you selected." TextWrapping="WrapWholeWords" />
+                                            <TextBlock x:Uid="ViewSelectedBasePolicyTextBlock" TextWrapping="WrapWholeWords" />
 
                                             <TextBox x:Name="StrictKernelModeBrowseForBasePolicyButton_SelectedBasePolicyTextBox"
                                                 TextWrapping="Wrap" AcceptsReturn="True" IsSpellCheckEnabled="False"
@@ -592,11 +571,8 @@
                         </controls:SettingsCard>
 
 
-                        <controls:SettingsCard Description="The name of the Supplemental policy that is going to be created."
-                            Header="Policy Name" IsClickEnabled="False" IsActionIconVisible="False">
-
-                            <TextBox x:Name="StrictKernelModePolicyNameTextBox" PlaceholderText="Supplemental Policy Name"/>
-
+                        <controls:SettingsCard x:Uid="SupplementalPolicyNameSettingsCard" IsClickEnabled="False" IsActionIconVisible="False">
+                            <TextBox x:Name="StrictKernelModePolicyNameTextBox" x:Uid="SupplementalPolicyNameTextBox"/>
                         </controls:SettingsCard>
 
 
@@ -615,9 +591,7 @@
                 </controls:SettingsExpander>
 
 
-
-                <!-- Package Family Name (PFN -->
-
+                <!-- Package Family Name (PFN) -->
                 <controls:SettingsExpander x:Name="PFNSettingsCard"
                     Description="Create a Supplemental policy based on an app's Package Family Name (PFN)"
                     Header="Package Family Name"
@@ -637,10 +611,10 @@
 
                     <controls:WrapPanel Orientation="Horizontal" HorizontalSpacing="6" VerticalSpacing="10">
 
-                        <Button x:Name="CreatePFNSupplementalPolicyButton" Click="CreatePFNSupplementalPolicyButton_Click" Content="Create Supplemental Policy"
+                        <Button x:Name="CreatePFNSupplementalPolicyButton" Click="CreatePFNSupplementalPolicyButton_Click" x:Uid="CreateSupplementalPolicyButton"
                             Style="{StaticResource AccentButtonStyle}" Margin="0,0,15,0" />
 
-                        <ToggleButton x:Name="PFNPolicyDeployToggleButton" Content="Deploy after Creation" Margin="0,0,15,0" />
+                        <ToggleButton x:Name="PFNPolicyDeployToggleButton" x:Uid="DeployAfterCreationButton" Margin="0,0,15,0" />
 
                         <TeachingTip x:Name="CreatePFNSupplementalPolicyTeachingTip" Target="{x:Bind CreatePFNSupplementalPolicyButton}" />
 
@@ -648,11 +622,8 @@
 
                     <controls:SettingsExpander.Items>
 
-                        <controls:SettingsCard Description="The name of the Supplemental policy that is going to be created."
-                            Header="Policy Name" IsClickEnabled="False" IsActionIconVisible="False">
-
-                            <TextBox x:Name="PFNPolicyNameTextBox" PlaceholderText="Supplemental Policy Name"/>
-
+                        <controls:SettingsCard x:Uid="SupplementalPolicyNameSettingsCard" IsClickEnabled="False" IsActionIconVisible="False">
+                            <TextBox x:Name="PFNPolicyNameTextBox" x:Uid="SupplementalPolicyNameTextBox"/>
                         </controls:SettingsCard>
 
                         <controls:SettingsCard x:Name="PFNBrowseForBasePolicySettingsCard" Description="Browse for the Base policy XML file that this Supplemental policy will be associated to."
@@ -666,9 +637,9 @@
 
                                         <controls:WrapPanel Orientation="Vertical" HorizontalSpacing="15" VerticalSpacing="15">
 
-                                            <Button Content="Clear" Click="PFNBasePolicyClearButton_Click"/>
+                                            <Button x:Uid="ClearButton" Click="PFNBasePolicyClearButton_Click"/>
 
-                                            <TextBlock Text="View the Base policy path you selected." TextWrapping="WrapWholeWords" />
+                                            <TextBlock x:Uid="ViewSelectedBasePolicyTextBlock" TextWrapping="WrapWholeWords" />
 
                                             <TextBox x:Name="PFNBrowseForBasePolicyButton_SelectedBasePolicyTextBox"
                                                 TextWrapping="Wrap" AcceptsReturn="True" IsSpellCheckEnabled="False"
@@ -708,10 +679,10 @@
 
                                     <TextBox x:Name="PFNAppFilteringTextBox" TextChanged="PFNAppFilteringTextBox_TextChanged" PlaceholderText="Search among the apps"/>
 
-                                    <TextBlock x:Name="PFNSelectedItemsCount" HorizontalAlignment="Center" Text="Selected Apps: 0"/>
-                                    <Button Content="Refresh" HorizontalAlignment="Center" x:Name="PFNRefreshAppsListButton" Click="PFNRefreshAppsListButton_Click" />
-                                    <Button Content="Select All" HorizontalAlignment="Center" x:Name="PFNSelectAllAppsListButton" Click="PFNSelectAllAppsListButton_Click" />
-                                    <Button Content="Remove Selections" HorizontalAlignment="Center" x:Name="PFNRemoveSelectionAppsListButton" Click="PFNRemoveSelectionAppsListButton_Click" />
+                                    <TextBlock x:Uid="SelectedAppsTextBlock" x:Name="PFNSelectedItemsCount" HorizontalAlignment="Center"/>
+                                    <Button x:Uid="RefreshButton" HorizontalAlignment="Center" x:Name="PFNRefreshAppsListButton" Click="PFNRefreshAppsListButton_Click" />
+                                    <Button x:Uid="SelectAllButton" HorizontalAlignment="Center" x:Name="PFNSelectAllAppsListButton" Click="PFNSelectAllAppsListButton_Click" />
+                                    <Button x:Uid="RemoveSelectionsButton" HorizontalAlignment="Center" x:Name="PFNRemoveSelectionAppsListButton" Click="PFNRemoveSelectionAppsListButton_Click" />
 
                                 </controls:WrapPanel>
 
diff --git a/AppControl Manager/Pages/CreateSupplementalPolicyFilesAndFoldersScanResults.xaml b/AppControl Manager/Pages/CreateSupplementalPolicyFilesAndFoldersScanResults.xaml
index fc2853b1b..ac7758eae 100644
--- a/AppControl Manager/Pages/CreateSupplementalPolicyFilesAndFoldersScanResults.xaml	
+++ b/AppControl Manager/Pages/CreateSupplementalPolicyFilesAndFoldersScanResults.xaml	
@@ -22,7 +22,6 @@
         <controls:WrapPanel Grid.Row="0" VerticalSpacing="4" HorizontalSpacing="4" Orientation="Horizontal" Margin="6,10,6,10">
 
             <TextBlock TextWrapping="WrapWholeWords" Style="{StaticResource BodyTextBlockStyle}">
-
                 <Span>
                     View the detected files that were used to create the <Run Foreground="{ThemeResource SystemAccentColor}">Supplemental</Run> policy.
                 </Span>
@@ -36,24 +35,24 @@
 
                 <ProgressRing x:Name="SelectLogsProgressRing" Visibility="Collapsed" IsActive="False" />
 
-                <DropDownButton Content="Actions" ToolTipService.ToolTip="Multiple actions to take on the logs">
+                <DropDownButton x:Uid="ExtraActionsDropDownButton">
                     <DropDownButton.Flyout>
 
                         <MenuFlyout Placement="Bottom">
 
-                            <MenuFlyoutItem Text="Select All" Click="SelectAll_Click">
+                            <MenuFlyoutItem x:Uid="SelectAllMenuFlyoutItem" Click="SelectAll_Click">
                                 <MenuFlyoutItem.Icon>
                                     <FontIcon Glyph="&#xE762;"/>
                                 </MenuFlyoutItem.Icon>
                             </MenuFlyoutItem>
 
-                            <MenuFlyoutItem Text="De-Select All" Click="DeSelectAll_Click">
+                            <MenuFlyoutItem x:Uid="DeSelectAllMenuFlyoutItem" Click="DeSelectAll_Click">
                                 <MenuFlyoutItem.Icon>
                                     <FontIcon Glyph="&#xE8E6;"/>
                                 </MenuFlyoutItem.Icon>
                             </MenuFlyoutItem>
 
-                            <MenuFlyoutItem Text="Clear Data" Click="ClearDataButton_Click" ToolTipService.ToolTip="Clears all of the displayed data">
+                            <MenuFlyoutItem Click="ClearDataButton_Click" x:Uid="ClearDataMenuFlyoutItem">
                                 <MenuFlyoutItem.Icon>
                                     <SymbolIcon Symbol="Delete" />
                                 </MenuFlyoutItem.Icon>
@@ -64,13 +63,13 @@
                     </DropDownButton.Flyout>
                 </DropDownButton>
 
-                <TextBox PlaceholderText="Total logs: 0"
+                <TextBox x:Uid="TotalLogsTextBlock"
             x:Name="TotalCountOfTheFilesTextBox"
             IsReadOnly="True"
             VerticalAlignment="Center"
-            VerticalContentAlignment="Center" ToolTipService.ToolTip="The total number of the logs"/>
+            VerticalContentAlignment="Center"/>
 
-                <TextBox x:Name="SearchBox" Width="300" PlaceholderText="Search data..." TextChanged="SearchBox_TextChanged" VerticalAlignment="Center" VerticalContentAlignment="Center" ToolTipService.ToolTip="Search the data" />
+                <TextBox x:Name="SearchBox" Width="300" x:Uid="SearchBoxTextBox" TextChanged="SearchBox_TextChanged" VerticalAlignment="Center" VerticalContentAlignment="Center" />
 
             </controls:WrapPanel>
         </Border>
diff --git a/AppControl Manager/Pages/Deployment.xaml b/AppControl Manager/Pages/Deployment.xaml
index 258512dd5..94b058aae 100644
--- a/AppControl Manager/Pages/Deployment.xaml	
+++ b/AppControl Manager/Pages/Deployment.xaml	
@@ -29,7 +29,7 @@
                     </Span>
                 </TextBlock>
 
-                <HyperlinkButton Content="Guide" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Deploy-App-Control-Policy" />
+                <HyperlinkButton x:Uid="GuideButtonAtTop" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Deploy-App-Control-Policy" />
 
             </controls:WrapPanel>
 
@@ -126,7 +126,7 @@
 
                                     <controls:WrapPanel Orientation="Vertical" HorizontalSpacing="15" VerticalSpacing="15">
 
-                                        <Button Content="Clear" Click="BrowseForXMLPolicyFilesButton_Flyout_Clear_Click" />
+                                        <Button x:Uid="ClearButton" Click="BrowseForXMLPolicyFilesButton_Flyout_Clear_Click" />
 
                                         <TextBlock Text="View the XML files you selected." TextWrapping="WrapWholeWords" />
 
@@ -194,7 +194,7 @@
 
                                     <controls:WrapPanel Orientation="Vertical" HorizontalSpacing="15" VerticalSpacing="15">
 
-                                        <Button Content="Clear" Click="BrowseForSignedXMLPolicyFilesButton_Flyout_Clear_Click" />
+                                        <Button x:Uid="ClearButton" Click="BrowseForSignedXMLPolicyFilesButton_Flyout_Clear_Click" />
 
                                         <TextBlock Text="View the XML files you selected." TextWrapping="WrapWholeWords" />
 
@@ -240,7 +240,7 @@
 
                     <controls:WrapPanel HorizontalSpacing="15" VerticalSpacing="15">
 
-                        <Button x:Name="BrowseForCIPBinaryFilesButton" Content="Browse" Click="BrowseForCIPBinaryFilesButton_Click"
+                        <Button x:Name="BrowseForCIPBinaryFilesButton" x:Uid="FileBrowseButton" Click="BrowseForCIPBinaryFilesButton_Click"
                                 Holding="BrowseForCIPBinaryFilesButton_Holding" RightTapped="BrowseForCIPBinaryFilesButton_RightTapped">
 
                             <Button.Flyout>
@@ -248,7 +248,7 @@
 
                                     <controls:WrapPanel Orientation="Vertical" HorizontalSpacing="15" VerticalSpacing="15">
 
-                                        <Button Content="Clear" Click="BrowseForCIPBinaryFilesButton_Flyout_Clear_Click" />
+                                        <Button x:Uid="ClearButton" Click="BrowseForCIPBinaryFilesButton_Flyout_Clear_Click" />
 
                                         <TextBlock Text="View the CIP files you selected." TextWrapping="WrapWholeWords" />
 
diff --git a/AppControl Manager/Pages/EventLogsPolicyCreation.xaml b/AppControl Manager/Pages/EventLogsPolicyCreation.xaml
index 3c3380f23..132f870c1 100644
--- a/AppControl Manager/Pages/EventLogsPolicyCreation.xaml	
+++ b/AppControl Manager/Pages/EventLogsPolicyCreation.xaml	
@@ -34,7 +34,7 @@
 
                 <controls:WrapPanel Orientation="Vertical" HorizontalSpacing="15" VerticalSpacing="15">
 
-                    <Button Content="Clear" Click="SelectedCodeIntegrityEVTXFilesFlyout_Clear_Click" />
+                    <Button x:Uid="ClearButton" Click="SelectedCodeIntegrityEVTXFilesFlyout_Clear_Click" />
 
                     <TextBlock Text="View the Code Integrity EVTX files you selected." TextWrapping="WrapWholeWords" />
 
@@ -50,7 +50,7 @@ MinWidth="400" IsReadOnly="True" />
 
                 <controls:WrapPanel Orientation="Vertical" HorizontalSpacing="15" VerticalSpacing="15">
 
-                    <Button Content="Clear" Click="SelectedAppLockerEVTXFilesFlyout_Clear_Click" />
+                    <Button x:Uid="ClearButton" Click="SelectedAppLockerEVTXFilesFlyout_Clear_Click" />
 
                     <TextBlock Text="View the AppLocker EVTX files you selected." TextWrapping="WrapWholeWords" />
 
@@ -79,7 +79,7 @@ MinWidth="400" IsReadOnly="True" />
             </Span>
             </TextBlock>
 
-            <HyperlinkButton Content="Guide" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Create-Policy-From-Event-Logs" />
+            <HyperlinkButton x:Uid="GuideButtonAtTop" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Create-Policy-From-Event-Logs" />
 
         </controls:WrapPanel>
 
@@ -150,9 +150,7 @@ MinWidth="400" IsReadOnly="True" />
               Style="{StaticResource PanelStyle}">
 
                                             <TextBlock Margin="5" VerticalAlignment="Center" TextWrapping="WrapWholeWords">
-
-                                       <Span>Browse for a XML policy file to add <Bold>the logs</Bold> to </Span>
-
+                                                <Span>Browse for a XML policy file to add <Bold>the logs</Bold> to </Span>
                                             </TextBlock>
 
                                             <Button Margin="5" x:Name="AddToPolicyButton" Content="Browse" ToolTipService.ToolTip="Select a XML file to add the scanned logs to" Style="{StaticResource AccentButtonStyle}" Click="AddToPolicyButton_Click" />
@@ -222,24 +220,24 @@ MinWidth="400" IsReadOnly="True" />
                 </DropDownButton>
 
 
-                <DropDownButton Content="Actions" ToolTipService.ToolTip="Multiple actions to take on the logs">
+                <DropDownButton x:Uid="ExtraActionsDropDownButton">
                     <DropDownButton.Flyout>
 
                         <MenuFlyout Placement="Bottom">
 
-                            <MenuFlyoutItem Text="Select All" Click="SelectAll_Click">
+                            <MenuFlyoutItem x:Uid="SelectAllMenuFlyoutItem" Click="SelectAll_Click">
                                 <MenuFlyoutItem.Icon>
                                     <FontIcon Glyph="&#xE762;"/>
                                 </MenuFlyoutItem.Icon>
                             </MenuFlyoutItem>
 
-                            <MenuFlyoutItem Text="De-Select All" Click="DeSelectAll_Click">
+                            <MenuFlyoutItem x:Uid="DeSelectAllMenuFlyoutItem" Click="DeSelectAll_Click">
                                 <MenuFlyoutItem.Icon>
                                     <FontIcon Glyph="&#xE8E6;"/>
                                 </MenuFlyoutItem.Icon>
                             </MenuFlyoutItem>
 
-                            <MenuFlyoutItem Text="Clear Data" Click="ClearDataButton_Click" ToolTipService.ToolTip="Clears all of the displayed data">
+                            <MenuFlyoutItem Click="ClearDataButton_Click" x:Uid="ClearDataMenuFlyoutItem">
                                 <MenuFlyoutItem.Icon>
                                     <SymbolIcon Symbol="Delete" />
                                 </MenuFlyoutItem.Icon>
@@ -247,7 +245,7 @@ MinWidth="400" IsReadOnly="True" />
 
                             <MenuFlyoutSeparator/>
 
-                            <ToggleMenuFlyoutItem x:Name="DeployPolicyToggle" Text="Deploy Policy After Creation" IsChecked="False">
+                            <ToggleMenuFlyoutItem x:Name="DeployPolicyToggle" x:Uid="DeployAfterCreationMenuFlyoutItem" IsChecked="False">
                                 <ToggleMenuFlyoutItem.Icon>
                                     <FontIcon Glyph="&#xE896;"/>
                                 </ToggleMenuFlyoutItem.Icon>
@@ -262,13 +260,13 @@ MinWidth="400" IsReadOnly="True" />
                 </DropDownButton>
 
 
-                <TextBox PlaceholderText="Total logs: 0"
+                <TextBox x:Uid="TotalLogsTextBlock"
                  x:Name="TotalCountOfTheFilesTextBox"
                  IsReadOnly="True"
                  VerticalAlignment="Center"
-                 VerticalContentAlignment="Center" ToolTipService.ToolTip="The total number of the logs"/>
+                 VerticalContentAlignment="Center"/>
 
-                <TextBox x:Name="SearchBox" Width="300" PlaceholderText="Search data..." TextChanged="SearchBox_TextChanged" VerticalAlignment="Center" VerticalContentAlignment="Center" ToolTipService.ToolTip="Search the data" />
+                <TextBox x:Name="SearchBox" Width="300" x:Uid="SearchBoxTextBox" TextChanged="SearchBox_TextChanged" VerticalAlignment="Center" VerticalContentAlignment="Center" />
 
                 <Button Content="Policy Name">
                     <Button.Flyout>
diff --git a/AppControl Manager/Pages/GetCIHashes.xaml b/AppControl Manager/Pages/GetCIHashes.xaml
index 1ed7d5c1a..b6653f170 100644
--- a/AppControl Manager/Pages/GetCIHashes.xaml	
+++ b/AppControl Manager/Pages/GetCIHashes.xaml	
@@ -20,14 +20,13 @@
             <controls:WrapPanel Grid.Row="0" VerticalSpacing="4" HorizontalSpacing="4" Orientation="Vertical" Margin="6,0,6,10">
 
                 <TextBlock TextWrapping="WrapWholeWords" Style="{StaticResource BodyTextBlockStyle}">
-
                     <Span>
                         Calculate the <Italic>Code Integrity</Italic>
                             <Run Foreground="{ThemeResource SystemAccentColor}">hashes</Run>
                         of files.</Span>
                 </TextBlock>
 
-                <HyperlinkButton Content="Guide" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Get-Code-Integrity-Hashes" />
+                <HyperlinkButton x:Uid="GuideButtonAtTop" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Get-Code-Integrity-Hashes" />
 
             </controls:WrapPanel>
 
diff --git a/AppControl Manager/Pages/GetSecurePolicySettings.xaml b/AppControl Manager/Pages/GetSecurePolicySettings.xaml
index 64e8dc8da..ea105da30 100644
--- a/AppControl Manager/Pages/GetSecurePolicySettings.xaml	
+++ b/AppControl Manager/Pages/GetSecurePolicySettings.xaml	
@@ -22,12 +22,11 @@
             <controls:WrapPanel Grid.Row="0" VerticalSpacing="4" HorizontalSpacing="4" Orientation="Vertical" Margin="6,0,6,10">
 
                 <TextBlock TextWrapping="WrapWholeWords"  Style="{StaticResource BodyTextBlockStyle}">
-
                 <Span> Retreive and query <Run Foreground="{ThemeResource SystemAccentColor}">the Secure Settings</Run>
                     on the system. </Span>
                 </TextBlock>
 
-                <HyperlinkButton Content="Guide" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Get-Secure-Policy-Settings" />
+                <HyperlinkButton x:Uid="GuideButtonAtTop" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Get-Secure-Policy-Settings" />
 
             </controls:WrapPanel>
 
diff --git a/AppControl Manager/Pages/Logs.xaml b/AppControl Manager/Pages/Logs.xaml
index 263e459a9..8beb84385 100644
--- a/AppControl Manager/Pages/Logs.xaml	
+++ b/AppControl Manager/Pages/Logs.xaml	
@@ -31,19 +31,18 @@
 
         <controls:WrapPanel Orientation="Horizontal" Grid.Row="1" Margin="10" HorizontalSpacing="10" VerticalSpacing="10">
             <!-- ComboBox for selecting log files -->
-            <ComboBox x:Name="LogFileComboBox" SelectionChanged="LogFileComboBox_SelectionChanged" FontSize="16" />
+            <ComboBox x:Name="LogFileComboBox" SelectionChanged="LogFileComboBox_SelectionChanged" />
 
             <!-- Button to refresh the logs -->
             <Button x:Name="RefreshButton"
-            Content="Refresh Logs"
+            x:Uid="RefreshLogFilesButton"
             Click="RefreshButton_Click"
-            FontSize="16"
             Style="{StaticResource AccentButtonStyle}" />
 
             <!-- Search TextBox -->
             <TextBox x:Name="SearchTextBox"
-             PlaceholderText="Search in the logs..."
-             FontSize="16" MinWidth="300" TextChanged="SearchTextBox_TextChanged"/>
+            PlaceholderText="Search in the logs..."
+            MinWidth="300" TextChanged="SearchTextBox_TextChanged"/>
 
         </controls:WrapPanel>
 
@@ -53,8 +52,8 @@
                     <ItemsRepeater.ItemTemplate>
                         <DataTemplate x:DataType="local:LogLine">
 
-                            <TextBlock
-                      Text="{x:Bind Text}" TextWrapping="Wrap" IsTextSelectionEnabled="True" FontSize="18"/>
+                            <TextBlock Text="{x:Bind Text}"
+                            TextWrapping="Wrap" IsTextSelectionEnabled="True" FontSize="18"/>
 
                         </DataTemplate>
                     </ItemsRepeater.ItemTemplate>
diff --git a/AppControl Manager/Pages/MDEAHPolicyCreation.xaml b/AppControl Manager/Pages/MDEAHPolicyCreation.xaml
index 07d03163c..05c1d8266 100644
--- a/AppControl Manager/Pages/MDEAHPolicyCreation.xaml	
+++ b/AppControl Manager/Pages/MDEAHPolicyCreation.xaml	
@@ -36,14 +36,12 @@
     </Span>
             </TextBlock>
 
-            <HyperlinkButton Content="Guide" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Create-Policy-From-MDE-Advanced-Hunting" />
+            <HyperlinkButton x:Uid="GuideButtonAtTop" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Create-Policy-From-MDE-Advanced-Hunting" />
 
         </controls:WrapPanel>
 
-
         <InfoBar x:Name="MainInfoBar" Grid.Row="1" Visibility="Collapsed" />
 
-
         <controls:WrapPanel Grid.Row="2" Orientation="Horizontal" VerticalAlignment="Center" HorizontalSpacing="10" VerticalSpacing="10">
 
             <ProgressRing x:Name="ScanLogsProgressRing" Visibility="Collapsed" IsActive="False"/>
@@ -54,14 +52,14 @@
                 <SelectorBarItem x:Name="SelectorBarItemCreate" Text="Create"/>
             </SelectorBar>
 
-            <TextBox PlaceholderText="Total logs: 0"
+            <TextBox x:Uid="TotalLogsTextBlock"
                 x:Name="TotalCountOfTheFilesTextBox"
                 IsReadOnly="True"
                 HorizontalAlignment="Right"
                 VerticalAlignment="Center"
-                VerticalContentAlignment="Center" ToolTipService.ToolTip="The total number of the logs"/>
+                VerticalContentAlignment="Center"/>
 
-            <TextBox x:Name="SearchBox" PlaceholderText="Search the data..." TextChanged="SearchBox_TextChanged" VerticalAlignment="Center" VerticalContentAlignment="Center" ToolTipService.ToolTip="Search the data" />
+            <TextBox x:Name="SearchBox" x:Uid="SearchBoxTextBox" TextChanged="SearchBox_TextChanged" VerticalAlignment="Center" VerticalContentAlignment="Center" />
 
             <CalendarDatePicker x:Name="FilterByDateCalendarPicker" PlaceholderText="Filter logs by date" ToolTipService.ToolTip="Will only show logs that are newer than the selected date"/>
 
@@ -94,7 +92,7 @@
 
                             <controls:WrapPanel Orientation="Vertical" HorizontalSpacing="15" VerticalSpacing="15">
 
-                                <Button Content="Clear" Click="BrowseForLogs_Flyout_Clear_Click" />
+                                <Button x:Uid="ClearButton" Click="BrowseForLogs_Flyout_Clear_Click" />
 
                                 <TextBlock Text="View the log files you selected." TextWrapping="WrapWholeWords" />
 
@@ -259,9 +257,7 @@ Spacing="8">
             Style="{StaticResource PanelStyle}">
 
                                             <TextBlock Margin="5" VerticalAlignment="Center" TextWrapping="WrapWholeWords">
-
-                                     <Span>Browse for a XML policy file to add <Bold>the logs</Bold> to </Span>
-
+                                                <Span>Browse for a XML policy file to add <Bold>the logs</Bold> to </Span>
                                             </TextBlock>
 
                                             <Button Margin="5" x:Name="AddToPolicyButton" Content="Browse" ToolTipService.ToolTip="Select a XML file to add the scanned logs to" Style="{StaticResource AccentButtonStyle}" Click="AddToPolicyButton_Click" />
@@ -275,10 +271,8 @@ Spacing="8">
 
 
                                             <TextBlock Margin="5" VerticalAlignment="Center" TextWrapping="WrapWholeWords" Width="290" >
-
                                                <Span>Browse for a <Bold>base</Bold>
-     policy XML file that this <Underline>Supplemental</Underline> policy will belong to </Span>
-
+                                                    policy XML file that this <Underline>Supplemental</Underline> policy will belong to </Span>
                                             </TextBlock>
 
                                             <Button Margin="5" x:Name="BasePolicyFileButton" Content="Browse" ToolTipService.ToolTip="Select a base policy that this supplemental policy will belong to." Style="{StaticResource AccentButtonStyle}" Click="BasePolicyFileButton_Click" />
@@ -306,24 +300,24 @@ Spacing="8">
 
                 </SplitButton>
 
-                <DropDownButton Content="Actions" ToolTipService.ToolTip="Multiple actions to take on the logs">
+                <DropDownButton x:Uid="ExtraActionsDropDownButton">
                     <DropDownButton.Flyout>
 
                         <MenuFlyout Placement="Bottom">
 
-                            <MenuFlyoutItem Text="Select All" Click="SelectAll_Click">
+                            <MenuFlyoutItem x:Uid="SelectAllMenuFlyoutItem" Click="SelectAll_Click">
                                 <MenuFlyoutItem.Icon>
                                     <FontIcon Glyph="&#xE762;"/>
                                 </MenuFlyoutItem.Icon>
                             </MenuFlyoutItem>
 
-                            <MenuFlyoutItem Text="De-Select All" Click="DeSelectAll_Click">
+                            <MenuFlyoutItem x:Uid="DeSelectAllMenuFlyoutItem" Click="DeSelectAll_Click">
                                 <MenuFlyoutItem.Icon>
                                     <FontIcon Glyph="&#xE8E6;"/>
                                 </MenuFlyoutItem.Icon>
                             </MenuFlyoutItem>
 
-                            <MenuFlyoutItem Text="Clear Data" Click="ClearDataButton_Click" ToolTipService.ToolTip="Clears all of the displayed data">
+                            <MenuFlyoutItem Click="ClearDataButton_Click" x:Uid="ClearDataMenuFlyoutItem">
                                 <MenuFlyoutItem.Icon>
                                     <SymbolIcon Symbol="Delete" />
                                 </MenuFlyoutItem.Icon>
@@ -331,15 +325,12 @@ Spacing="8">
 
                             <MenuFlyoutSeparator/>
 
-                            <ToggleMenuFlyoutItem x:Name="DeployPolicyToggle" Text="Deploy Policy After Creation" IsChecked="False">
+                            <ToggleMenuFlyoutItem x:Name="DeployPolicyToggle" x:Uid="DeployAfterCreationMenuFlyoutItem" IsChecked="False">
                                 <ToggleMenuFlyoutItem.Icon>
                                     <FontIcon Glyph="&#xE896;"/>
                                 </ToggleMenuFlyoutItem.Icon>
-
-
                             </ToggleMenuFlyoutItem>
 
-
                         </MenuFlyout>
 
                     </DropDownButton.Flyout>
@@ -368,12 +359,10 @@ Spacing="8">
                     <ComboBoxItem>Hash</ComboBoxItem>
                 </ComboBox>
 
-
             </controls:WrapPanel>
 
         </Border>
 
-
         <!-- DataGrid for FileIdentity Outputs -->
         <Border Grid.Row="4" Style="{StaticResource GridCardStyle}" Margin="0,0,0,10" Padding="5">
             <tk7controls:DataGrid
diff --git a/AppControl Manager/Pages/MergePolicies.xaml b/AppControl Manager/Pages/MergePolicies.xaml
index 199a4fe62..f7508ef78 100644
--- a/AppControl Manager/Pages/MergePolicies.xaml	
+++ b/AppControl Manager/Pages/MergePolicies.xaml	
@@ -30,7 +30,7 @@
 </Span>
                 </TextBlock>
 
-                <HyperlinkButton Content="Guide" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Merge-App-Control-Policies" />
+                <HyperlinkButton x:Uid="GuideButtonAtTop" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Merge-App-Control-Policies" />
 
             </controls:WrapPanel>
 
@@ -87,7 +87,7 @@
 
                                         <controls:WrapPanel Orientation="Vertical" HorizontalSpacing="15" VerticalSpacing="15">
 
-                                            <Button Content="Clear" Click="MainPolicy_Flyout_ClearButton" />
+                                            <Button x:Uid="ClearButton" Click="MainPolicy_Flyout_ClearButton" />
 
                                             <TextBlock Text="View the Main policy you selected." TextWrapping="WrapWholeWords" />
 
@@ -115,7 +115,7 @@
 
                                         <controls:WrapPanel Orientation="Vertical" HorizontalSpacing="15" VerticalSpacing="15">
 
-                                            <Button Content="Clear" Click="OtherPolicies_Flyout_ClearButton" />
+                                            <Button x:Uid="ClearButton" Click="OtherPolicies_Flyout_ClearButton" />
 
                                             <TextBlock Text="View the other policies you selected." TextWrapping="WrapWholeWords" />
 
diff --git a/AppControl Manager/Pages/Simulation.xaml b/AppControl Manager/Pages/Simulation.xaml
index abb3fcf86..8e57e96d6 100644
--- a/AppControl Manager/Pages/Simulation.xaml	
+++ b/AppControl Manager/Pages/Simulation.xaml	
@@ -23,17 +23,16 @@
         <controls:WrapPanel Grid.Row="0" VerticalSpacing="4" HorizontalSpacing="4" Orientation="Vertical" Margin="6,0,6,10">
 
             <TextBlock TextWrapping="WrapWholeWords" Style="{StaticResource BodyTextBlockStyle}">
-
-<Span>
-    Perform <Italic>App Control for Business</Italic>
-        <Run Foreground="{ThemeResource SystemAccentColor}">Simulation</Run>
-    by selecting files or folders, and a XML policy file, then use the
-    <Underline><Bold>Begin Simulation</Bold></Underline> button to populate the data grid.
-     The results will show you whether the selected files would be allowed or blocked by your App Control policy if it was actually deployed on a system and those files were run.
-</Span>
+                <Span>
+                    Perform <Italic>App Control for Business</Italic>
+                        <Run Foreground="{ThemeResource SystemAccentColor}">Simulation</Run>
+                    by selecting files or folders, and a XML policy file, then use the
+                    <Underline><Bold>Begin Simulation</Bold></Underline> button to populate the data grid.
+                     The results will show you whether the selected files would be allowed or blocked by your App Control policy if it was actually deployed on a system and those files were run.
+                </Span>
             </TextBlock>
 
-            <HyperlinkButton Content="Guide" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Simulation" />
+            <HyperlinkButton x:Uid="GuideButtonAtTop" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Simulation" />
 
         </controls:WrapPanel>
 
@@ -60,7 +59,7 @@
 
                             <controls:WrapPanel Orientation="Vertical" HorizontalSpacing="15" VerticalSpacing="15">
 
-                                <Button Content="Clear" Click="SelectXmlFileButton_Flyout_Clear_Click" />
+                                <Button x:Uid="ClearButton" Click="SelectXmlFileButton_Flyout_Clear_Click" />
 
                                 <TextBlock Text="View the XML file you selected." TextWrapping="WrapWholeWords" />
 
@@ -89,9 +88,9 @@
 
                             <controls:WrapPanel Orientation="Vertical" HorizontalSpacing="15" VerticalSpacing="15">
 
-                                <Button Content="Clear" Click="SelectFilesButton_Flyout_Clear_Click" />
+                                <Button x:Uid="ClearButton" Click="SelectFilesButton_Flyout_Clear_Click" />
 
-                                <TextBlock Text="View the files you selected." TextWrapping="WrapWholeWords" />
+                                <TextBlock x:Uid="ViewSelectedFilesTextBlock" TextWrapping="WrapWholeWords" />
 
                                 <TextBox x:Name="SelectFilesButton_SelectedFilesTextBox"
                                     TextWrapping="Wrap" AcceptsReturn="True" IsSpellCheckEnabled="False"
@@ -120,9 +119,9 @@
 
                             <controls:WrapPanel Orientation="Vertical" HorizontalSpacing="15" VerticalSpacing="15">
 
-                                <Button Content="Clear" Click="SelectFoldersButton_Flyout_Clear_Click" />
+                                <Button x:Uid="ClearButton" Click="SelectFoldersButton_Flyout_Clear_Click" />
 
-                                <TextBlock Text="View the folders you selected." TextWrapping="WrapWholeWords" />
+                                <TextBlock x:Uid="ViewSelectedFoldersTextBlock" TextWrapping="WrapWholeWords" />
 
                                 <TextBox x:Name="SelectFoldersButton_SelectedFilesTextBox"
                                     TextWrapping="Wrap" AcceptsReturn="True" IsSpellCheckEnabled="False"
@@ -177,7 +176,7 @@
                             <MenuFlyoutSeparator/>
 
                             <!-- Clear Data Button -->
-                            <MenuFlyoutItem Text="Clear Data" Click="ClearDataButton_Click" ToolTipService.ToolTip="Clears all of the displayed data">
+                            <MenuFlyoutItem Click="ClearDataButton_Click" x:Uid="ClearDataMenuFlyoutItem">
                                 <MenuFlyoutItem.Icon>
                                     <SymbolIcon Symbol="Delete" />
                                 </MenuFlyoutItem.Icon>
diff --git a/AppControl Manager/Pages/StrictKernelPolicyScanResults.xaml b/AppControl Manager/Pages/StrictKernelPolicyScanResults.xaml
index 5fd4bcdc8..4353b9356 100644
--- a/AppControl Manager/Pages/StrictKernelPolicyScanResults.xaml	
+++ b/AppControl Manager/Pages/StrictKernelPolicyScanResults.xaml	
@@ -22,7 +22,6 @@
         <controls:WrapPanel Grid.Row="0" VerticalSpacing="4" HorizontalSpacing="4" Orientation="Horizontal" Margin="6,0,6,10">
 
             <TextBlock TextWrapping="WrapWholeWords" Style="{StaticResource BodyTextBlockStyle}">
-
                 <Span>
                     View the detected Kernel-mode files that will be used to create the <Run Foreground="{ThemeResource SystemAccentColor}">enforced mode</Run> policy. Remove items you don't want to be included in the final Strict Kernel-mode policy from the list.
                 </Span>
@@ -36,24 +35,24 @@
 
                 <ProgressRing x:Name="SelectLogsProgressRing" Visibility="Collapsed" IsActive="False" />
 
-                <DropDownButton Content="Actions" ToolTipService.ToolTip="Multiple actions to take on the logs">
+                <DropDownButton x:Uid="ExtraActionsDropDownButton">
                     <DropDownButton.Flyout>
 
                         <MenuFlyout Placement="Bottom">
 
-                            <MenuFlyoutItem Text="Select All" Click="SelectAll_Click">
+                            <MenuFlyoutItem x:Uid="SelectAllMenuFlyoutItem" Click="SelectAll_Click">
                                 <MenuFlyoutItem.Icon>
                                     <FontIcon Glyph="&#xE762;"/>
                                 </MenuFlyoutItem.Icon>
                             </MenuFlyoutItem>
 
-                            <MenuFlyoutItem Text="De-Select All" Click="DeSelectAll_Click">
+                            <MenuFlyoutItem x:Uid="DeSelectAllMenuFlyoutItem" Click="DeSelectAll_Click">
                                 <MenuFlyoutItem.Icon>
                                     <FontIcon Glyph="&#xE8E6;"/>
                                 </MenuFlyoutItem.Icon>
                             </MenuFlyoutItem>
 
-                            <MenuFlyoutItem Text="Clear Data" Click="ClearDataButton_Click" ToolTipService.ToolTip="Clears all of the displayed data">
+                            <MenuFlyoutItem Click="ClearDataButton_Click" x:Uid="ClearDataMenuFlyoutItem">
                                 <MenuFlyoutItem.Icon>
                                     <SymbolIcon Symbol="Delete" />
                                 </MenuFlyoutItem.Icon>
@@ -64,13 +63,13 @@
                     </DropDownButton.Flyout>
                 </DropDownButton>
 
-                <TextBox PlaceholderText="Total logs: 0"
-            x:Name="TotalCountOfTheFilesTextBox"
-            IsReadOnly="True"
-            VerticalAlignment="Center"
-            VerticalContentAlignment="Center" ToolTipService.ToolTip="The total number of the logs"/>
+                <TextBox x:Uid="TotalLogsTextBlock"
+                x:Name="TotalCountOfTheFilesTextBox"
+                IsReadOnly="True"
+                VerticalAlignment="Center"
+                VerticalContentAlignment="Center"/>
 
-                <TextBox x:Name="SearchBox" Width="300" PlaceholderText="Search data..." TextChanged="SearchBox_TextChanged" VerticalAlignment="Center" VerticalContentAlignment="Center" ToolTipService.ToolTip="Search the data" />
+                <TextBox x:Name="SearchBox" Width="300" x:Uid="SearchBoxTextBox" TextChanged="SearchBox_TextChanged" VerticalAlignment="Center" VerticalContentAlignment="Center" />
 
             </controls:WrapPanel>
         </Border>
diff --git a/AppControl Manager/Pages/SystemInformation/SystemInformation.xaml b/AppControl Manager/Pages/SystemInformation/SystemInformation.xaml
index 7f5225809..8fb57b1c5 100644
--- a/AppControl Manager/Pages/SystemInformation/SystemInformation.xaml	
+++ b/AppControl Manager/Pages/SystemInformation/SystemInformation.xaml	
@@ -20,16 +20,15 @@
         <controls:WrapPanel Grid.Row="0" VerticalSpacing="4" HorizontalSpacing="4" Orientation="Horizontal" Margin="5,0,0,5">
 
             <TextBlock TextWrapping="WrapWholeWords" Style="{StaticResource BodyTextBlockStyle}">
-
-<Span>
-    View detailed information about
-        <Run Foreground="{ThemeResource SystemAccentColor}">the Deployed policies</Run>
-   and <Bold>Code Integrity</Bold> on the system.
-
-</Span>
+                <Span>
+                    View detailed information about
+                        <Run Foreground="{ThemeResource SystemAccentColor}">the Deployed policies</Run>
+                   and <Bold>Code Integrity</Bold> on the system.
+                
+                </Span>
             </TextBlock>
 
-            <HyperlinkButton Margin="0,-6,0,0" Content="Guide" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/System-Information" />
+            <HyperlinkButton Margin="0,-6,0,0" x:Uid="GuideButtonAtTop" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/System-Information" />
 
         </controls:WrapPanel>
 
diff --git a/AppControl Manager/Pages/Update.xaml b/AppControl Manager/Pages/Update.xaml
index af9535b2a..bc567f6f9 100644
--- a/AppControl Manager/Pages/Update.xaml	
+++ b/AppControl Manager/Pages/Update.xaml	
@@ -23,13 +23,12 @@
             <controls:WrapPanel Grid.Row="0" VerticalSpacing="4" HorizontalSpacing="4" Orientation="Vertical" Margin="6,0,6,10">
 
                 <TextBlock TextWrapping="WrapWholeWords" Style="{StaticResource BodyTextBlockStyle}">
-
-<Span>
-    Check for <Run Foreground="{ThemeResource SystemAccentColor}">updates</Run> in this page. You can also enable automatic update check which will happen once at startup and you will be notified whenever a new version is available.
-</Span>
+                    <Span>
+                        Check for <Run Foreground="{ThemeResource SystemAccentColor}">updates</Run> in this page. You can also enable automatic update check which will happen once at startup and you will be notified whenever a new version is available.
+                    </Span>
                 </TextBlock>
 
-                <HyperlinkButton Content="Guide" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Update" />
+                <HyperlinkButton x:Uid="GuideButtonAtTop" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Update" />
 
             </controls:WrapPanel>
 
diff --git a/AppControl Manager/Pages/ValidatePolicy.xaml b/AppControl Manager/Pages/ValidatePolicy.xaml
index ce20c24b3..ce4ac510d 100644
--- a/AppControl Manager/Pages/ValidatePolicy.xaml	
+++ b/AppControl Manager/Pages/ValidatePolicy.xaml	
@@ -22,14 +22,13 @@
             <controls:WrapPanel Grid.Row="0" VerticalSpacing="4" HorizontalSpacing="4" Orientation="Horizontal" Margin="5,0,5,10">
 
                 <TextBlock TextWrapping="WrapWholeWords" Style="{StaticResource BodyTextBlockStyle}">
-
                     <Span>
                         Validate <Run Foreground="{ThemeResource SystemAccentColor}">App Control</Run> Policies to ensure they are compliant with the official schema.
                         If you manually modified XML policy files and want to ensure your modifications are correct, use this feature to validate them.
                     </Span>
                 </TextBlock>
 
-                <HyperlinkButton Content="Guide" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Validate-Policies" />
+                <HyperlinkButton x:Uid="GuideButtonAtTop" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Validate-Policies" />
 
             </controls:WrapPanel>
 
diff --git a/AppControl Manager/Pages/ViewFileCertificates.xaml b/AppControl Manager/Pages/ViewFileCertificates.xaml
index b00edc199..8173e14b9 100644
--- a/AppControl Manager/Pages/ViewFileCertificates.xaml	
+++ b/AppControl Manager/Pages/ViewFileCertificates.xaml	
@@ -23,14 +23,13 @@
         <controls:WrapPanel Grid.Row="0" VerticalSpacing="4" HorizontalSpacing="4" Orientation="Vertical" Margin="5,0,5,5">
 
             <TextBlock TextWrapping="WrapWholeWords" Style="{StaticResource BodyTextBlockStyle}">
-
                   <Span>
                       View <Run Foreground="{ThemeResource SystemAccentColor}">Comprehensive</Run> information about the certificates used to sign files.
                         Details that are typically unavailable in File Explorer properties or PowerShell cmdlets are presented here in full.
                   </Span>
             </TextBlock>
 
-            <HyperlinkButton Content="Guide" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/View-File-Certificates" />
+            <HyperlinkButton x:Uid="GuideButtonAtTop" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/View-File-Certificates" />
 
         </controls:WrapPanel>
 
@@ -43,11 +42,10 @@
                 <win:RepositionThemeTransition IsStaggeringEnabled="False" />
             </win:StackPanel.ChildrenTransitions>
 
-            <controls:SettingsCard Description="Browse for a file to see all of its available certificates"
-                                     x:Name="BrowseForFilesSettingsCard"
-                  Header="Select File" Click="BrowseForFilesSettingsCard_Click" IsClickEnabled="True" IsActionIconVisible="False">
+            <controls:SettingsCard x:Uid="BrowseForFilesSettingsCard" x:Name="BrowseForFilesSettingsCard"
+            Click="BrowseForFilesSettingsCard_Click" IsClickEnabled="True" IsActionIconVisible="False">
 
-                <Button Content="Browse" x:Name="BrowseForFilesButton" Click="BrowseForFilesButton_Click"  />
+                <Button x:Uid="FileBrowseButton" x:Name="BrowseForFilesButton" Click="BrowseForFilesButton_Click"  />
 
             </controls:SettingsCard>
 
diff --git a/AppControl Manager/Resources/StrictKernelMode_NoFlightRoots.xml b/AppControl Manager/Resources/StrictKernelMode_NoFlightRoots.xml
index 866010394..fa27ba9c5 100644
--- a/AppControl Manager/Resources/StrictKernelMode_NoFlightRoots.xml	
+++ b/AppControl Manager/Resources/StrictKernelMode_NoFlightRoots.xml	
@@ -24,7 +24,7 @@
   <EKUs>
     <EKU ID="ID_EKU_WINDOWS" Value="010A2B0601040182370A0306"/>
     <EKU ID="ID_EKU_ELAM" Value="010A2B0601040182373D0401"/>
-    <EKU ID="ID_EKU_HAL_EXT" Value="010a2b0601040182373d0501"/>
+    <EKU ID="ID_EKU_HAL_EXT" Value="010A2B0601040182373D0501"/>
   </EKUs>
   <FileRules/>
   <Signers>
diff --git a/AppControl Manager/Strings/en-US/Resources.resw b/AppControl Manager/Strings/en-US/Resources.resw
index 2eb2227b0..9f6ee7b44 100644
--- a/AppControl Manager/Strings/en-US/Resources.resw	
+++ b/AppControl Manager/Strings/en-US/Resources.resw	
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<root><!-- 
-    Microsoft ResX Schema 
-    
+<root><!--
+    Microsoft ResX Schema
+
     Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
     associated with the data types.
-    
+
     Example:
-    
+
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -25,36 +25,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-                
-    There are any number of "resheader" rows that contain simple 
+
+    There are any number of "resheader" rows that contain simple
     name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
     mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
     extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
     read any of the formats listed below.
-    
+
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -238,4 +238,274 @@
   <data name="Update" xml:space="preserve">
     <value>Update</value>
   </data>
+  <data name="BrowseForFilesSettingsCard.Description" xml:space="preserve">
+    <value>Browse for a file to see all of its available certificates</value>
+  </data>
+  <data name="BrowseForFilesSettingsCard.Header" xml:space="preserve">
+    <value>Select File</value>
+  </data>
+  <data name="GuideButtonAtTop.Content" xml:space="preserve">
+    <value>Guide</value>
+  </data>
+  <data name="GuideButtonAtTop.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Click/Tap to visit the full Guide for this page on GitHub</value>
+  </data>
+  <data name="DeployAfterCreationButton.Content" xml:space="preserve">
+    <value>Deploy after Creation</value>
+  </data>
+  <data name="DeployAfterCreationButton.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Toggling this button means the policy will be deployed on the system after it&apos;s been created</value>
+  </data>
+  <data name="CreateSupplementalPolicyButton.Content" xml:space="preserve">
+    <value>Create Supplemental Policy</value>
+  </data>
+  <data name="CreateSupplementalPolicyButton.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Create the Supplemental policy based on the configurations you selected</value>
+  </data>
+  <data name="CreateDenyPolicyButton.Content" xml:space="preserve">
+    <value>Create Deny Policy</value>
+  </data>
+  <data name="CreateDenyPolicyButton.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Create the Deny policy based on the configurations you selected</value>
+  </data>
+  <data name="CreateDenyPolicyFilesAndFoldersSettingsExpander.Description" xml:space="preserve">
+    <value>Create Deny policy by scanning files and folders</value>
+  </data>
+  <data name="CreateDenyPolicyFilesAndFoldersSettingsExpander.Header" xml:space="preserve">
+    <value>Files and Folders</value>
+  </data>
+  <data name="CreateDenyPolicyFilesAndFoldersSettingsExpander.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Create Deny policy by scanning files and folders</value>
+  </data>
+  <data name="CreateDenyPolicyPFNSettingsExpander.Description" xml:space="preserve">
+    <value>Create a Deny policy based on an app&apos;s Package Family Name (PFN)</value>
+  </data>
+  <data name="CreateDenyPolicyPFNSettingsExpander.Header" xml:space="preserve">
+    <value>Package Family Name</value>
+  </data>
+  <data name="CreateDenyPolicyPFNSettingsExpander.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Create a Deny policy based on an app&apos;s Package Family Name (PFN)</value>
+  </data>
+  <data name="AuditRuleOptionSettingsCard.Description" xml:space="preserve">
+    <value>Indicates that the created/deployed policy will have (Enabled:Audit Mode) policy rule option and will generate audit logs instead of blocking files.</value>
+  </data>
+  <data name="AuditRuleOptionSettingsCard.Header" xml:space="preserve">
+    <value>Audit</value>
+  </data>
+  <data name="AuditRuleOptionSettingsCard.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Indicates that the created/deployed policy will have (Enabled:Audit Mode) policy rule option and will generate audit logs instead of blocking files.</value>
+  </data>
+  <data name="RequireEVSignersRuleOption.Description" xml:space="preserve">
+    <value>Indicates that the created/deployed policy will have (Require EV Signers) policy rule option which will only allow kernel-mode drivers signed with an EV certificate to run.</value>
+  </data>
+  <data name="RequireEVSignersRuleOption.Header" xml:space="preserve">
+    <value>Require EVSigners</value>
+  </data>
+  <data name="RequireEVSignersRuleOption.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Indicates that the created/deployed policy will have (Require EV Signers) policy rule option which will only allow kernel-mode drivers signed with an EV certificate to run.</value>
+  </data>
+  <data name="EnableScriptEnforcementRuleOption.Description" xml:space="preserve">
+    <value>Enables script enforcement for the policy which will severely limit the attack surface of PowerShell by requiring only scripts/modules signed and allowed in the Code Integrity policy to run.</value>
+  </data>
+  <data name="EnableScriptEnforcementRuleOption.Header" xml:space="preserve">
+    <value>Enable Script Enforcement</value>
+  </data>
+  <data name="EnableScriptEnforcementRuleOption.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Enables script enforcement for the policy which will severely limit the attack surface of PowerShell by requiring only scripts/modules signed and allowed in the Code Integrity policy to run.</value>
+  </data>
+  <data name="TestModeRuleOption.Description" xml:space="preserve">
+    <value>Indicates that the created/deployed policy will have (Enabled:Boot Audit on Failure) and (Enabled:Advanced Boot Options Menu) policy rule options. Useful for testing the policy and having recovery options available when something goes wrong. Not recommended to be used in the final production-ready policy due to security reasons.</value>
+  </data>
+  <data name="TestModeRuleOption.Header" xml:space="preserve">
+    <value>Test Mode</value>
+  </data>
+  <data name="TestModeRuleOption.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Indicates that the created/deployed policy will have (Enabled:Boot Audit on Failure) and (Enabled:Advanced Boot Options Menu) policy rule options. Useful for testing the policy and having recovery options available when something goes wrong. Not recommended to be used in the final production-ready policy due to security reasons.</value>
+  </data>
+  <data name="FileBrowseButton.Content" xml:space="preserve">
+    <value>Browse</value>
+  </data>
+  <data name="FileBrowseButton.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Opens the File picker dialog allowing you select file(s)</value>
+  </data>
+  <data name="FolderBrowseButton.Content" xml:space="preserve">
+    <value>Browse</value>
+  </data>
+  <data name="FolderBrowseButton.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Opens the Folder picker dialog allowing you select folder(s)</value>
+  </data>
+  <data name="SupplementalPolicyNameTextBox.PlaceholderText" xml:space="preserve">
+    <value>Supplemental Policy Name</value>
+  </data>
+  <data name="SupplementalPolicyNameTextBox.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Enter a name for the Supplemental policy that will be created.</value>
+  </data>
+  <data name="SupplementalPolicyNameSettingsCard.Description" xml:space="preserve">
+    <value>The name of the Supplemental policy that is going to be created.</value>
+  </data>
+  <data name="SupplementalPolicyNameSettingsCard.ToolTipService.ToolTip" xml:space="preserve">
+    <value>The name of the Supplemental policy that is going to be created.</value>
+  </data>
+  <data name="SupplementalPolicyNameSettingsCard.Header" xml:space="preserve">
+    <value>Policy Name</value>
+  </data>
+  <data name="SupplementalFilesAndFoldersSettingsCard.Header" xml:space="preserve">
+    <value>Files and Folders</value>
+  </data>
+  <data name="SupplementalFilesAndFoldersSettingsCard.Description" xml:space="preserve">
+    <value>Create Supplemental policy by scanning files and folders</value>
+  </data>
+  <data name="SupplementalFilesAndFoldersSettingsCard.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Create Supplemental policy by scanning files and folders</value>
+  </data>
+  <data name="ClearButton.Content" xml:space="preserve">
+    <value>Clear</value>
+  </data>
+  <data name="ClearButton.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Clear</value>
+  </data>
+  <data name="ReviewEventLogsNavItem.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Review the Event Logs that were collected during the Audit mode phase</value>
+  </data>
+  <data name="ReviewEventLogsNavItem.Content" xml:space="preserve">
+    <value>Review the Event Logs</value>
+  </data>
+  <data name="ReviewLocalFilesNavItem.Content" xml:space="preserve">
+    <value>Review the Local Files</value>
+  </data>
+  <data name="ReviewLocalFilesNavItem.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Review the Local Files. These are the files that were found in the directories you browsed for.</value>
+  </data>
+  <data name="AllowNewAppsInternalMainNavItem.Content" xml:space="preserve">
+    <value>Start allowing apps or files</value>
+  </data>
+  <data name="AllowNewAppsInternalMainNavItem.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Start allowing apps or files by either running them or browsing for their directories during the Audit mode phase.</value>
+  </data>
+  <data name="ExtraActionsDropDownButton.Content" xml:space="preserve">
+    <value>Actions</value>
+  </data>
+  <data name="ExtraActionsDropDownButton.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Offers multiple different actions to take on the displayed data</value>
+  </data>
+  <data name="ClearDataMenuFlyoutItem.Text" xml:space="preserve">
+    <value>Clear Data</value>
+  </data>
+  <data name="ClearDataMenuFlyoutItem.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Clear all of the displayed data</value>
+  </data>
+  <data name="DeployAfterCreationMenuFlyoutItem.Text" xml:space="preserve">
+    <value>Deploy after Creation</value>
+  </data>
+  <data name="DeployAfterCreationMenuFlyoutItem.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Toggling this button means the policy will be deployed on the system after it&apos;s been created</value>
+  </data>
+  <data name="SearchBoxTextBox.PlaceholderText" xml:space="preserve">
+    <value>Search the data...</value>
+  </data>
+  <data name="SearchBoxTextBox.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Search among the displayed data</value>
+  </data>
+  <data name="DeSelectAllMenuFlyoutItem.Text" xml:space="preserve">
+    <value>De-Select All</value>
+  </data>
+  <data name="DeSelectAllMenuFlyoutItem.ToolTipService.ToolTip" xml:space="preserve">
+    <value>De-select any selected data</value>
+  </data>
+  <data name="SelectAllMenuFlyoutItem.Text" xml:space="preserve">
+    <value>Select All</value>
+  </data>
+  <data name="SelectAllMenuFlyoutItem.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Select all of the displayed data</value>
+  </data>
+  <data name="SelectAllButton.Content" xml:space="preserve">
+    <value>Select all</value>
+  </data>
+  <data name="SelectAllButton.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Select all</value>
+  </data>
+  <data name="RefreshButton.Content" xml:space="preserve">
+    <value>Refresh</value>
+  </data>
+  <data name="RefreshButton.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Refresh</value>
+  </data>
+  <data name="RemoveSelectionsButton.Content" xml:space="preserve">
+    <value>Remove Selections</value>
+  </data>
+  <data name="RemoveSelectionsButton.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Remove Selections</value>
+  </data>
+  <data name="SelectedAppsTextBlock.Text" xml:space="preserve">
+    <value>Selected Apps: 0</value>
+  </data>
+  <data name="SelectedAppsTextBlock.ToolTipService.ToolTip" xml:space="preserve">
+    <value>The total number of the selected Apps</value>
+  </data>
+  <data name="BrowseForFoldersDenyPolicySettingsCard.Description" xml:space="preserve">
+    <value>Browse for Folder paths to scan and include in the Deny policy. The folders will be scanned recursively.</value>
+  </data>
+  <data name="BrowseForFoldersDenyPolicySettingsCard.Header" xml:space="preserve">
+    <value>Browse For Folders</value>
+  </data>
+  <data name="BrowseForFoldersDenyPolicySettingsCard.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Browse for Folder paths to scan and include in the Deny policy. The folders will be scanned recursively.</value>
+  </data>
+  <data name="BrowseForFilesDenyPolicySettingsCard.Description" xml:space="preserve">
+    <value>Browse for file paths to scan and include in the Deny policy.</value>
+  </data>
+  <data name="BrowseForFilesDenyPolicySettingsCard.Header" xml:space="preserve">
+    <value>Browse For Files</value>
+  </data>
+  <data name="BrowseForFilesDenyPolicySettingsCard.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Browse for file paths to scan and include in the Deny policy.</value>
+  </data>
+  <data name="DenyPolicyNameSettingsCard.Description" xml:space="preserve">
+    <value>The name of the Deny policy that is going to be created.</value>
+  </data>
+  <data name="DenyPolicyNameSettingsCard.Header" xml:space="preserve">
+    <value>Policy Name</value>
+  </data>
+  <data name="DenyPolicyNameSettingsCard.ToolTipService.ToolTip" xml:space="preserve">
+    <value>The name of the Deny policy that is going to be created.</value>
+  </data>
+  <data name="ViewSelectedBasePolicyTextBlock.Text" xml:space="preserve">
+    <value>View the Base policy path you selected.</value>
+  </data>
+  <data name="ViewSelectedFilesTextBlock.Text" xml:space="preserve">
+    <value>View the files you selected.</value>
+  </data>
+  <data name="ViewSelectedFoldersTextBlock.Text" xml:space="preserve">
+    <value>View the folders you selected.</value>
+  </data>
+  <data name="TotalLogsTextBlock.PlaceholderText" xml:space="preserve">
+    <value>Total logs: 0</value>
+  </data>
+  <data name="TotalLogsTextBlock.ToolTipService.ToolTip" xml:space="preserve">
+    <value>The total number of the logs</value>
+  </data>
+  <data name="RefreshLogFilesButton.Content" xml:space="preserve">
+    <value>Refresh The Logs</value>
+  </data>
+  <data name="RefreshLogFilesButton.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Retrieve the latest logs for the current session by reading them from the log file in the user configurations directory</value>
+  </data>
+  <data name="MainSearchAutoSuggestBox.PlaceholderText" xml:space="preserve">
+    <value>Search menu items...</value>
+  </data>
+  <data name="MainSearchAutoSuggestBox.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Enter menu item names to find them quickly</value>
+  </data>
+  <data name="UpdateNavItem.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Check for updates</value>
+  </data>
+  <data name="UpdateNavItem.Content" xml:space="preserve">
+    <value>Update</value>
+  </data>
+  <data name="OpenConfigDirectoryButton.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Open the directory where user configurations and user generated files are stored</value>
+  </data>
+  <data name="OpenConfigDirectoryButtonText.Text" xml:space="preserve">
+    <value>Open User Config Directory</value>
+  </data>
 </root>
\ No newline at end of file

From 63256f8642c90e2fb0af5d1a7f62d94e02df510c Mon Sep 17 00:00:00 2001
From: Violet Hansen <spynetgirl@outlook.com>
Date: Fri, 14 Feb 2025 20:47:07 +0200
Subject: [PATCH 2/2] Improved a log message to be more accurate

---
 .../IntelGathering/FileIdentityTimeBasedHashSet.cs              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AppControl Manager/IntelGathering/FileIdentityTimeBasedHashSet.cs b/AppControl Manager/IntelGathering/FileIdentityTimeBasedHashSet.cs
index 027f2e2be..8f81d8270 100644
--- a/AppControl Manager/IntelGathering/FileIdentityTimeBasedHashSet.cs	
+++ b/AppControl Manager/IntelGathering/FileIdentityTimeBasedHashSet.cs	
@@ -49,7 +49,7 @@ public bool Add(FileIdentity item)
 			if (existingItem.TimeCreated.HasValue && item.TimeCreated.HasValue &&
 				existingItem.TimeCreated < item.TimeCreated)
 			{
-				Logger.Write($"Replacing an older FileIdentity item with a newer one in MDE Advanced Hunting Logs " +
+				Logger.Write($"Replacing an older FileIdentity item with a newer one in the Logs " +
 							 $"for the file with name {existingItem.FileName} and SHA256 hash {existingItem.SHA256Hash}.");
 
 				// Remove the existing older item and add the newer one