Merge branch 'master' of https://github.com/Sycnex/Windows10Debloater

README.md

@@ -28,7 +28,7 @@ Remember this script NEEDS to be run as admin in order to function properly.
 
 # How To Run the Windows10SysPrepDebloater.ps1 file
 
-For the WindowsSysPrepDebloater.ps1 file, there are a couple of paramters that you can run so that you can specify which functions are used. The parameters are:
+For the WindowsSysPrepDebloater.ps1 file, there are a couple of parameters that you can run so that you can specify which functions are used. The parameters are:
 -SysPrep, -Debloat. 
 
 To run this with parameters, do the following:

Windows10Debloater.ps1

@@ -44,7 +44,7 @@ Function DebloatAll {
     Microsoft.BioEnrollment|Microsoft.CredDialogHost|Microsoft.ECApp|Microsoft.LockApp|Microsoft.MicrosoftEdgeDevToolsClient|Microsoft.MicrosoftEdge|Microsoft.PPIProjection|Microsoft.Win32WebViewHost|Microsoft.Windows.Apprep.ChxApp|`
     Microsoft.Windows.AssignedAccessLockApp|Microsoft.Windows.CapturePicker|Microsoft.Windows.CloudExperienceHost|Microsoft.Windows.ContentDeliveryManager|Microsoft.Windows.Cortana|Microsoft.Windows.NarratorQuickStart|`
     Microsoft.Windows.ParentalControls|Microsoft.Windows.PeopleExperienceHost|Microsoft.Windows.PinningConfirmationDialog|Microsoft.Windows.SecHealthUI|Microsoft.Windows.SecureAssessmentBrowser|Microsoft.Windows.ShellExperienceHost|`
-    Microsoft.Windows.XGpuEjectDialog|Microsoft.XboxGameCallableUI|Windows.CBSPreview|windows.immersivecontrolpanel|Windows.PrintDialog|Microsoft.VCLibs.140.00|Microsoft.Services.Store.Engagement|Microsoft.UI.Xaml.2.0'|*Nvidia*
+    Microsoft.Windows.XGpuEjectDialog|Microsoft.XboxGameCallableUI|Windows.CBSPreview|windows.immersivecontrolpanel|Windows.PrintDialog|Microsoft.VCLibs.140.00|Microsoft.Services.Store.Engagement|Microsoft.UI.Xaml.2.0|*Nvidia*'
     Get-AppxPackage -AllUsers | Where-Object {$_.Name -NotMatch $WhitelistedApps -and $_.Name -NotMatch $NonRemovable} | Remove-AppxPackage
     Get-AppxPackage | Where-Object {$_.Name -NotMatch $WhitelistedApps -and $_.Name -NotMatch $NonRemovable} | Remove-AppxPackage
     Get-AppxProvisionedPackage -Online | Where-Object {$_.PackageName -NotMatch $WhitelistedApps -and $_.PackageName -NotMatch $NonRemovable} | Remove-AppxProvisionedPackage -Online
@@ -97,6 +97,7 @@ Function DebloatBlacklist {
         "*Duolingo-LearnLanguagesforFree*"
         "*PandoraMediaInc*"
         "*CandyCrush*"
+        "*BubbleWitch3Saga*"
         "*Wunderlist*"
         "*Flipboard*"
         "*Twitter*"
@@ -305,7 +306,7 @@ Function Protect-Privacy {
     $CloudStore = 'HKCU:\Software\Microsoft\Windows\CurrentVersion\CloudStore'
     If (Test-Path $CloudStore) {
         Stop-Process Explorer.exe -Force
-        Remove-Item $CloudStore
+        Remove-Item $CloudStore -Recurse -Force
         Start-Process Explorer.exe -Wait
     }
 }

Windows10DebloaterGUI.ps1

@@ -79,6 +79,7 @@ $global:Bloatware = @(
     "Duolingo-LearnLanguagesforFree"
     "PandoraMediaInc"
     "CandyCrush"
+    "BubbleWitch3Saga"
     "Wunderlist"
     "Flipboard"
     "Twitter"
@@ -696,10 +697,10 @@ $RemoveAllBloatware.Add_Click( {
             
             
             Write-Host "Removing CloudStore from registry if it exists"
-            $CloudStore = 'HKCUSoftware\Microsoft\Windows\CurrentVersion\CloudStore'
+            $CloudStore = 'HKCU:\Software\Microsoft\Windows\CurrentVersion\CloudStore'
             If (Test-Path $CloudStore) {
                 Stop-Process Explorer.exe -Force
-                Remove-Item $CloudStore
+                Remove-Item $CloudStore -Recurse -Force
                 Start-Process Explorer.exe -Wait
             }
   

Windows10SysPrepDebloater.ps1

@@ -174,10 +174,10 @@ Function Protect-Privacy {
     
     
      Write-Output "Removing CloudStore from registry if it exists"
-     $CloudStore = 'HKCUSoftware\Microsoft\Windows\CurrentVersion\CloudStore'
+     $CloudStore = 'HKCU:\Software\Microsoft\Windows\CurrentVersion\CloudStore'
      If (Test-Path $CloudStore) {
      Stop-Process Explorer.exe -Force
-     Remove-Item $CloudStore
+     Remove-Item $CloudStore -Recurse -Force
      Start-Process Explorer.exe -Wait
     }