diff --git a/AppControl Manager/.editorconfig b/AppControl Manager/.editorconfig
index 25bd9770a..ff9ad8203 100644
--- a/AppControl Manager/.editorconfig	
+++ b/AppControl Manager/.editorconfig	
@@ -22,7 +22,7 @@ dotnet_diagnostic.CA1310.severity = error
 dotnet_diagnostic.CA1401.severity = error
 
 # CA1303: Do not pass literals as localized parameters
-dotnet_diagnostic.CA1303.severity = silent
+dotnet_diagnostic.CA1303.severity = error
 
 # CA1309: Use ordinal string comparison
 dotnet_diagnostic.CA1309.severity = error
@@ -195,9 +195,6 @@ dotnet_diagnostic.CA1805.severity = error
 # CA1806: Do not ignore method results
 dotnet_diagnostic.CA1806.severity = error
 
-# CA1819: Properties should not return arrays
-dotnet_diagnostic.CA1819.severity = silent
-
 # CA1834: Consider using 'StringBuilder.Append(char)' when applicable
 dotnet_diagnostic.CA1834.severity = error
 
@@ -557,3 +554,195 @@ dotnet_diagnostic.CA5396.severity = error
 
 # CA5398: Avoid hardcoded SslProtocols values
 dotnet_diagnostic.CA5398.severity = error
+
+# CA1857: A constant is expected for the parameter
+dotnet_diagnostic.CA1857.severity = error
+
+# CA1870: Use a cached 'SearchValues' instance
+dotnet_diagnostic.CA1870.severity = error
+
+# CA2234: Pass system uri objects instead of strings
+dotnet_diagnostic.CA2234.severity = error
+
+# CA2352: Unsafe DataSet or DataTable in serializable type can be vulnerable to remote code execution attacks
+dotnet_diagnostic.CA2352.severity = error
+
+# CA2353: Unsafe DataSet or DataTable in serializable type
+dotnet_diagnostic.CA2353.severity = error
+
+# CA2354: Unsafe DataSet or DataTable in deserialized object graph can be vulnerable to remote code execution attacks
+dotnet_diagnostic.CA2354.severity = error
+
+# CA2355: Unsafe DataSet or DataTable type found in deserializable object graph
+dotnet_diagnostic.CA2355.severity = error
+
+# CA2362: Unsafe DataSet or DataTable in auto-generated serializable type can be vulnerable to remote code execution attacks
+dotnet_diagnostic.CA2362.severity = error
+
+# CA2356: Unsafe DataSet or DataTable type in web deserializable object graph
+dotnet_diagnostic.CA2356.severity = error
+
+# CA2260: Use correct type parameter
+dotnet_diagnostic.CA2260.severity = error
+
+# CA1824: Mark assemblies with NeutralResourcesLanguageAttribute
+dotnet_diagnostic.CA1824.severity = error
+
+# CA2016: Forward the 'CancellationToken' parameter to methods
+dotnet_diagnostic.CA2016.severity = error
+
+# CA2020: Prevent behavioral change
+dotnet_diagnostic.CA2020.severity = error
+
+# CsWinRT1030: Project does not enable unsafe blocks
+dotnet_diagnostic.CsWinRT1030.severity = error
+
+# CA1000: Do not declare static members on generic types
+dotnet_diagnostic.CA1000.severity = error
+
+# CA1003: Use generic event handler instances
+dotnet_diagnostic.CA1003.severity = error
+
+# CA1005: Avoid excessive parameters on generic types
+dotnet_diagnostic.CA1005.severity = error
+
+# CA1008: Enums should have zero value
+dotnet_diagnostic.CA1008.severity = error
+
+# CA1014: Mark assemblies with CLSCompliant
+dotnet_diagnostic.CA1014.severity = error
+
+# CA1027: Mark enums with FlagsAttribute
+dotnet_diagnostic.CA1027.severity = error
+
+# CA5358: Review cipher mode usage with cryptography experts
+dotnet_diagnostic.CA5358.severity = error
+
+# CA1833: Use AsSpan or AsMemory instead of Range-based indexers when appropriate
+dotnet_diagnostic.CA1833.severity = error
+
+# CA1844: Provide memory-based overrides of async methods when subclassing 'Stream'
+dotnet_diagnostic.CA1844.severity = error
+
+# CA2351: Do not use DataSet.ReadXml() with untrusted data
+dotnet_diagnostic.CA2351.severity = error
+
+# CA3003: Review code for file path injection vulnerabilities
+dotnet_diagnostic.CA3003.severity = error
+
+# CA2361: Ensure auto-generated class containing DataSet.ReadXml() is not used with untrusted data
+dotnet_diagnostic.CA2361.severity = error
+
+# CA2350: Do not use DataTable.ReadXml() with untrusted data
+dotnet_diagnostic.CA2350.severity = error
+
+# CA2329: Do not deserialize with JsonSerializer using an insecure configuration
+dotnet_diagnostic.CA2329.severity = error
+
+# CA2322: Ensure JavaScriptSerializer is not initialized with SimpleTypeResolver before deserializing
+dotnet_diagnostic.CA2322.severity = error
+
+# CA2330: Ensure that JsonSerializer has a secure configuration when deserializing
+dotnet_diagnostic.CA2330.severity = error
+
+# CA2305: Do not use insecure deserializer LosFormatter
+dotnet_diagnostic.CA2305.severity = error
+
+# CA2326: Do not use TypeNameHandling values other than None
+dotnet_diagnostic.CA2326.severity = error
+
+# CA2321: Do not deserialize with JavaScriptSerializer using a SimpleTypeResolver
+dotnet_diagnostic.CA2321.severity = error
+
+# CA2249: Consider using 'string.Contains' instead of 'string.IndexOf'
+dotnet_diagnostic.CA2249.severity = error
+
+# CA2315: Do not use insecure deserializer ObjectStateFormatter
+dotnet_diagnostic.CA2315.severity = error
+
+# CA3061: Do Not Add Schema By URL
+dotnet_diagnostic.CA3061.severity = error
+
+# CA5391: Use antiforgery tokens in ASP.NET Core MVC controllers
+dotnet_diagnostic.CA5391.severity = error
+
+# CA5392: Use DefaultDllImportSearchPaths attribute for P/Invokes
+dotnet_diagnostic.CA5392.severity = error
+
+# CA5393: Do not use unsafe DllImportSearchPath value
+dotnet_diagnostic.CA5393.severity = error
+
+# CA5376: Use SharedAccessProtocol HttpsOnly
+dotnet_diagnostic.CA5376.severity = error
+
+# CA5377: Use Container Level Access Policy
+dotnet_diagnostic.CA5377.severity = error
+
+# CA5378: Do not disable ServicePointManagerSecurityProtocols
+dotnet_diagnostic.CA5378.severity = error
+
+# CA5375: Do Not Use Account Shared Access Signature
+dotnet_diagnostic.CA5375.severity = error
+
+# CA5372: Use XmlReader for XPathDocument constructor
+dotnet_diagnostic.CA5372.severity = error
+
+# CA5369: Use XmlReader for 'XmlSerializer.Deserialize()'
+dotnet_diagnostic.CA5369.severity = error
+
+# CA5368: Set ViewStateUserKey For Classes Derived From Page
+dotnet_diagnostic.CA5368.severity = error
+
+# CA5367: Do Not Serialize Types With Pointer Fields
+dotnet_diagnostic.CA5367.severity = error
+
+# CA5365: Do Not Disable HTTP Header Checking
+dotnet_diagnostic.CA5365.severity = error
+
+# CA5363: Do Not Disable Request Validation
+dotnet_diagnostic.CA5363.severity = error
+
+# CA1859: Use concrete types when possible for improved performance
+dotnet_diagnostic.CA1859.severity = error
+
+# CA5399: HttpClients should enable certificate revocation list checks
+dotnet_diagnostic.CA5399.severity = error
+
+# CA5395: Miss HttpVerb attribute for action methods
+dotnet_diagnostic.CA5395.severity = error
+
+# CA5389: Do Not Add Archive Item's Path To The Target File System Path
+dotnet_diagnostic.CA5389.severity = error
+
+# CA5374: Do Not Use XslTransform
+dotnet_diagnostic.CA5374.severity = error
+
+# CA5359: Do Not Disable Certificate Validation
+dotnet_diagnostic.CA5359.severity = error
+
+# CA2310: Do not use insecure deserializer NetDataContractSerializer
+dotnet_diagnostic.CA2310.severity = error
+
+# CA2119: Seal methods that satisfy private interfaces
+dotnet_diagnostic.CA2119.severity = error
+
+# CA2211: Non-constant fields should not be visible
+dotnet_diagnostic.CA2211.severity = error
+
+# CA2311: Do not deserialize without first setting NetDataContractSerializer.Binder
+dotnet_diagnostic.CA2311.severity = error
+
+# CA3147: Mark Verb Handlers With Validate Antiforgery Token
+dotnet_diagnostic.CA3147.severity = error
+
+# CA2100: Review SQL queries for security vulnerabilities
+dotnet_diagnostic.CA2100.severity = error
+
+# CA2216: Disposable types should declare finalizer
+dotnet_diagnostic.CA2216.severity = error
+
+# CA1017: Mark assemblies with ComVisible
+dotnet_diagnostic.CA1017.severity = error
+
+# CA1016: Mark assemblies with assembly version
+dotnet_diagnostic.CA1016.severity = error
diff --git a/AppControl Manager/App.xaml b/AppControl Manager/App.xaml
index f14abf7a5..17d5afa08 100644
--- a/AppControl Manager/App.xaml	
+++ b/AppControl Manager/App.xaml	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Application
-    x:Class="WDACConfig.App"
+    x:Class="AppControlManager.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:WDACConfig">
+    xmlns:local="using:AppControlManager">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
diff --git a/AppControl Manager/App.xaml.cs b/AppControl Manager/App.xaml.cs
index 1bd2952fe..e5d60be8d 100644
--- a/AppControl Manager/App.xaml.cs	
+++ b/AppControl Manager/App.xaml.cs	
@@ -6,7 +6,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Windows.ApplicationModel;
-using static WDACConfig.AppSettings;
+
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
@@ -14,7 +14,7 @@
 // Useful info regarding App Lifecycle events: https://learn.microsoft.com/en-us/windows/apps/windows-app-sdk/applifecycle/applifecycle
 
 
