From 23cbc5b79f4a2f48c726e15f8546dd4c7522b266 Mon Sep 17 00:00:00 2001
From: rayenghanmi <ghanmirayen12@gmail.com>
Date: Thu, 4 Apr 2024 21:03:19 +0100
Subject: [PATCH 1/7] v0.8.0

---
 App.xaml.cs                     |  8 ++--
 CHANGELOG.md                    |  8 ++++
 Helpers/OptimizationOptions.cs  | 12 ------
 Package.appxmanifest            |  2 +-
 Strings/ar-tn/Resources.resw    |  8 ++--
 Strings/en-us/Resources.resw    |  8 ++--
 Strings/fr-fr/Resources.resw    |  8 ++--
 Views/DebloatSystemPage.xaml    |  7 +++-
 Views/DebloatSystemPage.xaml.cs | 67 ++++++++++++++++++++++++++++-----
 Views/PrivacyPage.xaml          |  4 --
 Views/SettingsPage.xaml         | 10 +++--
 app.manifest                    |  6 +--
 12 files changed, 97 insertions(+), 51 deletions(-)

diff --git a/App.xaml.cs b/App.xaml.cs
index e6b5f9b..37b3015 100644
--- a/App.xaml.cs
+++ b/App.xaml.cs
@@ -122,19 +122,19 @@ protected async override void OnLaunched(LaunchActivatedEventArgs args)
         await App.GetService<IActivationService>().ActivateAsync(args);
     }
 
-    private bool ShouldShowWelcomeNotification()
+    private static bool ShouldShowWelcomeNotification()
     {
         // Check if the setting is not present or set to false
-        if (!ApplicationData.Current.LocalSettings.Values.ContainsKey("WelcomeNotificationShown"))
+        if (!ApplicationData.Current.LocalSettings.Values.TryGetValue("WelcomeNotificationShown", out var value))
         {
             return true; // Show the notification if the setting is not present
         }
 
         // Check the value of the setting
-        return !(bool)ApplicationData.Current.LocalSettings.Values["WelcomeNotificationShown"];
+        return !(bool)value;
     }
 
-    private void SetWelcomeNotificationShown()
+    private static void SetWelcomeNotificationShown()
     {
         // Set the flag to true to indicate that the welcome notification has been shown
         LogHelper.Log("Setting WelcomeNotificationShown");
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 551e0cf..1d7e1ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 All notable changes to this branch will be documented in this file.
 
+## 0.8.0 - Work In Progress
+
+### Fixes
+
+- [x] When finished uninstalling apps, the `Show All` checkbox should keep the same state after refreshing installed apps' list.
+- [x] Some apps that were not removed are showing `Uninstalled successfully`.
+- [x] Some packages may show an error even after being successfully removed.
+
 ## 0.7.2 - Released
 
 ### Added
diff --git a/Helpers/OptimizationOptions.cs b/Helpers/OptimizationOptions.cs
index 21932dc..9b17f44 100644
--- a/Helpers/OptimizationOptions.cs
+++ b/Helpers/OptimizationOptions.cs
@@ -263,18 +263,6 @@ public static void XamlSwitches(ToggleSwitch toggleSwitch)
                         ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
                     }
                     break;
-                case "SMBv3":
-                    if (toggleSwitch.IsOn)
-                    {
-                        OptimizeSystemHelper.DisableSMB("3");
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
-                    }
-                    else
-                    {
-                        OptimizeSystemHelper.EnableSMB("3");
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
-                    }
-                    break;
                 case "NTFSTimeStamp":
                     if (toggleSwitch.IsOn)
                     {
diff --git a/Package.appxmanifest b/Package.appxmanifest
index c7596b0..88c19f3 100644
--- a/Package.appxmanifest
+++ b/Package.appxmanifest
@@ -13,7 +13,7 @@
   <Identity
     Name="Rayen.RyTuneX"
     Publisher="CN=Rayen Ghanmi"
-    Version="0.7.2.0" />
+    Version="0.8.0.0" />
     
   <mp:PhoneIdentity PhoneProductId="593c7ba8-f1c9-47cf-a952-7c22b10aac3a" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
     
diff --git a/Strings/ar-tn/Resources.resw b/Strings/ar-tn/Resources.resw
index ec21f83..92da44c 100644
--- a/Strings/ar-tn/Resources.resw
+++ b/Strings/ar-tn/Resources.resw
@@ -186,7 +186,7 @@
     <value>اللغة</value>
   </data>
   <data name="WelcomeNotice" xml:space="preserve">
-    <value>عزيزنا المستخدم،\n\nيسرنا أن نرحب بك في RyTuneX، حيث يلتقي تحسين الأداء بالدقة. تم تطويره بواسطة ريان غانمي وصُمم بفخر من قِبل RyByte، RyTuneX ليس مجرد تطبيق، بل هو بوابتك إلى تجربة حوسبة محسّنة. سواء كنت تستخدم Windows 11 أو Windows 10، تم تصميم RyTuneX لرفع أداء جهازك إلى آفاق جديدة. استمتع بعالم حيث يتم إسكات الخدمات الغير ضرورية، ويتم طرد الفضول، ويتم ضبط نظامك بعناية من خلال تحسينات السجل الذكية. استعد لفتح قوة جهازك الحقيقية - مرحبًا بك في RyTuneX، حيث يكون كل نقرة خطوة نحو رحلة حوسبة أسرع وأكثر استجابة.\n\nملحوظة: يرجى أن تكون على علم بأن RyTuneX حاليًا في مرحلة التجربة. بينما نحن متحمسون لاستقبالك، قد تكون بعض الميزات قيد التطوير، وقد تحدث مشاكل عرضية. رأيك لدينا قيم للغاية في مساعدتنا على تحسين وتحسين تجربة RyTuneX. شكرًا لك على كونك جزءًا من رحلتنا لتحسين وتعزيز تجربة Windows الخاصة بك.\n\nمع خالص التحية،\n\nفريق RyByte</value>
+    <value>عزيزنا المستخدم،\n\nيسرنا أن نرحب بك في RyTuneX، حيث يلتقي تحسين الأداء بالدقة. تم تطويره وتصميمه بفخر من قِبل ريان غانمي، RyTuneX ليس مجرد تطبيق، بل هو بوابتك إلى تجربة حوسبة محسّنة. سواء كنت تستخدم ويندوز 11 أو 10، تم تصميم RyTuneX لرفع أداء جهازك إلى آفاق جديدة. استمتع بعالم حيث يتم إسكات الخدمات الغير ضرورية، ويتم طرد الفضول، ويتم ضبط نظامك بعناية من خلال تحسينات السجل الذكية. استعد لفتح قوة جهازك الحقيقية - مرحبًا بك في RyTuneX، حيث يكون كل نقرة خطوة نحو رحلة حوسبة أسرع وأكثر استجابة.\n\nملحوظة: يرجى أن تكون على علم بأن RyTuneX حاليًا في مرحلة التجربة. بينما نحن متحمسون لاستقبالك، قد تكون بعض الميزات قيد التطوير، وقد تحدث مشاكل عرضية. رأيك لدينا قيم للغاية في مساعدتنا على تحسين وتحسين تجربة RyTuneX. شكرًا لك على كونك جزءًا من رحلتنا لتحسين وتعزيز تجربة Windows الخاصة بك.\n\nمع خالص التحية،\n\nريان غانمي</value>
   </data>
   <data name="WelcomeNoticeTitle" xml:space="preserve">
     <value>أهلاً بك في RyTuneX - أطلق عنان إلى كامل إمكانيات جهازك!</value>
@@ -270,12 +270,12 @@
     <value>قد لا يقوم إلغاء تثبيت بعض هذه التطبيقات بإزالتها تمامًا.</value>
   </data>
   <data name="UninstallationError" xml:space="preserve">
-    <value>خطأ أثناء عملية الإلغاء.</value>
+    <value>خطأ أثناء عملية الإلغاء</value>
   </data>
   <data name="UninstallationSuccessMultiple" xml:space="preserve">
-    <value>,تم إلغاء التثبيت بنجاح.</value>
+    <value>تم إلغاء التثبيت بنجاح</value>
   </data>
   <data name="UninstallationSuccessSingle" xml:space="preserve">
-    <value>تم إلغاء تثبيت التطبيق بنجاح.</value>
+    <value>تم إلغاء تثبيت التطبيق بنجاح</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/Strings/en-us/Resources.resw b/Strings/en-us/Resources.resw
index 7ade8c3..627e309 100644
--- a/Strings/en-us/Resources.resw
+++ b/Strings/en-us/Resources.resw
@@ -186,7 +186,7 @@
     <value>Language</value>
   </data>
   <data name="WelcomeNotice" xml:space="preserve">
-    <value>Dear Valued User,\n\nWe're thrilled to welcome you to RyTuneX, where performance optimization meets precision. Developed by Rayen Ghanmi and proudly crafted by RyByte, RyTuneX is not just an application; it's your gateway to an enhanced computing experience. Whether you're running Windows 11 or Windows 10, RyTuneX is designed to elevate your device's performance to new heights. Dive into a world where unnecessary services are silenced, bloat is banished, and the very heart of your system is finely tuned through intelligent registry optimizations. Get ready to unlock the true power of your device – welcome to RyTuneX, where every click is a step towards a faster, more responsive computing journey.\n\nNote: Please be aware that RyTuneX is currently in beta. While we're excited to have you on board, some features may be in development, and occasional issues might arise. Your feedback is invaluable in helping us refine and perfect the RyTuneX experience. Thank you for being a part of our journey to optimize and enhance your Windows experience.\n\nBest regards,\n\nThe RyByte Team</value>
+    <value>Dear Valued User,\n\nWe're thrilled to welcome you to RyTuneX, where performance optimization meets precision. Developed and proudly crafted by Rayen Ghanmi, RyTuneX is not just an application, it's your gateway to an enhanced computing experience. Whether you're running Windows 11 or Windows 10, RyTuneX is designed to elevate your device's performance to new heights. Dive into a world where unnecessary services are silenced, bloat is banished, and the very heart of your system is finely tuned through intelligent registry optimizations. Get ready to unlock the true power of your device – welcome to RyTuneX, where every click is a step towards a faster, more responsive computing journey.\n\nNote: While we're excited to have you on board, some features may be in development, and occasional issues might arise. Your feedback is invaluable in helping us refine and perfect the RyTuneX experience. Thank you for being a part of our journey to optimize and enhance your Windows experience.\n\nBest regards,\n\nRayen Ghanmi</value>
   </data>
   <data name="WelcomeNoticeTitle" xml:space="preserve">
     <value>Welcome to RyTuneX - Unleash Your Device's Full Potential!</value>
@@ -270,12 +270,12 @@
     <value>Uninstalling some of these apps may not remove them completely.</value>
   </data>
   <data name="UninstallationError" xml:space="preserve">
-    <value>Error uninstalling.</value>
+    <value>Error uninstalling</value>
   </data>
   <data name="UninstallationSuccessMultiple" xml:space="preserve">
-    <value>apps uninstalled successfully.</value>
+    <value>Apps uninstalled successfully</value>
   </data>
   <data name="UninstallationSuccessSingle" xml:space="preserve">
-    <value>App uninstalled successfully.</value>
+    <value>App uninstalled successfully</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/Strings/fr-fr/Resources.resw b/Strings/fr-fr/Resources.resw
index 1f64a3c..202a82b 100644
--- a/Strings/fr-fr/Resources.resw
+++ b/Strings/fr-fr/Resources.resw
@@ -186,7 +186,7 @@
     <value>Langue</value>
   </data>
   <data name="WelcomeNotice" xml:space="preserve">
-    <value>Cher utilisateur précieux,\n\nNous sommes ravis de vous accueillir dans RyTuneX, où l'optimisation des performances rencontre la précision. Développé par Rayen Ghanmi et fièrement conçu par RyByte, RyTuneX n'est pas simplement une application ; c'est votre porte d'entrée vers une expérience informatique améliorée. Que vous utilisiez Windows 11 ou Windows 10, RyTuneX est conçu pour élever les performances de votre appareil à de nouveaux sommets. Plongez dans un univers où les services inutiles sont réduits au silence, les éléments superflus sont éliminés, et le cœur même de votre système est finement réglé grâce à des optimisations intelligentes de la base de registre. Préparez-vous à libérer la véritable puissance de votre appareil - bienvenue dans RyTuneX, où chaque clic est un pas vers un parcours informatique plus rapide et réactif.\n\nRemarque : Veuillez noter que RyTuneX est actuellement en version bêta. Bien que nous soyons ravis de vous avoir parmi nous, certaines fonctionnalités sont en cours de développement, et des problèmes occasionnels peuvent survenir. Vos commentaires sont précieux pour nous aider à affiner et à perfectionner l'expérience RyTuneX. Merci de faire partie de notre parcours visant à optimiser et améliorer votre expérience Windows.\n\nCordialement,\n\nL'équipe RyByte</value>
+    <value>Cher utilisateur précieux,\n\nNous sommes ravis de vous accueillir dans RyTuneX, où l'optimisation des performances rencontre la précision. Développé et fièrement conçu par Rayen Ghanmi, RyTuneX n'est pas simplement une application ; c'est votre porte d'entrée vers une expérience informatique améliorée. Que vous utilisiez Windows 11 ou Windows 10, RyTuneX est conçu pour élever les performances de votre appareil à de nouveaux sommets. Plongez dans un univers où les services inutiles sont réduits au silence, les éléments superflus sont éliminés, et le cœur même de votre système est finement réglé grâce à des optimisations intelligentes de la base de registre. Préparez-vous à libérer la véritable puissance de votre appareil - bienvenue dans RyTuneX, où chaque clic est un pas vers un parcours informatique plus rapide et réactif.\n\nRemarque: Bien que nous soyons ravis de vous avoir parmi nous, certaines fonctionnalités sont en cours de développement, et des problèmes occasionnels peuvent survenir. Vos commentaires sont précieux pour nous aider à affiner et à perfectionner l'expérience RyTuneX. Merci de faire partie de notre parcours visant à optimiser et améliorer votre expérience Windows.\n\nCordialement,\n\nRayen Ghanmi</value>
   </data>
   <data name="WelcomeNoticeTitle" xml:space="preserve">
     <value>Bienvenue dans RyTuneX - Libérez tout le potentiel de votre appareil !</value>
@@ -270,12 +270,12 @@
     <value>La désinstallation de certaines de ces applications peut ne pas les supprimer complètement.</value>
   </data>
   <data name="UninstallationError" xml:space="preserve">
-    <value>Erreur lors de la désinstallation.</value>
+    <value>Erreur lors de la désinstallation</value>
   </data>
   <data name="UninstallationSuccessMultiple" xml:space="preserve">
-    <value>applications désinstallées avec succès.</value>
+    <value>Applications désinstallées avec succès</value>
   </data>
   <data name="UninstallationSuccessSingle" xml:space="preserve">
-    <value>Désinstallation de l'application réussie.</value>
+    <value>Désinstallation de l'application réussie</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/Views/DebloatSystemPage.xaml b/Views/DebloatSystemPage.xaml
index 895fe67..3af6b0c 100644
--- a/Views/DebloatSystemPage.xaml
+++ b/Views/DebloatSystemPage.xaml
@@ -32,11 +32,14 @@
         </Border>
         <StackPanel Margin="10" x:Name="gettingAppsLoading" Grid.Row="0" Visibility="Visible">
             <TextBlock x:Uid="DebloatSystemPage_FetchingInstalledApps"/>
-            <ProgressBar Width="Auto" IsIndeterminate="True"/>
+            <ProgressBar Margin="3" Width="Auto" IsIndeterminate="True"/>
         </StackPanel>
         <TextBlock Margin="3" Grid.Row="1" x:Name="installedAppsCount" Visibility="Collapsed"/>
         <CheckBox x:Uid="DebloatSystemPage_ShowAll" Margin="3" Grid.Row="2" x:Name="showAll" Visibility="Collapsed" Checked="ShowAll_Checked" Unchecked="ShowAll_Unchecked"/>
-        <TextBlock Margin="3" Grid.Row="3" x:Name="uninstallingStatusText"/>
+        <ScrollView Margin="3" Grid.Row="3">
+            <TextBlock Margin="3" x:Name="uninstallingStatusText"/>
+        </ScrollView>
+        
         <ProgressBar Margin="2" Grid.Row="4" x:Name="uninstallingStatusBar" Width="Auto" IsIndeterminate="True" Visibility="Collapsed"/>
         <Button x:Uid="DebloatSystemPage_UninstallButton" Margin="3" Grid.Row="5" x:Name="uninstallButton" Visibility="Collapsed" Click="UninstallSelectedApp_Click" HorizontalAlignment="Left" VerticalAlignment="Bottom"/>
         <muxc:InfoBar
diff --git a/Views/DebloatSystemPage.xaml.cs b/Views/DebloatSystemPage.xaml.cs
index 5dd408c..59a8329 100644
--- a/Views/DebloatSystemPage.xaml.cs
+++ b/Views/DebloatSystemPage.xaml.cs
@@ -17,11 +17,16 @@
 using CommunityToolkit.WinUI.Behaviors;
 using System.Threading;
 using Windows.ApplicationModel.Core;
+using Windows.Storage;
+using RyTuneX.Contracts.Services;
+using Json.Schema;
+using Windows.UI.Popups;
 
 namespace RyTuneX.Views;
 
 public sealed partial class DebloatSystemPage : Page
 {
+    private bool uninstallableOnlyChecked = true;
     public ObservableCollection<KeyValuePair<string, string>> AppList { get; set; } = [];
     private readonly HashSet<string> selectedAppsForUninstall = [];
     private readonly CancellationTokenSource cancellationTokenSource = new();
@@ -54,7 +59,7 @@ private async void LoadInstalledApps(bool uninstallableOnly = true, Cancellation
             cancellationToken.ThrowIfCancellationRequested();
 
             var installedApps = await Task.Run(() => OptimizationOptions.GetUWPApps(uninstallableOnly), cancellationToken);
-            var numberOfInstalledApps = installedApps.Count;
+            var numberOfInstalledApps = installedApps.Count - 1; // removes Rayen.RyTuneX from total installed apps count
 
             DispatcherQueue.TryEnqueue(() =>
             {
@@ -72,7 +77,11 @@ private async void LoadInstalledApps(bool uninstallableOnly = true, Cancellation
 
                 foreach (var app in installedApps)
                 {
-                    AppList.Add(app);
+                    // prevent displaying Rayen.RyTuneX in AppList
+                    if (!app.ToString().Contains("Rayen.RyTuneX"))
+                    {
+                        AppList.Add(app);
+                    }
                 }
 
                 // showing the installed apps data after fetching
@@ -128,7 +137,15 @@ private async void UninstallSelectedApp_Click(object sender, RoutedEventArgs e)
             }
             // Reload the installed apps after successfull uninstall
             await LogHelper.Log("Reloading Installed Apps Data");
-            LoadInstalledApps();
+            if (uninstallableOnlyChecked)
+            {
+                LoadInstalledApps();
+            }
+            else
+            {
+                LoadInstalledApps(false);
+            }
+
             // update ui elements
             uninstallingStatusBar.Visibility = Visibility.Collapsed;
             if (appTreeView.SelectedItems.Count > 1)
@@ -144,25 +161,53 @@ private async void UninstallSelectedApp_Click(object sender, RoutedEventArgs e)
         // in case of an error
         catch (Exception ex)
         {
-            await LogHelper.Log("Error Uninstalling");
-            await LogHelper.LogError($"Error Uninstalling: {ex}");
             // update ui elements
-            uninstallingStatusText.Text = $"Error: {ex}";
+            uninstallingStatusText.Text = ex.ToString();
             uninstallingStatusBar.ShowError = true;
             NotificationQueue.Show(NotificationContent("Debloat".GetLocalized(), "UninstallationError".GetLocalized(), InfoBarSeverity.Error, 5000));
+
+            var uninstallationFailed = new ContentDialog()
+            {
+                XamlRoot = this.XamlRoot,
+                Title = "UninstallationError".GetLocalized(),
+                Content = ex.Message,
+                CloseButtonText = "View logs"
+            };
+            await uninstallationFailed.ShowAsync();
+            var tempFolder = ApplicationData.Current.TemporaryFolder;
+            var file = await tempFolder.GetFileAsync($"Logs_{DateTime.Now:yyyy-MM-dd}.txt");
+
+            // Use Process.Start to open the file with the default application
+            Process.Start(new ProcessStartInfo(file.Path) { UseShellExecute = true });
+
             // reload
-            LoadInstalledApps();
+            if (uninstallableOnlyChecked)
+            {
+                LoadInstalledApps();
+            }
+            else
+            {
+                LoadInstalledApps(false);
+            }
+
         }
     }
     private static async Task UninstallApps(string appName)
     {
         await LogHelper.Log($"Uninstalling: {appName}");
         using var script = PowerShell.Create();
-        script.AddScript("Import-Module -SkipEditionCheck");
-        script.AddScript($"Get-AppxPackage -AllUsers {appName} | Remove-AppxPackage");
+        script.AddScript($"Get-AppxPackage -AllUsers | Where-Object {{$_.Name -eq '{appName}'}} | Remove-AppxPackage");
+
+        var result = await script.InvokeAsync();
 
-        await script.InvokeAsync();
+        if (script.HadErrors)
+        {
+            var errorMessage = string.Join(Environment.NewLine, script.Streams.Error.Select(err => err.ToString()));
+            await LogHelper.LogError(errorMessage);
+            throw new Exception(errorMessage);
+        }
     }
+
     private void ShowAll_Checked(object sender, RoutedEventArgs e)
     {
         // Show uninstallable apps only
@@ -176,6 +221,7 @@ private void ShowAll_Checked(object sender, RoutedEventArgs e)
             uninstallButton.IsEnabled = false;
             NotificationQueue.Show(NotificationContent("Debloat".GetLocalized(), "DebloatPage_NotificationBody".GetLocalized(), InfoBarSeverity.Warning, 4000));
         });
+        uninstallableOnlyChecked = false;
         LoadInstalledApps(uninstallableOnly: false, cancellationTokenSource.Token);
     }
     private void ShowAll_Unchecked(object sender, RoutedEventArgs e)
@@ -190,6 +236,7 @@ private void ShowAll_Unchecked(object sender, RoutedEventArgs e)
             appTreeView.IsEnabled = false;
             uninstallButton.IsEnabled = false;
         });
