diff --git a/Windows10Debloater.ps1 b/Windows10Debloater.ps1
index dab69a9..aec47b0 100644
--- a/Windows10Debloater.ps1
+++ b/Windows10Debloater.ps1
@@ -1,502 +1,504 @@
 #This function finds any AppX/AppXProvisioned package and uninstalls it, except for Freshpaint, Windows Calculator, Windows Store, and Windows Photos.
 #Also, to note - This does NOT remove essential system services/software/etc such as .NET framework installations, Cortana, Edge, etc.
 
-If (Test-Path "C:\Windows10Debloater") {
-    Write-Output "C:\Windows10Debloater exists. Skipping."
+if (Test-Path "C:\Windows10Debloater") {
+  Write-Output "C:\Windows10Debloater exists. Skipping."
 }
-Else {
-    Write-Output "The folder 'C:\Windows10Debloater' doesn't exist. This folder will be used for storing logs created after the script runs. Creating now."
-    Sleep 1
-    New-Item -Path "C:\Windows10Debloater" -ItemType Directory
+else {
+  Write-Output "The folder 'C:\Windows10Debloater' doesn't exist. This folder will be used for storing logs created after the script runs. Creating now."
+  Sleep 1
+  New-Item -Path "C:\Windows10Debloater" -ItemType Directory
 }
 
 Start-Transcript -OutputDirectory "C:\Windows10Debloater"
-Function Start-Debloat {
-    
-    [CmdletBinding()]
-        
-    Param()
-    
-    #Removes AppxPackages
-    #Credit to /u/GavinEke for a modified version of my whitelist code
-    [regex]$WhitelistedApps = 'Microsoft.Paint3D|Microsoft.WindowsCalculator|Microsoft.WindowsStore|Microsoft.Windows.Photos'
-    Get-AppxPackage -AllUsers | Where-Object {$_.Name -NotMatch $WhitelistedApps} | Remove-AppxPackage -ErrorAction SilentlyContinue
-    Get-AppxProvisionedPackage -Online | Where-Object {$_.PackageName -NotMatch $WhitelistedApps} | Remove-AppxProvisionedPackage -Online -ErrorAction SilentlyContinue
+function Start-Debloat {
+
+  [CmdletBinding()]
+
+  param()
+
+  #Removes AppxPackages
+  #Credit to /u/GavinEke for a modified version of my whitelist code
+  [regex]$WhitelistedApps = 'Microsoft.Paint3D|Microsoft.WindowsCalculator|Microsoft.WindowsStore|Microsoft.Windows.Photos'
+  Get-AppxPackage -AllUsers | Where-Object { $_.Name -notmatch $WhitelistedApps } | Remove-AppxPackage -ErrorAction SilentlyContinue
+  Get-AppxProvisionedPackage -Online | Where-Object { $_.PackageName -notmatch $WhitelistedApps } | Remove-AppxProvisionedPackage -Online -ErrorAction SilentlyContinue
 }
-Function Remove-Keys {
-        
-    [CmdletBinding()]
-            
-    Param()
-        
-    #These are the registry keys that it will delete.
-            
-    $Keys = @(
-            
-        #Remove Background Tasks
-        "HKCR:\Extensions\ContractId\Windows.BackgroundTasks\PackageId\46928bounde.EclipseManager_2.2.4.51_neutral__a5h4egax66k6y"
-        "HKCR:\Extensions\ContractId\Windows.BackgroundTasks\PackageId\ActiproSoftwareLLC.562882FEEB491_2.6.18.18_neutral__24pqs290vpjk0"
-        "HKCR:\Extensions\ContractId\Windows.BackgroundTasks\PackageId\Microsoft.MicrosoftOfficeHub_17.7909.7600.0_x64__8wekyb3d8bbwe"
-        "HKCR:\Extensions\ContractId\Windows.BackgroundTasks\PackageId\Microsoft.PPIProjection_10.0.15063.0_neutral_neutral_cw5n1h2txyewy"
-        "HKCR:\Extensions\ContractId\Windows.BackgroundTasks\PackageId\Microsoft.XboxGameCallableUI_1000.15063.0.0_neutral_neutral_cw5n1h2txyewy"
-        "HKCR:\Extensions\ContractId\Windows.BackgroundTasks\PackageId\Microsoft.XboxGameCallableUI_1000.16299.15.0_neutral_neutral_cw5n1h2txyewy"
-            
-        #Windows File
-        "HKCR:\Extensions\ContractId\Windows.File\PackageId\ActiproSoftwareLLC.562882FEEB491_2.6.18.18_neutral__24pqs290vpjk0"
-            
-        #Registry keys to delete if they aren't uninstalled by RemoveAppXPackage/RemoveAppXProvisionedPackage
-        "HKCR:\Extensions\ContractId\Windows.Launch\PackageId\46928bounde.EclipseManager_2.2.4.51_neutral__a5h4egax66k6y"
-        "HKCR:\Extensions\ContractId\Windows.Launch\PackageId\ActiproSoftwareLLC.562882FEEB491_2.6.18.18_neutral__24pqs290vpjk0"
-        "HKCR:\Extensions\ContractId\Windows.Launch\PackageId\Microsoft.PPIProjection_10.0.15063.0_neutral_neutral_cw5n1h2txyewy"
-        "HKCR:\Extensions\ContractId\Windows.Launch\PackageId\Microsoft.XboxGameCallableUI_1000.15063.0.0_neutral_neutral_cw5n1h2txyewy"
-        "HKCR:\Extensions\ContractId\Windows.Launch\PackageId\Microsoft.XboxGameCallableUI_1000.16299.15.0_neutral_neutral_cw5n1h2txyewy"
-            
-        #Scheduled Tasks to delete
-        "HKCR:\Extensions\ContractId\Windows.PreInstalledConfigTask\PackageId\Microsoft.MicrosoftOfficeHub_17.7909.7600.0_x64__8wekyb3d8bbwe"
-            
-        #Windows Protocol Keys
-        "HKCR:\Extensions\ContractId\Windows.Protocol\PackageId\ActiproSoftwareLLC.562882FEEB491_2.6.18.18_neutral__24pqs290vpjk0"
-        "HKCR:\Extensions\ContractId\Windows.Protocol\PackageId\Microsoft.PPIProjection_10.0.15063.0_neutral_neutral_cw5n1h2txyewy"
-        "HKCR:\Extensions\ContractId\Windows.Protocol\PackageId\Microsoft.XboxGameCallableUI_1000.15063.0.0_neutral_neutral_cw5n1h2txyewy"
-        "HKCR:\Extensions\ContractId\Windows.Protocol\PackageId\Microsoft.XboxGameCallableUI_1000.16299.15.0_neutral_neutral_cw5n1h2txyewy"
-               
-        #Windows Share Target
-        "HKCR:\Extensions\ContractId\Windows.ShareTarget\PackageId\ActiproSoftwareLLC.562882FEEB491_2.6.18.18_neutral__24pqs290vpjk0"
-    )
-        
-    #This writes the output of each key it is removing and also removes the keys listed above.
-    ForEach ($Key in $Keys) {
-        Write-Output "Removing $Key from registry"
-        Remove-Item $Key -Recurse -ErrorAction SilentlyContinue
-    }
+function Remove-Keys {
+
+  [CmdletBinding()]
+
+  param()
+
+  #These are the registry keys that it will delete.
+
+  $Keys = @(
+
+    #Remove Background Tasks
+    "HKCR:\Extensions\ContractId\Windows.BackgroundTasks\PackageId\46928bounde.EclipseManager_2.2.4.51_neutral__a5h4egax66k6y"
+    "HKCR:\Extensions\ContractId\Windows.BackgroundTasks\PackageId\ActiproSoftwareLLC.562882FEEB491_2.6.18.18_neutral__24pqs290vpjk0"
+    "HKCR:\Extensions\ContractId\Windows.BackgroundTasks\PackageId\Microsoft.MicrosoftOfficeHub_17.7909.7600.0_x64__8wekyb3d8bbwe"
+    "HKCR:\Extensions\ContractId\Windows.BackgroundTasks\PackageId\Microsoft.PPIProjection_10.0.15063.0_neutral_neutral_cw5n1h2txyewy"
+    "HKCR:\Extensions\ContractId\Windows.BackgroundTasks\PackageId\Microsoft.XboxGameCallableUI_1000.15063.0.0_neutral_neutral_cw5n1h2txyewy"
+    "HKCR:\Extensions\ContractId\Windows.BackgroundTasks\PackageId\Microsoft.XboxGameCallableUI_1000.16299.15.0_neutral_neutral_cw5n1h2txyewy"
+
+    #Windows File
+    "HKCR:\Extensions\ContractId\Windows.File\PackageId\ActiproSoftwareLLC.562882FEEB491_2.6.18.18_neutral__24pqs290vpjk0"
+
+    #Registry keys to delete if they aren't uninstalled by RemoveAppXPackage/RemoveAppXProvisionedPackage
+    "HKCR:\Extensions\ContractId\Windows.Launch\PackageId\46928bounde.EclipseManager_2.2.4.51_neutral__a5h4egax66k6y"
+    "HKCR:\Extensions\ContractId\Windows.Launch\PackageId\ActiproSoftwareLLC.562882FEEB491_2.6.18.18_neutral__24pqs290vpjk0"
+    "HKCR:\Extensions\ContractId\Windows.Launch\PackageId\Microsoft.PPIProjection_10.0.15063.0_neutral_neutral_cw5n1h2txyewy"
+    "HKCR:\Extensions\ContractId\Windows.Launch\PackageId\Microsoft.XboxGameCallableUI_1000.15063.0.0_neutral_neutral_cw5n1h2txyewy"
+    "HKCR:\Extensions\ContractId\Windows.Launch\PackageId\Microsoft.XboxGameCallableUI_1000.16299.15.0_neutral_neutral_cw5n1h2txyewy"
+
+    #Scheduled Tasks to delete
+    "HKCR:\Extensions\ContractId\Windows.PreInstalledConfigTask\PackageId\Microsoft.MicrosoftOfficeHub_17.7909.7600.0_x64__8wekyb3d8bbwe"
+
+    #Windows Protocol Keys
+    "HKCR:\Extensions\ContractId\Windows.Protocol\PackageId\ActiproSoftwareLLC.562882FEEB491_2.6.18.18_neutral__24pqs290vpjk0"
+    "HKCR:\Extensions\ContractId\Windows.Protocol\PackageId\Microsoft.PPIProjection_10.0.15063.0_neutral_neutral_cw5n1h2txyewy"
+    "HKCR:\Extensions\ContractId\Windows.Protocol\PackageId\Microsoft.XboxGameCallableUI_1000.15063.0.0_neutral_neutral_cw5n1h2txyewy"
+    "HKCR:\Extensions\ContractId\Windows.Protocol\PackageId\Microsoft.XboxGameCallableUI_1000.16299.15.0_neutral_neutral_cw5n1h2txyewy"
+
+    #Windows Share Target
+    "HKCR:\Extensions\ContractId\Windows.ShareTarget\PackageId\ActiproSoftwareLLC.562882FEEB491_2.6.18.18_neutral__24pqs290vpjk0"
+  )
+
+  #This writes the output of each key it is removing and also removes the keys listed above.
+  foreach ($Key in $Keys) {
+    Write-Output "Removing $Key from registry"
+    Remove-Item $Key -Recurse -ErrorAction SilentlyContinue
+  }
 }
-            
-Function Protect-Privacy {
-        
-    [CmdletBinding()]
-        
-    Param()
-            
-    #Disables Windows Feedback Experience
-    Write-Output "Disabling Windows Feedback Experience program"
+
+function Protect-Privacy {
+
+  [CmdletBinding()]
+
+  param()
+
+  #Disables Windows Feedback Experience
+  Write-Output "Disabling Windows Feedback Experience program"
+  $Advertising = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\AdvertisingInfo'
+  if (Test-Path $Advertising) {
+    Set-ItemProperty $Advertising -Name Enabled -Value 0 -Verbose
+  }
+
+  #Stops Cortana from being used as part of your Windows Search Function
+  Write-Output "Stopping Cortana from being used as part of your Windows Search Function"
+  $Search = 'HKLM:\SOFTWARE\Policies\Microsoft\Windows\Windows Search'
+  if (Test-Path $Search) {
+    Set-ItemProperty $Search -Name AllowCortana -Value 0 -Verbose
+  }
+
+  #Stops the Windows Feedback Experience from sending anonymous data
+  Write-Output "Stopping the Windows Feedback Experience program"
+  $Period1 = 'HKCU:\Software\Microsoft\Siuf'
+  $Period2 = 'HKCU:\Software\Microsoft\Siuf\Rules'
+  $Period3 = 'HKCU:\Software\Microsoft\Siuf\Rules\PeriodInNanoSeconds'
+  if (!(Test-Path $Period3)) {
+    mkdir $Period1 -ErrorAction SilentlyContinue
+    mkdir $Period2 -ErrorAction SilentlyContinue
+    mkdir $Period3 -ErrorAction SilentlyContinue
+    New-ItemProperty $Period3 -Name PeriodInNanoSeconds -Value 0 -Verbose -ErrorAction SilentlyContinue
+  }
+
+  Write-Output "Adding Registry key to prevent bloatware apps from returning"
+  #Prevents bloatware applications from returning
+  $registryPath = "HKLM:\SOFTWARE\Policies\Microsoft\Windows\CloudContent"
+  if (!(Test-Path $registryPath)) {
+    mkdir $registryPath -ErrorAction SilentlyContinue
+    New-ItemProperty $registryPath -Name DisableWindowsConsumerFeatures -Value 1 -Verbose -ErrorAction SilentlyContinue
+  }
+
+  Write-Output "Setting Mixed Reality Portal value to 0 so that you can uninstall it in Settings"
+  $Holo = 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Holographic'
+  if (Test-Path $Holo) {
+    Set-ItemProperty $Holo -Name FirstRunSucceeded -Value 0 -Verbose
+  }
+
+  #Disables live tiles
+  Write-Output "Disabling live tiles"
+  $Live = 'HKCU:\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\PushNotifications'
+  if (!(Test-Path $Live)) {
+    mkdir $Live -ErrorAction SilentlyContinue
+    New-ItemProperty $Live -Name NoTileApplicationNotification -Value 1 -Verbose
+  }
+
+  #Turns off Data Collection via the AllowTelemtry key by changing it to 0
+  Write-Output "Turning off Data Collection"
+  $DataCollection = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection'
+  if (Test-Path $DataCollection) {
+    Set-ItemProperty $DataCollection -Name AllowTelemetry -Value 0 -Verbose
+  }
+
+  #Disables People icon on Taskbar
+  Write-Output "Disabling People icon on Taskbar"
+  $People = 'HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\People'
+  if (!(Test-Path $People)) {
+    mkdir $People -ErrorAction SilentlyContinue
+    New-ItemProperty $People -Name PeopleBand -Value 0 -Verbose
+  }
+
+  #Disables suggestions on start menu
+  Write-Output "Disabling suggestions on the Start Menu"
+  if ('HKCU:\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager') {
+    $Suggestions = 'HKCU:\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager'
+    Set-ItemProperty $Suggestions -Name SystemPaneSuggestionsEnabled -Value 0 -Verbose
+  }
+
+  #Disables scheduled tasks that are considered unnecessary
+  Write-Output "Disabling scheduled tasks"
+  Get-ScheduledTask -TaskName XblGameSaveTaskLogon | Disable-ScheduledTask
+  Get-ScheduledTask -TaskName XblGameSaveTask | Disable-ScheduledTask
+  Get-ScheduledTask -TaskName Consolidator | Disable-ScheduledTask
+  Get-ScheduledTask -TaskName UsbCeip | Disable-ScheduledTask
+  Get-ScheduledTask -TaskName DmClient | Disable-ScheduledTask
+  Get-ScheduledTask -TaskName DmClientOnScenarioDownload | Disable-ScheduledTask
+}
+
+function Stop-EdgePDF {
+
+  Write-Output "Stopping Edge from taking over as the default .PDF viewer"
+  #Stops edge from taking over as the default .PDF viewer
+  if (!(Get-ItemProperty 'HKCR:\.pdf' -Name NoOpenWith)) {
+    $NoOpen = 'HKCR:\.pdf'
+    New-ItemProperty $NoOpen -Name NoOpenWith -Verbose -ErrorAction SilentlyContinue
+  }
+
+  if (!(Get-ItemProperty 'HKCR:\.pdf' -Name NoStaticDefaultVerb)) {
+    $NoStatic = 'HKCR:\.pdf'
+    New-ItemProperty $NoStatic -Name NoStaticDefaultVerb -Verbose -ErrorAction SilentlyContinue
+  }
+
+  if (!(Get-ItemProperty 'HKCR:\.pdf\OpenWithProgids' -Name NoOpenWith)) {
+    $NoOpen = 'HKCR:\.pdf\OpenWithProgids'
+    New-ItemProperty $NoOpen -Name NoOpenWith -Verbose -ErrorAction SilentlyContinue
+  }
+
+  if (!(Get-ItemProperty 'HKCR:\.pdf\OpenWithProgids' -Name NoStaticDefaultVerb)) {
+    $NoStatic = 'HKCR:\.pdf\OpenWithProgids'
+    New-ItemProperty $NoStatic -Name NoStaticDefaultVerb -Verbose -ErrorAction SilentlyContinue
+  }
+
+  if (!(Get-ItemProperty 'HKCR:\.pdf\OpenWithList' -Name NoOpenWith)) {
+    $NoOpen = 'HKCR:\.pdf\OpenWithList'
+    New-ItemProperty $NoOpen -Name NoOpenWith -Verbose -ErrorAction SilentlyContinue
+  }
+
+  if (!(Get-ItemProperty 'HKCR:\.pdf\OpenWithList' -Name NoStaticDefaultVerb)) {
+    $NoStatic = 'HKCR:\.pdf\OpenWithList'
+    New-ItemProperty $NoStatic -Name NoStaticDefaultVerb -Verbose -ErrorAction SilentlyContinue
+  }
+
+  #Appends an underscore '_' to the Registry key for Edge
+  if ('HKCR:\AppXd4nrz8ff68srnhf9t5a8sbjyar1cr723') {
+    $Edge = 'HKCR:\AppXd4nrz8ff68srnhf9t5a8sbjyar1cr723'
+    Set-Item $Edge AppXd4nrz8ff68srnhf9t5a8sbjyar1cr723_ -Verbose
+  }
+}
+function Revert-Changes {
+
+  [CmdletBinding()]
+
+  param()
+
+  #This function will revert the changes you made when running the Start-Debloat function.
+
+  #This line reinstalls all of the bloatware that was removed
+  Get-AppxPackage -AllUsers | ForEach-Object { Add-AppxPackage -Verbose -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml" } -ErrorAction SilentlyContinue
+
+  Write-Output "Re-enabling key to show advertisement information"
+  #Tells Windows to enable your advertising information.
+  if ('HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\AdvertisingInfo') {
     $Advertising = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\AdvertisingInfo'
-    If (Test-Path $Advertising) {
-        Set-ItemProperty $Advertising -Name Enabled -Value 0 -Verbose
-    }
-            
-    #Stops Cortana from being used as part of your Windows Search Function
-    Write-Output "Stopping Cortana from being used as part of your Windows Search Function"
+    Set-ItemProperty $Advertising -Name Enabled -Value 1 -Verbose
+  }
+
+  #Enables Cortana to be used as part of your Windows Search Function
+  Write-Output "Re-enabling Cortana to be used in your Windows Search"
+  if ('HKLM:\SOFTWARE\Policies\Microsoft\Windows\Windows Search') {
     $Search = 'HKLM:\SOFTWARE\Policies\Microsoft\Windows\Windows Search'
-    If (Test-Path $Search) {
-        Set-ItemProperty $Search -Name AllowCortana -Value 0 -Verbose
-    }
-            
-    #Stops the Windows Feedback Experience from sending anonymous data
-    Write-Output "Stopping the Windows Feedback Experience program"
-    $Period1 = 'HKCU:\Software\Microsoft\Siuf'
-    $Period2 = 'HKCU:\Software\Microsoft\Siuf\Rules'
-    $Period3 = 'HKCU:\Software\Microsoft\Siuf\Rules\PeriodInNanoSeconds'
-    If (!(Test-Path $Period3)) { 
-        mkdir $Period1 -ErrorAction SilentlyContinue
-        mkdir $Period2 -ErrorAction SilentlyContinue
-        mkdir $Period3 -ErrorAction SilentlyContinue
-        New-ItemProperty $Period3 -Name PeriodInNanoSeconds -Value 0 -Verbose -ErrorAction SilentlyContinue
-    }
-                   
-    Write-Output "Adding Registry key to prevent bloatware apps from returning"
-    #Prevents bloatware applications from returning
+    Set-ItemProperty $Search -Name AllowCortana -Value 1 -Verbose
+  }
+
+  #Re-enables the Windows Feedback Experience for sending anonymous data
+  Write-Output "Re-enabling Windows Feedback Experience"
+  if (!('HKCU:\Software\Microsoft\Siuf\Rules\PeriodInNanoSeconds')) {
+    mkdir 'HKCU:\Software\Microsoft\Siuf\Rules\PeriodInNanoSeconds'
+    $Period = 'HKCU:\Software\Microsoft\Siuf\Rules\PeriodInNanoSeconds'
+    New-Item $Period -ErrorAction SilentlyContinue
+    Set-ItemProperty -Name PeriodInNanoSeconds -Value 1 -Verbose
+  }
+
+  Write-Output "Adding Registry key to prevent bloatware apps from returning"
+  #Enables bloatware applications
+  if ('HKLM:\SOFTWARE\Policies\Microsoft\Windows\CloudContent') {
     $registryPath = "HKLM:\SOFTWARE\Policies\Microsoft\Windows\CloudContent"
-    If (!(Test-Path $registryPath)) {
-        Mkdir $registryPath -ErrorAction SilentlyContinue
-        New-ItemProperty $registryPath -Name DisableWindowsConsumerFeatures -Value 1 -Verbose -ErrorAction SilentlyContinue
-    }          
-        
-    Write-Output "Setting Mixed Reality Portal value to 0 so that you can uninstall it in Settings"
-    $Holo = 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Holographic'    
-    If (Test-Path $Holo) {
-        Set-ItemProperty $Holo -Name FirstRunSucceeded -Value 0 -Verbose
-    }
-        
-    #Disables live tiles
-    Write-Output "Disabling live tiles"
-    $Live = 'HKCU:\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\PushNotifications'    
-    If (!(Test-Path $Live)) {
-        mkdir $Live -ErrorAction SilentlyContinue     
-        New-ItemProperty $Live -Name NoTileApplicationNotification -Value 1 -Verbose
-    }
-        
-    #Turns off Data Collection via the AllowTelemtry key by changing it to 0
-    Write-Output "Turning off Data Collection"
-    $DataCollection = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection'    
-    If (Test-Path $DataCollection) {
-        Set-ItemProperty $DataCollection -Name AllowTelemetry -Value 0 -Verbose
-    }
-        
-    #Disables People icon on Taskbar
-    Write-Output "Disabling People icon on Taskbar"
-    $People = 'HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\People'    
-    If (!(Test-Path $People)) {
-        mkdir $People -ErrorAction SilentlyContinue
-        New-ItemProperty $People -Name PeopleBand -Value 0 -Verbose
-    }
-    
-    #Disables suggestions on start menu
-    Write-Output "Disabling suggestions on the Start Menu"
-    If ('HKCU:\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager') {
-        $Suggestions = 'HKCU:\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager'
-        Set-ItemProperty $Suggestions -Name SystemPaneSuggestionsEnabled -Value 0 -Verbose
-    }
-        
-    #Disables scheduled tasks that are considered unnecessary 
-    Write-Output "Disabling scheduled tasks"
-    Get-ScheduledTask -TaskName XblGameSaveTaskLogon | Disable-ScheduledTask
-    Get-ScheduledTask -TaskName XblGameSaveTask | Disable-ScheduledTask
-    Get-ScheduledTask -TaskName Consolidator | Disable-ScheduledTask
-    Get-ScheduledTask -TaskName UsbCeip | Disable-ScheduledTask
-    Get-ScheduledTask -TaskName DmClient | Disable-ScheduledTask
-    Get-ScheduledTask -TaskName DmClientOnScenarioDownload | Disable-ScheduledTask
-}
-        
-Function Stop-EdgePDF {
-        
-    Write-Output "Stopping Edge from taking over as the default .PDF viewer" 
-    #Stops edge from taking over as the default .PDF viewer
-    If (!(Get-ItemProperty 'HKCR:\.pdf' -Name NoOpenWith)) {
-        $NoOpen = 'HKCR:\.pdf'
-        New-ItemProperty $NoOpen -Name NoOpenWith -Verbose -ErrorAction SilentlyContinue
-    }
-        
-    If (!(Get-ItemProperty 'HKCR:\.pdf' -Name NoStaticDefaultVerb)) {
-        $NoStatic = 'HKCR:\.pdf'
-        New-ItemProperty $NoStatic -Name NoStaticDefaultVerb -Verbose -ErrorAction SilentlyContinue
-    }
-        
-    If (!(Get-ItemProperty 'HKCR:\.pdf\OpenWithProgids' -Name NoOpenWith)) {
-        $NoOpen = 'HKCR:\.pdf\OpenWithProgids'
-        New-ItemProperty $NoOpen -Name NoOpenWith -Verbose -ErrorAction SilentlyContinue
-    }
-        
-    If (!(Get-ItemProperty 'HKCR:\.pdf\OpenWithProgids' -Name NoStaticDefaultVerb)) {
-        $NoStatic = 'HKCR:\.pdf\OpenWithProgids'
-        New-ItemProperty $NoStatic -Name NoStaticDefaultVerb -Verbose -ErrorAction SilentlyContinue
-    }
-        
-    If (!(Get-ItemProperty 'HKCR:\.pdf\OpenWithList' -Name NoOpenWith)) {
-        $NoOpen = 'HKCR:\.pdf\OpenWithList'
-        New-ItemProperty $NoOpen -Name NoOpenWith -Verbose -ErrorAction SilentlyContinue
-    }
-        
-    If (!(Get-ItemProperty 'HKCR:\.pdf\OpenWithList' -Name NoStaticDefaultVerb)) {
-        $NoStatic = 'HKCR:\.pdf\OpenWithList'
-        New-ItemProperty $NoStatic -Name NoStaticDefaultVerb -Verbose -ErrorAction SilentlyContinue
-    }
-        
-    #Appends an underscore '_' to the Registry key for Edge
-    If ('HKCR:\AppXd4nrz8ff68srnhf9t5a8sbjyar1cr723') {
-        $Edge = 'HKCR:\AppXd4nrz8ff68srnhf9t5a8sbjyar1cr723'
-        Set-Item $Edge AppXd4nrz8ff68srnhf9t5a8sbjyar1cr723_ -Verbose
-    }
-}
-Function Revert-Changes {   
-            
-    [CmdletBinding()]
-            
-    Param()
-        
-    #This function will revert the changes you made when running the Start-Debloat function.
-        
-    #This line reinstalls all of the bloatware that was removed
-    Get-AppxPackage -AllUsers | ForEach {Add-AppxPackage -Verbose -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"} -ErrorAction SilentlyContinue
-        
-    Write-Output "Re-enabling key to show advertisement information"
-    #Tells Windows to enable your advertising information.
-    If ('HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\AdvertisingInfo') {
-        $Advertising = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\AdvertisingInfo'
-        Set-ItemProperty $Advertising -Name Enabled -Value 1 -Verbose
-    }
-            
-    #Enables Cortana to be used as part of your Windows Search Function
-    Write-Output "Re-enabling Cortana to be used in your Windows Search"
-    If ('HKLM:\SOFTWARE\Policies\Microsoft\Windows\Windows Search') {
-        $Search = 'HKLM:\SOFTWARE\Policies\Microsoft\Windows\Windows Search'
-        Set-ItemProperty $Search -Name AllowCortana -Value 1 -Verbose
-    }
-            
-    #Re-enables the Windows Feedback Experience for sending anonymous data
-    Write-Output "Re-enabling Windows Feedback Experience"
-    If (!('HKCU:\Software\Microsoft\Siuf\Rules\PeriodInNanoSeconds')) { 
-        mkdir 'HKCU:\Software\Microsoft\Siuf\Rules\PeriodInNanoSeconds'
-        $Period = 'HKCU:\Software\Microsoft\Siuf\Rules\PeriodInNanoSeconds'
-        New-Item $Period -ErrorAction SilentlyContinue
-        Set-ItemProperty -Name PeriodInNanoSeconds -Value 1 -Verbose
-    }
-                   
-    Write-Output "Adding Registry key to prevent bloatware apps from returning"
-    #Enables bloatware applications
-    If ('HKLM:\SOFTWARE\Policies\Microsoft\Windows\CloudContent') {
-        $registryPath = "HKLM:\SOFTWARE\Policies\Microsoft\Windows\CloudContent"
-        Mkdir $registryPath -ErrorAction SilentlyContinue
-        New-ItemProperty $registryPath -Name DisableWindowsConsumerFeatures -Value 0 -Verbose -ErrorAction SilentlyContinue
-    }
-        
-    #Changes Mixed Reality Portal Key 'FirstRunSucceeded' to 1
-    Write-Output "Setting Mixed Reality Portal value to 1"
-    If ('HKCU:\Software\Microsoft\Windows\CurrentVersion\Holographic') {
-        $Holo = 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Holographic'
-        Set-ItemProperty $Holo -Name FirstRunSucceeded -Value 1 -Verbose
-    }
-        
-    #Re-enables live tiles
-    Write-Output "Enabling live tiles"
-    If ('HKCU:\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\PushNotifications') {
-        mkdir 'HKCU:\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\PushNotifications' -ErrorAction SilentlyContinue       
-        $Live = 'HKCU:\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\PushNotifications'
-        New-ItemProperty $Live -Name NoTileApplicationNotification -Value 0 -Verbose -ErrorAction SilentlyContinue
-    }
-               
-    Write-Output "Changing the 'Cloud Content' registry key value to 1 to allow bloatware apps to reinstall"
-    #Prevents bloatware applications from returning
-    If ("HKLM:\SOFTWARE\Policies\Microsoft\Windows\CloudContent\") {
-        $registryPath = "HKLM:\SOFTWARE\Policies\Microsoft\Windows\CloudContent"
-        Mkdir $registryPath -ErrorAction SilentlyContinue
-        New-ItemProperty $registryPath -Name DisableWindowsConsumerFeatures -Value 1 -Verbose -ErrorAction SilentlyContinue
-    }
-        
-    #Re-enables data collection
-    Write-Output "Re-enabling data collection"
-    If ('HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection') {
-        $DataCollection = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection'
-        Set-ItemProperty $DataCollection -Name AllowTelemetry -Value 1 -Verbose
-    }
-        
-    #Re-enables People Icon on Taskbar
-    Write-Output "Enabling People icon on Taskbar"
-    If ('HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\People') {
-        $People = 'HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\People'
-        New-ItemProperty $People -Name PeopleBand -Value 1 -Verbose -ErrorAction SilentlyContinue
-    }
-    
-    #Re-enables suggestions on start menu
-    Write-Output "Enabling suggestions on the Start Menu"
-    If ('HKCU:\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager') {
-        $Suggestions = 'HKCU:\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager'
-        Set-ItemProperty $Suggestions -Name SystemPaneSuggestionsEnabled -Value 1 -Verbose
-    }
-        
-    #Re-enables scheduled tasks that were disabled when running the Debloat switch
-    Write-Output "Enabling scheduled tasks that were disabled"
-    Get-ScheduledTask -TaskName XblGameSaveTaskLogon | Enable-ScheduledTask
-    Get-ScheduledTask -TaskName XblGameSaveTask | Enable-ScheduledTask
-    Get-ScheduledTask -TaskName Consolidator | Enable-ScheduledTask
-    Get-ScheduledTask -TaskName UsbCeip | Enable-ScheduledTask
-    Get-ScheduledTask -TaskName DmClient | Enable-ScheduledTask
-    Get-ScheduledTask -TaskName DmClientOnScenarioDownload | Enable-ScheduledTask
+    mkdir $registryPath -ErrorAction SilentlyContinue
+    New-ItemProperty $registryPath -Name DisableWindowsConsumerFeatures -Value 0 -Verbose -ErrorAction SilentlyContinue
+  }
+
+  #Changes Mixed Reality Portal Key 'FirstRunSucceeded' to 1
+  Write-Output "Setting Mixed Reality Portal value to 1"
+  if ('HKCU:\Software\Microsoft\Windows\CurrentVersion\Holographic') {
+    $Holo = 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Holographic'
+    Set-ItemProperty $Holo -Name FirstRunSucceeded -Value 1 -Verbose
+  }
+
+  #Re-enables live tiles
+  Write-Output "Enabling live tiles"
+  if ('HKCU:\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\PushNotifications') {
+    mkdir 'HKCU:\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\PushNotifications' -ErrorAction SilentlyContinue
+    $Live = 'HKCU:\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\PushNotifications'
+    New-ItemProperty $Live -Name NoTileApplicationNotification -Value 0 -Verbose -ErrorAction SilentlyContinue
+  }
+
+  Write-Output "Changing the 'Cloud Content' registry key value to 1 to allow bloatware apps to reinstall"
+  #Prevents bloatware applications from returning
+  if ("HKLM:\SOFTWARE\Policies\Microsoft\Windows\CloudContent\") {
+    $registryPath = "HKLM:\SOFTWARE\Policies\Microsoft\Windows\CloudContent"
+    mkdir $registryPath -ErrorAction SilentlyContinue
+    New-ItemProperty $registryPath -Name DisableWindowsConsumerFeatures -Value 1 -Verbose -ErrorAction SilentlyContinue
+  }
+
+  #Re-enables data collection
+  Write-Output "Re-enabling data collection"
+  if ('HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection') {
+    $DataCollection = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection'
+    Set-ItemProperty $DataCollection -Name AllowTelemetry -Value 1 -Verbose
+  }
+
+  #Re-enables People Icon on Taskbar
+  Write-Output "Enabling People icon on Taskbar"
+  if ('HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\People') {
+    $People = 'HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\People'
+    New-ItemProperty $People -Name PeopleBand -Value 1 -Verbose -ErrorAction SilentlyContinue
+  }
+
+  #Re-enables suggestions on start menu
+  Write-Output "Enabling suggestions on the Start Menu"
+  if ('HKCU:\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager') {
+    $Suggestions = 'HKCU:\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager'
+    Set-ItemProperty $Suggestions -Name SystemPaneSuggestionsEnabled -Value 1 -Verbose
+  }
+
+  #Re-enables scheduled tasks that were disabled when running the Debloat switch
+  Write-Output "Enabling scheduled tasks that were disabled"
+  Get-ScheduledTask -TaskName XblGameSaveTaskLogon | Enable-ScheduledTask
+  Get-ScheduledTask -TaskName XblGameSaveTask | Enable-ScheduledTask
+  Get-ScheduledTask -TaskName Consolidator | Enable-ScheduledTask
+  Get-ScheduledTask -TaskName UsbCeip | Enable-ScheduledTask
+  Get-ScheduledTask -TaskName DmClient | Enable-ScheduledTask
+  Get-ScheduledTask -TaskName DmClientOnScenarioDownload | Enable-ScheduledTask
 }
-    
-Function Enable-EdgePDF {
-    Write-Output "Setting Edge back to default"
-    #Sets edge back to default
-    If (Get-ItemProperty 'HKCR:\.pdf' -Name NoOpenWith) {
-        $NoOpen = 'HKCR:\.pdf'
-        Remove-ItemProperty $NoOpen -Name NoOpenWith -Verbose
-    }
-        
-    If (Get-ItemProperty 'HKCR:\.pdf' -Name NoStaticDefaultVerb) {
-        $NoStatic = 'HKCR:\.pdf'
-        Remove-ItemProperty $NoStatic -Name NoStaticDefaultVerb -Verbose
-    }
-        
-    If (Get-ItemProperty 'HKCR:\.pdf\OpenWithProgids' -Name NoOpenWith) {
-        $NoOpen = 'HKCR:\.pdf\OpenWithProgids'
-        Remove-ItemProperty $NoOpen -Name NoOpenWith -Verbose
-    }
-        
-    If (Get-ItemProperty 'HKCR:\.pdf\OpenWithProgids' -Name NoStaticDefaultVerb) {
-        $NoStatic = 'HKCR:\.pdf\OpenWithProgids'
-        Remove-ItemProperty $NoStatic -Name NoStaticDefaultVerb -Verbose
-    }
-        
-    If (Get-ItemProperty 'HKCR:\.pdf\OpenWithList' -Name NoOpenWith) {
-        $NoOpen = 'HKCR:\.pdf\OpenWithList'
-        Remove-ItemProperty $NoOpen -Name NoOpenWith -Verbose
-    }
-        
-    If (Get-ItemProperty 'HKCR:\.pdf\OpenWithList' -Name NoStaticDefaultVerb) {
-        $NoStatic = 'HKCR:\.pdf\OpenWithList'
-        Remove-ItemProperty $NoStatic -Name NoStaticDefaultVerb -Verbose
-    }
-        
-    #Removes an underscore '_' from the Registry key for Edge
-    If ('HKCR:\AppXd4nrz8ff68srnhf9t5a8sbjyar1cr723') {
-        $Edge = 'HKCR:\AppXd4nrz8ff68srnhf9t5a8sbjyar1cr723'
-        Set-Item $Edge AppXd4nrz8ff68srnhf9t5a8sbjyar1cr723 -Verbose
-    }
+
+function Enable-EdgePDF {
+  Write-Output "Setting Edge back to default"
+  #Sets edge back to default
+  if (Get-ItemProperty 'HKCR:\.pdf' -Name NoOpenWith) {
+    $NoOpen = 'HKCR:\.pdf'
+    Remove-ItemProperty $NoOpen -Name NoOpenWith -Verbose
+  }
+
+  if (Get-ItemProperty 'HKCR:\.pdf' -Name NoStaticDefaultVerb) {
+    $NoStatic = 'HKCR:\.pdf'
+    Remove-ItemProperty $NoStatic -Name NoStaticDefaultVerb -Verbose
+  }
+
+  if (Get-ItemProperty 'HKCR:\.pdf\OpenWithProgids' -Name NoOpenWith) {
+    $NoOpen = 'HKCR:\.pdf\OpenWithProgids'
+    Remove-ItemProperty $NoOpen -Name NoOpenWith -Verbose
+  }
+
+  if (Get-ItemProperty 'HKCR:\.pdf\OpenWithProgids' -Name NoStaticDefaultVerb) {
+    $NoStatic = 'HKCR:\.pdf\OpenWithProgids'
+    Remove-ItemProperty $NoStatic -Name NoStaticDefaultVerb -Verbose
+  }
+
+  if (Get-ItemProperty 'HKCR:\.pdf\OpenWithList' -Name NoOpenWith) {
+    $NoOpen = 'HKCR:\.pdf\OpenWithList'
+    Remove-ItemProperty $NoOpen -Name NoOpenWith -Verbose
+  }
+
+  if (Get-ItemProperty 'HKCR:\.pdf\OpenWithList' -Name NoStaticDefaultVerb) {
+    $NoStatic = 'HKCR:\.pdf\OpenWithList'
+    Remove-ItemProperty $NoStatic -Name NoStaticDefaultVerb -Verbose
+  }
+
+  #Removes an underscore '_' from the Registry key for Edge
+  if ('HKCR:\AppXd4nrz8ff68srnhf9t5a8sbjyar1cr723') {
+    $Edge = 'HKCR:\AppXd4nrz8ff68srnhf9t5a8sbjyar1cr723'
+    Set-Item $Edge AppXd4nrz8ff68srnhf9t5a8sbjyar1cr723 -Verbose
+  }
 }
 
-Function FixWhitelistedApps {
-    
-    [CmdletBinding()]
-            
-    Param()
-    
-    If(!(Get-AppxPackage -AllUsers | Select Microsoft.Paint3D, Microsoft.WindowsCalculator, Microsoft.WindowsStore, Microsoft.Windows.Photos)) {
-    
+function FixWhitelistedApps {
+
+  [CmdletBinding()]
+
+  param()
+
+  if (!(Get-AppxPackage -AllUsers | Select-Object Microsoft.Paint3D,Microsoft.WindowsCalculator,Microsoft.WindowsStore,Microsoft.Windows.Photos)) {
+
     #Credit to abulgatz for these 4 lines of code
-    Get-AppxPackage -allusers Microsoft.Paint3D | Foreach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
-    Get-AppxPackage -allusers Microsoft.WindowsCalculator | Foreach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
-    Get-AppxPackage -allusers Microsoft.WindowsStore | Foreach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
-    Get-AppxPackage -allusers Microsoft.Windows.Photos | Foreach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"} } }
+    Get-AppxPackage -AllUsers Microsoft.Paint3D | ForEach-Object { Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml" }
+    Get-AppxPackage -AllUsers Microsoft.WindowsCalculator | ForEach-Object { Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml" }
+    Get-AppxPackage -AllUsers Microsoft.WindowsStore | ForEach-Object { Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml" }
+    Get-AppxPackage -AllUsers Microsoft.Windows.Photos | ForEach-Object { Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml" }
+  }
+}
 
 #This switch will ask you if you'd like to run the script as interactive or silently. Depending on your selection, yes will be interactive, no will be silent.
 Write-Output "How would you like to run this script?"
 $ReadHost = Read-Host " ( Interactive / Noninteractive ) "
-Switch ($ReadHost) {
-    Interactive {
-        #Switch statement containing Debloat/Revert options
-        Write-Output "The following options will allow you to either Debloat Windows 10, or to revert changes made after Debloating Windows 10.
-        Choose 'Debloat' to Debloat Windows 10 or choose 'Revert' to revert changes." 
-        $Readhost = Read-Host " ( Debloat / Revert ) " 
-        Switch ($ReadHost) {
-            #This will debloat Windows 10
-            Debloat {
-                #Creates a "drive" to access the HKCR (HKEY_CLASSES_ROOT)
-                Write-Output "Creating PSDrive 'HKCR' (HKEY_CLASSES_ROOT). This will be used for the duration of the script as it is necessary for the removal and modification of specific registry keys."
-                New-PSDrive -Name HKCR -PSProvider Registry -Root HKEY_CLASSES_ROOT
-                Sleep 1
-                Write-Output "Uninstalling bloatware, please wait."
-                Start-Debloat
-                Write-Output "Bloatware removed."
-                Sleep 1
-                Write-Output "Removing specific registry keys."
-                Remove-Keys
-                Write-Output "Leftover bloatware registry keys removed."
-                Sleep 1
-                Write-Output "Checking to see if any Whitelisted Apps were removed, and if so re-adding them."
-                Sleep 1
-                FixWhitelistedApps
-                Sleep 1
-                Write-Output "Disabling Cortana from search, disabling feedback to Microsoft, and disabling scheduled tasks that are considered to be telemetry or unnecessary."
-                Protect-Privacy
-                Write-Output "Cortana disabled from search, feedback to Microsoft has been disabled, and scheduled tasks are disabled."
-                Sleep 1; $PublishSettings = $Debloat
-    
-                Write-Output "Do you want to stop edge from taking over as the default PDF viewer?"
-                $ReadHost = Read-Host " (Yes / No ) "
-                Switch ($ReadHost) {
-                    Yes {
-                        Stop-EdgePDF
-                        Write-Output "Edge will no longer take over as the default PDF viewer."; $PublishSettings = $Yes
-                    }
-                    No {
-                        $PublishSettings = $No
-                    }
-                }
-                #Switch statement asking if you'd like to reboot your machine
-                Write-Output "For some of the changes to properly take effect it is recommended to reboot your machine. Would you like to restart?"
-                $ReadHost = Read-Host " ( Yes / No ) " 
-                Switch ($Readhost) {
-                    Yes {
-                        Write-Output "Unloading the HKCR drive..."
-                        Remove-PSDrive HKCR 
-                        Sleep 1
-                        Stop-Transcript
-                        Write-Output "Initiating reboot."
-                        Sleep 2
-                        Restart-Computer; $PublishSettings = $Yes
-                    }
-                    No {
-                        Write-Output "Unloading the HKCR drive..."
-                        Remove-PSDrive HKCR 
-                        Sleep 1
-                        Stop-Transcript
-                        Write-Output "Script has finished. Exiting."
-                        Sleep 2
-                        Exit; $PublishSettings = $No
-                    }
-                }
-            }
-        Revert {
-            Write-Output "Reverting changes..."
-            Write-Output "Creating PSDrive 'HKCR' (HKEY_CLASSES_ROOT). This will be used for the duration of the script as it is necessary for the modification of specific registry keys."
-            New-PSDrive -Name HKCR -PSProvider Registry -Root HKEY_CLASSES_ROOT
-            Revert-Changes; $PublishSettings = $Revert
-            Write-Output "Do you want to revert changes that disabled Edge as the default PDF viewer?"
-            $ReadHost = Read-Host " (Yes / No ) "
-            Switch ($ReadHost) {
-                Yes {
-                    Enable-EdgePDF
-                    Write-Output "Edge will no longer be disabled from being used as the default Edge PDF viewer."; $PublishSettings = $Yes
-                }
-                No {$PublishSettings = $No}
-            }
-            #Switch statement asking if you'd like to reboot your machine
-            Write-Output "For some of the changes to properly take effect it is recommended to reboot your machine. Would you like to restart?"
-            $Readhost = Read-Host " ( Yes / No ) "
-            Switch ($Readhost) {
-                Yes {
-                    Write-Output "Unloading the HKCR drive..."
-                    Remove-PSDrive HKCR 
-                    Sleep 1
-                    Write-Output "Initiating reboot."
-                    Stop-Transcript
-                    Sleep 2
-                    Restart-Computer; $PublishSettings = $Yes
-                }
-                No {
-                    Write-Output "Unloading the HKCR drive..."
-                    Remove-PSDrive HKCR 
-                    Sleep 1
-                    Write-Output "Script has finished. Exiting."
-                    Stop-Transcript
-                    Sleep 2
-                    Exit; $PublishSettings = $No
-                    }
-                }
-            }
+switch ($ReadHost) {
+  Interactive {
+    #Switch statement containing Debloat/Revert options
+    Write-Output "The following options will allow you to either Debloat Windows 10, or to revert changes made after Debloating Windows 10.
+        Choose 'Debloat' to Debloat Windows 10 or choose 'Revert' to revert changes."
+    $Readhost = Read-Host " ( Debloat / Revert ) "
+    switch ($ReadHost) {
+      #This will debloat Windows 10
+      Debloat {
+        #Creates a "drive" to access the HKCR (HKEY_CLASSES_ROOT)
+        Write-Output "Creating PSDrive 'HKCR' (HKEY_CLASSES_ROOT). This will be used for the duration of the script as it is necessary for the removal and modification of specific registry keys."
+        New-PSDrive -Name HKCR -PSProvider Registry -Root HKEY_CLASSES_ROOT
+        Sleep 1
+        Write-Output "Uninstalling bloatware, please wait."
+        Start-Debloat
+        Write-Output "Bloatware removed."
+        Sleep 1
+        Write-Output "Removing specific registry keys."
+        Remove-Keys
+        Write-Output "Leftover bloatware registry keys removed."
+        Sleep 1
+        Write-Output "Checking to see if any Whitelisted Apps were removed, and if so re-adding them."
+        Sleep 1
+        FixWhitelistedApps
+        Sleep 1
+        Write-Output "Disabling Cortana from search, disabling feedback to Microsoft, and disabling scheduled tasks that are considered to be telemetry or unnecessary."
+        Protect-Privacy
+        Write-Output "Cortana disabled from search, feedback to Microsoft has been disabled, and scheduled tasks are disabled."
+        Sleep 1; $PublishSettings = $Debloat
+
+        Write-Output "Do you want to stop edge from taking over as the default PDF viewer?"
+        $ReadHost = Read-Host " (Yes / No ) "
+        switch ($ReadHost) {
+          Yes {
+            Stop-EdgePDF
+            Write-Output "Edge will no longer take over as the default PDF viewer."; $PublishSettings = $Yes
+          }
+          No {
+            $PublishSettings = $No
+          }
         }
-    }
-    Noninteractive {
-        Write-Output "You will not be prompted for any other questions after this. With either option your machine will not automatically reboot and you will need to manually reboot. Would you like to Debloat or Revert changes?"
-        $Readhost = Read-Host " ( Debloat / Revert ) " 
-        Switch ($ReadHost) {
-            Debloat {
-                Write-Output "Uninstalling bloatware. Please wait."
-                Start-Debloat
-                Write-Output "Removing leftover bloatware registry keys."
-                Sleep 1
-                Remove-Keys
-                Sleep 1
-                Write-Output "Checking to see if any Whitelisted Apps were removed, and if so re-adding them."
-                Sleep 1
-                FixWhitelistedApps
-                Sleep 1
-                Write-Output "Stopping Edge from being used as the default PDF Viewer."
-                Sleep 1
-                Protect-Privacy
-                Write-Output "Script has finished. Exiting now."
-                Sleep 2
-                Stop-Transcript
-                Exit; $PublishSettings = $Debloat
-            }
-            Revert {
-                Write-Output "Reverting changes..."
-                Write-Output "Creating PSDrive 'HKCR' (HKEY_CLASSES_ROOT). This will be used for the duration of the script as it is necessary for the modification of specific registry keys."
-                New-PSDrive -Name HKCR -PSProvider Registry -Root HKEY_CLASSES_ROOT
-                Write-Output "Reinstalling bloatware. Please wait."
-                Revert-Changes
-                Write-Output "Bloatware has been reinstalled."
-                Write-Output "Setting Edge back to being the default PDF Viewer."
-                Sleep 1
-                Enable-EdgePDF 
-                Write-Output "Edge has been set back to being the default PDF Viewer"
-                Write-Output "Unloading the HKCR drive..."
-                Remove-PSDrive HKCR
-                Sleep 1
-                Write-Output "Script has finished. Exiting now."
-                Stop-Transcript
-                Sleep 2
-                Exit; $PublishSettings = $Revert
-                }
-            }
+        #Switch statement asking if you'd like to reboot your machine
+        Write-Output "For some of the changes to properly take effect it is recommended to reboot your machine. Would you like to restart?"
+        $ReadHost = Read-Host " ( Yes / No ) "
+        switch ($Readhost) {
+          Yes {
+            Write-Output "Unloading the HKCR drive..."
+            Remove-PSDrive HKCR
+            Sleep 1
+            Stop-Transcript
+            Write-Output "Initiating reboot."
+            Sleep 2
+            Restart-Computer; $PublishSettings = $Yes
+          }
+          No {
+            Write-Output "Unloading the HKCR drive..."
+            Remove-PSDrive HKCR
+            Sleep 1
+            Stop-Transcript
+            Write-Output "Script has finished. Exiting."
+            Sleep 2
+            exit; $PublishSettings = $No
+          }
         }
-    }
+      }
+      Revert {
+        Write-Output "Reverting changes..."
+        Write-Output "Creating PSDrive 'HKCR' (HKEY_CLASSES_ROOT). This will be used for the duration of the script as it is necessary for the modification of specific registry keys."
+        New-PSDrive -Name HKCR -PSProvider Registry -Root HKEY_CLASSES_ROOT
+        Revert-Changes; $PublishSettings = $Revert
+        Write-Output "Do you want to revert changes that disabled Edge as the default PDF viewer?"
+        $ReadHost = Read-Host " (Yes / No ) "
+        switch ($ReadHost) {
+          Yes {
+            Enable-EdgePDF
+            Write-Output "Edge will no longer be disabled from being used as the default Edge PDF viewer."; $PublishSettings = $Yes
+          }
+          No { $PublishSettings = $No }
+        }
+        #Switch statement asking if you'd like to reboot your machine
+        Write-Output "For some of the changes to properly take effect it is recommended to reboot your machine. Would you like to restart?"
+        $Readhost = Read-Host " ( Yes / No ) "
+        switch ($Readhost) {
+          Yes {
+            Write-Output "Unloading the HKCR drive..."
+            Remove-PSDrive HKCR
+            Sleep 1
+            Write-Output "Initiating reboot."
+            Stop-Transcript
+            Sleep 2
+            Restart-Computer; $PublishSettings = $Yes
+          }
+          No {
+            Write-Output "Unloading the HKCR drive..."
+            Remove-PSDrive HKCR
+            Sleep 1
+            Write-Output "Script has finished. Exiting."
+            Stop-Transcript
+            Sleep 2
+            exit; $PublishSettings = $No
+          }
+        }
+      }
+    }
+  }
+  Noninteractive {
+    Write-Output "You will not be prompted for any other questions after this. With either option your machine will not automatically reboot and you will need to manually reboot. Would you like to Debloat or Revert changes?"
+    $Readhost = Read-Host " ( Debloat / Revert ) "
+    switch ($ReadHost) {
+      Debloat {
+        Write-Output "Uninstalling bloatware. Please wait."
+        Start-Debloat
+        Write-Output "Removing leftover bloatware registry keys."
+        Sleep 1
+        Remove-Keys
+        Sleep 1
+        Write-Output "Checking to see if any Whitelisted Apps were removed, and if so re-adding them."
+        Sleep 1
+        FixWhitelistedApps
+        Sleep 1
+        Write-Output "Stopping Edge from being used as the default PDF Viewer."
+        Sleep 1
+        Protect-Privacy
+        Write-Output "Script has finished. Exiting now."
+        Sleep 2
+        Stop-Transcript
+        exit; $PublishSettings = $Debloat
+      }
+      Revert {
+        Write-Output "Reverting changes..."
+        Write-Output "Creating PSDrive 'HKCR' (HKEY_CLASSES_ROOT). This will be used for the duration of the script as it is necessary for the modification of specific registry keys."
+        New-PSDrive -Name HKCR -PSProvider Registry -Root HKEY_CLASSES_ROOT
+        Write-Output "Reinstalling bloatware. Please wait."
+        Revert-Changes
+        Write-Output "Bloatware has been reinstalled."
+        Write-Output "Setting Edge back to being the default PDF Viewer."
+        Sleep 1
+        Enable-EdgePDF
+        Write-Output "Edge has been set back to being the default PDF Viewer"
+        Write-Output "Unloading the HKCR drive..."
+        Remove-PSDrive HKCR
+        Sleep 1
+        Write-Output "Script has finished. Exiting now."
+        Stop-Transcript
+        Sleep 2
+        exit; $PublishSettings = $Revert
+      }
+    }
+  }
+}
diff --git a/Windows10SysPrepDebloater.ps1 b/Windows10SysPrepDebloater.ps1
index 3a16483..76c3be0 100644
--- a/Windows10SysPrepDebloater.ps1
+++ b/Windows10SysPrepDebloater.ps1
@@ -4,226 +4,226 @@
 #This is the switch parameter for running this script as a 'silent' script, for use in MDT images or any type of mass deployment without user interaction.
 param([switch]$Debloat)
 
-param([switch]$SysPrep)
+param ([switch]$SysPrep)
 
-param([switch]$StopEdgePDF)
+param ([switch]$StopEdgePDF)
 
 #This will run get-appxpackage | remove-appxpackage which is required for sysprep to provision the apps.
-Function Begin-SysPrep {
+function Begin-SysPrep {
 
-    param([switch]$SysPrep)
+  param([switch]$SysPrep)
 
-    get-appxpackage | remove-appxpackage -ErrorAction SilentlyContinue
+  Get-AppxPackage | Remove-AppxPackage -ErrorAction SilentlyContinue
 
 }
 
 #Creates a PSDrive to be able to access the 'HKCR' tree
 New-PSDrive -Name HKCR -PSProvider Registry -Root HKEY_CLASSES_ROOT
-Function Start-Debloat {
-    
-    param([switch]$Debloat)
-
-    #Removes AppxPackages
-    #Credit to Reddit user /u/GavinEke for a modified version of my whitelist code
-    [regex]$WhitelistedApps = 'Microsoft.Paint3D|Microsoft.WindowsCalculator|Microsoft.WindowsStore|Microsoft.Windows.Photos'
-    Get-AppxPackage -AllUsers | Where-Object {$_.Name -NotMatch $WhitelistedApps} | Remove-AppxPackage -ErrorAction SilentlyContinue
-    Get-AppxProvisionedPackage -Online | Where-Object {$_.PackageName -NotMatch $WhitelistedApps} | Remove-AppxProvisionedPackage -Online -ErrorAction SilentlyContinue
+function Start-Debloat {
+
+  param([switch]$Debloat)
+
+  #Removes AppxPackages
+  #Credit to Reddit user /u/GavinEke for a modified version of my whitelist code
+  [regex]$WhitelistedApps = 'Microsoft.Paint3D|Microsoft.WindowsCalculator|Microsoft.WindowsStore|Microsoft.Windows.Photos'
+  Get-AppxPackage -AllUsers | Where-Object { $_.Name -notmatch $WhitelistedApps } | Remove-AppxPackage -ErrorAction SilentlyContinue
+  Get-AppxProvisionedPackage -Online | Where-Object { $_.PackageName -notmatch $WhitelistedApps } | Remove-AppxProvisionedPackage -Online -ErrorAction SilentlyContinue
 }
 
-Function Remove-Keys {
-        
-    Param([switch]$Debloat)    
-    
-    #These are the registry keys that it will delete.
-        
-    $Keys = @(
-        
-        #Remove Background Tasks
-        "HKCR:\Extensions\ContractId\Windows.BackgroundTasks\PackageId\46928bounde.EclipseManager_2.2.4.51_neutral__a5h4egax66k6y"
-        "HKCR:\Extensions\ContractId\Windows.BackgroundTasks\PackageId\ActiproSoftwareLLC.562882FEEB491_2.6.18.18_neutral__24pqs290vpjk0"
-        "HKCR:\Extensions\ContractId\Windows.BackgroundTasks\PackageId\Microsoft.MicrosoftOfficeHub_17.7909.7600.0_x64__8wekyb3d8bbwe"
-        "HKCR:\Extensions\ContractId\Windows.BackgroundTasks\PackageId\Microsoft.PPIProjection_10.0.15063.0_neutral_neutral_cw5n1h2txyewy"
-        "HKCR:\Extensions\ContractId\Windows.BackgroundTasks\PackageId\Microsoft.XboxGameCallableUI_1000.15063.0.0_neutral_neutral_cw5n1h2txyewy"
-        "HKCR:\Extensions\ContractId\Windows.BackgroundTasks\PackageId\Microsoft.XboxGameCallableUI_1000.16299.15.0_neutral_neutral_cw5n1h2txyewy"
-        
-        #Windows File
-        "HKCR:\Extensions\ContractId\Windows.File\PackageId\ActiproSoftwareLLC.562882FEEB491_2.6.18.18_neutral__24pqs290vpjk0"
-        
-        #Registry keys to delete if they aren't uninstalled by RemoveAppXPackage/RemoveAppXProvisionedPackage
-        "HKCR:\Extensions\ContractId\Windows.Launch\PackageId\46928bounde.EclipseManager_2.2.4.51_neutral__a5h4egax66k6y"
-        "HKCR:\Extensions\ContractId\Windows.Launch\PackageId\ActiproSoftwareLLC.562882FEEB491_2.6.18.18_neutral__24pqs290vpjk0"
-        "HKCR:\Extensions\ContractId\Windows.Launch\PackageId\Microsoft.PPIProjection_10.0.15063.0_neutral_neutral_cw5n1h2txyewy"
-        "HKCR:\Extensions\ContractId\Windows.Launch\PackageId\Microsoft.XboxGameCallableUI_1000.15063.0.0_neutral_neutral_cw5n1h2txyewy"
-        "HKCR:\Extensions\ContractId\Windows.Launch\PackageId\Microsoft.XboxGameCallableUI_1000.16299.15.0_neutral_neutral_cw5n1h2txyewy"
-        
-        #Scheduled Tasks to delete
-        "HKCR:\Extensions\ContractId\Windows.PreInstalledConfigTask\PackageId\Microsoft.MicrosoftOfficeHub_17.7909.7600.0_x64__8wekyb3d8bbwe"
-        
-        #Windows Protocol Keys
-        "HKCR:\Extensions\ContractId\Windows.Protocol\PackageId\ActiproSoftwareLLC.562882FEEB491_2.6.18.18_neutral__24pqs290vpjk0"
-        "HKCR:\Extensions\ContractId\Windows.Protocol\PackageId\Microsoft.PPIProjection_10.0.15063.0_neutral_neutral_cw5n1h2txyewy"
-        "HKCR:\Extensions\ContractId\Windows.Protocol\PackageId\Microsoft.XboxGameCallableUI_1000.15063.0.0_neutral_neutral_cw5n1h2txyewy"
-        "HKCR:\Extensions\ContractId\Windows.Protocol\PackageId\Microsoft.XboxGameCallableUI_1000.16299.15.0_neutral_neutral_cw5n1h2txyewy"
-           
-        #Windows Share Target
-        "HKCR:\Extensions\ContractId\Windows.ShareTarget\PackageId\ActiproSoftwareLLC.562882FEEB491_2.6.18.18_neutral__24pqs290vpjk0"
-    )
-    
-    #This writes the output of each key it is removing and also removes the keys listed above.
-    ForEach ($Key in $Keys) {
-        Write-Output "Removing $Key from registry"
-        Remove-Item $Key -Recurse -ErrorAction SilentlyContinue
-    }
+function Remove-Keys {
+
+  param([switch]$Debloat)
+
+  #These are the registry keys that it will delete.
+
+  $Keys = @(
+
+    #Remove Background Tasks
+    "HKCR:\Extensions\ContractId\Windows.BackgroundTasks\PackageId\46928bounde.EclipseManager_2.2.4.51_neutral__a5h4egax66k6y"
+    "HKCR:\Extensions\ContractId\Windows.BackgroundTasks\PackageId\ActiproSoftwareLLC.562882FEEB491_2.6.18.18_neutral__24pqs290vpjk0"
+    "HKCR:\Extensions\ContractId\Windows.BackgroundTasks\PackageId\Microsoft.MicrosoftOfficeHub_17.7909.7600.0_x64__8wekyb3d8bbwe"
+    "HKCR:\Extensions\ContractId\Windows.BackgroundTasks\PackageId\Microsoft.PPIProjection_10.0.15063.0_neutral_neutral_cw5n1h2txyewy"
+    "HKCR:\Extensions\ContractId\Windows.BackgroundTasks\PackageId\Microsoft.XboxGameCallableUI_1000.15063.0.0_neutral_neutral_cw5n1h2txyewy"
+    "HKCR:\Extensions\ContractId\Windows.BackgroundTasks\PackageId\Microsoft.XboxGameCallableUI_1000.16299.15.0_neutral_neutral_cw5n1h2txyewy"
+
+    #Windows File
+    "HKCR:\Extensions\ContractId\Windows.File\PackageId\ActiproSoftwareLLC.562882FEEB491_2.6.18.18_neutral__24pqs290vpjk0"
+
+    #Registry keys to delete if they aren't uninstalled by RemoveAppXPackage/RemoveAppXProvisionedPackage
+    "HKCR:\Extensions\ContractId\Windows.Launch\PackageId\46928bounde.EclipseManager_2.2.4.51_neutral__a5h4egax66k6y"
+    "HKCR:\Extensions\ContractId\Windows.Launch\PackageId\ActiproSoftwareLLC.562882FEEB491_2.6.18.18_neutral__24pqs290vpjk0"
+    "HKCR:\Extensions\ContractId\Windows.Launch\PackageId\Microsoft.PPIProjection_10.0.15063.0_neutral_neutral_cw5n1h2txyewy"
+    "HKCR:\Extensions\ContractId\Windows.Launch\PackageId\Microsoft.XboxGameCallableUI_1000.15063.0.0_neutral_neutral_cw5n1h2txyewy"
+    "HKCR:\Extensions\ContractId\Windows.Launch\PackageId\Microsoft.XboxGameCallableUI_1000.16299.15.0_neutral_neutral_cw5n1h2txyewy"
+
+    #Scheduled Tasks to delete
+    "HKCR:\Extensions\ContractId\Windows.PreInstalledConfigTask\PackageId\Microsoft.MicrosoftOfficeHub_17.7909.7600.0_x64__8wekyb3d8bbwe"
+
+    #Windows Protocol Keys
+    "HKCR:\Extensions\ContractId\Windows.Protocol\PackageId\ActiproSoftwareLLC.562882FEEB491_2.6.18.18_neutral__24pqs290vpjk0"
+    "HKCR:\Extensions\ContractId\Windows.Protocol\PackageId\Microsoft.PPIProjection_10.0.15063.0_neutral_neutral_cw5n1h2txyewy"
+    "HKCR:\Extensions\ContractId\Windows.Protocol\PackageId\Microsoft.XboxGameCallableUI_1000.15063.0.0_neutral_neutral_cw5n1h2txyewy"
+    "HKCR:\Extensions\ContractId\Windows.Protocol\PackageId\Microsoft.XboxGameCallableUI_1000.16299.15.0_neutral_neutral_cw5n1h2txyewy"
+
+    #Windows Share Target
+    "HKCR:\Extensions\ContractId\Windows.ShareTarget\PackageId\ActiproSoftwareLLC.562882FEEB491_2.6.18.18_neutral__24pqs290vpjk0"
+  )
+
+  #This writes the output of each key it is removing and also removes the keys listed above.
+  foreach ($Key in $Keys) {
+    Write-Output "Removing $Key from registry"
+    Remove-Item $Key -Recurse -ErrorAction SilentlyContinue
+  }
 }
-        
-Function Protect-Privacy {
-    
-    Param([switch]$Debloat)    
-
-    #Creates a PSDrive to be able to access the 'HKCR' tree
-    New-PSDrive -Name HKCR -PSProvider Registry -Root HKEY_CLASSES_ROOT
-        
-    #Disables Windows Feedback Experience
-    Write-Output "Disabling Windows Feedback Experience program"
-    $Advertising = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\AdvertisingInfo'
-    If (Test-Path $Advertising) {
-        Set-ItemProperty $Advertising -Name Enabled -Value 0 -Verbose
-    }
-        
-    #Stops Cortana from being used as part of your Windows Search Function
-    Write-Output "Stopping Cortana from being used as part of your Windows Search Function"
-    $Search = 'HKLM:\SOFTWARE\Policies\Microsoft\Windows\Windows Search'
-    If (Test-Path $Search) {
-        Set-ItemProperty $Search -Name AllowCortana -Value 0 -Verbose
-    }
-        
-    #Stops the Windows Feedback Experience from sending anonymous data
-    Write-Output "Stopping the Windows Feedback Experience program"
-    $Period1 = 'HKCU:\Software\Microsoft\Siuf'
-    $Period2 = 'HKCU:\Software\Microsoft\Siuf\Rules'
-    $Period3 = 'HKCU:\Software\Microsoft\Siuf\Rules\PeriodInNanoSeconds'
-    If (!(Test-Path $Period3)) { 
-        mkdir $Period1 -ErrorAction SilentlyContinue
-        mkdir $Period2 -ErrorAction SilentlyContinue
-        mkdir $Period3 -ErrorAction SilentlyContinue
-        New-ItemProperty $Period3 -Name PeriodInNanoSeconds -Value 0 -Verbose -ErrorAction SilentlyContinue
-    }
-               
-    Write-Output "Adding Registry key to prevent bloatware apps from returning"
-    #Prevents bloatware applications from returning
-    $registryPath = "HKLM:\SOFTWARE\Policies\Microsoft\Windows\CloudContent"
-    If (!(Test-Path $registryPath)) {
-        Mkdir $registryPath -ErrorAction SilentlyContinue
-        New-ItemProperty $registryPath -Name DisableWindowsConsumerFeatures -Value 1 -Verbose -ErrorAction SilentlyContinue
-    }          
-    
-    Write-Output "Setting Mixed Reality Portal value to 0 so that you can uninstall it in Settings"
-    $Holo = 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Holographic'    
-    If (Test-Path $Holo) {
-        Set-ItemProperty $Holo -Name FirstRunSucceeded -Value 0 -Verbose
-    }
-    
-    #Disables live tiles
-    Write-Output "Disabling live tiles"
-    $Live = 'HKCU:\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\PushNotifications'    
-    If (!(Test-Path $Live)) {
-        mkdir $Live -ErrorAction SilentlyContinue     
-        New-ItemProperty $Live -Name NoTileApplicationNotification -Value 1 -Verbose
-    }
-    
-    #Turns off Data Collection via the AllowTelemtry key by changing it to 0
-    Write-Output "Turning off Data Collection"
-    $DataCollection = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection'    
-    If (Test-Path $DataCollection) {
-        Set-ItemProperty $DataCollection -Name AllowTelemetry -Value 0 -Verbose
-    }
-    
-    #Disables People icon on Taskbar
-    Write-Output "Disabling People icon on Taskbar"
-    $People = 'HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\People'    
-    If (!(Test-Path $People)) {
-        mkdir $People -ErrorAction SilentlyContinue
-        New-ItemProperty $People -Name PeopleBand -Value 0 -Verbose
-    }
-
-    #Disables suggestions on start menu
-    Write-Output "Disabling suggestions on the Start Menu"
-    $Suggestions = 'HKCU:\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager'    
-    If (Test-Path $Suggestions) {
-        Set-ItemProperty $Suggestions -Name SystemPaneSuggestionsEnabled -Value 0 -Verbose
-    }
-
-    #Loads the registry keys/values below into the NTUSER.DAT file which prevents the apps from redownloading. Credit to a60wattfish
-    reg load HKU\Default_User C:\Users\Default\NTUSER.DAT
-    Set-ItemProperty -Path Registry::HKU\Default_User\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager -Name SystemPaneSuggestionsEnabled -Value 0
-    Set-ItemProperty -Path Registry::HKU\Default_User\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager -Name PreInstalledAppsEnabled -Value 0
-    Set-ItemProperty -Path Registry::HKU\Default_User\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager -Name OemPreInstalledAppsEnabled -Value 0
-    reg unload HKU\Default_User
-    
-    #Disables scheduled tasks that are considered unnecessary 
-    Write-Output "Disabling scheduled tasks"
-    Get-ScheduledTask -TaskName XblGameSaveTaskLogon | Disable-ScheduledTask
-    Get-ScheduledTask -TaskName XblGameSaveTask | Disable-ScheduledTask
-    Get-ScheduledTask -TaskName Consolidator | Disable-ScheduledTask
-    Get-ScheduledTask -TaskName UsbCeip | Disable-ScheduledTask
-    Get-ScheduledTask -TaskName DmClient | Disable-ScheduledTask
-    Get-ScheduledTask -TaskName DmClientOnScenarioDownload | Disable-ScheduledTask
+
+function Protect-Privacy {
+
+  param([switch]$Debloat)
+
+  #Creates a PSDrive to be able to access the 'HKCR' tree
+  New-PSDrive -Name HKCR -PSProvider Registry -Root HKEY_CLASSES_ROOT
+
+  #Disables Windows Feedback Experience
+  Write-Output "Disabling Windows Feedback Experience program"
+  $Advertising = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\AdvertisingInfo'
+  if (Test-Path $Advertising) {
+    Set-ItemProperty $Advertising -Name Enabled -Value 0 -Verbose
+  }
+
+  #Stops Cortana from being used as part of your Windows Search Function
+  Write-Output "Stopping Cortana from being used as part of your Windows Search Function"
+  $Search = 'HKLM:\SOFTWARE\Policies\Microsoft\Windows\Windows Search'
+  if (Test-Path $Search) {
+    Set-ItemProperty $Search -Name AllowCortana -Value 0 -Verbose
+  }
+
+  #Stops the Windows Feedback Experience from sending anonymous data
+  Write-Output "Stopping the Windows Feedback Experience program"
+  $Period1 = 'HKCU:\Software\Microsoft\Siuf'
+  $Period2 = 'HKCU:\Software\Microsoft\Siuf\Rules'
+  $Period3 = 'HKCU:\Software\Microsoft\Siuf\Rules\PeriodInNanoSeconds'
+  if (!(Test-Path $Period3)) {
+    mkdir $Period1 -ErrorAction SilentlyContinue
+    mkdir $Period2 -ErrorAction SilentlyContinue
+    mkdir $Period3 -ErrorAction SilentlyContinue
+    New-ItemProperty $Period3 -Name PeriodInNanoSeconds -Value 0 -Verbose -ErrorAction SilentlyContinue
+  }
+
+  Write-Output "Adding Registry key to prevent bloatware apps from returning"
+  #Prevents bloatware applications from returning
+  $registryPath = "HKLM:\SOFTWARE\Policies\Microsoft\Windows\CloudContent"
+  if (!(Test-Path $registryPath)) {
+    mkdir $registryPath -ErrorAction SilentlyContinue
+    New-ItemProperty $registryPath -Name DisableWindowsConsumerFeatures -Value 1 -Verbose -ErrorAction SilentlyContinue
+  }
+
+  Write-Output "Setting Mixed Reality Portal value to 0 so that you can uninstall it in Settings"
+  $Holo = 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Holographic'
+  if (Test-Path $Holo) {
+    Set-ItemProperty $Holo -Name FirstRunSucceeded -Value 0 -Verbose
+  }
+
+  #Disables live tiles
+  Write-Output "Disabling live tiles"
+  $Live = 'HKCU:\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\PushNotifications'
+  if (!(Test-Path $Live)) {
+    mkdir $Live -ErrorAction SilentlyContinue
+    New-ItemProperty $Live -Name NoTileApplicationNotification -Value 1 -Verbose
+  }
+
+  #Turns off Data Collection via the AllowTelemtry key by changing it to 0
+  Write-Output "Turning off Data Collection"
+  $DataCollection = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection'
+  if (Test-Path $DataCollection) {
+    Set-ItemProperty $DataCollection -Name AllowTelemetry -Value 0 -Verbose
+  }
+
+  #Disables People icon on Taskbar
+  Write-Output "Disabling People icon on Taskbar"
+  $People = 'HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\People'
+  if (!(Test-Path $People)) {
+    mkdir $People -ErrorAction SilentlyContinue
+    New-ItemProperty $People -Name PeopleBand -Value 0 -Verbose
+  }
+
+  #Disables suggestions on start menu
+  Write-Output "Disabling suggestions on the Start Menu"
+  $Suggestions = 'HKCU:\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager'
+  if (Test-Path $Suggestions) {
+    Set-ItemProperty $Suggestions -Name SystemPaneSuggestionsEnabled -Value 0 -Verbose
+  }
+
+  #Loads the registry keys/values below into the NTUSER.DAT file which prevents the apps from redownloading. Credit to a60wattfish
+  reg load HKU\Default_User C:\Users\Default\NTUSER.DAT
+  Set-ItemProperty -Path Registry::HKU\Default_User\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager -Name SystemPaneSuggestionsEnabled -Value 0
+  Set-ItemProperty -Path Registry::HKU\Default_User\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager -Name PreInstalledAppsEnabled -Value 0
+  Set-ItemProperty -Path Registry::HKU\Default_User\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager -Name OemPreInstalledAppsEnabled -Value 0
+  reg unload HKU\Default_User
+
+  #Disables scheduled tasks that are considered unnecessary 
+  Write-Output "Disabling scheduled tasks"
+  Get-ScheduledTask -TaskName XblGameSaveTaskLogon | Disable-ScheduledTask
+  Get-ScheduledTask -TaskName XblGameSaveTask | Disable-ScheduledTask
+  Get-ScheduledTask -TaskName Consolidator | Disable-ScheduledTask
+  Get-ScheduledTask -TaskName UsbCeip | Disable-ScheduledTask
+  Get-ScheduledTask -TaskName DmClient | Disable-ScheduledTask
+  Get-ScheduledTask -TaskName DmClientOnScenarioDownload | Disable-ScheduledTask
 }
-    
-Function Stop-EdgePDF {
-
-    param([switch]$StopEdgePDF)    
-    
-    #Stops edge from taking over as the default .PDF viewer
-    Write-Output "Stopping Edge from taking over as the default .PDF viewer" 
-    $NoOpen = 'HKCR:\.pdf'
-    If (!(Get-ItemProperty $NoOpen -Name NoOpenWith)) {
-        New-ItemProperty $NoOpen -Name NoOpenWith -Verbose -ErrorAction SilentlyContinue
-    }
-    
-    $NoStatic = 'HKCR:\.pdf'
-    If (!(Get-ItemProperty $NoStatic -Name NoStaticDefaultVerb)) {
-        New-ItemProperty $NoStatic -Name NoStaticDefaultVerb -Verbose -ErrorAction SilentlyContinue
-    }
-    
-    $NoOpen = 'HKCR:\.pdf\OpenWithProgids'
-    If (!(Get-ItemProperty $NoOpen -Name NoOpenWith)) {
-        New-ItemProperty $NoOpen -Name NoOpenWith -Verbose -ErrorAction SilentlyContinue
-    }
-    
-    $NoStatic = 'HKCR:\.pdf\OpenWithProgids'    
-    If (!(Get-ItemProperty $NoStatic -Name NoStaticDefaultVerb)) {
-        New-ItemProperty $NoStatic -Name NoStaticDefaultVerb -Verbose -ErrorAction SilentlyContinue
-    }
-    
-    $NoOpen = 'HKCR:\.pdf\OpenWithList'    
-    If (!(Get-ItemProperty $NoOpen -Name NoOpenWith)) {
-        New-ItemProperty $NoOpen -Name NoOpenWith -Verbose -ErrorAction SilentlyContinue
-    }
-    
-    $NoStatic = 'HKCR:\.pdf\OpenWithList'
-    If (!(Get-ItemProperty $NoStatic -Name NoStaticDefaultVerb)) {
-        New-ItemProperty $NoStatic -Name NoStaticDefaultVerb -Verbose -ErrorAction SilentlyContinue
-    }
-    
-    #Appends an underscore '_' to the Registry key for Edge
-    $Edge = 'HKCR:\AppXd4nrz8ff68srnhf9t5a8sbjyar1cr723'    
-    If (Test-Path $Edge) {
-        Set-Item $Edge AppXd4nrz8ff68srnhf9t5a8sbjyar1cr723_ -Verbose
-    }
+
+function Stop-EdgePDF {
+
+  param([switch]$StopEdgePDF)
+
+  #Stops edge from taking over as the default .PDF viewer
+  Write-Output "Stopping Edge from taking over as the default .PDF viewer"
+  $NoOpen = 'HKCR:\.pdf'
+  if (!(Get-ItemProperty $NoOpen -Name NoOpenWith)) {
+    New-ItemProperty $NoOpen -Name NoOpenWith -Verbose -ErrorAction SilentlyContinue
+  }
+
+  $NoStatic = 'HKCR:\.pdf'
+  if (!(Get-ItemProperty $NoStatic -Name NoStaticDefaultVerb)) {
+    New-ItemProperty $NoStatic -Name NoStaticDefaultVerb -Verbose -ErrorAction SilentlyContinue
+  }
+
+  $NoOpen = 'HKCR:\.pdf\OpenWithProgids'
+  if (!(Get-ItemProperty $NoOpen -Name NoOpenWith)) {
+    New-ItemProperty $NoOpen -Name NoOpenWith -Verbose -ErrorAction SilentlyContinue
+  }
+
+  $NoStatic = 'HKCR:\.pdf\OpenWithProgids'
+  if (!(Get-ItemProperty $NoStatic -Name NoStaticDefaultVerb)) {
+    New-ItemProperty $NoStatic -Name NoStaticDefaultVerb -Verbose -ErrorAction SilentlyContinue
+  }
+
+  $NoOpen = 'HKCR:\.pdf\OpenWithList'
+  if (!(Get-ItemProperty $NoOpen -Name NoOpenWith)) {
+    New-ItemProperty $NoOpen -Name NoOpenWith -Verbose -ErrorAction SilentlyContinue
+  }
+
+  $NoStatic = 'HKCR:\.pdf\OpenWithList'
+  if (!(Get-ItemProperty $NoStatic -Name NoStaticDefaultVerb)) {
+    New-ItemProperty $NoStatic -Name NoStaticDefaultVerb -Verbose -ErrorAction SilentlyContinue
+  }
+
+  #Appends an underscore '_' to the Registry key for Edge
+  $Edge = 'HKCR:\AppXd4nrz8ff68srnhf9t5a8sbjyar1cr723'
+  if (Test-Path $Edge) {
+    Set-Item $Edge AppXd4nrz8ff68srnhf9t5a8sbjyar1cr723_ -Verbose
+  }
 }
 
-Function FixWhitelistedApps {
-    
-    Param([switch]$Debloat)
-    
-    If(!(Get-AppxPackage -AllUsers | Select Microsoft.Paint3D, Microsoft.WindowsCalculator, Microsoft.WindowsStore, Microsoft.Windows.Photos)) {
-    
+function FixWhitelistedApps {
+
+  param([switch]$Debloat)
+
+  if (!(Get-AppxPackage -AllUsers | Select-Object Microsoft.Paint3D,Microsoft.WindowsCalculator,Microsoft.WindowsStore,Microsoft.Windows.Photos)) {
+
     #Credit to abulgatz for the 4 lines of code
-    Get-AppxPackage -allusers Microsoft.Paint3D | Foreach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
-    Get-AppxPackage -allusers Microsoft.WindowsCalculator | Foreach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
-    Get-AppxPackage -allusers Microsoft.WindowsStore | Foreach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
-    Get-AppxPackage -allusers Microsoft.Windows.Photos | Foreach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"} } 
+    Get-AppxPackage -AllUsers Microsoft.Paint3D | ForEach-Object { Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml" }
+    Get-AppxPackage -AllUsers Microsoft.WindowsCalculator | ForEach-Object { Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml" }
+    Get-AppxPackage -AllUsers Microsoft.WindowsStore | ForEach-Object { Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml" }
+    Get-AppxPackage -AllUsers Microsoft.Windows.Photos | ForEach-Object { Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml" } }
 }
 
 Write-Output "Initiating Sysprep"