-namespace WDACConfig
+namespace AppControlManager
 {
     /// <summary>
     /// Provides application-specific behavior to supplement the default Application class.
@@ -56,7 +56,7 @@ public App()
             #region
 
             // Check for the SoundSetting in the local settings
-            bool soundSetting = AppSettings.GetSetting<bool>(SettingKeys.SoundSetting);
+            bool soundSetting = AppSettings.GetSetting<bool>(AppControlManager.AppSettings.SettingKeys.SoundSetting);
 
             if (soundSetting)
             {
@@ -81,11 +81,12 @@ public App()
         /// <summary>
         /// Event handler for when the sound setting is changed.
         /// </summary>
-        /// <param name="isSoundOn"></param>
-        private void OnSoundSettingChanged(bool isSoundOn)
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void OnSoundSettingChanged(object? sender, SoundSettingChangedEventArgs e)
         {
             // Set the global sound state based on the event
-            if (isSoundOn)
+            if (e.IsSoundOn)
             {
                 ElementSoundPlayer.State = ElementSoundPlayerState.On;
                 ElementSoundPlayer.SpatialAudioMode = ElementSpatialAudioMode.On;
diff --git a/AppControl Manager/AppControl Manager.csproj b/AppControl Manager/AppControl Manager.csproj
index db71e645e..0c8673417 100644
--- a/AppControl Manager/AppControl Manager.csproj	
+++ b/AppControl Manager/AppControl Manager.csproj	
@@ -16,7 +16,7 @@
     <!-- https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props#invariantglobalization -->
     <InvariantGlobalization>true</InvariantGlobalization>
 
-    <RootNamespace>WDACConfig</RootNamespace>
+    <RootNamespace>AppControlManager</RootNamespace>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <Platforms>x64</Platforms>
     <RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
@@ -33,6 +33,7 @@
     -->
     <WindowsSdkPackageVersion>10.0.26100.56</WindowsSdkPackageVersion>
 
+
     <!--
     By default .NET runtimes are contained in the MSIX. This line will also include the WindowsAppSDK in the MSIX file
     so that the App will be installable on any system that neither has the .NET runtime nor the latest AppSDK
@@ -43,10 +44,12 @@
     -->
     <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
 
+
     <!-- Publish Properties -->
     <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
     <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
 
+
     <!-- Disabling trimming temporarily -->
     <!-- There should be absolutely no trim warnings before this can be enabled
     Otherwise there is no guarantee that the app will work as expected at all times -->
@@ -56,13 +59,15 @@
     <!-- <SuppressTrimAnalysisWarnings>false</SuppressTrimAnalysisWarnings> -->
     <!-- <TrimmerSingleWarn>false</TrimmerSingleWarn> -->
 
+
     <ImplicitUsings>disable</ImplicitUsings>
     <Description>An application that simplifies management of Application Control in Windows.</Description>
     <PackageProjectUrl>https://github.com/HotCakeX/Harden-Windows-Security</PackageProjectUrl>
     <RepositoryUrl>https://github.com/HotCakeX/Harden-Windows-Security</RepositoryUrl>
-    <PackageTags>App Control,WDAC,WDACConfig,AppControl For Business, AppControl Manager</PackageTags>
+    <PackageTags>App Control,WDAC,AppControl For Business, AppControl Manager</PackageTags>
     <PackageReleaseNotes>https://github.com/HotCakeX/Harden-Windows-Security/releases</PackageReleaseNotes>
 
+
     <!-- Automatically created for packing -->
     <!-- https://learn.microsoft.com/en-us/windows/msix/app-installer/create-appinstallerfile-vs -->
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
@@ -71,6 +76,7 @@
     <AppxPackageSigningTimestampDigestAlgorithm>SHA512</AppxPackageSigningTimestampDigestAlgorithm>
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
 
+
     <!-- Defining custom directory in the root directory to be created if it doesn't exist. MSIX package after packing will be stored there -->
     <AppxPackageDir>MSIXOutput\</AppxPackageDir>
     <AppxSymbolPackageEnabled>True</AppxSymbolPackageEnabled>
@@ -86,15 +92,21 @@
     <AssemblyVersion>$(FileVersion)</AssemblyVersion>
     <NeutralLanguage>en-US</NeutralLanguage>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
-    <StartupObject>WDACConfig.Program</StartupObject>
+    <StartupObject>AppControlManager.Program</StartupObject>
     <GenerateAssemblyInfo>True</GenerateAssemblyInfo>
 
+
     <!-- https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/unsafe-code -->
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
 
+
     <Version>$(FileVersion)</Version>
     <Copyright>© 2024–Present</Copyright>
     <Title>AppControl Manager</Title>
+
+
+    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
+
   </PropertyGroup>
 
   <!--
@@ -165,13 +177,6 @@
     <HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-  </PropertyGroup>
-
   <ItemGroup>
     <None Remove="Pages\AllowNewAppsDataGrid.xaml" />
     <None Remove="Pages\AllowNewAppsEventLogsDataGrid.xaml" />
diff --git a/AppControl Manager/Excluded Code/FileDialogHelper.cs b/AppControl Manager/Excluded Code/FileDialogHelper.cs
index 66329407a..2b29f5241 100644
--- a/AppControl Manager/Excluded Code/FileDialogHelper.cs	
+++ b/AppControl Manager/Excluded Code/FileDialogHelper.cs	
@@ -7,7 +7,7 @@
 using Windows.Win32.UI.Shell;
 using Windows.Win32.UI.Shell.Common;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     /// <summary>
     /// https://learn.microsoft.com/en-us/uwp/api/windows.storage.pickers.filesavepicker?view=winrt-26100
diff --git a/AppControl Manager/Logic/AllCertificatesGrabber.cs b/AppControl Manager/Logic/AllCertificatesGrabber.cs
index 015fe009d..b2f7d9f36 100644
--- a/AppControl Manager/Logic/AllCertificatesGrabber.cs	
+++ b/AppControl Manager/Logic/AllCertificatesGrabber.cs	
@@ -8,7 +8,7 @@
 
 // The following functions and methods use the Windows APIs to grab all of the certificates from a signed file
 
-namespace WDACConfig
+namespace AppControlManager
 {
 
     // a class to throw a custom exception when the certificate has HashMismatch
@@ -170,6 +170,7 @@ internal static partial class Crypt32DLL
 
             // External method declaration for CryptMsgGetParam
             [LibraryImport("crypt32.dll", SetLastError = true)]
+            [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
             [return: MarshalAs(UnmanagedType.Bool)]
             // https://learn.microsoft.com/en-us/windows/win32/api/wincrypt/nf-wincrypt-cryptmsggetparam
             internal static partial bool CryptMsgGetParam(
diff --git a/AppControl Manager/Logic/WDAC Simulation/Arbitrator.cs b/AppControl Manager/Logic/App Control Simulation/Arbitrator.cs
similarity index 99%
rename from AppControl Manager/Logic/WDAC Simulation/Arbitrator.cs
rename to AppControl Manager/Logic/App Control Simulation/Arbitrator.cs
index edd8153af..ff83f8e12 100644
--- a/AppControl Manager/Logic/WDAC Simulation/Arbitrator.cs	
+++ b/AppControl Manager/Logic/App Control Simulation/Arbitrator.cs	
@@ -6,7 +6,7 @@
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     internal static class Arbitrator
     {
diff --git a/AppControl Manager/Logic/WDAC Simulation/GetCertificateDetails.cs b/AppControl Manager/Logic/App Control Simulation/GetCertificateDetails.cs
similarity index 99%
rename from AppControl Manager/Logic/WDAC Simulation/GetCertificateDetails.cs
rename to AppControl Manager/Logic/App Control Simulation/GetCertificateDetails.cs
index 72bb623b9..08ad11a36 100644
--- a/AppControl Manager/Logic/WDAC Simulation/GetCertificateDetails.cs	
+++ b/AppControl Manager/Logic/App Control Simulation/GetCertificateDetails.cs	
@@ -2,7 +2,7 @@
 using System.Security.Cryptography.Pkcs;
 using System.Security.Cryptography.X509Certificates;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public static class GetCertificateDetails
     {
diff --git a/AppControl Manager/Logic/WDAC Simulation/GetFileRuleOutput.cs b/AppControl Manager/Logic/App Control Simulation/GetFileRuleOutput.cs
similarity index 99%
rename from AppControl Manager/Logic/WDAC Simulation/GetFileRuleOutput.cs
rename to AppControl Manager/Logic/App Control Simulation/GetFileRuleOutput.cs
index bb651a84c..3bb78e360 100644
--- a/AppControl Manager/Logic/WDAC Simulation/GetFileRuleOutput.cs	
+++ b/AppControl Manager/Logic/App Control Simulation/GetFileRuleOutput.cs	
@@ -4,7 +4,7 @@
 using System.Text.RegularExpressions;
 using System.Xml;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public partial class GetFileRuleOutput
     {
diff --git a/AppControl Manager/Logic/WDAC Simulation/GetSignerInfo.cs b/AppControl Manager/Logic/App Control Simulation/GetSignerInfo.cs
similarity index 99%
rename from AppControl Manager/Logic/WDAC Simulation/GetSignerInfo.cs
rename to AppControl Manager/Logic/App Control Simulation/GetSignerInfo.cs
index 8cdb8791f..7b9533f0a 100644
--- a/AppControl Manager/Logic/WDAC Simulation/GetSignerInfo.cs	
+++ b/AppControl Manager/Logic/App Control Simulation/GetSignerInfo.cs	
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Xml;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public static class GetSignerInfo
     {
@@ -11,7 +11,7 @@ public static class GetSignerInfo
         /// The output contains as much info as possible about each signer
         /// </summary>
         /// <param name="xmlContent"></param>
-        /// <returns> List<WDACConfig.Signer> </returns>
+        /// <returns> List<AppControlManager.Signer> </returns>
         /// <exception cref="InvalidOperationException"></exception>
         public static List<Signer> Get(XmlDocument xmlContent)
         {
diff --git a/AppControl Manager/Logic/AppSettings.cs b/AppControl Manager/Logic/AppSettings.cs
index 6baa8810f..cf54aa41f 100644
--- a/AppControl Manager/Logic/AppSettings.cs	
+++ b/AppControl Manager/Logic/AppSettings.cs	
@@ -1,6 +1,6 @@
 using Windows.Storage;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     // https://learn.microsoft.com/en-us/uwp/api/windows.storage.applicationdata.localsettings
 
diff --git a/AppControl Manager/Logic/AppThemeManager.cs b/AppControl Manager/Logic/AppThemeManager.cs
index 312255e29..b4eb62fc2 100644
--- a/AppControl Manager/Logic/AppThemeManager.cs	
+++ b/AppControl Manager/Logic/AppThemeManager.cs	
@@ -1,19 +1,24 @@
 using System;
 
-namespace WDACConfig
+namespace AppControlManager
 {
-    public static class AppThemeManager
+    // Custom EventArgs class for app theme changes
+    internal sealed class AppThemeChangedEventArgs(string? newTheme) : EventArgs
     {
+        internal string? NewTheme { get; } = newTheme;
+    }
 
+    internal static class AppThemeManager
+    {
         // The static event for App theme dark/light changes
         // MainWindow listens to this
-        public static event Action<string>? AppThemeChanged;
+        internal static event EventHandler<AppThemeChangedEventArgs>? AppThemeChanged;
 
         // Method to raise the event
-        public static void OnAppThemeChanged(string newLocation)
+        internal static void OnAppThemeChanged(string newTheme)
         {
-            AppThemeChanged?.Invoke(newLocation);
+            // Trigger the AppThemeChanged event with the new theme
+            AppThemeChanged?.Invoke(null, new AppThemeChangedEventArgs(newTheme));
         }
-
     }
 }
diff --git a/AppControl Manager/Logic/AppUpdate.cs b/AppControl Manager/Logic/AppUpdate.cs
index 4ac75d906..03bc4220c 100644
--- a/AppControl Manager/Logic/AppUpdate.cs	
+++ b/AppControl Manager/Logic/AppUpdate.cs	
@@ -1,8 +1,7 @@
-
-using System;
+using System;
 using System.Net.Http;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     /// <summary>
     /// AppUpdate class is responsible for checking for application updates.
@@ -18,8 +17,11 @@ public class AppUpdate
         // The Instance property returns the one and only instance of this class.
         public static AppUpdate Instance => _instance.Value;
 
-        // Event triggered when an update is available
-        public event EventHandler<bool>? UpdateAvailable;
+        /// <summary>
+        /// Event triggered when an update is available.
+        /// Includes details about the availability status and the version.
+        /// </summary>
+        public event EventHandler<UpdateAvailableEventArgs>? UpdateAvailable;
 
         // Private constructor prevents instantiation from outside, ensuring only one instance.
         private AppUpdate() { }
@@ -38,8 +40,11 @@ public UpdateCheckResponse Check()
             Version onlineAvailableVersion = new(versionsResponse);
             bool isUpdateAvailable = onlineAvailableVersion > App.currentAppVersion;
 
-            // Raise the UpdateAvailable event if there's an update and there are subscribers
-            UpdateAvailable?.Invoke(this, isUpdateAvailable);
+            // Raise the UpdateAvailable event if there are subscribers
+            UpdateAvailable?.Invoke(
+                this,
+                new UpdateAvailableEventArgs(isUpdateAvailable, onlineAvailableVersion)
+            );
 
             return new UpdateCheckResponse(
                 isUpdateAvailable,
@@ -47,4 +52,20 @@ public UpdateCheckResponse Check()
             );
         }
     }
+
+    /// <summary>
+    /// EventArgs class to provide data for the UpdateAvailable event.
+    /// </summary>
+    public class UpdateAvailableEventArgs(bool isUpdateAvailable, Version availableVersion) : EventArgs
+    {
+        /// <summary>
+        /// Indicates whether an update is available.
+        /// </summary>
+        public bool IsUpdateAvailable { get; } = isUpdateAvailable;
+
+        /// <summary>
+        /// The version of the available update.
+        /// </summary>
+        public Version AvailableVersion { get; } = availableVersion;
+    }
 }
diff --git a/AppControl Manager/Logic/CertificateCreator.cs b/AppControl Manager/Logic/CertificateCreator.cs
index 911a07e3e..f22c9c08e 100644
--- a/AppControl Manager/Logic/CertificateCreator.cs	
+++ b/AppControl Manager/Logic/CertificateCreator.cs	
@@ -4,7 +4,7 @@
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public static class CertificateGenerator
     {
diff --git a/AppControl Manager/Logic/CertificateHelper.cs b/AppControl Manager/Logic/CertificateHelper.cs
index 57fb461a2..35ba7c5a4 100644
--- a/AppControl Manager/Logic/CertificateHelper.cs	
+++ b/AppControl Manager/Logic/CertificateHelper.cs	
@@ -3,7 +3,7 @@
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     // A class to throw a custom exception when the certificate collection cannot be obtained during App Control Simulation
     public sealed class FailedToGetCertificateCollectionException(string message, string functionName) : Exception($"{functionName}: {message}")
diff --git a/AppControl Manager/Logic/CheckPolicyDeploymentStatus.cs b/AppControl Manager/Logic/CheckPolicyDeploymentStatus.cs
index a4576df2f..5011197a7 100644
--- a/AppControl Manager/Logic/CheckPolicyDeploymentStatus.cs	
+++ b/AppControl Manager/Logic/CheckPolicyDeploymentStatus.cs	
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace WDACConfig
+namespace AppControlManager
 {
 
     public static class CheckPolicyDeploymentStatus
diff --git a/AppControl Manager/Logic/CiToolHelper.cs b/AppControl Manager/Logic/CiToolHelper.cs
index cc63b355e..47988f722 100644
--- a/AppControl Manager/Logic/CiToolHelper.cs	
+++ b/AppControl Manager/Logic/CiToolHelper.cs	
@@ -6,7 +6,7 @@
 using System.Text;
 using System.Text.Json;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     // Class to represent a policy with various attributes
     public sealed class CiPolicyInfo
diff --git a/AppControl Manager/Logic/CodeIntegrityInfo.cs b/AppControl Manager/Logic/CodeIntegrityInfo.cs
index d8fe59141..7cec73c61 100644
--- a/AppControl Manager/Logic/CodeIntegrityInfo.cs	
+++ b/AppControl Manager/Logic/CodeIntegrityInfo.cs	
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 
-namespace WDACConfig.CodeIntegrity
+namespace AppControlManager.CodeIntegrity
 {
 
     internal sealed class CodeIntegrityOption
@@ -30,6 +30,7 @@ private struct SYSTEM_CODEINTEGRITY_INFORMATION
 
         // https://learn.microsoft.com/en-us/windows/win32/api/winternl/nf-winternl-ntquerysysteminformation#system_codeintegrity_information
         [LibraryImport("ntdll.dll", SetLastError = true)]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
         private static partial int NtQuerySystemInformation(
         int SystemInformationClass,
         IntPtr SystemInformation,
diff --git a/AppControl Manager/Logic/ConfigureISGServices.cs b/AppControl Manager/Logic/ConfigureISGServices.cs
index 9b6c0ea2c..3e43c2606 100644
--- a/AppControl Manager/Logic/ConfigureISGServices.cs	
+++ b/AppControl Manager/Logic/ConfigureISGServices.cs	
@@ -1,4 +1,4 @@
-namespace WDACConfig
+namespace AppControlManager
 {
     public static class ConfigureISGServices
     {
diff --git a/AppControl Manager/Logic/Crypt32CertCN.cs b/AppControl Manager/Logic/Crypt32CertCN.cs
index 3e1cd80d3..482557769 100644
--- a/AppControl Manager/Logic/Crypt32CertCN.cs	
+++ b/AppControl Manager/Logic/Crypt32CertCN.cs	
@@ -1,12 +1,13 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public static partial class CryptoAPI
     {
         // https://learn.microsoft.com/en-us/windows/win32/api/wincrypt/nf-wincrypt-certgetnamestringw
         [LibraryImport("crypt32.dll", EntryPoint = "CertGetNameStringW", StringMarshalling = StringMarshalling.Utf16, SetLastError = true)]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
         private static partial int CertGetNameString(
             IntPtr pCertContext, // The handle property of the certificate object
             int dwType,
diff --git a/AppControl Manager/Logic/DeviceGuardInfo.cs b/AppControl Manager/Logic/DeviceGuardInfo.cs
index 039697011..3c8291d3c 100644
--- a/AppControl Manager/Logic/DeviceGuardInfo.cs	
+++ b/AppControl Manager/Logic/DeviceGuardInfo.cs	
@@ -1,7 +1,7 @@
 using System.Linq;
 using System.Management;
 
-namespace WDACConfig
+namespace AppControlManager
 {
 
     public sealed class DeviceGuardStatus
diff --git a/AppControl Manager/Logic/DirectorySelector.cs b/AppControl Manager/Logic/DirectorySelector.cs
index 4bece6227..994db2340 100644
--- a/AppControl Manager/Logic/DirectorySelector.cs	
+++ b/AppControl Manager/Logic/DirectorySelector.cs	
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public static class DirectorySelector
     {
diff --git a/AppControl Manager/Logic/EventLogUtility.cs b/AppControl Manager/Logic/EventLogUtility.cs
index bc48f99a3..58b26b812 100644
--- a/AppControl Manager/Logic/EventLogUtility.cs	
+++ b/AppControl Manager/Logic/EventLogUtility.cs	
@@ -2,7 +2,7 @@
 using System.Diagnostics.Eventing.Reader;
 using System.IO;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public static class EventLogUtility
     {
diff --git a/AppControl Manager/Logic/FileDialogHelper.cs b/AppControl Manager/Logic/FileDialogHelper.cs
index 8022ee20b..fdcc77d1f 100644
--- a/AppControl Manager/Logic/FileDialogHelper.cs	
+++ b/AppControl Manager/Logic/FileDialogHelper.cs	
@@ -7,7 +7,7 @@
 using Windows.Win32.UI.Shell;
 using Windows.Win32.UI.Shell.Common;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     /// <summary>
     /// https://learn.microsoft.com/en-us/uwp/api/windows.storage.pickers.filesavepicker?view=winrt-26100
@@ -62,7 +62,7 @@ out IFileOpenDialog* fileOpenDialog // Explicitly specify the output type
 
             // Set the default folder to "My Documents".
             hr = PInvoke.SHCreateItemFromParsingName(
-                Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
+                GlobalVars.UserConfigDir,
                 null,
                 typeof(IShellItem).GUID,
                 out void* pDirectoryShellItem
@@ -192,7 +192,7 @@ out void* pDirectoryShellItem
 
             // Set default folder to My Documents
             hr = PInvoke.SHCreateItemFromParsingName(
-                Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
+                GlobalVars.UserConfigDir,
                 null,
                 typeof(IShellItem).GUID,
                 out void* directoryShellItem
@@ -320,7 +320,7 @@ out void* directoryShellItem
 
             // Set default folder to "My Documents"
             hr = PInvoke.SHCreateItemFromParsingName(
-                Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
+                GlobalVars.UserConfigDir,
                 null,
                 typeof(IShellItem).GUID,
                 out void* directoryShellItem
@@ -413,7 +413,7 @@ out void* directoryShellItem
 
             // Set default folder to "My Documents"
             hr = PInvoke.SHCreateItemFromParsingName(
-                Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
+                GlobalVars.UserConfigDir,
                 null,
                 typeof(IShellItem).GUID,
                 out void* directoryShellItem
diff --git a/AppControl Manager/Logic/FileDirectoryPathComparer.cs b/AppControl Manager/Logic/FileDirectoryPathComparer.cs
index b1744754a..a149c5223 100644
--- a/AppControl Manager/Logic/FileDirectoryPathComparer.cs	
+++ b/AppControl Manager/Logic/FileDirectoryPathComparer.cs	
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public static class FileDirectoryPathComparer
     {
diff --git a/AppControl Manager/Logic/GetExtendedFileAttrib.cs b/AppControl Manager/Logic/GetExtendedFileAttrib.cs
index e49908f0c..892784a2a 100644
--- a/AppControl Manager/Logic/GetExtendedFileAttrib.cs	
+++ b/AppControl Manager/Logic/GetExtendedFileAttrib.cs	
@@ -2,7 +2,7 @@
 using System.Globalization;
 using System.Runtime.InteropServices;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public sealed partial class ExFileInfo
     {
@@ -22,15 +22,18 @@ public sealed partial class ExFileInfo
         // Importing external functions from Version.dll to work with file version info
         // https://learn.microsoft.com/he-il/windows/win32/api/winver/nf-winver-getfileversioninfosizeexa
         [LibraryImport("Version.dll", EntryPoint = "GetFileVersionInfoSizeExW", SetLastError = true, StringMarshalling = StringMarshalling.Utf16)]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
         private static partial int GetFileVersionInfoSizeEx(uint dwFlags, string filename, out int handle);
 
         // https://learn.microsoft.com/he-il/windows/win32/api/winver/nf-winver-verqueryvaluea
         [LibraryImport("Version.dll", EntryPoint = "VerQueryValueW", SetLastError = true, StringMarshalling = StringMarshalling.Utf16)]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
         [return: MarshalAs(UnmanagedType.Bool)]
         private static partial bool VerQueryValue(IntPtr block, string subBlock, out IntPtr buffer, out int len);
 
         // https://learn.microsoft.com/he-il/windows/win32/api/winver/nf-winver-getfileversioninfoexa
         [LibraryImport("Version.dll", EntryPoint = "GetFileVersionInfoExW", SetLastError = true, StringMarshalling = StringMarshalling.Utf16)]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
         [return: MarshalAs(UnmanagedType.Bool)]
         private static partial bool GetFileVersionInfoEx(uint dwFlags, string filename, int handle, int len, [Out] byte[] data);
 
diff --git a/AppControl Manager/Logic/GetFilesFast.cs b/AppControl Manager/Logic/GetFilesFast.cs
index 73ebbce53..8cecbecbb 100644
--- a/AppControl Manager/Logic/GetFilesFast.cs	
+++ b/AppControl Manager/Logic/GetFilesFast.cs	
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public static class FileUtility
     {
diff --git a/AppControl Manager/Logic/GetOpusData.cs b/AppControl Manager/Logic/GetOpusData.cs
index d17a9b955..76a1a4f59 100644
--- a/AppControl Manager/Logic/GetOpusData.cs	
+++ b/AppControl Manager/Logic/GetOpusData.cs	
@@ -4,7 +4,7 @@
 using System.Security.Cryptography;
 using System.Security.Cryptography.Pkcs;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public static partial class Opus
     {
@@ -13,11 +13,12 @@ internal static partial class Crypt32
 
             // More info: https://learn.microsoft.com/en-us/windows/win32/api/wincrypt/nf-wincrypt-cryptdecodeobject
             [LibraryImport("crypt32.dll", StringMarshalling = StringMarshalling.Utf16, SetLastError = true)]
+            [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
             [return: MarshalAs(UnmanagedType.Bool)]
             internal static partial bool CryptDecodeObject(
                 uint dwCertEncodingType,        // Specifies the encoding type used in the encoded message
                 IntPtr lpszStructType,          // Pointer to a null-terminated ANSI string that identifies the type of the structure to be decoded
-               [In] byte[] pbEncoded,           // Pointer to a buffer that contains the encoded structure
+                [In] byte[] pbEncoded,           // Pointer to a buffer that contains the encoded structure
                 uint cbEncoded,                 // Size, in bytes, of the pbEncoded buffer
                 uint dwFlags,                   // Flags that modify the behavior of the function
                 IntPtr pvStructInto,            // Pointer to a buffer that receives the decoded structure
diff --git a/AppControl Manager/Logic/Variables/GlobalVars.cs b/AppControl Manager/Logic/GlobalVars.cs
similarity index 50%
rename from AppControl Manager/Logic/Variables/GlobalVars.cs
rename to AppControl Manager/Logic/GlobalVars.cs
index 6b9ffcccf..3213353bd 100644
--- a/AppControl Manager/Logic/Variables/GlobalVars.cs	
+++ b/AppControl Manager/Logic/GlobalVars.cs	
@@ -1,37 +1,37 @@
 using System;
 using System.IO;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     // This class defines constant variables
-    public static class GlobalVars
+    internal static class GlobalVars
     {
 
         // User Mode block rules
-        public const string MSFTRecommendedBlockRulesURL = "https://raw.githubusercontent.com/MicrosoftDocs/windows-itpro-docs/refs/heads/public/windows/security/application-security/application-control/app-control-for-business/design/applications-that-can-bypass-appcontrol.md";
+        internal static readonly Uri MSFTRecommendedBlockRulesURL = new("https://raw.githubusercontent.com/MicrosoftDocs/windows-itpro-docs/refs/heads/public/windows/security/application-security/application-control/app-control-for-business/design/applications-that-can-bypass-appcontrol.md");
 
         // Kernel Mode block rules
-        public const string MSFTRecommendedDriverBlockRulesURL = "https://raw.githubusercontent.com/MicrosoftDocs/windows-itpro-docs/refs/heads/public/windows/security/application-security/application-control/app-control-for-business/design/microsoft-recommended-driver-block-rules.md";
+        internal static readonly Uri MSFTRecommendedDriverBlockRulesURL = new("https://raw.githubusercontent.com/MicrosoftDocs/windows-itpro-docs/refs/heads/public/windows/security/application-security/application-control/app-control-for-business/design/microsoft-recommended-driver-block-rules.md");
 
         // Storing the path to the Code Integrity Schema XSD file
-        public static readonly string CISchemaPath = Path.Combine(
+        internal static readonly string CISchemaPath = Path.Combine(
             Environment.GetEnvironmentVariable("SystemDrive") + @"\",
             "Windows", "schemas", "CodeIntegrity", "cipolicy.xsd");
 
         // Storing the path to the WDACConfig folder in the Program Files
-        public static readonly string UserConfigDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "WDACConfig");
+        internal static readonly string UserConfigDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "WDACConfig");
 
         // Storing the path to User Config JSON file in the WDACConfig folder in the Program Files
-        public static readonly string UserConfigJson = Path.Combine(UserConfigDir, "UserConfigurations", "UserConfigurations.json");
+        internal static readonly string UserConfigJson = Path.Combine(UserConfigDir, "UserConfigurations", "UserConfigurations.json");
 
         // Storing the path to the StagingArea folder in the WDACConfig folder in the Program Files
-        public static readonly string StagingArea = Path.Combine(UserConfigDir, "StagingArea");
+        internal static readonly string StagingArea = Path.Combine(UserConfigDir, "StagingArea");
 
         // The link to the file that contains the download link for the latest version of the AppControl Manager
-        internal const string AppUpdateDownloadLinkURL = "https://raw.githubusercontent.com/HotCakeX/Harden-Windows-Security/refs/heads/main/AppControl%20Manager/DownloadURL.txt";
+        internal static readonly Uri AppUpdateDownloadLinkURL = new("https://raw.githubusercontent.com/HotCakeX/Harden-Windows-Security/refs/heads/main/AppControl%20Manager/DownloadURL.txt");
 
         // The link to the file that contains the version number of the latest available version of the AppControl Manager
-        internal const string AppVersionLinkURL = "https://raw.githubusercontent.com/HotCakeX/Harden-Windows-Security/refs/heads/main/AppControl%20Manager/version.txt";
+        internal static readonly Uri AppVersionLinkURL = new("https://raw.githubusercontent.com/HotCakeX/Harden-Windows-Security/refs/heads/main/AppControl%20Manager/version.txt");
 
         // The check for update button on the Update page uses this variable as the text/content for its button
         // It is dynamically updated on app launch when a new version is available
diff --git a/AppControl Manager/Logic/IconsStyleManager.cs b/AppControl Manager/Logic/IconsStyleManager.cs
index ea4003c39..0a9102ca1 100644
--- a/AppControl Manager/Logic/IconsStyleManager.cs	
+++ b/AppControl Manager/Logic/IconsStyleManager.cs	
@@ -1,17 +1,27 @@
 using System;
 
-namespace WDACConfig
+namespace AppControlManager
 {
-    public static class IconsStyleManager
+    // Custom EventArgs class for Icons Style changes
+    internal sealed class IconsStyleChangedEventArgs(string? newIconsStyle) : EventArgs
+    {
+        internal string? NewIconsStyle { get; } = newIconsStyle;
+    }
+
+    internal static class IconsStyleManager
     {
         // The static event for Icons Style changes
         // MainWindow listens to this to set the icons style
-        public static event Action<string>? IconsStyleChanged;
+        internal static event EventHandler<IconsStyleChangedEventArgs>? IconsStyleChanged;
 
         // Method to raise the event when the icons styles change
-        public static void OnIconsStylesChanged(string newIconsStyle)
+        internal static void OnIconsStylesChanged(string newIconsStyle)
         {
-            IconsStyleChanged?.Invoke(newIconsStyle);
+            // Raise the IconsStyleChanged event with the new style
+            IconsStyleChanged?.Invoke(
+                null,
+                new IconsStyleChangedEventArgs(newIconsStyle)
+            );
         }
     }
 }
diff --git a/AppControl Manager/Logic/IntelGathering/CILogIntel.cs b/AppControl Manager/Logic/IntelGathering/CILogIntel.cs
index 6156d9e44..12f998486 100644
--- a/AppControl Manager/Logic/IntelGathering/CILogIntel.cs	
+++ b/AppControl Manager/Logic/IntelGathering/CILogIntel.cs	
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace WDACConfig.IntelGathering
+namespace AppControlManager.IntelGathering
 {
     // Application Control event tags intelligence
     internal static class CILogIntel
diff --git a/AppControl Manager/Logic/IntelGathering/CertCNFetcher.cs b/AppControl Manager/Logic/IntelGathering/CertCNFetcher.cs
index f271d7a33..66e419797 100644
--- a/AppControl Manager/Logic/IntelGathering/CertCNFetcher.cs	
+++ b/AppControl Manager/Logic/IntelGathering/CertCNFetcher.cs	
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Security.Cryptography.X509Certificates;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public static class CertCNFetcher
     {
diff --git a/AppControl Manager/Logic/IntelGathering/DriveLetterMapper.cs b/AppControl Manager/Logic/IntelGathering/DriveLetterMapper.cs
index 054c3ed5d..9f618c53b 100644
--- a/AppControl Manager/Logic/IntelGathering/DriveLetterMapper.cs	
+++ b/AppControl Manager/Logic/IntelGathering/DriveLetterMapper.cs	
@@ -3,16 +3,18 @@
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.Marshalling;
 
-namespace WDACConfig.IntelGathering
+namespace AppControlManager.IntelGathering
 {
     public static partial class DriveLetterMapper
     {
         [LibraryImport("kernel32.dll", SetLastError = true, StringMarshalling = StringMarshalling.Utf16, EntryPoint = "FindFirstVolumeW")]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
         private static partial IntPtr FindFirstVolume(
             [MarshalUsing(CountElementName = "cchBufferLength")][Out] char[] lpszVolumeName,
             uint cchBufferLength);
 
         [LibraryImport("kernel32.dll", SetLastError = true, StringMarshalling = StringMarshalling.Utf16, EntryPoint = "FindNextVolumeW")]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
         [return: MarshalAs(UnmanagedType.Bool)]
         private static partial bool FindNextVolume(
             IntPtr hFindVolume,
@@ -20,12 +22,14 @@ private static partial bool FindNextVolume(
             uint cchBufferLength);
 
         [LibraryImport("kernel32.dll", SetLastError = true, StringMarshalling = StringMarshalling.Utf16, EntryPoint = "QueryDosDeviceW")]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
         private static partial uint QueryDosDevice(
             string lpDeviceName,
             [MarshalUsing(CountElementName = "ucchMax")][Out] char[] lpTargetPath,
             int ucchMax);
 
         [LibraryImport("kernel32.dll", SetLastError = true, StringMarshalling = StringMarshalling.Utf16, EntryPoint = "GetVolumePathNamesForVolumeNameW")]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
         [return: MarshalAs(UnmanagedType.Bool)]
         private static partial bool GetVolumePathNamesForVolumeNameW(
             [MarshalAs(UnmanagedType.LPWStr)] string lpszVolumeName,
diff --git a/AppControl Manager/Logic/IntelGathering/EventAction.cs b/AppControl Manager/Logic/IntelGathering/EventAction.cs
index c5a6aa316..254df75a7 100644
--- a/AppControl Manager/Logic/IntelGathering/EventAction.cs	
+++ b/AppControl Manager/Logic/IntelGathering/EventAction.cs	
@@ -1,5 +1,5 @@
 
-namespace WDACConfig.IntelGathering
+namespace AppControlManager.IntelGathering
 {
     public enum EventAction
     {
diff --git a/AppControl Manager/Logic/IntelGathering/FileIdentity.cs b/AppControl Manager/Logic/IntelGathering/FileIdentity.cs
index ead9bc43a..b06aa803c 100644
--- a/AppControl Manager/Logic/IntelGathering/FileIdentity.cs	
+++ b/AppControl Manager/Logic/IntelGathering/FileIdentity.cs	
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace WDACConfig.IntelGathering
+namespace AppControlManager.IntelGathering
 {
     public sealed class FileIdentity
     {
diff --git a/AppControl Manager/Logic/IntelGathering/FileIdentityComparer.cs b/AppControl Manager/Logic/IntelGathering/FileIdentityComparer.cs
index 8ebf529c0..c86053730 100644
--- a/AppControl Manager/Logic/IntelGathering/FileIdentityComparer.cs	
+++ b/AppControl Manager/Logic/IntelGathering/FileIdentityComparer.cs	
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace WDACConfig.IntelGathering
+namespace AppControlManager.IntelGathering
 {
     /// <summary>
     /// A custom equality comparer for the FileIdentity class.
diff --git a/AppControl Manager/Logic/IntelGathering/FileIdentityECCBasedHashSet.cs b/AppControl Manager/Logic/IntelGathering/FileIdentityECCBasedHashSet.cs
index f7c9beafb..4cb87633d 100644
--- a/AppControl Manager/Logic/IntelGathering/FileIdentityECCBasedHashSet.cs	
+++ b/AppControl Manager/Logic/IntelGathering/FileIdentityECCBasedHashSet.cs	
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace WDACConfig.IntelGathering
+namespace AppControlManager.IntelGathering
 {
     /// <summary>
     /// A custom collection that manages a set of FileIdentity objects,
diff --git a/AppControl Manager/Logic/IntelGathering/FileIdentityOrigin.cs b/AppControl Manager/Logic/IntelGathering/FileIdentityOrigin.cs
index 753b207b3..3da3811fa 100644
--- a/AppControl Manager/Logic/IntelGathering/FileIdentityOrigin.cs	
+++ b/AppControl Manager/Logic/IntelGathering/FileIdentityOrigin.cs	
@@ -1,5 +1,5 @@
 
-namespace WDACConfig.IntelGathering
+namespace AppControlManager.IntelGathering
 {
     public enum FileIdentityOrigin
     {
diff --git a/AppControl Manager/Logic/IntelGathering/FileIdentitySignatureBasedHashSet.cs b/AppControl Manager/Logic/IntelGathering/FileIdentitySignatureBasedHashSet.cs
index 09666a9ef..79a71a6ea 100644
--- a/AppControl Manager/Logic/IntelGathering/FileIdentitySignatureBasedHashSet.cs	
+++ b/AppControl Manager/Logic/IntelGathering/FileIdentitySignatureBasedHashSet.cs	
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace WDACConfig.IntelGathering
+namespace AppControlManager.IntelGathering
 {
     /// <summary>
     /// A custom collection that manages a set of FileIdentity objects,
diff --git a/AppControl Manager/Logic/IntelGathering/FileIdentityTimeBasedHashSet.cs b/AppControl Manager/Logic/IntelGathering/FileIdentityTimeBasedHashSet.cs
index e27a1876b..f3a5877b4 100644
--- a/AppControl Manager/Logic/IntelGathering/FileIdentityTimeBasedHashSet.cs	
+++ b/AppControl Manager/Logic/IntelGathering/FileIdentityTimeBasedHashSet.cs	
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace WDACConfig.IntelGathering
+namespace AppControlManager.IntelGathering
 {
     /// <summary>
     /// A custom collection that manages a set of FileIdentity objects,
diff --git a/AppControl Manager/Logic/IntelGathering/FileSignerInfo.cs b/AppControl Manager/Logic/IntelGathering/FileSignerInfo.cs
index 9d0666c19..fb3248345 100644
--- a/AppControl Manager/Logic/IntelGathering/FileSignerInfo.cs	
+++ b/AppControl Manager/Logic/IntelGathering/FileSignerInfo.cs	
@@ -1,6 +1,6 @@
 using System;
 
-namespace WDACConfig.IntelGathering
+namespace AppControlManager.IntelGathering
 {
     public sealed class FileSignerInfo
     {
diff --git a/AppControl Manager/Logic/IntelGathering/FileSignerInfoComparer.cs b/AppControl Manager/Logic/IntelGathering/FileSignerInfoComparer.cs
index 9b6131dc1..770260edb 100644
--- a/AppControl Manager/Logic/IntelGathering/FileSignerInfoComparer.cs	
+++ b/AppControl Manager/Logic/IntelGathering/FileSignerInfoComparer.cs	
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace WDACConfig.IntelGathering
+namespace AppControlManager.IntelGathering
 {
     /// <summary>
     /// A custom equality comparer for the FileSignerInfo class.
diff --git a/AppControl Manager/Logic/IntelGathering/GetEventLogsData.cs b/AppControl Manager/Logic/IntelGathering/GetEventLogsData.cs
index 5ae73d5a8..c14bf1811 100644
--- a/AppControl Manager/Logic/IntelGathering/GetEventLogsData.cs	
+++ b/AppControl Manager/Logic/IntelGathering/GetEventLogsData.cs	
@@ -7,7 +7,7 @@
 using System.Threading.Tasks;
 using System.Xml;
 
-namespace WDACConfig.IntelGathering
+namespace AppControlManager.IntelGathering
 {
     internal static class GetEventLogsData
     {
diff --git a/AppControl Manager/Logic/IntelGathering/GetMDEAdvancedHuntingLogsData.cs b/AppControl Manager/Logic/IntelGathering/GetMDEAdvancedHuntingLogsData.cs
index dfad61327..a079e66b6 100644
--- a/AppControl Manager/Logic/IntelGathering/GetMDEAdvancedHuntingLogsData.cs	
+++ b/AppControl Manager/Logic/IntelGathering/GetMDEAdvancedHuntingLogsData.cs	
@@ -3,7 +3,7 @@
 using System.Globalization;
 using System.Linq;
 
-namespace WDACConfig.IntelGathering
+namespace AppControlManager.IntelGathering
 {
     internal static class GetMDEAdvancedHuntingLogsData
     {
diff --git a/AppControl Manager/Logic/IntelGathering/KernelModeDrivers.cs b/AppControl Manager/Logic/IntelGathering/KernelModeDrivers.cs
index 2585b726a..714711e3b 100644
--- a/AppControl Manager/Logic/IntelGathering/KernelModeDrivers.cs	
+++ b/AppControl Manager/Logic/IntelGathering/KernelModeDrivers.cs	
@@ -5,7 +5,7 @@
 
 #pragma warning disable CS0649
 
-namespace WDACConfig.IntelGathering
+namespace AppControlManager.IntelGathering
 {
     internal static class KernelModeDrivers
     {
diff --git a/AppControl Manager/Logic/IntelGathering/KernelUserVerdict.cs b/AppControl Manager/Logic/IntelGathering/KernelUserVerdict.cs
index d5ee17bdb..9b3d6f8a1 100644
--- a/AppControl Manager/Logic/IntelGathering/KernelUserVerdict.cs	
+++ b/AppControl Manager/Logic/IntelGathering/KernelUserVerdict.cs	
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace WDACConfig.IntelGathering
+namespace AppControlManager.IntelGathering
 {
     internal sealed class KernelUserVerdict
     {
diff --git a/AppControl Manager/Logic/IntelGathering/LocalFilesScan.cs b/AppControl Manager/Logic/IntelGathering/LocalFilesScan.cs
index 815cc5984..8dbd92c83 100644
--- a/AppControl Manager/Logic/IntelGathering/LocalFilesScan.cs	
+++ b/AppControl Manager/Logic/IntelGathering/LocalFilesScan.cs	
@@ -1,12 +1,16 @@
-using System;
+using Microsoft.UI.Xaml.Controls;
+using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Security.Cryptography;
 using System.Security.Cryptography.Pkcs;
 using System.Security.Cryptography.X509Certificates;
+using System.Threading;
+using System.Threading.Tasks;
 
-namespace WDACConfig.IntelGathering
+namespace AppControlManager.IntelGathering
 {
     public static class LocalFilesScan
     {
@@ -16,221 +20,285 @@ public static class LocalFilesScan
         private const string ECCOID = "1.2.840.10045.2.1";
 
 
-        public static HashSet<FileIdentity> Scan(List<FileInfo> files)
+        public static HashSet<FileIdentity> Scan(List<FileInfo> files, ushort scalability, ProgressBar? UIProgressBar, ProgressRing? UIProgressRing)
         {
-            // HashSet to store the output, ensures the data are unique
-            HashSet<FileIdentity> fileIdentities = new(new FileIdentityComparer());
 
+            // Store the output of all of the parallel tasks in this
+            ConcurrentDictionary<FileInfo, FileIdentity> temporaryOutput = [];
+
+            // The counter variable to track processed files
+            int processedFilesCount = 0;
+
+            // The count of all of the files that are going to be processed
+            double AllFilesCount = files.Count;
 
-            foreach (FileInfo file in files)
+            // split the file paths by the value of Scalability variable
+            IEnumerable<FileInfo[]> SplitArrays = Enumerable.Chunk(files, (int)Math.Ceiling(AllFilesCount / scalability));
+
+            // List of tasks to run in parallel
+            List<Task> tasks = [];
+
+            // Loop over each chunk of data
+            foreach (FileInfo[] chunk in SplitArrays)
             {
+                // Run each chunk of data in a different thread
+                tasks.Add(Task.Run(() =>
+                {
 
-                // To track whether ECC Signed signature has been detected or not
-                // Once it's been set to true, it won't be changed to false anymore for the current file
-                bool IsECCSigned = false;
+                    foreach (FileInfo file in chunk)
+                    {
 
-                // String path of the current file
-                string fileString = file.ToString();
+                        // Increment the processed file count safely
+                        _ = Interlocked.Increment(ref processedFilesCount);
 
-                #region Gather File information
+                        if (UIProgressBar is not null)
+                        {
 
-                // Get the Code integrity hashes of the file
-                CodeIntegrityHashes fileHashes = CiFileHash.GetCiFileHashes(fileString);
+                            // Update progress bar safely on the UI thread
+                            _ = UIProgressBar.DispatcherQueue.TryEnqueue(() =>
+                            {
+                                double progressPercentage = (processedFilesCount / AllFilesCount) * 100;
 
-                // Get the extended file attributes
-                ExFileInfo ExtendedFileInfo = ExFileInfo.GetExtendedFileInfo(fileString);
+                                UIProgressBar.Value = Math.Min(progressPercentage, 100);
+                            });
 
-                // Get the certificate details of the file
-                List<AllFileSigners> FileSignatureResults = AllCertificatesGrabber.GetAllFileSigners(fileString);
+                        }
+                        else if (UIProgressRing is not null)
+                        {
 
-                List<string> ekuOIDs = [];
+                            // Update progress ring safely on the UI thread
+                            _ = UIProgressRing.DispatcherQueue.TryEnqueue(() =>
+                            {
+                                double progressPercentage = (processedFilesCount / AllFilesCount) * 100;
 
-                bool fileIsSigned = false;
+                                UIProgressRing.Value = Math.Min(progressPercentage, 100);
+                            });
+                        }
 
-                if (FileSignatureResults.Count > 0)
-                {
-                    fileIsSigned = true;
-                }
 
-                #endregion
 
-                FileIdentity currentFileIdentity = new()
-                {
-                    Origin = FileIdentityOrigin.DirectFileScan,
-                    SignatureStatus = fileIsSigned ? SignatureStatus.IsSigned : SignatureStatus.IsUnsigned,
-                    FilePath = fileString,
-                    FileName = file.Name,
-                    SHA1Hash = fileHashes.SHa1Authenticode,
-                    SHA256Hash = fileHashes.SHA256Authenticode,
-                    SHA1PageHash = fileHashes.SHA1Page,
-                    SHA256PageHash = fileHashes.SHA256Page,
-                    SISigningScenario = KernelModeDrivers.CheckKernelUserModeStatus(fileString).Verdict is UserOrKernelMode.UserMode ? 1 : 0,
-                    OriginalFileName = ExtendedFileInfo.OriginalFileName,
-                    InternalName = ExtendedFileInfo.InternalName,
-                    FileDescription = ExtendedFileInfo.FileDescription,
-                    ProductName = ExtendedFileInfo.ProductName,
-                    FileVersion = ExtendedFileInfo.Version
-                };
-
-                if (fileIsSigned)
-                {
+                        // To track whether ECC Signed signature has been detected or not
+                        // Once it's been set to true, it won't be changed to false anymore for the current file
+                        bool IsECCSigned = false;
 
-                    // The EKU OIDs of the primary signer of the file, just like the output of the Get-AuthenticodeSignature cmdlet, the ones that App Control policy uses for EKU-based authorization
-                    // Only the leaf certificate of the primary signer has EKUs, others such as root or intermediate have KUs only.
-                    ekuOIDs = FileSignatureResults
-                       .Where(p => p.Signer?.SignerInfos is not null)
-                       .SelectMany(p => p.Signer.SignerInfos.Cast<SignerInfo>())
-                       .Where(info => info.Certificate is not null)
-                       .SelectMany(info => info.Certificate!.Extensions.OfType<X509EnhancedKeyUsageExtension>())
-                       .SelectMany(ext => ext.EnhancedKeyUsages.Cast<Oid>())
-                       .Select(oid => oid.Value)
-                       .ToList()!;
+                        // String path of the current file
+                        string fileString = file.ToString();
 
-                    // Check if the file has WHQL signer
-                    bool HasWHQLSigner = ekuOIDs.Contains(WHQLOid);
+                        #region Gather File information
 
-                    // Assign the FileIdentity's property.
-                    // Indicating the current FileIdentity contains an item in FileSignerInfos property that is a WHQL signer.
-                    currentFileIdentity.HasWHQLSigner = HasWHQLSigner;
+                        // Get the Code integrity hashes of the file
+                        CodeIntegrityHashes fileHashes = CiFileHash.GetCiFileHashes(fileString);
 
-                    // Get all of the certificates of the file
-                    List<ChainPackage> FileSignerInfo = GetCertificateDetails.Get([.. FileSignatureResults]);
+                        // Get the extended file attributes
+                        ExFileInfo ExtendedFileInfo = ExFileInfo.GetExtendedFileInfo(fileString);
 
+                        // Get the certificate details of the file
+                        List<AllFileSigners> FileSignatureResults = AllCertificatesGrabber.GetAllFileSigners(fileString);
 
-                    // Iterate through the certificates of the file
-                    foreach (ChainPackage package in FileSignerInfo)
-                    {
+                        List<string> ekuOIDs = [];
 
-                        string? CurrentOpusData = null;
+                        bool fileIsSigned = false;
 
-                        try
-                        {
-                            // Try to get the Opus data of the current chain (essentially the current chain's leaf certificate)
-                            CurrentOpusData = Opus.GetOpusData(package.SignedCms).Select(p => p.CertOemID).First();
-                        }
-                        catch
+                        if (FileSignatureResults.Count > 0)
                         {
-                            Logger.Write($"Failed to get the Opus data of the current chain package");
+                            fileIsSigned = true;
                         }
 
+                        #endregion
 
-
-                        // If the Leaf Certificate exists in the current package
-                        // Indicating that the current signer of the file is a normal certificate with Leaf/Intermediate(s)/Root
-                        if (package.LeafCertificate is not null)
+                        FileIdentity currentFileIdentity = new()
+                        {
+                            Origin = FileIdentityOrigin.DirectFileScan,
+                            SignatureStatus = fileIsSigned ? SignatureStatus.IsSigned : SignatureStatus.IsUnsigned,
+                            FilePath = fileString,
+                            FileName = file.Name,
+                            SHA1Hash = fileHashes.SHa1Authenticode,
+                            SHA256Hash = fileHashes.SHA256Authenticode,
+                            SHA1PageHash = fileHashes.SHA1Page,
+                            SHA256PageHash = fileHashes.SHA256Page,
+                            SISigningScenario = KernelModeDrivers.CheckKernelUserModeStatus(fileString).Verdict is UserOrKernelMode.UserMode ? 1 : 0,
+                            OriginalFileName = ExtendedFileInfo.OriginalFileName,
+                            InternalName = ExtendedFileInfo.InternalName,
+                            FileDescription = ExtendedFileInfo.FileDescription,
+                            ProductName = ExtendedFileInfo.ProductName,
+                            FileVersion = ExtendedFileInfo.Version
+                        };
+
+                        if (fileIsSigned)
                         {
 
-                            // See if the leaf certificate in the current signer has WHQL OID for its EKU
-                            bool WHQLConfirmed = package.LeafCertificate.Certificate!.Extensions.OfType<X509EnhancedKeyUsageExtension>()
-                                   .Any(eku => eku.EnhancedKeyUsages.Cast<Oid>()
-                                   .Any(oid => oid.Value is not null && oid.Value.Contains(WHQLOid, StringComparison.OrdinalIgnoreCase)));
+                            // The EKU OIDs of the primary signer of the file, just like the output of the Get-AuthenticodeSignature cmdlet, the ones that App Control policy uses for EKU-based authorization
+                            // Only the leaf certificate of the primary signer has EKUs, others such as root or intermediate have KUs only.
+                            ekuOIDs = FileSignatureResults
+                               .Where(p => p.Signer?.SignerInfos is not null)
+                               .SelectMany(p => p.Signer.SignerInfos.Cast<SignerInfo>())
+                               .Where(info => info.Certificate is not null)
+                               .SelectMany(info => info.Certificate!.Extensions.OfType<X509EnhancedKeyUsageExtension>())
+                               .SelectMany(ext => ext.EnhancedKeyUsages.Cast<Oid>())
+                               .Select(oid => oid.Value)
+                               .ToList()!;
 
+                            // Check if the file has WHQL signer
+                            bool HasWHQLSigner = ekuOIDs.Contains(WHQLOid);
 
-                            // Get the TBSHash of the Issuer certificate of the Leaf Certificate of the current file's signer
-                            string IssuerTBSHash = CertificateHelper.GetTBSCertificate(package.LeafCertificate.Issuer);
+                            // Assign the FileIdentity's property.
+                            // Indicating the current FileIdentity contains an item in FileSignerInfos property that is a WHQL signer.
+                            currentFileIdentity.HasWHQLSigner = HasWHQLSigner;
 
-                            FileSignerInfo signerInfo = new()
-                            {
-                                TotalSignatureCount = FileSignerInfo.Count,
-                                NotValidAfter = package.LeafCertificate?.NotAfter,
-                                NotValidBefore = package.LeafCertificate?.NotBefore,
-                                PublisherName = package.LeafCertificate?.SubjectCN,
-                                IssuerName = package.LeafCertificate?.IssuerCN,
-                                PublisherTBSHash = package.LeafCertificate?.TBSValue,
-                                IssuerTBSHash = IssuerTBSHash,
-                                OPUSInfo = CurrentOpusData,
-                                IsWHQL = WHQLConfirmed,
-                                EKUs = WHQLConfirmed ? WHQLOid : ekuOIDs.First() // If the Leaf certificate has WHQL EKU then assign that EKU's OID here, otherwise assign the first OID of the leaf certificate of the file.
-                            };
-
-
-                            // Add the CN of the file's leaf certificate to the FilePublishers HashSet of the current FileIdentity
-                            if (package.LeafCertificate?.SubjectCN is not null)
+                            // Get all of the certificates of the file
+                            List<ChainPackage> FileSignerInfo = GetCertificateDetails.Get([.. FileSignatureResults]);
+
+
+                            // Iterate through the certificates of the file
+                            foreach (ChainPackage package in FileSignerInfo)
                             {
-                                _ = currentFileIdentity.FilePublishers.Add(package.LeafCertificate.SubjectCN);
 
-                                // Check to see if it hasn't already been determined that the file is ECC signed
-                                // We don't want to find an ECC signed certificate and then overwrite the property's value and set it to false by the next non-ECC signed certificate
-                                if (!IsECCSigned)
+                                string? CurrentOpusData = null;
+
+                                try
+                                {
+                                    // Try to get the Opus data of the current chain (essentially the current chain's leaf certificate)
+                                    CurrentOpusData = Opus.GetOpusData(package.SignedCms).Select(p => p.CertOemID).First();
+                                }
+                                catch
                                 {
+                                    Logger.Write($"Failed to get the Opus data of the current chain package");
+                                }
 
-                                    // Check see if the file is ECC-Signed
-                                    currentFileIdentity.IsECCSigned = string.Equals(package.LeafCertificate.Certificate?.PublicKey?.EncodedKeyValue.Oid?.Value, ECCOID, StringComparison.OrdinalIgnoreCase);
 
-                                    if (currentFileIdentity.IsECCSigned == true)
-                                    {
-                                        // Set it to true so we don't search for ECC Signed certificates in other signers of the file
-                                        IsECCSigned = true;
 
-                                        Logger.Write($"ECC Signed File Detected: {currentFileIdentity.FilePath}. Will create Hash rules for it.");
-                                    }
-                                }
-                            }
+                                // If the Leaf Certificate exists in the current package
+                                // Indicating that the current signer of the file is a normal certificate with Leaf/Intermediate(s)/Root
+                                if (package.LeafCertificate is not null)
+                                {
 
+                                    // See if the leaf certificate in the current signer has WHQL OID for its EKU
+                                    bool WHQLConfirmed = package.LeafCertificate.Certificate!.Extensions.OfType<X509EnhancedKeyUsageExtension>()
+                                           .Any(eku => eku.EnhancedKeyUsages.Cast<Oid>()
+                                           .Any(oid => oid.Value is not null && oid.Value.Contains(WHQLOid, StringComparison.OrdinalIgnoreCase)));
 
-                            _ = currentFileIdentity.FileSignerInfos.Add(signerInfo);
 
-                        }
+                                    // Get the TBSHash of the Issuer certificate of the Leaf Certificate of the current file's signer
+                                    string IssuerTBSHash = CertificateHelper.GetTBSCertificate(package.LeafCertificate.Issuer);
 
-                        // If Leaf certificate is null, according to the GetCertificateDetails class's logic,
-                        // use Root certificate. That means the current signer of the file is a root certificate.
-                        else if (package.RootCertificate is not null)
-                        {
+                                    FileSignerInfo signerInfo = new()
+                                    {
+                                        TotalSignatureCount = FileSignerInfo.Count,
+                                        NotValidAfter = package.LeafCertificate?.NotAfter,
+                                        NotValidBefore = package.LeafCertificate?.NotBefore,
+                                        PublisherName = package.LeafCertificate?.SubjectCN,
+                                        IssuerName = package.LeafCertificate?.IssuerCN,
+                                        PublisherTBSHash = package.LeafCertificate?.TBSValue,
+                                        IssuerTBSHash = IssuerTBSHash,
+                                        OPUSInfo = CurrentOpusData,
+                                        IsWHQL = WHQLConfirmed,
+                                        EKUs = WHQLConfirmed ? WHQLOid : ekuOIDs.First() // If the Leaf certificate has WHQL EKU then assign that EKU's OID here, otherwise assign the first OID of the leaf certificate of the file.
+                                    };
+
+
+                                    // Add the CN of the file's leaf certificate to the FilePublishers HashSet of the current FileIdentity
+                                    if (package.LeafCertificate?.SubjectCN is not null)
+                                    {
+                                        _ = currentFileIdentity.FilePublishers.Add(package.LeafCertificate.SubjectCN);
 
+                                        // Check to see if it hasn't already been determined that the file is ECC signed
+                                        // We don't want to find an ECC signed certificate and then overwrite the property's value and set it to false by the next non-ECC signed certificate
+                                        if (!IsECCSigned)
+                                        {
 
-                            // See if the root certificate in the current signer has WHQL OID for its EKU
-                            bool WHQLConfirmed = package.RootCertificate.Certificate!.Extensions.OfType<X509EnhancedKeyUsageExtension>()
-                                   .Any(eku => eku.EnhancedKeyUsages.Cast<Oid>()
-                                   .Any(oid => oid.Value is not null && oid.Value.Contains(WHQLOid, StringComparison.OrdinalIgnoreCase)));
+                                            // Check see if the file is ECC-Signed
+                                            currentFileIdentity.IsECCSigned = string.Equals(package.LeafCertificate.Certificate?.PublicKey?.EncodedKeyValue.Oid?.Value, ECCOID, StringComparison.OrdinalIgnoreCase);
 
+                                            if (currentFileIdentity.IsECCSigned == true)
+                                            {
+                                                // Set it to true so we don't search for ECC Signed certificates in other signers of the file
+                                                IsECCSigned = true;
+
+                                                Logger.Write($"ECC Signed File Detected: {currentFileIdentity.FilePath}. Will create Hash rules for it.");
+                                            }
+                                        }
+                                    }
 
-                            FileSignerInfo signerInfo = new()
-                            {
-                                TotalSignatureCount = FileSignerInfo.Count,
-                                NotValidAfter = package.RootCertificate.NotAfter,
-                                NotValidBefore = package.RootCertificate.NotBefore,
-                                PublisherName = package.RootCertificate.SubjectCN,
-                                IssuerName = package.RootCertificate.IssuerCN,
-                                PublisherTBSHash = package.RootCertificate.TBSValue,
-                                IssuerTBSHash = package.RootCertificate.TBSValue,
-                                OPUSInfo = CurrentOpusData,
-                                IsWHQL = WHQLConfirmed,
-                                EKUs = WHQLConfirmed ? WHQLOid : ekuOIDs.First() // If the root certificate has WHQL EKU then assign that EKU's OID here, otherwise assign the first OID of the root certificate of the file.
-                            };
-
-
-                            // Add the CN of the file's root certificate to the FilePublishers HashSet of the current FileIdentity
-                            if (package.RootCertificate.SubjectCN is not null)
-                            {
-                                _ = currentFileIdentity.FilePublishers.Add(package.RootCertificate.SubjectCN);
 
+                                    _ = currentFileIdentity.FileSignerInfos.Add(signerInfo);
+
+                                }
 
-                                // Check to see if it hasn't already been determined that the file is ECC signed
-                                // We don't want to find an ECC signed certificate and then overwrite the property's value and set it to false by the next non-ECC signed certificate
-                                if (!IsECCSigned)
+                                // If Leaf certificate is null, according to the GetCertificateDetails class's logic,
+                                // use Root certificate. That means the current signer of the file is a root certificate.
+                                else if (package.RootCertificate is not null)
                                 {
-                                    // Check see if the file is ECC-Signed
-                                    currentFileIdentity.IsECCSigned = string.Equals(package.RootCertificate.Certificate?.PublicKey?.EncodedKeyValue.Oid?.Value, ECCOID, StringComparison.OrdinalIgnoreCase);
 
-                                    if (currentFileIdentity.IsECCSigned == true)
+
+                                    // See if the root certificate in the current signer has WHQL OID for its EKU
+                                    bool WHQLConfirmed = package.RootCertificate.Certificate!.Extensions.OfType<X509EnhancedKeyUsageExtension>()
+                                           .Any(eku => eku.EnhancedKeyUsages.Cast<Oid>()
+                                           .Any(oid => oid.Value is not null && oid.Value.Contains(WHQLOid, StringComparison.OrdinalIgnoreCase)));
+
+
+                                    FileSignerInfo signerInfo = new()
+                                    {
+                                        TotalSignatureCount = FileSignerInfo.Count,
+                                        NotValidAfter = package.RootCertificate.NotAfter,
+                                        NotValidBefore = package.RootCertificate.NotBefore,
+                                        PublisherName = package.RootCertificate.SubjectCN,
+                                        IssuerName = package.RootCertificate.IssuerCN,
+                                        PublisherTBSHash = package.RootCertificate.TBSValue,
+                                        IssuerTBSHash = package.RootCertificate.TBSValue,
+                                        OPUSInfo = CurrentOpusData,
+                                        IsWHQL = WHQLConfirmed,
+                                        EKUs = WHQLConfirmed ? WHQLOid : ekuOIDs.First() // If the root certificate has WHQL EKU then assign that EKU's OID here, otherwise assign the first OID of the root certificate of the file.
+                                    };
+
+
+                                    // Add the CN of the file's root certificate to the FilePublishers HashSet of the current FileIdentity
+                                    if (package.RootCertificate.SubjectCN is not null)
                                     {
-                                        // Set it to true so we don't search for ECC Signed certificates in other signers of the file
-                                        IsECCSigned = true;
+                                        _ = currentFileIdentity.FilePublishers.Add(package.RootCertificate.SubjectCN);
+
+
+                                        // Check to see if it hasn't already been determined that the file is ECC signed
+                                        // We don't want to find an ECC signed certificate and then overwrite the property's value and set it to false by the next non-ECC signed certificate
+                                        if (!IsECCSigned)
+                                        {
+                                            // Check see if the file is ECC-Signed
+                                            currentFileIdentity.IsECCSigned = string.Equals(package.RootCertificate.Certificate?.PublicKey?.EncodedKeyValue.Oid?.Value, ECCOID, StringComparison.OrdinalIgnoreCase);
+
+                                            if (currentFileIdentity.IsECCSigned == true)
+                                            {
+                                                // Set it to true so we don't search for ECC Signed certificates in other signers of the file
+                                                IsECCSigned = true;
+
+                                                Logger.Write($"ECC Signed File Detected: {currentFileIdentity.FilePath}. Will create Hash rules for it.");
+                                            }
+                                        }
 
-                                        Logger.Write($"ECC Signed File Detected: {currentFileIdentity.FilePath}. Will create Hash rules for it.");
                                     }
-                                }
 
+                                    _ = currentFileIdentity.FileSignerInfos.Add(signerInfo);
+                                }
                             }
-
-                            _ = currentFileIdentity.FileSignerInfos.Add(signerInfo);
                         }
+
+                        // Add the current file's identity to the output HashSet
+                        _ = temporaryOutput.TryAdd(file, currentFileIdentity);
+
                     }
-                }
+                }));
+            }
 
-                // Add the current file's identity to the output HashSet
-                _ = fileIdentities.Add(currentFileIdentity);
 
+            // Wait for all tasks to complete without making the method async
+            // The method is already being called in an async/await fashion
+            Task.WaitAll([.. tasks]);
+
+            // HashSet to store the output, ensures the data are unique
+            HashSet<FileIdentity> fileIdentities = new(new FileIdentityComparer());
+
+            // Add all the items from the Concurrent Dictionary to the Custom HashSet
+            foreach (FileIdentity item in temporaryOutput.Values)
+            {
+                _ = fileIdentities.Add(item);
             }
 
             return fileIdentities;
diff --git a/AppControl Manager/Logic/IntelGathering/MDEAdvancedHuntingData.cs b/AppControl Manager/Logic/IntelGathering/MDEAdvancedHuntingData.cs
index 3da2be8fa..2c9497c1a 100644
--- a/AppControl Manager/Logic/IntelGathering/MDEAdvancedHuntingData.cs	
+++ b/AppControl Manager/Logic/IntelGathering/MDEAdvancedHuntingData.cs	
@@ -1,5 +1,5 @@
 
-namespace WDACConfig.IntelGathering
+namespace AppControlManager.IntelGathering
 {
     // Define a public class to store the structure of the new CSV data
     public sealed class MDEAdvancedHuntingData
diff --git a/AppControl Manager/Logic/IntelGathering/OptimizeMDECSVData.cs b/AppControl Manager/Logic/IntelGathering/OptimizeMDECSVData.cs
index 90916dcdd..cb861142f 100644
--- a/AppControl Manager/Logic/IntelGathering/OptimizeMDECSVData.cs	
+++ b/AppControl Manager/Logic/IntelGathering/OptimizeMDECSVData.cs	
@@ -6,7 +6,7 @@
 using System.Text.Json.Serialization;
 using System.Text.RegularExpressions;
 
-namespace WDACConfig.IntelGathering
+namespace AppControlManager.IntelGathering
 {
 
     // Generates precomputed serialization metadata for Dictionary<string, string> at compile time,
diff --git a/AppControl Manager/Logic/IntelGathering/PlatformInvocations.cs b/AppControl Manager/Logic/IntelGathering/PlatformInvocations.cs
index d401cbf69..40149c977 100644
--- a/AppControl Manager/Logic/IntelGathering/PlatformInvocations.cs	
+++ b/AppControl Manager/Logic/IntelGathering/PlatformInvocations.cs	
@@ -1,13 +1,14 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace WDACConfig.IntelGathering
+namespace AppControlManager.IntelGathering
 {
     internal static partial class PlatformInvocations
     {
 
         // https://learn.microsoft.com/en-us/windows/win32/api/mssip/nf-mssip-cryptsipretrievesubjectguid
         [LibraryImport("crypt32.dll", EntryPoint = "CryptSIPRetrieveSubjectGuid", SetLastError = true, StringMarshalling = StringMarshalling.Utf16)]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
         [return: MarshalAs(UnmanagedType.Bool)]
         internal static partial bool CryptSIPRetrieveSubjectGuid(
             string FileName,
@@ -16,6 +17,7 @@ internal static partial bool CryptSIPRetrieveSubjectGuid(
 
         // https://learn.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-createfilew
         [LibraryImport("kernel32.dll", EntryPoint = "CreateFileW", SetLastError = true, StringMarshalling = StringMarshalling.Utf16)]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
         internal static partial IntPtr CreateFileW(
             string lpFileName,
             uint dwDesiredAccess,
@@ -27,11 +29,13 @@ internal static partial IntPtr CreateFileW(
 
         // https://learn.microsoft.com/en-us/windows/win32/api/handleapi/nf-handleapi-closehandle
         [LibraryImport("kernel32.dll", SetLastError = true)]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
         [return: MarshalAs(UnmanagedType.Bool)]
         internal static partial bool CloseHandle(IntPtr hObject);
 
         // https://learn.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-createfilemappinga
         [LibraryImport("kernel32.dll", EntryPoint = "CreateFileMappingW", SetLastError = true, StringMarshalling = StringMarshalling.Utf16)]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
         internal static partial IntPtr CreateFileMapping(
             IntPtr hFile,
             IntPtr pFileMappingAttributes,
@@ -42,10 +46,12 @@ internal static partial IntPtr CreateFileMapping(
 
         // https://learn.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-getfilesize
         [LibraryImport("kernel32.dll", SetLastError = true)]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
         internal static partial uint GetFileSize(IntPtr hFile, ref uint lpFileSizeHigh);
 
         // https://learn.microsoft.com/en-us/windows/win32/api/memoryapi/nf-memoryapi-mapviewoffile
         [LibraryImport("kernel32.dll", SetLastError = true)]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
         internal static partial IntPtr MapViewOfFile(
             IntPtr hFileMappingObject,
             uint dwDesiredAccess,
@@ -55,6 +61,7 @@ internal static partial IntPtr MapViewOfFile(
 
         // https://learn.microsoft.com/en-us/windows/win32/api/dbghelp/nf-dbghelp-imagedirectoryentrytodataex
         [LibraryImport("DbgHelp.dll", SetLastError = true)]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
         internal static partial IntPtr ImageDirectoryEntryToDataEx(
             IntPtr Base,
             int MappedAsImage,
@@ -64,14 +71,17 @@ internal static partial IntPtr ImageDirectoryEntryToDataEx(
 
         // https://learn.microsoft.com/en-us/windows/win32/api/memoryapi/nf-memoryapi-unmapviewoffile
         [LibraryImport("kernel32.dll", SetLastError = true)]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
         internal static partial int UnmapViewOfFile(IntPtr lpBaseAddress);
 
         // https://learn.microsoft.com/en-us/windows/win32/api/dbghelp/nf-dbghelp-imagentheader
         [LibraryImport("DbgHelp.dll", SetLastError = true)]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
         internal static partial IntPtr ImageNtHeader(IntPtr ImageBase);
 
         // https://learn.microsoft.com/en-us/windows/win32/api/dbghelp/nf-dbghelp-imagervatova
         [LibraryImport("DbgHelp.dll", SetLastError = true)]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
         internal static partial IntPtr ImageRvaToVa(
             IntPtr NtHeaders,
             IntPtr Base,
diff --git a/AppControl Manager/Logic/IntelGathering/PrepareEmptyPolicy.cs b/AppControl Manager/Logic/IntelGathering/PrepareEmptyPolicy.cs
index c0d4c17b0..014e86a0f 100644
--- a/AppControl Manager/Logic/IntelGathering/PrepareEmptyPolicy.cs	
+++ b/AppControl Manager/Logic/IntelGathering/PrepareEmptyPolicy.cs	
@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace WDACConfig.IntelGathering
+namespace AppControlManager.IntelGathering
 {
     public static class PrepareEmptyPolicy
     {
diff --git a/AppControl Manager/Logic/IntelGathering/ScanLevels.cs b/AppControl Manager/Logic/IntelGathering/ScanLevels.cs
index d7cb1edae..2e902ecd8 100644
--- a/AppControl Manager/Logic/IntelGathering/ScanLevels.cs	
+++ b/AppControl Manager/Logic/IntelGathering/ScanLevels.cs	
@@ -1,4 +1,4 @@
-namespace WDACConfig.IntelGathering
+namespace AppControlManager.IntelGathering
 {
     // The levels used by the BuildSignerAndHashObjects method
     public enum ScanLevels
diff --git a/AppControl Manager/Logic/IntelGathering/SignatureStatus.cs b/AppControl Manager/Logic/IntelGathering/SignatureStatus.cs
index 6e700b445..5f8c452a9 100644
--- a/AppControl Manager/Logic/IntelGathering/SignatureStatus.cs	
+++ b/AppControl Manager/Logic/IntelGathering/SignatureStatus.cs	
@@ -1,5 +1,5 @@
 
-namespace WDACConfig.IntelGathering
+namespace AppControlManager.IntelGathering
 {
     public enum SignatureStatus
     {
diff --git a/AppControl Manager/Logic/Logging/Logger.cs b/AppControl Manager/Logic/Logging/Logger.cs
index 47169a350..d960502d7 100644
--- a/AppControl Manager/Logic/Logging/Logger.cs	
+++ b/AppControl Manager/Logic/Logging/Logger.cs	
@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public static class Logger
     {
@@ -9,7 +9,7 @@ public static class Logger
         internal static readonly string LogsDirectory = Path.Combine(GlobalVars.UserConfigDir, "Logs");
 
         // The Logs file path
-        private static readonly string LogFileName = Path.Combine(LogsDirectory, $"WDACConfig_AppLogs_{DateTime.Now:yyyy-MM-dd HH-mm-ss}.txt");
+        private static readonly string LogFileName = Path.Combine(LogsDirectory, $"AppControlManager_Logs_{DateTime.Now:yyyy-MM-dd HH-mm-ss}.txt");
 
         static Logger()
         {
diff --git a/AppControl Manager/Logic/Main Cmdlets/InvokeWDACSimulation.cs b/AppControl Manager/Logic/Main/AppControlSimulation.cs
similarity index 99%
rename from AppControl Manager/Logic/Main Cmdlets/InvokeWDACSimulation.cs
rename to AppControl Manager/Logic/Main/AppControlSimulation.cs
index b8f9e80cb..1c09e77a7 100644
--- a/AppControl Manager/Logic/Main Cmdlets/InvokeWDACSimulation.cs	
+++ b/AppControl Manager/Logic/Main/AppControlSimulation.cs	
@@ -13,9 +13,9 @@
 using System.Threading.Tasks;
 using System.Xml;
 
-namespace WDACConfig
+namespace AppControlManager
 {
-    public static class InvokeWDACSimulation
+    public static class AppControlSimulation
     {
 
         /// <summary>
@@ -282,7 +282,7 @@ public static ConcurrentDictionary<string, SimulationOutput> Invoke(
 
             Logger.Write("Looping through each supported file");
 
-            // Rhe counter variable to track processed files
+            // The counter variable to track processed files
             int processedFilesCount = 0;
 
             // The count of all of the files that are going to be processed
diff --git a/AppControl Manager/Logic/Main Cmdlets/BasePolicyCreator.cs b/AppControl Manager/Logic/Main/BasePolicyCreator.cs
similarity index 98%
rename from AppControl Manager/Logic/Main Cmdlets/BasePolicyCreator.cs
rename to AppControl Manager/Logic/Main/BasePolicyCreator.cs
index ba311c66a..22c9ce5de 100644
--- a/AppControl Manager/Logic/Main Cmdlets/BasePolicyCreator.cs	
+++ b/AppControl Manager/Logic/Main/BasePolicyCreator.cs	
@@ -10,7 +10,7 @@
 using System.Text.RegularExpressions;
 using System.Xml;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public static partial class BasePolicyCreator
     {
@@ -189,7 +189,7 @@ public sealed class DriverBlockListInfo
                 string repo = "windows-itpro-docs";
                 string path = "windows/security/application-security/application-control/app-control-for-business/design/microsoft-recommended-driver-block-rules.md";
 
-                string apiUrl = $"https://api.github.com/repos/{owner}/{repo}/commits?path={path}";
+                Uri apiUrl = new($"https://api.github.com/repos/{owner}/{repo}/commits?path={path}");
 
                 using HttpClient httpClient = new();
                 httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/115.0.0.0 Safari/537.36");
@@ -217,8 +217,7 @@ public sealed class DriverBlockListInfo
                 }
 
                 // Fetch the content of the Markdown file
-                string markdownUrl = GlobalVars.MSFTRecommendedDriverBlockRulesURL;
-                string markdownContent = httpClient.GetStringAsync(markdownUrl).GetAwaiter().GetResult();
+                string markdownContent = httpClient.GetStringAsync(GlobalVars.MSFTRecommendedDriverBlockRulesURL).GetAwaiter().GetResult();
 
                 // Use Regex to find the version
                 string version = string.Empty;
@@ -264,7 +263,7 @@ public static void DeployDriversBlockRules(string StagingArea)
             string ZipExtractionDir = Path.Combine(StagingArea, "VulnerableDriverBlockList");
 
             // The link to download the zip file
-            string DriversBlockListZipDownloadLink = "https://aka.ms/VulnerableDriverBlockList";
+            Uri DriversBlockListZipDownloadLink = new("https://aka.ms/VulnerableDriverBlockList");
 
             // Get the system drive
             string? systemDrive = Environment.GetEnvironmentVariable("SystemDrive");
diff --git a/AppControl Manager/Logic/Main Cmdlets/GetCIPolicySetting.cs b/AppControl Manager/Logic/Main/GetCIPolicySetting.cs
similarity index 99%
rename from AppControl Manager/Logic/Main Cmdlets/GetCIPolicySetting.cs
rename to AppControl Manager/Logic/Main/GetCIPolicySetting.cs
index 1c9e609e8..92713d2b3 100644
--- a/AppControl Manager/Logic/Main Cmdlets/GetCIPolicySetting.cs	
+++ b/AppControl Manager/Logic/Main/GetCIPolicySetting.cs	
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace WDACConfig
+namespace AppControlManager
 {
 
     public sealed class SecurePolicySetting(object? Value, WLDP_SECURE_SETTING_VALUE_TYPE ValueType, uint ValueSize, bool Status, int StatusCode)
diff --git a/AppControl Manager/Logic/Main Cmdlets/GetCiFileHashes.cs b/AppControl Manager/Logic/Main/GetCiFileHashes.cs
similarity index 99%
rename from AppControl Manager/Logic/Main Cmdlets/GetCiFileHashes.cs
rename to AppControl Manager/Logic/Main/GetCiFileHashes.cs
index 0257842cf..4d646cf3d 100644
--- a/AppControl Manager/Logic/Main Cmdlets/GetCiFileHashes.cs	
+++ b/AppControl Manager/Logic/Main/GetCiFileHashes.cs	
@@ -4,7 +4,7 @@
 using System.Runtime.InteropServices;
 using System.Text;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public static class CiFileHash
     {
diff --git a/AppControl Manager/Logic/Main Cmdlets/SetCiRuleOptions.cs b/AppControl Manager/Logic/Main/SetCiRuleOptions.cs
similarity index 99%
rename from AppControl Manager/Logic/Main Cmdlets/SetCiRuleOptions.cs
rename to AppControl Manager/Logic/Main/SetCiRuleOptions.cs
index fc6d24d28..82db5246f 100644
--- a/AppControl Manager/Logic/Main Cmdlets/SetCiRuleOptions.cs	
+++ b/AppControl Manager/Logic/Main/SetCiRuleOptions.cs	
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Xml;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public static class CiRuleOptions
     {
@@ -163,7 +163,7 @@ public enum PolicyRuleOptions
 
            // Load the CI Schema content
            XmlDocument schemaData = new();
-           schemaData.Load(Path.Combine(WDACConfig.GlobalVars.CISchemaPath));
+           schemaData.Load(Path.Combine(AppControlManager.GlobalVars.CISchemaPath));
 
            // Create a namespace manager to handle namespaces
            XmlNamespaceManager nsManager = new(schemaData.NameTable);
diff --git a/AppControl Manager/Logic/Main Cmdlets/TestCiPolicy.cs b/AppControl Manager/Logic/Main/TestCiPolicy.cs
similarity index 99%
rename from AppControl Manager/Logic/Main Cmdlets/TestCiPolicy.cs
rename to AppControl Manager/Logic/Main/TestCiPolicy.cs
index 35b5965d3..958e4454a 100644
--- a/AppControl Manager/Logic/Main Cmdlets/TestCiPolicy.cs	
+++ b/AppControl Manager/Logic/Main/TestCiPolicy.cs	
@@ -6,7 +6,7 @@
 using System.Xml;
 using System.Xml.Schema;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public static class CiPolicyTest
     {
diff --git a/AppControl Manager/Logic/Main Cmdlets/UserConfiguration.cs b/AppControl Manager/Logic/Main/UserConfiguration.cs
similarity index 99%
rename from AppControl Manager/Logic/Main Cmdlets/UserConfiguration.cs
rename to AppControl Manager/Logic/Main/UserConfiguration.cs
index ca6410d70..7f5d67a15 100644
--- a/AppControl Manager/Logic/Main Cmdlets/UserConfiguration.cs	
+++ b/AppControl Manager/Logic/Main/UserConfiguration.cs	
@@ -4,7 +4,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace WDACConfig
+namespace AppControlManager
 {
 
     // This is to ensure the Serialize method works when trimming is enabled
diff --git a/AppControl Manager/Logic/MainWindowViewModel.cs b/AppControl Manager/Logic/MainWindowViewModel.cs
index ab176a2f8..9c060b94f 100644
--- a/AppControl Manager/Logic/MainWindowViewModel.cs	
+++ b/AppControl Manager/Logic/MainWindowViewModel.cs	
@@ -1,7 +1,7 @@
 using Microsoft.UI.Dispatching;
 using System.ComponentModel;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     /// <summary>
     /// ViewModel for the MainWindow, responsible for managing UI properties and
@@ -67,14 +67,15 @@ public MainWindowViewModel(AppUpdate updateService)
         /// </summary>
         /// <param name="sender">Sender of the event, in this case, AppUpdate instance.</param>
         /// <param name="isUpdateAvailable">Boolean indicating whether an update is available.</param>
-        private void OnUpdateAvailable(object sender, bool isUpdateAvailable)
+        private void OnUpdateAvailable(object sender, UpdateAvailableEventArgs e)
         {
             // Marshal back to the UI thread using the dispatcher to safely update UI-bound properties
             _ = _dispatcher.TryEnqueue(() =>
-             {
-                 // Set InfoBadgeOpacity based on update availability: 1 to show, 0 to hide
-                 InfoBadgeOpacity = isUpdateAvailable ? 1 : 0;
-             });
+            {
+                // Set InfoBadgeOpacity based on update availability: 1 to show, 0 to hide
+                InfoBadgeOpacity = e.IsUpdateAvailable ? 1 : 0;
+            });
         }
+
     }
 }
diff --git a/AppControl Manager/Logic/MeowOpener.cs b/AppControl Manager/Logic/MeowOpener.cs
index 6e258f26f..20d749a5a 100644
--- a/AppControl Manager/Logic/MeowOpener.cs	
+++ b/AppControl Manager/Logic/MeowOpener.cs	
@@ -3,7 +3,7 @@
 using System.Runtime.InteropServices;
 using System.Xml;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     // Declares a public static class that cannot be instantiated.
     public static partial class MeowParser
@@ -12,6 +12,7 @@ public static partial class MeowParser
         // P/Invoke declaration to import the 'BCryptOpenAlgorithmProvider' function from 'bcrypt.dll'.
         // https://learn.microsoft.com/en-us/windows/win32/api/bcrypt/nf-bcrypt-bcryptopenalgorithmprovider
         [LibraryImport("bcrypt.dll", EntryPoint = "BCryptOpenAlgorithmProvider", SetLastError = true, StringMarshalling = StringMarshalling.Utf16)]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
         internal static partial int BCryptOpenAlgorithmProvider(
         out IntPtr phAlgorithm, // Output parameter to receive the handle of the cryptographic algorithm.
         string pszAlgId, // The algorithm identifier (e.g., AES, SHA256, etc.).
@@ -22,6 +23,7 @@ internal static partial int BCryptOpenAlgorithmProvider(
         // Releases the algorithm handle acquired by 'BCryptOpenAlgorithmProvider'.
         // https://learn.microsoft.com/en-us/windows/win32/api/bcrypt/nf-bcrypt-bcryptclosealgorithmprovider
         [LibraryImport("bcrypt.dll", EntryPoint = "BCryptCloseAlgorithmProvider", SetLastError = true)]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
         internal static partial int BCryptCloseAlgorithmProvider(IntPtr hAlgorithm, uint dwFlags);
 
         // Defines a structure with sequential layout to match the native structure.
diff --git a/AppControl Manager/Logic/MoveUserModeToKernelMode.cs b/AppControl Manager/Logic/MoveUserModeToKernelMode.cs
index 6b1f84e20..9228e8497 100644
--- a/AppControl Manager/Logic/MoveUserModeToKernelMode.cs	
+++ b/AppControl Manager/Logic/MoveUserModeToKernelMode.cs	
@@ -1,7 +1,7 @@
 using System;
 using System.Xml;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public static class MoveUserModeToKernelMode
     {
diff --git a/AppControl Manager/Logic/NavigationBackgroundManager.cs b/AppControl Manager/Logic/NavigationBackgroundManager.cs
index 2dcf1a70e..91e5d46ca 100644
--- a/AppControl Manager/Logic/NavigationBackgroundManager.cs	
+++ b/AppControl Manager/Logic/NavigationBackgroundManager.cs	
@@ -1,16 +1,26 @@
 using System;
 
-namespace WDACConfig
+namespace AppControlManager
 {
-    public static class NavigationBackgroundManager
+    // Custom EventArgs class for navigation background changes
+    internal sealed class NavigationBackgroundChangedEventArgs(bool isBackgroundOn) : EventArgs
+    {
+        internal bool IsBackgroundOn { get; } = isBackgroundOn;
+    }
+
+    internal static class NavigationBackgroundManager
     {
         // Event for when the NavigationView background changes
-        public static event Action<bool>? NavViewBackgroundChange;
+        internal static event EventHandler<NavigationBackgroundChangedEventArgs>? NavViewBackgroundChange;
 
         // Method to invoke the event
-        public static void OnNavigationBackgroundChanged(bool isBackgroundOn)
+        internal static void OnNavigationBackgroundChanged(bool isBackgroundOn)
         {
-            NavViewBackgroundChange?.Invoke(isBackgroundOn);
+            // Raise the NavViewBackgroundChange event with the new background status
+            NavViewBackgroundChange?.Invoke(
+                null,
+                new NavigationBackgroundChangedEventArgs(isBackgroundOn)
+            );
         }
     }
 }
diff --git a/AppControl Manager/Logic/NavigationViewLocationManager.cs b/AppControl Manager/Logic/NavigationViewLocationManager.cs
index 29d2a7faa..b251be3d5 100644
--- a/AppControl Manager/Logic/NavigationViewLocationManager.cs	
+++ b/AppControl Manager/Logic/NavigationViewLocationManager.cs	
@@ -1,17 +1,27 @@
 using System;
 
-namespace WDACConfig
+namespace AppControlManager
 {
-    public static class NavigationViewLocationManager
+    // Custom EventArgs class for navigation view location changes
+    internal sealed class NavigationViewLocationChangedEventArgs(string newLocation) : EventArgs
+    {
+        internal string NewLocation { get; } = newLocation;
+    }
+
+    internal static class NavigationViewLocationManager
     {
         // The static event for NavigationView location changes
         // MainWindow listens to this to set the NavigationView's location
-        public static event Action<string>? NavigationViewLocationChanged;
+        internal static event EventHandler<NavigationViewLocationChangedEventArgs>? NavigationViewLocationChanged;
 
-        // Method to raise the event when the background is changed
-        public static void OnNavigationViewLocationChanged(string newLocation)
+        // Method to raise the event when the location changes
+        internal static void OnNavigationViewLocationChanged(string newLocation)
         {
-            NavigationViewLocationChanged?.Invoke(newLocation);
+            // Raise the NavigationViewLocationChanged event with the new location
+            NavigationViewLocationChanged?.Invoke(
+                null,
+                new NavigationViewLocationChangedEventArgs(newLocation)
+            );
         }
     }
 }
diff --git a/AppControl Manager/Logic/PageHashCalc.cs b/AppControl Manager/Logic/PageHashCalc.cs
index 0d88a05c4..273eefc0f 100644
--- a/AppControl Manager/Logic/PageHashCalc.cs	
+++ b/AppControl Manager/Logic/PageHashCalc.cs	
@@ -3,7 +3,7 @@
 using System.Runtime.InteropServices;
 using System.Text;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     /// <summary>
     /// necessary logics for Page hash calculation
diff --git a/AppControl Manager/Logic/PolicyFileSigningStatusDetection.cs b/AppControl Manager/Logic/PolicyFileSigningStatusDetection.cs
index 8a95f25a6..2bd73a743 100644
--- a/AppControl Manager/Logic/PolicyFileSigningStatusDetection.cs	
+++ b/AppControl Manager/Logic/PolicyFileSigningStatusDetection.cs	
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Xml;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public static class PolicyFileSigningStatusDetection
     {
diff --git a/AppControl Manager/Logic/PolicyMerger.cs b/AppControl Manager/Logic/PolicyMerger.cs
index e69cd5b79..c02f6b0a0 100644
--- a/AppControl Manager/Logic/PolicyMerger.cs	
+++ b/AppControl Manager/Logic/PolicyMerger.cs	
@@ -1,6 +1,6 @@
 using System.Linq;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public static class PolicyMerger
     {
diff --git a/AppControl Manager/Logic/PolicyToCIPConverter.cs b/AppControl Manager/Logic/PolicyToCIPConverter.cs
index 3595cb8eb..e0eab12b8 100644
--- a/AppControl Manager/Logic/PolicyToCIPConverter.cs	
+++ b/AppControl Manager/Logic/PolicyToCIPConverter.cs	
@@ -1,4 +1,4 @@
-namespace WDACConfig
+namespace AppControlManager
 {
     public static class PolicyToCIPConverter
     {
diff --git a/AppControl Manager/Logic/ProcessStarter.cs b/AppControl Manager/Logic/ProcessStarter.cs
index c3c018b28..b42c872bb 100644
--- a/AppControl Manager/Logic/ProcessStarter.cs	
+++ b/AppControl Manager/Logic/ProcessStarter.cs	
@@ -1,7 +1,7 @@
 using System;
 using System.Diagnostics;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     internal static class ProcessStarter
     {
diff --git a/AppControl Manager/Logic/RemoveSupplementalSigners.cs b/AppControl Manager/Logic/RemoveSupplementalSigners.cs
index 86062a19f..ceb92375b 100644
--- a/AppControl Manager/Logic/RemoveSupplementalSigners.cs	
+++ b/AppControl Manager/Logic/RemoveSupplementalSigners.cs	
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Xml;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public static class CiPolicyHandler
     {
diff --git a/AppControl Manager/Logic/SecureStringComparer.cs b/AppControl Manager/Logic/SecureStringComparer.cs
index f54ddba69..a664e01f2 100644
--- a/AppControl Manager/Logic/SecureStringComparer.cs	
+++ b/AppControl Manager/Logic/SecureStringComparer.cs	
@@ -2,7 +2,7 @@
 using System.Runtime.InteropServices;
 using System.Security;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public static class SecureStringComparer
     {
diff --git a/AppControl Manager/Logic/SignToolHelper.cs b/AppControl Manager/Logic/SignToolHelper.cs
index 36a5bd0c6..fa595b5d9 100644
--- a/AppControl Manager/Logic/SignToolHelper.cs	
+++ b/AppControl Manager/Logic/SignToolHelper.cs	
@@ -7,7 +7,7 @@
 using System.Runtime.InteropServices;
 using System.Text.Json;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public static class SignToolHelper
     {
@@ -85,7 +85,7 @@ private static string Download()
             Logger.Write("Finding the latest version of the microsoft.windows.sdk.buildtools package from NuGet");
 
             // Get the list of versions
-            string versionsUrl = $"https://api.nuget.org/v3-flatcontainer/{packageName}/index.json";
+            Uri versionsUrl = new($"https://api.nuget.org/v3-flatcontainer/{packageName}/index.json");
             string versionsResponse = client.GetStringAsync(versionsUrl).GetAwaiter().GetResult();
 
             // Parse the JSON to get the latest version
@@ -94,7 +94,7 @@ private static string Download()
             string? latestVersion = versions[versions.GetArrayLength() - 1].GetString() ?? throw new InvalidOperationException("Failed to get the latest version of the package.");
 
             // Construct the download link for the latest version's .nupkg
-            string downloadUrl = $"https://api.nuget.org/v3-flatcontainer/{packageName}/{latestVersion}/{packageName}.{latestVersion}.nupkg";
+            Uri downloadUrl = new($"https://api.nuget.org/v3-flatcontainer/{packageName}/{latestVersion}/{packageName}.{latestVersion}.nupkg");
 
             Logger.Write($"Downloading the latest .nupkg package file version '{latestVersion}' from the following URL: {downloadUrl}");
 
diff --git a/AppControl Manager/Logic/SnapBackGuarantee.cs b/AppControl Manager/Logic/SnapBackGuarantee.cs
index 4b28cd89b..aaf95a8df 100644
--- a/AppControl Manager/Logic/SnapBackGuarantee.cs	
+++ b/AppControl Manager/Logic/SnapBackGuarantee.cs	
@@ -2,7 +2,7 @@
 using System.IO;
 using System.Management;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public static class SnapBackGuarantee
     {
diff --git a/AppControl Manager/Logic/SoundManager.cs b/AppControl Manager/Logic/SoundManager.cs
index a7e45aba1..1bc111523 100644
--- a/AppControl Manager/Logic/SoundManager.cs	
+++ b/AppControl Manager/Logic/SoundManager.cs	
@@ -1,16 +1,26 @@
 using System;
 
-namespace WDACConfig
+namespace AppControlManager
 {
-    public static class SoundManager
+    // Custom EventArgs class for sound setting changes
+    internal sealed class SoundSettingChangedEventArgs(bool isSoundOn) : EventArgs
+    {
+        internal bool IsSoundOn { get; } = isSoundOn;
+    }
+
+    internal static class SoundManager
     {
         // Event to notify when the sound setting is changed
-        public static event Action<bool>? SoundSettingChanged;
+        internal static event EventHandler<SoundSettingChangedEventArgs>? SoundSettingChanged;
 
         // Method to invoke the event
-        public static void OnSoundSettingChanged(bool isSoundOn)
+        internal static void OnSoundSettingChanged(bool isSoundOn)
         {
-            SoundSettingChanged?.Invoke(isSoundOn);
+            // Raise the SoundSettingChanged event with the new sound setting status
+            SoundSettingChanged?.Invoke(
+                null,
+                new SoundSettingChangedEventArgs(isSoundOn)
+            );
         }
     }
 }
diff --git a/AppControl Manager/Logic/StagingArea.cs b/AppControl Manager/Logic/StagingArea.cs
index f3404ece8..5bed23bc7 100644
--- a/AppControl Manager/Logic/StagingArea.cs	
+++ b/AppControl Manager/Logic/StagingArea.cs	
@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public static class StagingArea
     {
diff --git a/AppControl Manager/Logic/SupplementalForSelf.cs b/AppControl Manager/Logic/SupplementalForSelf.cs
index 629193b69..a928d036d 100644
--- a/AppControl Manager/Logic/SupplementalForSelf.cs	
+++ b/AppControl Manager/Logic/SupplementalForSelf.cs	
@@ -3,7 +3,7 @@
 using System.IO;
 using System.Linq;
 
-namespace WDACConfig
+namespace AppControlManager
 {
 
     internal static class SupplementalForSelf
diff --git a/AppControl Manager/Logic/TaskSchedulerHelper.cs b/AppControl Manager/Logic/TaskSchedulerHelper.cs
index 70d4b12ab..714493b20 100644
--- a/AppControl Manager/Logic/TaskSchedulerHelper.cs	
+++ b/AppControl Manager/Logic/TaskSchedulerHelper.cs	
@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Management;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     internal static class TaskSchedulerHelper
     {
diff --git a/AppControl Manager/Logic/ThemeManager.cs b/AppControl Manager/Logic/ThemeManager.cs
index 376c3afb4..f90a4a4b0 100644
--- a/AppControl Manager/Logic/ThemeManager.cs	
+++ b/AppControl Manager/Logic/ThemeManager.cs	
@@ -1,17 +1,23 @@
 using System;
 
-namespace WDACConfig
+namespace AppControlManager
 {
-    public static class ThemeManager
+    // Custom EventArgs class for the event
+    internal sealed class BackgroundChangedEventArgs(string? newBackground) : EventArgs
+    {
+        internal string? NewBackground { get; } = newBackground;
+    }
+
+    internal static class ThemeManager
     {
         // The static event for background changes
         // MainWindow listens to this to set the app theme
-        public static event Action<string>? BackDropChanged;
+        internal static event EventHandler<BackgroundChangedEventArgs>? BackDropChanged;
 
         // Method to raise the event when the background is changed
-        public static void OnBackgroundChanged(string newBackground)
+        internal static void OnBackgroundChanged(string newBackground)
         {
-            BackDropChanged?.Invoke(newBackground);
+            BackDropChanged?.Invoke(null, new BackgroundChangedEventArgs(newBackground));
         }
     }
 }
diff --git a/AppControl Manager/Logic/Types And Definitions/AuthenticodePageHashes.cs b/AppControl Manager/Logic/Types And Definitions/AuthenticodePageHashes.cs
index 2c251193a..f8719b1ed 100644
--- a/AppControl Manager/Logic/Types And Definitions/AuthenticodePageHashes.cs	
+++ b/AppControl Manager/Logic/Types And Definitions/AuthenticodePageHashes.cs	
@@ -1,5 +1,5 @@
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public sealed class CodeIntegrityHashes(string? sha1Page, string? sha256Page, string? sha1Authenticode, string? sha256Authenticode)
     {
diff --git a/AppControl Manager/Logic/Types And Definitions/CertificateDetailsCreator.cs b/AppControl Manager/Logic/Types And Definitions/CertificateDetailsCreator.cs
index 836476213..036cd9b00 100644
--- a/AppControl Manager/Logic/Types And Definitions/CertificateDetailsCreator.cs	
+++ b/AppControl Manager/Logic/Types And Definitions/CertificateDetailsCreator.cs	
@@ -1,5 +1,5 @@
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public sealed class CertificateDetailsCreator(string intermediateCertTBS, string intermediateCertName, string leafCertTBS, string leafCertName)
     {
diff --git a/AppControl Manager/Logic/Types And Definitions/CertificateSignerCreator.cs b/AppControl Manager/Logic/Types And Definitions/CertificateSignerCreator.cs
index 93a0d16f2..b7e46f66d 100644
--- a/AppControl Manager/Logic/Types And Definitions/CertificateSignerCreator.cs	
+++ b/AppControl Manager/Logic/Types And Definitions/CertificateSignerCreator.cs	
@@ -1,5 +1,5 @@
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public sealed class CertificateSignerCreator(string tbs, string signerName, int siSigningScenario)
     {
diff --git a/AppControl Manager/Logic/Types And Definitions/ChainElement.cs b/AppControl Manager/Logic/Types And Definitions/ChainElement.cs
index c2ae54ed4..87f9ac8f1 100644
--- a/AppControl Manager/Logic/Types And Definitions/ChainElement.cs	
+++ b/AppControl Manager/Logic/Types And Definitions/ChainElement.cs	
@@ -1,7 +1,7 @@
 using System;
 using System.Security.Cryptography.X509Certificates;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     // the enum for CertificateType
     public enum CertificateType
diff --git a/AppControl Manager/Logic/Types And Definitions/ChainPackage.cs b/AppControl Manager/Logic/Types And Definitions/ChainPackage.cs
index f6917e917..f6623f72b 100644
--- a/AppControl Manager/Logic/Types And Definitions/ChainPackage.cs	
+++ b/AppControl Manager/Logic/Types And Definitions/ChainPackage.cs	
@@ -1,7 +1,7 @@
 using System.Security.Cryptography.Pkcs;
 using System.Security.Cryptography.X509Certificates;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public sealed class ChainPackage(X509Chain certificatechain, SignedCms signedcms, ChainElement rootcertificate,
      ChainElement[]? intermediatecertificates,
diff --git a/AppControl Manager/Logic/Types And Definitions/CodeIntegrityPolicy.cs b/AppControl Manager/Logic/Types And Definitions/CodeIntegrityPolicy.cs
index b4667fb9c..c92085ee9 100644
--- a/AppControl Manager/Logic/Types And Definitions/CodeIntegrityPolicy.cs	
+++ b/AppControl Manager/Logic/Types And Definitions/CodeIntegrityPolicy.cs	
@@ -1,7 +1,7 @@
 using System;
 using System.Xml;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     // This class represents a single Code Integrity XML policy
     // It Makes sure PolicyType attribute, BasePolicyID node and PolicyID nodes exist and remove PolicyTypeID node if it exists
diff --git a/AppControl Manager/Logic/Types And Definitions/FileAttrib.cs b/AppControl Manager/Logic/Types And Definitions/FileAttrib.cs
index 32b2e1ad6..740f75308 100644
--- a/AppControl Manager/Logic/Types And Definitions/FileAttrib.cs	
+++ b/AppControl Manager/Logic/Types And Definitions/FileAttrib.cs	
@@ -1,6 +1,6 @@
 using System.Xml;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     // This class represents a <FileAttrib> node within a Code Integrity XML file
     public sealed class FileAttrib
diff --git a/AppControl Manager/Logic/Types And Definitions/FileAttribComparer .cs b/AppControl Manager/Logic/Types And Definitions/FileAttribComparer .cs
index afb383b09..1c077b327 100644
--- a/AppControl Manager/Logic/Types And Definitions/FileAttribComparer .cs	
+++ b/AppControl Manager/Logic/Types And Definitions/FileAttribComparer .cs	
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     /// <summary>
     /// A custom equality comparer for the FileAttrib class.
diff --git a/AppControl Manager/Logic/Types And Definitions/FileBasedInfoPackage.cs b/AppControl Manager/Logic/Types And Definitions/FileBasedInfoPackage.cs
index d0225030e..fab43fcf7 100644
--- a/AppControl Manager/Logic/Types And Definitions/FileBasedInfoPackage.cs	
+++ b/AppControl Manager/Logic/Types And Definitions/FileBasedInfoPackage.cs	
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     // Used by the BuildSignerAndHashObjects method to store and return the output
     public sealed class FileBasedInfoPackage(List<FilePublisherSignerCreator> filepublishersigners, List<PublisherSignerCreator> publishersigners, List<HashCreator> completehashes)
diff --git a/AppControl Manager/Logic/Types And Definitions/FilePublisherSignerCreator.cs b/AppControl Manager/Logic/Types And Definitions/FilePublisherSignerCreator.cs
index 9bc43ea5e..f385697fa 100644
--- a/AppControl Manager/Logic/Types And Definitions/FilePublisherSignerCreator.cs	
+++ b/AppControl Manager/Logic/Types And Definitions/FilePublisherSignerCreator.cs	
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public sealed class FilePublisherSignerCreator
     {
diff --git a/AppControl Manager/Logic/Types And Definitions/HashCreator.cs b/AppControl Manager/Logic/Types And Definitions/HashCreator.cs
index e8986e65c..f21054681 100644
--- a/AppControl Manager/Logic/Types And Definitions/HashCreator.cs	
+++ b/AppControl Manager/Logic/Types And Definitions/HashCreator.cs	
@@ -1,5 +1,5 @@
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public sealed class HashCreator(string authenticodeSHA256, string authenticodeSHA1, string fileName, int siSigningScenario)
     {
diff --git a/AppControl Manager/Logic/Types And Definitions/OpusSigner.cs b/AppControl Manager/Logic/Types And Definitions/OpusSigner.cs
index 29055c8d4..851e3fd4f 100644
--- a/AppControl Manager/Logic/Types And Definitions/OpusSigner.cs	
+++ b/AppControl Manager/Logic/Types And Definitions/OpusSigner.cs	
@@ -1,5 +1,5 @@
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public sealed class OpusSigner(string tbsHash, string subjectCN)
     {
diff --git a/AppControl Manager/Logic/Types And Definitions/PolicyHashObj.cs b/AppControl Manager/Logic/Types And Definitions/PolicyHashObj.cs
index 2147b8737..8706dfff1 100644
--- a/AppControl Manager/Logic/Types And Definitions/PolicyHashObj.cs	
+++ b/AppControl Manager/Logic/Types And Definitions/PolicyHashObj.cs	
@@ -1,7 +1,7 @@
 using System;
 
 // Used by AppControl Simulations
-namespace WDACConfig
+namespace AppControlManager
 {
     public sealed class PolicyHashObj(string hashvalue, string hashtype, string filepathforhash)
     {
diff --git a/AppControl Manager/Logic/Types And Definitions/PublisherSignerCreator.cs b/AppControl Manager/Logic/Types And Definitions/PublisherSignerCreator.cs
index bb7b9c37e..d95bed660 100644
--- a/AppControl Manager/Logic/Types And Definitions/PublisherSignerCreator.cs	
+++ b/AppControl Manager/Logic/Types And Definitions/PublisherSignerCreator.cs	
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public sealed class PublisherSignerCreator
     {
diff --git a/AppControl Manager/Logic/Types And Definitions/Signer.cs b/AppControl Manager/Logic/Types And Definitions/Signer.cs
index ff4a5d9d9..ba8304357 100644
--- a/AppControl Manager/Logic/Types And Definitions/Signer.cs	
+++ b/AppControl Manager/Logic/Types And Definitions/Signer.cs	
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public sealed class Signer(
         string id,
diff --git a/AppControl Manager/Logic/Types And Definitions/SimulationInput.cs b/AppControl Manager/Logic/Types And Definitions/SimulationInput.cs
index 9272fe34a..2462517ec 100644
--- a/AppControl Manager/Logic/Types And Definitions/SimulationInput.cs	
+++ b/AppControl Manager/Logic/Types And Definitions/SimulationInput.cs	
@@ -1,4 +1,4 @@
-namespace WDACConfig
+namespace AppControlManager
 {
     /// <summary>
     /// Used by AppControl Simulations
diff --git a/AppControl Manager/Logic/Types And Definitions/SimulationOutput.cs b/AppControl Manager/Logic/Types And Definitions/SimulationOutput.cs
index ca7f54bed..f723f49c2 100644
--- a/AppControl Manager/Logic/Types And Definitions/SimulationOutput.cs	
+++ b/AppControl Manager/Logic/Types And Definitions/SimulationOutput.cs	
@@ -1,5 +1,5 @@
 
-namespace WDACConfig
+namespace AppControlManager
 {
     /// <summary>
     /// Used by AppControl Simulations, the output of the comparer function/method
diff --git a/AppControl Manager/Logic/Types And Definitions/UpdateCheckResponse.cs b/AppControl Manager/Logic/Types And Definitions/UpdateCheckResponse.cs
index de55bf2a4..8afa593ed 100644
--- a/AppControl Manager/Logic/Types And Definitions/UpdateCheckResponse.cs	
+++ b/AppControl Manager/Logic/Types And Definitions/UpdateCheckResponse.cs	
@@ -1,6 +1,6 @@
 using System;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     /// <summary>
     /// Represents an object that is the response of an update check for the AppControl Manager app
diff --git a/AppControl Manager/Logic/Types And Definitions/WinTrust.cs b/AppControl Manager/Logic/Types And Definitions/WinTrust.cs
index 8a13cf81f..c98b07acf 100644
--- a/AppControl Manager/Logic/Types And Definitions/WinTrust.cs	
+++ b/AppControl Manager/Logic/Types And Definitions/WinTrust.cs	
@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     // This class contains all of the WinTrust related functions and codes
     internal static partial class WinTrust
@@ -14,6 +14,7 @@ internal static partial class WinTrust
 
         // a method to acquire a handle to a catalog administrator context using a native function from WinTrust.dll
         [LibraryImport("WinTrust.dll", StringMarshalling = StringMarshalling.Utf16)]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
         [return: MarshalAs(UnmanagedType.Bool)]
         internal static partial bool CryptCATAdminAcquireContext2(
             ref IntPtr hCatAdmin, // the first parameter: a reference to a pointer to store the handle
@@ -25,6 +26,7 @@ internal static partial bool CryptCATAdminAcquireContext2(
 
         // a method to release a handle to a catalog administrator context using a native function from WinTrust.dll
         [LibraryImport("WinTrust.dll")]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
         [return: MarshalAs(UnmanagedType.Bool)]
         internal static partial bool CryptCATAdminReleaseContext(
             IntPtr hCatAdmin, // the first parameter: a pointer to the handle to release
@@ -33,6 +35,7 @@ internal static partial bool CryptCATAdminReleaseContext(
 
         // a method to calculate the hash of a file using a native function from WinTrust.dll
         [LibraryImport("WinTrust.dll")]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
         [return: MarshalAs(UnmanagedType.Bool)]
         internal static partial bool CryptCATAdminCalcHashFromFileHandle3(
             IntPtr hCatAdmin, // the first parameter: a pointer to the handle of the catalog administrator context
@@ -51,6 +54,7 @@ internal static partial bool CryptCATAdminCalcHashFromFileHandle3(
         // P/Invoke declaration to import the 'CryptCATOpen' function from WinTrust.dll
         // https://learn.microsoft.com/en-us/windows/win32/api/mscat/nf-mscat-cryptcatopen
         [LibraryImport("WinTrust.dll", SetLastError = true, StringMarshalling = StringMarshalling.Utf16)]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
         internal static partial IntPtr CryptCATOpen(
             [MarshalAs(UnmanagedType.LPWStr)] string FileName, // The name of the catalog file.
             uint OpenFlags, // Flags to control the function behavior.
@@ -61,6 +65,7 @@ internal static partial IntPtr CryptCATOpen(
         // P/Invoke declaration to import the 'CryptCATEnumerateMember' function from WinTrust.dll
         // https://learn.microsoft.com/en-us/windows/win32/api/mscat/nf-mscat-cryptcatenumeratemember
         [LibraryImport("WinTrust.dll", SetLastError = true)]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
         internal static partial IntPtr CryptCATEnumerateMember(
             IntPtr MeowLogHandle, // Handle to the catalog context.
             IntPtr PrevCatalogMember); // Pointer to the previous catalog member.
@@ -68,6 +73,7 @@ internal static partial IntPtr CryptCATEnumerateMember(
         // P/Invoke declaration to import the 'CryptCATClose' function from WinTrust.dll
         // https://learn.microsoft.com/en-us/windows/win32/api/mscat/nf-mscat-cryptcatclose
         [LibraryImport("WinTrust.dll", SetLastError = true)]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
         internal static partial IntPtr CryptCATClose(IntPtr MainCryptProviderHandle); // Closes the catalog context.
 
         #endregion
@@ -78,6 +84,7 @@ internal static partial IntPtr CryptCATEnumerateMember(
 
         // a method to compute the hash of the first page of a file using a native function from Wintrust.dll
         [LibraryImport("Wintrust.dll", StringMarshalling = StringMarshalling.Utf16)] // an attribute to specify the DLL name and the character set
+        [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
         internal static partial int ComputeFirstPageHash( // the method signature
             string pszAlgId, // the first parameter: the name of the hash algorithm to use
             string filename, // the second parameter: the name of the file to hash
@@ -116,6 +123,7 @@ public enum WinVerifyTrustResult : uint
 
         // https://learn.microsoft.com/en-us/windows/win32/api/wintrust/nf-wintrust-winverifytrust
         [LibraryImport("wintrust.dll", EntryPoint = "WinVerifyTrust")]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
         // Set to return a WinVerifyTrustResult enum
         internal static partial WinVerifyTrustResult WinVerifyTrust(
             IntPtr hwnd,
@@ -124,6 +132,7 @@ internal static partial WinVerifyTrustResult WinVerifyTrust(
 
         // https://learn.microsoft.com/en-us/windows/win32/api/wintrust/nf-wintrust-wthelperprovdatafromstatedata
         [LibraryImport("wintrust.dll", SetLastError = true)]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
         internal static partial IntPtr WTHelperProvDataFromStateData(IntPtr hStateData);
 
         #endregion
diff --git a/AppControl Manager/Logic/VersionIncrementer.cs b/AppControl Manager/Logic/VersionIncrementer.cs
index 7b92a66fe..7f9edcd06 100644
--- a/AppControl Manager/Logic/VersionIncrementer.cs	
+++ b/AppControl Manager/Logic/VersionIncrementer.cs	
@@ -1,6 +1,6 @@
 using System;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public static class VersionIncrementer
     {
diff --git a/AppControl Manager/Logic/Win32Interop.cs b/AppControl Manager/Logic/Win32Interop.cs
index 7f5f4ecde..a8593ce5f 100644
--- a/AppControl Manager/Logic/Win32Interop.cs	
+++ b/AppControl Manager/Logic/Win32Interop.cs	
@@ -1,12 +1,13 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     internal sealed partial class Win32InteropInternal
     {
         // https://learn.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-getwindowplacement
         [LibraryImport("user32.dll", SetLastError = true)]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
         [return: MarshalAs(UnmanagedType.Bool)]
         internal static partial bool GetWindowPlacement(IntPtr hWnd, ref WINDOWPLACEMENT lpwndpl);
 
diff --git a/AppControl Manager/Logic/WldpQuerySecurityPolicy.cs b/AppControl Manager/Logic/WldpQuerySecurityPolicy.cs
index 0c18a98fd..b3bb687d5 100644
--- a/AppControl Manager/Logic/WldpQuerySecurityPolicy.cs	
+++ b/AppControl Manager/Logic/WldpQuerySecurityPolicy.cs	
@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public enum WLDP_SECURE_SETTING_VALUE_TYPE
     {
@@ -23,6 +23,7 @@ public struct UNICODE_STRING
     public static partial class WldpQuerySecurityPolicyWrapper
     {
         [LibraryImport("Wldp.dll")]
+        [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
         internal static partial int WldpQuerySecurityPolicy(
             ref UNICODE_STRING Provider,
             ref UNICODE_STRING Key,
diff --git a/AppControl Manager/Logic/XMLOps/CiPolicyUtility.cs b/AppControl Manager/Logic/XMLOps/CiPolicyUtility.cs
index c23f9a25d..a5d15726c 100644
--- a/AppControl Manager/Logic/XMLOps/CiPolicyUtility.cs	
+++ b/AppControl Manager/Logic/XMLOps/CiPolicyUtility.cs	
@@ -2,7 +2,7 @@
 using System.IO;
 using System.Xml;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public static class CiPolicyUtility
     {
diff --git a/AppControl Manager/Logic/XMLOps/ClearCiPolicySemantic.cs b/AppControl Manager/Logic/XMLOps/ClearCiPolicySemantic.cs
index 5510364a2..6fbdcde5b 100644
--- a/AppControl Manager/Logic/XMLOps/ClearCiPolicySemantic.cs	
+++ b/AppControl Manager/Logic/XMLOps/ClearCiPolicySemantic.cs	
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Xml;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public static class ClearCiPolicySemantic
     {
diff --git a/AppControl Manager/Logic/XMLOps/CloseEmptyXmlNodesSemantic.cs b/AppControl Manager/Logic/XMLOps/CloseEmptyXmlNodesSemantic.cs
index dd5d82306..fb2f8205d 100644
--- a/AppControl Manager/Logic/XMLOps/CloseEmptyXmlNodesSemantic.cs	
+++ b/AppControl Manager/Logic/XMLOps/CloseEmptyXmlNodesSemantic.cs	
@@ -1,7 +1,7 @@
 using System;
 using System.Xml;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     internal static class CloseEmptyXmlNodesSemantic
     {
diff --git a/AppControl Manager/Logic/XMLOps/EditGUIDs.cs b/AppControl Manager/Logic/XMLOps/EditGUIDs.cs
index 155ef0f60..246b5ef68 100644
--- a/AppControl Manager/Logic/XMLOps/EditGUIDs.cs	
+++ b/AppControl Manager/Logic/XMLOps/EditGUIDs.cs	
@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public static class PolicyEditor
     {
diff --git a/AppControl Manager/Logic/XMLOps/Macros.cs b/AppControl Manager/Logic/XMLOps/Macros.cs
index 135821a95..36706cf42 100644
--- a/AppControl Manager/Logic/XMLOps/Macros.cs	
+++ b/AppControl Manager/Logic/XMLOps/Macros.cs	
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Xml;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public static class Macros
     {
diff --git a/AppControl Manager/Logic/XMLOps/MergeSignersSemantic.cs b/AppControl Manager/Logic/XMLOps/MergeSignersSemantic.cs
index c4e11f4eb..be8f33bee 100644
--- a/AppControl Manager/Logic/XMLOps/MergeSignersSemantic.cs	
+++ b/AppControl Manager/Logic/XMLOps/MergeSignersSemantic.cs	
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Xml;
 
-namespace WDACConfig
+namespace AppControlManager
 {
 
     // Comparer for XmlNode objects based on their "RuleID" attribute
diff --git a/AppControl Manager/Logic/XMLOps/NewCertificateSignerRules.cs b/AppControl Manager/Logic/XMLOps/NewCertificateSignerRules.cs
index 585a5811a..99439688a 100644
--- a/AppControl Manager/Logic/XMLOps/NewCertificateSignerRules.cs	
+++ b/AppControl Manager/Logic/XMLOps/NewCertificateSignerRules.cs	
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Xml;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public static class NewCertificateSignerRules
     {
diff --git a/AppControl Manager/Logic/XMLOps/NewFilePublisherLevelRules.cs b/AppControl Manager/Logic/XMLOps/NewFilePublisherLevelRules.cs
index f5ae62181..046800136 100644
--- a/AppControl Manager/Logic/XMLOps/NewFilePublisherLevelRules.cs	
+++ b/AppControl Manager/Logic/XMLOps/NewFilePublisherLevelRules.cs	
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Xml;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     internal static class NewFilePublisherLevelRules
     {
diff --git a/AppControl Manager/Logic/XMLOps/NewHashLevelRules.cs b/AppControl Manager/Logic/XMLOps/NewHashLevelRules.cs
index 93b1839d1..2d053e876 100644
--- a/AppControl Manager/Logic/XMLOps/NewHashLevelRules.cs	
+++ b/AppControl Manager/Logic/XMLOps/NewHashLevelRules.cs	
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Xml;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public static class NewHashLevelRules
     {
diff --git a/AppControl Manager/Logic/XMLOps/NewPFNLevelRules.cs b/AppControl Manager/Logic/XMLOps/NewPFNLevelRules.cs
index 4ccbe9d2c..98ed76ec1 100644
--- a/AppControl Manager/Logic/XMLOps/NewPFNLevelRules.cs	
+++ b/AppControl Manager/Logic/XMLOps/NewPFNLevelRules.cs	
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Xml;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public static class NewPFNLevelRules
     {
diff --git a/AppControl Manager/Logic/XMLOps/NewPublisherLevelRules.cs b/AppControl Manager/Logic/XMLOps/NewPublisherLevelRules.cs
index b4e25e07b..8d222d650 100644
--- a/AppControl Manager/Logic/XMLOps/NewPublisherLevelRules.cs	
+++ b/AppControl Manager/Logic/XMLOps/NewPublisherLevelRules.cs	
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Xml;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     internal static class NewPublisherLevelRules
     {
diff --git a/AppControl Manager/Logic/XMLOps/RemoveAllowElementsSemantic.cs b/AppControl Manager/Logic/XMLOps/RemoveAllowElementsSemantic.cs
index 6a50efe56..77e08638c 100644
--- a/AppControl Manager/Logic/XMLOps/RemoveAllowElementsSemantic.cs	
+++ b/AppControl Manager/Logic/XMLOps/RemoveAllowElementsSemantic.cs	
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Xml;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     internal static class RemoveAllowElementsSemantic
     {
diff --git a/AppControl Manager/Logic/XMLOps/RemoveDuplicateFileAttribSemantic.cs b/AppControl Manager/Logic/XMLOps/RemoveDuplicateFileAttribSemantic.cs
index 3f74a4a1b..f1df7eb60 100644
--- a/AppControl Manager/Logic/XMLOps/RemoveDuplicateFileAttribSemantic.cs	
+++ b/AppControl Manager/Logic/XMLOps/RemoveDuplicateFileAttribSemantic.cs	
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Xml;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     internal static class RemoveDuplicateFileAttribSemantic
     {
diff --git a/AppControl Manager/Logic/XMLOps/RemoveUnreferencedFileRuleRefs.cs b/AppControl Manager/Logic/XMLOps/RemoveUnreferencedFileRuleRefs.cs
index 33dd5131a..6fc54e147 100644
--- a/AppControl Manager/Logic/XMLOps/RemoveUnreferencedFileRuleRefs.cs	
+++ b/AppControl Manager/Logic/XMLOps/RemoveUnreferencedFileRuleRefs.cs	
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Xml;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public static class RemoveUnreferencedFileRuleRefs
     {
diff --git a/AppControl Manager/Logic/XMLOps/SetCiPolicyInfo.cs b/AppControl Manager/Logic/XMLOps/SetCiPolicyInfo.cs
index 33cf56e78..d4e750de3 100644
--- a/AppControl Manager/Logic/XMLOps/SetCiPolicyInfo.cs	
+++ b/AppControl Manager/Logic/XMLOps/SetCiPolicyInfo.cs	
@@ -1,7 +1,7 @@
 using System;
 using System.Xml;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public static class SetCiPolicyInfo
     {
diff --git a/AppControl Manager/Logic/XMLOps/SignerAndHashBuilder.cs b/AppControl Manager/Logic/XMLOps/SignerAndHashBuilder.cs
index 3e76f7e41..f44a82d63 100644
--- a/AppControl Manager/Logic/XMLOps/SignerAndHashBuilder.cs	
+++ b/AppControl Manager/Logic/XMLOps/SignerAndHashBuilder.cs	
@@ -1,7 +1,7 @@
+using AppControlManager.IntelGathering;
 using System.Collections.Generic;
-using WDACConfig.IntelGathering;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public static class SignerAndHashBuilder
     {
diff --git a/AppControl Manager/Logic/XMLOps/UpdateHvciOptions.cs b/AppControl Manager/Logic/XMLOps/UpdateHvciOptions.cs
index aad0dbb91..61a9f8250 100644
--- a/AppControl Manager/Logic/XMLOps/UpdateHvciOptions.cs	
+++ b/AppControl Manager/Logic/XMLOps/UpdateHvciOptions.cs	
@@ -1,7 +1,7 @@
 using System;
 using System.Xml;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public static class UpdateHvciOptions
     {
diff --git a/AppControl Manager/Logic/XMLOps/XMLOps.cs b/AppControl Manager/Logic/XMLOps/XMLOps.cs
index 3c571b6bc..a3bbf7fed 100644
--- a/AppControl Manager/Logic/XMLOps/XMLOps.cs	
+++ b/AppControl Manager/Logic/XMLOps/XMLOps.cs	
@@ -1,5 +1,5 @@
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public static class XMLOps
     {
@@ -23,15 +23,12 @@ public static void Initiate(FileBasedInfoPackage incomingData, string xmlFilePat
             RemoveDuplicateFileAttribSemantic.Remove(xmlFilePath);
 
             // 2 passes are needed - Needs improvements
-            // MergeSignersSemantic.Merge(xmlFilePath);
-            // MergeSignersSemantic.Merge(xmlFilePath);
+            MergeSignersSemantic.Merge(xmlFilePath);
+            MergeSignersSemantic.Merge(xmlFilePath);
 
             // Adding this so that the Merge cmdlet won't complain
             CloseEmptyXmlNodesSemantic.Close(xmlFilePath);
 
-            // Replacement for the above method
-            PolicyMerger.Merge([xmlFilePath], xmlFilePath);
-
             // This method runs twice, once for signed data and once for unsigned data
             CloseEmptyXmlNodesSemantic.Close(xmlFilePath);
 
diff --git a/AppControl Manager/Logic/XmlFilePathExtractor.cs b/AppControl Manager/Logic/XmlFilePathExtractor.cs
index 9944d5e45..08c68f6ec 100644
--- a/AppControl Manager/Logic/XmlFilePathExtractor.cs	
+++ b/AppControl Manager/Logic/XmlFilePathExtractor.cs	
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Xml;
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public static class XmlFilePathExtractor
     {
diff --git a/AppControl Manager/Logic/packageManagement.cs b/AppControl Manager/Logic/packageManagement.cs
index 4008f0136..a529ad89e 100644
--- a/AppControl Manager/Logic/packageManagement.cs	
+++ b/AppControl Manager/Logic/packageManagement.cs	
@@ -15,7 +15,7 @@
            }
 */
 
-namespace WDACConfig
+namespace AppControlManager
 {
     public class PackageDetails
     {
diff --git a/AppControl Manager/MainWindow.xaml b/AppControl Manager/MainWindow.xaml
index 9dd9d511c..2e96a2f25 100644
--- a/AppControl Manager/MainWindow.xaml	
+++ b/AppControl Manager/MainWindow.xaml	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Window
-    x:Class="WDACConfig.MainWindow"
+    x:Class="AppControlManager.MainWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:WDACConfig"
+    xmlns:local="using:AppControlManager"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d"
diff --git a/AppControl Manager/MainWindow.xaml.cs b/AppControl Manager/MainWindow.xaml.cs
index 1bf8d3a23..43623d9b3 100644
--- a/AppControl Manager/MainWindow.xaml.cs	
+++ b/AppControl Manager/MainWindow.xaml.cs	
@@ -12,7 +12,7 @@
 using System.Threading.Tasks;
 using Windows.Graphics;
 
-namespace WDACConfig
+namespace AppControlManager
 {
 
     public sealed partial class MainWindow : Window
@@ -138,16 +138,16 @@ public MainWindow()
 
 
             // Set the initial background setting based on the user's settings
-            OnNavigationBackgroundChanged(AppSettings.GetSetting<bool>(AppSettings.SettingKeys.NavViewBackground));
+            OnNavigationBackgroundChanged(null, new(AppSettings.GetSetting<bool>(AppSettings.SettingKeys.NavViewBackground)));
 
             // Set the initial BackDrop setting based on the user's settings
-            OnBackgroundChanged(AppSettings.GetSetting<string>(AppSettings.SettingKeys.BackDropBackground));
+            OnBackgroundChanged(null, new(AppSettings.GetSetting<string>(AppSettings.SettingKeys.BackDropBackground)));
 
             // Set the initial App Theme based on the user's settings
-            OnAppThemeChanged(AppSettings.GetSetting<string>(AppSettings.SettingKeys.AppTheme));
+            OnAppThemeChanged(null, new(AppSettings.GetSetting<string>(AppSettings.SettingKeys.AppTheme)));
 
             // Set the initial Icons styles abased on the user's settings
-            OnIconsStylesChanged(AppSettings.GetSetting<string>(AppSettings.SettingKeys.IconsStyle));
+            OnIconsStylesChanged(null, new(AppSettings.GetSetting<string>(AppSettings.SettingKeys.IconsStyle)));
 
             // Restore window size on startup
             RestoreWindowSize();
@@ -237,8 +237,9 @@ private static AppWindow GetAppWindowForCurrentWindow()
         /// <summary>
         /// Event handler for the global Icons Style change event
         /// </summary>
-        /// <param name="newIconsStyle"></param>
-        private void OnIconsStylesChanged(string? newIconsStyle)
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void OnIconsStylesChanged(object? sender, IconsStyleChangedEventArgs e)
         {
 
             // Get the current theme
@@ -246,7 +247,7 @@ private void OnIconsStylesChanged(string? newIconsStyle)
 
 
             // Set the Icons Style
-            switch (newIconsStyle)
+            switch (e.NewIconsStyle)
             {
                 case "Animated":
                     {
@@ -620,11 +621,12 @@ private void OnIconsStylesChanged(string? newIconsStyle)
         /// <summary>
         /// Event handler for the global NavigationView location change event
         /// </summary>
-        /// <param name="newLocation"></param>
-        private void OnNavigationViewLocationChanged(string newLocation)
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void OnNavigationViewLocationChanged(object? sender, NavigationViewLocationChangedEventArgs e)
         {
             // Set the NavigationView's location based on the event
-            switch (newLocation)
+            switch (e.NewLocation)
             {
                 case "Left":
                     {
@@ -659,8 +661,9 @@ private void OnNavigationViewLocationChanged(string newLocation)
         /// Changing it during runtime is not possible without trigger a theme change: Light/Dark.
         /// Application.RequestedTheme is read-only, so we us RootGrid which is the origin of all other elements.
         /// </summary>
-        /// <param name="isBackgroundOn"></param>
-        private void OnNavigationBackgroundChanged(bool isBackgroundOn)
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void OnNavigationBackgroundChanged(object? sender, NavigationBackgroundChangedEventArgs e)
         {
             // Get the current theme
             ElementTheme currentTheme = RootGrid.ActualTheme;
@@ -672,7 +675,7 @@ private void OnNavigationBackgroundChanged(bool isBackgroundOn)
             RootGrid.RequestedTheme = oppositeTheme;
 
             // Perform NavigationView background changes based on the settings' page's button
-            if (isBackgroundOn)
+            if (e.IsBackgroundOn)
             {
                 MainNavigation.Resources["NavigationViewContentBackground"] = new SolidColorBrush(Colors.Transparent);
             }
@@ -692,12 +695,14 @@ private void OnNavigationBackgroundChanged(bool isBackgroundOn)
         /// <summary>
         /// Event handler for the global BackgroundChanged event. When user selects a different background for the app, this will be triggered.
         /// </summary>
-        /// <param name="selectedBackdrop"></param>
-        private void OnBackgroundChanged(string? selectedBackdrop)
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void OnBackgroundChanged(object? sender, BackgroundChangedEventArgs e)
         {
+
             // Update the SystemBackdrop based on the selected background
             // The Default is set in the XAML
-            switch (selectedBackdrop)
+            switch (e.NewBackground)
             {
                 case "MicaAlt":
                     this.SystemBackdrop = new MicaBackdrop { Kind = MicaKind.BaseAlt };
@@ -719,10 +724,12 @@ private void OnBackgroundChanged(string? selectedBackdrop)
         /// Event handler for the global AppThemeChanged event
         /// Also changes the AnimatedIcons based on the theme to maintain their accessibility
         /// </summary>
-        /// <param name="newTheme"></param>
-        private void OnAppThemeChanged(string? newTheme)
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void OnAppThemeChanged(object? sender, AppThemeChangedEventArgs e)
         {
 
+
             // Get the current system color mode
             // UISettings uiSettings = new();
             // ElementTheme currentColorMode = uiSettings.GetColorValue(UIColorType.Background) == Colors.Black
@@ -739,7 +746,7 @@ private void OnAppThemeChanged(string? newTheme)
             // Set the requested theme based on the event
             // If "Use System Setting" is used, the current system color mode will be assigned which can be either light/dark
             // Also performs animated icon switch based on theme
-            switch (newTheme)
+            switch (e.NewTheme)
             {
                 case "Light":
                     {
diff --git a/AppControl Manager/Pages/AllowNewApps/AllowNewApps.xaml b/AppControl Manager/Pages/AllowNewApps/AllowNewApps.xaml
index 6e9366d0f..5e4c12191 100644
--- a/AppControl Manager/Pages/AllowNewApps/AllowNewApps.xaml	
+++ b/AppControl Manager/Pages/AllowNewApps/AllowNewApps.xaml	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Page
-    x:Class="WDACConfig.Pages.AllowNewApps"
+    x:Class="AppControlManager.Pages.AllowNewApps"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:WDACConfig.Pages"
+    xmlns:local="using:AppControlManager.Pages"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="using:CommunityToolkit.WinUI"
diff --git a/AppControl Manager/Pages/AllowNewApps/AllowNewApps.xaml.cs b/AppControl Manager/Pages/AllowNewApps/AllowNewApps.xaml.cs
index dc247a3e7..1b6996dec 100644
--- a/AppControl Manager/Pages/AllowNewApps/AllowNewApps.xaml.cs	
+++ b/AppControl Manager/Pages/AllowNewApps/AllowNewApps.xaml.cs	
@@ -6,7 +6,7 @@
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
 
-namespace WDACConfig.Pages
+namespace AppControlManager.Pages
 {
     /// <summary>
     /// An empty page that can be used on its own or navigated to within a Frame.
diff --git a/AppControl Manager/Pages/AllowNewApps/AllowNewAppsEventLogsDataGrid.xaml b/AppControl Manager/Pages/AllowNewApps/AllowNewAppsEventLogsDataGrid.xaml
index f6a787766..3e205915e 100644
--- a/AppControl Manager/Pages/AllowNewApps/AllowNewAppsEventLogsDataGrid.xaml	
+++ b/AppControl Manager/Pages/AllowNewApps/AllowNewAppsEventLogsDataGrid.xaml	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Page
-    x:Class="WDACConfig.Pages.AllowNewAppsEventLogsDataGrid"
+    x:Class="AppControlManager.Pages.AllowNewAppsEventLogsDataGrid"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:WDACConfig.Pages"
+    xmlns:local="using:AppControlManager.Pages"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d"
diff --git a/AppControl Manager/Pages/AllowNewApps/AllowNewAppsEventLogsDataGrid.xaml.cs b/AppControl Manager/Pages/AllowNewApps/AllowNewAppsEventLogsDataGrid.xaml.cs
index ce3a36b46..fa33d6e9d 100644
--- a/AppControl Manager/Pages/AllowNewApps/AllowNewAppsEventLogsDataGrid.xaml.cs	
+++ b/AppControl Manager/Pages/AllowNewApps/AllowNewAppsEventLogsDataGrid.xaml.cs	
@@ -1,3 +1,4 @@
+using AppControlManager.IntelGathering;
 using CommunityToolkit.WinUI.UI.Controls;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
@@ -6,13 +7,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using WDACConfig.IntelGathering;
 using Windows.ApplicationModel.DataTransfer;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
 
-namespace WDACConfig.Pages
+namespace AppControlManager.Pages
 {
     /// <summary>
     /// An empty page that can be used on its own or navigated to within a Frame.
diff --git a/AppControl Manager/Pages/AllowNewApps/AllowNewAppsLocalFilesDataGrid.xaml b/AppControl Manager/Pages/AllowNewApps/AllowNewAppsLocalFilesDataGrid.xaml
index 903d49ea2..e4add13cf 100644
--- a/AppControl Manager/Pages/AllowNewApps/AllowNewAppsLocalFilesDataGrid.xaml	
+++ b/AppControl Manager/Pages/AllowNewApps/AllowNewAppsLocalFilesDataGrid.xaml	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Page
-    x:Class="WDACConfig.Pages.AllowNewAppsLocalFilesDataGrid"
+    x:Class="AppControlManager.Pages.AllowNewAppsLocalFilesDataGrid"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:WDACConfig.Pages"
+    xmlns:local="using:AppControlManager.Pages"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d"
diff --git a/AppControl Manager/Pages/AllowNewApps/AllowNewAppsLocalFilesDataGrid.xaml.cs b/AppControl Manager/Pages/AllowNewApps/AllowNewAppsLocalFilesDataGrid.xaml.cs
index ee63c804f..4b1cfba64 100644
--- a/AppControl Manager/Pages/AllowNewApps/AllowNewAppsLocalFilesDataGrid.xaml.cs	
+++ b/AppControl Manager/Pages/AllowNewApps/AllowNewAppsLocalFilesDataGrid.xaml.cs	
@@ -1,3 +1,4 @@
+using AppControlManager.IntelGathering;
 using CommunityToolkit.WinUI.UI.Controls;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
@@ -6,13 +7,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using WDACConfig.IntelGathering;
 using Windows.ApplicationModel.DataTransfer;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
 
-namespace WDACConfig.Pages
+namespace AppControlManager.Pages
 {
     /// <summary>
     /// An empty page that can be used on its own or navigated to within a Frame.
diff --git a/AppControl Manager/Pages/AllowNewApps/AllowNewAppsStart.xaml b/AppControl Manager/Pages/AllowNewApps/AllowNewAppsStart.xaml
index 92b4fbb9d..5dccf904e 100644
--- a/AppControl Manager/Pages/AllowNewApps/AllowNewAppsStart.xaml	
+++ b/AppControl Manager/Pages/AllowNewApps/AllowNewAppsStart.xaml	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Page
-    x:Class="WDACConfig.Pages.AllowNewAppsStart"
+    x:Class="AppControlManager.Pages.AllowNewAppsStart"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:WDACConfig.Pages"
+    xmlns:local="using:AppControlManager.Pages"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="using:CommunityToolkit.WinUI"
diff --git a/AppControl Manager/Pages/AllowNewApps/AllowNewAppsStart.xaml.cs b/AppControl Manager/Pages/AllowNewApps/AllowNewAppsStart.xaml.cs
index 0b1edceda..4d608ea2c 100644
--- a/AppControl Manager/Pages/AllowNewApps/AllowNewAppsStart.xaml.cs	
+++ b/AppControl Manager/Pages/AllowNewApps/AllowNewAppsStart.xaml.cs	
@@ -1,3 +1,4 @@
+using AppControlManager.IntelGathering;
 using Microsoft.UI;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
@@ -10,10 +11,9 @@
 using System.Linq;
 using System.Runtime.InteropServices.WindowsRuntime;
 using System.Threading.Tasks;
-using WDACConfig.IntelGathering;
 
 
-namespace WDACConfig.Pages
+namespace AppControlManager.Pages
 {
 
     public sealed partial class AllowNewAppsStart : Page
@@ -331,6 +331,9 @@ private async void GoToStep3Button_Click(object sender, RoutedEventArgs e)
                 GoToStep3Button.IsEnabled = false;
                 ResetStepsButton.IsEnabled = false;
 
+                // While the base policy is being deployed is audit mode, set the progress ring as indeterminate
+                Step2ProgressRing.IsIndeterminate = true;
+
                 // Enable the DataGrid pages so user can select the logs
                 AllowNewApps.Instance.EnableAllowNewAppsNavigationItem("LocalFiles");
                 AllowNewApps.Instance.EnableAllowNewAppsNavigationItem("EventLogs");
@@ -369,6 +372,9 @@ await Task.Run(() =>
                         _ = DispatcherQueue.TryEnqueue(() =>
                         {
                             Step2InfoBar.Message = "Scanning the selected directories";
+
+                            // Set the progress ring to no longer be indeterminate since file scan will take control of its value
+                            Step2ProgressRing.IsIndeterminate = false;
                         });
 
 
@@ -380,8 +386,10 @@ await Task.Run(() =>
                         // Get all of the AppControl compatible files from user selected directories
                         List<FileInfo> DetectedFilesInSelectedDirectories = FileUtility.GetFilesFast(selectedDirectories, null, null);
 
+
+
                         // Scan all of the detected files from the user selected directories
-                        HashSet<FileIdentity> LocalFilesResults = LocalFilesScan.Scan(DetectedFilesInSelectedDirectories);
+                        HashSet<FileIdentity> LocalFilesResults = LocalFilesScan.Scan(DetectedFilesInSelectedDirectories, 2, null, Step2ProgressRing);
 
                         // Add the results of the directories scans to the DataGrid
                         foreach (FileIdentity item in LocalFilesResults)
diff --git a/AppControl Manager/Pages/BuildNewCertificate.xaml b/AppControl Manager/Pages/BuildNewCertificate.xaml
index 0d809b80a..03a9a8e49 100644
--- a/AppControl Manager/Pages/BuildNewCertificate.xaml	
+++ b/AppControl Manager/Pages/BuildNewCertificate.xaml	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Page
-    x:Class="WDACConfig.Pages.BuildNewCertificate"
+    x:Class="AppControlManager.Pages.BuildNewCertificate"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:WDACConfig.Pages"
+    xmlns:local="using:AppControlManager.Pages"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="using:CommunityToolkit.WinUI"
diff --git a/AppControl Manager/Pages/BuildNewCertificate.xaml.cs b/AppControl Manager/Pages/BuildNewCertificate.xaml.cs
index 8ce2abbe9..418468bcc 100644
--- a/AppControl Manager/Pages/BuildNewCertificate.xaml.cs	
+++ b/AppControl Manager/Pages/BuildNewCertificate.xaml.cs	
@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using Windows.ApplicationModel.DataTransfer;
 
-namespace WDACConfig.Pages
+namespace AppControlManager.Pages
 {
 
     public sealed partial class BuildNewCertificate : Page
diff --git a/AppControl Manager/Pages/ConfigurePolicyRuleOptions.xaml b/AppControl Manager/Pages/ConfigurePolicyRuleOptions.xaml
index 62191e753..7c932b97f 100644
--- a/AppControl Manager/Pages/ConfigurePolicyRuleOptions.xaml	
+++ b/AppControl Manager/Pages/ConfigurePolicyRuleOptions.xaml	
@@ -1,8 +1,8 @@
 <Page
-    x:Class="WDACConfig.Pages.ConfigurePolicyRuleOptions"
+    x:Class="AppControlManager.Pages.ConfigurePolicyRuleOptions"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:WDACConfig.Pages"
+    xmlns:local="using:AppControlManager.Pages"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="using:CommunityToolkit.WinUI"
diff --git a/AppControl Manager/Pages/ConfigurePolicyRuleOptions.xaml.cs b/AppControl Manager/Pages/ConfigurePolicyRuleOptions.xaml.cs
index 0aa3c3641..9a2541297 100644
--- a/AppControl Manager/Pages/ConfigurePolicyRuleOptions.xaml.cs	
+++ b/AppControl Manager/Pages/ConfigurePolicyRuleOptions.xaml.cs	
@@ -4,9 +4,9 @@
 using Microsoft.UI.Xaml.Navigation;
 using System;
 using System.Collections.Generic;
-using static WDACConfig.CiRuleOptions;
+using static AppControlManager.CiRuleOptions;
 
-namespace WDACConfig.Pages
+namespace AppControlManager.Pages
 {
     public sealed partial class ConfigurePolicyRuleOptions : Page
     {
diff --git a/AppControl Manager/Pages/CreatePolicy.xaml b/AppControl Manager/Pages/CreatePolicy.xaml
index f9441d2bd..6e98dd99b 100644
--- a/AppControl Manager/Pages/CreatePolicy.xaml	
+++ b/AppControl Manager/Pages/CreatePolicy.xaml	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Page
-    x:Class="WDACConfig.Pages.CreatePolicy"
+    x:Class="AppControlManager.Pages.CreatePolicy"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:WDACConfig.Pages"
+    xmlns:local="using:AppControlManager.Pages"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="using:CommunityToolkit.WinUI"
@@ -99,7 +99,7 @@ Style="{StaticResource AccentButtonStyle}" Click="AllowMicrosoftCreateAndDeploy_
     Value="2"
     SpinButtonPlacementMode="Inline"
     SmallChange="1"
-    IsEnabled="False"                                      
+    IsEnabled="False"
     LargeChange="10" Minimum="2" Maximum="1000000" Margin="0,0,30,0" ToolTipService.ToolTip="This is the Maximum Capacity of the Code Integrity Operational Log Size" />
 
 
diff --git a/AppControl Manager/Pages/CreatePolicy.xaml.cs b/AppControl Manager/Pages/CreatePolicy.xaml.cs
index d49d0fb95..f14edd5c5 100644
--- a/AppControl Manager/Pages/CreatePolicy.xaml.cs	
+++ b/AppControl Manager/Pages/CreatePolicy.xaml.cs	
@@ -5,7 +5,7 @@
 using System;
 using System.Threading.Tasks;
 
-namespace WDACConfig.Pages
+namespace AppControlManager.Pages
 {
     public sealed partial class CreatePolicy : Page
     {
diff --git a/AppControl Manager/Pages/CreateSupplementalPolicy.xaml b/AppControl Manager/Pages/CreateSupplementalPolicy.xaml
index 8cd7492d4..4a411f56d 100644
--- a/AppControl Manager/Pages/CreateSupplementalPolicy.xaml	
+++ b/AppControl Manager/Pages/CreateSupplementalPolicy.xaml	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Page
-    x:Class="WDACConfig.Pages.CreateSupplementalPolicy"
+    x:Class="AppControlManager.Pages.CreateSupplementalPolicy"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:WDACConfig.Pages"
+    xmlns:local="using:AppControlManager.Pages"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="using:CommunityToolkit.WinUI"
@@ -188,6 +188,42 @@ Header="Policy Name" IsClickEnabled="False" IsActionIconVisible="False">
 
                         </controls:SettingsCard>
 
+                        <controls:SettingsCard Description="The higher this number, the faster the scan completes and the more system resources will be consumed."
+                        Header="Scalability" IsClickEnabled="False" IsActionIconVisible="False">
+
+                            <controls:WrapPanel Orientation="Horizontal" HorizontalSpacing="15">
+
+                                <!-- Scalability Button with RadialGauge Flyout -->
+                                <Button x:Name="ScalabilityButton" Content="Scalability" ToolTipService.ToolTip="The number of the concurrent/parallel tasks to use when scanning files. By default it uses 2 parallel tasks.">
+                                    <Button.Flyout>
+                                        <Flyout>
+                                            <StackPanel>
+                                                <controls:RadialGauge x:Name="ScalabilityRadialGauge"
+                                                    StepSize="1"
+                                                    TickSpacing="2"
+                                                    ScaleWidth="12"
+                                                    NeedleWidth="5"
+                                                    NeedleLength="80"
+                                                    TickLength="8"
+                                                    TickWidth="0"
+                                                    ScalePadding="0"
+                                                    TickPadding="24"
+                                                    Width="200"
+                                                    Maximum="120"
+                                                    Minimum="2"
+                                                    ValueChanged="ScalabilityRadialGauge_ValueChanged"
+                                                    ValueStringFormat="N0"/>
+                                            </StackPanel>
+                                        </Flyout>
+                                    </Button.Flyout>
+                                </Button>
+
+                                <ProgressBar x:Name="FilesAndFoldersProgressBar" Width="200" Value="0" ToolTipService.ToolTip="The Supplemental policy creation progress" />
+
+                            </controls:WrapPanel>
+
+                        </controls:SettingsCard>
+
                         <controls:SettingsCard Description="View the details of all of the files that were detected in the file and folder paths you selected."
                                            Header="View detected file details"
                                            HeaderIcon="{ui:FontIcon Glyph=&#xE83B;}"
diff --git a/AppControl Manager/Pages/CreateSupplementalPolicy.xaml.cs b/AppControl Manager/Pages/CreateSupplementalPolicy.xaml.cs
index d71362d2d..fcb68983c 100644
--- a/AppControl Manager/Pages/CreateSupplementalPolicy.xaml.cs	
+++ b/AppControl Manager/Pages/CreateSupplementalPolicy.xaml.cs	
@@ -1,3 +1,5 @@
+using AppControlManager.IntelGathering;
+using CommunityToolkit.WinUI.Controls;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Controls.Primitives;
@@ -9,9 +11,8 @@
 using System.Linq;
 using System.Security.Cryptography.X509Certificates;
 using System.Threading.Tasks;
-using WDACConfig.IntelGathering;
 
-namespace WDACConfig.Pages
+namespace AppControlManager.Pages
 {
 
     public sealed partial class CreateSupplementalPolicy : Page
@@ -355,6 +356,10 @@ private async void CreateFilesAndFoldersSupplementalPolicyButton_Click(object se
                 filesAndFoldersScanResultsList.Clear();
                 filesAndFoldersScanResults.Clear();
 
+                double radialGaugeValue = ScalabilityRadialGauge.Value; // Value from radial gauge
+
+                ScalabilityRadialGauge.IsEnabled = false;
+
                 await Task.Run(() =>
                 {
 
@@ -400,7 +405,7 @@ await Task.Run(() =>
 
 
                     // Scan all of the detected files from the user selected directories
-                    HashSet<FileIdentity> LocalFilesResults = LocalFilesScan.Scan(DetectedFilesInSelectedDirectories);
+                    HashSet<FileIdentity> LocalFilesResults = LocalFilesScan.Scan(DetectedFilesInSelectedDirectories, (ushort)radialGaugeValue, FilesAndFoldersProgressBar, null);
 
                     // Add the results of the directories scans to the DataGrid
                     foreach (FileIdentity item in LocalFilesResults)
@@ -514,9 +519,6 @@ await Task.Run(() =>
                 // Clear variables and UI fields for the next round
                 filesAndFoldersFilePaths.Clear();
                 filesAndFoldersFolderPaths.Clear();
-                filesAndFoldersBasePolicyPath = null;
-                filesAndFoldersSupplementalPolicyName = null;
-                FilesAndFoldersPolicyNameTextBox.Text = null;
 
 
                 // Clear the TextBoxes in the Flyouts
@@ -525,10 +527,23 @@ await Task.Run(() =>
 
 
                 CreateCertificatesSupplementalPolicyButton.IsEnabled = true;
+
+
+                ScalabilityRadialGauge.IsEnabled = true;
             }
         }
 
 
+        // Event handler for RadialGauge ValueChanged
+        private void ScalabilityRadialGauge_ValueChanged(object sender, RangeBaseValueChangedEventArgs e)
+        {
+            if (sender is RadialGauge gauge)
+            {
+                // Update the button content with the current value of the gauge
+                ScalabilityButton.Content = $"Scalability: {gauge.Value:N0}";
+            }
+        }
+
         #endregion
 
 
@@ -744,7 +759,8 @@ await Task.Run(() =>
                     CloseEmptyXmlNodesSemantic.Close(EmptyPolicyPath);
                     RemoveDuplicateFileAttribSemantic.Remove(EmptyPolicyPath);
                     CloseEmptyXmlNodesSemantic.Close(EmptyPolicyPath);
-                    PolicyMerger.Merge([EmptyPolicyPath], EmptyPolicyPath);
+                    MergeSignersSemantic.Merge(EmptyPolicyPath);
+                    MergeSignersSemantic.Merge(EmptyPolicyPath);
                     CloseEmptyXmlNodesSemantic.Close(EmptyPolicyPath);
 
 
diff --git a/AppControl Manager/Pages/CreateSupplementalPolicyFilesAndFoldersScanResults.xaml b/AppControl Manager/Pages/CreateSupplementalPolicyFilesAndFoldersScanResults.xaml
index c587de37d..6c0d7bdd1 100644
--- a/AppControl Manager/Pages/CreateSupplementalPolicyFilesAndFoldersScanResults.xaml	
+++ b/AppControl Manager/Pages/CreateSupplementalPolicyFilesAndFoldersScanResults.xaml	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Page
-    x:Class="WDACConfig.Pages.CreateSupplementalPolicyFilesAndFoldersScanResults"
+    x:Class="AppControlManager.Pages.CreateSupplementalPolicyFilesAndFoldersScanResults"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:WDACConfig.Pages"
+    xmlns:local="using:AppControlManager.Pages"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d"
@@ -141,7 +141,7 @@ Style="{StaticResource BodyTextBlockStyle}">
                     <tk7controls:DataGridTextColumn Header="File Version" Binding="{Binding FileVersion}" Width="Auto" Tag="FileVersion"/>
                     <tk7controls:DataGridTextColumn Header="Package Family Name" Binding="{Binding PackageFamilyName}" Width="Auto" Tag="PackageFamilyName"/>
                     <tk7controls:DataGridTextColumn Header="SHA256 Hash" Binding="{Binding SHA256Hash}" Width="Auto" Tag="SHA256Hash"/>
-                    <tk7controls:DataGridTextColumn Header="SHA1 Hash" Binding="{Binding SHA1Hash}" Width="Auto" Tag="SHA1Hash"/>                    
+                    <tk7controls:DataGridTextColumn Header="SHA1 Hash" Binding="{Binding SHA1Hash}" Width="Auto" Tag="SHA1Hash"/>
                     <tk7controls:DataGridTextColumn Header="Signing Scenario" Binding="{Binding SISigningScenario}" Width="Auto" Tag="SISigningScenario"/>
                     <tk7controls:DataGridTextColumn Header="File Path" Binding="{Binding FilePath}" Width="Auto" Tag="FilePath"/>
                     <tk7controls:DataGridTextColumn Header="SHA1 Page Hash" Binding="{Binding SHA1PageHash}" Width="Auto" Tag="SHA1PageHash"/>
diff --git a/AppControl Manager/Pages/CreateSupplementalPolicyFilesAndFoldersScanResults.xaml.cs b/AppControl Manager/Pages/CreateSupplementalPolicyFilesAndFoldersScanResults.xaml.cs
index 0ce3c6314..f850013af 100644
--- a/AppControl Manager/Pages/CreateSupplementalPolicyFilesAndFoldersScanResults.xaml.cs	
+++ b/AppControl Manager/Pages/CreateSupplementalPolicyFilesAndFoldersScanResults.xaml.cs	
@@ -1,3 +1,4 @@
+using AppControlManager.IntelGathering;
 using CommunityToolkit.WinUI.UI.Controls;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
@@ -6,10 +7,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using WDACConfig.IntelGathering;
 using Windows.ApplicationModel.DataTransfer;
 
-namespace WDACConfig.Pages
+namespace AppControlManager.Pages
 {
 
     public sealed partial class CreateSupplementalPolicyFilesAndFoldersScanResults : Page
diff --git a/AppControl Manager/Pages/Deployment.xaml b/AppControl Manager/Pages/Deployment.xaml
index e34d73dd6..8ba2e0da5 100644
--- a/AppControl Manager/Pages/Deployment.xaml	
+++ b/AppControl Manager/Pages/Deployment.xaml	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Page
-    x:Class="WDACConfig.Pages.Deployment"
+    x:Class="AppControlManager.Pages.Deployment"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:WDACConfig.Pages"
+    xmlns:local="using:AppControlManager.Pages"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="using:CommunityToolkit.WinUI"
diff --git a/AppControl Manager/Pages/Deployment.xaml.cs b/AppControl Manager/Pages/Deployment.xaml.cs
index 4f04bb845..7e6a7a8a5 100644
--- a/AppControl Manager/Pages/Deployment.xaml.cs	
+++ b/AppControl Manager/Pages/Deployment.xaml.cs	
@@ -8,7 +8,7 @@
 using System.Threading.Tasks;
 using System.Xml;
 
-namespace WDACConfig.Pages
+namespace AppControlManager.Pages
 {
 
     public sealed partial class Deployment : Page
diff --git a/AppControl Manager/Pages/EventLogsPolicyCreation.xaml b/AppControl Manager/Pages/EventLogsPolicyCreation.xaml
index 7de8012cf..e4276854f 100644
--- a/AppControl Manager/Pages/EventLogsPolicyCreation.xaml	
+++ b/AppControl Manager/Pages/EventLogsPolicyCreation.xaml	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Page
-    x:Class="WDACConfig.Pages.EventLogsPolicyCreation"
+    x:Class="AppControlManager.Pages.EventLogsPolicyCreation"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:WDACConfig.Pages"
+    xmlns:local="using:AppControlManager.Pages"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="using:CommunityToolkit.WinUI"
diff --git a/AppControl Manager/Pages/EventLogsPolicyCreation.xaml.cs b/AppControl Manager/Pages/EventLogsPolicyCreation.xaml.cs
index 1b12d655f..04cdd0622 100644
--- a/AppControl Manager/Pages/EventLogsPolicyCreation.xaml.cs	
+++ b/AppControl Manager/Pages/EventLogsPolicyCreation.xaml.cs	
@@ -1,3 +1,4 @@
+using AppControlManager.IntelGathering;
 using CommunityToolkit.WinUI.UI.Controls;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
@@ -9,11 +10,10 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using WDACConfig.IntelGathering;
 using Windows.ApplicationModel.DataTransfer;
 
 
-namespace WDACConfig.Pages
+namespace AppControlManager.Pages
 {
     /// <summary>
     /// An empty page that can be used on its own or navigated to within a Frame.
diff --git a/AppControl Manager/Pages/GetCIHashes.xaml b/AppControl Manager/Pages/GetCIHashes.xaml
index bae67f20d..390812bb7 100644
--- a/AppControl Manager/Pages/GetCIHashes.xaml	
+++ b/AppControl Manager/Pages/GetCIHashes.xaml	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Page
-    x:Class="WDACConfig.Pages.GetCIHashes"
+    x:Class="AppControlManager.Pages.GetCIHashes"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:WDACConfig.Pages"
+    xmlns:local="using:AppControlManager.Pages"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:controls="using:CommunityToolkit.WinUI.Controls"
diff --git a/AppControl Manager/Pages/GetCIHashes.xaml.cs b/AppControl Manager/Pages/GetCIHashes.xaml.cs
index 8042b0c1f..df853aa73 100644
--- a/AppControl Manager/Pages/GetCIHashes.xaml.cs	
+++ b/AppControl Manager/Pages/GetCIHashes.xaml.cs	
@@ -2,7 +2,7 @@
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Navigation;
 
-namespace WDACConfig.Pages
+namespace AppControlManager.Pages
 {
     public sealed partial class GetCIHashes : Page
     {
diff --git a/AppControl Manager/Pages/GetSecurePolicySettings.xaml b/AppControl Manager/Pages/GetSecurePolicySettings.xaml
index 36669d88d..f7f73880e 100644
--- a/AppControl Manager/Pages/GetSecurePolicySettings.xaml	
+++ b/AppControl Manager/Pages/GetSecurePolicySettings.xaml	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Page
-    x:Class="WDACConfig.Pages.GetSecurePolicySettings"
+    x:Class="AppControlManager.Pages.GetSecurePolicySettings"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:WDACConfig.Pages"
+    xmlns:local="using:AppControlManager.Pages"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:controls="using:CommunityToolkit.WinUI.Controls"
diff --git a/AppControl Manager/Pages/GetSecurePolicySettings.xaml.cs b/AppControl Manager/Pages/GetSecurePolicySettings.xaml.cs
index cc0977743..b0ccf6891 100644
--- a/AppControl Manager/Pages/GetSecurePolicySettings.xaml.cs	
+++ b/AppControl Manager/Pages/GetSecurePolicySettings.xaml.cs	
@@ -3,7 +3,7 @@
 using Microsoft.UI.Xaml.Navigation;
 using System.Globalization;
 
-namespace WDACConfig.Pages
+namespace AppControlManager.Pages
 {
     public sealed partial class GetSecurePolicySettings : Page
     {
diff --git a/AppControl Manager/Pages/GitHubDocumentation.xaml b/AppControl Manager/Pages/GitHubDocumentation.xaml
index 3a606b190..e5732c97f 100644
--- a/AppControl Manager/Pages/GitHubDocumentation.xaml	
+++ b/AppControl Manager/Pages/GitHubDocumentation.xaml	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Page
-    x:Class="WDACConfig.Pages.GitHubDocumentation"
+    x:Class="AppControlManager.Pages.GitHubDocumentation"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:WDACConfig.Pages"
+    xmlns:local="using:AppControlManager.Pages"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="using:CommunityToolkit.WinUI"
diff --git a/AppControl Manager/Pages/GitHubDocumentation.xaml.cs b/AppControl Manager/Pages/GitHubDocumentation.xaml.cs
index 35d5164ba..ff29b8889 100644
--- a/AppControl Manager/Pages/GitHubDocumentation.xaml.cs	
+++ b/AppControl Manager/Pages/GitHubDocumentation.xaml.cs	
@@ -3,7 +3,7 @@
 using Microsoft.UI.Xaml.Controls;
 using System;
 
-namespace WDACConfig.Pages
+namespace AppControlManager.Pages
 {
     public sealed partial class GitHubDocumentation : Page
     {
diff --git a/AppControl Manager/Pages/Logs.xaml b/AppControl Manager/Pages/Logs.xaml
index 3829e3db3..4ebd2f7dd 100644
--- a/AppControl Manager/Pages/Logs.xaml	
+++ b/AppControl Manager/Pages/Logs.xaml	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Page
-    x:Class="WDACConfig.Pages.Logs"
+    x:Class="AppControlManager.Pages.Logs"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:WDACConfig.Pages"
+    xmlns:local="using:AppControlManager.Pages"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="using:CommunityToolkit.WinUI"
diff --git a/AppControl Manager/Pages/Logs.xaml.cs b/AppControl Manager/Pages/Logs.xaml.cs
index 879e19168..4b526eede 100644
--- a/AppControl Manager/Pages/Logs.xaml.cs	
+++ b/AppControl Manager/Pages/Logs.xaml.cs	
@@ -8,7 +8,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace WDACConfig.Pages
+namespace AppControlManager.Pages
 {
     public sealed partial class Logs : Page
     {
@@ -69,7 +69,7 @@ private void HighlightColorPicker_ColorChanged(ColorPicker sender, ColorChangedE
         private void LoadLogFiles()
         {
             // Get all log files matching the syntax and sort them by creation time
-            List<FileInfo> logFiles = [.. Directory.GetFiles(Logger.LogsDirectory, "WDACConfig_AppLogs_*.txt")
+            List<FileInfo> logFiles = [.. Directory.GetFiles(Logger.LogsDirectory, "AppControlManager_Logs_*.txt")
                 .Select(f => new FileInfo(f))
                 .Where(f => f.Length <= 409600) // Filter files that are 400KB or smaller to prevent UI from freezing. ItemsRepeater element should be used for virtualized content display.
                 .OrderByDescending(f => f.CreationTime)];
diff --git a/AppControl Manager/Pages/MDEAHPolicyCreation.xaml b/AppControl Manager/Pages/MDEAHPolicyCreation.xaml
index 96ef00aa1..82470b71c 100644
--- a/AppControl Manager/Pages/MDEAHPolicyCreation.xaml	
+++ b/AppControl Manager/Pages/MDEAHPolicyCreation.xaml	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Page
-    x:Class="WDACConfig.Pages.MDEAHPolicyCreation"
+    x:Class="AppControlManager.Pages.MDEAHPolicyCreation"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:WDACConfig.Pages"
+    xmlns:local="using:AppControlManager.Pages"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="using:CommunityToolkit.WinUI"
diff --git a/AppControl Manager/Pages/MDEAHPolicyCreation.xaml.cs b/AppControl Manager/Pages/MDEAHPolicyCreation.xaml.cs
index ca4f6c4cd..b9f275297 100644
--- a/AppControl Manager/Pages/MDEAHPolicyCreation.xaml.cs	
+++ b/AppControl Manager/Pages/MDEAHPolicyCreation.xaml.cs	
@@ -1,3 +1,4 @@
+using AppControlManager.IntelGathering;
 using CommunityToolkit.WinUI.UI.Controls;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
@@ -9,11 +10,10 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using WDACConfig.IntelGathering;
 using Windows.ApplicationModel.DataTransfer;
 
 
-namespace WDACConfig.Pages
+namespace AppControlManager.Pages
 {
     /// <summary>
     /// An empty page that can be used on its own or navigated to within a Frame.
diff --git a/AppControl Manager/Pages/MicrosoftDocumentation.xaml b/AppControl Manager/Pages/MicrosoftDocumentation.xaml
index 4a9daf706..ca012f0de 100644
--- a/AppControl Manager/Pages/MicrosoftDocumentation.xaml	
+++ b/AppControl Manager/Pages/MicrosoftDocumentation.xaml	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Page
-    x:Class="WDACConfig.Pages.MicrosoftDocumentation"
+    x:Class="AppControlManager.Pages.MicrosoftDocumentation"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:WDACConfig.Pages"
+    xmlns:local="using:AppControlManager.Pages"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="using:CommunityToolkit.WinUI"
diff --git a/AppControl Manager/Pages/MicrosoftDocumentation.xaml.cs b/AppControl Manager/Pages/MicrosoftDocumentation.xaml.cs
index 22be0c0cb..a6be9d479 100644
--- a/AppControl Manager/Pages/MicrosoftDocumentation.xaml.cs	
+++ b/AppControl Manager/Pages/MicrosoftDocumentation.xaml.cs	
@@ -3,7 +3,7 @@
 using Microsoft.UI.Xaml.Controls;
 using System;
 
-namespace WDACConfig.Pages
+namespace AppControlManager.Pages
 {
     public sealed partial class MicrosoftDocumentation : Page
     {
diff --git a/AppControl Manager/Pages/Settings.xaml b/AppControl Manager/Pages/Settings.xaml
index f6c015386..b431089c6 100644
--- a/AppControl Manager/Pages/Settings.xaml	
+++ b/AppControl Manager/Pages/Settings.xaml	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Page
-    x:Class="WDACConfig.Pages.Settings"
+    x:Class="AppControlManager.Pages.Settings"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:WDACConfig.Pages"
+    xmlns:local="using:AppControlManager.Pages"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="using:CommunityToolkit.WinUI"
diff --git a/AppControl Manager/Pages/Settings.xaml.cs b/AppControl Manager/Pages/Settings.xaml.cs
index 34ab95684..c12bac4f3 100644
--- a/AppControl Manager/Pages/Settings.xaml.cs	
+++ b/AppControl Manager/Pages/Settings.xaml.cs	
@@ -7,10 +7,10 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Windows.UI.ViewManagement;
-using static WDACConfig.AppSettings;
+using static AppControlManager.AppSettings;
 
 
-namespace WDACConfig.Pages
+namespace AppControlManager.Pages
 {
     public sealed partial class Settings : Page
     {
@@ -31,7 +31,7 @@ public Settings()
             VersionTextBlock.Text = $"Version {App.currentAppVersion}";
 
             // Set the year for the copyright section
-            CopyRightSettingsExpander.Description = $"© {DateTime.Now.Year}. All rights reserved.";
+            CopyRightSettingsExpander.Description = $"� {DateTime.Now.Year}. All rights reserved.";
 
             FetchLatestCertificateCNs();
 
diff --git a/AppControl Manager/Pages/Simulation.xaml b/AppControl Manager/Pages/Simulation.xaml
index 89172bccd..bb9c47f32 100644
--- a/AppControl Manager/Pages/Simulation.xaml	
+++ b/AppControl Manager/Pages/Simulation.xaml	
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Page
-    x:Class="WDACConfig.Pages.Simulation"
+    x:Class="AppControlManager.Pages.Simulation"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:WDACConfig.Pages"
-    xmlns:localbase="using:WDACConfig"
-    xmlns:wdac="using:WDACConfig"
+    xmlns:local="using:AppControlManager.Pages"
+    xmlns:localbase="using:AppControlManager"
+    xmlns:AppControlManager="using:AppControlManager"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="using:CommunityToolkit.WinUI"
@@ -117,7 +117,7 @@ Style="{StaticResource BodyTextBlockStyle}">
                             <MenuFlyoutSeparator/>
 
                             <!-- Toggle Button for CSV Output -->
-                            <ToggleMenuFlyoutItem x:Name="CSVOutputToggle" Text="Save output to CSV" IsChecked="False" ToolTipService.ToolTip="Exports the output to a CSV file in the WDACConfig directory in the Program Files directory at the end of the simulation job.">
+                            <ToggleMenuFlyoutItem x:Name="CSVOutputToggle" Text="Save output to CSV" IsChecked="False" ToolTipService.ToolTip="Exports the output to a CSV file in the AppControlManager directory in the Program Files directory at the end of the simulation job.">
                                 <ToggleMenuFlyoutItem.Icon>
                                     <FontIcon Glyph="&#xE9F9;" />
                                 </ToggleMenuFlyoutItem.Icon>
diff --git a/AppControl Manager/Pages/Simulation.xaml.cs b/AppControl Manager/Pages/Simulation.xaml.cs
index df27506b7..d7c693d96 100644
--- a/AppControl Manager/Pages/Simulation.xaml.cs	
+++ b/AppControl Manager/Pages/Simulation.xaml.cs	
@@ -14,7 +14,7 @@
 using System.Threading.Tasks;
 using Windows.ApplicationModel.DataTransfer;
 
-namespace WDACConfig.Pages
+namespace AppControlManager.Pages
 {
     public sealed partial class Simulation : Page
     {
@@ -80,7 +80,7 @@ private async void BeginSimulationButton_Click(object sender, RoutedEventArgs e)
                 // Run the simulation
                 ConcurrentDictionary<string, SimulationOutput> result = await Task.Run(() =>
                 {
-                    return InvokeWDACSimulation.Invoke(
+                    return AppControlSimulation.Invoke(
                         filePaths,
                         folderPaths,
                         xmlFilePath,
diff --git a/AppControl Manager/Pages/SystemInformation/CodeIntegrityInfo.xaml b/AppControl Manager/Pages/SystemInformation/CodeIntegrityInfo.xaml
index b56fc5720..4202aa5c6 100644
--- a/AppControl Manager/Pages/SystemInformation/CodeIntegrityInfo.xaml	
+++ b/AppControl Manager/Pages/SystemInformation/CodeIntegrityInfo.xaml	
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Page
-    x:Class="WDACConfig.Pages.CodeIntegrityInfo"
+    x:Class="AppControlManager.Pages.CodeIntegrityInfo"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:WDACConfig.Pages"
-    xmlns:ci="using:WDACConfig.CodeIntegrity"
+    xmlns:local="using:AppControlManager.Pages"
+    xmlns:ci="using:AppControlManager.CodeIntegrity"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
diff --git a/AppControl Manager/Pages/SystemInformation/CodeIntegrityInfo.xaml.cs b/AppControl Manager/Pages/SystemInformation/CodeIntegrityInfo.xaml.cs
index 1a91dfa01..ba8d3a6f9 100644
--- a/AppControl Manager/Pages/SystemInformation/CodeIntegrityInfo.xaml.cs	
+++ b/AppControl Manager/Pages/SystemInformation/CodeIntegrityInfo.xaml.cs	
@@ -1,7 +1,7 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 
-namespace WDACConfig.Pages
+namespace AppControlManager.Pages
 {
     public sealed partial class CodeIntegrityInfo : Page
     {
diff --git a/AppControl Manager/Pages/SystemInformation/SystemInformation.xaml b/AppControl Manager/Pages/SystemInformation/SystemInformation.xaml
index 7cf17ebdc..ac5c0752f 100644
--- a/AppControl Manager/Pages/SystemInformation/SystemInformation.xaml	
+++ b/AppControl Manager/Pages/SystemInformation/SystemInformation.xaml	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Page
-    x:Class="WDACConfig.Pages.SystemInformation"
+    x:Class="AppControlManager.Pages.SystemInformation"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:WDACConfig.Pages"
+    xmlns:local="using:AppControlManager.Pages"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="using:CommunityToolkit.WinUI"
diff --git a/AppControl Manager/Pages/SystemInformation/SystemInformation.xaml.cs b/AppControl Manager/Pages/SystemInformation/SystemInformation.xaml.cs
index 77d20d3db..5dbc194ee 100644
--- a/AppControl Manager/Pages/SystemInformation/SystemInformation.xaml.cs	
+++ b/AppControl Manager/Pages/SystemInformation/SystemInformation.xaml.cs	
@@ -5,7 +5,7 @@
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
 
-namespace WDACConfig.Pages
+namespace AppControlManager.Pages
 {
     /// <summary>
     /// An empty page that can be used on its own or navigated to within a Frame.
diff --git a/AppControl Manager/Pages/SystemInformation/ViewCurrentPolicies.xaml b/AppControl Manager/Pages/SystemInformation/ViewCurrentPolicies.xaml
index c14c0a795..90d202cde 100644
--- a/AppControl Manager/Pages/SystemInformation/ViewCurrentPolicies.xaml	
+++ b/AppControl Manager/Pages/SystemInformation/ViewCurrentPolicies.xaml	
@@ -1,9 +1,9 @@
 <Page
-    x:Class="WDACConfig.Pages.ViewCurrentPolicies"
+    x:Class="AppControlManager.Pages.ViewCurrentPolicies"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:WDACConfig.Pages"
-    xmlns:wdac="using:WDACConfig"
+    xmlns:local="using:AppControlManager.Pages"
+    xmlns:AppControlManager="using:AppControlManager"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="using:CommunityToolkit.WinUI"
diff --git a/AppControl Manager/Pages/SystemInformation/ViewCurrentPolicies.xaml.cs b/AppControl Manager/Pages/SystemInformation/ViewCurrentPolicies.xaml.cs
index 73aa79079..086c4f132 100644
--- a/AppControl Manager/Pages/SystemInformation/ViewCurrentPolicies.xaml.cs	
+++ b/AppControl Manager/Pages/SystemInformation/ViewCurrentPolicies.xaml.cs	
@@ -10,7 +10,7 @@
 using System.Threading.Tasks;
 using Windows.ApplicationModel.DataTransfer;
 
-namespace WDACConfig.Pages
+namespace AppControlManager.Pages
 {
     public sealed partial class ViewCurrentPolicies : Page
     {
diff --git a/AppControl Manager/Pages/Update.xaml b/AppControl Manager/Pages/Update.xaml
index 1f7eeaeb2..4b481537b 100644
--- a/AppControl Manager/Pages/Update.xaml	
+++ b/AppControl Manager/Pages/Update.xaml	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Page
-    x:Class="WDACConfig.Pages.Update"
+    x:Class="AppControlManager.Pages.Update"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:WDACConfig.Pages"
+    xmlns:local="using:AppControlManager.Pages"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="using:CommunityToolkit.WinUI"
diff --git a/AppControl Manager/Pages/Update.xaml.cs b/AppControl Manager/Pages/Update.xaml.cs
index ec9f807d2..0d9fc0b0d 100644
--- a/AppControl Manager/Pages/Update.xaml.cs	
+++ b/AppControl Manager/Pages/Update.xaml.cs	
@@ -17,7 +17,7 @@
 
 #pragma warning disable IDE0063 // Do not simplify using statements, keep them scoped for proper disposal otherwise files will be in use until the method is exited
 
-namespace WDACConfig.Pages
+namespace AppControlManager.Pages
 {
 
     public sealed partial class Update : Page
@@ -32,10 +32,16 @@ public sealed partial class Update : Page
         // Track whether hardened update procedure must be used
         private bool useHardenedUpdateProcedure;
 
+        // To determine whether to use the user-supplied MSIX path or continue with downloading the MSIX from GitHub
+        // It's changed by the UI toggle
         internal bool useCustomMSIXPath;
 
+        // The custom MSIX path that the user supplied
         internal string? customMSIXPath;
 
+        // Could be a URL or file path, will be used by Regex to detect version and architecture
+        private string? sourceForRegex;
+
         // A static instance of the Update class which will hold the single, shared instance of it
         private static Update? _instance;
 
@@ -94,25 +100,33 @@ private async void CheckForUpdateButton_Click(object sender, RoutedEventArgs e)
 
                     string stagingArea = StagingArea.NewStagingArea("AppUpdate").ToString();
 
-                    string onlineDownloadURL;
+                    // To store the latest MSIX version download link after retrieving it from GitHub text file
+                    Uri onlineDownloadURL;
 
+                    // Location of the MSIX package where it will be saved after download it from GitHub
+                    // Or in case user supplied a custom path, it will be assigned to this
                     string AppControlManagerSavePath;
 
                     DownloadProgressRingForMSIXFile.Visibility = Visibility.Visible;
 
+                    // If user did not supply a custom MSIX file path
                     if (!useCustomMSIXPath)
                     {
 
                         using (HttpClient client = new())
                         {
                             // Store the download link to the latest available version
-                            onlineDownloadURL = await client.GetStringAsync(GlobalVars.AppUpdateDownloadLinkURL);
+                            onlineDownloadURL = new Uri(await client.GetStringAsync(GlobalVars.AppUpdateDownloadLinkURL));
                         }
 
+                        // The Uri will be used to detect the version and architecture of the MSIX package being installed
+                        sourceForRegex = onlineDownloadURL.ToString();
+
                         AppControlManagerSavePath = Path.Combine(stagingArea, "AppControlManager.msix");
 
                         UpdateStatusInfoBar.Message = "Downloading the AppControl Manager MSIX package...";
 
+
                         using (HttpClient client = new())
                         {
                             // Send an Async get request to the url and specify to stop reading after headers are received for better efficiently
@@ -181,7 +195,10 @@ private async void CheckForUpdateButton_Click(object sender, RoutedEventArgs e)
 
                     else
                     {
-                        onlineDownloadURL = customMSIXPath ?? throw new InvalidOperationException("No MSIX path was selected");
+                        // Use the user-supplied MSIX file path to detect the version and architecture
+                        sourceForRegex = customMSIXPath ?? throw new InvalidOperationException("No MSIX path was selected");
+
+                        // Use the user-supplied MSIX file path for installation source
                         AppControlManagerSavePath = customMSIXPath;
                     }
 
@@ -221,8 +238,8 @@ await Task.Run(() =>
                         UserProtectedPrivateKey: useHardenedUpdateProcedure,
                         ExportablePrivateKey: false);
 
-                        // Get the version and architecture of the installing MSIX package app from the provided file path
-                        Match RegexMatch = regex.Match(onlineDownloadURL);
+                        // Get the version and architecture of the installing MSIX package app
+                        Match RegexMatch = regex.Match(sourceForRegex);
 
                         string InstallingAppVersion;
                         string InstallingAppArchitecture;
diff --git a/AppControl Manager/Pages/UpdatePageCustomMSIXPath.xaml b/AppControl Manager/Pages/UpdatePageCustomMSIXPath.xaml
index b36443060..57b164243 100644
--- a/AppControl Manager/Pages/UpdatePageCustomMSIXPath.xaml	
+++ b/AppControl Manager/Pages/UpdatePageCustomMSIXPath.xaml	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Page
-    x:Class="WDACConfig.Pages.UpdatePageCustomMSIXPath"
+    x:Class="AppControlManager.Pages.UpdatePageCustomMSIXPath"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:WDACConfig.Pages"
+    xmlns:local="using:AppControlManager.Pages"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="using:CommunityToolkit.WinUI"
diff --git a/AppControl Manager/Pages/UpdatePageCustomMSIXPath.xaml.cs b/AppControl Manager/Pages/UpdatePageCustomMSIXPath.xaml.cs
index 4928a3f6e..a84684eaa 100644
--- a/AppControl Manager/Pages/UpdatePageCustomMSIXPath.xaml.cs	
+++ b/AppControl Manager/Pages/UpdatePageCustomMSIXPath.xaml.cs	
@@ -3,7 +3,7 @@
 using Microsoft.UI.Xaml.Navigation;
 using System.IO;
 
-namespace WDACConfig.Pages
+namespace AppControlManager.Pages
 {
     /// <summary>
     /// An empty page that can be used on its own or navigated to within a Frame.