+        uninstallableOnlyChecked = true;
         LoadInstalledApps(uninstallableOnly: true, cancellationTokenSource.Token);
     }
     private CommunityToolkit.WinUI.Behaviors.Notification NotificationContent(string title, string message, InfoBarSeverity severity, int duration)
diff --git a/Views/PrivacyPage.xaml b/Views/PrivacyPage.xaml
index 04b5bed..97f12d1 100644
--- a/Views/PrivacyPage.xaml
+++ b/Views/PrivacyPage.xaml
@@ -47,10 +47,6 @@
                     <ToggleSwitch x:Name="SMBv2" Tag="SMBv2" Toggled="ToggleSwitch_Toggled"/>
                 </controls:SettingsCard>
 
-                <controls:SettingsCard Header="Disable SMBv3" Description="Disables Server Message Block version 3 (SMBv3) for enhanced security">
-                    <ToggleSwitch x:Name="SMBv3" Tag="SMBv3" Toggled="ToggleSwitch_Toggled"/>
-                </controls:SettingsCard>
-                
                 <controls:SettingsCard Header="Disable Telemetry Services" Description="Turns off telemetry services to prevent the collection and transmission of usage data by the operating system.">
                     <ToggleSwitch x:Name="TelemetryServices" Tag="TelemetryServices" Toggled="ToggleSwitch_Toggled"/>
                 </controls:SettingsCard>
diff --git a/Views/SettingsPage.xaml b/Views/SettingsPage.xaml
index d72e656..a6b1bd6 100644
--- a/Views/SettingsPage.xaml
+++ b/Views/SettingsPage.xaml
@@ -98,9 +98,13 @@
                     </controls:SettingsCard>
                 </controls:SettingsExpander.Items>
             </controls:SettingsExpander>
-            <HyperlinkButton Margin="0,8,0,0"
-                     x:Uid="SettingsPage_FeedbackButton"
-                     NavigateUri="https://github.com/rayenghanmi/rytunex/issues/new" />
+            <StackPanel Orientation="Horizontal" Margin="0,8,0,0">
+                <HyperlinkButton x:Uid="SettingsPage_FeedbackButton"
+                    NavigateUri="https://github.com/rayenghanmi/rytunex/issues/new" />
+                <HyperlinkButton x:Uid="SettingsPage_SupportButton"
+                    Content="#CeasefireNOW"
+                    NavigateUri="https://techforpalestine.org/learn-more/" />
+            </StackPanel>
         </StackPanel>
     </ScrollView>
 </Page>
diff --git a/app.manifest b/app.manifest
index bd3af19..cd5e510 100644
--- a/app.manifest
+++ b/app.manifest
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="0.7.2.0" name="RyTuneX.app"/>
+  <assemblyIdentity version="0.8.0.0" name="RyTuneX.app"/>
     <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
       <application>
         <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
       </application>
     </compatibility>
-	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+	<!--<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
 		<security>
 			<requestedPrivileges>
 				<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
 			</requestedPrivileges>
 		</security>
-	</trustInfo>
+	</trustInfo>-->
   <application xmlns="urn:schemas-microsoft-com:asm.v3">
     <windowsSettings>
       <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>

From a8ea219ada6c3321aebb00d33cb833d851e765d1 Mon Sep 17 00:00:00 2001
From: rayenghanmi <ghanmirayen12@gmail.com>
Date: Fri, 5 Apr 2024 22:54:50 +0100
Subject: [PATCH 2/7] 0.8.0

---
 CHANGELOG.md                    |  4 ++++
 Helpers/OptimizationOptions.cs  | 19 ++++++++++++++----
 Strings/en-us/Resources.resw    |  3 +++
 Views/DebloatSystemPage.xaml    | 15 ++++++++++++--
 Views/DebloatSystemPage.xaml.cs | 35 +++++++++++++++++++++++++++++++++
 5 files changed, 70 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d7e1ed..6eccd92 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,10 @@ All notable changes to this branch will be documented in this file.
 - [x] Some apps that were not removed are showing `Uninstalled successfully`.
 - [x] Some packages may show an error even after being successfully removed.
 
+### Added
+
+- Option to remove temporary files in `Debloat` page.
+
 ## 0.7.2 - Released
 
 ### Added
diff --git a/Helpers/OptimizationOptions.cs b/Helpers/OptimizationOptions.cs
index 9b17f44..aa9e0bc 100644
--- a/Helpers/OptimizationOptions.cs
+++ b/Helpers/OptimizationOptions.cs
@@ -74,24 +74,35 @@ internal static void StopService(string serviceName)
             }
         }
     }
-    internal static void StartInCmd(string command)
+    internal static async Task<int> StartInCmd(string command)
     {
         try
         {
             using var p = new Process();
             p.StartInfo.FileName = "cmd.exe";
             p.StartInfo.Arguments = $"/C {command}";
-            p.StartInfo.CreateNoWindow = false;
+            p.StartInfo.CreateNoWindow = true;
             p.StartInfo.UseShellExecute = true;
-            p.StartInfo.WindowStyle = ProcessWindowStyle.Normal;
-            p.Start();
+            p.StartInfo.WindowStyle = ProcessWindowStyle.Hidden;
+
+            // Start the process in a separate Task
+            Task startTask = Task.Run(() => p.Start());
+
+            // Await the start task to ensure process starts
+            await startTask;
+
+            // Await process completion and capture exit code
+            await p.WaitForExitAsync();
+            return p.ExitCode;
         }
         catch (Exception ex)
         {
             Debug.WriteLine($"Error running command: {ex.Message}");
+            throw;
         }
     }
 
+
     internal static void StartService(string serviceName)
     {
         if (ServiceExists(serviceName))
diff --git a/Strings/en-us/Resources.resw b/Strings/en-us/Resources.resw
index 627e309..8206cd7 100644
--- a/Strings/en-us/Resources.resw
+++ b/Strings/en-us/Resources.resw
@@ -278,4 +278,7 @@
   <data name="UninstallationSuccessSingle" xml:space="preserve">
     <value>App uninstalled successfully</value>
   </data>
+  <data name="DebloatSystemPage_TempButton.Content" xml:space="preserve">
+    <value>Remove Temp Files</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Views/DebloatSystemPage.xaml b/Views/DebloatSystemPage.xaml
index 3af6b0c..4c2cb9c 100644
--- a/Views/DebloatSystemPage.xaml
+++ b/Views/DebloatSystemPage.xaml
@@ -39,9 +39,8 @@
         <ScrollView Margin="3" Grid.Row="3">
             <TextBlock Margin="3" x:Name="uninstallingStatusText"/>
         </ScrollView>
-        
+
         <ProgressBar Margin="2" Grid.Row="4" x:Name="uninstallingStatusBar" Width="Auto" IsIndeterminate="True" Visibility="Collapsed"/>
-        <Button x:Uid="DebloatSystemPage_UninstallButton" Margin="3" Grid.Row="5" x:Name="uninstallButton" Visibility="Collapsed" Click="UninstallSelectedApp_Click" HorizontalAlignment="Left" VerticalAlignment="Bottom"/>
         <muxc:InfoBar
                       MaxWidth="480"
                       Margin="16"
@@ -51,5 +50,17 @@
                 <behaviors:StackedNotificationsBehavior x:Name="NotificationQueue" />
             </interactivity:Interaction.Behaviors>
         </muxc:InfoBar>
+        <StackPanel Orientation="Horizontal" Margin="3" Grid.Row="5">
+            <Button Margin="3" x:Uid="DebloatSystemPage_UninstallButton" x:Name="uninstallButton" Visibility="Collapsed" Click="UninstallSelectedApp_Click"/>
+            <StackPanel x:Name="TempStackButtonTextBar" Margin="3" Orientation="Vertical" VerticalAlignment="Center" Visibility="Collapsed">
+                <Grid>
+                    <Button x:Uid="DebloatSystemPage_TempButton" x:Name="TempButton" Click="RemoveTempFiles"/>
+                    <StackPanel x:Name="TempStack" Visibility="Collapsed">
+                        <ProgressBar x:Name="TempProgress" Margin="3" IsIndeterminate="True" Visibility="Collapsed"/>
+                        <TextBlock x:Name="TempStatusText"/>
+                    </StackPanel>
+                </Grid>
+            </StackPanel>
+        </StackPanel>
     </Grid>
 </Page>
diff --git a/Views/DebloatSystemPage.xaml.cs b/Views/DebloatSystemPage.xaml.cs
index 59a8329..c33b22d 100644
--- a/Views/DebloatSystemPage.xaml.cs
+++ b/Views/DebloatSystemPage.xaml.cs
@@ -74,6 +74,7 @@ private async void LoadInstalledApps(bool uninstallableOnly = true, Cancellation
                 uninstallingStatusBar.Visibility = Visibility.Collapsed;
                 showAll.Visibility = Visibility.Collapsed;
                 uninstallButton.Visibility = Visibility.Collapsed;
+                TempStackButtonTextBar.Visibility = Visibility.Collapsed;
 
                 foreach (var app in installedApps)
                 {
@@ -95,6 +96,7 @@ private async void LoadInstalledApps(bool uninstallableOnly = true, Cancellation
                 uninstallButton.IsEnabled = true;
                 gettingAppsLoading.Visibility = Visibility.Collapsed;
                 uninstallingStatusBar.ShowError = false;
+                TempStackButtonTextBar.Visibility = Visibility.Visible;
             });
         }
         catch (OperationCanceledException ex)
@@ -251,4 +253,37 @@ private CommunityToolkit.WinUI.Behaviors.Notification NotificationContent(string
         LogHelper.Log("Returning Debloat Notification");
         return notification;
     }
+
+    private async void RemoveTempFiles(object sender, RoutedEventArgs e)
+    {
+        try
+        {
+            TempStack.Visibility = Visibility.Visible;
+            TempProgress.ShowError = false;
+            TempProgress.Visibility = Visibility.Visible;
+            TempButton.Visibility = Visibility.Collapsed;
+            TempStatusText.Text = "Deleting Temp Files...";
+
+            var exitCode = await OptimizationOptions.StartInCmd("Del /F /S /Q \"C:\\*.tmp\"");
+
+            // Check for successful execution
+            if (exitCode == 0)
+            {
+                TempStatusText.Text = "Temp Files Deleted Successfully!";
+                TempProgress.Visibility = Visibility.Collapsed;
+            }
+            else
+            {
+                TempStatusText.Text = "Error Deleting Temp Files";
+                TempProgress.ShowError = true;
+            }
+        }
+        catch (Exception ex)
+        {
+            TempStatusText.Text = "Error: " + ex.Message;
+            TempButton.Visibility = Visibility.Visible;
+            TempProgress.Visibility = Visibility.Collapsed;
+            TempProgress.ShowError = true;
+        }
+    }
 }
\ No newline at end of file

From 3806b05c9ec46688771c0c2cea52bc3a00e80b69 Mon Sep 17 00:00:00 2001
From: rayenghanmi <ghanmirayen12@gmail.com>
Date: Sat, 6 Apr 2024 00:26:42 +0100
Subject: [PATCH 3/7] toggle switches

Reapplying tweaks when initializing toggle switches' previous state is now fixed
---
 CHANGELOG.md                     |   1 +
 Helpers/OptimizationOptions.cs   | 210 +++++++++++++++----------------
 Views/FeaturesPage.xaml.cs       |  23 +++-
 Views/OptimizeSystemPage.xaml.cs |  31 +++--
 Views/PrivacyPage.xaml.cs        |  31 +++--
 5 files changed, 162 insertions(+), 134 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6eccd92..0b93690 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ All notable changes to this branch will be documented in this file.
 - [x] When finished uninstalling apps, the `Show All` checkbox should keep the same state after refreshing installed apps' list.
 - [x] Some apps that were not removed are showing `Uninstalled successfully`.
 - [x] Some packages may show an error even after being successfully removed.
+- [x] Reapplying tweaks when initializing toggle switches' previous state.
 
 ### Added
 
diff --git a/Helpers/OptimizationOptions.cs b/Helpers/OptimizationOptions.cs
index aa9e0bc..3af1960 100644
--- a/Helpers/OptimizationOptions.cs
+++ b/Helpers/OptimizationOptions.cs
@@ -112,9 +112,9 @@ internal static void StartService(string serviceName)
             sc.Start();
         }
     }
-    public static void XamlSwitches(ToggleSwitch toggleSwitch)
+    public static void XamlSwitches(ToggleSwitch toggleSwitch, bool isAutomated = true)
     {
-        if (toggleSwitch != null && toggleSwitch.Tag != null)
+        if (!isAutomated && toggleSwitch != null && toggleSwitch.Tag != null)
         {
             switch (toggleSwitch.Tag)
             {
@@ -122,624 +122,622 @@ public static void XamlSwitches(ToggleSwitch toggleSwitch)
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.EnablePerformanceTweaks();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.DisablePerformanceTweaks();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "TelemetryServices":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableTelemetryServices();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableTelemetryServices();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "HomeGroup":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableHomeGroup();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableHomeGroup();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "PrintService":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisablePrintService();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnablePrintService();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "Superfetch":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableSuperfetch();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableSuperfetch();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "CompatibilityAssistant":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableCompatibilityAssistant();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableCompatibilityAssistant();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "SystemRestore":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableSystemRestore();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableSystemRestore();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "VerboseLogon":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.EnableVerboseLogon();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.DisableVerboseLogon();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "ClassicContextMenu":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.EnableClassicContextMenu();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.DisableClassicContextMenu();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "ClassicStartMenu":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.EnableClassicStartMenu();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.DisableClassicStartMenu();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "Search":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableSearch();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableSearch();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "SMBv1":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableSMB("1");
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableSMB("1");
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "SMBv2":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableSMB("2");
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableSMB("2");
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "NTFSTimeStamp":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableNTFSTimeStamp();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableNTFSTimeStamp();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "ErrorReporting":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableErrorReporting();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableErrorReporting();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "LegacyVolumeSlider":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableLegacyVolumeSlider();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableLegacyVolumeSlider();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "Cortana":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableCortana();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableCortana();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "GamingMode":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.EnableGamingMode();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.DisableGamingMode();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "AutomaticUpdates":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableAutomaticUpdates();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableAutomaticUpdates();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "StoreUpdates":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableStoreUpdates();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableStoreUpdates();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "OneDrive":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableOneDrive();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableOneDrive();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "SensorServices":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableSensorServices();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableSensorServices();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "Privacy":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.EnhancePrivacy();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.CompromisePrivacy();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "GameBar":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableGameBar();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableGameBar();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "QuickAccessHistory":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableQuickAccessHistory();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableQuickAccessHistory();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "StartMenuAds":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableStartMenuAds();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableStartMenuAds();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
                     }
                     break;
                 case "MyPeople":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableMyPeople();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableMyPeople();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "Drivers":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.ExcludeDrivers();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.IncludeDrivers();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "WindowsInk":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableWindowsInk();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableWindowsInk();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "SpellingAndTypingFeatures":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableSpellingAndTypingFeatures();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableSpellingAndTypingFeatures();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "FaxService":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableFaxService();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableFaxService();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "InsiderService":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableInsiderService();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableInsiderService();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "SmartScreen":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableSmartScreen();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableSmartScreen();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "CloudClipboard":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableCloudClipboard();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableCloudClipboard();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "StickyKeys":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableStickyKeys();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableStickyKeys();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "CastToDevice":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.RemoveCastToDevice();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.AddCastToDevice();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "VBS":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableVBS();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableVBS();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "TaskbarToLeft":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.AlignTaskbarToLeft();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.AlignTaskbarToCenter();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "SnapAssist":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableSnapAssist();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableSnapAssist();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "Widgets":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableWidgets();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableWidgets();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "Chat":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableChat();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableChat();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "ShowMoreOptions":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableShowMoreOptions();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableShowMoreOptions();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "FilesCompactMode":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.EnableFilesCompactMode();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.DisableFilesCompactMode();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "Stickers":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableStickers();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableStickers();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "EdgeDiscoverBar":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableEdgeDiscoverBar();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableEdgeDiscoverBar();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "EdgeTelemetry":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableEdgeTelemetry();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableEdgeTelemetry();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "CoPilotAI":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableCoPilotAI();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableCoPilotAI();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "VisualStudioTelemetry":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableVisualStudioTelemetry();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableVisualStudioTelemetry();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "NvidiaTelemetry":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableNvidiaTelemetry();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableNvidiaTelemetry();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "ChromeTelemetry":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableChromeTelemetry();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableChromeTelemetry();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "FirefoxTelemetry":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableFirefoxTelemetry();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableFirefoxTelemetry();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
                 case "Hibernation":
                     if (toggleSwitch.IsOn)
                     {
                         OptimizeSystemHelper.DisableHibernation();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+                        
                     }
                     else
                     {
                         OptimizeSystemHelper.EnableHibernation();
-                        ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+                        
                     }
                     break;
             }
diff --git a/Views/FeaturesPage.xaml.cs b/Views/FeaturesPage.xaml.cs
index a243d5a..2c7fb10 100644
--- a/Views/FeaturesPage.xaml.cs
+++ b/Views/FeaturesPage.xaml.cs
@@ -13,15 +13,13 @@ namespace RyTuneX.Views;
 
 public sealed partial class FeaturesPage : Page
 {
-
-    private readonly bool isInitialSetup = true;
+    private bool isInitialLoad = true;
 
     public FeaturesPage()
     {
         InitializeComponent();
         LogHelper.Log("Initializing FeaturesPage");
         Loaded += (sender, e) => InitializeToggleSwitches();
-        isInitialSetup = false;
     }
     private void InitializeToggleSwitches()
     {
@@ -39,6 +37,7 @@ private void InitializeToggleSwitches()
                 }
             }
         }
+        isInitialLoad = false;
     }
     // Helper method to find all children of a specific type in the visual tree
     private static IEnumerable<T> FindVisualChildren<T>(DependencyObject depObj) where T : DependencyObject
