Merge pull request #1 from Sycnex/master

Update Fork

README.md

@@ -1,4 +1,5 @@
 # Windows10Debloater
+
 Script/Utility/Application to debloat Windows 10
 
 # How To Run the Windows10Debloater.ps1 and the Windows10DebloaterGUI.ps1 files
@@ -12,10 +13,10 @@ First Method:
 3) Enable PowerShell execution
 <code>Set-ExecutionPolicy Unrestricted -Force</code>
 4) On the prompt, change to the directory where you extracted the files:
-  e.g. - cd c:\temp
+  e.g. - `cd c:\temp`
 5) Next, to run either script, enter in the following:
-  e.g. - .\Windows10DebloaterGUI.ps1
-  
+  e.g. - `.\Windows10DebloaterGUI.ps1`
+
 
 Second Method:
 
@@ -28,18 +29,18 @@ 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:
--SysPrep, -Debloat. 
+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:
 
 1) Download the .zip file on the main page of the github and extract the .zip file to your desired location
 2) Once extracted, open PowerShell (or PowerShell ISE) as an Administrator
 3) On the prompt, change to the directory where you extracted the files:
-  e.g. - cd c:\temp
+  e.g. - `cd c:\temp`
 4) Next, to run either script, enter in the following:
-  e.g. - .\Windows10SysPrepDebloater.ps1 -Sysprep, -Debloat -Privacy
-  
+  e.g. - `.\Windows10SysPrepDebloater.ps1 -Sysprep, -Debloat -Privacy`
+
 
 # Sysprep, Interactive, and GUI Application
 
@@ -101,70 +102,69 @@ These scheduled tasks that are disabled have absolutely no impact on the functio
 # Bloatware that is removed:
 
 3DBuilder,
+ActiproSoftware,
+Alarms,
 Appconnector,
+Asphalt8,
+Autodesk SketchBook,
 Bing Finance,
+Bing Food And Drink,
+Bing Health And Fitness,
 Bing News,
 Bing Sports,
+Bing Travel,
 Bing Weather,
+BioEnrollment,
+Camera,
+CandyCrush,
+CandyCrushSoda,
+Caesars Slots Free Casino,
+ContactSupport,
+CyberLink MediaSuite Essentials,
+DrawboardPDF,
+Duolingo,
+EclipseManager,
+Facebook,
+FarmVille 2 Country Escape,
+Flipboard,
 Fresh Paint,
 Get started,
+iHeartRadio,
+King apps,
+Maps,
+March of Empires,
+Messaging,
 Microsoft Office Hub,
 Microsoft Solitaire Collection,
 Microsoft Sticky Notes,
+Minecraft,
+Netflix,
+Network Speed Test,
+NYT Crossword,
+Office Sway,
 OneNote,
 OneConnect,
+Pandora,
 People,
-Skype for Desktop,
-Alarms,
-Camera,
-Maps,
 Phone,
-SoundRecorder,
-XboxApp,
-Zune Music,
-Zune Video,
-Windows communications apps,
-Minecraft,
+Phototastic Collage,
+PicsArt-PhotoStudio,
 PowerBI,
-Network Speed Test,
-Phone,
-Messaging,
-Office Sway,
-Windows Feedback Hub,
-Bing Food And Drink,
-Bing Travel,
-Bing Health And Fitness,
-Windows Reading List,
-Twitter,
-Pandora,
-Flipboard,
+Royal Revolt 2,
 Shazam,
-CandyCrush,
-CandyCrushSoda,
-King apps,
-iHeartRadio,
-Netflix,
-DrawboardPDF,
-PicsArt-PhotoStudio,
-FarmVille 2 Country Escape,
+Skype for Desktop,
+SoundRecorder,
 TuneInRadio,
-Asphalt8,
-NYT Crossword,
-CyberLink MediaSuite Essentials,
-Facebook,
-Royal Revolt 2,
-Caesars Slots Free Casino,
-March of Empires,
-Phototastic Collage,
-Autodesk SketchBook,
-Duolingo,
-EclipseManager,
-ActiproSoftware,
-BioEnrollment,
+Twitter,
+Windows communications apps,
 Windows Feedback,
+Windows Feedback Hub,
+Windows Reading List,
+XboxApp,
 Xbox Game CallableUI,
-Xbox Identity Provider, and
-ContactSupport.
+Xbox Identity Provider,
+Zune Music,
+Zune Video.
 
 # Quick download link
 

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

@@ -37,6 +37,7 @@ If (!([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]:
 
 #Unnecessary Windows 10 AppX apps that will be removed by the blacklist.
 $global:Bloatware = @(
+    "Microsoft.PPIProjection"
     "Microsoft.BingNews"
     "Microsoft.GetHelp"
     "Microsoft.Getstarted"
@@ -79,6 +80,7 @@ $global:Bloatware = @(
     "Duolingo-LearnLanguagesforFree"
     "PandoraMediaInc"
     "CandyCrush"
+    "BubbleWitch3Saga"
     "Wunderlist"
     "Flipboard"
     "Twitter"
@@ -696,10 +698,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
     }