diff --git a/scripts/autoconfig-all.cmd b/scripts/autoconfig-all.cmd
index 8672426..f1003f6 100644
--- a/scripts/autoconfig-all.cmd
+++ b/scripts/autoconfig-all.cmd
@@ -54,6 +54,9 @@ echo.
 call modify-powersettings.cmd
 echo.
 
+call modify-desktoptheme.cmd
+echo.
+
 call install-tweaks.cmd
 echo.
 
diff --git a/scripts/uninstall-apps.ps1 b/scripts/uninstall-apps.ps1
index 60a625d..fed21ef 100644
--- a/scripts/uninstall-apps.ps1
+++ b/scripts/uninstall-apps.ps1
@@ -6,13 +6,11 @@ $ErrorActionPreference = 'SilentlyContinue'
 
 Get-AppxPackage -AllUsers |
   where-object {$_.name -notlike "*store*"} |
-  where-object {$_.name -notlike "*calc*"} |
   where-object {$_.name -notlike "*terminal*"} |
   Remove-AppxPackage
 
 Get-AppxProvisionedPackage -online |
   where-object {$_.name -notlike "*store*"} |
-  where-object {$_.name -notlike "*calc*"} |
   where-object {$_.name -notlike "*terminal*"} |
   Remove-AppxProvisionedPackage -online
 
diff --git a/scripts/uninstall-edge.cmd b/scripts/uninstall-edge.cmd
index 4cbaccb..bba4acb 100644
--- a/scripts/uninstall-edge.cmd
+++ b/scripts/uninstall-edge.cmd
@@ -6,11 +6,15 @@ set INSTALLER=Application\8*\Installer
 
 echo ####### %0 #######
 
+@echo on
 %EDGEROOT%\%INSTALLER%\setup.exe --uninstall --system-level --verbose-logging --force-uninstall
+@echo off
+timeout /T 30
 
 echo cleanup ...
 tasklist
-taskkill /F /IM "*edge*"
+taskkill /F /IM EdgeInstall.exe
+taskkill /F /IM Setup.exe
 
 @echo on
 rd /S /Q %EDGEROOT%