@@ -73,12 +72,24 @@ private void ToggleSwitch_Toggled(object sender, RoutedEventArgs e)
     {
         try
         {
-            if (!isInitialSetup)
+            var toggleSwitch = (ToggleSwitch)sender;
+            Debug.WriteLine($"ToggleSwitch Tag: {toggleSwitch.Tag}, IsOn: {toggleSwitch.IsOn}");
+            if (toggleSwitch.IsOn)
+            {
+                ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+            }
+            else
+            {
+                ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+            }
+            if (isInitialLoad)
             {
-                var toggleSwitch = (ToggleSwitch)sender;
-                Debug.WriteLine($"ToggleSwitch Tag: {toggleSwitch.Tag}, IsOn: {toggleSwitch.IsOn}");
                 OptimizationOptions.XamlSwitches(toggleSwitch);
             }
+            else
+            {
+                OptimizationOptions.XamlSwitches(toggleSwitch, false);
+            }
         }
         catch (Exception ex)
         {
diff --git a/Views/OptimizeSystemPage.xaml.cs b/Views/OptimizeSystemPage.xaml.cs
index 83340a9..1dc5ab0 100644
--- a/Views/OptimizeSystemPage.xaml.cs
+++ b/Views/OptimizeSystemPage.xaml.cs
@@ -11,14 +11,13 @@ namespace RyTuneX.Views;
 public sealed partial class OptimizeSystemPage : Page
 {
 
-    private readonly bool isInitialSetup = true;
+    private bool isInitialLoad = true;
 
     public OptimizeSystemPage()
     {
         InitializeComponent();
         LogHelper.Log("Initializing OptimizeSystemPage");
         Loaded += (sender, e) => InitializeToggleSwitches();
-        isInitialSetup = false;
     }
     private void InitializeToggleSwitches()
     {
@@ -36,6 +35,7 @@ private void InitializeToggleSwitches()
                 }
             }
         }
+        isInitialLoad = false;
     }
     // Helper method to find all children of a specific type in the visual tree
     private static IEnumerable<T> FindVisualChildren<T>(DependencyObject depObj) where T : DependencyObject
@@ -66,23 +66,32 @@ private static IEnumerable<T> FindVisualChildren<T>(DependencyObject depObj) whe
             }
         }
     }
-    private async void ToggleSwitch_Toggled(object sender, RoutedEventArgs e)
+    private void ToggleSwitch_Toggled(object sender, RoutedEventArgs e)
     {
         try
         {
-            if (!isInitialSetup)
+            var toggleSwitch = (ToggleSwitch)sender;
+            Debug.WriteLine($"ToggleSwitch Tag: {toggleSwitch.Tag}, IsOn: {toggleSwitch.IsOn}");
+            if (toggleSwitch.IsOn)
             {
-                var toggleSwitch = (ToggleSwitch)sender;
-                if (toggleSwitch != null && toggleSwitch.Tag != null)
-                {
-                    Debug.WriteLine($"ToggleSwitch Tag: {toggleSwitch.Tag}, IsOn: {toggleSwitch.IsOn}");
-                    OptimizationOptions.XamlSwitches(toggleSwitch);
-                }
+                ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+            }
+            else
+            {
+                ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+            }
+            if (isInitialLoad)
+            {
+                OptimizationOptions.XamlSwitches(toggleSwitch);
+            }
+            else
+            {
+                OptimizationOptions.XamlSwitches(toggleSwitch, false);
             }
         }
         catch (Exception ex)
         {
-            await LogHelper.ShowErrorMessageAndLog(ex, XamlRoot);
+            LogHelper.ShowErrorMessageAndLog(ex, XamlRoot);
         }
     }
 }
\ No newline at end of file
diff --git a/Views/PrivacyPage.xaml.cs b/Views/PrivacyPage.xaml.cs
index 5826170..3b219a2 100644
--- a/Views/PrivacyPage.xaml.cs
+++ b/Views/PrivacyPage.xaml.cs
@@ -14,14 +14,13 @@ namespace RyTuneX.Views;
 public sealed partial class PrivacyPage : Page
 {
 
-    private readonly bool isInitialSetup = true;
+    private bool isInitialLoad = true;
 
     public PrivacyPage()
     {
         InitializeComponent();
         LogHelper.Log("Initializing OptimizeSystemPage");
         Loaded += (sender, e) => InitializeToggleSwitches();
-        isInitialSetup = false;
     }
     private void InitializeToggleSwitches()
     {
@@ -39,6 +38,7 @@ private void InitializeToggleSwitches()
                 }
             }
         }
+        isInitialLoad = false;
     }
     // Helper method to find all children of a specific type in the visual tree
     private static IEnumerable<T> FindVisualChildren<T>(DependencyObject depObj) where T : DependencyObject
@@ -69,23 +69,32 @@ private static IEnumerable<T> FindVisualChildren<T>(DependencyObject depObj) whe
             }
         }
     }
-    private async void ToggleSwitch_Toggled(object sender, RoutedEventArgs e)
+    private void ToggleSwitch_Toggled(object sender, RoutedEventArgs e)
     {
         try
         {
-            if (!isInitialSetup)
+            var toggleSwitch = (ToggleSwitch)sender;
+            Debug.WriteLine($"ToggleSwitch Tag: {toggleSwitch.Tag}, IsOn: {toggleSwitch.IsOn}");
+            if (toggleSwitch.IsOn)
             {
-                var toggleSwitch = (ToggleSwitch)sender;
-                if (toggleSwitch != null && toggleSwitch.Tag != null)
-                {
-                    Debug.WriteLine($"ToggleSwitch Tag: {toggleSwitch.Tag}, IsOn: {toggleSwitch.IsOn}");
-                    OptimizationOptions.XamlSwitches(toggleSwitch);
-                }
+                ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = true;
+            }
+            else
+            {
+                ApplicationData.Current.LocalSettings.Values[(string)toggleSwitch.Tag] = false;
+            }
+            if (isInitialLoad)
+            {
+                OptimizationOptions.XamlSwitches(toggleSwitch);
+            }
+            else
+            {
+                OptimizationOptions.XamlSwitches(toggleSwitch, false);
             }
         }
         catch (Exception ex)
         {
-            await LogHelper.ShowErrorMessageAndLog(ex, this.XamlRoot);
+            LogHelper.ShowErrorMessageAndLog(ex, XamlRoot);
         }
     }
 }
\ No newline at end of file

From 540ac598463534d0fc20882056921f644569151e Mon Sep 17 00:00:00 2001
From: rayenghanmi <ghanmirayen12@gmail.com>
Date: Sun, 7 Apr 2024 23:46:53 +0100
Subject: [PATCH 4/7] Possible #8 fix

---
 App.xaml.cs                     |   9 +-
 Helpers/OptimizationOptions.cs  |  67 +++++++
 Helpers/RemoveEdge.bat          | 303 ++++++++++++++++++++++++++++++++
 Views/DebloatSystemPage.xaml.cs |  26 ++-
 4 files changed, 394 insertions(+), 11 deletions(-)
 create mode 100644 Helpers/RemoveEdge.bat

diff --git a/App.xaml.cs b/App.xaml.cs
index 37b3015..c57d8a3 100644
--- a/App.xaml.cs
+++ b/App.xaml.cs
@@ -20,6 +20,7 @@
 
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml;
 
 using RyTuneX.Activation;
@@ -100,7 +101,7 @@ public App()
         }).
         Build();
 
-        App.GetService<IAppNotificationService>().Initialize();
+        //App.GetService<IAppNotificationService>().Initialize();
 
     }
 
@@ -113,7 +114,11 @@ protected async override void OnLaunched(LaunchActivatedEventArgs args)
         if (showWelcomeNotification)
         {
             await LogHelper.Log("Showing Welcome Notification");
-            App.GetService<IAppNotificationService>().Show(string.Format("WelcomeNotification".GetLocalized(), AppContext.BaseDirectory));
+            App.MainWindow.DispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
+            {
+                var welcomeMessage = "WelcomeNotice".GetLocalized().Replace("\\n", Environment.NewLine); ;
+                App.MainWindow.ShowMessageDialogAsync(welcomeMessage, "WelcomeNoticeTitle".GetLocalized());
+            });
 
             // Set the flag to indicate that the welcome notification has been shown
             SetWelcomeNotificationShown();
diff --git a/Helpers/OptimizationOptions.cs b/Helpers/OptimizationOptions.cs
index 3af1960..ee7f3b6 100644
--- a/Helpers/OptimizationOptions.cs
+++ b/Helpers/OptimizationOptions.cs
@@ -74,6 +74,73 @@ internal static void StopService(string serviceName)
             }
         }
     }
+
+    /*internal static async Task RemoveEdgeScript(string powerShellScript)
+    {
+        try
+        {
+            // Write the PowerShell script content to a temporary file
+            var tempPowerShellFile = Path.GetTempFileName() + ".ps1";
+            File.WriteAllText(tempPowerShellFile, powerShellScript);
+
+            // Execute the PowerShell script asynchronously
+            // Use Task.Run to start the PowerShell process on a thread pool thread
+            await Task.Run(() =>
+            {
+                Process.Start(new ProcessStartInfo
+                {
+                    FileName = "powershell.exe",
+                    Arguments = $"-ExecutionPolicy Bypass -File \"{tempPowerShellFile}\"",
+                    UseShellExecute = true,
+                    CreateNoWindow = true,
+                    WindowStyle = ProcessWindowStyle.Hidden
+                }).WaitForExit();
+            });
+
+            // Clean up the temporary file
+            File.Delete(tempPowerShellFile);
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine("An error occurred: " + ex.Message);
+        }
+    }*/
+
+    internal static async Task ExecuteBatchFileAsync()
+    {
+        var batchFileName = "RemoveEdge.bat"; // Name of your .bat file
+        var appDirectory = AppDomain.CurrentDomain.BaseDirectory;
+        var batchFilePath = Path.Combine(appDirectory, "Helpers", batchFileName);
+        using Process process = new Process();
+        process.StartInfo.FileName = "cmd.exe";
+        process.StartInfo.Arguments = $"/c \"{batchFilePath}\""; // /c option carries out the command specified by the string and then terminates
+        process.StartInfo.UseShellExecute = false;
+        process.StartInfo.RedirectStandardOutput = true;
+        process.StartInfo.RedirectStandardError = true;
+
+        process.OutputDataReceived += (sender, e) =>
+        {
+            if (!string.IsNullOrEmpty(e.Data))
+            {
+                Console.WriteLine(e.Data);
+            }
+        };
+
+        process.ErrorDataReceived += (sender, e) =>
+        {
+            if (!string.IsNullOrEmpty(e.Data))
+            {
+                Console.WriteLine($"Error: {e.Data}");
+            }
+        };
+
+        process.Start();
+        process.BeginOutputReadLine();
+        process.BeginErrorReadLine();
+
+        await Task.Run(() => process.WaitForExit()); // Wait for the process to exit
+    }
+
     internal static async Task<int> StartInCmd(string command)
     {
         try
diff --git a/Helpers/RemoveEdge.bat b/Helpers/RemoveEdge.bat
new file mode 100644
index 0000000..4865091
--- /dev/null
+++ b/Helpers/RemoveEdge.bat
@@ -0,0 +1,303 @@
+@(set "0=%~f0"^)#) & powershell -nop -c iex([io.file]::ReadAllText($env:0)) & exit /b
+#:: just copy-paste into powershell - it's a standalone hybrid script
+sp 'HKCU:\Volatile Environment' 'Edge_Removal' @'
+
+$also_remove_webview = 1
+## why also remove webview? because it is 2 copies of edge, not a slimmed down CEF, and is driving bloated web apps
+$also_remove_widgets = 1
+## why also remove widgets? because it is a webview glorified ad portal on msn and bing news cathering to stupid people
+$also_remove_xsocial = 1
+## why also remove xsocial? because it starts webview setup every boot - xbox gamebar will still work without the social crap
+
+$host.ui.RawUI.WindowTitle = 'Edge Removal - AveYo, 2023.09.14'
+write-host "Run the script again whenever you need to reinstall and update edge or webview..`n"
+$remove_appx = @("MicrosoftEdge"); $remove_win32 = @("Microsoft Edge","Microsoft Edge Update"); $skip = @() # @("DevTools")
+if ($also_remove_webview -eq 1) {$remove_appx += "Win32WebViewHost"; $remove_win32 += "Microsoft EdgeWebView"}
+if ($also_remove_widgets -eq 1) {$remove_appx += "WebExperience"}
+if ($also_remove_xsocial -eq 1) {$remove_appx += "GamingServices"}
+
+$global:WEBV = $also_remove_webview -eq 1
+$global:IS64 = [Environment]::Is64BitOperatingSystem
+$global:IFEO = 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options'
+$global:EDGE_UID = '{56EB18F8-B008-4CBD-B6D2-8C97FE7E9062}'
+$global:WEBV_UID = '{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}'
+$global:UPDT_UID = '{F3C4FE00-EFD5-403B-9569-398A20F1BA4A}'
+$global:PROGRAMS = ($env:ProgramFiles, ${env:ProgramFiles(x86)})[$IS64]
+$global:SOFTWARE = ('SOFTWARE', 'SOFTWARE\WOW6432Node')[$IS64]
+$global:ALLHIVES = 'HKCU:\SOFTWARE','HKLM:\SOFTWARE','HKCU:\SOFTWARE\Policies','HKLM:\SOFTWARE\Policies'
+if ($IS64) { $global:ALLHIVES += "HKCU:\$SOFTWARE","HKLM:\$SOFTWARE","HKCU:\$SOFTWARE\Policies","HKLM:\$SOFTWARE\Policies"}
+## -------------------------------------------------------------------------------------------------------------------------------
+
+## 1 bonus! enter into powershell console: firefox / edge / webview to install a browser / reinstall edge / webview after removal
+function global:firefox { $url = 'https://download.mozilla.org/?product=firefox-stub'
+  $setup = "$((new-object -ComObject Shell.Application).NameSpace('shell:Downloads').Self.Path)\Firefox Installer.exe"
+  write-host $url; Invoke-WebRequest $url -OutFile $setup; start $setup
+}
+function global:edge { $url = 'https://go.microsoft.com/fwlink/?linkid=2108834&Channel=Stable&language=en'
+  $setup = "$((new-object -ComObject Shell.Application).NameSpace('shell:Downloads').Self.Path)\MicrosoftEdgeSetup.exe"
+  write-host $url; Invoke-WebRequest $url -OutFile $setup; PREPARE_EDGE; start $setup
+}
+function global:webview { $url = 'https://go.microsoft.com/fwlink/p/?LinkId=2124703'
+  $setup = "$((new-object -ComObject Shell.Application).NameSpace('shell:Downloads').Self.Path)\MicrosoftEdgeWebview2Setup.exe"
+  write-host $url; Invoke-WebRequest $url -OutFile $setup; PREPARE_WEBVIEW; start $setup
+}
+function global:xsocial { $url = 'https://dlassets-ssl.xboxlive.com/public/content/XboxInstaller/XboxInstaller.exe'
+  $setup = "$((new-object -ComObject Shell.Application).NameSpace('shell:Downloads').Self.Path)\XboxInstaller.exe"
+  write-host $url; Invoke-WebRequest $url -OutFile $setup; PREPARE_WEBVIEW; start $setup
+}
+
+## helper for set-itemproperty remove-itemproperty new-item remove-item with auto test-path
+function global:sp_test_path { if (test-path $args[0]) {Microsoft.PowerShell.Management\Set-ItemProperty @args} else {
+  Microsoft.PowerShell.Management\New-Item $args[0] -force -ea 0 >''; Microsoft.PowerShell.Management\Set-ItemProperty @args} }
+function global:rp_test_path { if (test-path $args[0]) {Microsoft.PowerShell.Management\Remove-ItemProperty @args} }
+function global:ni_test_path { if (-not (test-path $args[0])) {Microsoft.PowerShell.Management\New-Item @args} }
+function global:ri_test_path { if (test-path $args[0]) {Microsoft.PowerShell.Management\Remove-Item @args} }
+foreach ($f in 'sp','rp','ni','ri') {set-alias -Name $f -Value "${f}_test_path" -Scope Local -Option AllScope -force -ea 0}
+
+## helper for edgeupdate reinstall
+function global:PREPARE_UPDT($cdp='msedgeupdate', $uid=$UPDT_UID) {
+  foreach ($f in 'sp','rp','ni','ri') {set-alias -Name $f -Value "${f}_test_path" -Scope Local -Option AllScope -force -ea 0}
+  foreach ($sw in $ALLHIVES) { 
+    rp "$sw\Microsoft\EdgeUpdate" 'DoNotUpdateToEdgeWithChromium' -force -ea 0
+    rp "$sw\Microsoft\EdgeUpdate" 'UpdaterExperimentationAndConfigurationServiceControl' -force -ea 0
+    rp "$sw\Microsoft\EdgeUpdate" "InstallDefault" -force -ea 0
+    rp "$sw\Microsoft\EdgeUpdate" "Install${uid}" -force -ea 0
+    rp "$sw\Microsoft\EdgeUpdate" "EdgePreview${uid}" -force -ea 0
+    rp "$sw\Microsoft\EdgeUpdate" "Update${uid}" -force -ea 0
+    rp "$sw\Microsoft\EdgeUpdate\ClientState\*" 'experiment_control_labels' -force -ea 0 
+    ri "$sw\Microsoft\EdgeUpdate\Clients\${uid}\Commands" -recurse -force -ea 0
+    rp "$sw\Microsoft\EdgeUpdateDev\CdpNames" "$cdp-*" -force -ea 0
+    sp "$sw\Microsoft\EdgeUpdateDev" 'CanContinueWithMissingUpdate' 1 -type Dword -force
+    sp "$sw\Microsoft\EdgeUpdateDev" 'AllowUninstall' 1 -type Dword -force
+  }
+}
+## helper for edge reinstall - remove bundled OpenWebSearch redirector and edgeupdate policies
+function global:PREPARE_EDGE {
+  foreach ($f in 'sp','rp','ni','ri') {set-alias -Name $f -Value "${f}_test_path" -Scope Local -Option AllScope -force -ea 0}
+  PREPARE_UPDT 'msedge' $EDGE_UID; PREPARE_UPDT 'msedgeupdate' $UPDT_UID 
+  $MSEDGE = "$PROGRAMS\Microsoft\Edge\Application\msedge.exe"
+  ri "$IFEO\msedge.exe" -recurse -force; ri "$IFEO\ie_to_edge_stub.exe" -recurse -force
+  ri 'Registry::HKEY_Users\S-1-5-21*\Software\Classes\microsoft-edge' -recurse -force
+  sp 'HKLM:\SOFTWARE\Classes\microsoft-edge\shell\open\command' '(Default)' "`"$MSEDGE`" --single-argument %%1" -force
+  ri 'Registry::HKEY_Users\S-1-5-21*\Software\Classes\MSEdgeHTM' -recurse -force
+  sp 'HKLM:\SOFTWARE\Classes\MSEdgeHTM\shell\open\command' '(Default)' "`"$MSEDGE`" --single-argument %%1" -force
+}
+## helper for webview reinstall - restore webexperience (widgets) if available
+function global:PREPARE_WEBVIEW {
+  PREPARE_UPDT 'msedgewebview' $WEBV_UID; PREPARE_UPDT 'msedgeupdate' $UPDT_UID
+  $cfg = @{Register=$true; ForceApplicationShutdown=$true; ForceUpdateFromAnyVersion=$true; DisableDevelopmentMode=$true} 
+  dir "$env:SystemRoot\SystemApps\Microsoft.Win32WebViewHost*\AppxManifest.xml" -rec -ea 0 | Add-AppxPackage @cfg
+  dir "$env:ProgramFiles\WindowsApps\MicrosoftWindows.Client.WebExperience*\AppxManifest.xml" -rec -ea 0 | Add-AppxPackage @cfg
+  kill -name explorer -ea 0; if ((get-process -name 'explorer' -ea 0) -eq $null) {start explorer}
+}
+## -------------------------------------------------------------------------------------------------------------------------------
+
+## 2 enable admin privileges
+$D1=[uri].module.gettype('System.Diagnostics.Process')."GetM`ethods"(42) |where {$_.Name -eq 'SetPrivilege'} #`:no-ev-warn
+'SeSecurityPrivilege','SeTakeOwnershipPrivilege','SeBackupPrivilege','SeRestorePrivilege'|foreach {$D1.Invoke($null, @("$_",2))}
+## -------------------------------------------------------------------------------------------------------------------------------
+
+## 3 shut down edge & webview clone stuff
+cd $env:systemdrive; taskkill /im explorer.exe /f 2>&1 >''
+$shut = 'explorer','Widgets','widgetservice','msedgewebview2','MicrosoftEdge*','chredge','msedge','edge'
+$shut,'msteams','msfamily','WebViewHost','Clipchamp' |foreach {kill -name $_ -force -ea 0}
+
+## clear win32 uninstall block
+foreach ($name in $remove_win32) { foreach ($sw in $ALLHIVES) {
+  $key = "$sw\Microsoft\Windows\CurrentVersion\Uninstall\$name"; if (-not (test-path $key)) {continue}
+  foreach ($val in 'NoRemove','NoModify','NoRepair') {rp $key $val -force -ea 0}
+  foreach ($val in 'ForceRemove','Delete') {sp $key $val 1 -type Dword -force}
+}}
+PREPARE_EDGE
+
+## find all Edge setup.exe and gather BHO paths for OpenWebSearch / MSEdgeRedirect usage
+$edges = @(); $bho = @(); $edgeupdates = @(); 'LocalApplicationData','ProgramFilesX86','ProgramFiles' |foreach {
+  $folder = [Environment]::GetFolderPath($_); $bho += dir "$folder\Microsoft\Edge*\ie_to_edge_stub.exe" -rec -ea 0
+  if ($WEBV) {$edges += dir "$folder\Microsoft\Edge*\setup.exe" -rec -ea 0 |where {$_ -like '*EdgeWebView*'}}
+  $edges += dir "$folder\Microsoft\Edge*\setup.exe" -rec -ea 0 |where {$_ -notlike '*EdgeWebView*'}
+  $edgeupdates += dir "$folder\Microsoft\EdgeUpdate\*.*.*.*\MicrosoftEdgeUpdate.exe" -rec -ea 0
+}
+
+## export OpenWebSearch innovative redirector - used by MSEdgeRedirect as well
+$DIR = "$env:SystemDrive\Scripts"; mkdir $DIR -ea 0 >''
+foreach ($b in $bho) { if (test-path $b) { try {copy $b "$DIR\ie_to_edge_stub.exe" -force -ea 0} catch{} } }
+## -------------------------------------------------------------------------------------------------------------------------------
+
+## 4 remove found *Edge* appx packages with unblock tricks
+$provisioned = get-appxprovisionedpackage -online; $appxpackage = get-appxpackage -allusers; $eol = @()
+$store = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\AppxAllUserStore'
+$users = @('S-1-5-18'); if (test-path $store) {$users += $((dir $store -ea 0 |where {$_ -like '*S-1-5-21*'}).PSChildName)}
+foreach ($choice in $remove_appx) { if ('' -eq $choice.Trim()) {continue}
+  foreach ($appx in $($provisioned |where {$_.PackageName -like "*$choice*"})) {
+    $next = !1; foreach ($no in $skip) {if ($appx.PackageName -like "*$no*") {$next = !0}} ; if ($next) {continue}
+    $PackageName = $appx.PackageName; $PackageFamilyName = ($appxpackage |where {$_.Name -eq $appx.DisplayName}).PackageFamilyName 
+    ni "$store\Deprovisioned\$PackageFamilyName" -force >''; $PackageFamilyName  
+    foreach ($sid in $users) {ni "$store\EndOfLife\$sid\$PackageName" -force >''} ; $eol += $PackageName
+    dism /online /set-nonremovableapppolicy /packagefamily:$PackageFamilyName /nonremovable:0 >''
+    remove-appxprovisionedpackage -packagename $PackageName -online -allusers >''
+  }
+  foreach ($appx in $($appxpackage |where {$_.PackageFullName -like "*$choice*"})) {
+    $next = !1; foreach ($no in $skip) {if ($appx.PackageFullName -like "*$no*") {$next = !0}} ; if ($next) {continue}
+    $PackageFullName = $appx.PackageFullName; 
+    ni "$store\Deprovisioned\$appx.PackageFamilyName" -force >''; $PackageFullName
+    foreach ($sid in $users) {ni "$store\EndOfLife\$sid\$PackageFullName" -force >''} ; $eol += $PackageFullName
+    dism /online /set-nonremovableapppolicy /packagefamily:$PackageFamilyName /nonremovable:0 >''
+    remove-appxpackage -package $PackageFullName -allusers >''
+  }
+}
+## -------------------------------------------------------------------------------------------------------------------------------
+
+## 5 run found *Edge* setup.exe with uninstall args and wait in-between
+foreach ($setup in $edges) { if (-not (test-path $setup)) {continue}
+  if ($setup -like '*EdgeWebView*') {$target = "--msedgewebview"} else {$target = "--msedge"}
+  $sulevel = ('--system-level','--user-level')[$setup -like '*\AppData\Local\*']
+  $removal = "--uninstall $target $sulevel --verbose-logging --force-uninstall"
+  try {write-host $setup $removal; start -wait $setup -args $removal} catch {}
+  do {sleep 3} while ((get-process -name 'setup','MicrosoftEdge*' -ea 0).Path -like '*\Microsoft\Edge*')
+}
+## -------------------------------------------------------------------------------------------------------------------------------
+
+## msi installers cleanup
+gp 'HKLM:\SOFTWARE\Classes\Installer\Products\*' 'ProductName' |where {$_.ProductName -like '*Microsoft Edge*'} |foreach { 
+  $prod = ($_.PSChildName -split '(.{8})(.{4})(.{4})(.{4})' -join '-').trim('-')
+  $sort = 7,6,5,4,3,2,1,0,8,12,11,10,9,13,17,16,15,14,18,20,19,22,21,23,25,24,27,26,29,28,31,30,33,32,35,34
+  $code = '{' + -join ($sort |foreach {$prod[$_]}) + '}'; start -wait msiexec.exe -args "/X$code /qn" 2>''
+  ri $_.PSPath -recurse -force
+  foreach ($sw in $ALLHIVES) {ri "$sw\Microsoft\Windows\CurrentVersion\Uninstall\$code" -recurse -force}  
+} 
+
+## 6 edgeupdate graceful cleanup
+if ($WEBV) {
+  foreach ($sw in $ALLHIVES) {ri "$sw\Microsoft\EdgeUpdate" -recurse -force}  
+  foreach ($UPDT in $edgeupdates) { 
+    if (test-path $UPDT) {write-host "$UPDT /unregsvc";  start -wait $UPDT -args '/unregsvc'}
+    do {sleep 3} while ((get-process -name 'setup','MicrosoftEdge*' -ea 0).Path -like '*\Microsoft\Edge*')
+    if (test-path $UPDT) {write-host "$UPDT /uninstall"; start -wait $UPDT -args '/uninstall'}
+    do {sleep 3} while ((get-process -name 'setup','MicrosoftEdge*' -ea 0).Path -like '*\Microsoft\Edge*')
+  }
+  Unregister-ScheduledTask -TaskName MicrosoftEdgeUpdate* -Confirm:$false -ea 0; ri "$PROGRAMS\Microsoft\Temp" -recurse -force
+} 
+$appdata = $([Environment]::GetFolderPath('ApplicationData'))
+ri "$appdata\Microsoft\Internet Explorer\Quick Launch\User Pinned\TaskBar\Tombstones\Microsoft Edge.lnk" -force
+ri "$appdata\Microsoft\Internet Explorer\Quick Launch\Microsoft Edge.lnk" -force
+
+## undo eol unblock trick to prevent latest cumulative update (LCU) failing 
+foreach ($sid in $users) { foreach ($PackageName in $eol) {ri "$store\EndOfLife\$sid\$PackageName" -force >''} }
+
+## .i. "Update policies are configured but will be ignored because this device isn't domain joined" .i.
+$uids = @($EDGE_UID); $cdps = @('msedge'); if ($WEBV) {$uids += $WEBV_UID; $cdps += 'msedgewebview'} 
+foreach ($sw in $ALLHIVES) {
+  sp "$sw\Microsoft\EdgeUpdate" 'DoNotUpdateToEdgeWithChromium' 1 -type Dword -force
+  sp "$sw\Microsoft\EdgeUpdate" 'UpdaterExperimentationAndConfigurationServiceControl' 0 -type Dword -force
+  sp "$sw\Microsoft\EdgeUpdate" 'InstallDefault' 0 -type Dword -force
+  foreach ($uid in $uids) {  
+    sp "$sw\Microsoft\EdgeUpdate" "Install${uid}" 0 -type Dword -force
+    sp "$sw\Microsoft\EdgeUpdate" "EdgePreview${uid}" 0 -type Dword -force
+    sp "$sw\Microsoft\EdgeUpdate" "Update${uid}" 2 -type Dword -force
+    foreach ($trigger in 'on-os-upgrade','on-logon','on-logon-autolaunch','on-logon-startup-boost') {
+      sp "$sw\Microsoft\EdgeUpdate\Clients\${uid}\Commands\$trigger" 'AutoRunOnLogon' 0 -type Dword -force
+      sp "$sw\Microsoft\EdgeUpdate\Clients\${uid}\Commands\$trigger" 'AutoRunOnOSUpgrade' 0 -type Dword -force
+      sp "$sw\Microsoft\EdgeUpdate\Clients\${uid}\Commands\$trigger" 'Enabled' 0 -type Dword -force
+    }
+  }
+  sp "$sw\Microsoft\MicrosoftEdge\Main" 'AllowPrelaunch' 0 -type Dword -force
+  sp "$sw\Microsoft\MicrosoftEdge\TabPreloader" 'AllowTabPreloading' 0 -type Dword -force
+  ## microsoft has no shame, so we are gonna insist opting-out of unsolicited reinstalls with windows updates
+  foreach ($cdp in $cdps) { foreach ($arch in 'x64','x86') { foreach ($zdp in '','-zdp') {
+    sp "$sw\Microsoft\EdgeUpdateDev\CdpNames" "$cdp-stable-win-$arch$zdp" "$cdp-stable-win-arm64$zdp" -force
+  }}}
+}
+## -------------------------------------------------------------------------------------------------------------------------------
+
+## 7 add bundled OpenWebSearch script to redirect microsoft-edge: anti-competitive links to the default browser
+$MSEP = ($env:ProgramFiles,${env:ProgramFiles(x86)})[[Environment]::Is64BitOperatingSystem] + '\Microsoft\Edge\Application'
+$IFEO = 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options'
+$MIN = ('--headless','--width 1 --height 1')[([environment]::OSVersion.Version.Build) -gt 25179]
+$CMD = "$env:systemroot\system32\conhost.exe $MIN" # AveYo: minimize prompt - see Terminal issue #13914
+ni "HKLM:\SOFTWARE\Classes\microsoft-edge\shell\open\command" -force >''
+sp "HKLM:\SOFTWARE\Classes\microsoft-edge" '(Default)' 'URL:microsoft-edge' -force
+sp "HKLM:\SOFTWARE\Classes\microsoft-edge" 'URL Protocol' '' -force
+sp "HKLM:\SOFTWARE\Classes\microsoft-edge" 'NoOpenWith' '' -force
+sp "HKLM:\SOFTWARE\Classes\microsoft-edge\shell\open\command" '(Default)' "`"$DIR\ie_to_edge_stub.exe`" %1" -force
+ni "HKLM:\SOFTWARE\Classes\MSEdgeHTM\shell\open\command" -force >''
+sp "HKLM:\SOFTWARE\Classes\MSEdgeHTM" 'NoOpenWith' '' -force
+sp "HKLM:\SOFTWARE\Classes\MSEdgeHTM\shell\open\command" '(Default)' "`"$DIR\ie_to_edge_stub.exe`" %1" -force
+ni "$IFEO\ie_to_edge_stub.exe\0" -force >''
+sp "$IFEO\ie_to_edge_stub.exe" 'UseFilter' 1 -type Dword -force
+sp "$IFEO\ie_to_edge_stub.exe\0" 'FilterFullPath' "$DIR\ie_to_edge_stub.exe" -force
+sp "$IFEO\ie_to_edge_stub.exe\0" 'Debugger' "$CMD $DIR\OpenWebSearch.cmd" -force
+ni "$IFEO\msedge.exe\0" -force >''
+sp "$IFEO\msedge.exe" 'UseFilter' 1 -type Dword -force
+sp "$IFEO\msedge.exe\0" 'FilterFullPath' "$MSEP\msedge.exe" -force
+sp "$IFEO\msedge.exe\0" 'Debugger' "$CMD $DIR\OpenWebSearch.cmd" -force
+## new: automatically re-create the needed hardlink if edge is reinstalled
+$ta = New-ScheduledTaskAction -Execute '%Temp%\OpenWebSearchRepair.cmd'
+$tt = New-ScheduledTaskTrigger -Once -At 00:00; $ts = New-ScheduledTaskSettingsSet -AllowStartIfOnBatteries
+Register-ScheduledTask -TaskName 'OpenWebSearchRepair' -Action $ta -Trigger $tt -Settings $ts -RunLevel Highest -Force >''
+
+$OpenWebSearch = @$
+@title OpenWebSearch Redux & echo off & set ?= open start menu web search, widgets links or help in your chosen browser - by AveYo
+for /f %%E in ('"prompt $E$S& for %%e in (1) do rem"') do echo;%%E[2t 2>nul & rem AveYo: minimize prompt
+call :reg_var "HKCU\SOFTWARE\Microsoft\Windows\Shell\Associations\UrlAssociations\https\UserChoice" ProgID ProgID
+if /i "%ProgID%" equ "MSEdgeHTM" echo;Default browser is set to Edge! Change it or remove OpenWebSearch script. & pause & exit /b
+call :reg_var "HKCR\%ProgID%\shell\open\command" "" Browser
+set Choice=& for %%. in (%Browser%) do if not defined Choice set "Choice=%%~."
+call :reg_var "HKCR\MSEdgeMHT\shell\open\command" "" FallBack
+set "Edge=" & for %%. in (%FallBack%) do if not defined Edge set "Edge=%%~."
+set "URI=" & set "URL=" & set "NOOP=" & set "PassTrough=%Edge:msedge=edge%"
+set "CLI=%CMDCMDLINE:"=``% "
+if defined CLI set "CLI=%CLI:*ie_to_edge_stub.exe`` =%"
+if defined CLI set "CLI=%CLI:*ie_to_edge_stub.exe =%"
+if defined CLI set "CLI=%CLI:*msedge.exe`` =%"
+if defined CLI set "CLI=%CLI:*msedge.exe =%"
+set "FIX=%CLI:~-1%"
+if defined CLI if "%FIX%"==" " set "CLI=%CLI:~0,-1%"
+if defined CLI set "RED=%CLI:microsoft-edge=%"
+if defined CLI set "URL=%CLI:http=%"
+if defined CLI set "ARG=%CLI:``="%"
+if "%CLI%" equ "%RED%" (set NOOP=1) else if "%CLI%" equ "%URL%" (set NOOP=1)
+if defined NOOP if not exist "%PassTrough%" echo;@mklink /h "%PassTrough%" "%Edge%" >"%Temp%\OpenWebSearchRepair.cmd"
+if defined NOOP if not exist "%PassTrough%" schtasks /run /tn OpenWebSearchRepair 2>nul >nul
+if defined NOOP if not exist "%PassTrough%" timeout /t 3 >nul
+if defined NOOP if exist "%PassTrough%" start "" "%PassTrough%" %ARG%
+if defined NOOP exit /b
+set "URL=%CLI:*microsoft-edge=%"
+set "URL=http%URL:*http=%"
+set "FIX=%URL:~-2%"
+if defined URL if "%FIX%"=="``" set "URL=%URL:~0,-2%"
+call :dec_url
+start "" "%Choice%" "%URL%"
+exit
+
+:reg_var [USAGE] call :reg_var "HKCU\Volatile Environment" value-or-"" variable [extra options]
+set {var}=& set {reg}=reg query "%~1" /v %2 /z /se "," /f /e& if %2=="" set {reg}=reg query "%~1" /ve /z /se "," /f /e
+for /f "skip=2 tokens=* delims=" %%V in ('%{reg}% %4 %5 %6 %7 %8 %9 2^>nul') do if not defined {var} set "{var}=%%V"
+if not defined {var} (set {reg}=& set "%~3="& exit /b) else if %2=="" set "{var}=%{var}:*)    =%"& rem AveYo: v3
+if not defined {var} (set {reg}=& set "%~3="& exit /b) else set {reg}=& set "%~3=%{var}:*)    =%"& set {var}=& exit /b
+
+:dec_url brute url percent decoding by AveYo
+set ".=%URL:!=}%"&setlocal enabledelayedexpansion& rem brute url percent decoding
+set ".=!.:%%={!" &set ".=!.:{3A=:!" &set ".=!.:{2F=/!" &set ".=!.:{3F=?!" &set ".=!.:{23=#!" &set ".=!.:{5B=[!" &set ".=!.:{5D=]!"
+set ".=!.:{40=@!"&set ".=!.:{21=}!" &set ".=!.:{24=$!" &set ".=!.:{26=&!" &set ".=!.:{27='!" &set ".=!.:{28=(!" &set ".=!.:{29=)!"
+set ".=!.:{2A=*!"&set ".=!.:{2B=+!" &set ".=!.:{2C=,!" &set ".=!.:{3B=;!" &set ".=!.:{3D==!" &set ".=!.:{25=%%!"&set ".=!.:{20= !"
+set ".=!.:{=%%!" &rem set ",=!.:%%=!" & if "!,!" neq "!.!" endlocal& set "URL=%.:}=!%" & call :dec_url
+endlocal& set "URL=%.:}=!%" & exit /b
+rem done
+
+$@
+[io.file]::WriteAllText("$DIR\OpenWebSearch.cmd", $OpenWebSearch)
+## -------------------------------------------------------------------------------------------------------------------------------
+
+## 8 done
+$done = gp 'Registry::HKEY_Users\S-1-5-21*\Volatile*' Edge_Removal -ea 0; if ($done) {rp $done.PSPath Edge_Removal -force -ea 0}
+if ((get-process -name 'explorer' -ea 0) -eq $null) {start explorer}
+
+## bonus enter into powershell console: firefox / edge / webview to install a browser / reinstall edge or webview after removal
+${.} = [char]27; $firefox = "${.}[38;2;255;165;0m firefox"; $reinstall = "${.}[96m edge / webview / xsocial${.}[97m "
+write-host "`n${.}[40;32m EDGE REMOVED! ${.}[97m -GET-ANOTHER-BROWSER? ENTER:$firefox ${.}[97m -REINSTALL? ENTER:$reinstall"
+## -------------------------------------------------------------------------------------------------------------------------------
+
+## 0 ask to run script as admin
+'@.replace("$@","'@").replace("@$","@'") -force -ea 0; $code='gp ''Registry::HKEY_Users\S-1-5-21*\Volatile*'' Edge_Removal -ea 0'
+start powershell -args "-nop -noe -c & {iex(($code)[0].Edge_Removal)}" -verb runas
+#::
\ No newline at end of file
diff --git a/Views/DebloatSystemPage.xaml.cs b/Views/DebloatSystemPage.xaml.cs
index c33b22d..ed24db2 100644
--- a/Views/DebloatSystemPage.xaml.cs
+++ b/Views/DebloatSystemPage.xaml.cs
@@ -21,6 +21,7 @@
 using RyTuneX.Contracts.Services;
 using Json.Schema;
 using Windows.UI.Popups;
+using ColorCode.Compilation.Languages;
 
 namespace RyTuneX.Views;
 
@@ -196,18 +197,25 @@ private async void UninstallSelectedApp_Click(object sender, RoutedEventArgs e)
     }
     private static async Task UninstallApps(string appName)
     {
-        await LogHelper.Log($"Uninstalling: {appName}");
-        using var script = PowerShell.Create();
-        script.AddScript($"Get-AppxPackage -AllUsers | Where-Object {{$_.Name -eq '{appName}'}} | Remove-AppxPackage");
+        if (!appName.Contains("Edge"))
+        {
+            await LogHelper.Log($"Uninstalling: {appName}");
+            using var script = System.Management.Automation.PowerShell.Create();
+            script.AddScript($"Get-AppxPackage -AllUsers | Where-Object {{$_.Name -eq '{appName}'}} | Remove-AppxPackage");
 
-        var result = await script.InvokeAsync();
+            var result = await script.InvokeAsync();
 
-        if (script.HadErrors)
-        {
-            var errorMessage = string.Join(Environment.NewLine, script.Streams.Error.Select(err => err.ToString()));
-            await LogHelper.LogError(errorMessage);
-            throw new Exception(errorMessage);
+            if (script.HadErrors)
+            {
+                var errorMessage = string.Join(Environment.NewLine, script.Streams.Error.Select(err => err.ToString()));
+                await LogHelper.LogError(errorMessage);
+                throw new Exception(errorMessage);
+            }
         }
+        else
+        {
+            await OptimizationOptions.ExecuteBatchFileAsync();
+        }   
     }
 
     private void ShowAll_Checked(object sender, RoutedEventArgs e)

From 286b58d9497c240154c82e7ecfd4aa7cd88cd5d4 Mon Sep 17 00:00:00 2001
From: rayenghanmi <ghanmirayen12@gmail.com>
Date: Wed, 10 Apr 2024 06:52:45 +0100
Subject: [PATCH 5/7] Edge Removal

---
 .../RemoveEdge.bat => Assets/RemoveEdge.ps1   |  77 +------------
 CHANGELOG.md                                  |   7 +-
 Helpers/OptimizationOptions.cs                | 102 ++++++++----------
 Package.appxmanifest                          |   2 +-
 RyTuneX.csproj                                |  38 +++----
 Services/PageService.cs                       |   7 +-
 Views/DebloatSystemPage.xaml.cs               |  52 ++++-----
 Views/FeaturesPage.xaml.cs                    |   3 -
 Views/PrivacyPage.xaml.cs                     |   3 -
 app.manifest                                  |   7 +-
 10 files changed, 105 insertions(+), 193 deletions(-)
 rename Helpers/RemoveEdge.bat => Assets/RemoveEdge.ps1 (75%)

diff --git a/Helpers/RemoveEdge.bat b/Assets/RemoveEdge.ps1
similarity index 75%
rename from Helpers/RemoveEdge.bat
rename to Assets/RemoveEdge.ps1
index 4865091..0a69681 100644
--- a/Helpers/RemoveEdge.bat
+++ b/Assets/RemoveEdge.ps1
@@ -1,7 +1,3 @@
-@(set "0=%~f0"^)#) & powershell -nop -c iex([io.file]::ReadAllText($env:0)) & exit /b
-#:: just copy-paste into powershell - it's a standalone hybrid script
-sp 'HKCU:\Volatile Environment' 'Edge_Removal' @'
-
 $also_remove_webview = 1
 ## why also remove webview? because it is 2 copies of edge, not a slimmed down CEF, and is driving bloated web apps
 $also_remove_widgets = 1
@@ -9,7 +5,6 @@ $also_remove_widgets = 1
 $also_remove_xsocial = 1
 ## why also remove xsocial? because it starts webview setup every boot - xbox gamebar will still work without the social crap
 
-$host.ui.RawUI.WindowTitle = 'Edge Removal - AveYo, 2023.09.14'
 write-host "Run the script again whenever you need to reinstall and update edge or webview..`n"
 $remove_appx = @("MicrosoftEdge"); $remove_win32 = @("Microsoft Edge","Microsoft Edge Update"); $skip = @() # @("DevTools")
 if ($also_remove_webview -eq 1) {$remove_appx += "Win32WebViewHost"; $remove_win32 += "Microsoft EdgeWebView"}
@@ -28,24 +23,6 @@ $global:ALLHIVES = 'HKCU:\SOFTWARE','HKLM:\SOFTWARE','HKCU:\SOFTWARE\Policies','
 if ($IS64) { $global:ALLHIVES += "HKCU:\$SOFTWARE","HKLM:\$SOFTWARE","HKCU:\$SOFTWARE\Policies","HKLM:\$SOFTWARE\Policies"}
 ## -------------------------------------------------------------------------------------------------------------------------------
 
-## 1 bonus! enter into powershell console: firefox / edge / webview to install a browser / reinstall edge / webview after removal
-function global:firefox { $url = 'https://download.mozilla.org/?product=firefox-stub'
-  $setup = "$((new-object -ComObject Shell.Application).NameSpace('shell:Downloads').Self.Path)\Firefox Installer.exe"
-  write-host $url; Invoke-WebRequest $url -OutFile $setup; start $setup
-}
-function global:edge { $url = 'https://go.microsoft.com/fwlink/?linkid=2108834&Channel=Stable&language=en'
-  $setup = "$((new-object -ComObject Shell.Application).NameSpace('shell:Downloads').Self.Path)\MicrosoftEdgeSetup.exe"
-  write-host $url; Invoke-WebRequest $url -OutFile $setup; PREPARE_EDGE; start $setup
-}
-function global:webview { $url = 'https://go.microsoft.com/fwlink/p/?LinkId=2124703'
-  $setup = "$((new-object -ComObject Shell.Application).NameSpace('shell:Downloads').Self.Path)\MicrosoftEdgeWebview2Setup.exe"
-  write-host $url; Invoke-WebRequest $url -OutFile $setup; PREPARE_WEBVIEW; start $setup
-}
-function global:xsocial { $url = 'https://dlassets-ssl.xboxlive.com/public/content/XboxInstaller/XboxInstaller.exe'
-  $setup = "$((new-object -ComObject Shell.Application).NameSpace('shell:Downloads').Self.Path)\XboxInstaller.exe"
-  write-host $url; Invoke-WebRequest $url -OutFile $setup; PREPARE_WEBVIEW; start $setup
-}
-
 ## helper for set-itemproperty remove-itemproperty new-item remove-item with auto test-path
 function global:sp_test_path { if (test-path $args[0]) {Microsoft.PowerShell.Management\Set-ItemProperty @args} else {
   Microsoft.PowerShell.Management\New-Item $args[0] -force -ea 0 >''; Microsoft.PowerShell.Management\Set-ItemProperty @args} }
@@ -54,44 +31,6 @@ function global:ni_test_path { if (-not (test-path $args[0])) {Microsoft.PowerSh
 function global:ri_test_path { if (test-path $args[0]) {Microsoft.PowerShell.Management\Remove-Item @args} }
 foreach ($f in 'sp','rp','ni','ri') {set-alias -Name $f -Value "${f}_test_path" -Scope Local -Option AllScope -force -ea 0}
 
-## helper for edgeupdate reinstall
-function global:PREPARE_UPDT($cdp='msedgeupdate', $uid=$UPDT_UID) {
-  foreach ($f in 'sp','rp','ni','ri') {set-alias -Name $f -Value "${f}_test_path" -Scope Local -Option AllScope -force -ea 0}
-  foreach ($sw in $ALLHIVES) { 
-    rp "$sw\Microsoft\EdgeUpdate" 'DoNotUpdateToEdgeWithChromium' -force -ea 0
-    rp "$sw\Microsoft\EdgeUpdate" 'UpdaterExperimentationAndConfigurationServiceControl' -force -ea 0
-    rp "$sw\Microsoft\EdgeUpdate" "InstallDefault" -force -ea 0
-    rp "$sw\Microsoft\EdgeUpdate" "Install${uid}" -force -ea 0
-    rp "$sw\Microsoft\EdgeUpdate" "EdgePreview${uid}" -force -ea 0
-    rp "$sw\Microsoft\EdgeUpdate" "Update${uid}" -force -ea 0
-    rp "$sw\Microsoft\EdgeUpdate\ClientState\*" 'experiment_control_labels' -force -ea 0 
-    ri "$sw\Microsoft\EdgeUpdate\Clients\${uid}\Commands" -recurse -force -ea 0
-    rp "$sw\Microsoft\EdgeUpdateDev\CdpNames" "$cdp-*" -force -ea 0
-    sp "$sw\Microsoft\EdgeUpdateDev" 'CanContinueWithMissingUpdate' 1 -type Dword -force
-    sp "$sw\Microsoft\EdgeUpdateDev" 'AllowUninstall' 1 -type Dword -force
-  }
-}
-## helper for edge reinstall - remove bundled OpenWebSearch redirector and edgeupdate policies
-function global:PREPARE_EDGE {
-  foreach ($f in 'sp','rp','ni','ri') {set-alias -Name $f -Value "${f}_test_path" -Scope Local -Option AllScope -force -ea 0}
-  PREPARE_UPDT 'msedge' $EDGE_UID; PREPARE_UPDT 'msedgeupdate' $UPDT_UID 
-  $MSEDGE = "$PROGRAMS\Microsoft\Edge\Application\msedge.exe"
-  ri "$IFEO\msedge.exe" -recurse -force; ri "$IFEO\ie_to_edge_stub.exe" -recurse -force
-  ri 'Registry::HKEY_Users\S-1-5-21*\Software\Classes\microsoft-edge' -recurse -force
-  sp 'HKLM:\SOFTWARE\Classes\microsoft-edge\shell\open\command' '(Default)' "`"$MSEDGE`" --single-argument %%1" -force
-  ri 'Registry::HKEY_Users\S-1-5-21*\Software\Classes\MSEdgeHTM' -recurse -force
-  sp 'HKLM:\SOFTWARE\Classes\MSEdgeHTM\shell\open\command' '(Default)' "`"$MSEDGE`" --single-argument %%1" -force
-}
-## helper for webview reinstall - restore webexperience (widgets) if available
-function global:PREPARE_WEBVIEW {
-  PREPARE_UPDT 'msedgewebview' $WEBV_UID; PREPARE_UPDT 'msedgeupdate' $UPDT_UID
-  $cfg = @{Register=$true; ForceApplicationShutdown=$true; ForceUpdateFromAnyVersion=$true; DisableDevelopmentMode=$true} 
-  dir "$env:SystemRoot\SystemApps\Microsoft.Win32WebViewHost*\AppxManifest.xml" -rec -ea 0 | Add-AppxPackage @cfg
-  dir "$env:ProgramFiles\WindowsApps\MicrosoftWindows.Client.WebExperience*\AppxManifest.xml" -rec -ea 0 | Add-AppxPackage @cfg
-  kill -name explorer -ea 0; if ((get-process -name 'explorer' -ea 0) -eq $null) {start explorer}
-}
-## -------------------------------------------------------------------------------------------------------------------------------
-
 ## 2 enable admin privileges
 $D1=[uri].module.gettype('System.Diagnostics.Process')."GetM`ethods"(42) |where {$_.Name -eq 'SetPrivilege'} #`:no-ev-warn
 'SeSecurityPrivilege','SeTakeOwnershipPrivilege','SeBackupPrivilege','SeRestorePrivilege'|foreach {$D1.Invoke($null, @("$_",2))}
@@ -235,7 +174,7 @@ $ta = New-ScheduledTaskAction -Execute '%Temp%\OpenWebSearchRepair.cmd'
 $tt = New-ScheduledTaskTrigger -Once -At 00:00; $ts = New-ScheduledTaskSettingsSet -AllowStartIfOnBatteries
 Register-ScheduledTask -TaskName 'OpenWebSearchRepair' -Action $ta -Trigger $tt -Settings $ts -RunLevel Highest -Force >''
 
-$OpenWebSearch = @$
+$OpenWebSearch = @'
 @title OpenWebSearch Redux & echo off & set ?= open start menu web search, widgets links or help in your chosen browser - by AveYo
 for /f %%E in ('"prompt $E$S& for %%e in (1) do rem"') do echo;%%E[2t 2>nul & rem AveYo: minimize prompt
 call :reg_var "HKCU\SOFTWARE\Microsoft\Windows\Shell\Associations\UrlAssociations\https\UserChoice" ProgID ProgID
@@ -284,20 +223,10 @@ set ".=!.:{=%%!" &rem set ",=!.:%%=!" & if "!,!" neq "!.!" endlocal& set "URL=%.
 endlocal& set "URL=%.:}=!%" & exit /b
 rem done
 
-$@
+'@
 [io.file]::WriteAllText("$DIR\OpenWebSearch.cmd", $OpenWebSearch)
 ## -------------------------------------------------------------------------------------------------------------------------------
 
 ## 8 done
 $done = gp 'Registry::HKEY_Users\S-1-5-21*\Volatile*' Edge_Removal -ea 0; if ($done) {rp $done.PSPath Edge_Removal -force -ea 0}
-if ((get-process -name 'explorer' -ea 0) -eq $null) {start explorer}
-
-## bonus enter into powershell console: firefox / edge / webview to install a browser / reinstall edge or webview after removal
-${.} = [char]27; $firefox = "${.}[38;2;255;165;0m firefox"; $reinstall = "${.}[96m edge / webview / xsocial${.}[97m "
-write-host "`n${.}[40;32m EDGE REMOVED! ${.}[97m -GET-ANOTHER-BROWSER? ENTER:$firefox ${.}[97m -REINSTALL? ENTER:$reinstall"
-## -------------------------------------------------------------------------------------------------------------------------------
-
-## 0 ask to run script as admin
-'@.replace("$@","'@").replace("@$","@'") -force -ea 0; $code='gp ''Registry::HKEY_Users\S-1-5-21*\Volatile*'' Edge_Removal -ea 0'
-start powershell -args "-nop -noe -c & {iex(($code)[0].Edge_Removal)}" -verb runas
-#::
\ No newline at end of file
+if ((get-process -name 'explorer' -ea 0) -eq $null) {start explorer}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b93690..dfcee7d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this branch will be documented in this file.
 
-## 0.8.0 - Work In Progress
+## 1.0.0 - Work In Progress
 
 ### Fixes
 
@@ -10,11 +10,16 @@ All notable changes to this branch will be documented in this file.
 - [x] Some apps that were not removed are showing `Uninstalled successfully`.
 - [x] Some packages may show an error even after being successfully removed.
 - [x] Reapplying tweaks when initializing toggle switches' previous state.
+- [x] Wrong uninstalled apps counting.
 
 ### Added
 
 - Option to remove temporary files in `Debloat` page.
 
+## 0.8.0 - Unreleased
+
+### Version numbering jumped to 1.0.0
+
 ## 0.7.2 - Released
 
 ### Added
diff --git a/Helpers/OptimizationOptions.cs b/Helpers/OptimizationOptions.cs
index ee7f3b6..63aeed2 100644
--- a/Helpers/OptimizationOptions.cs
+++ b/Helpers/OptimizationOptions.cs
@@ -1,10 +1,10 @@
-using System;
-using System.Diagnostics;
+using System.Diagnostics;
 using System.ServiceProcess;
 using System.Collections.ObjectModel;
 using System.Management.Automation;
-using Windows.Storage;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml;
+using System.Reflection;
 
 namespace RyTuneX.Helpers;
 internal class OptimizationOptions
@@ -75,70 +75,62 @@ internal static void StopService(string serviceName)
         }
     }
 
-    /*internal static async Task RemoveEdgeScript(string powerShellScript)
+    internal static async Task ExecuteBatchFileAsync()
     {
         try
         {
-            // Write the PowerShell script content to a temporary file
-            var tempPowerShellFile = Path.GetTempFileName() + ".ps1";
-            File.WriteAllText(tempPowerShellFile, powerShellScript);
+            // Get the path to the PowerShell script file
+            string scriptFilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Assets", "RemoveEdge.ps1");
 
-            // Execute the PowerShell script asynchronously
-            // Use Task.Run to start the PowerShell process on a thread pool thread
-            await Task.Run(() =>
-            {
-                Process.Start(new ProcessStartInfo
-                {
-                    FileName = "powershell.exe",
-                    Arguments = $"-ExecutionPolicy Bypass -File \"{tempPowerShellFile}\"",
-                    UseShellExecute = true,
-                    CreateNoWindow = true,
-                    WindowStyle = ProcessWindowStyle.Hidden
-                }).WaitForExit();
-            });
 
-            // Clean up the temporary file
-            File.Delete(tempPowerShellFile);
-        }
-        catch (Exception ex)
-        {
-            Console.WriteLine("An error occurred: " + ex.Message);
-        }
-    }*/
 
-    internal static async Task ExecuteBatchFileAsync()
-    {
-        var batchFileName = "RemoveEdge.bat"; // Name of your .bat file
-        var appDirectory = AppDomain.CurrentDomain.BaseDirectory;
-        var batchFilePath = Path.Combine(appDirectory, "Helpers", batchFileName);
-        using Process process = new Process();
-        process.StartInfo.FileName = "cmd.exe";
-        process.StartInfo.Arguments = $"/c \"{batchFilePath}\""; // /c option carries out the command specified by the string and then terminates
-        process.StartInfo.UseShellExecute = false;
-        process.StartInfo.RedirectStandardOutput = true;
-        process.StartInfo.RedirectStandardError = true;
-
-        process.OutputDataReceived += (sender, e) =>
-        {
-            if (!string.IsNullOrEmpty(e.Data))
+            if (!File.Exists(scriptFilePath))
             {
-                Console.WriteLine(e.Data);
+                LogHelper.Log($"Script file not found: {scriptFilePath}");
+                return;
             }
-        };
 
-        process.ErrorDataReceived += (sender, e) =>
-        {
-            if (!string.IsNullOrEmpty(e.Data))
+            // Read the content of the script file
+            string scriptContent = File.ReadAllText(scriptFilePath);
+
+            // Create a PowerShell instance
+            using (var PowerShellInstance = PowerShell.Create())
             {
-                Console.WriteLine($"Error: {e.Data}");
-            }
-        };
+                LogHelper.Log("Getting Installed Apps [OptimizationOptions.cs]");
+
+                // Add the script content
+                PowerShellInstance.AddScript(scriptContent)
+                    .AddArgument("-Set-ExecutionPolicy Unrestricted");
 
-        process.Start();
-        process.BeginOutputReadLine();
-        process.BeginErrorReadLine();
+                // Invoke the script asynchronously
+                await Task.Run(() => PowerShellInstance.Invoke());
 
-        await Task.Run(() => process.WaitForExit()); // Wait for the process to exit
+                // Check for errors
+                if (PowerShellInstance.HadErrors)
+                {
+                    foreach (var error in PowerShellInstance.Streams.Error)
+                    {
+                        LogHelper.Log($"PowerShell Error: {error}");
+                    }
+                }
+                else
+                {
+                    LogHelper.Log("PowerShell script executed successfully.");
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            LogHelper.Log($"Error: {ex.Message}");
+        }
+    }
+
+    // Helper method to get the path of the script file
+    private string GetScriptFilePath(string scriptFileName)
+    {
+        string assemblyLocation = Assembly.GetExecutingAssembly().Location;
+        string scriptDirectory = Path.Combine(Path.GetDirectoryName(assemblyLocation), "Helpers");
+        return Path.Combine(scriptDirectory, scriptFileName);
     }
 
     internal static async Task<int> StartInCmd(string command)
diff --git a/Package.appxmanifest b/Package.appxmanifest
index 88c19f3..acb6065 100644
--- a/Package.appxmanifest
+++ b/Package.appxmanifest
@@ -13,7 +13,7 @@
   <Identity
     Name="Rayen.RyTuneX"
     Publisher="CN=Rayen Ghanmi"
-    Version="0.8.0.0" />
+    Version="1.0.0.0" />
     
   <mp:PhoneIdentity PhoneProductId="593c7ba8-f1c9-47cf-a952-7c22b10aac3a" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
     
diff --git a/RyTuneX.csproj b/RyTuneX.csproj
index 89bc736..64dcbd1 100644
--- a/RyTuneX.csproj
+++ b/RyTuneX.csproj
@@ -42,25 +42,25 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-    <PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.0.230907" />
-    <PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.0.240109" />
-    <PackageReference Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231115000" />
-    <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
-    <PackageReference Include="System.Management" Version="8.0.0" />
-    <PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.0" />
-    <PackageReference Include="WinUI3Localizer" Version="2.1.0" />
-    <PackageReference Include="WinUIEx" Version="2.3.3" />
-    <PackageReference Include="Microsoft.PowerShell.Commands.Diagnostics" Version="7.4.0" />
-    <PackageReference Include="Microsoft.PowerShell.Commands.Management" Version="7.4.0" />
-    <PackageReference Include="Microsoft.PowerShell.Commands.Utility" Version="7.4.0" />
-    <PackageReference Include="Microsoft.PowerShell.ConsoleHost" Version="7.4.0" />
-    <PackageReference Include="Microsoft.WSMan.Management" Version="7.4.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.0" />
-    <PackageReference Include="System.Management.Automation" Version="7.4.0" />
+	  <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
+	  <PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.0.230907" />
+	  <PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.0.240109" />
+	  <PackageReference Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" />
+	  <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+	  <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231115000" />
+	  <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
+	  <PackageReference Include="System.Management" Version="8.0.0" />
+	  <PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.0" />
+	  <PackageReference Include="WinUI3Localizer" Version="2.1.0" />
+	  <PackageReference Include="WinUIEx" Version="2.3.3" />
+	  <PackageReference Include="Microsoft.PowerShell.Commands.Diagnostics" Version="7.4.0" />
+	  <PackageReference Include="Microsoft.PowerShell.Commands.Management" Version="7.4.0" />
+	  <PackageReference Include="Microsoft.PowerShell.Commands.Utility" Version="7.4.0" />
+	  <PackageReference Include="Microsoft.PowerShell.ConsoleHost" Version="7.4.0" />
+	  <PackageReference Include="Microsoft.WSMan.Management" Version="7.4.0" />
+	  <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+	  <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.0" />
+	  <PackageReference Include="System.Management.Automation" Version="7.4.0" />
   </ItemGroup>
 
 <ItemGroup>
diff --git a/Services/PageService.cs b/Services/PageService.cs
index c023824..d930727 100644
--- a/Services/PageService.cs
+++ b/Services/PageService.cs
@@ -1,9 +1,4 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-
-using Microsoft.UI.Xaml.Controls;
-
-using RyTuneX.Contracts.Services;
-using RyTuneX.ViewModels;
+using RyTuneX.Contracts.Services;
 using RyTuneX.Views;
 
 namespace RyTuneX.Services;
diff --git a/Views/DebloatSystemPage.xaml.cs b/Views/DebloatSystemPage.xaml.cs
index ed24db2..68e7a7d 100644
--- a/Views/DebloatSystemPage.xaml.cs
+++ b/Views/DebloatSystemPage.xaml.cs
@@ -1,27 +1,11 @@
-using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
-using System.Drawing;
 using System.Management.Automation;
-using System.Reflection;
-using Microsoft.Extensions.Logging;
-using Microsoft.UI;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Media;
 using RyTuneX.Helpers;
-using Windows.ApplicationModel;
-using Windows.UI.Core;
-using Windows.UI.Notifications;
-using CommunityToolkit.WinUI.Behaviors;
-using System.Threading;
-using Windows.ApplicationModel.Core;
 using Windows.Storage;
-using RyTuneX.Contracts.Services;
-using Json.Schema;
-using Windows.UI.Popups;
-using ColorCode.Compilation.Languages;
+
 
 namespace RyTuneX.Views;
 
@@ -61,7 +45,6 @@ private async void LoadInstalledApps(bool uninstallableOnly = true, Cancellation
 
             var installedApps = await Task.Run(() => OptimizationOptions.GetUWPApps(uninstallableOnly), cancellationToken);
             var numberOfInstalledApps = installedApps.Count - 1; // removes Rayen.RyTuneX from total installed apps count
-
             DispatcherQueue.TryEnqueue(() =>
             {
                 // fetching installed apps data & hiding UI elements
@@ -138,6 +121,7 @@ private async void UninstallSelectedApp_Click(object sender, RoutedEventArgs e)
                     }
                 }
             }
+            appTreeView.SelectedItems.Clear();
             // Reload the installed apps after successfull uninstall
             await LogHelper.Log("Reloading Installed Apps Data");
             if (uninstallableOnlyChecked)
@@ -159,7 +143,7 @@ private async void UninstallSelectedApp_Click(object sender, RoutedEventArgs e)
             {
                 NotificationQueue.Show(NotificationContent("Debloat", "UninstallationSuccessSingle".GetLocalized(), InfoBarSeverity.Success, 4000));
             }
-            
+
         }
         // in case of an error
         catch (Exception ex)
@@ -183,7 +167,8 @@ private async void UninstallSelectedApp_Click(object sender, RoutedEventArgs e)
             // Use Process.Start to open the file with the default application
             Process.Start(new ProcessStartInfo(file.Path) { UseShellExecute = true });
 
-            // reload
+            // reload after error
+
             if (uninstallableOnlyChecked)
             {
                 LoadInstalledApps();
@@ -197,7 +182,7 @@ private async void UninstallSelectedApp_Click(object sender, RoutedEventArgs e)
     }
     private static async Task UninstallApps(string appName)
     {
-        if (!appName.Contains("Edge"))
+        if (!appName.Contains("Microsoft.MicrosoftEdge"))
         {
             await LogHelper.Log($"Uninstalling: {appName}");
             using var script = System.Management.Automation.PowerShell.Create();
@@ -214,8 +199,24 @@ private static async Task UninstallApps(string appName)
         }
         else
         {
-            await OptimizationOptions.ExecuteBatchFileAsync();
-        }   
+            var scriptFilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Assets", "RemoveEdge.ps1");
+
+            var scriptContent = File.ReadAllText(scriptFilePath);
+
+            await LogHelper.Log($"Uninstalling: {appName}");
+
+            using var PowerShellInstance = PowerShell.Create();
+            PowerShellInstance.AddScript(scriptContent)
+                .AddArgument("-Set-ExecutionPolicy Unrestricted");
+
+            var result = PowerShellInstance.InvokeAsync();
+            if (PowerShellInstance.HadErrors)
+            {
+                var errorMessage = string.Join(Environment.NewLine, PowerShellInstance.Streams.Error.Select(err => err.ToString()));
+                await LogHelper.LogError(errorMessage);
+                throw new Exception(errorMessage);
+            }
+        }
     }
 
     private void ShowAll_Checked(object sender, RoutedEventArgs e)
@@ -272,10 +273,11 @@ private async void RemoveTempFiles(object sender, RoutedEventArgs e)
             TempButton.Visibility = Visibility.Collapsed;
             TempStatusText.Text = "Deleting Temp Files...";
 
-            var exitCode = await OptimizationOptions.StartInCmd("Del /F /S /Q \"C:\\*.tmp\"");
+            var exitCode1 = await OptimizationOptions.StartInCmd("del /F /S /Q \"C:\\*.tmp\"");
+            var exitCode2 = await OptimizationOptions.StartInCmd("del /q/f/s %TEMP%\\*");
 
             // Check for successful execution
-            if (exitCode == 0)
+            if (exitCode1 == 0 && exitCode2 == 0)
             {
                 TempStatusText.Text = "Temp Files Deleted Successfully!";
                 TempProgress.Visibility = Visibility.Collapsed;
diff --git a/Views/FeaturesPage.xaml.cs b/Views/FeaturesPage.xaml.cs
index 2c7fb10..109a976 100644
--- a/Views/FeaturesPage.xaml.cs
+++ b/Views/FeaturesPage.xaml.cs
@@ -4,9 +4,6 @@
 using Windows.Storage;
 using Microsoft.UI.Xaml.Media;
 using RyTuneX.Helpers;
-using Windows.UI.Popups;
-using Json.Schema;
-using System;
 using CommunityToolkit.WinUI.Controls;
 
 namespace RyTuneX.Views;
diff --git a/Views/PrivacyPage.xaml.cs b/Views/PrivacyPage.xaml.cs
index 3b219a2..9451e7a 100644
--- a/Views/PrivacyPage.xaml.cs
+++ b/Views/PrivacyPage.xaml.cs
@@ -4,9 +4,6 @@
 using Windows.Storage;
 using Microsoft.UI.Xaml.Media;
 using RyTuneX.Helpers;
-using Windows.UI.Popups;
-using Json.Schema;
-using System;
 using CommunityToolkit.WinUI.Controls;
 
 namespace RyTuneX.Views;
diff --git a/app.manifest b/app.manifest
index cd5e510..33da227 100644
--- a/app.manifest
+++ b/app.manifest
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="0.8.0.0" name="RyTuneX.app"/>
-    <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-      <application>
-        <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
-      </application>
-    </compatibility>
+  <assemblyIdentity version="1.0.0.0" name="RyTuneX.app"/>
 	<!--<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
 		<security>
 			<requestedPrivileges>

From a7d90becdc5ed5084f5c112cfd2a9152a6e76e36 Mon Sep 17 00:00:00 2001
From: rayenghanmi <ghanmirayen12@gmail.com>
Date: Thu, 11 Apr 2024 14:47:52 +0100
Subject: [PATCH 6/7] Fix for #8

---
 CHANGELOG.md                    |  9 ++----
 Helpers/OptimizationOptions.cs  | 50 +++++++++++++--------------------
 Package.appxmanifest            |  2 +-
 Views/DebloatSystemPage.xaml    |  2 +-
 Views/DebloatSystemPage.xaml.cs |  6 ++--
 app.manifest                    |  2 +-
 6 files changed, 29 insertions(+), 42 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dfcee7d..1fbe3e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this branch will be documented in this file.
 
-## 1.0.0 - Work In Progress
+## 0.8.0 - Released
 
 ### Fixes
 
@@ -10,16 +10,13 @@ All notable changes to this branch will be documented in this file.
 - [x] Some apps that were not removed are showing `Uninstalled successfully`.
 - [x] Some packages may show an error even after being successfully removed.
 - [x] Reapplying tweaks when initializing toggle switches' previous state.
-- [x] Wrong uninstalled apps counting.
+- [x] Outputting the wrong uninstalled apps count.
+- [x] Issue #8.
 
 ### Added
 
 - Option to remove temporary files in `Debloat` page.
 
-## 0.8.0 - Unreleased
-
-### Version numbering jumped to 1.0.0
-
 ## 0.7.2 - Released
 
 ### Added
diff --git a/Helpers/OptimizationOptions.cs b/Helpers/OptimizationOptions.cs
index 63aeed2..b89f915 100644
--- a/Helpers/OptimizationOptions.cs
+++ b/Helpers/OptimizationOptions.cs
@@ -80,59 +80,49 @@ internal static async Task ExecuteBatchFileAsync()
         try
         {
             // Get the path to the PowerShell script file
-            string scriptFilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Assets", "RemoveEdge.ps1");
+            var scriptFilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Assets", "RemoveEdge.ps1");
 
 
 
             if (!File.Exists(scriptFilePath))
             {
-                LogHelper.Log($"Script file not found: {scriptFilePath}");
+                await LogHelper.Log($"Script file not found: {scriptFilePath}");
                 return;
             }
 
             // Read the content of the script file
-            string scriptContent = File.ReadAllText(scriptFilePath);
+            var scriptContent = File.ReadAllText(scriptFilePath);
 
             // Create a PowerShell instance
-            using (var PowerShellInstance = PowerShell.Create())
-            {
-                LogHelper.Log("Getting Installed Apps [OptimizationOptions.cs]");
+            using var PowerShellInstance = PowerShell.Create();
+            await LogHelper.Log("Getting Installed Apps [OptimizationOptions.cs]");
 
-                // Add the script content
-                PowerShellInstance.AddScript(scriptContent)
-                    .AddArgument("-Set-ExecutionPolicy Unrestricted");
+            // Add the script content
+            PowerShellInstance.AddScript(scriptContent)
+                .AddArgument("-Set-ExecutionPolicy Unrestricted");
 
-                // Invoke the script asynchronously
-                await Task.Run(() => PowerShellInstance.Invoke());
+            // Invoke the script asynchronously
+            await Task.Run(() => PowerShellInstance.Invoke());
 
-                // Check for errors
-                if (PowerShellInstance.HadErrors)
-                {
-                    foreach (var error in PowerShellInstance.Streams.Error)
-                    {
-                        LogHelper.Log($"PowerShell Error: {error}");
-                    }
-                }
-                else
+            // Check for errors
+            if (PowerShellInstance.HadErrors)
+            {
+                foreach (var error in PowerShellInstance.Streams.Error)
                 {
-                    LogHelper.Log("PowerShell script executed successfully.");
+                    await LogHelper.Log($"PowerShell Error: {error}");
                 }
             }
+            else
+            {
+                await LogHelper.Log("PowerShell script executed successfully.");
+            }
         }
         catch (Exception ex)
         {
-            LogHelper.Log($"Error: {ex.Message}");
+            await LogHelper.Log($"Error: {ex.Message}");
         }
     }
 
-    // Helper method to get the path of the script file
-    private string GetScriptFilePath(string scriptFileName)
-    {
-        string assemblyLocation = Assembly.GetExecutingAssembly().Location;
-        string scriptDirectory = Path.Combine(Path.GetDirectoryName(assemblyLocation), "Helpers");
-        return Path.Combine(scriptDirectory, scriptFileName);
-    }
-
     internal static async Task<int> StartInCmd(string command)
     {
         try
diff --git a/Package.appxmanifest b/Package.appxmanifest
index acb6065..88c19f3 100644
--- a/Package.appxmanifest
+++ b/Package.appxmanifest
@@ -13,7 +13,7 @@
   <Identity
     Name="Rayen.RyTuneX"
     Publisher="CN=Rayen Ghanmi"
-    Version="1.0.0.0" />
+    Version="0.8.0.0" />
     
   <mp:PhoneIdentity PhoneProductId="593c7ba8-f1c9-47cf-a952-7c22b10aac3a" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
     
diff --git a/Views/DebloatSystemPage.xaml b/Views/DebloatSystemPage.xaml
index 4c2cb9c..a84cc5c 100644
--- a/Views/DebloatSystemPage.xaml
+++ b/Views/DebloatSystemPage.xaml
@@ -19,7 +19,7 @@
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
         <Border Padding="5" CornerRadius="8" BorderThickness="1" BorderBrush="{ThemeResource LayerOnMicaBaseAltFillColorSecondaryBrush}" Background="{ThemeResource LayerOnMicaBaseAltFillColorDefaultBrush}">
-            <TreeView Grid.Row="0" x:Name="appTreeView" Visibility="Collapsed" ItemsSource="{x:Bind AppList}" SelectionMode="Multiple" DragItemsStarting="appTreeView_DragItemsStarting">
+            <TreeView Grid.Row="0" x:Name="appTreeView" Visibility="Collapsed" ItemsSource="{x:Bind AppList}" SelectionMode="Multiple" DragItemsStarting="AppTreeView_DragItemsStarting">
                 <TreeView.ItemTemplate>
                     <DataTemplate>
                         <StackPanel Orientation="Horizontal">
diff --git a/Views/DebloatSystemPage.xaml.cs b/Views/DebloatSystemPage.xaml.cs
index 68e7a7d..b59a047 100644
--- a/Views/DebloatSystemPage.xaml.cs
+++ b/Views/DebloatSystemPage.xaml.cs
@@ -29,7 +29,7 @@ private void DebloatSystemPage_Unloaded(object sender, RoutedEventArgs e)
         selectedAppsForUninstall.Clear();
         cancellationTokenSource.Cancel();
     }
-    private void appTreeView_DragItemsStarting(TreeView sender, TreeViewDragItemsStartingEventArgs args)
+    private static void AppTreeView_DragItemsStarting(TreeView sender, TreeViewDragItemsStartingEventArgs args)
     {
         args.Cancel = true;
     }
@@ -155,7 +155,7 @@ private async void UninstallSelectedApp_Click(object sender, RoutedEventArgs e)
 
             var uninstallationFailed = new ContentDialog()
             {
-                XamlRoot = this.XamlRoot,
+                XamlRoot = XamlRoot,
                 Title = "UninstallationError".GetLocalized(),
                 Content = ex.Message,
                 CloseButtonText = "View logs"
@@ -250,7 +250,7 @@ private void ShowAll_Unchecked(object sender, RoutedEventArgs e)
         uninstallableOnlyChecked = true;
         LoadInstalledApps(uninstallableOnly: true, cancellationTokenSource.Token);
     }
-    private CommunityToolkit.WinUI.Behaviors.Notification NotificationContent(string title, string message, InfoBarSeverity severity, int duration)
+    private static CommunityToolkit.WinUI.Behaviors.Notification NotificationContent(string title, string message, InfoBarSeverity severity, int duration)
     {
         var notification = new CommunityToolkit.WinUI.Behaviors.Notification
         {
diff --git a/app.manifest b/app.manifest
index 33da227..9251094 100644
--- a/app.manifest
+++ b/app.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.0.0.0" name="RyTuneX.app"/>
+  <assemblyIdentity version="0.8.0.0" name="RyTuneX.app"/>
 	<!--<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
 		<security>
 			<requestedPrivileges>

From d86f49e635a465e49c6b1254fd246b771e4c4f4c Mon Sep 17 00:00:00 2001
From: rayenghanmi <ghanmirayen12@gmail.com>
Date: Fri, 12 Apr 2024 19:15:48 +0100
Subject: [PATCH 7/7] v0.8.0 release

---
 CHANGELOG.md                    |  21 ++--
 Helpers/OptimizationOptions.cs  |  46 ---------
 RyTuneX.csproj                  |  14 ++-
 Views/DebloatSystemPage.xaml    |  14 ++-
 Views/DebloatSystemPage.xaml.cs |  22 +++-
 Views/FeaturesPage.xaml         |  60 ++++-------
 Views/FeaturesPage.xaml.cs      |  10 +-
 Views/OptimizeSystemPage.xaml   |  22 ++--
 Views/PrivacyPage.xaml          |   8 +-
 Views/SettingsPage.xaml         |  16 ++-
 Views/SystemInfoPage.xaml       |  64 +++++++++---
 Views/SystemInfoPage.xaml.cs    | 177 ++++++++++++++++++++++++++++++--
 12 files changed, 320 insertions(+), 154 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1fbe3e3..9294f36 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,16 +6,23 @@ All notable changes to this branch will be documented in this file.
 
 ### Fixes
 
-- [x] When finished uninstalling apps, the `Show All` checkbox should keep the same state after refreshing installed apps' list.
-- [x] Some apps that were not removed are showing `Uninstalled successfully`.
-- [x] Some packages may show an error even after being successfully removed.
-- [x] Reapplying tweaks when initializing toggle switches' previous state.
-- [x] Outputting the wrong uninstalled apps count.
-- [x] Issue #8.
+- [x] Addressed a bug where the `Show All` checkbox would not retain its state after refreshing the list of installed apps upon uninstallation completion.
+- [x] Resolved an issue where certain apps were incorrectly displaying `Uninstalled successfully` despite not being removed.
+- [x] Fixed a recurring exception error that could arise after successfully removing certain packages.
+- [x] Rectified an issue where reapplying tweaks would fail to initialize toggle switches' previous states.
+- [x] Corrected the inaccurate count of uninstalled apps displayed on the `Debloat` page.
+- [x] Mitigated a crash occurring on specific Windows versions upon successful installation startup. Refer to issue #8 for more details.
 
 ### Added
 
-- Option to remove temporary files in `Debloat` page.
+- Introduced an option to remove temporary files within the `Debloat` page.
+- Included the capability to uninstall `Microsoft.MicrosoftEdge`.
+- Included an option to extract and import drivers within the `System Info` page.
+- Enhanced text and navigation animations.
+
+## Known Issues
+
+- Inconsistencies in language translation for Arabic and French.
 
 ## 0.7.2 - Released
 
diff --git a/Helpers/OptimizationOptions.cs b/Helpers/OptimizationOptions.cs
index b89f915..8ee1ec7 100644
--- a/Helpers/OptimizationOptions.cs
+++ b/Helpers/OptimizationOptions.cs
@@ -273,18 +273,6 @@ public static void XamlSwitches(ToggleSwitch toggleSwitch, bool isAutomated = tr
                     {
                         OptimizeSystemHelper.DisableClassicContextMenu();
                         
-                    }
-                    break;
-                case "ClassicStartMenu":
-                    if (toggleSwitch.IsOn)
-                    {
-                        OptimizeSystemHelper.EnableClassicStartMenu();
-                        
-                    }
-                    else
-                    {
-                        OptimizeSystemHelper.DisableClassicStartMenu();
-                        
                     }
                     break;
                 case "Search":
@@ -345,18 +333,6 @@ public static void XamlSwitches(ToggleSwitch toggleSwitch, bool isAutomated = tr
                     {
                         OptimizeSystemHelper.EnableErrorReporting();
                         
-                    }
-                    break;
-                case "LegacyVolumeSlider":
-                    if (toggleSwitch.IsOn)
-                    {
-                        OptimizeSystemHelper.DisableLegacyVolumeSlider();
-                        
-                    }
-                    else
-                    {
-                        OptimizeSystemHelper.EnableLegacyVolumeSlider();
-                        
                     }
                     break;
                 case "Cortana":
@@ -467,16 +443,6 @@ public static void XamlSwitches(ToggleSwitch toggleSwitch, bool isAutomated = tr
                         
                     }
                     break;
-                case "StartMenuAds":
-                    if (toggleSwitch.IsOn)
-                    {
-                        OptimizeSystemHelper.DisableStartMenuAds();
-                    }
-                    else
-                    {
-                        OptimizeSystemHelper.EnableStartMenuAds();
-                    }
-                    break;
                 case "MyPeople":
                     if (toggleSwitch.IsOn)
                     {
@@ -655,18 +621,6 @@ public static void XamlSwitches(ToggleSwitch toggleSwitch, bool isAutomated = tr
                     {
                         OptimizeSystemHelper.EnableChat();
                         
-                    }
-                    break;
-                case "ShowMoreOptions":
-                    if (toggleSwitch.IsOn)
-                    {
-                        OptimizeSystemHelper.DisableShowMoreOptions();
-                        
-                    }
-                    else
-                    {
-                        OptimizeSystemHelper.EnableShowMoreOptions();
-                        
                     }
                     break;
                 case "FilesCompactMode":
diff --git a/RyTuneX.csproj b/RyTuneX.csproj
index 64dcbd1..b5149fb 100644
--- a/RyTuneX.csproj
+++ b/RyTuneX.csproj
@@ -12,20 +12,18 @@
 	<ImplicitUsings>enable</ImplicitUsings>
 	<Nullable>enable</Nullable>
 	<UseWinUI>true</UseWinUI>
+	<WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
     <EnableMsixTooling>true</EnableMsixTooling>
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
-    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
-    <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
-    <GenerateTestArtifacts>True</GenerateTestArtifacts>
-    <AppxBundle>Never</AppxBundle>
+	<AppxBundle>Never</AppxBundle>
     <WindowsPackageType>MSIX</WindowsPackageType>
     <PackageCertificateThumbprint>DF8A7D4022DFD5CBB74CBD267C30722B1313BD08</PackageCertificateThumbprint>
     <StartupObject>RyTuneX.Program</StartupObject>
-    <PackageReadmeFile>README.md</PackageReadmeFile>
-    <RepositoryUrl>https://github.com/rayenghanmi/rytunex</RepositoryUrl>
-    <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
+    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
+    <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
+    <GenerateTestArtifacts>True</GenerateTestArtifacts>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="Assets\bug.png" />
@@ -47,7 +45,7 @@
 	  <PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.0.240109" />
 	  <PackageReference Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" />
 	  <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
-	  <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231115000" />
+	  <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240404000" />
 	  <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
 	  <PackageReference Include="System.Management" Version="8.0.0" />
 	  <PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.0" />
diff --git a/Views/DebloatSystemPage.xaml b/Views/DebloatSystemPage.xaml
index a84cc5c..8500f43 100644
--- a/Views/DebloatSystemPage.xaml
+++ b/Views/DebloatSystemPage.xaml
@@ -10,6 +10,10 @@
     xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
     mc:Ignorable="d">
     <Grid Margin="0,0,0,26">
+        <Grid.ChildrenTransitions>
+            <EntranceThemeTransition FromVerticalOffset="50" />
+            <RepositionThemeTransition IsStaggeringEnabled="True" />
+        </Grid.ChildrenTransitions>
         <Grid.RowDefinitions>
             <RowDefinition Height="*"/>
             <RowDefinition Height="Auto"/>
@@ -23,7 +27,7 @@
                 <TreeView.ItemTemplate>
                     <DataTemplate>
                         <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="{Binding Key}" />
+                            <TextBlock Text="{Binding Key}" Loaded="TextBlock_Loaded" />
                             <TextBlock Text="{Binding Value}" Visibility="Collapsed"/>
                         </StackPanel>
                     </DataTemplate>
@@ -51,9 +55,17 @@
             </interactivity:Interaction.Behaviors>
         </muxc:InfoBar>
         <StackPanel Orientation="Horizontal" Margin="3" Grid.Row="5">
+            <StackPanel.ChildrenTransitions>
+                <EntranceThemeTransition FromVerticalOffset="50" />
+                <RepositionThemeTransition IsStaggeringEnabled="True" />
+            </StackPanel.ChildrenTransitions>
             <Button Margin="3" x:Uid="DebloatSystemPage_UninstallButton" x:Name="uninstallButton" Visibility="Collapsed" Click="UninstallSelectedApp_Click"/>
             <StackPanel x:Name="TempStackButtonTextBar" Margin="3" Orientation="Vertical" VerticalAlignment="Center" Visibility="Collapsed">
                 <Grid>
+                    <Grid.ChildrenTransitions>
+                        <EntranceThemeTransition FromVerticalOffset="50" />
+                        <RepositionThemeTransition IsStaggeringEnabled="True" />
+                    </Grid.ChildrenTransitions>
                     <Button x:Uid="DebloatSystemPage_TempButton" x:Name="TempButton" Click="RemoveTempFiles"/>
                     <StackPanel x:Name="TempStack" Visibility="Collapsed">
                         <ProgressBar x:Name="TempProgress" Margin="3" IsIndeterminate="True" Visibility="Collapsed"/>
diff --git a/Views/DebloatSystemPage.xaml.cs b/Views/DebloatSystemPage.xaml.cs
index b59a047..4e164a2 100644
--- a/Views/DebloatSystemPage.xaml.cs
+++ b/Views/DebloatSystemPage.xaml.cs
@@ -3,6 +3,7 @@
 using System.Management.Automation;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media.Animation;
 using RyTuneX.Helpers;
 using Windows.Storage;
 
@@ -29,7 +30,7 @@ private void DebloatSystemPage_Unloaded(object sender, RoutedEventArgs e)
         selectedAppsForUninstall.Clear();
         cancellationTokenSource.Cancel();
     }
-    private static void AppTreeView_DragItemsStarting(TreeView sender, TreeViewDragItemsStartingEventArgs args)
+    private void AppTreeView_DragItemsStarting(TreeView sender, TreeViewDragItemsStartingEventArgs args)
     {
         args.Cancel = true;
     }
@@ -296,4 +297,23 @@ private async void RemoveTempFiles(object sender, RoutedEventArgs e)
             TempProgress.ShowError = true;
         }
     }
+    private void TextBlock_Loaded(object sender, RoutedEventArgs e)
+    {
+        var textBlock = sender as TextBlock;
+        if (textBlock != null)
+        {
+            var storyboard = new Storyboard();
+            var fadeInAnimation = new DoubleAnimation
+            {
+                From = 0,
+                To = 1,
+                Duration = new Duration(TimeSpan.FromSeconds(0.5))
+            };
+            Storyboard.SetTarget(fadeInAnimation, textBlock);
+            Storyboard.SetTargetProperty(fadeInAnimation, "Opacity");
+            storyboard.Children.Add(fadeInAnimation);
+            storyboard.Begin();
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/Views/FeaturesPage.xaml b/Views/FeaturesPage.xaml
index f9a1ea8..6437089 100644
--- a/Views/FeaturesPage.xaml
+++ b/Views/FeaturesPage.xaml
@@ -32,11 +32,11 @@
                     </HyperlinkButton>
                 </StackPanel>
 
-                <controls:SettingsCard Header="Enable Verbose Logon" Description="Enable detailed logon messages for better system monitoring and troubleshooting.">
+                <controls:SettingsCard Header="Enable Verbose Logon" Description="Enable detailed logon messages for better system monitoring and troubleshooting. May not be user-friendly for everyday use">
                     <ToggleSwitch x:Name="VerboseLogon" Tag="VerboseLogon" Toggled="ToggleSwitch_Toggled"/>
                 </controls:SettingsCard>
 
-                <controls:SettingsCard Header="Disable Hibernation" Description="Turn off hibernation to save power and prevent the computer from entering sleep mode">
+                <controls:SettingsCard Header="Disable Hibernation" Description="Turn off hibernation to save power and prevent the computer from entering sleep mode. Not recommended for laptops">
                     <ToggleSwitch x:Name="Hibernation" Tag="Hibernation" Toggled="ToggleSwitch_Toggled"/>
                 </controls:SettingsCard>
 
@@ -68,19 +68,15 @@
                     <ToggleSwitch x:Name="QuickAccessHistory" Tag="QuickAccessHistory" Toggled="ToggleSwitch_Toggled"/>
                 </controls:SettingsCard>
 
-                <controls:SettingsCard Header="Disable Start Menu Ads" Description="Disables ads in the Start Menu">
-                    <ToggleSwitch x:Name="StartMenuAds" Tag="StartMenuAds" Toggled="ToggleSwitch_Toggled"/>
-                </controls:SettingsCard>
-
                 <controls:SettingsCard Header="Disable My People" Description="Turns off My People feature in the taskbar">
                     <ToggleSwitch x:Name="MyPeople" Tag="MyPeople" Toggled="ToggleSwitch_Toggled"/>
                 </controls:SettingsCard>
 
-                <controls:SettingsCard Header="Disable Sensor Services" Description="Turns off sensor services for privacy and power savings">
+                <controls:SettingsCard Header="Disable Sensor Services" Description="Turns off sensor services for privacy and power savings. Not recommended for laptops with relevant sensors">
                     <ToggleSwitch x:Name="SensorServices" Tag="SensorServices" Toggled="ToggleSwitch_Toggled"/>
                 </controls:SettingsCard>
 
-                <controls:SettingsCard Header="Disable Windows Ink" Description="Turns off Windows Ink Workspace and related features">
+                <controls:SettingsCard Header="Disable Windows Ink" Description="Turns off Windows Ink Workspace and related features. Not recommended for devices with a stylus">
                     <ToggleSwitch x:Name="WindowsInk" Tag="WindowsInk" Toggled="ToggleSwitch_Toggled"/>
                 </controls:SettingsCard>
 
@@ -100,11 +96,11 @@
                     <ToggleSwitch x:Name="CloudClipboard" Tag="CloudClipboard" Toggled="ToggleSwitch_Toggled"/>
                 </controls:SettingsCard>
 
-                <controls:SettingsCard Header="Disable Sticky Keys" Description="Disables Sticky Keys accessibility feature">
+                <controls:SettingsCard Header="Disable Sticky Keys" Description="Disables Sticky Keys accessibility feature. Useful for people who accidentally press multiple keys at once">
                     <ToggleSwitch x:Name="StickyKeys" Tag="StickyKeys" Toggled="ToggleSwitch_Toggled"/>
                 </controls:SettingsCard>
 
-                <controls:SettingsCard Header="Disable Cast to Device" Description="Disables the Cast to Device feature in Windows">
+                <controls:SettingsCard Header="Disable Cast to Device" Description="Disables the Cast to Device feature in Windows. Useful for presentations or sharing media on other devices">
                     <ToggleSwitch x:Name="CastToDevice" Tag="CastToDevice" Toggled="ToggleSwitch_Toggled"/>
                 </controls:SettingsCard>
 
@@ -118,63 +114,51 @@
                     </HyperlinkButton>
                 </StackPanel>
 
-                <controls:SettingsCard Header="Restore Classic Context Menu" Description="Bring back the familiar Windows 10 context menu for a classic and efficient user experience.">
+                <!--<controls:SettingsCard Header="Restore Classic Context Menu" Description="Bring back the familiar Windows 10 context menu for a classic and efficient user experience.">
                     <ToggleSwitch x:Name="ClassicContextMenu" Tag="ClassicContextMenu" Toggled="ToggleSwitch_Toggled"/>
-                </controls:SettingsCard>
-                
-                <controls:SettingsCard Header="Restore Classic Start Menu" Description="Restore the classic Windows 10 Start Menu for a familiar user experience and enhanced usability.">
-                    <ToggleSwitch x:Name="ClassicStartMenu" Tag="ClassicStartMenu" Toggled="ToggleSwitch_Toggled"/>
-                </controls:SettingsCard>
-                
-                <controls:SettingsCard Header="Disable VBS" Description="Disables Virtualization-Based Security (VBS) for advanced security features.">
+                </controls:SettingsCard>-->
+
+                <controls:SettingsCard Header="Disable VBS" Description="Disables Virtualization-Based Security (VBS) for advanced security features. Not recommended for high-security environments">
                     <ToggleSwitch x:Name="VBS" Tag="VBS" Toggled="ToggleSwitch_Toggled"/>
                 </controls:SettingsCard>
 
-                <controls:SettingsCard Header="Move Taskbar to The Left" Description="Moves the taskbar from the default bottom position to the left side of the screen.">
+                <controls:SettingsCard Header="Move Taskbar to The Left" Description="Moves the taskbar from the default bottom position to the left side of the screen. Personal preference">
                     <ToggleSwitch x:Name="TaskbarToLeft" Tag="TaskbarToLeft" Toggled="ToggleSwitch_Toggled"/>
                 </controls:SettingsCard>
 
-                <controls:SettingsCard Header="Disable Snap Assist" Description="Disables Snap Assist, which automatically arranges open windows when dragging.">
+                <controls:SettingsCard Header="Disable Snap Assist" Description="Disables Snap Assist, which automatically arranges open windows when dragging.  Useful for multitasking but some users prefer manual window management">
                     <ToggleSwitch x:Name="SnapAssist" Tag="SnapAssist" Toggled="ToggleSwitch_Toggled"/>
                 </controls:SettingsCard>
 
-                <controls:SettingsCard Header="Disable Widgets" Description="Disables the Widgets feature on the Windows 11 taskbar.">
+                <controls:SettingsCard Header="Disable Widgets" Description="Disables the Widgets feature on the Windows 11 taskbar. Consider if you find the widgets useful for quick updates (Windows 11 only)">
                     <ToggleSwitch x:Name="Widgets" Tag="Widgets" Toggled="ToggleSwitch_Toggled"/>
                 </controls:SettingsCard>
 
-                <controls:SettingsCard Header="Disable Chat" Description="Disables the Chat feature on the Windows 11 taskbar.">
+                <controls:SettingsCard Header="Disable Chat" Description="Disables the Chat feature on the Windows 11 taskbar. Only recommended if you don't use the chat feature for communication (Windows 11 only)">
                     <ToggleSwitch x:Name="Chat" Tag="Chat" Toggled="ToggleSwitch_Toggled"/>
                 </controls:SettingsCard>
 
-                <controls:SettingsCard Header="Enable Legacy Volume Slider" Description="Enables the legacy volume slider in the system tray">
-                    <ToggleSwitch x:Name="LegacyVolumeSlider" Tag="LegacyVolumeSlider" Toggled="ToggleSwitch_Toggled"/>
-                </controls:SettingsCard>
-
-                <controls:SettingsCard Header="Disable Show More Options" Description="Hides additional options in various Windows settings.">
-                    <ToggleSwitch x:Name="ShowMoreOptions" Tag="ShowMoreOptions" Toggled="ToggleSwitch_Toggled"/>
-                </controls:SettingsCard>
-
-                <controls:SettingsCard Header="Enable Files Compact Mode" Description="Enables Compact Mode for file browsing with smaller thumbnails.">
+                <controls:SettingsCard Header="Enable Files Compact Mode" Description="Enables Compact Mode for file browsing with smaller thumbnails. Useful for low-resolution displays or managing large folders">
                     <ToggleSwitch x:Name="FilesCompactMode" Tag="FilesCompactMode" Toggled="ToggleSwitch_Toggled"/>
                 </controls:SettingsCard>
 
-                <controls:SettingsCard Header="Disable Stickers" Description="Disables the Stickers feature in the Windows 11 messaging app.">
+                <controls:SettingsCard Header="Disable Stickers" Description="Disables the Stickers feature in the Windows 11 messaging app. Only recommended if you don't use stickers for communication (Windows 11 only)">
                     <ToggleSwitch x:Name="Stickers" Tag="Stickers" Toggled="ToggleSwitch_Toggled"/>
                 </controls:SettingsCard>
 
-                <controls:SettingsCard Header="Disable Edge Discover Bar" Description="Disables the Discover Bar feature in Microsoft Edge.">
+                <controls:SettingsCard Header="Disable Edge Discover Bar" Description="Disables the Discover Bar feature in Microsoft Edge. Useful if you find it distracting or prefer cleaner browser interface">
                     <ToggleSwitch x:Name="EdgeDiscoverBar" Tag="EdgeDiscoverBar" Toggled="ToggleSwitch_Toggled"/>
                 </controls:SettingsCard>
 
-                <controls:SettingsCard Header="Disable CoPilot AI" Description="Disables the CoPilot AI feature in Windows for assistance with code writing.">
+                <controls:SettingsCard Header="Disable CoPilot AI" Description="Disables the CoPilot AI feature in Windows for assistance with code writing. Not recommended for developers">
                     <ToggleSwitch x:Name="CoPilotAI" Tag="CoPilotAI" Toggled="ToggleSwitch_Toggled"/>
                 </controls:SettingsCard>
 
                 <controls:SettingsCard ActionIcon="{ui:FontIcon Glyph=&#xE8A7;}"
-                               ActionIconToolTip="Open in new window"
-                               Description="Use ExplorerPatcher by valinet, to get more Windows 11 customizations."
-                               Header="Want more customizations?"
-                               HeaderIcon="{ui:FontIcon Glyph=&#xE774;}"
+                               ActionIconToolTip="Open Rersonalization"
+                               Description="Currently, RyTuneX does not provide full system customizations but we're working on enhancing it"
+                               Header="Rersonalize your system"
+                               HeaderIcon="{ui:FontIcon Glyph=&#xE771;}"
                                IsClickEnabled="True"
                                Click="SettingsCard_Click"/>
             </StackPanel>
diff --git a/Views/FeaturesPage.xaml.cs b/Views/FeaturesPage.xaml.cs
index 109a976..4e37543 100644
--- a/Views/FeaturesPage.xaml.cs
+++ b/Views/FeaturesPage.xaml.cs
@@ -65,7 +65,7 @@ private static IEnumerable<T> FindVisualChildren<T>(DependencyObject depObj) whe
             }
         }
     }
-    private void ToggleSwitch_Toggled(object sender, RoutedEventArgs e)
+    private async void ToggleSwitch_Toggled(object sender, RoutedEventArgs e)
     {
         try
         {
@@ -90,16 +90,12 @@ private void ToggleSwitch_Toggled(object sender, RoutedEventArgs e)
         }
         catch (Exception ex)
         {
-            LogHelper.ShowErrorMessageAndLog(ex, XamlRoot);
+            await LogHelper.ShowErrorMessageAndLog(ex, XamlRoot);
         }
     }
 
     private void SettingsCard_Click(object sender, RoutedEventArgs e)
     {
-        Process.Start(new ProcessStartInfo
-        {
-            FileName = "https://github.com/valinet/ExplorerPatcher",
-            UseShellExecute = true
-        });
+        Process.Start("explorer.exe", "ms-settings:personalization");
     }
 }
\ No newline at end of file
diff --git a/Views/OptimizeSystemPage.xaml b/Views/OptimizeSystemPage.xaml
index d3ece26..925f6ba 100644
--- a/Views/OptimizeSystemPage.xaml
+++ b/Views/OptimizeSystemPage.xaml
@@ -39,22 +39,22 @@
                     </controls:SettingsCard.Description>
                 </controls:SettingsCard>
 
-                <controls:SettingsCard Header="Disable Superfetch" Description="Turns off Superfetch to disable preloading of frequently used applications for faster startup">
+                <controls:SettingsCard Header="Disable Superfetch" Description="Turns off Superfetch, which preloads frequently used applications for faster startup. May impact startup times for some programs if you're using HDD.">
                     <ToggleSwitch x:Name="Superfetch" Tag="Superfetch" Toggled="ToggleSwitch_Toggled"/>
                 </controls:SettingsCard>
 
-                <controls:SettingsCard Header="Disable NTFS Timestamp" Description="Disables NTFS timestamp updates for file operations">
+                <controls:SettingsCard Header="Disable NTFS Timestamp" Description="Disables updates to NTFS timestamps for file operations. May affect functionality of programs relying on precise timestamps.">
                     <ToggleSwitch x:Name="NTFSTimeStamp" Tag="NTFSTimeStamp" Toggled="ToggleSwitch_Toggled"/>
                 </controls:SettingsCard>
 
-                <controls:SettingsCard Header="Enable Gaming Mode" Description="Enables Gaming Mode for an enhanced gaming experience">
+                <controls:SettingsCard Header="Enable Gaming Mode" Description="Enables Gaming Mode, which optimizes system resources for a smoother gaming experience. May affect background processes.">
                     <ToggleSwitch x:Name="GamingMode" Tag="GamingMode" Toggled="ToggleSwitch_Toggled"/>
                 </controls:SettingsCard>
 
-                <controls:SettingsCard Header="Exclude Drivers From Windows Updates" Description="Excludes driver updates from Windows Update">
+                <controls:SettingsCard Header="Exclude Drivers From Windows Updates" Description="Excludes driver updates from Windows Update. May lead to outdated drivers with potential security risks or compatibility issues. Use with caution.">
                     <ToggleSwitch x:Name="Drivers" Tag="Drivers" Toggled="ToggleSwitch_Toggled"/>
                 </controls:SettingsCard>
-                
+
                 <!-- Advanced System Optimizations -->
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Margin="6"
@@ -66,23 +66,23 @@
                     </HyperlinkButton>
                 </StackPanel>
 
-                <controls:SettingsCard Header="Disable System Restore" Description="Disables System Restore to prevent the creation of restore points for system recovery">
+                <controls:SettingsCard Header="Disable System Restore" Description="Disables System Restore, which creates restore points to revert the system to a previous state in case of problems. Not recommended. Disabling this feature removes the ability to easily recover from potential system issues.">
                     <ToggleSwitch x:Name="SystemRestore" Tag="SystemRestore" Toggled="ToggleSwitch_Toggled"/>
                 </controls:SettingsCard>
 
-                <controls:SettingsCard Header="Disable Cortana" Description="Disables Cortana, the virtual assistant, and search feature">
+                <controls:SettingsCard Header="Disable Cortana" Description="Disables Cortana, the virtual assistant that can answer questions and complete tasks. May impact voice search and some productivity features.">
                     <ToggleSwitch x:Name="Cortana" Tag="Cortana" Toggled="ToggleSwitch_Toggled"/>
                 </controls:SettingsCard>
 
-                <controls:SettingsCard Header="Disable Store Updates" Description="Disables automatic updates for Windows Store apps">
+                <controls:SettingsCard Header="Disable Store Updates" Description="Disables automatic updates for apps downloaded from the Microsoft Store. May leave apps vulnerable to security risks or lacking new features.">
                     <ToggleSwitch x:Name="StoreUpdates" Tag="StoreUpdates" Toggled="ToggleSwitch_Toggled"/>
                 </controls:SettingsCard>
-                
-                <controls:SettingsCard Header="Disable Automatic Updates" Description="Turns off automatic Windows updates for manual control of update installations">
+
+                <controls:SettingsCard Header="Disable Automatic Updates" Description="Turns off automatic Windows updates, requiring manual installation. Highly discouraged. This can leave your system vulnerable to security exploits and bug fixes.">
                     <ToggleSwitch x:Name="AutomaticUpdates" Tag="AutomaticUpdates" Toggled="ToggleSwitch_Toggled"/>
                 </controls:SettingsCard>
 
-                <controls:SettingsCard Header="Disable Smart Screen" Description="Turns off SmartScreen Filter for apps and files">
+                <controls:SettingsCard Header="Disable Smart Screen" Description="Turns off SmartScreen Filter, which warns you about potentially unsafe apps and files downloaded from the internet. Not recommended for security reasons. Disabling this feature increases the risk of malware infection.">
                     <ToggleSwitch x:Name="SmartScreen" Tag="SmartScreen" Toggled="ToggleSwitch_Toggled"/>
                 </controls:SettingsCard>
 
diff --git a/Views/PrivacyPage.xaml b/Views/PrivacyPage.xaml
index 97f12d1..4a80ba0 100644
--- a/Views/PrivacyPage.xaml
+++ b/Views/PrivacyPage.xaml
@@ -34,16 +34,15 @@
                 <controls:SettingsCard Header="Enhance Privacy">
                     <ToggleSwitch x:Name="Privacy" Tag="Privacy" Toggled="ToggleSwitch_Toggled"/>
                     <controls:SettingsCard.Description>
-                        <HyperlinkButton Content="Learn more about what's being disabled" 
-                                         NavigateUri="https://rayenghanmi.github.io/rytunex/privacy.html" />
+                        <HyperlinkButton Content="Learn more about what's being disabled" NavigateUri="https://docs.github.com/en/enterprise-cloud@latest/pages/getting-started-with-github-pages/changing-the-visibility-of-your-github-pages-site" />
                     </controls:SettingsCard.Description>
                 </controls:SettingsCard>
 
-                <controls:SettingsCard Header="Disable SMBv1" Description="Disables Server Message Block version 1 (SMBv1) for enhanced security">
+                <controls:SettingsCard Header="Disable SMBv1" Description="Disables Server Message Block version 1 (SMBv1) for enhanced security. Recommended">
                     <ToggleSwitch x:Name="SMBv1" Tag="SMBv1" Toggled="ToggleSwitch_Toggled"/>
                 </controls:SettingsCard>
 
-                <controls:SettingsCard Header="Disable SMBv2" Description="Disables Server Message Block version 2 (SMBv2) for enhanced security">
+                <controls:SettingsCard Header="Disable SMBv2" Description="Disables Server Message Block version 2 (SMBv2) for enhanced security. Use with caution as it might break network file sharing functionalities.">
                     <ToggleSwitch x:Name="SMBv2" Tag="SMBv2" Toggled="ToggleSwitch_Toggled"/>
                 </controls:SettingsCard>
 
@@ -70,6 +69,7 @@
                 <controls:SettingsCard Header="Disable Firefox Telemetry" Description="Disables telemetry data collection in Mozilla Firefox.">
                     <ToggleSwitch x:Name="FirefoxTelemetry" Tag="FirefoxTelemetry" Toggled="ToggleSwitch_Toggled"/>
                 </controls:SettingsCard>
+                
             </StackPanel>
         </ScrollViewer>
     </Grid>
diff --git a/Views/SettingsPage.xaml b/Views/SettingsPage.xaml
index a6b1bd6..0cd2a51 100644
--- a/Views/SettingsPage.xaml
+++ b/Views/SettingsPage.xaml
@@ -30,11 +30,17 @@
                 </StackPanel.ChildrenTransitions>
                 <StackPanel>
                     <TextBlock x:Uid="Settings_Language" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"/>
-                    <ComboBox x:Name="LanguageComboBox" PlaceholderText="System Language" Margin="{StaticResource SmallTopMargin}" SelectionChanged="LanguageComboBox_SelectionChanged">
-                        <ComboBoxItem Content="English (US)" Tag="en-us"/>
-                        <ComboBoxItem Content="Français (France)" Tag="fr-fr"/>
-                        <ComboBoxItem Content="العربية (تونس)" Tag="ar-tn"/>
-                    </ComboBox>
+                    <controls:SettingsCard x:Name="LanguageSettingsCard"
+                               Description="Choose your default language"
+                               Header="Change Language"
+                               HeaderIcon="{ui:FontIcon Glyph=&#xF2B7;}">
+                        <ComboBox x:Name="LanguageComboBox" PlaceholderText="System Language" Margin="{StaticResource SmallTopMargin}" SelectionChanged="LanguageComboBox_SelectionChanged">
+                            <ComboBoxItem Content="English (US)" Tag="en-us"/>
+                            <ComboBoxItem Content="Français (France)" Tag="fr-fr"/>
+                            <ComboBoxItem Content="العربية (تونس)" Tag="ar-tn"/>
+                        </ComboBox>
+                    </controls:SettingsCard>
+
                 </StackPanel>
             </StackPanel>
             <StackPanel>
diff --git a/Views/SystemInfoPage.xaml b/Views/SystemInfoPage.xaml
index e2f4ffd..1416d48 100644
--- a/Views/SystemInfoPage.xaml
+++ b/Views/SystemInfoPage.xaml
@@ -7,17 +7,7 @@
     mc:Ignorable="d">
 
     <Grid Margin="-26,0,-26,20" x:Name="ContentArea">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="*"/>
-        </Grid.RowDefinitions>
-        <Button Grid.Row="0" ToolTipService.ToolTip="Sync System Info" Click="ReloadInfo" HorizontalAlignment="Right">
-            <StackPanel Orientation="Horizontal">
-                <FontIcon Margin="3"  Glyph="&#xE72C;"/>
-                <TextBlock x:Uid="SystemInfoPage_ReloadButton" Margin="3"/>
-            </StackPanel>
-        </Button>
-        <ScrollView Grid.Row="1" Margin="0,10,0,0" HorizontalScrollMode="Disabled" VerticalScrollMode="Auto" Background="Transparent">
+        <ScrollView Margin="0,10,0,0" HorizontalScrollMode="Disabled" VerticalScrollMode="Auto" Background="Transparent">
             
             <Grid>
                 <Grid.RowDefinitions>
@@ -26,36 +16,78 @@
                     <RowDefinition Height="*"/>
                     <RowDefinition Height="*"/>
                     <RowDefinition Height="*"/>
+                    <RowDefinition Height="*"/>
                 </Grid.RowDefinitions>
-                <StackPanel Grid.Row="0" Margin="20,10,20,0">
+                <StackPanel Grid.Row="0" Margin="20,10,20,20">
+                    <TextBlock Text="Drivers" Margin="10" ToolTipService.ToolTip="Extract your current drivers for an easier backup" Style="{StaticResource BodyStrongTextBlockStyle}"/>
+                    <StackPanel x:Name="driversPanel" Padding="10" CornerRadius="8" Background="{ThemeResource LayerOnMicaBaseAltFillColorDefaultBrush}">
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock Style="{StaticResource BodyTextBlockStyle}" x:Name="driversImport" VerticalAlignment="Center" HorizontalAlignment="Left">
+                                Extract your drivers to an external folder for easy backup.
+                            </TextBlock>
+                        </StackPanel>
+                        <StackPanel Margin="15,0,0,0" Orientation="Horizontal">
+                            <ScrollView VerticalScrollMode="Disabled" VerticalAlignment="Center" MinWidth="230">
+                                <TextBox x:Name="FolderPathText" Text="Select a folder" IsEnabled="False"/>
+                            </ScrollView>
+                            <Button Margin="15,15,0,15" Content="Select" Click="SelectPathButton_Click"/>
+                            <Button Margin="15,15,0,15" x:Name="ExtractButton" Visibility="Collapsed" Content="Extract" Click="ExtractButton_Click"/>
+                        </StackPanel>
+                        <StackPanel x:Name="ExtractingStatus" Visibility="Collapsed">
+                            <TextBlock x:Name="ExtractingStatusText" Text="Extracting" Margin="3"/>
+                            <ProgressBar x:Name="ExtractingStatusPb" IsIndeterminate="True"/>
+                        </StackPanel>
+                        
+                        <!-- Working on it -->
+                        
+                        <!--<StackPanel Margin="15,0,0,0" Orientation="Horizontal">
+                            <TextBlock Style="{StaticResource BodyTextBlockStyle}" x:Name="drivers" VerticalAlignment="Center" HorizontalAlignment="Left">
+                                Import extracted drivers backup using RyTuneX.
+                            </TextBlock>
+                        </StackPanel>
+                        <StackPanel Margin="15,0,0,0" Orientation="Horizontal">
+                            <ScrollView VerticalScrollMode="Disabled" VerticalAlignment="Center" MinWidth="230">
+                                <TextBox x:Name="ImportFolderPathText" Text="Select a folder" IsEnabled="False"/>
+                            </ScrollView>
+                            <Button Margin="15,15,0,15" Content="Select" Click="ImportSelectPathButton_Click"/>
+                            <Button Margin="15,15,0,15" x:Name="ImportButton" Visibility="Collapsed" Content="Import" Click="ImportButton_Click"/>
+                        </StackPanel>
+                        <StackPanel x:Name="ImportingStatus" Visibility="Collapsed">
+                            <TextBlock x:Name="ImportingStatusText" Text="Importing" Margin="3"/>
+                            <ProgressBar x:Name="ImportingStatusPb" IsIndeterminate="True"/>
+                        </StackPanel>-->
+
+                    </StackPanel>
+                </StackPanel>
+                <StackPanel Grid.Row="1" Margin="20,10,20,0">
                     <TextBlock x:Uid="SystemInfoPage_OS" ToolTipService.ToolTip="Operating System" Margin="10" Style="{StaticResource BodyStrongTextBlockStyle}"/>
                     <StackPanel x:Name="osPanel" Padding="10" CornerRadius="8" Background="{ThemeResource LayerOnMicaBaseAltFillColorDefaultBrush}">
                         <ProgressRing x:Name="osProgressRing" Margin="10" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                         <TextBlock Style="{StaticResource BodyTextBlockStyle}" x:Name="os" VerticalAlignment="Center" HorizontalAlignment="Left" Visibility="Collapsed"/>
                     </StackPanel>
                 </StackPanel>
-                <StackPanel Grid.Row="1" Margin="20,10,20,0">
+                <StackPanel Grid.Row="2" Margin="20,10,20,0">
                     <TextBlock x:Uid="SystemInfoPage_CPU" ToolTipService.ToolTip="Central Processing Unit" Margin="10" Style="{StaticResource BodyStrongTextBlockStyle}"/>
                     <StackPanel x:Name="cpuPanel" Padding="10" CornerRadius="8" Background="{ThemeResource LayerOnMicaBaseAltFillColorDefaultBrush}">
                         <ProgressRing x:Name="cpuProgressRing" Margin="10" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                         <TextBlock Style="{StaticResource BodyTextBlockStyle}" x:Name="cpu" VerticalAlignment="Center" HorizontalAlignment="Left" Visibility="Collapsed"/>
                     </StackPanel>
                 </StackPanel>
-                <StackPanel Grid.Row="2" Margin="20,10,20,0">
+                <StackPanel Grid.Row="3" Margin="20,10,20,0">
                     <TextBlock x:Uid="SystemInfoPage_GPU" ToolTipService.ToolTip="Graphics Processing Unit" Margin="10" Style="{StaticResource BodyStrongTextBlockStyle}"/>
                     <StackPanel x:Name="gpuPanel" Padding="10" CornerRadius="8" Background="{ThemeResource LayerOnMicaBaseAltFillColorDefaultBrush}">
                         <ProgressRing x:Name="gpuProgressRing" Margin="10" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                         <TextBlock Style="{StaticResource BodyTextBlockStyle}" x:Name="gpu" VerticalAlignment="Center" HorizontalAlignment="Left" Visibility="Collapsed"/>
                     </StackPanel>
                 </StackPanel>
-                <StackPanel Grid.Row="3" Margin="20,10,20,0">
+                <StackPanel Grid.Row="4" Margin="20,10,20,0">
                     <TextBlock x:Uid="SystemInfoPage_RAM" ToolTipService.ToolTip="Random Access Memory" Margin="10" Style="{StaticResource BodyStrongTextBlockStyle}"/>
                     <StackPanel x:Name="ramPanel" Padding="10" CornerRadius="8" Background="{ThemeResource LayerOnMicaBaseAltFillColorDefaultBrush}">
                         <ProgressRing x:Name="ramProgressRing" Margin="10" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                         <TextBlock Style="{StaticResource BodyTextBlockStyle}" x:Name="ram" VerticalAlignment="Center" HorizontalAlignment="Left" Visibility="Collapsed"/>
                     </StackPanel>
                 </StackPanel>
-                <StackPanel Grid.Row="4" Margin="20,10,20,20">
+                <StackPanel Grid.Row="5" Margin="20,10,20,0">
                     <TextBlock x:Uid="SystemInfoPage_Storage" ToolTipService.ToolTip="Storage Devices" Margin="10" Style="{StaticResource BodyStrongTextBlockStyle}"/>
                     <StackPanel x:Name="diskPanel" Padding="10" CornerRadius="8" Background="{ThemeResource LayerOnMicaBaseAltFillColorDefaultBrush}">
                         <ProgressRing x:Name="diskProgressRing" Margin="10" VerticalAlignment="Center" HorizontalAlignment="Center"/>
diff --git a/Views/SystemInfoPage.xaml.cs b/Views/SystemInfoPage.xaml.cs
index 37c2d82..0cafc1e 100644
--- a/Views/SystemInfoPage.xaml.cs
+++ b/Views/SystemInfoPage.xaml.cs
@@ -1,10 +1,13 @@
-using System.Diagnostics;
+using System;
 using Microsoft.UI.Xaml.Controls;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Management;
-using System.Threading.Tasks;
+using Windows.Storage.Pickers;
+using Windows.Storage;
+using System.Runtime.InteropServices;
+using WinRT.Interop;
+using Microsoft.UI.Xaml;
+using RyTuneX.Helpers;
+
 
 namespace RyTuneX.Views;
 
@@ -205,17 +208,171 @@ private static string GetOsInformation()
         }
     }
 
-    private void ReloadInfo(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+    // Working on it
+
+    /*private static async Task ImportDrivers(string path)
+    {
+        await OptimizationOptions.StartInCmd($"pnputil.exe /add-driver '{path}'\\*.inf /subdirs /install");
+    }
+    public static async Task<int> ProcessSubdirectories(string parentDirectory)
     {
         try
         {
-            LogHelper.LogError("Reloading SystemInfo Page");
-            Frame.Navigate(Frame.CurrentSourcePageType);
-            Frame.BackStack.RemoveAt(Frame.BackStack.Count - 1);
+            string[] subdirectories = Directory.GetDirectories(parentDirectory);
+
+            foreach (string subdir in subdirectories)
+            {
+                await OptimizationOptions.StartInCmd($"pnputil.exe /add-driver '{subdir}'\\*.inf /install");
+                await ProcessSubdirectories(subdir);
+            }
         }
         catch (Exception ex)
         {
-            LogHelper.LogError($"Error reloading SystemInfo Page: {ex}");
+            Console.WriteLine($"Error: {ex.Message}");
+        }
+        return 0;
+    }
+    private async void ImportButton_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+    {
+        var folderPath = FolderPathText.Text;
+        if (!Directory.Exists(folderPath))
+        {
+            Directory.CreateDirectory(folderPath);
+        }
+        ImportingStatusText.Text = "Importing drivers...";
+        ImportingStatusPb.ShowError = false;
+        ImportingStatus.Visibility = Visibility.Visible;
+        try
+        {
+            //var exitCode = await OptimizationOptions.StartInCmd($"pnputil.exe /add-driver '{folderPath}'\\*.inf /subdirs /install");
+            var exitCode = await ProcessSubdirectories(folderPath);
+            if (exitCode == 0)
+            {
+                ImportingStatusText.Text = "Done";
+                ImportingStatusPb.Visibility = Visibility.Collapsed;
+            }
+            else
+            {
+                ImportingStatusText.Text = "There was an error while importing drivers";
+                ImportingStatusPb.ShowError = true;
+            }
+        }
+        catch
+        {
+            ImportingStatusText.Text = "There was an error while importing drivers";
+            ImportingStatusPb.ShowError = true;
+        }
+
+    }
+
+    private void ImportSelectPathButton_Click(object sender, RoutedEventArgs e)
+    {
+
+        var selectedFolderPath = ShowDialog("C:\\", "Select a Folder...");
+        if (!string.IsNullOrEmpty(selectedFolderPath))
+        {
+            ImportFolderPathText.Text = selectedFolderPath;
+            ImportButton.Visibility = Visibility.Visible;
+        }
+        else
+        {
+            ImportButton.Visibility = Visibility.Collapsed;
+            ImportFolderPathText.Text = "Select a folder";
+        }
+    }*/
+
+    private async void ExtractButton_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+    {
+        var folderPath = FolderPathText.Text + $"\\RyTuneX_Drivers_{DateTime.Now:yyyy-MM-dd}";
+        if (!Directory.Exists(folderPath))
+        {
+            Directory.CreateDirectory(folderPath);
+        }
+        ExtractingStatusText.Text = "Extracting drivers...";
+        ExtractingStatusPb.ShowError = false;
+        ExtractingStatus.Visibility = Visibility.Visible;
+        try
+        {
+            var exitCode = await OptimizationOptions.StartInCmd($"powershell Export-WindowsDriver -Online -Destination '{folderPath}'");
+            if ( exitCode == 0 )
+            {
+                ExtractingStatusText.Text = "Done";
+                ExtractingStatusPb.Visibility = Visibility.Collapsed;
+            }
+            else
+            {
+                ExtractingStatusText.Text = "There was an error while extracting drivers";
+                ExtractingStatusPb.ShowError = true;
+            }
+        }
+        catch
+        {
+            ExtractingStatusText.Text = "There was an error while extracting drivers";
+            ExtractingStatusPb.ShowError = true;
+        }
+
+    }
+
+    private void SelectPathButton_Click(object sender, RoutedEventArgs e)
+    {
+
+        var selectedFolderPath = ShowDialog("C:\\", "Select a Folder...");
+        if (!string.IsNullOrEmpty(selectedFolderPath))
+        {
+            FolderPathText.Text = selectedFolderPath;
+            ExtractButton.Visibility = Visibility.Visible;
+        }
+        else
+        {
+            ExtractButton.Visibility = Visibility.Collapsed;
+            FolderPathText.Text = "Select a folder";
+        }
+    }
+
+    [DllImport("shell32.dll", CharSet = CharSet.Unicode)]
+    private static extern IntPtr SHBrowseForFolder(ref BROWSEINFO lpbi);
+
+    [DllImport("shell32.dll", CharSet = CharSet.Unicode)]
+    private static extern bool SHGetPathFromIDList(IntPtr pidl, IntPtr pszPath);
+
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+    private struct BROWSEINFO
+    {
+        public IntPtr hwndOwner;
+        public IntPtr pidlRoot;
+        public string pszDisplayName;
+        public string lpszTitle;
+        public uint ulFlags;
+        public IntPtr lpfn;
+        public IntPtr lParam;
+        public int iImage;
+    }
+
+    public static string ShowDialog(string startingDirectory, string dialogTitle)
+    {
+        var bi = new BROWSEINFO
+        {
+            hwndOwner = IntPtr.Zero,
+            pidlRoot = IntPtr.Zero,
+            pszDisplayName = new string('\0', 260),
+            lpszTitle = dialogTitle,
+            ulFlags = 0x00000040 | 0x00000001 // BIF_NEWDIALOGSTYLE | BIF_RETURNONLYFSDIRS
+        };
+
+        var pidl = SHBrowseForFolder(ref bi);
+        if (pidl != IntPtr.Zero)
+        {
+            var pathPtr = Marshal.AllocCoTaskMem(260 * sizeof(char));
+            if (SHGetPathFromIDList(pidl, pathPtr))
+            {
+                var path = Marshal.PtrToStringUni(pathPtr);
+                Marshal.FreeCoTaskMem(pidl);
+                Marshal.FreeCoTaskMem(pathPtr);
+                return path;
+            }
+            Marshal.FreeCoTaskMem(pidl);
+            Marshal.FreeCoTaskMem(pathPtr);
         }
+        return string.Empty;
     }
 }